Skip to content

fix(utils): fix popper flip error #3386

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 1 commit into from
May 7, 2025
Merged

fix(utils): fix popper flip error #3386

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
15 changes: 8 additions & 7 deletions packages/utils/src/popper/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ const getOffsetRectRelativeToCustomParent = (
}

const getScrollTopValue = (el: HTMLElement) =>
el === document.body ? Math.max(document.documentElement.scrollTop, document.body.scrollTop) : el.scrollTop
el === document.body ? Math.max(document.documentElement.scrollTop, document.body.scrollTop) : el.scrollTop || 0
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure that el.scrollTop is always a number by providing a default value of 0. This prevents potential errors when el.scrollTop is undefined.


const getScrollLeftValue = (el: HTMLElement) =>
el === document.body ? Math.max(document.documentElement.scrollLeft, document.body.scrollLeft) : el.scrollLeft
el === document.body ? Math.max(document.documentElement.scrollLeft, document.body.scrollLeft) : el.scrollLeft || 0
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure that el.scrollLeft is always a number by providing a default value of 0. This prevents potential errors when el.scrollLeft is undefined.


const getMaxWH = (body, html) => {
const height = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight)
Expand Down Expand Up @@ -620,17 +620,18 @@ export class PopperJS {
placementOpposite = getOppositePlacement(placement)

let popperOffsets = getPopperClientRect(data.offsets.popper)
// 变量起名不佳。 此处分2种情况： placement是right', 'bottom 或 left,top
let a = ~['right', 'bottom'].indexOf(placement)
let p = Math.floor(data.offsets.reference[placement])
let po = Math.floor(popperOffsets[placementOpposite])
let isRightOrBottom = ['right', 'bottom'].includes(placement)
// reference元素的对应的位置
let refPosition = Math.floor(data.offsets.reference[placement])
// 弹出层对应的位置
let popupPosition = Math.floor(popperOffsets[placementOpposite])

// 如果right， ref.right > pop.left
// bottom, ref.bottom > pop.top
// left, ref.left < pop.left
// top, ref.top < pop.bottom
// 则进行flip
if ((a && p > po) || (!a && p < po)) {
if ((isRightOrBottom && refPosition > popupPosition) || (!isRightOrBottom && refPosition < popupPosition)) {
data.flipped = true
data.placement = flipOrderArr[index + 1]

Expand Down
Loading