mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-07 17:44:35 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix: Table should not crash with empty column children (#20703)

Browse Source
This commit is contained in:
二货机器人 2020-01-06 20:28:47 +08:00 committed by GitHub
parent c5a40fc683
commit 1c1a4a773d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/table/__tests__/Table.test.js
View File

@ -142,4 +142,18 @@ describe('Table', () => {
wrapper.find('th').simulate('click');
expect(onClick).toHaveBeenCalled();
});
it('should not crash when column children is empty', () => {
mount(
<Table
columns={[
{
dataIndex: 'name',
children: undefined,
},
]}
dataSource={[]}
/>,
);
});
});

2
components/table/hooks/useFilter/index.tsx
View File

@ -27,7 +27,7 @@ function collectFilterStates<RecordType>(
): FilterState<RecordType>[] {
let filterStates: FilterState<RecordType>[] = [];
columns.forEach((column, index) => {
(columns || []).forEach((column, index) => {
const columnPos = getColumnPos(index, pos);
if ('children' in column) {

4
components/table/hooks/useSorter.tsx
View File

@ -54,7 +54,7 @@ function collectSortStates<RecordType>(
): SortState<RecordType>[] {
let sortStates: SortState<RecordType>[] = [];
columns.forEach((column, index) => {
(columns || []).forEach((column, index) => {
const columnPos = getColumnPos(index, pos);
if ('children' in column) {
@ -91,7 +91,7 @@ function injectSorter<RecordType>(
defaultSortDirections: SortOrder[],
pos?: string,
): ColumnsType<RecordType> {
return columns.map((column, index) => {
return (columns || []).map((column, index) => {
const columnPos = getColumnPos(index, pos);
let newColumn: ColumnsType<RecordType>[number] = column;

1
components/table/interface.tsx
View File

@ -63,7 +63,6 @@ export interface ColumnType<RecordType> extends RcColumnType<RecordType> {
title?: ColumnTitle<RecordType>;
// Sorter
// TODO: Doc this update
sorter?:
| boolean
| CompareFn<RecordType>