fix: 修复非滚动引起的渲染也会触发滚动事件的问题 (#2692)

* fix: 修复非滚动引起的渲染也会触发滚动事件的问题 * chore: 还原
antvis · Apr 30, 2024 · 0cc2839 · 0cc2839
1 parent 2f52f3b
commit 0cc2839
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 8 deletions.
diff --git a/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts b/packages/s2-core/__tests__/spreadsheet/scroll-spec.ts
@@ -1,7 +1,8 @@
+/* eslint-disable jest/expect-expect */
 /* eslint-disable jest/no-conditional-expect */
 import * as mockDataConfig from 'tests/data/simple-data.json';
 import { createMockCellInfo, getContainer, sleep } from 'tests/util/helpers';
-import { get } from 'lodash';
+import { cloneDeep, get } from 'lodash';
 import { ScrollBar, ScrollType } from '../../src/ui/scrollbar';
 import type { CellScrollPosition } from './../../src/common/interface/scroll';
 import { PivotSheet, SpreadSheet } from '@/sheet-type';
@@ -941,4 +942,30 @@ describe('Scroll Tests', () => {
       isMatchElementSpy.mockClear();
     },
   );
+
+  test('should not trigger scroll event when first rendered', () => {
+    const expectScroll = getScrollExpect();
+
+    expectScroll();
+  });
+
+  test('should not trigger scroll event when options changed', () => {
+    const expectScroll = getScrollExpect();
+
+    s2.setOptions({
+      hierarchyType: 'tree',
+    });
+    s2.render();
+
+    expectScroll();
+  });
+
+  test('should not trigger scroll event when data config changed', () => {
+    const expectScroll = getScrollExpect();
+
+    s2.setDataCfg(cloneDeep(mockDataConfig));
+    s2.render();
+
+    expectScroll();
+  });
 });
diff --git a/packages/s2-core/src/facet/base-facet.ts b/packages/s2-core/src/facet/base-facet.ts
@@ -546,7 +546,7 @@ export abstract class BaseFacet {
     this.renderHeaders();
     this.renderScrollBars();
     this.renderBackground();
-    this.dynamicRenderCell();
+    this.dynamicRenderCell(true);
   }
 
   /**
@@ -919,25 +919,25 @@ export abstract class BaseFacet {
         ScrollType.ScrollChange,
         ({ offset }: ScrollChangeParams) => {
           const newOffset = this.getValidScrollBarOffset(offset, maxOffset);
-          const rowHeaderScrollX = floor(newOffset);
+          const newRowHeaderScrollX = floor(newOffset);
 
-          this.setScrollOffset({ rowHeaderScrollX });
+          this.setScrollOffset({ rowHeaderScrollX: newRowHeaderScrollX });
 
           this.rowHeader?.onRowScrollX(
-            rowHeaderScrollX,
+            newRowHeaderScrollX,
             KEY_GROUP_ROW_RESIZE_AREA,
           );
           this.seriesNumberHeader?.onRowScrollX(
-            rowHeaderScrollX,
+            newRowHeaderScrollX,
             KEY_GROUP_ROW_INDEX_RESIZE_AREA,
           );
           this.cornerHeader.onRowScrollX(
-            rowHeaderScrollX,
+            newRowHeaderScrollX,
             KEY_GROUP_CORNER_RESIZE_AREA,
           );
 
           const scrollBarOffsetX = this.getScrollBarOffset(
-            rowHeaderScrollX,
+            newRowHeaderScrollX,
             this.hRowScrollBar,
           );