refactor: move useRowInfo in a single file

Author: zombieJ

docs/examples/virtual.tsx

@@ -192,6 +192,7 @@ const Demo = () => {
         scroll={{ x: 1200, y: scrollY ? 200 : null }}
         data={data}
         rowKey="indexKey"
+        expandable={{}}
       />
     </div>
   );

src/Body/BodyRow.tsx

@@ -1,13 +1,12 @@
 import { useContext } from '@rc-component/context';
 import classNames from 'classnames';
-import { useEvent } from 'rc-util';
 import * as React from 'react';
 import Cell from '../Cell';
-import TableContext, { responseImmutable, type TableContextProps } from '../context/TableContext';
+import TableContext, { responseImmutable } from '../context/TableContext';
 import devRenderTimes from '../hooks/useRenderTimes';
 import type { ColumnType, CustomizeComponent, GetComponentProps, GetRowKey } from '../interface';
-import { getColumnsKey } from '../utils/valueUtil';
 import ExpandedRow from './ExpandedRow';
+import useRowInfo from '../hooks/useRowInfo';
 
 export interface BodyRowProps<RecordType> {
   record: RecordType;
@@ -19,80 +18,14 @@ export interface BodyRowProps<RecordType> {
   cellComponent: CustomizeComponent;
   scopeCellComponent: CustomizeComponent;
   onRow: GetComponentProps<RecordType>;
-  rowExpandable: (record: RecordType) => boolean;
   indent?: number;
   rowKey: React.Key;
   getRowKey: GetRowKey<RecordType>;
 }
 
-export function useRowInfo<RecordType>(
-  record: RecordType,
-  rowKey: React.Key,
-): Pick<
-  TableContextProps,
-  | 'prefixCls'
-  | 'fixedInfoList'
-  | 'flattenColumns'
-  | 'expandableType'
-  | 'expandRowByClick'
-  | 'onTriggerExpand'
-  | 'rowClassName'
-  | 'expandedRowClassName'
-  | 'indentSize'
-  | 'expandIcon'
-  | 'expandedRowRender'
-  | 'expandIconColumnIndex'
-  | 'expandedKeys'
-  | 'childrenColumnName'
-> & {
-  columnsKey: React.Key[];
-  nestExpandable: boolean;
-  expanded: boolean;
-  hasNestChildren: boolean;
-  record: RecordType;
-} {
-  const context: TableContextProps = useContext(TableContext, [
-    'prefixCls',
-    'fixedInfoList',
-    'flattenColumns',
-    'expandableType',
-    'expandRowByClick',
-    'onTriggerExpand',
-    'rowClassName',
-    'expandedRowClassName',
-    'indentSize',
-    'expandIcon',
-    'expandedRowRender',
-    'expandIconColumnIndex',
-    'expandedKeys',
-    'childrenColumnName',
-  ]);
-
-  const { flattenColumns, expandableType, expandedKeys, childrenColumnName, onTriggerExpand } =
-    context;
-
-  const columnsKey = getColumnsKey(flattenColumns);
-
-  // Only when row is not expandable and `children` exist in record
-  const nestExpandable = expandableType === 'nest';
-
-  const expanded = expandedKeys && expandedKeys.has(rowKey);
-
-  const hasNestChildren = childrenColumnName && record && record[childrenColumnName];
-
-  const onInternalTriggerExpand = useEvent(onTriggerExpand);
-
-  return {
-    ...context,
-    columnsKey,
-    nestExpandable,
-    expanded,
-    hasNestChildren,
-    record,
-    onTriggerExpand: onInternalTriggerExpand,
-  };
-}
-
+// ==================================================================================
+// ==                                 getCellProps                                 ==
+// ==================================================================================
 export function getCellProps<RecordType>(
   rowInfo: ReturnType<typeof useRowInfo<RecordType>>,
   column: ColumnType<RecordType>,
@@ -150,6 +83,9 @@ export function getCellProps<RecordType>(
   };
 }
 
+// ==================================================================================
+// ==                                 getCellProps                                 ==
+// ==================================================================================
 function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
   props: BodyRowProps<RecordType>,
 ) {
@@ -164,7 +100,6 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
     index,
     renderIndex,
     rowKey,
-    rowExpandable,
     onRow,
     indent = 0,
     rowComponent: RowComponent,
@@ -187,6 +122,8 @@ function BodyRow<RecordType extends { children?: readonly RecordType[] }>(
     expanded,
   } = rowInfo;
 
+  const { rowExpandable } = useContext(TableContext, ['rowExpandable']);
+
   const [expandRended, setExpandRended] = React.useState(false);
 
   if (process.env.NODE_ENV !== 'production') {

src/Body/index.tsx

@@ -15,7 +15,6 @@ export interface BodyProps<RecordType> {
   data: readonly RecordType[];
   measureColumnWidth: boolean;
   onRow: GetComponentProps<RecordType>;
-  rowExpandable: (record: RecordType) => boolean;
   emptyNode: React.ReactNode;
 }
 
@@ -24,7 +23,7 @@ function Body<RecordType>(props: BodyProps<RecordType>) {
     devRenderTimes(props);
   }
 
-  const { data, measureColumnWidth, onRow, rowExpandable, emptyNode } = props;
+  const { data, measureColumnWidth, onRow, emptyNode } = props;
 
   const {
     prefixCls,
@@ -77,7 +76,6 @@ function Body<RecordType>(props: BodyProps<RecordType>) {
           scopeCellComponent={thComponent}
           onRow={onRow}
           getRowKey={getRowKey}
-          rowExpandable={rowExpandable}
           indent={indent}
         />
       );

src/StaticTable/BodyLine.tsx

@@ -1,11 +1,11 @@
 import { useContext } from '@rc-component/context';
 import classNames from 'classnames';
 import * as React from 'react';
-import { useRowInfo } from '../Body/BodyRow';
 import TableContext, { responseImmutable } from '../context/TableContext';
 import type { FlattenData } from '../hooks/useFlattenRecords';
 import { StaticContext } from './context';
 import VirtualCell from './VirtualCell';
+import useRowInfo from '../hooks/useRowInfo';
 
 export interface BodyLineProps<RecordType = any> {
   data: FlattenData<RecordType>;
@@ -23,11 +23,19 @@ const BodyLine = React.forwardRef<HTMLDivElement, BodyLineProps>((props, ref) =>
   const { data, index, className, rowKey, style, extra, getHeight, ...restProps } = props;
   const { record, indent } = data;
 
-  const { flattenColumns, prefixCls } = useContext(TableContext);
+  const { flattenColumns, prefixCls, expandableType, rowExpandable } = useContext(TableContext, [
+    'prefixCls',
+    'flattenColumns',
+    'expandableType',
+    'rowExpandable',
+  ]);
   const { scrollX } = useContext(StaticContext, ['scrollX']);
 
   const rowInfo = useRowInfo(record, rowKey);
 
+  // ========================== Expand ==========================
+  const rowSupportExpand = expandableType === 'row' && (!rowExpandable || rowExpandable(record));
+
   // ========================== Render ==========================
 
   const rowStyle: React.CSSProperties = {

src/Table.tsx

@@ -535,7 +535,6 @@ function Table<RecordType extends DefaultRecordType>(tableProps: TableProps<Reco
     <Body
       data={mergedData}
       measureColumnWidth={fixHeader || horizonScroll || isSticky}
-      rowExpandable={expandableConfig.rowExpandable}
       onRow={onRow}
       emptyNode={emptyNode}
     />
@@ -769,6 +768,7 @@ function Table<RecordType extends DefaultRecordType>(tableProps: TableProps<Reco
       hoverStartRow: startRow,
       hoverEndRow: endRow,
       onHover,
+      rowExpandable: expandableConfig.rowExpandable,
 
       getRowKey,
       expandedKeys: mergedExpandedKeys,
@@ -810,6 +810,7 @@ function Table<RecordType extends DefaultRecordType>(tableProps: TableProps<Reco
       startRow,
       endRow,
       onHover,
+      expandableConfig.rowExpandable,
 
       getRowKey,
       mergedExpandedKeys,

src/context/TableContext.tsx

@@ -55,6 +55,7 @@ export interface TableContextProps<RecordType = any> {
   hoverStartRow: number;
   hoverEndRow: number;
   onHover: (start: number, end: number) => void;
+  rowExpandable: (record: RecordType) => boolean;
 
   expandedKeys: Set<React.Key>;
   getRowKey: GetRowKey<RecordType>;

src/hooks/useRowInfo.tsx

@@ -0,0 +1,73 @@
+import { useContext } from '@rc-component/context';
+import type { TableContextProps } from '../context/TableContext';
+import TableContext from '../context/TableContext';
+import { getColumnsKey } from '../utils/valueUtil';
+import { useEvent } from 'rc-util';
+
+export default function useRowInfo<RecordType>(
+  record: RecordType,
+  rowKey: React.Key,
+): Pick<
+  TableContextProps,
+  | 'prefixCls'
+  | 'fixedInfoList'
+  | 'flattenColumns'
+  | 'expandableType'
+  | 'expandRowByClick'
+  | 'onTriggerExpand'
+  | 'rowClassName'
+  | 'expandedRowClassName'
+  | 'indentSize'
+  | 'expandIcon'
+  | 'expandedRowRender'
+  | 'expandIconColumnIndex'
+  | 'expandedKeys'
+  | 'childrenColumnName'
+> & {
+  columnsKey: React.Key[];
+  nestExpandable: boolean;
+  expanded: boolean;
+  hasNestChildren: boolean;
+  record: RecordType;
+} {
+  const context: TableContextProps = useContext(TableContext, [
+    'prefixCls',
+    'fixedInfoList',
+    'flattenColumns',
+    'expandableType',
+    'expandRowByClick',
+    'onTriggerExpand',
+    'rowClassName',
+    'expandedRowClassName',
+    'indentSize',
+    'expandIcon',
+    'expandedRowRender',
+    'expandIconColumnIndex',
+    'expandedKeys',
+    'childrenColumnName',
+  ]);
+
+  const { flattenColumns, expandableType, expandedKeys, childrenColumnName, onTriggerExpand } =
+    context;
+
+  const columnsKey = getColumnsKey(flattenColumns);
+
+  // Only when row is not expandable and `children` exist in record
+  const nestExpandable = expandableType === 'nest';
+
+  const expanded = expandedKeys && expandedKeys.has(rowKey);
+
+  const hasNestChildren = childrenColumnName && record && record[childrenColumnName];
+
+  const onInternalTriggerExpand = useEvent(onTriggerExpand);
+
+  return {
+    ...context,
+    columnsKey,
+    nestExpandable,
+    expanded,
+    hasNestChildren,
+    record,
+    onTriggerExpand: onInternalTriggerExpand,
+  };
+}