fix: Table ts definition (ant-design#32358)

* fix: Table ts definition * fix: backof default rowKey
jawQ · Sep 30, 2021 · ec9ecde · ec9ecde
1 parent 8ec1522
commit ec9ecde
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/components/table/Table.tsx b/components/table/Table.tsx
@@ -516,11 +516,14 @@ function InternalTable<RecordType extends object = any>(
   );
 }
 
-const TableRef = React.forwardRef(InternalTable);
+const ForwardTable = React.forwardRef(InternalTable) as <RecordType extends object = any>(
+  props: React.PropsWithChildren<TableProps<RecordType>> & { ref?: React.Ref<HTMLDivElement> },
+) => React.ReactElement;
 
-type InternalTableType = typeof TableRef;
+type InternalTableType = typeof ForwardTable;
 
 interface TableInterface extends InternalTableType {
+  defaultProps?: Partial<TableProps<any>>;
   SELECTION_ALL: 'SELECT_ALL';
   SELECTION_INVERT: 'SELECT_INVERT';
   SELECTION_NONE: 'SELECT_NONE';
@@ -529,7 +532,7 @@ interface TableInterface extends InternalTableType {
   Summary: typeof Summary;
 }
 
-const Table = TableRef as TableInterface;
+const Table = ForwardTable as TableInterface;
 
 Table.defaultProps = {
   rowKey: 'key',

diff --git a/components/table/__tests__/type.test.tsx b/components/table/__tests__/type.test.tsx
@@ -28,6 +28,14 @@ describe('Table.typescript', () => {
     const table = <Table rowSelection={{ selections: [Table.SELECTION_ALL] }} />;
     expect(table).toBeTruthy();
   });
+
+  it('generic', () => {
+    interface RecordType {
+      key: string;
+    }
+    const table = <Table<RecordType> dataSource={[{ key: 'Bamboo' }]} />;
+    expect(table).toBeTruthy();
+  });
 });
 
 describe('Table.typescript types', () => {