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.

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

fix(Table): the onFilter methods of column adds ability to filter children #47170

Merged
merged 1 commit into from
Jan 27, 2024
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion components/table/InternalTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ const InternalTable = <RecordType extends AnyObject = AnyObject>(
currentDataSource: getFilterData(
getSortData(rawData, changeInfo.sorterStates!, childrenColumnName),
changeInfo.filterStates!,
childrenColumnName,
),
action,
});
Expand Down Expand Up @@ -355,7 +356,7 @@ const InternalTable = <RecordType extends AnyObject = AnyObject>(
getPopupContainer: getPopupContainer || getContextPopupContainer,
rootClassName: classNames(rootClassName, rootCls),
});
const mergedData = getFilterData(sortedData, filterStates);
const mergedData = getFilterData(sortedData, filterStates, childrenColumnName);

changeEventInfo.filters = filters;
changeEventInfo.filterStates = filterStates;
Expand Down
41 changes: 41 additions & 0 deletions components/table/__tests__/Table.filter.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,47 @@ describe('Table.filter', () => {
expect(container.querySelectorAll('tbody tr').length).toBe(4);
});

it('can filter children by defaultFilteredValue', async () => {
const { container } = render(
createTable({
columns: [
{
...column,
defaultFilteredValue: ['Jim', 'Tom'],
onFilter: (value: string, record) => {
if (record.children && record.children.length) {
return true;
}
return record.name.includes(value);
},
},
],
dataSource: [
{
key: '0',
name: 'Jack',
children: [
{ key: '0-1', name: 'Jim' },
{ key: '0-2', name: 'Tony' },
],
},
{ key: '1', name: 'Lucy' },
{ key: '2', name: 'Tom' },
{ key: '3', name: 'Jerry' },
],
expandable: {
defaultExpandAllRows: true,
},
}),
);

expect([...container.querySelectorAll('tbody tr')].map((item) => item.textContent)).toEqual([
'Jack',
'Jim',
'Tom',
]);
});

// Warning: An update to Item ran an effect, but was not wrapped in act(...).
it('fires change event', () => {
const handleChange = jest.fn();
Expand Down
30 changes: 23 additions & 7 deletions components/table/hooks/useFilter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,20 +157,36 @@ function generateFilterInfo<RecordType>(filterStates: FilterState<RecordType>[])
export function getFilterData<RecordType>(
data: RecordType[],
filterStates: FilterState<RecordType>[],
childrenColumnName: string,
) {
return filterStates.reduce((currentData, filterState) => {
const {
column: { onFilter, filters },
filteredKeys,
} = filterState;
if (onFilter && filteredKeys && filteredKeys.length) {
return currentData.filter((record) =>
filteredKeys.some((key) => {
const keys = flattenKeys(filters);
const keyIndex = keys.findIndex((k) => String(k) === String(key));
const realKey = keyIndex !== -1 ? keys[keyIndex] : key;
return onFilter(realKey, record);
}),
return (
currentData
// shallow copy
.map((record) => ({ ...record }))
.filter((record: any) =>
filteredKeys.some((key) => {
const keys = flattenKeys(filters);
const keyIndex = keys.findIndex((k) => String(k) === String(key));
const realKey = keyIndex !== -1 ? keys[keyIndex] : key;

// filter children
if (record[childrenColumnName]) {
record[childrenColumnName] = getFilterData(
afc163 marked this conversation as resolved.
Show resolved Hide resolved
record[childrenColumnName],
filterStates,
childrenColumnName,
);
}

return onFilter(realKey, record);
}),
)
);
}
return currentData;
Expand Down