Skip to content

[v4] Remove empty divs from Positioner Portal #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeroenransijn merged 1 commit into from
Sep 19, 2018
Merged

[v4] Remove empty divs from Positioner Portal #330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions src/positioner/src/Positioner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ export default class Positioner extends PureComponent {
// https://github.com/segmentio/evergreen/issues/255
// We need to ceil the width and height to prevent jitter when
// the window is zoomed (when `window.devicePixelRatio` is not an integer)
height = Math.ceil(positionerRect.height)
width = Math.ceil(positionerRect.width)
height = Math.round(positionerRect.height)
width = Math.round(positionerRect.width)
} else {
// When the animation is in flight use `offsetWidth/Height` which
// does not calculate the `transform` property as part of its result.
Expand Down Expand Up @@ -229,17 +229,18 @@ export default class Positioner extends PureComponent {
return (
<React.Fragment>
{target({ getRef: this.getTargetRef, isShown })}
<Portal>
<Transition
in={isShown}
timeout={animationDuration}
onEnter={this.handleEnter}
onEntered={this.props.onOpenComplete}
onExited={this.handleExited}
unmountOnExit
>
{state =>
children({

<Transition
in={isShown}
timeout={animationDuration}
onEnter={this.handleEnter}
onEntered={this.props.onOpenComplete}
onExited={this.handleExited}
unmountOnExit
>
{state => (
<Portal>
{children({
top,
left,
state,
Expand All @@ -257,10 +258,10 @@ export default class Positioner extends PureComponent {
},
getRef: this.getRef,
animationDuration
})
}
</Transition>
</Portal>
})}
</Portal>
)}
</Transition>
</React.Fragment>
)
}}
Expand Down