Skip to content

Commit

Permalink
fix: prioritize poppers position prop in overlaytrigger (#6175)
Browse files Browse the repository at this point in the history
* fix: prioritize poppers position prop in overlaytrigger

* remove fallback to placement

* rm comment

* reinstate better comment
  • Loading branch information
golota60 committed Jan 6, 2022
1 parent ccaede1 commit dc9a0d7
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/Overlay.tsx
Expand Up @@ -179,20 +179,22 @@ const Overlay = React.forwardRef<HTMLElement, OverlayProps>(
}}
transition={actualTransition}
>
{(overlayProps, { arrowProps, placement, popper: popperObj, show }) => {
{(overlayProps, { arrowProps, popper: popperObj, show }) => {
wrapRefs(overlayProps, arrowProps);
// Need to get placement from popper object, handling case when overlay is flipped using 'flip' prop
const updatedPlacement = popperObj?.placement;
const popper = Object.assign(popperRef.current, {
state: popperObj?.state,
scheduleUpdate: popperObj?.update,
placement,
placement: updatedPlacement,
outOfBoundaries:
popperObj?.state?.modifiersData.hide?.isReferenceHidden || false,
});

if (typeof overlay === 'function')
return overlay({
...overlayProps,
placement,
placement: updatedPlacement,
show,
...(!transition && show && { className: 'show' }),
popper,
Expand All @@ -201,7 +203,7 @@ const Overlay = React.forwardRef<HTMLElement, OverlayProps>(

return React.cloneElement(overlay as React.ReactElement, {
...overlayProps,
placement,
placement: updatedPlacement,
arrowProps,
popper,
className: classNames(
Expand Down

0 comments on commit dc9a0d7

Please sign in to comment.