Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions src/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -453,23 +453,36 @@ const Table = <RecordType extends DefaultRecordType>(
}, []);

const [setScrollTarget, getScrollTarget] = useTimeoutLock(null);
const [scrollRetryTimeoutMap] = React.useState(
() => new WeakMap<HTMLDivElement, ReturnType<typeof setTimeout>>(),
);

function forceScroll(scrollLeft: number, target: HTMLDivElement | ((left: number) => void)) {
if (!target) {
return;
}
if (typeof target === 'function') {
target(scrollLeft);
} else if (target.scrollLeft !== scrollLeft) {
return;
}

const scrollRetryTimeout = scrollRetryTimeoutMap.get(target);
if (scrollRetryTimeout) {
clearTimeout(scrollRetryTimeout);
}

if (target.scrollLeft !== scrollLeft) {
target.scrollLeft = scrollLeft;

// Delay to force scroll position if not sync
// ref: https://github.com/ant-design/ant-design/issues/37179
setTimeout(() => {
const retryTimeout = setTimeout(() => {
if (target.scrollLeft !== scrollLeft) {
target.scrollLeft = scrollLeft;
}
}, 0);

scrollRetryTimeoutMap.set(target, retryTimeout);
}
}

Expand Down
44 changes: 44 additions & 0 deletions tests/Table.spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -1365,4 +1365,48 @@ describe('Table.Basic', () => {
vi.useRealTimers();
}
});

it('cancels stale scrollLeft retry when target already synced', () => {
vi.useFakeTimers();

try {
const { container } = render(
createTable({
scroll: { x: 100, y: 100 },
}),
);

const tableHeader = container.querySelector('.rc-table-header');
const tableBody = container.querySelector('.rc-table-body');
let headerScrollLeft = 0;
let bodyScrollLeft = 0;

Object.defineProperty(tableHeader, 'scrollLeft', {
get() {
return headerScrollLeft;
},
set(value) {
headerScrollLeft = value;
},
});
Object.defineProperty(tableBody, 'scrollLeft', {
get() {
return bodyScrollLeft;
},
});

bodyScrollLeft = 100;
fireEvent.scroll(tableBody);

headerScrollLeft = 50;
bodyScrollLeft = 50;
fireEvent.scroll(tableBody);

vi.runAllTimers();

expect(headerScrollLeft).toBe(50);
} finally {
vi.useRealTimers();
}
});
});
Loading