Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

fix(Popper): fix comparison for scrollParent #1959

Merged
layershifter merged 3 commits into from
Sep 24, 2019
Merged

fix(Popper): fix comparison for scrollParent #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c7f902
fix(Popper): fix comparison for `scrollParent`
layershifter Sep 23, 2019
3ed909f
Merge branches 'fix/popper-compare-with-body' and 'master' of https:/…
layershifter Sep 23, 2019
87d3124
add changelog
layershifter Sep 23, 2019
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

### Fixes
- Fix comparison for `scrollParent` in `unstable_Popper` @layershifter ([#1959](https://github.com/stardust-ui/react/pull/1959))

<!--------------------------------[ v0.39.0 ]------------------------------- -->
## [v0.39.0](https://github.com/stardust-ui/react/tree/v0.39.0) (2019-09-23)
[Compare changes](https://github.com/stardust-ui/react/compare/v0.38.1...v0.39.0)
Expand Down
3 changes: 2 additions & 1 deletion packages/react/src/lib/positioner/Popper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ const Popper: React.FunctionComponent<PopperProps> = props => {
}

const pointerTargetRefElement = pointerTargetRef && pointerTargetRef.current
const popperHasScrollableParent = getScrollParent(contentRef.current) !== document.body
const scrollParentElement = getScrollParent(contentRef.current)
const popperHasScrollableParent = scrollParentElement !== scrollParentElement.ownerDocument.body

const modifiers: PopperJS.Modifiers = _.merge(
{ preventOverflow: { padding: 0 } },
Expand Down