[DataGrid] Fix delete filter inconsistent behavior (#13353)

Co-authored-by: Andrew Cherniavskyi <[email protected]>
mui · Jul 12, 2024 · c0af84d · c0af84d
1 parent ee1ce3e
commit c0af84d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/packages/x-data-grid/src/components/panel/filterPanel/GridFilterForm.tsx b/packages/x-data-grid/src/components/panel/filterPanel/GridFilterForm.tsx
@@ -399,16 +399,7 @@ const GridFilterForm = React.forwardRef<HTMLDivElement, GridFilterFormProps>(
     );
 
     const handleDeleteFilter = () => {
-      if (rootProps.disableMultipleColumnsFiltering) {
-        if (item.value === undefined) {
-          deleteFilter(item);
-        } else {
-          // TODO v6: simplify the behavior by always remove the filter form
-          applyFilterChanges({ ...item, value: undefined });
-        }
-      } else {
-        deleteFilter(item);
-      }
+      deleteFilter(item);
     };
 
     React.useImperativeHandle(

diff --git a/packages/x-data-grid/src/tests/filterPanel.DataGrid.test.tsx b/packages/x-data-grid/src/tests/filterPanel.DataGrid.test.tsx
@@ -466,10 +466,6 @@ describe('<DataGrid /> - Filter panel', () => {
     );
     expect(screen.queryAllByRole('tooltip').length).to.deep.equal(1);
 
-    // TODO v6: remove the next two lines
-    deleteFilterForm();
-    expect(onFilterModelChange.lastCall.args[0].items[0].value).to.equal(undefined);
-
     deleteFilterForm();
     clock.tick(100);
     expect(screen.queryAllByRole('tooltip').length).to.deep.equal(0);