Skip to content

Fix: DOMLayoutDelegate miscalculates item & visible rects #8696

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Fix: DOMLayoutDelegate miscalculates item & visible rects #8696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2d81e98
fix: subtract border width from visible rect
nwidynski Aug 9, 2025
edfecf4
fix: tests
nwidynski Aug 9, 2025
afb5528
fix: table tests
nwidynski Aug 9, 2025
1d460cc
fix: adjust item rects by container border
nwidynski Aug 10, 2025
9ae4259
fix: item rect calculation
nwidynski Aug 10, 2025
749a696
feat: simplify rect calculation
nwidynski Aug 10, 2025
ab0e277
fix: remove scroll position from offset
nwidynski Aug 10, 2025
4792d97
fix: typo
nwidynski Aug 10, 2025
3c938d2
fix: calculate position relative to viewport
nwidynski Aug 15, 2025
82e81f2
fix: container relative calc
nwidynski Aug 15, 2025
d821b90
chore: formatting
nwidynski Aug 15, 2025
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
2 changes: 1 addition & 1 deletion packages/@react-aria/dnd/test/useDroppableCollection.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe('useDroppableCollection', () => {
return this.getBoundingClientRect().top;
});

jest.spyOn(HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function () {
jest.spyOn(HTMLElement.prototype, 'clientHeight', 'get').mockImplementation(function () {
return this.getBoundingClientRect().height;
});

Expand Down
8 changes: 4 additions & 4 deletions packages/@react-aria/selection/src/DOMLayoutDelegate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export class DOMLayoutDelegate implements LayoutDelegate {
let itemRect = item.getBoundingClientRect();

return {
x: itemRect.left - containerRect.left + container.scrollLeft,
y: itemRect.top - containerRect.top + container.scrollTop,
x: itemRect.left - containerRect.left - container.clientLeft + container.scrollLeft,
y: itemRect.top - containerRect.top - container.clientTop + container.scrollTop,
width: itemRect.width,
height: itemRect.height
};
Expand All @@ -54,8 +54,8 @@ export class DOMLayoutDelegate implements LayoutDelegate {
return {
x: container?.scrollLeft ?? 0,
y: container?.scrollTop ?? 0,
width: container?.offsetWidth ?? 0,
height: container?.offsetHeight ?? 0
width: container?.clientWidth ?? 0,
height: container?.clientHeight ?? 0
};
}
}
6 changes: 3 additions & 3 deletions packages/react-aria-components/test/Table.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,15 +1633,15 @@ describe('Table', () => {
});

describe('load more spinner', () => {
let offsetHeight, scrollHeight;
let clientHeight, scrollHeight;
let DndTable = stories.DndTable;
let initialItems = [
{id: '1', type: 'file', name: 'Adobe Photoshop'},
{id: '2', type: 'file', name: 'Adobe XD'}
];
beforeAll(function () {
scrollHeight = jest.spyOn(window.HTMLElement.prototype, 'scrollHeight', 'get').mockImplementation(() => 200);
offsetHeight = jest.spyOn(window.HTMLElement.prototype, 'offsetHeight', 'get').mockImplementation(function () {
clientHeight = jest.spyOn(window.HTMLElement.prototype, 'clientHeight', 'get').mockImplementation(function () {
if (this.getAttribute('role') === 'grid') {
return 200;
}
Expand All @@ -1651,7 +1651,7 @@ describe('Table', () => {
});

afterAll(function () {
offsetHeight.mockReset();
clientHeight.mockReset();
scrollHeight.mockReset();
});

Expand Down
Loading