fix: virtual missing renderIndex

react-component · Sep 12, 2023 · 8bc5e29 · 8bc5e29
1 parent 03eb3d4
commit 8bc5e29
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/VirtualTable/BodyLine.tsx b/src/VirtualTable/BodyLine.tsx
@@ -21,7 +21,7 @@ export interface BodyLineProps<RecordType = any> {
 
 const BodyLine = React.forwardRef<HTMLDivElement, BodyLineProps>((props, ref) => {
   const { data, index, className, rowKey, style, extra, getHeight, ...restProps } = props;
-  const { record, indent } = data;
+  const { record, indent, index: renderIndex } = data;
 
   const { scrollX, flattenColumns, prefixCls, fixColumn, componentWidth } = useContext(
     TableContext,
@@ -102,6 +102,7 @@ const BodyLine = React.forwardRef<HTMLDivElement, BodyLineProps>((props, ref) =>
             colIndex={colIndex}
             indent={indent}
             index={index}
+            renderIndex={renderIndex}
             record={record}
             inverse={extra}
             getHeight={getHeight}

diff --git a/src/VirtualTable/VirtualCell.tsx b/src/VirtualTable/VirtualCell.tsx
@@ -1,18 +1,20 @@
+import { useContext } from '@rc-component/context';
+import classNames from 'classnames';
 import * as React from 'react';
 import { getCellProps } from '../Body/BodyRow';
 import Cell from '../Cell';
+import type useRowInfo from '../hooks/useRowInfo';
 import type { ColumnType } from '../interface';
-import classNames from 'classnames';
-import { useContext } from '@rc-component/context';
 import { GridContext } from './context';
-import type useRowInfo from '../hooks/useRowInfo';
 
-export interface VirtualCellProps<RecordType extends { index: number }> {
+export interface VirtualCellProps<RecordType> {
   rowInfo: ReturnType<typeof useRowInfo>;
   column: ColumnType<RecordType>;
   colIndex: number;
   indent: number;
   index: number;
+  /** Used for `column.render` */
+  renderIndex: number;
   record: RecordType;
 
   // Follow props is used for RowSpanVirtualCell only
@@ -33,11 +35,20 @@ export function getColumnWidth(colIndex: number, colSpan: number, columnsOffset:
   return columnsOffset[colIndex + mergedColSpan] - (columnsOffset[colIndex] || 0);
 }
 
-function VirtualCell<RecordType extends { index: number } = any>(
-  props: VirtualCellProps<RecordType>,
-) {
-  const { rowInfo, column, colIndex, indent, index, record, style, className, inverse, getHeight } =
-    props;
+function VirtualCell<RecordType = any>(props: VirtualCellProps<RecordType>) {
+  const {
+    rowInfo,
+    column,
+    colIndex,
+    indent,
+    index,
+    renderIndex,
+    record,
+    style,
+    className,
+    inverse,
+    getHeight,
+  } = props;
 
   const { render, dataIndex, className: columnClassName, width: colWidth } = column;
 
@@ -108,7 +119,7 @@ function VirtualCell<RecordType extends { index: number } = any>(
       key={key}
       record={record}
       index={index}
-      renderIndex={record.index}
+      renderIndex={renderIndex}
       dataIndex={dataIndex}
       render={mergedRender}
       shouldCellUpdate={column.shouldCellUpdate}