@mui/x-data-grid 5.6.1 → 5.7.0

package/hooks/features/editRows/useGridRowEditing.new.js

@@ -0,0 +1,486 @@
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import _toPropertyKey from "@babel/runtime/helpers/esm/toPropertyKey";
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import { useGridApiEventHandler, useGridApiOptionHandler } from '../../utils/useGridApiEventHandler';
+import { GridEvents } from '../../../models/events/gridEvents';
+import { GridEditModes, GridRowModes } from '../../../models/gridEditRowModel';
+import { useGridApiMethod } from '../../utils/useGridApiMethod';
+import { gridEditRowsStateSelector } from './gridEditRowsSelector';
+import { isPrintableKey } from '../../../utils/keyboardUtils';
+import { gridColumnFieldsSelector } from '../columns/gridColumnsSelector';
+import { GridRowEditStopReasons, GridRowEditStartReasons } from '../../../models/params/gridRowParams';
+export const useGridRowEditing = (apiRef, props) => {
+  const focusTimeout = React.useRef(null);
+  const nextFocusedCell = React.useRef(null);
+  const {
+    processRowUpdate
+  } = props;
+
+  const runIfEditModeIsRow = callback => (...args) => {
+    if (props.editMode === GridEditModes.Row) {
+      callback(...args);
+    }
+  };
+
+  const throwIfNotEditable = React.useCallback((id, field) => {
+    const params = apiRef.current.getCellParams(id, field);
+
+    if (!apiRef.current.isCellEditable(params)) {
+      throw new Error(`MUI: The cell with id=${id} and field=${field} is not editable.`);
+    }
+  }, [apiRef]);
+  const throwIfNotInMode = React.useCallback((id, mode) => {
+    if (apiRef.current.getRowMode(id) !== mode) {
+      throw new Error(`MUI: The row with id=${id} is not in ${mode} mode.`);
+    }
+  }, [apiRef]);
+  const handleCellDoubleClick = React.useCallback((params, event) => {
+    if (!params.isEditable) {
+      return;
+    }
+
+    if (apiRef.current.getRowMode(params.id) === GridRowModes.Edit) {
+      return;
+    }
+
+    const rowParams = apiRef.current.getRowParams(params.id);
+
+    const newParams = _extends({}, rowParams, {
+      field: params.field,
+      reason: GridRowEditStartReasons.cellDoubleClick
+    });
+
+    apiRef.current.publishEvent(GridEvents.rowEditStart, newParams, event);
+  }, [apiRef]);
+  const handleCellFocusIn = React.useCallback(params => {
+    nextFocusedCell.current = params;
+  }, []);
+  const handleCellFocusOut = React.useCallback((params, event) => {
+    if (!params.isEditable) {
+      return;
+    }
+
+    if (apiRef.current.getRowMode(params.id) === GridRowModes.View) {
+      return;
+    } // The mechanism to detect if we can stop editing a row is different from
+    // the cell editing. Instead of triggering it when clicking outside a cell,
+    // we must check if another cell in the same row was not clicked. To achieve
+    // that, first we keep track of all cells that gained focus. When a cell loses
+    // focus we check if the next cell that received focus is from a different row.
+
+
+    nextFocusedCell.current = null;
+    focusTimeout.current = setTimeout(() => {
+      var _nextFocusedCell$curr;
+
+      focusTimeout.current = null;
+
+      if (((_nextFocusedCell$curr = nextFocusedCell.current) == null ? void 0 : _nextFocusedCell$curr.id) !== params.id) {
+        const rowParams = apiRef.current.getRowParams(params.id);
+
+        const newParams = _extends({}, rowParams, {
+          field: params.field,
+          reason: GridRowEditStopReasons.rowFocusOut
+        });
+
+        apiRef.current.publishEvent(GridEvents.rowEditStop, newParams, event);
+      }
+    });
+  }, [apiRef]);
+  React.useEffect(() => {
+    return () => {
+      clearTimeout(focusTimeout.current);
+    };
+  }, []);
+  const handleCellKeyDown = React.useCallback((params, event) => {
+    if (params.cellMode === GridRowModes.Edit) {
+      let reason;
+
+      if (event.key === 'Escape') {
+        reason = GridRowEditStopReasons.escapeKeyDown;
+      } else if (event.key === 'Enter') {
+        reason = GridRowEditStopReasons.enterKeyDown;
+      } else if (event.key === 'Tab') {
+        const columnFields = gridColumnFieldsSelector(apiRef).filter(field => apiRef.current.isCellEditable(apiRef.current.getCellParams(params.id, field)));
+
+        if (event.shiftKey) {
+          if (params.field === columnFields[0]) {
+            // Exit if user pressed Shift+Tab on the first field
+            reason = GridRowEditStopReasons.shiftTabKeyDown;
+          }
+        } else if (params.field === columnFields[columnFields.length - 1]) {
+          // Exit if user pressed Tab on the last field
+          reason = GridRowEditStopReasons.tabKeyDown;
+        }
+
+        if (reason) {
+          event.preventDefault(); // Prevent going to the next element in the tab sequence
+        }
+      }
+
+      if (reason) {
+        const rowParams = apiRef.current.getRowParams(params.id);
+
+        const newParams = _extends({}, rowParams, {
+          reason,
+          field: params.field
+        });
+
+        apiRef.current.publishEvent(GridEvents.rowEditStop, newParams, event);
+      }
+    } else if (params.isEditable) {
+      let reason;
+
+      if (isPrintableKey(event.key)) {
+        if (event.shiftKey || event.ctrlKey || event.metaKey || event.altKey) {
+          return;
+        }
+
+        reason = GridRowEditStartReasons.printableKeyDown;
+      } else if (event.key === 'Enter') {
+        reason = GridRowEditStartReasons.enterKeyDown;
+      } else if (event.key === 'Delete') {
+        reason = GridRowEditStartReasons.deleteKeyDown;
+      }
+
+      if (reason) {
+        const rowParams = apiRef.current.getRowParams(params.id);
+
+        const newParams = _extends({}, rowParams, {
+          field: params.field,
+          reason
+        });
+
+        apiRef.current.publishEvent(GridEvents.rowEditStart, newParams, event);
+      }
+    }
+  }, [apiRef]);
+  const handleRowEditStart = React.useCallback((params, event) => {
+    const {
+      id,
+      field,
+      reason
+    } = params;
+    apiRef.current.startRowEditMode({
+      id,
+      fieldToFocus: field
+    });
+
+    if (reason === GridRowEditStartReasons.deleteKeyDown || reason === GridRowEditStartReasons.printableKeyDown) {
+      apiRef.current.setEditCellValue({
+        id,
+        field: field,
+        value: ''
+      }, event);
+    }
+  }, [apiRef]);
+  const handleRowEditStop = React.useCallback(params => {
+    const {
+      id,
+      reason,
+      field
+    } = params;
+    apiRef.current.unstable_runPendingEditCellValueMutation(id);
+    let cellToFocusAfter;
+
+    if (reason === GridRowEditStopReasons.enterKeyDown) {
+      cellToFocusAfter = 'below';
+    } else if (reason === GridRowEditStopReasons.tabKeyDown) {
+      cellToFocusAfter = 'right';
+    } else if (reason === GridRowEditStopReasons.shiftTabKeyDown) {
+      cellToFocusAfter = 'left';
+    }
+
+    let ignoreModifications = reason === 'escapeKeyDown';
+    const editingState = gridEditRowsStateSelector(apiRef.current.state);
+
+    if (!ignoreModifications) {
+      // The user wants to stop editing the cell but we can't wait for the props to be processed.
+      // In this case, discard the modifications if any field is processing its props.
+      ignoreModifications = Object.values(editingState[id]).some(fieldProps => {
+        return fieldProps.isProcessingProps;
+      });
+    }
+
+    apiRef.current.stopRowEditMode({
+      id,
+      ignoreModifications,
+      field,
+      cellToFocusAfter
+    });
+  }, [apiRef]);
+  useGridApiEventHandler(apiRef, GridEvents.cellDoubleClick, runIfEditModeIsRow(handleCellDoubleClick));
+  useGridApiEventHandler(apiRef, GridEvents.cellFocusIn, runIfEditModeIsRow(handleCellFocusIn));
+  useGridApiEventHandler(apiRef, GridEvents.cellFocusOut, runIfEditModeIsRow(handleCellFocusOut));
+  useGridApiEventHandler(apiRef, GridEvents.cellKeyDown, runIfEditModeIsRow(handleCellKeyDown));
+  useGridApiEventHandler(apiRef, GridEvents.rowEditStart, runIfEditModeIsRow(handleRowEditStart));
+  useGridApiEventHandler(apiRef, GridEvents.rowEditStop, runIfEditModeIsRow(handleRowEditStop));
+  useGridApiOptionHandler(apiRef, GridEvents.rowEditStart, props.onRowEditStart);
+  useGridApiOptionHandler(apiRef, GridEvents.rowEditStop, props.onRowEditStop);
+  const getRowMode = React.useCallback(id => {
+    if (props.editMode === GridEditModes.Cell) {
+      return GridRowModes.View;
+    }
+
+    const editingState = gridEditRowsStateSelector(apiRef.current.state);
+    const isEditing = editingState[id] && Object.keys(editingState[id]).length > 0;
+    return isEditing ? GridRowModes.Edit : GridRowModes.View;
+  }, [apiRef, props.editMode]);
+  const updateOrDeleteRowState = React.useCallback((id, newProps) => {
+    apiRef.current.setState(state => {
+      const newEditingState = _extends({}, state.editRows);
+
+      if (newProps !== null) {
+        newEditingState[id] = newProps;
+      } else {
+        delete newEditingState[id];
+      }
+
+      return _extends({}, state, {
+        editRows: newEditingState
+      });
+    });
+    apiRef.current.forceUpdate();
+  }, [apiRef]);
+  const updateOrDeleteFieldState = React.useCallback((id, field, newProps) => {
+    apiRef.current.setState(state => {
+      const newEditingState = _extends({}, state.editRows);
+
+      if (newProps !== null) {
+        newEditingState[id] = _extends({}, newEditingState[id], {
+          [field]: _extends({}, newProps)
+        });
+      } else {
+        delete newEditingState[id][field];
+
+        if (Object.keys(newEditingState[id]).length === 0) {
+          delete newEditingState[id];
+        }
+      }
+
+      return _extends({}, state, {
+        editRows: newEditingState
+      });
+    });
+    apiRef.current.forceUpdate();
+  }, [apiRef]);
+  const startRowEditMode = React.useCallback(params => {
+    const {
+      id,
+      fieldToFocus
+    } = params;
+    throwIfNotInMode(id, GridRowModes.View);
+
+    if (apiRef.current.getRowMode(id) === GridRowModes.Edit) {
+      throw new Error(`MUI: The cell with id=${id} is already in edit mode.`);
+    }
+
+    const columnFields = gridColumnFieldsSelector(apiRef);
+    const newProps = columnFields.reduce((acc, field) => {
+      const cellParams = apiRef.current.getCellParams(id, field);
+
+      if (!cellParams.isEditable) {
+        return acc;
+      }
+
+      acc[field] = {
+        value: apiRef.current.getCellValue(id, field),
+        error: false,
+        isProcessingProps: false
+      };
+      return acc;
+    }, {});
+    updateOrDeleteRowState(id, newProps);
+
+    if (fieldToFocus) {
+      apiRef.current.setCellFocus(id, fieldToFocus);
+    }
+  }, [apiRef, throwIfNotInMode, updateOrDeleteRowState]);
+  const stopRowEditMode = React.useCallback(params => {
+    const {
+      id,
+      ignoreModifications,
+      field: focusedField,
+      cellToFocusAfter = 'none'
+    } = params;
+    throwIfNotInMode(id, GridRowModes.Edit);
+    apiRef.current.unstable_runPendingEditCellValueMutation(id);
+
+    const updateFocusedCellIfNeeded = () => {
+      if (cellToFocusAfter !== 'none' && focusedField) {
+        apiRef.current.unstable_moveFocusToRelativeCell(id, focusedField, cellToFocusAfter);
+      }
+    };
+
+    if (ignoreModifications) {
+      updateFocusedCellIfNeeded();
+      updateOrDeleteRowState(id, null);
+      return;
+    }
+
+    const editingState = gridEditRowsStateSelector(apiRef.current.state);
+    const row = apiRef.current.getRow(id);
+    const isSomeFieldProcessingProps = Object.values(editingState[id]).some(fieldProps => fieldProps.isProcessingProps);
+
+    if (isSomeFieldProcessingProps) {
+      return;
+    }
+
+    const hasSomeFieldWithError = Object.values(editingState[id]).some(fieldProps => fieldProps.error);
+
+    if (hasSomeFieldWithError) {
+      return;
+    }
+
+    let rowUpdate = _extends({}, row);
+
+    Object.entries(editingState[id]).forEach(([field, fieldProps]) => {
+      const column = apiRef.current.getColumn(field);
+
+      if (column.valueSetter) {
+        rowUpdate = column.valueSetter({
+          value: fieldProps.value,
+          row: rowUpdate
+        });
+      } else {
+        rowUpdate[field] = fieldProps.value;
+      }
+    });
+
+    if (processRowUpdate) {
+      Promise.resolve(processRowUpdate(rowUpdate, row)).then(finalRowUpdate => {
+        apiRef.current.updateRows([finalRowUpdate]);
+        updateFocusedCellIfNeeded();
+        updateOrDeleteRowState(id, null);
+      });
+    } else {
+      apiRef.current.updateRows([rowUpdate]);
+      updateFocusedCellIfNeeded();
+      updateOrDeleteRowState(id, null);
+    }
+  }, [apiRef, processRowUpdate, throwIfNotInMode, updateOrDeleteRowState]);
+  const setRowEditingEditCellValue = React.useCallback(params => {
+    const {
+      id,
+      field,
+      value
+    } = params;
+    throwIfNotEditable(id, field);
+    const column = apiRef.current.getColumn(field);
+    const row = apiRef.current.getRow(id);
+    let parsedValue = value;
+
+    if (column.valueParser) {
+      parsedValue = column.valueParser(value, apiRef.current.getCellParams(id, field));
+    }
+
+    let editingState = gridEditRowsStateSelector(apiRef.current.state);
+
+    let newProps = _extends({}, editingState[id][field], {
+      value: parsedValue
+    });
+
+    if (!column.preProcessEditCellProps) {
+      updateOrDeleteFieldState(id, field, newProps);
+    }
+
+    return new Promise(resolve => {
+      const promises = [];
+
+      if (column.preProcessEditCellProps) {
+        const hasChanged = newProps.value !== editingState[id][field].value;
+        newProps = _extends({}, newProps, {
+          isProcessingProps: true
+        });
+        updateOrDeleteFieldState(id, field, newProps);
+
+        const _editingState$id = editingState[id],
+              otherFieldsProps = _objectWithoutPropertiesLoose(_editingState$id, [field].map(_toPropertyKey));
+
+        const promise = Promise.resolve(column.preProcessEditCellProps({
+          id,
+          row,
+          props: newProps,
+          hasChanged,
+          otherFieldsProps
+        })).then(processedProps => {
+          // Check again if the row is in edit mode because the user may have
+          // discarded the changes while the props were being processed.
+          if (apiRef.current.getRowMode(id) === GridRowModes.View) {
+            resolve(false);
+            return;
+          }
+
+          editingState = gridEditRowsStateSelector(apiRef.current.state);
+          processedProps = _extends({}, processedProps, {
+            isProcessingProps: false
+          }); // We don't reuse the value from the props pre-processing because when the
+          // promise resolves it may be already outdated. The only exception to this rule
+          // is when there's no pre-processing.
+
+          processedProps.value = column.preProcessEditCellProps ? editingState[id][field].value : parsedValue;
+          updateOrDeleteFieldState(id, field, processedProps);
+        });
+        promises.push(promise);
+      }
+
+      Object.entries(editingState[id]).forEach(([thisField, fieldProps]) => {
+        if (thisField === field) {
+          return;
+        }
+
+        const fieldColumn = apiRef.current.getColumn(thisField);
+
+        if (!fieldColumn.preProcessEditCellProps) {
+          return;
+        }
+
+        fieldProps = _extends({}, fieldProps, {
+          isProcessingProps: true
+        });
+        updateOrDeleteFieldState(id, thisField, fieldProps);
+        editingState = gridEditRowsStateSelector(apiRef.current.state);
+
+        const _editingState$id2 = editingState[id],
+              otherFieldsProps = _objectWithoutPropertiesLoose(_editingState$id2, [thisField].map(_toPropertyKey));
+
+        const promise = Promise.resolve(fieldColumn.preProcessEditCellProps({
+          id,
+          row,
+          props: fieldProps,
+          hasChanged: false,
+          otherFieldsProps
+        })).then(processedProps => {
+          // Check again if the row is in edit mode because the user may have
+          // discarded the changes while the props were being processed.
+          if (apiRef.current.getRowMode(id) === GridRowModes.View) {
+            resolve(false);
+            return;
+          }
+
+          processedProps = _extends({}, processedProps, {
+            isProcessingProps: false
+          });
+          updateOrDeleteFieldState(id, thisField, processedProps);
+        });
+        promises.push(promise);
+      });
+      Promise.all(promises).then(() => {
+        if (apiRef.current.getRowMode(id) === GridRowModes.Edit) {
+          editingState = gridEditRowsStateSelector(apiRef.current.state);
+          resolve(!editingState[id][field].error);
+        } else {
+          resolve(false);
+        }
+      });
+    });
+  }, [apiRef, throwIfNotEditable, updateOrDeleteFieldState]);
+  const editingApi = {
+    getRowMode,
+    startRowEditMode,
+    stopRowEditMode,
+    unstable_setRowEditingEditCellValue: setRowEditingEditCellValue
+  };
+  useGridApiMethod(apiRef, editingApi, 'EditingApi');
+};

