fix: cannot expand when using expandIcon and expandRowByClick (#468)

Author: afc163

examples/expandIcon.tsx

@@ -25,30 +25,29 @@ function CustomExpandIcon(props) {
     <a
       className="expand-row-icon"
       onClick={e => props.onExpand(props.record, e)}
+      // eslint-disable-next-line react/no-danger
       dangerouslySetInnerHTML={{ __html: text }}
       style={{ color: 'blue', cursor: 'pointer' }}
     />
   );
 }
 
-class Demo extends React.Component {
-  onExpand = (expanded, record) => {
-    console.log('onExpand', expanded, record);
-  };
+const onExpand = (expanded, record) => {
+  // eslint-disable-next-line no-console
+  console.log('onExpand', expanded, record);
+};
 
-  render() {
-    return (
-      <div>
-        <Table
-          columns={columns}
-          expandedRowRender={record => <p>extra: {record.a}</p>}
-          onExpand={this.onExpand}
-          expandIcon={CustomExpandIcon}
-          data={data}
-        />
-      </div>
-    );
-  }
-}
+const Demo = () => (
+  <Table
+    columns={columns}
+    data={data}
+    expandable={{
+      expandRowByClick: true,
+      expandedRowRender: record => <p>extra: {record.a}</p>,
+      onExpand,
+      expandIcon: CustomExpandIcon,
+    }}
+  />
+);
 
 export default Demo;

src/Table.tsx

@@ -342,7 +342,7 @@ function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordTyp
       expandable: !!expandedRowRender,
       expandedKeys: mergedExpandedKeys,
       getRowKey,
-      onTriggerExpand,
+      onTriggerExpand: expandRowByClick ? () => {} : onTriggerExpand,
       expandIcon: mergedExpandIcon,
       expandIconColumnIndex,
       direction,

tests/ExpandRow.spec.js

@@ -368,4 +368,35 @@ describe('Table.Expand', () => {
     );
     expect(wrapper.find('tbody tr')).toHaveLength(3);
   });
+
+  // https://github.com/ant-design/ant-design/issues/23894
+  it('should be collapsible when use `expandIcon` & `expandRowByClick`', () => {
+    const data = [{ key: 0, name: 'Lucy', age: 27, children: [{ key: 1, name: 'Jack', age: 28 }] }];
+    const onExpand = jest.fn();
+    const wrapper = mount(
+      createTable({
+        expandable: {
+          expandedRowRender,
+          expandRowByClick: true,
+          expandIcon: ({ onExpand: onIconExpand }) => (
+            <span className="custom-expand-icon" onClick={onIconExpand} />
+          ),
+          onExpand,
+        },
+        data,
+      }),
+    );
+    wrapper
+      .find('.custom-expand-icon')
+      .first()
+      .simulate('click');
+    expect(onExpand).toHaveBeenCalledWith(true, data[0]);
+    expect(onExpand).toHaveBeenCalledTimes(1);
+    wrapper
+      .find('.custom-expand-icon')
+      .first()
+      .simulate('click');
+    expect(onExpand).toHaveBeenCalledWith(false, data[0]);
+    expect(onExpand).toHaveBeenCalledTimes(2);
+  });
 });