@mui/x-data-grid 6.18.0 → 7.0.0-alpha.0

package/modern/colDef/gridNumericColDef.js

@@ -3,7 +3,6 @@ import { gridNumberComparator } from '../hooks/features/sorting/gridSortingUtils
 import { isNumber } from '../utils/utils';
 import { getGridNumericOperators, getGridNumericQuickFilterFn } from './gridNumericOperators';
 import { GRID_STRING_COL_DEF } from './gridStringColDef';
-import { convertQuickFilterV7ToLegacy } from './utils';
 export const GRID_NUMERIC_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
   type: 'number',
   align: 'right',
@@ -14,6 +13,5 @@ export const GRID_NUMERIC_COL_DEF = _extends({}, GRID_STRING_COL_DEF, {
     value
   }) => isNumber(value) ? value.toLocaleString() : value || '',
   filterOperators: getGridNumericOperators(),
-  getApplyQuickFilterFn: convertQuickFilterV7ToLegacy(getGridNumericQuickFilterFn),
-  getApplyQuickFilterFnV7: getGridNumericQuickFilterFn
+  getApplyQuickFilterFn: getGridNumericQuickFilterFn
 });

package/modern/colDef/gridNumericOperators.js

@@ -1,23 +1,22 @@
 import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilterInputValue';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
-import { convertLegacyOperators, tagInternalFilter } from './utils';
 const parseNumericValue = value => {
   if (value == null) {
     return null;
   }
   return Number(value);
 };
-export const getGridNumericQuickFilterFn = tagInternalFilter(value => {
+export const getGridNumericQuickFilterFn = value => {
   if (value == null || Number.isNaN(value) || value === '') {
     return null;
   }
   return columnValue => {
     return parseNumericValue(columnValue) === parseNumericValue(value);
   };
-});
-export const getGridNumericOperators = () => convertLegacyOperators([{
+};
+export const getGridNumericOperators = () => [{
   value: '=',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -31,7 +30,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '!=',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -45,7 +44,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '>',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -62,7 +61,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '>=',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -79,7 +78,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '<',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -96,7 +95,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: '<=',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || Number.isNaN(filterItem.value)) {
       return null;
     }
@@ -113,7 +112,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   }
 }, {
   value: 'isEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value == null;
     };
@@ -121,7 +120,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   requiresFilterValue: false
 }, {
   value: 'isNotEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value != null;
     };
@@ -129,7 +128,7 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   requiresFilterValue: false
 }, {
   value: 'isAnyOf',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
       return null;
     }
@@ -141,4 +140,4 @@ export const getGridNumericOperators = () => convertLegacyOperators([{
   InputComponentProps: {
     type: 'number'
   }
-}]);
+}];

package/modern/colDef/gridSingleSelectOperators.js

@@ -1,16 +1,15 @@
 import { GridFilterInputSingleSelect } from '../components/panel/filterPanel/GridFilterInputSingleSelect';
 import { GridFilterInputMultipleSingleSelect } from '../components/panel/filterPanel/GridFilterInputMultipleSingleSelect';
 import { isObject } from '../utils/utils';
-import { convertLegacyOperators } from './utils';
 const parseObjectValue = value => {
   if (value == null || !isObject(value)) {
     return value;
   }
   return value.value;
 };
