Fix checkbox selection is keeping selection when filtering

mui · Jan 19, 2024 · 6b1f42e · 6b1f42e
1 parent c710c86
commit 6b1f42e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/packages/grid/x-data-grid/src/hooks/features/rowSelection/useGridRowSelection.ts b/packages/grid/x-data-grid/src/hooks/features/rowSelection/useGridRowSelection.ts
@@ -18,7 +18,10 @@ import {
 } from './gridRowSelectionSelector';
 import { gridPaginatedVisibleSortedGridRowIdsSelector } from '../pagination';
 import { gridFocusCellSelector } from '../focus/gridFocusStateSelector';
-import { gridExpandedSortedRowIdsSelector } from '../filter/gridFilterSelector';
+import {
+  gridExpandedSortedRowIdsSelector,
+  gridFilterModelSelector,
+} from '../filter/gridFilterSelector';
 import { GRID_CHECKBOX_SELECTION_COL_DEF, GRID_ACTIONS_COLUMN_TYPE } from '../../../colDef';
 import { GridCellModes } from '../../../models/gridEditRowModel';
 import { isKeyboardEvent, isNavigationKey } from '../../../utils/keyboardUtils';
@@ -445,7 +448,9 @@ export const useGridRowSelection = (
         ? gridPaginatedVisibleSortedGridRowIdsSelector(apiRef)
         : gridExpandedSortedRowIdsSelector(apiRef);
 
-      apiRef.current.selectRows(rowsToBeSelected, params.value);
+      const filterModel = gridFilterModelSelector(apiRef);
+
+      apiRef.current.selectRows(rowsToBeSelected, params.value, filterModel?.items.length > 0);
     },
     [apiRef, props.checkboxSelectionVisibleOnly, props.pagination],
   );