Skip to content

Commit 51297f9

Browse files
authored
chore: formatting
1 parent d631569 commit 51297f9

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

packages/@react-aria/utils/src/scrollIntoView.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,20 @@ export function scrollIntoView(scrollView: HTMLElement, element: HTMLElement): v
7171
let targetTop = offsetY - scrollMarginTopNumber;
7272
let targetBottom = offsetY + height + scrollMarginBottomNumber;
7373

74-
// convenience vars for padded viewport edges (content coords)
75-
let viewportLeft = x + parseInt(borderLeftWidth, 10) + scrollPaddingLeftNumber;
76-
let viewportRight = maxX - scrollPaddingRightNumber;
77-
let viewportTop = y + parseInt(borderTopWidth, 10) + scrollPaddingTopNumber;
78-
let viewportBottom = maxY - scrollPaddingBottomNumber;
74+
let scrollPortLeft = x + parseInt(borderLeftWidth, 10) + scrollPaddingLeftNumber;
75+
let scrollPortRight = maxX - scrollPaddingRightNumber;
76+
let scrollPortTop = y + parseInt(borderTopWidth, 10) + scrollPaddingTopNumber;
77+
let scrollPortBottom = maxY - scrollPaddingBottomNumber;
7978

80-
const spansBothX =
81-
targetLeft <= viewportLeft && targetRight >= viewportRight;
82-
83-
if (!spansBothX) {
79+
if (targetLeft > scrollPortLeft || targetRight < scrollPortRight) {
8480
if (targetLeft <= x + scrollPaddingLeftNumber) {
8581
x = targetLeft - parseInt(borderLeftWidth, 10) - scrollPaddingLeftNumber;
8682
} else if (targetRight > maxX - scrollPaddingRightNumber) {
8783
x += targetRight - maxX + scrollPaddingRightNumber;
8884
}
8985
}
9086

91-
const spansBothY =
92-
targetTop <= viewportTop && targetBottom >= viewportBottom;
93-
94-
if (!spansBothY) {
87+
if (targetTop > scrollPortTop || targetBottom < scrollPortBottom) {
9588
if (targetTop <= borderAdjustedY + scrollPaddingTopNumber) {
9689
y = targetTop - parseInt(borderTopWidth, 10) - scrollPaddingTopNumber;
9790
} else if (targetBottom > maxY - scrollPaddingBottomNumber) {

0 commit comments

Comments
 (0)