fix: 修复行头滚动刷选获取到错误的实例

antvis · Dec 5, 2023 · 3006ab3 · 3006ab3
1 parent 2c40b87
commit 3006ab3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/packages/s2-core/src/facet/header/pivot-row.ts b/packages/s2-core/src/facet/header/pivot-row.ts
@@ -3,7 +3,7 @@ import { RowCell } from '../../cell/row-cell';
 import { BaseFrozenRowHeader } from './base-frozen-row';
 
 export class PivotRowHeader extends BaseFrozenRowHeader {
-  protected createCellInstance(node: Node): RowCell {
+  public createCellInstance(node: Node): RowCell {
     const { spreadsheet, scrollY } = this.headerConfig;
     const frozenRow = this.isFrozenRow(node);
 

diff --git a/packages/s2-core/src/facet/header/row.ts b/packages/s2-core/src/facet/header/row.ts
@@ -46,11 +46,11 @@ export class RowHeader extends BaseHeader<RowHeaderConfig> {
     ); // right
   }
 
-  protected createCellInstance(item: Node) {
-    return new RowCell(item, this.headerConfig.spreadsheet, this.headerConfig);
+  public createCellInstance(node: Node) {
+    return new RowCell(node, this.headerConfig.spreadsheet, this.headerConfig);
   }
 
-  protected getCellGroup(item: Node): IGroup {
+  protected getCellGroup(node: Node): IGroup {
     return this;
   }
 

diff --git a/packages/s2-core/src/facet/header/series-number.ts b/packages/s2-core/src/facet/header/series-number.ts
@@ -72,17 +72,16 @@ export class SeriesNumberHeader extends BaseFrozenRowHeader {
     });
   }
 
-  protected createCellInstance(item: Node): RowCell {
-    const frozenRow = this.isFrozenRow(item);
-    const cell = new SeriesNumberCell(
-      item,
+  public createCellInstance(node: Node): RowCell {
+    const frozenRow = this.isFrozenRow(node);
+    return new SeriesNumberCell(
+      node,
       this.headerConfig.spreadsheet,
       {
         ...this.headerConfig,
         scrollY: frozenRow ? 0 : this.headerConfig.scrollY,
       },
       frozenRow,
     );
-    return cell;
   }
 }
diff --git a/packages/s2-core/src/interaction/brush-selection/row-brush-selection.ts b/packages/s2-core/src/interaction/brush-selection/row-brush-selection.ts
@@ -1,6 +1,6 @@
 import type { Point } from '@antv/g-canvas';
 import { isNil, last, map } from 'lodash';
-import { RowCell } from '../../cell';
+import { BaseRowCell, RowCell } from '../../cell';
 import { InterceptType, S2Event } from '../../common/constant';
 import {
   InteractionBrushSelectionStage,
@@ -129,7 +129,7 @@ export class RowBrushSelection extends BaseBrushSelection {
       }
 
       // TODO: 先暂时不考虑自定义单元格的情况, next 分支把这些单元格 (包括自定义单元格) 都放在了 s2.options.rowCell 里
-      return new RowCell(node, this.spreadsheet);
+      return this.spreadsheet.facet.rowHeader.createCellInstance(node);
     });
   }