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

[data grid] onFilterModelChange fires with stale field value #10711

Closed
wants to merge 11 commits into from
Closed

[data grid] onFilterModelChange fires with stale field value #10711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3d0a814
fix: reset the value filed when the filter model changes
gitstart Oct 18, 2023
7114d1c
Merge commit 'be453d20cac2cd4849df41c3dd0733f8b442e196' of https://gi…
gitstart Oct 19, 2023
0805ab3
fix: update tests
gitstart Oct 19, 2023
52008cd
Merge commit '79bbfa6e80ec286805d33901a764a23e136360d1' of https://gi…
gitstart Oct 19, 2023
b3eaf63
fix: update tests
gitstart Oct 19, 2023
f1f0cdc
Merge commit '522721c224fdf95879dc3d98416a5863e3f133a1' of https://gi…
gitstart Oct 19, 2023
90224db
fix: update tests
gitstart Oct 19, 2023
583b6e8
Merge commit '7d2ecd9265a5a5716640fd36af92ccf054b7fa13' of https://gi…
gitstart Oct 19, 2023
8a8f01b
fix: update tests
gitstart Oct 19, 2023
eca4beb
fix: update tests
gitstart Oct 19, 2023
152803a
Merge commit '391351c5041e6c8450df9111c87534957401266e' of https://gi…
gitstart Oct 19, 2023
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
2 changes: 1 addition & 1 deletion packages/grid/x-data-grid/src/components/panel/filterPanel/GridFilterForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ const GridFilterForm = React.forwardRef<HTMLDivElement, GridFilterFormProps>(
...item,
field,
operator: newOperator.value,
value: eraseItemValue ? undefined : item.value,
value: eraseItemValue ? undefined : '',
});
},
[apiRef, applyFilterChanges, item, currentColumn, currentOperator],
Expand Down
8 changes: 4 additions & 4 deletions packages/grid/x-data-grid/src/tests/filterPanel.DataGrid.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ describe('<DataGrid /> - Filter panel', () => {

setColumnValue('slogan');

expect(getColumnValues(0)).to.deep.equal([]);
expect(getColumnValues(0)).to.deep.equal(['Nike', 'Adidas', 'Puma']);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into it!
While the fix is quite simple, it changed the filtering behavior in some valid use cases - this is why you had to update a few unit tests for them to pass.

Instead of always resetting the filter value, did you consider other options?
For example, resetting the filter value only if the type of the filtered column changes.
What do you think?

expect(screen.getByRole<HTMLSelectElement>('combobox', { name: 'Operator' }).value).to.equal(
'equals',
);
expect(screen.getByRole<HTMLInputElement>('textbox', { name: 'Value' }).value).to.equal('Puma');
expect(screen.getByRole<HTMLInputElement>('textbox', { name: 'Value' }).value).to.equal('');
});

it('should reset value if operator is not available for the new column', () => {
Expand Down Expand Up @@ -341,7 +341,7 @@ describe('<DataGrid /> - Filter panel', () => {

setColumnValue('origin');

expect(getColumnValues(0)).to.deep.equal(['REF_2', 'REF_3']);
expect(getColumnValues(0)).to.deep.equal(['REF_1', 'REF_2', 'REF_3']);
});

it('should reset filter value if not available in the new valueOptions with operator "isAnyOf"', () => {
Expand Down Expand Up @@ -412,7 +412,7 @@ describe('<DataGrid /> - Filter panel', () => {

expect(getColumnValues(0)).to.deep.equal(['REF_1']);
setColumnValue('origin');
expect(getColumnValues(0)).to.deep.equal(['REF_2', 'REF_3']);
expect(getColumnValues(0)).to.deep.equal(['REF_1', 'REF_2', 'REF_3']);
});

it('should reset filter value if moving from multiple to single value operator', () => {
Expand Down
Loading