Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ env:
matrix:
- TEST_TYPE=lint
- TEST_TYPE=test
- TEST_TYPE=compile
2 changes: 1 addition & 1 deletion src/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ function Table<RecordType extends DefaultRecordType>(props: TableProps<RecordTyp
return defaultExpandedRowKeys;
}
if (defaultExpandAllRows) {
return findAllChildrenKeys<RecordType>(mergedData, getRowKey);
return findAllChildrenKeys<RecordType>(mergedData, getRowKey, mergedChildrenColumnName);
}
return [];
});
Expand Down
3 changes: 2 additions & 1 deletion src/utils/expandUtil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ export function renderExpandIcon<RecordType>({
export function findAllChildrenKeys<RecordType>(
data: RecordType[],
getRowKey: GetRowKey<RecordType>,
childrenColumnName: string,
): Key[] {
const keys: Key[] = [];

function dig(list: RecordType[]) {
(list || []).forEach((item, index) => {
keys.push(getRowKey(item, index));

dig(((item as unknown) as { children: RecordType[] }).children);
dig((item as any)[childrenColumnName]);
});
}

Expand Down
14 changes: 14 additions & 0 deletions tests/ExpandRow.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -354,4 +354,18 @@ describe('Table.Expand', () => {
.hasClass('rc-table-row-collapsed'),
).toBeTruthy();
});

// https://github.com/ant-design/ant-design/issues/21788
it('`defaultExpandAllRows` with `childrenColumnName`', () => {
const data = [
{
key: 0,
sub: [{ key: 1, sub: [{ key: 2 }] }],
},
];
const wrapper = mount(
createTable({ data, childrenColumnName: 'sub', expandable: { defaultExpandAllRows: true } }),
);
expect(wrapper.find('tbody tr')).toHaveLength(3);
});
});