Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(table): fix row list incorrect when filter column may have been removed or use a new key #38982

Merged
merged 3 commits into from Nov 25, 2022
Merged

fix(table): fix row list incorrect when filter column may have been removed or use a new key #38982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4a50f4
fix(table): fix filter state when reset columns
yoyo837 Nov 25, 2022
031d053
fix(table): Fix the problem that the old filter state still takes eff…
yoyo837 Nov 25, 2022
ac57e86
test: add test case
yoyo837 Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
185 changes: 184 additions & 1 deletion components/table/__tests__/Table.filter.test.tsx
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ import Select from '../../select';
import Tooltip from '../../tooltip';
import type { SelectProps } from '../../select';
import type { ColumnGroupType, ColumnType, TableProps } from '..';
import type { ColumnFilterItem, FilterDropdownProps, FilterValue } from '../interface';
import type { ColumnFilterItem, FilterDropdownProps, FilterValue, ColumnsType } from '../interface';
import { resetWarned } from '../../_util/warning';
import type { TreeColumnFilterItem } from '../hooks/useFilter/FilterDropdown';

Expand Down Expand Up @@ -1826,6 +1826,189 @@ describe('Table.filter', () => {
);
});

it('Columns with filters should filter correctly after reset it.', () => {
interface DataType {
key: React.Key;
name?: string;
name1?: string;
age?: number;
address?: string;
}

const columns: ColumnsType<DataType> = [
{
title: 'Name',
dataIndex: 'name',
filters: [
{
text: 'Joe',
value: 'Joe',
},
{
text: 'Jim',
value: 'Jim',
},
{
text: 'Submenu',
value: 'Submenu',
children: [
{
text: 'Green',
value: 'Green',
},
{
text: 'Black',
value: 'Black',
},
],
},
],
// specify the condition of filtering result
// here is that finding the name started with `value`
onFilter: (value: string, record) => record.name?.indexOf(value) === 0,
sorter: (a, b) => a.name!.length - b.name!.length,
sortDirections: ['descend'],
},
{
title: 'Age',
dataIndex: 'age',
defaultSortOrder: 'descend',
sorter: (a, b) => a.age! - b.age!,
},
{
title: 'Address',
dataIndex: 'address',
filters: [
{
text: 'London',
value: 'London',
},
{
text: 'New York',
value: 'New York',
},
],
onFilter: (value: string, record) => record.address?.indexOf(value) === 0,
},
];

const App: React.FC = () => {
const [ddd, setData] = React.useState<Array<DataType>>([
{
key: '1',
name: 'John Brown',
age: 32,
address: 'New York No. 1 Lake Park',
},
{
key: '2',
name: 'Jim Green',
age: 42,
address: 'London No. 1 Lake Park',
},
{
key: '3',
name: 'Joe Black',
age: 32,
address: 'Sidney No. 1 Lake Park',
},
{
key: '4',
name: 'Jim Red',
age: 32,
address: 'London No. 2 Lake Park',
},
]);
const [cs, setCs] = React.useState(columns);

const handleClick = () => {
setCs([
{
title: 'name1',
dataIndex: 'name1',
},
{
title: 'Address',
dataIndex: 'address',
filters: [
{
text: 'London',
value: 'London',
},
{
text: 'New York',
value: 'New York',
},
],
onFilter: (value: string, record) => record.address?.indexOf(value) === 0,
},
]);
setData([
{
key: '1',
name1: 'Joe Brown',
address: 'New York No. 1 Lake Park',
},
{
key: '2',
name1: 'Jim Green',
address: 'London No. 1 Lake Park',
},
{
key: '3',
name1: 'Joe Black',
address: 'Sidney No. 1 Lake Park',
},
{
key: '4',
name1: 'Jim Red',
address: 'London No. 2 Lake Park',
},
]);
};

return (
<div>
<span className="rest-btn" onClick={handleClick}>
refresh
</span>
<Table columns={cs} dataSource={ddd} />
</div>
);
};

const { container } = render(<App />);

expect(container.querySelectorAll('.ant-table-tbody .ant-table-row').length).toEqual(4);
// Open
fireEvent.click(container.querySelector('.ant-table-filter-trigger')!);
function getFilterMenu() {
return container.querySelector('.ant-table-filter-dropdown');
}
// Seems raf not trigger when in useEffect for async update
// Need trigger multiple times
function refreshTimer() {
for (let i = 0; i < 3; i += 1) {
act(() => {
jest.runAllTimers();
});
}
}

const items = getFilterMenu()?.querySelectorAll('li.ant-dropdown-menu-item');
fireEvent.click(items?.[0]!);
fireEvent.click(
getFilterMenu()?.querySelector('.ant-table-filter-dropdown-btns .ant-btn-primary')!,
);
refreshTimer();

expect(container.querySelectorAll('.ant-table-tbody .ant-table-row').length).toEqual(1);

fireEvent.click(container.querySelector('.rest-btn')!);

expect(container.querySelectorAll('.ant-table-tbody .ant-table-row').length).toEqual(4);
});

describe('filter tree mode', () => {
it('supports filter tree', () => {
jest.spyOn(console, 'error').mockImplementation(() => undefined);
Expand Down
9 changes: 8 additions & 1 deletion components/table/hooks/useFilter/index.tsx
View file
Open in desktop
Expand Up @@ -211,6 +211,9 @@ function useFilter<RecordType>({

const mergedFilterStates = React.useMemo(() => {
const collectedStates = collectFilterStates(mergedColumns, false);
if (collectedStates.length === 0) {
return collectedStates;
}
let filteredKeysIsAllNotControlled = true;
let filteredKeysIsAllControlled = true;
collectedStates.forEach(({ filteredKeys }) => {
Expand All @@ -223,7 +226,11 @@ function useFilter<RecordType>({

// Return if not controlled
if (filteredKeysIsAllNotControlled) {
return filterStates;
// Filter column may have been removed
const keyList = (mergedColumns || []).map((column, index) =>
getColumnKey(column, getColumnPos(index)),
);
return filterStates.filter(({ key }) => keyList.includes(key));
}

warning(
Expand Down