fix: should not reset virtual scrollLeft when data changed (#1146)

react-component · Jun 18, 2024 · c2b48ac · c2b48ac
1 parent 80ed65b
commit c2b48ac
Show file tree

Hide file tree

Showing 3 changed files with 240 additions and 3 deletions.
diff --git a/src/Table.tsx b/src/Table.tsx
@@ -485,8 +485,9 @@ function Table<RecordType extends DefaultRecordType>(
   const triggerOnScroll = () => {
     if (horizonScroll && scrollBodyRef.current) {
       onInternalScroll({
-        currentTarget: getDOM(scrollBodyRef.current),
-      } as React.UIEvent<HTMLDivElement>);
+        currentTarget: getDOM(scrollBodyRef.current) as HTMLElement,
+        scrollLeft: scrollBodyRef.current?.scrollLeft,
+      });
     } else {
       setPingedLeft(false);
       setPingedRight(false);

diff --git a/tests/Virtual.spec.tsx b/tests/Virtual.spec.tsx
@@ -33,6 +33,8 @@ vi.mock('rc-virtual-list', async () => {
 describe('Table.Virtual', () => {
   let scrollLeftCalled = false;
 
+  const setScrollLeft = vi.fn();
+
   beforeAll(() => {
     spyElementPrototypes(HTMLElement, {
       getBoundingClientRect: () => ({
@@ -43,7 +45,7 @@ describe('Table.Virtual', () => {
           scrollLeftCalled = true;
           return 100;
         },
-        set: () => {},
+        set: setScrollLeft as any,
       },
       clientWidth: {
         get: () => 80,
@@ -56,6 +58,7 @@ describe('Table.Virtual', () => {
 
   beforeEach(() => {
     scrollLeftCalled = false;
+    setScrollLeft.mockReset();
     global.scrollToConfig = null;
     vi.useFakeTimers();
     resetWarned();
@@ -210,6 +213,35 @@ describe('Table.Virtual', () => {
     expect(scrollLeftCalled).toBeTruthy();
   });
 
+  it('should not reset scroll when data changed', async () => {
+    const { container, rerender } = getTable();
+
+    resize(container.querySelector('.rc-table')!);
+
+    rerender(
+      <VirtualTable
+        columns={[
+          {
+            dataIndex: 'name',
+          },
+          {
+            dataIndex: 'age',
+          },
+          {
+            dataIndex: 'address',
+          },
+        ]}
+        rowKey="name"
+        scroll={{ x: 100, y: 100 }}
+        data={[{}]}
+      />,
+    );
+    vi.runAllTimers();
+
+    // mock scrollLeft is 100, but virtual offsetX is 0
+    expect(setScrollLeft).toHaveBeenCalledWith(undefined, 0);
+  });
+
   it('should follow correct width', () => {
     const { container } = getTable({
       columns: [