File tree 1 file changed +2
-6
lines changed
1 file changed +2
-6
lines changed Original file line number Diff line number Diff line change @@ -320,25 +320,21 @@ export default class ViewSlider extends React.Component<Props, State> {
320
320
transitionTimingFunction,
321
321
overflow : 'hidden' ,
322
322
height : animateHeight && height != null ? height : undefined ,
323
+ ...( fillParent ? fillStyle : { } ) ,
323
324
...style ,
324
325
}
325
326
326
327
const finalViewportStyle = {
327
328
position : 'relative' ,
328
329
left : `${ activeView * spacing * ( rtl ? 100 : - 100 ) } %` ,
329
330
whiteSpace : 'nowrap' ,
330
- minHeight : '100%' ,
331
331
direction : rtl ? 'rtl' : 'ltr' ,
332
332
transition : transitioning
333
333
? `left ${ transitionTimingFunction } ${ transitionDuration } ms`
334
334
: undefined ,
335
+ ...( fillParent ? { height : '100%' } : { minHeight : '100%' } ) ,
335
336
...viewportStyle ,
336
337
}
337
- if ( fillParent ) {
338
- Object . assign ( finalOuterStyle , fillStyle )
339
- Object . assign ( finalViewportStyle , fillStyle )
340
- }
341
-
342
338
// when not transitioning, render empty placeholder divs before the active view to push it into the right
343
339
// horizontal position
344
340
const views = [ ]
You can’t perform that action at this time.
0 commit comments