fix: Table crash when dataSource contains number

close #26039
ant-design · Aug 5, 2020 · 3331f20 · 3331f20
1 parent 1d0f600
commit 3331f20
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/components/table/Table.tsx b/components/table/Table.tsx
@@ -162,7 +162,7 @@ function Table<RecordType extends object = any>(props: TableProps<RecordType>) {
   const { childrenColumnName = 'children' } = mergedExpandable;
 
   const expandType: ExpandType = React.useMemo<ExpandType>(() => {
-    if (rawData.some(item => (item as any)[childrenColumnName])) {
+    if (rawData.some(item => (item as any)?.[childrenColumnName])) {
       return 'nest';
     }
 
@@ -183,7 +183,7 @@ function Table<RecordType extends object = any>(props: TableProps<RecordType>) {
       return rowKey;
     }
 
-    return (record: RecordType) => (record as any)[rowKey as string];
+    return (record: RecordType) => (record as any)?.[rowKey as string];
   }, [rowKey]);
 
   const [getRecordByKey] = useLazyKVMap(rawData, childrenColumnName, getRowKey);

diff --git a/components/table/__tests__/Table.test.js b/components/table/__tests__/Table.test.js
@@ -160,6 +160,19 @@ describe('Table', () => {
     );
   });
 
+  it('should not crash when dataSource is array with none-object items', () => {
+    mount(
+      <Table
+        columns={[
+          {
+            title: 'name',
+          },
+        ]}
+        dataSource={['1', 2, undefined, {}, null, true, false, 0]}
+      />,
+    );
+  });
+
   it('prevent touch event', () => {
     const wrapper = mount(
       <Table

diff --git a/components/table/hooks/useLazyKVMap.ts b/components/table/hooks/useLazyKVMap.ts
@@ -30,7 +30,7 @@ export default function useLazyKVMap<RecordType>(
           const rowKey = getRowKey(record, index);
           kvMap.set(rowKey, record);
 
-          if (childrenColumnName in record) {
+          if (record && typeof record === 'object' && childrenColumnName in record) {
             dig((record as any)[childrenColumnName] || []);
           }
         });

diff --git a/components/table/hooks/useSelection.tsx b/components/table/hooks/useSelection.tsx
@@ -59,7 +59,7 @@ function flattenData<RecordType>(
   (data || []).forEach(record => {
     list.push(record);
 
-    if (childrenColumnName in record) {
+    if (record && typeof record === 'object' && childrenColumnName in record) {
       list = [
         ...list,
         ...flattenData<RecordType>((record as any)[childrenColumnName], childrenColumnName),