chore: tmp of columns

Author: zombieJ

docs/examples/virtual.tsx

@@ -160,6 +160,15 @@ const columns: ColumnsType = [
   },
 ];
 
+function cleanOnCell(cols: any = []) {
+  cols.forEach(col => {
+    delete (col as any).onCell;
+
+    cleanOnCell((col as any).children);
+  });
+}
+cleanOnCell(columns);
+
 const data: RecordType[] = new Array(4 * 10000).fill(null).map((_, index) => ({
   a: `a${index}`,
   b: `b${index}`,
@@ -192,7 +201,10 @@ const Demo = () => {
         scroll={{ x: 1200, y: scrollY ? 200 : null }}
         data={data}
         rowKey="indexKey"
-        expandable={{}}
+        expandable={{
+          expandedRowRender: () => 2333,
+          columnWidth: 60,
+        }}
       />
     </div>
   );

src/Body/BodyRow.tsx

@@ -1,8 +1,7 @@
-import { useContext } from '@rc-component/context';
 import classNames from 'classnames';
 import * as React from 'react';
 import Cell from '../Cell';
-import TableContext, { responseImmutable } from '../context/TableContext';
+import { responseImmutable } from '../context/TableContext';
 import devRenderTimes from '../hooks/useRenderTimes';
 import type { ColumnType, CustomizeComponent, GetComponentProps, GetRowKey } from '../interface';
 import ExpandedRow from './ExpandedRow';
@@ -110,20 +109,18 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
   const {
     prefixCls,
     flattenColumns,
-    expandableType,
     expandRowByClick,
     onTriggerExpand,
     rowClassName,
     expandedRowClassName,
     expandedRowRender,
 
     // Misc
-    nestExpandable,
     expanded,
+    supportExpand,
+    expandable,
   } = rowInfo;
 
-  const { rowExpandable } = useContext(TableContext, ['rowExpandable']);
-
   const [expandRended, setExpandRended] = React.useState(false);
 
   if (process.env.NODE_ENV !== 'production') {
@@ -136,14 +133,11 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
     }
   }, [expanded]);
 
-  const rowSupportExpand = expandableType === 'row' && (!rowExpandable || rowExpandable(record));
-  const mergedExpandable = rowSupportExpand || nestExpandable;
-
   // =========================== onRow ===========================
   const additionalProps = onRow?.(record, index);
 
   const onClick: React.MouseEventHandler<HTMLElement> = (event, ...args) => {
-    if (expandRowByClick && mergedExpandable) {
+    if (expandRowByClick && expandable) {
       onTriggerExpand(record, event);
     }
 
@@ -212,7 +206,7 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
 
   // ======================== Expand Row =========================
   let expandRowNode: React.ReactElement;
-  if (rowSupportExpand && (expandRended || expanded)) {
+  if (supportExpand && (expandRended || expanded)) {
     const expandContent = expandedRowRender(record, index, indent + 1, expanded);
     const computedExpandedRowClassName =
       expandedRowClassName && expandedRowClassName(record, index, indent);

src/StaticTable/BodyGrid.tsx

@@ -50,6 +50,7 @@ const Grid = React.forwardRef<GridRef, GridProps>((props, ref) => {
     () => columnsWidth.map(colWidth => colWidth[2]),
     [columnsWidth],
   );
+  console.log('~~~~>', flattenColumns, columnsWidth);
 
   React.useEffect(() => {
     columnsWidth.forEach(([key, width]) => {

src/StaticTable/BodyLine.tsx

@@ -34,7 +34,6 @@ const BodyLine = React.forwardRef<HTMLDivElement, BodyLineProps>((props, ref) =>
   const rowInfo = useRowInfo(record, rowKey);
 
   // ========================== Expand ==========================
-  const rowSupportExpand = expandableType === 'row' && (!rowExpandable || rowExpandable(record));
 
   // ========================== Render ==========================
 

src/hooks/useRowInfo.tsx

@@ -29,6 +29,8 @@ export default function useRowInfo<RecordType>(
   expanded: boolean;
   hasNestChildren: boolean;
   record: RecordType;
+  supportExpand: boolean;
+  expandable: boolean;
 } {
   const context: TableContextProps = useContext(TableContext, [
     'prefixCls',
@@ -45,22 +47,34 @@ export default function useRowInfo<RecordType>(
     'expandIconColumnIndex',
     'expandedKeys',
     'childrenColumnName',
+    'rowExpandable',
   ]);
 
-  const { flattenColumns, expandableType, expandedKeys, childrenColumnName, onTriggerExpand } =
-    context;
-
-  const columnsKey = getColumnsKey(flattenColumns);
+  const {
+    flattenColumns,
+    expandableType,
+    expandedKeys,
+    childrenColumnName,
+    onTriggerExpand,
+    rowExpandable,
+  } = context;
 
+  // ======================= Expandable =======================
   // Only when row is not expandable and `children` exist in record
   const nestExpandable = expandableType === 'nest';
 
+  const rowSupportExpand = expandableType === 'row' && (!rowExpandable || rowExpandable(record));
+  const mergedExpandable = rowSupportExpand || nestExpandable;
+
   const expanded = expandedKeys && expandedKeys.has(rowKey);
 
   const hasNestChildren = childrenColumnName && record && record[childrenColumnName];
 
   const onInternalTriggerExpand = useEvent(onTriggerExpand);
 
+  // ========================= Column =========================
+  const columnsKey = getColumnsKey(flattenColumns);
+
   return {
     ...context,
     columnsKey,
@@ -69,5 +83,7 @@ export default function useRowInfo<RecordType>(
     hasNestChildren,
     record,
     onTriggerExpand: onInternalTriggerExpand,
+    supportExpand: rowSupportExpand,
+    expandable: mergedExpandable,
   };
 }