Skip to content

Fix incorrect position from calculatePosition when flip is enabled and positive offset is given #845

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
merged 4 commits into from
Jul 31, 2020
Merged

Fix incorrect position from calculatePosition when flip is enabled and positive offset is given #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
452b493
fix calculatePosition func
raon0211 Jul 27, 2020
6db9460
Add storybook
raon0211 Jul 29, 2020
14572d3
Merge branch 'main' into fix-calculate-position
raon0211 Jul 29, 2020
b6e5b6f
Merge branch 'main' into fix-calculate-position
dannify Jul 31, 2020
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
4 changes: 2 additions & 2 deletions packages/@react-aria/overlays/src/calculatePosition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export function calculatePositionInternal(
// Check if the scroll size of the overlay is greater than the available space to determine if we need to flip
if (flip && scrollSize[size] > space) {
let flippedPlacementInfo = parsePlacement(`${FLIPPED_DIRECTION[placement]} ${crossPlacement}` as Placement);
let flippedPosition = computePosition(childOffset, boundaryDimensions, overlaySize, flippedPlacementInfo, -1 * offset, crossOffset);
let flippedPosition = computePosition(childOffset, boundaryDimensions, overlaySize, flippedPlacementInfo, offset, crossOffset);
let flippedSpace = getAvailableSpace(
boundaryDimensions,
containerOffsetWithBoundary,
Expand All @@ -284,7 +284,7 @@ export function calculatePositionInternal(
if (flippedSpace > space) {
placementInfo = flippedPlacementInfo;
position = flippedPosition;
normalizedOffset = -1 * offset;
normalizedOffset = offset;
}
}

Expand Down
6 changes: 6 additions & 0 deletions packages/@react-aria/overlays/test/calculatePosition.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,12 @@ describe('calculatePosition', function () {
// testCases[9] is for right placement
'left', getTargetDimension({left: 0, top: 0}), testCases[9].offsetBefore, 0, 0, true
);

describe('positive offset', function () {
checkPosition(
'left', getTargetDimension({left: 0, top: 250}), [110, 200, undefined, 100, 350], 10, 0, true
);
});
});

describe('overlay smaller than target aligns in center', function () {
Expand Down
4 changes: 4 additions & 0 deletions packages/@react-spectrum/dialog/stories/DialogTrigger.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ storiesOf('DialogTrigger', module)
'shouldFlip: false',
() => renderPopover({type: 'popover', placement: 'left', shouldFlip: false, width: 'calc(100vh - 100px)'})
)
.add(
'shouldFlip: true with offset',
() => renderPopover({type: 'popover', placement: 'left', shouldFlip: true, offset: 50, width: 'calc(100vh - 100px)'})
)
.add(
'containerPadding',
() => renderPopover({type: 'popover', placement: 'bottom', width: 'calc(100vh - 100px)', containerPadding: 20})
Expand Down