adjust expandIconColumnIndex logic

Author: zombieJ

examples/childrenIndent.tsx

@@ -10,6 +10,23 @@ interface RecordType {
   children?: RecordType[];
 }
 
+function CustomExpandIcon(props) {
+  let text;
+  if (props.expanded) {
+    text = '⇧ collapse';
+  } else {
+    text = '⇩ expand';
+  }
+  return (
+    <a
+      className="expand-row-icon"
+      onClick={e => props.onExpand(props.record, e)}
+      dangerouslySetInnerHTML={{ __html: text }}
+      style={{ color: 'blue', cursor: 'pointer' }}
+    />
+  );
+}
+
 const columns = [
   {
     title: 'Name',
@@ -113,6 +130,7 @@ const Demo = () => (
     data={data}
     indentSize={30}
     onExpand={onExpand}
+    expandIcon={CustomExpandIcon}
   />
 );
 

src/Body/BodyRow.tsx

@@ -66,6 +66,7 @@ function BodyRow<RecordType extends { children?: RecordType[] }>(props: BodyRowP
     indentSize,
     expandIcon,
     expandedRowRender,
+    expandIconColumnIndex,
   } = React.useContext(BodyContext);
   const { onColumnResize } = React.useContext(ResizeContext);
   const [expandRended, setExpandRended] = React.useState(false);
@@ -137,7 +138,7 @@ function BodyRow<RecordType extends { children?: RecordType[] }>(props: BodyRowP
 
         // ============= Used for nest expandable =============
         let appendCellNode: React.ReactNode;
-        if (colIndex === 0 && nestExpandable) {
+        if (colIndex === (expandIconColumnIndex || 0) && nestExpandable) {
           appendCellNode = (
             <>
               <span

src/Table.tsx

@@ -109,7 +109,7 @@ export interface TableProps<RecordType extends DefaultRecordType>
    * !!! DO NOT USE IN PRODUCTION ENVIRONMENT !!!
    */
   // Used for antd table transform column with additional column
-  transformColumns: (columns: ColumnsType<RecordType>) => ColumnsType<RecordType>;
+  transformColumns?: (columns: ColumnsType<RecordType>) => ColumnsType<RecordType>;
 }
 
 function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordType>) {
@@ -523,6 +523,7 @@ function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordTyp
           expandRowByClick,
           expandedRowRender,
           onTriggerExpand,
+          expandIconColumnIndex,
           indentSize,
         }}
       >

src/context/BodyContext.tsx

@@ -29,6 +29,7 @@ export interface BodyContextProps<RecordType = DefaultRecordType> {
   expandedRowRender: ExpandedRowRender<RecordType>;
   expandIcon: RenderExpandIcon<RecordType>;
   onTriggerExpand: TriggerEventHandler<RecordType>;
+  expandIconColumnIndex: number;
 }
 
 const BodyContext = React.createContext<BodyContextProps>(null);