package/hooks/features/editRows/{useGridRowEditing.js → useGridRowEditing.old.js}

@@ -4,7 +4,7 @@ import { useEventCallback } from '@mui/material/utils';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { GridRowModes, GridEditModes, GridCellModes } from '../../../models/gridEditRowModel';
 import { useGridSelector } from '../../utils/useGridSelector';
-import { gridColumnFieldsSelector } from '../columns/gridColumnsSelector';
+import { gridColumnDefinitionsSelector } from '../columns/gridColumnsSelector';
 import { gridEditRowsStateSelector } from './gridEditRowsSelector';
 import { GridEvents } from '../../../models/events/gridEvents';
 import { gridFocusCellSelector } from '../focus/gridFocusStateSelector';
@@ -14,7 +14,7 @@ export const useGridRowEditing = (apiRef, props) => {
 
   const focusTimeout = React.useRef(null);
   const nextFocusedCell = React.useRef(null);
-  const columnFields = useGridSelector(apiRef, gridColumnFieldsSelector);
+  const columns = useGridSelector(apiRef, gridColumnDefinitionsSelector);
 
   const buildCallback = callback => (...args) => {
     if (props.editMode === GridEditModes.Row) {
@@ -32,11 +32,11 @@ export const useGridRowEditing = (apiRef, props) => {
 
       if (mode === GridRowModes.Edit) {
         newEditRowsState[id] = {};
-        columnFields.forEach(field => {
-          const cellParams = apiRef.current.getCellParams(id, field);
+        columns.forEach(column => {
+          const cellParams = apiRef.current.getCellParams(id, column.field);
 
           if (cellParams.isEditable) {
-            newEditRowsState[id][field] = {
+            newEditRowsState[id][column.field] = {
               value: cellParams.value
             };
           }
@@ -50,7 +50,7 @@ export const useGridRowEditing = (apiRef, props) => {
       });
     });
     apiRef.current.forceUpdate();
-  }, [apiRef, columnFields]);
+  }, [apiRef, columns]);
   const getRowMode = React.useCallback(id => {
     if (props.editMode === GridEditModes.Cell) {
       return GridRowModes.View;
@@ -66,7 +66,7 @@ export const useGridRowEditing = (apiRef, props) => {
       throw new Error(`MUI: You can't commit changes when the edit mode is 'cell'.`);
     }
 
-    apiRef.current.unstable_runPendingEditCellValueChangeDebounce(id);
+    apiRef.current.unstable_runPendingEditCellValueMutation(id);
     const model = apiRef.current.getEditRowsModel();
     const editRowProps = model[id];
 

package/hooks/features/filter/gridFilterState.d.ts

@@ -33,10 +33,7 @@ export interface GridFilterInitialState {
  * @param {(filterItem: GridFilterItem) => boolean} shouldApplyItem An optional callback to allow the filtering engine to only apply some items.
  */
 export declare type GridAggregatedFilterItemApplier = (rowId: GridRowId, shouldApplyItem?: (filterItem: GridFilterItem) => boolean) => boolean;
-export interface GridFilteringParams {
+export interface GridFilteringMethodParams {
     isRowMatchingFilters: GridAggregatedFilterItemApplier | null;
 }
-export declare type GridFilteringMethod = (params: GridFilteringParams) => Omit<GridFilterState, 'filterModel'>;
-export declare type GridFilteringMethodCollection = {
-    [methodName: string]: GridFilteringMethod;
-};
+export declare type GridFilteringMethodValue = Omit<GridFilterState, 'filterModel'>;

package/hooks/features/filter/useGridFilter.d.ts

@@ -8,4 +8,4 @@ export declare const filterStateInitializer: GridStateInitializer<Pick<DataGridP
  * @requires useGridParamsApi (method)
  * @requires useGridRows (event)
  */
-export declare const useGridFilter: (apiRef: React.MutableRefObject<GridApiCommunity>, props: Pick<DataGridProcessedProps, 'initialState' | 'filterModel' | 'onFilterModelChange' | 'filterMode' | 'disableMultipleColumnsFiltering'>) => void;
+export declare const useGridFilter: (apiRef: React.MutableRefObject<GridApiCommunity>, props: Pick<DataGridProcessedProps, 'initialState' | 'filterModel' | 'onFilterModelChange' | 'filterMode' | 'disableMultipleColumnsFiltering' | 'components' | 'componentsProps'>) => void;

package/hooks/features/filter/useGridFilter.js

@@ -10,10 +10,11 @@ import { GridPreferencePanelsValue } from '../preferencesPanel/gridPreferencePan
 import { getDefaultGridFilterModel } from './gridFilterState';
 import { gridFilterModelSelector, gridVisibleSortedRowEntriesSelector } from './gridFilterSelector';
 import { useFirstRender } from '../../utils/useFirstRender';
-import { gridRowIdsSelector, gridRowGroupingNameSelector } from '../rows';
+import { gridRowIdsSelector } from '../rows';
 import { useGridRegisterPreProcessor } from '../../core/preProcessing';
-import { useGridRegisterFilteringMethod } from './useGridRegisterFilteringMethod';
+import { GRID_DEFAULT_STRATEGY, useGridRegisterStrategyProcessor } from '../../core/strategyProcessing';
 import { buildAggregatedFilterApplier, sanitizeFilterModel, mergeStateWithFilterModel } from './gridFilterUtils';
+import { jsx as _jsx } from "react/jsx-runtime";
 export const filterStateInitializer = (state, props, apiRef) => {
   var _ref, _props$filterModel, _props$initialState, _props$initialState$f;
 
@@ -33,9 +34,9 @@ export const filterStateInitializer = (state, props, apiRef) => {
  */
 
 export const useGridFilter = (apiRef, props) => {
+  var _props$componentsProp2;
+
   const logger = useGridLogger(apiRef, 'useGridFilter');
-  const filteringMethodCollectionRef = React.useRef({});
-  const lastFilteringMethodApplied = React.useRef(null);
   apiRef.current.unstable_updateControlState({
     stateId: 'filter',
     propModel: props.filterModel,
@@ -49,17 +50,9 @@ export const useGridFilter = (apiRef, props) => {
 
   const applyFilters = React.useCallback(() => {
     apiRef.current.setState(state => {
-      const rowGroupingName = gridRowGroupingNameSelector(state, apiRef.current.instanceId);
-      const filteringMethod = filteringMethodCollectionRef.current[rowGroupingName];
-
-      if (!filteringMethod) {
-        throw new Error('MUI: Invalid filtering method.');
-      }
-
       const filterModel = gridFilterModelSelector(state, apiRef.current.instanceId);
       const isRowMatchingFilters = props.filterMode === GridFeatureModeConstant.client ? buildAggregatedFilterApplier(filterModel, apiRef) : null;
-      lastFilteringMethodApplied.current = filteringMethod;
-      const filteringResult = filteringMethod({
+      const filteringResult = apiRef.current.unstable_applyStrategyProcessor('filtering', {
         isRowMatchingFilters
       });
       return _extends({}, state, {
@@ -194,6 +187,16 @@ export const useGridFilter = (apiRef, props) => {
       callbacks: [...params.callbacks, apiRef.current.unstable_applyFilters]
     });
   }, [apiRef, props.disableMultipleColumnsFiltering]);
+  const preferencePanelPreProcessing = React.useCallback((initialValue, value) => {
+    if (value === GridPreferencePanelsValue.filters) {
+      var _props$componentsProp;
+
+      const FilterPanel = props.components.FilterPanel;
+      return /*#__PURE__*/_jsx(FilterPanel, _extends({}, (_props$componentsProp = props.componentsProps) == null ? void 0 : _props$componentsProp.filterPanel));
+    }
+
+    return initialValue;
+  }, [props.components.FilterPanel, (_props$componentsProp2 = props.componentsProps) == null ? void 0 : _props$componentsProp2.filterPanel]);
   const flatFilteringMethod = React.useCallback(params => {
     if (props.filterMode === GridFeatureModeConstant.client && params.isRowMatchingFilters) {
       const rowIds = gridRowIdsSelector(apiRef);
@@ -220,7 +223,8 @@ export const useGridFilter = (apiRef, props) => {
   }, [apiRef, props.filterMode]);
   useGridRegisterPreProcessor(apiRef, 'exportState', stateExportPreProcessing);
   useGridRegisterPreProcessor(apiRef, 'restoreState', stateRestorePreProcessing);
-  useGridRegisterFilteringMethod(apiRef, 'none', flatFilteringMethod);
+  useGridRegisterPreProcessor(apiRef, 'preferencePanel', preferencePanelPreProcessing);
+  useGridRegisterStrategyProcessor(apiRef, GRID_DEFAULT_STRATEGY, 'filtering', flatFilteringMethod);
   /**
    * EVENTS
    */
@@ -237,30 +241,20 @@ export const useGridFilter = (apiRef, props) => {
       }));
     }
   }, [apiRef, logger]);
-  const handlePreProcessorRegister = React.useCallback(name => {
-    if (name !== 'filteringMethod') {
-      return;
-    }
-
-    filteringMethodCollectionRef.current = apiRef.current.unstable_applyPreProcessors('filteringMethod', {});
-    const rowGroupingName = gridRowGroupingNameSelector(apiRef);
-
-    if (lastFilteringMethodApplied.current !== filteringMethodCollectionRef.current[rowGroupingName]) {
+  const handleStrategyProcessorChange = React.useCallback(methodName => {
+    if (methodName === 'filtering') {
       apiRef.current.unstable_applyFilters();
     }
   }, [apiRef]);
   useGridApiEventHandler(apiRef, GridEvents.rowsSet, apiRef.current.unstable_applyFilters);
   useGridApiEventHandler(apiRef, GridEvents.rowExpansionChange, apiRef.current.unstable_applyFilters);
   useGridApiEventHandler(apiRef, GridEvents.columnsChange, handleColumnsChange);
-  useGridApiEventHandler(apiRef, GridEvents.preProcessorRegister, handlePreProcessorRegister);
+  useGridApiEventHandler(apiRef, GridEvents.activeStrategyProcessorChange, handleStrategyProcessorChange);
   /**
    * 1ST RENDER
    */
 
   useFirstRender(() => {
-    // This line of pre-processor initialization should always come after the registration of `flatFilteringMethod`
-    // Otherwise on the 1st render there would be no filtering method registered
-    filteringMethodCollectionRef.current = apiRef.current.unstable_applyPreProcessors('filteringMethod', {});
     apiRef.current.unstable_applyFilters();
   });
   /**

package/hooks/features/focus/useGridFocus.d.ts

@@ -8,4 +8,4 @@ export declare const focusStateInitializer: GridStateInitializer;
  * @requires useGridRows (method)
  * @requires useGridEditing (event)
  */
-export declare const useGridFocus: (apiRef: React.MutableRefObject<GridApiCommunity>, props: Pick<DataGridProcessedProps, 'rows'>) => void;
+export declare const useGridFocus: (apiRef: React.MutableRefObject<GridApiCommunity>, props: Pick<DataGridProcessedProps, 'rows' | 'pagination' | 'paginationMode'>) => void;