diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-11-09 07:53:21 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-11-09 07:53:21 +0800 |
| commit | 5d74421e438d0b56f31344f5fc4d4abbcb190722 (patch) | |
| tree | f0cd49aa411e783b0c2625aae33e83b1d2842e91 /packages | |
| parent | 4f4d901ecaa4fd772288c3421f92da293690ceb8 (diff) | |
| download | dexon-sol-tools-5d74421e438d0b56f31344f5fc4d4abbcb190722.tar dexon-sol-tools-5d74421e438d0b56f31344f5fc4d4abbcb190722.tar.gz dexon-sol-tools-5d74421e438d0b56f31344f5fc4d4abbcb190722.tar.bz2 dexon-sol-tools-5d74421e438d0b56f31344f5fc4d4abbcb190722.tar.lz dexon-sol-tools-5d74421e438d0b56f31344f5fc4d4abbcb190722.tar.xz dexon-sol-tools-5d74421e438d0b56f31344f5fc4d4abbcb190722.tar.zst dexon-sol-tools-5d74421e438d0b56f31344f5fc4d4abbcb190722.zip | |
fix: broken features because of merge
Diffstat (limited to 'packages')
3 files changed, 5 insertions, 1 deletions
diff --git a/packages/instant/src/components/animations/position_animation.tsx b/packages/instant/src/components/animations/position_animation.tsx index 576d29c07..8b3b294b7 100644 --- a/packages/instant/src/components/animations/position_animation.tsx +++ b/packages/instant/src/components/animations/position_animation.tsx @@ -77,6 +77,7 @@ const generatePositionAnimationCss = (positionSettings: PositionAnimationSetting export interface PositionAnimationProps { positionSettings: OptionallyScreenSpecific<PositionAnimationSettings>; zIndex?: OptionallyScreenSpecific<number>; + height?: string; } const defaultAnimation = (positionSettings: OptionallyScreenSpecific<PositionAnimationSettings>) => { @@ -104,5 +105,6 @@ export const PositionAnimation = ${props => animationForSize(props.positionSettings, 'sm', media.small)} ${props => animationForSize(props.positionSettings, 'md', media.medium)} ${props => animationForSize(props.positionSettings, 'lg', media.large)} + ${props => (props.height ? `height: ${props.height};` : '')} } `; diff --git a/packages/instant/src/components/animations/slide_animation.tsx b/packages/instant/src/components/animations/slide_animation.tsx index 122229dee..9adb1c674 100644 --- a/packages/instant/src/components/animations/slide_animation.tsx +++ b/packages/instant/src/components/animations/slide_animation.tsx @@ -10,6 +10,7 @@ export interface SlideAnimationProps { slideInSettings: OptionallyScreenSpecific<PositionAnimationSettings>; slideOutSettings: OptionallyScreenSpecific<PositionAnimationSettings>; zIndex?: OptionallyScreenSpecific<number>; + height?: string; } export const SlideAnimation: React.StatelessComponent<SlideAnimationProps> = props => { @@ -18,7 +19,7 @@ export const SlideAnimation: React.StatelessComponent<SlideAnimationProps> = pro } const positionSettings = props.animationState === 'slidIn' ? props.slideInSettings : props.slideOutSettings; return ( - <PositionAnimation positionSettings={positionSettings} zIndex={props.zIndex}> + <PositionAnimation height={props.height} positionSettings={positionSettings} zIndex={props.zIndex}> {props.children} </PositionAnimation> ); diff --git a/packages/instant/src/components/sliding_panel.tsx b/packages/instant/src/components/sliding_panel.tsx index 99db58e68..9d16f9560 100644 --- a/packages/instant/src/components/sliding_panel.tsx +++ b/packages/instant/src/components/sliding_panel.tsx @@ -69,6 +69,7 @@ export const SlidingPanel: React.StatelessComponent<SlidingPanelProps> = props = slideInSettings={slideUpSettings} slideOutSettings={slideDownSettings} animationState={animationState} + height="100%" > <Panel {...rest} /> </SlideAnimation> |