Skip to content
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

Jump to bottom

chore: not flip too much #334

Merged
merged 1 commit into from
Mar 8, 2023
Merged

chore: not flip too much #334

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 33 additions & 1 deletion docs/examples/inside.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,22 @@ const builtinPlacements = {
},
offset: [0, 0],
},
topLeft: {
points: ['bl', 'tl'],
overflow: {
adjustX: true,
adjustY: true,
},
offset: [0, 0],
},
topRight: {
points: ['br', 'tr'],
overflow: {
adjustX: true,
adjustY: true,
},
offset: [0, 0],
},
left: {
points: ['cr', 'cl'],
overflow: {
Expand All @@ -20,6 +36,22 @@ const builtinPlacements = {
},
offset: [0, 0],
},
leftTop: {
points: ['tr', 'tl'],
overflow: {
adjustX: true,
adjustY: true,
},
offset: [0, 0],
},
leftBottom: {
points: ['br', 'bl'],
overflow: {
adjustX: true,
adjustY: true,
},
offset: [0, 0],
},
right: {
points: ['cl', 'cr'],
overflow: {
Expand All @@ -38,7 +70,7 @@ const builtinPlacements = {
},
};

const popupPlacement = 'top';
const popupPlacement = 'leftBottom';

export default () => {
const containerRef = React.useRef<HTMLDivElement>();
Expand Down
47 changes: 37 additions & 10 deletions src/hooks/useAlign.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ export default function useAlign(
const popupHeight = popupRect.height;
const popupWidth = popupRect.width;

const targetHeight = targetRect.height;
const targetWidth = targetRect.width;

// Get bounding of visible area
const visibleArea =
placementInfo.htmlRegion === 'scroll'
Expand Down Expand Up @@ -274,13 +277,20 @@ export default function useAlign(

const needAdjustY = supportAdjust(adjustY);

const sameTB = popupPoints[0] === targetPoints[0];

// Bottom to Top
if (
needAdjustY &&
popupPoints[0] === 't' &&
nextPopupBottom > visibleArea.bottom
) {
nextOffsetY = targetAlignPointTL.y - popupAlignPointBR.y - popupOffsetY;
if (sameTB) {
nextOffsetY -= popupHeight - targetHeight;
} else {
nextOffsetY =
targetAlignPointTL.y - popupAlignPointBR.y - popupOffsetY;
}

nextAlignInfo.points = [
reversePoints(popupPoints, 0),
Expand All @@ -294,7 +304,12 @@ export default function useAlign(
popupPoints[0] === 'b' &&
nextPopupY < visibleArea.top
) {
nextOffsetY = targetAlignPointBR.y - popupAlignPointTL.y - popupOffsetY;
if (sameTB) {
nextOffsetY += popupHeight - targetHeight;
} else {
nextOffsetY =
targetAlignPointBR.y - popupAlignPointTL.y - popupOffsetY;
}

nextAlignInfo.points = [
reversePoints(popupPoints, 0),
Expand All @@ -309,13 +324,20 @@ export default function useAlign(
const needAdjustX = supportAdjust(adjustX);

// >>>>> Flip
const sameLR = popupPoints[1] === targetPoints[1];

// Right to Left
if (
needAdjustX &&
popupPoints[1] === 'l' &&
nextPopupRight > visibleArea.right
) {
nextOffsetX = targetAlignPointTL.x - popupAlignPointBR.x - popupOffsetX;
if (sameLR) {
nextOffsetX -= popupWidth - targetWidth;
} else {
nextOffsetX =
targetAlignPointTL.x - popupAlignPointBR.x - popupOffsetX;
}

nextAlignInfo.points = [
reversePoints(popupPoints, 1),
Expand All @@ -329,7 +351,12 @@ export default function useAlign(
popupPoints[1] === 'r' &&
nextPopupX < visibleArea.left
) {
nextOffsetX = targetAlignPointBR.x - popupAlignPointTL.x - popupOffsetX;
if (sameLR) {
nextOffsetX += popupWidth - targetWidth;
} else {
nextOffsetX =
targetAlignPointBR.x - popupAlignPointTL.x - popupOffsetX;
}

nextAlignInfo.points = [
reversePoints(popupPoints, 1),
Expand All @@ -344,9 +371,9 @@ export default function useAlign(
if (nextPopupX < visibleArea.left) {
nextOffsetX -= nextPopupX - visibleArea.left;

if (targetRect.x + targetRect.width < visibleArea.left + numShiftX) {
if (targetRect.x + targetWidth < visibleArea.left + numShiftX) {
nextOffsetX +=
targetRect.x - visibleArea.left + targetRect.width - numShiftX;
targetRect.x - visibleArea.left + targetWidth - numShiftX;
}
}

Expand All @@ -366,9 +393,9 @@ export default function useAlign(
if (nextPopupY < visibleArea.top) {
nextOffsetY -= nextPopupY - visibleArea.top;

if (targetRect.y + targetRect.height < visibleArea.top + numShiftY) {
if (targetRect.y + targetHeight < visibleArea.top + numShiftY) {
nextOffsetY +=
targetRect.y - visibleArea.top + targetRect.height - numShiftY;
targetRect.y - visibleArea.top + targetHeight - numShiftY;
}
}

Expand All @@ -389,9 +416,9 @@ export default function useAlign(
const popupBottom = popupTop + popupHeight;

const targetLeft = targetRect.x;
const targetRight = targetLeft + targetRect.width;
const targetRight = targetLeft + targetWidth;
const targetTop = targetRect.y;
const targetBottom = targetTop + targetRect.height;
const targetBottom = targetTop + targetHeight;

const maxLeft = Math.max(popupLeft, targetLeft);
const minRight = Math.min(popupRight, targetRight);
Expand Down