fix: table onCell-method cause offset in width calculation

Author: 路振凯

src/Body/BodyRow.tsx

@@ -8,6 +8,8 @@ import type { ColumnType, CustomizeComponent } from '../interface';
 import ExpandedRow from './ExpandedRow';
 import { computedExpandedClassName } from '../utils/expandUtil';
 import type { TableProps } from '..';
+import useStickyOffsets from '../hooks/useStickyOffsets';
+import { getCellFixedInfo } from '../utils/fixUtil';
 
 export interface BodyRowProps<RecordType> {
   record: RecordType;
@@ -43,12 +45,14 @@ export function getCellProps<RecordType>(
   index: number,
   rowKeys: React.Key[] = [],
   expandedRowOffset = 0,
+  rowStickyOffsets?: ReturnType<typeof useStickyOffsets>,
 ) {
   const {
     record,
     prefixCls,
     columnsKey,
     fixedInfoList,
+    flattenColumns,
     expandIconColumnIndex,
     nestExpandable,
     indentSize,
@@ -61,9 +65,11 @@ export function getCellProps<RecordType>(
   } = rowInfo;
 
   const key = columnsKey[colIndex];
-  const fixedInfo = fixedInfoList[colIndex];
+  let fixedInfo = fixedInfoList[colIndex];
 
-  // ============= Used for nest expandable =============
+  if (column.fixed && rowStickyOffsets) {
+    fixedInfo = getCellFixedInfo(colIndex, colIndex, flattenColumns, rowStickyOffsets);
+  }
   let appendCellNode: React.ReactNode;
   if (colIndex === (expandIconColumnIndex || 0) && nestExpandable) {
     appendCellNode = (
@@ -143,6 +149,7 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
   const {
     prefixCls,
     flattenColumns,
+    colWidths,
     expandedRowClassName,
     expandedRowRender,
     rowProps,
@@ -152,6 +159,19 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
     rowSupportExpand,
   } = rowInfo;
 
+  const hasColSpanZero = React.useMemo(() => {
+    return flattenColumns.some(col => {
+      const cellProps = col.onCell?.(record, index) || {};
+      return (cellProps.colSpan ?? 1) === 0;
+    });
+  }, [flattenColumns, record, index]);
+
+  const rowStickyOffsets = useStickyOffsets(
+    colWidths,
+    flattenColumns,
+    hasColSpanZero ? { record, rowIndex: index } : undefined,
+  );
+
   // Force render expand row if expanded before
   const expandedRef = React.useRef(false);
   expandedRef.current ||= expanded;
@@ -196,6 +216,7 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
           index,
           rowKeys,
           expandedRowInfo?.offset,
+          rowStickyOffsets,
         );
 
         return (

src/hooks/useRowInfo.tsx

@@ -15,6 +15,7 @@ export default function useRowInfo<RecordType>(
   | 'prefixCls'
   | 'fixedInfoList'
   | 'flattenColumns'
+  | 'colWidths'
   | 'expandableType'
   | 'expandRowByClick'
   | 'onTriggerExpand'
@@ -41,6 +42,7 @@ export default function useRowInfo<RecordType>(
     'prefixCls',
     'fixedInfoList',
     'flattenColumns',
+    'colWidths',
     'expandableType',
     'expandRowByClick',
     'onTriggerExpand',

src/hooks/useStickyOffsets.ts

@@ -3,10 +3,14 @@ import type { ColumnType, StickyOffsets } from '../interface';
 
 /**
  * Get sticky column offset width
+ * @param colWidths - Column widths array
+ * @param flattenColumns - Flattened columns
+ * @param rowContext - Optional row context for dynamic colSpan calculation
  */
 function useStickyOffsets<RecordType>(
   colWidths: number[],
   flattenColumns: readonly ColumnType<RecordType>[],
+  rowContext?: { record: RecordType; rowIndex: number },
 ) {
   const stickyOffsets: StickyOffsets = useMemo(() => {
     const columnCount = flattenColumns.length;
@@ -16,9 +20,19 @@ function useStickyOffsets<RecordType>(
       let total = 0;
 
       for (let i = startIndex; i !== endIndex; i += offset) {
+        const column = flattenColumns[i];
+
         offsets.push(total);
 
-        if (flattenColumns[i].fixed) {
+        let colSpan = 1;
+        if (rowContext) {
+          const cellProps = column.onCell?.(rowContext.record, rowContext.rowIndex) || {};
+          colSpan = cellProps.colSpan ?? 1;
+        } else {
+          colSpan = column.colSpan ?? 1;
+        }
+
+        if (column.fixed && colSpan !== 0) {
           total += colWidths[i] || 0;
         }
       }
@@ -33,8 +47,9 @@ function useStickyOffsets<RecordType>(
       start: startOffsets,
       end: endOffsets,
       widths: colWidths,
+      isSticky: flattenColumns.some(column => column.fixed),
     };
-  }, [colWidths, flattenColumns]);
+  }, [colWidths, flattenColumns, ...(rowContext ? [rowContext.record, rowContext.rowIndex] : [])]);
 
   return stickyOffsets;
 }