-export const getGridSingleSelectOperators = () => convertLegacyOperators([{
+export const getGridSingleSelectOperators = () => [{
   value: 'is',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || filterItem.value === '') {
       return null;
     }
@@ -19,7 +18,7 @@ export const getGridSingleSelectOperators = () => convertLegacyOperators([{
   InputComponent: GridFilterInputSingleSelect
 }, {
   value: 'not',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (filterItem.value == null || filterItem.value === '') {
       return null;
     }
@@ -28,7 +27,7 @@ export const getGridSingleSelectOperators = () => convertLegacyOperators([{
   InputComponent: GridFilterInputSingleSelect
 }, {
   value: 'isAnyOf',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
       return null;
     }
@@ -36,4 +35,4 @@ export const getGridSingleSelectOperators = () => convertLegacyOperators([{
     return value => filterItemValues.includes(parseObjectValue(value));
   },
   InputComponent: GridFilterInputMultipleSingleSelect
-}]);
+}];

package/modern/colDef/gridStringColDef.js

@@ -1,7 +1,6 @@
 import { renderEditInputCell } from '../components/cell/GridEditInputCell';
 import { gridStringOrNumberComparator } from '../hooks/features/sorting/gridSortingUtils';
 import { getGridStringOperators, getGridStringQuickFilterFn } from './gridStringOperators';
-import { convertQuickFilterV7ToLegacy } from './utils';
 
 /**
  * TODO: Move pro and premium properties outside of this Community file
@@ -24,6 +23,5 @@ export const GRID_STRING_COL_DEF = {
   align: 'left',
   filterOperators: getGridStringOperators(),
   renderEditCell: renderEditInputCell,
-  getApplyQuickFilterFn: convertQuickFilterV7ToLegacy(getGridStringQuickFilterFn),
-  getApplyQuickFilterFnV7: getGridStringQuickFilterFn
+  getApplyQuickFilterFn: getGridStringQuickFilterFn
 };

package/modern/colDef/gridStringOperators.js

@@ -1,19 +1,23 @@
 import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilterInputValue';
 import { escapeRegExp } from '../utils/utils';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
-import { convertLegacyOperators, tagInternalFilter } from './utils';
-export const getGridStringQuickFilterFn = tagInternalFilter(value => {
+import { removeDiacritics } from '../hooks/features/filter/gridFilterUtils';
+export const getGridStringQuickFilterFn = value => {
   if (!value) {
     return null;
   }
   const filterRegex = new RegExp(escapeRegExp(value), 'i');
-  return columnValue => {
+  return (_, row, column, apiRef) => {
+    let columnValue = apiRef.current.getRowFormattedValue(row, column);
+    if (apiRef.current.ignoreDiacritics) {
+      columnValue = removeDiacritics(columnValue);
+    }
     return columnValue != null ? filterRegex.test(columnValue.toString()) : false;
   };
-});
-export const getGridStringOperators = (disableTrim = false) => convertLegacyOperators([{
+};
+export const getGridStringOperators = (disableTrim = false) => [{
   value: 'contains',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!filterItem.value) {
       return null;
     }
@@ -26,7 +30,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   InputComponent: GridFilterInputValue
 }, {
   value: 'equals',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!filterItem.value) {
       return null;
     }
@@ -42,7 +46,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   InputComponent: GridFilterInputValue
 }, {
   value: 'startsWith',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!filterItem.value) {
       return null;
     }
@@ -55,7 +59,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   InputComponent: GridFilterInputValue
 }, {
   value: 'endsWith',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!filterItem.value) {
       return null;
     }
@@ -68,7 +72,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   InputComponent: GridFilterInputValue
 }, {
   value: 'isEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value === '' || value == null;
     };
@@ -76,7 +80,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   requiresFilterValue: false
 }, {
   value: 'isNotEmpty',
-  getApplyFilterFnV7: () => {
+  getApplyFilterFn: () => {
     return value => {
       return value !== '' && value != null;
     };
@@ -84,7 +88,7 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
   requiresFilterValue: false
 }, {
   value: 'isAnyOf',
-  getApplyFilterFnV7: filterItem => {
+  getApplyFilterFn: filterItem => {
     if (!Array.isArray(filterItem.value) || filterItem.value.length === 0) {
       return null;
     }
@@ -98,4 +102,4 @@ export const getGridStringOperators = (disableTrim = false) => convertLegacyOper
     }) : false;
   },
   InputComponent: GridFilterInputMultipleValue
-}]);
+}];

package/modern/components/cell/GridActionsCell.js

@@ -72,10 +72,12 @@ function GridActionsCell(props) {
     focus() {
       // If ignoreCallToFocus is true, then one of the buttons was clicked and the focus is already set
       if (!ignoreCallToFocus.current) {
-        setFocusedButtonIndex(0);
+        // find the first focusable button and pass the index to the state
+        const focusableButtonIndex = options.findIndex(o => !o.props.disabled);
+        setFocusedButtonIndex(focusableButtonIndex);
       }
     }
-  }), []);
+  }), [options]);
   React.useEffect(() => {
     if (focusedButtonIndex >= numberOfButtons) {
       setFocusedButtonIndex(numberOfButtons - 1);
@@ -103,19 +105,23 @@ function GridActionsCell(props) {
     if (numberOfButtons <= 1) {
       return;
     }
+    const getNewIndex = (index, direction) => {
+      if (index < 0 || index > options.length) {
+        return index;
+      }
+
+      // for rtl mode we need to reverse the direction
+      const rtlMod = theme.direction === 'rtl' ? -1 : 1;
+      const indexMod = (direction === 'left' ? -1 : 1) * rtlMod;
+
+      // if the button that should receive focus is disabled go one more step
+      return options[index + indexMod]?.props.disabled ? getNewIndex(index + indexMod, direction) : index + indexMod;
+    };
     let newIndex = focusedButtonIndex;
     if (event.key === 'ArrowRight') {
-      if (theme.direction === 'rtl') {
-        newIndex -= 1;
-      } else {
-        newIndex += 1;
-      }
+      newIndex = getNewIndex(focusedButtonIndex, 'right');
     } else if (event.key === 'ArrowLeft') {
-      if (theme.direction === 'rtl') {
-        newIndex += 1;
-      } else {
-        newIndex -= 1;
-      }
+      newIndex = getNewIndex(focusedButtonIndex, 'left');
     }
     if (newIndex < 0 || newIndex >= numberOfButtons) {
       return; // We're already in the first or last item = do nothing and let the grid listen the event

package/modern/components/cell/GridCell.js

@@ -439,8 +439,8 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
     value,
     formattedValue
   } = cellParamsWithAPI;
-  const managesOwnFocus = column.type === 'actions';
-  const tabIndex = (cellMode === 'view' || !isEditable) && !managesOwnFocus ? cellParamsWithAPI.tabIndex : -1;
+  const canManageOwnFocus = column.type === 'actions' && column.getActions?.(apiRef.current.getRowParams(rowId)).some(action => !action.props.disabled);
+  const tabIndex = (cellMode === 'view' || !isEditable) && !canManageOwnFocus ? cellParamsWithAPI.tabIndex : -1;
   const {
     classes: rootClasses,
     getCellClassName
@@ -578,7 +578,7 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
       children: valueString
     });
   }
-  if ( /*#__PURE__*/React.isValidElement(children) && managesOwnFocus) {
+  if ( /*#__PURE__*/React.isValidElement(children) && canManageOwnFocus) {
     children = /*#__PURE__*/React.cloneElement(children, {
       focusElementRef
     });

package/modern/constants/defaultGridSlotsComponents.js

@@ -9,21 +9,21 @@ import materialSlots from '../material';
 // TODO: camelCase these key. It's a private helper now.
 // Remove then need to call `uncapitalizeObjectKeys`.
 export const DATA_GRID_DEFAULT_SLOTS_COMPONENTS = _extends({}, materialSlots, {
-  Cell: GridCellV7,
-  SkeletonCell: GridSkeletonCell,
-  ColumnHeaderFilterIconButton: GridColumnHeaderFilterIconButton,
-  ColumnMenu: GridColumnMenu,
-  ColumnHeaders: GridColumnHeaders,
-  Footer: GridFooter,
-  FooterRowCount: GridRowCount,
-  Toolbar: null,
-  PreferencesPanel: GridPreferencesPanel,
-  LoadingOverlay: GridLoadingOverlay,
-  NoResultsOverlay: GridNoResultsOverlay,
-  NoRowsOverlay: GridNoRowsOverlay,
-  Pagination: GridPagination,
-  FilterPanel: GridFilterPanel,
-  ColumnsPanel: GridColumnsPanel,
-  Panel: GridPanel,
-  Row: GridRow
+  cell: GridCellV7,
+  skeletonCell: GridSkeletonCell,
+  columnHeaderFilterIconButton: GridColumnHeaderFilterIconButton,
+  columnMenu: GridColumnMenu,
+  columnHeaders: GridColumnHeaders,
+  footer: GridFooter,
+  footerRowCount: GridRowCount,
+  toolbar: null,
+  preferencesPanel: GridPreferencesPanel,
+  loadingOverlay: GridLoadingOverlay,
+  noResultsOverlay: GridNoResultsOverlay,
+  noRowsOverlay: GridNoRowsOverlay,
+  pagination: GridPagination,
+  filterPanel: GridFilterPanel,
+  columnsPanel: GridColumnsPanel,
+  panel: GridPanel,
+  row: GridRow
 });

package/modern/hooks/features/export/useGridPrintExport.js

@@ -7,7 +7,7 @@ import { gridColumnDefinitionsSelector, gridColumnVisibilityModelSelector } from
 import { gridClasses } from '../../../constants/gridClasses';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { gridRowsMetaSelector } from '../rows/gridRowsMetaSelector';
-import { getColumnsToExport } from './utils';
+import { defaultGetRowsToExport, getColumnsToExport } from './utils';
 import { mergeStateWithPaginationModel } from '../pagination/useGridPagination';
 import { useGridRegisterPipeProcessor } from '../../core/pipeProcessing';
 import { GridPrintExportMenuItem } from '../../../components/toolbar/GridToolbarExport';
@@ -118,12 +118,10 @@ export const useGridPrintExport = (apiRef, props) => {
     // the footer is always being placed at the bottom of the page as if all rows are exported
     // so if getRowsToExport is being used to only export a subset of rows then we need to
     // adjust the footer position to be correctly placed at the bottom of the grid
-    if (options?.getRowsToExport) {
-      const gridFooterElement = gridClone.querySelector(`.${gridClasses.footerContainer}`);
-      gridFooterElement.style.position = 'absolute';
-      gridFooterElement.style.width = '100%';
-      gridFooterElement.style.top = `${computedTotalHeight - gridFooterElementHeight}px`;
-    }
+    const gridFooterElement = gridClone.querySelector(`.${gridClasses.footerContainer}`);
+    gridFooterElement.style.position = 'absolute';
+    gridFooterElement.style.width = '100%';
+    gridFooterElement.style.top = `${computedTotalHeight - gridFooterElementHeight}px`;
 
     // printDoc.body.appendChild(gridClone); should be enough but a clone isolation bug in Safari
     // prevents us to do it
@@ -226,9 +224,7 @@ export const useGridPrintExport = (apiRef, props) => {
       apiRef.current.forceUpdate();
     }
     await updateGridColumnsForPrint(options?.fields, options?.allColumns, options?.includeCheckboxes);
-    if (options?.getRowsToExport) {
-      updateGridRowsForPrint(options.getRowsToExport);
-    }
+    updateGridRowsForPrint(options?.getRowsToExport ?? defaultGetRowsToExport);
     apiRef.current.unstable_setVirtualization(false);
     await raf(); // wait for the state changes to take action
     const printWindow = buildPrintWindow(options?.fileName);

package/modern/hooks/features/filter/gridFilterUtils.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { GridLogicOperator } from '../../../models';
-import { GLOBAL_API_REF, isInternalFilter } from '../../../colDef/utils';
 import { getDefaultGridFilterModel } from './gridFilterState';
 import { buildWarning } from '../../../utils/warning';
+import { getPublicApiRef } from '../../../utils/getPublicApiRef';
 import { gridColumnFieldsSelector, gridColumnLookupSelector, gridVisibleColumnFieldsSelector } from '../columns';
 
 // Fixes https://github.com/mui/mui-x/issues/10056
@@ -69,7 +69,7 @@ export const sanitizeFilterModel = (model, disableMultipleColumnsFiltering, apiR
 export const mergeStateWithFilterModel = (filterModel, disableMultipleColumnsFiltering, apiRef) => filteringState => _extends({}, filteringState, {
   filterModel: sanitizeFilterModel(filterModel, disableMultipleColumnsFiltering, apiRef)
 });
-const removeDiacritics = value => {
+export const removeDiacritics = value => {
   if (typeof value === 'string') {
     return value.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
   }
@@ -107,41 +107,19 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
   if (!filterOperator) {
     throw new Error(`MUI: No filter operator found for column '${column.field}' and operator value '${newFilterItem.operator}'.`);
   }
-  const hasUserFunctionLegacy = !isInternalFilter(filterOperator.getApplyFilterFn);
-  const hasUserFunctionV7 = !isInternalFilter(filterOperator.getApplyFilterFnV7);
-  if (filterOperator.getApplyFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
-    const applyFilterOnRow = filterOperator.getApplyFilterFnV7(newFilterItem, column);
-    if (typeof applyFilterOnRow !== 'function') {
-      return null;
-    }
-    return {
-      v7: true,
-      item: newFilterItem,
-      fn: row => {
-        let value = apiRef.current.getRowValue(row, column);
-        if (ignoreDiacritics) {
-          value = removeDiacritics(value);
-        }
-        return applyFilterOnRow(value, row, column, apiRef);
-      }
-    };
-  }
+  const publicApiRef = getPublicApiRef(apiRef);
   const applyFilterOnRow = filterOperator.getApplyFilterFn(newFilterItem, column);
   if (typeof applyFilterOnRow !== 'function') {
     return null;
   }
   return {
-    v7: false,
     item: newFilterItem,
-    fn: rowId => {
-      const params = apiRef.current.getCellParams(rowId, newFilterItem.field);
-      GLOBAL_API_REF.current = apiRef;
+    fn: row => {
+      let value = apiRef.current.getRowValue(row, column);
       if (ignoreDiacritics) {
-        params.value = removeDiacritics(params.value);
+        value = removeDiacritics(value);
       }
-      const result = applyFilterOnRow(params);
-      GLOBAL_API_REF.current = null;
-      return result;
+      return applyFilterOnRow(value, row, column, publicApiRef);
     }
   };
 };
@@ -168,7 +146,7 @@ const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) =>
       for (let i = 0; i < appliers.length; i += 1) {
         const applier = appliers[i];
         if (!shouldApplyFilter || shouldApplyFilter(applier.item.field)) {
-          resultPerItemId[applier.item.id] = applier.v7 ? applier.fn(row) : applier.fn(apiRef.current.getRowId(row));
+          resultPerItemId[applier.item.id] = applier.fn(row);
         }
       }
       return resultPerItemId;
@@ -184,7 +162,7 @@ const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) =>
       ${appliers.map((applier, i) => `${JSON.stringify(String(applier.item.id))}:
           !shouldApply${i} ?
             false :
-            ${applier.v7 ? `appliers[${i}].fn(row)` : `appliers[${i}].fn(getRowId(row))`},
+            appliers[${i}].fn(row),
       `).join('\n')}};
 
       return result$$;
@@ -214,31 +192,17 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
   const {
     ignoreDiacritics
   } = apiRef.current.rootProps;
+  const publicApiRef = getPublicApiRef(apiRef);
   columnFields.forEach(field => {
     const column = apiRef.current.getColumn(field);
     const getApplyQuickFilterFn = column?.getApplyQuickFilterFn;
-    const getApplyQuickFilterFnV7 = column?.getApplyQuickFilterFnV7;
-    const hasUserFunctionLegacy = !isInternalFilter(getApplyQuickFilterFn);
-    const hasUserFunctionV7 = !isInternalFilter(getApplyQuickFilterFnV7);
-    if (getApplyQuickFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
-      appliersPerField.push({
-        column,
-        appliers: quickFilterValues.map(quickFilterValue => {
-          const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
-          return {
-            v7: true,
-            fn: getApplyQuickFilterFnV7(value, column, apiRef)
-          };
-        })
-      });
-    } else if (getApplyQuickFilterFn) {
+    if (getApplyQuickFilterFn) {
       appliersPerField.push({
         column,
         appliers: quickFilterValues.map(quickFilterValue => {
           const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
-            v7: false,
-            fn: getApplyQuickFilterFn(value, column, apiRef)
+            fn: getApplyQuickFilterFn(value, column, publicApiRef)
           };
         })
       });
@@ -246,7 +210,6 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
   });
   return function isRowMatchingQuickFilter(row, shouldApplyFilter) {
     const result = {};
-    const usedCellParams = {};
 
     /* eslint-disable no-restricted-syntax, no-labels */
     outer: for (let v = 0; v < quickFilterValues.length; v += 1) {
@@ -263,30 +226,17 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           continue;
         }
         const applier = appliers[v];
-        let value = apiRef.current.getRowFormattedValue(row, column);
+        let value = apiRef.current.getRowValue(row, column);
         if (applier.fn === null) {
           continue;
         }
-        if (applier.v7) {
-          if (ignoreDiacritics) {
-            value = removeDiacritics(value);
-          }
-          const isMatching = applier.fn(value, row, column, apiRef);
-          if (isMatching) {
-            result[filterValue] = true;
-            continue outer;
-          }
-        } else {
-          const cellParams = usedCellParams[field] ?? apiRef.current.getCellParams(apiRef.current.getRowId(row), field);
-          if (ignoreDiacritics) {
-            cellParams.value = removeDiacritics(cellParams.value);
-          }
-          usedCellParams[field] = cellParams;
-          const isMatching = applier.fn(cellParams);
-          if (isMatching) {
-            result[filterValue] = true;
-            continue outer;
-          }
+        if (ignoreDiacritics) {
+          value = removeDiacritics(value);
+        }
+        const isMatching = applier.fn(value, row, column, publicApiRef);
+        if (isMatching) {
+          result[filterValue] = true;
+          continue outer;
         }
       }
       result[filterValue] = false;

package/modern/hooks/features/filter/useGridFilter.js

@@ -212,7 +212,8 @@ export const useGridFilter = (apiRef, props) => {
     setFilterModel,
     showFilterPanel,
     hideFilterPanel,
-    setQuickFilterValues
+    setQuickFilterValues,
+    ignoreDiacritics: props.ignoreDiacritics
   };
   useGridApiMethod(apiRef, filterApi, 'public');
 

package/modern/hooks/features/rows/useGridRows.js

@@ -283,7 +283,7 @@ export const useGridRows = (apiRef, props) => {
     });
 
     // Removes potential remaining skeleton rows from the dataRowIds.
-    const dataRowIds = rootGroupChildren.filter(childId => tree[childId].type === 'leaf');
+    const dataRowIds = rootGroupChildren.filter(childId => tree[childId]?.type === 'leaf');
     apiRef.current.caches.rows.dataRowIdToModelLookup = dataRowIdToModelLookup;
     apiRef.current.caches.rows.dataRowIdToIdLookup = dataRowIdToIdLookup;
     apiRef.current.setState(state => _extends({}, state, {

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.18.0
+ * @mui/x-data-grid v7.0.0-alpha.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/internals/index.js

@@ -59,8 +59,8 @@ export { isNavigationKey } from '../utils/keyboardUtils';
 export { clamp, isDeepEqual, isNumber, isFunction, isObject } from '../utils/utils';
 export { buildWarning } from '../utils/warning';
 export { exportAs } from '../utils/exportAs';
+export * from '../utils/getPublicApiRef';
 export { useGridPrivateApiContext } from '../hooks/utils/useGridPrivateApiContext';
 export * from '../hooks/utils/useOnMount';
 export { serializeCellValue } from '../hooks/features/export/serializers/csvSerializer';
-export * from '../colDef/utils';
 export * from './utils';

package/modern/internals/utils/computeSlots.js

@@ -1,17 +1,18 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import { uncapitalizeObjectKeys } from './slotsMigration';
-
-// TODO v7: Remove `components` and usages of `UncapitalizeObjectKeys` type
-// after converting keys in Grid(Pro|Premium)SlotsComponent to camelCase.
-// https://github.com/mui/mui-x/issues/7940
 export function computeSlots({
   defaultSlots,
-  slots,
-  components
+  slots
 }) {
-  const overrides = slots ?? (components ? uncapitalizeObjectKeys(components) : null);
+  const overrides = slots;
   if (!overrides || Object.keys(overrides).length === 0) {
     return defaultSlots;
   }
-  return _extends({}, defaultSlots, overrides);
+  const result = _extends({}, defaultSlots);
+  Object.keys(overrides).forEach(key => {
+    const k = key;
+    if (overrides[k] !== undefined) {
+      result[k] = overrides[k];
+    }
+  });
+  return result;
 }

package/modern/internals/utils/index.js

@@ -1,3 +1,2 @@
 export * from './computeSlots';
-export * from './slotsMigration';
 export * from './useProps';