🐛 Fix Table inifinite loop issue

ant-design · Nov 4, 2019 · 0bdf682 · 0bdf682
1 parent 7158142
commit 0bdf682
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/components/table/Table.tsx b/components/table/Table.tsx
@@ -284,7 +284,7 @@ class Table<T> extends React.Component<InternalTableProps<T>, TableState<T>> {
     const { columns, sortColumn, sortOrder } = this.state;
     if (this.getSortOrderColumns(columns).length > 0) {
       const sortState = this.getSortStateFromColumns(columns);
-      if (sortState.sortColumn !== sortColumn || sortState.sortOrder !== sortOrder) {
+      if (!isSameColumn(sortState.sortColumn, sortColumn) || sortState.sortOrder !== sortOrder) {
         this.setState(sortState);
       }
     }

diff --git a/components/table/__tests__/Table.sorter.test.js b/components/table/__tests__/Table.sorter.test.js
@@ -676,4 +676,24 @@ describe('Table.sorter', () => {
 
     expect(renderedNames(wrapper)).toEqual(['Brown', 'Green', 'Mike', 'Alex', 'Petter', 'Zoe']);
   });
+
+  // https://github.com/ant-design/ant-design/issues/19443
+  it('should not being inifinite loop when using Table.Column with sortOrder', () => {
+    class Demo extends React.Component {
+      componentDidMount() {
+        this.setState({});
+      }
+
+      render() {
+        return (
+          <Table dataSource={[]}>
+            <Table.Column title="Age" dataIndex="age" sorter sortOrder="ascend" key="age" />
+          </Table>
+        );
+      }
+    }
+    expect(() => {
+      mount(<Demo />);
+    }).not.toThrow();
+  });
 });