@mui/x-data-grid 6.18.0 → 6.18.1

package/CHANGELOG.md

@@ -3,6 +3,64 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 6.18.1
+
+_Nov 9, 2023_
+
+We'd like to offer a big thanks to the 9 contributors who made this release possible. Here are some highlights ✨:
+
+- ✨ Fix aggregation label not showing when `renderHeader` is used (#10961) @cherniavskii
+- 📘 Server side data source [early documentation](https://mui.com/x/react-data-grid/server-side-data/) published
+- 📈 `<ChartsReferenceLine />` component is now available
+- 🐞 Bugfixes
+- 📚 Documentation improvements
+
+### Data Grid
+
+#### `@mui/x-data-grid@6.18.1`
+
+- [DataGrid] Fix cell value type in quick filtering v7 (#10884) @cherniavskii
+- [DataGrid] Fix keyboard navigation for actions cell with disabled buttons (#10947) @michelengelen
+- [DataGrid] Fix `undefined` slot values (#10934) @romgrk
+
+#### `@mui/x-data-grid-pro@6.18.1` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@6.18.1`, plus:
+
+- [DataGridPro] Add data source interface and basic documentation (#10543) @MBilalShafi
+
+#### `@mui/x-data-grid-premium@6.18.1` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-data-grid-pro@6.18.1`, plus:
+
+- [DataGridPremium] Render aggregation label when `renderHeader` is used (#10961) @cherniavskii
+
+### Date Pickers
+
+#### `@mui/x-date-pickers@6.18.1`
+
+- [fields] Fix multi input date time field section selection (#10915) @noraleonte
+- [pickers] Always use up-to-date `defaultView` (#10889) @LukasTy
+
+#### `@mui/x-date-pickers-pro@6.18.1` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@6.18.1`.
+
+### Charts / `@mui/x-charts@6.18.1`
+
+- [charts] Add `<ChartsReferenceLine />` component (#10597) @wascou
+- [charts] Improve properties JSDoc (#10931) @alexfauquette
+
+### Docs
+
+- [docs] Fix charts docs as stable (#10888) @alexfauquette
+- [docs] Document how to hide the legend (#10954) @alexfauquette
+
+### Core
+
+- [core] Adds new alpha version to version select on the docs (#10944) @michelengelen
+- [core] Fix GitHub title tag consistency @oliviertassinari
+
 ## 6.18.0
 
 _Nov 3, 2023_
@@ -357,7 +415,7 @@ Same changes as in `@mui/x-date-pickers@6.16.1`, plus:
 
 - [core] Fix casing consistency with legal and marketing content @oliviertassinari
 - [core] Revert the link in the priority support ticket description (#10517) @michelengelen
-- [CHANGELOG] Polish image @oliviertassinari
+- [changelog] Polish image @oliviertassinari
 
 ## 6.16.0
 
@@ -1149,7 +1207,7 @@ Same changes as in `@mui/x-date-pickers@6.10.1`.
 ### Core
 
 - [core] Add `validate` command (#9714) @romgrk
-- [CHANGELOG] Update generator to new format @oliviertassinari
+- [changelog] Update generator to new format @oliviertassinari
 
 ## 6.10.0
 
@@ -1207,7 +1265,7 @@ Same changes as in `@mui/x-date-pickers@6.10.0`.
 
 - [core] Disambiguate eslint plugin name @oliviertassinari
 - [core] Update priority support issue template and prompt (#9574) @DanailH
-- [CHANGELOG] Clarify each plan (#9446) @oliviertassinari
+- [changelog] Clarify each plan (#9446) @oliviertassinari
 - [license] Fix error terminology (#9614) @oliviertassinari
 
 ## 6.9.2
@@ -1356,8 +1414,8 @@ Same changes as in `@mui/x-date-pickers@6.9.1`.
 - [core] Fix priority support prompt action (#9472) @DanailH
 - [core] Update `uses` for priority support action (#9480) @DanailH
 - [core] Bumb update monorepo (#9476) @alexfauquette
-- [CHANGELOG] Fix media quality (#9439) @oliviertassinari
-- [CHANGELOG] Remove height img attribute @oliviertassinari
+- [changelog] Fix media quality (#9439) @oliviertassinari
+- [changelog] Remove height img attribute @oliviertassinari
 - [test] Skip flaky row pinning tests in JSDOM (#9511) @cherniavskii
 
 ## 6.9.0

package/colDef/gridStringOperators.js

@@ -2,12 +2,17 @@ import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilter
 import { escapeRegExp } from '../utils/utils';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
 import { convertLegacyOperators, tagInternalFilter } from './utils';
+import { removeDiacritics } from '../hooks/features/filter/gridFilterUtils';
 export const getGridStringQuickFilterFn = tagInternalFilter(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;
   };
 });

package/components/cell/GridActionsCell.js

@@ -73,10 +73,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);
@@ -104,19 +106,24 @@ function GridActionsCell(props) {
     if (numberOfButtons <= 1) {
       return;
     }
+    const getNewIndex = (index, direction) => {
+      var _options;
+      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 = options[index + indexMod]) != null && _options.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/components/cell/GridCell.js

@@ -386,7 +386,7 @@ process.env.NODE_ENV !== "production" ? GridCell.propTypes = {
 } : void 0;
 export { MemoizedCellWrapper as GridCellWrapper, GridCell };
 const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
-  var _rootProps$unstable_c, _rootProps$experiment3, _rootProps$experiment4;
+  var _getActions, _ref, _rootProps$unstable_c, _rootProps$experiment3, _rootProps$experiment4;
   const {
       column,
       rowId,
@@ -441,8 +441,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' && ((_getActions = (_ref = column).getActions) == null ? void 0 : _getActions.call(_ref, apiRef.current.getRowParams(rowId)).some(action => !action.props.disabled));
+  const tabIndex = (cellMode === 'view' || !isEditable) && !canManageOwnFocus ? cellParamsWithAPI.tabIndex : -1;
   const {
     classes: rootClasses,
     getCellClassName
@@ -580,7 +580,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/hooks/features/filter/gridFilterUtils.d.ts

@@ -13,6 +13,7 @@ import { GridAggregatedFilterItemApplier, GridFilterItemResult, GridQuickFilterV
 export declare const cleanFilterItem: (item: GridFilterItem, apiRef: React.MutableRefObject<GridPrivateApiCommunity>) => GridFilterItem;
 export declare const sanitizeFilterModel: (model: GridFilterModel, disableMultipleColumnsFiltering: boolean, apiRef: React.MutableRefObject<GridPrivateApiCommunity>) => GridFilterModel;
 export declare const mergeStateWithFilterModel: (filterModel: GridFilterModel, disableMultipleColumnsFiltering: boolean, apiRef: React.MutableRefObject<GridPrivateApiCommunity>) => (filteringState: GridStateCommunity['filter']) => GridStateCommunity['filter'];
+export declare const removeDiacritics: (value: unknown) => unknown;
 export declare const buildAggregatedFilterApplier: (filterModel: GridFilterModel, apiRef: React.MutableRefObject<GridPrivateApiCommunity>, disableEval: boolean) => GridAggregatedFilterItemApplier;
 type FilterCache = {
     cleanedFilterItems?: GridFilterItem[];

package/hooks/features/filter/gridFilterUtils.js

@@ -3,6 +3,7 @@ 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 +70,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, '');
   }
@@ -110,6 +111,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
   }
   const hasUserFunctionLegacy = !isInternalFilter(filterOperator.getApplyFilterFn);
   const hasUserFunctionV7 = !isInternalFilter(filterOperator.getApplyFilterFnV7);
+  const publicApiRef = getPublicApiRef(apiRef);
   if (filterOperator.getApplyFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
     const applyFilterOnRow = filterOperator.getApplyFilterFnV7(newFilterItem, column);
     if (typeof applyFilterOnRow !== 'function') {
@@ -123,7 +125,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
         if (ignoreDiacritics) {
           value = removeDiacritics(value);
         }
-        return applyFilterOnRow(value, row, column, apiRef);
+        return applyFilterOnRow(value, row, column, publicApiRef);
       }
     };
   }
@@ -136,7 +138,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
     item: newFilterItem,
     fn: rowId => {
       const params = apiRef.current.getCellParams(rowId, newFilterItem.field);
-      GLOBAL_API_REF.current = apiRef;
+      GLOBAL_API_REF.current = publicApiRef;
       if (ignoreDiacritics) {
         params.value = removeDiacritics(params.value);
       }
@@ -216,6 +218,7 @@ 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 == null ? void 0 : column.getApplyQuickFilterFn;
@@ -229,7 +232,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
             v7: true,
-            fn: getApplyQuickFilterFnV7(value, column, apiRef)
+            fn: getApplyQuickFilterFnV7(value, column, publicApiRef)
           };
         })
       });
@@ -240,7 +243,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
             v7: false,
-            fn: getApplyQuickFilterFn(value, column, apiRef)
+            fn: getApplyQuickFilterFn(value, column, publicApiRef)
           };
         })
       });
@@ -265,7 +268,7 @@ 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;
         }
@@ -273,7 +276,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           if (ignoreDiacritics) {
             value = removeDiacritics(value);
           }
-          const isMatching = applier.fn(value, row, column, apiRef);
+          const isMatching = applier.fn(value, row, column, publicApiRef);
           if (isMatching) {
             result[filterValue] = true;
             continue outer;

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<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, 'rows' | 'initialState' | 'filterModel' | 'getRowId' | 'onFilterModelChange' | 'filterMode' | 'disableMultipleColumnsFiltering' | 'slots' | 'slotProps' | 'disableColumnFilter' | 'disableEval'>) => void;
+export declare const useGridFilter: (apiRef: React.MutableRefObject<GridPrivateApiCommunity>, props: Pick<DataGridProcessedProps, 'rows' | 'initialState' | 'filterModel' | 'getRowId' | 'onFilterModelChange' | 'filterMode' | 'disableMultipleColumnsFiltering' | 'slots' | 'slotProps' | 'disableColumnFilter' | 'disableEval' | 'ignoreDiacritics'>) => void;

package/hooks/features/filter/useGridFilter.js

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

package/index.js

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

package/internals/index.d.ts

@@ -72,6 +72,7 @@ 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 type { GridPrivateOnlyApiCommon } from '../models/api/gridApiCommon';
 export { useGridPrivateApiContext } from '../hooks/utils/useGridPrivateApiContext';
 export * from '../hooks/utils/useOnMount';

package/internals/index.js

@@ -59,6 +59,7 @@ 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';

package/internals/utils/computeSlots.js

@@ -13,5 +13,12 @@ export function computeSlots({
   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/legacy/colDef/gridStringOperators.js

@@ -2,12 +2,17 @@ import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilter
 import { escapeRegExp } from '../utils/utils';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
 import { convertLegacyOperators, tagInternalFilter } from './utils';
+import { removeDiacritics } from '../hooks/features/filter/gridFilterUtils';
 export var getGridStringQuickFilterFn = tagInternalFilter(function (value) {
   if (!value) {
     return null;
   }
   var filterRegex = new RegExp(escapeRegExp(value), 'i');
-  return function (columnValue) {
+  return function (_, row, column, apiRef) {
+    var columnValue = apiRef.current.getRowFormattedValue(row, column);
+    if (apiRef.current.ignoreDiacritics) {
+      columnValue = removeDiacritics(columnValue);
+    }
     return columnValue != null ? filterRegex.test(columnValue.toString()) : false;
   };
 });

package/legacy/components/cell/GridActionsCell.js

@@ -97,11 +97,15 @@ function GridActionsCell(props) {
       focus: function 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
+          var focusableButtonIndex = options.findIndex(function (o) {
+            return !o.props.disabled;
+          });
+          setFocusedButtonIndex(focusableButtonIndex);
         }
       }
     };
-  }, []);
+  }, [options]);
   React.useEffect(function () {
     if (focusedButtonIndex >= numberOfButtons) {
       setFocusedButtonIndex(numberOfButtons - 1);
@@ -133,19 +137,24 @@ function GridActionsCell(props) {
     if (numberOfButtons <= 1) {
       return;
     }
+    var getNewIndex = function getNewIndex(index, direction) {
+      var _options;
+      if (index < 0 || index > options.length) {
+        return index;
+      }
+
+      // for rtl mode we need to reverse the direction
+      var rtlMod = theme.direction === 'rtl' ? -1 : 1;
+      var indexMod = (direction === 'left' ? -1 : 1) * rtlMod;
+
+      // if the button that should receive focus is disabled go one more step
+      return (_options = options[index + indexMod]) != null && _options.props.disabled ? getNewIndex(index + indexMod, direction) : index + indexMod;
+    };
     var 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/legacy/components/cell/GridCell.js

@@ -387,7 +387,7 @@ process.env.NODE_ENV !== "production" ? GridCell.propTypes = {
 } : void 0;
 export { MemoizedCellWrapper as GridCellWrapper, GridCell };
 var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _rootProps$unstable_c, _rootProps$experiment3, _rootProps$experiment4;
+  var _getActions, _ref, _rootProps$unstable_c, _rootProps$experiment3, _rootProps$experiment4;
   var column = props.column,
     rowId = props.rowId,
     editCellState = props.editCellState,
@@ -443,8 +443,10 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     isEditable = cellParamsWithAPI.isEditable,
     value = cellParamsWithAPI.value,
     formattedValue = cellParamsWithAPI.formattedValue;
-  var managesOwnFocus = column.type === 'actions';
-  var tabIndex = (cellMode === 'view' || !isEditable) && !managesOwnFocus ? cellParamsWithAPI.tabIndex : -1;
+  var canManageOwnFocus = column.type === 'actions' && ((_getActions = (_ref = column).getActions) == null ? void 0 : _getActions.call(_ref, apiRef.current.getRowParams(rowId)).some(function (action) {
+    return !action.props.disabled;
+  }));
+  var tabIndex = (cellMode === 'view' || !isEditable) && !canManageOwnFocus ? cellParamsWithAPI.tabIndex : -1;
   var rootClasses = rootProps.classes,
     getCellClassName = rootProps.getCellClassName;
   var classNames = apiRef.current.unstable_applyPipeProcessors('cellClassName', [], {
@@ -588,7 +590,7 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
       children: valueString
     });
   }
-  if ( /*#__PURE__*/React.isValidElement(children) && managesOwnFocus) {
+  if ( /*#__PURE__*/React.isValidElement(children) && canManageOwnFocus) {
     children = /*#__PURE__*/React.cloneElement(children, {
       focusElementRef: focusElementRef
     });

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

@@ -3,6 +3,7 @@ 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
@@ -79,7 +80,7 @@ export var mergeStateWithFilterModel = function mergeStateWithFilterModel(filter
     });
   };
 };
-var removeDiacritics = function removeDiacritics(value) {
+export var removeDiacritics = function removeDiacritics(value) {
   if (typeof value === 'string') {
     return value.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
   }
@@ -122,6 +123,7 @@ var getFilterCallbackFromItem = function getFilterCallbackFromItem(filterItem, a
   }
   var hasUserFunctionLegacy = !isInternalFilter(filterOperator.getApplyFilterFn);
   var hasUserFunctionV7 = !isInternalFilter(filterOperator.getApplyFilterFnV7);
+  var publicApiRef = getPublicApiRef(apiRef);
   if (filterOperator.getApplyFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
     var _applyFilterOnRow = filterOperator.getApplyFilterFnV7(newFilterItem, column);
     if (typeof _applyFilterOnRow !== 'function') {
@@ -135,7 +137,7 @@ var getFilterCallbackFromItem = function getFilterCallbackFromItem(filterItem, a
         if (ignoreDiacritics) {
           value = removeDiacritics(value);
         }
-        return _applyFilterOnRow(value, row, column, apiRef);
+        return _applyFilterOnRow(value, row, column, publicApiRef);
       }
     };
   }
@@ -148,7 +150,7 @@ var getFilterCallbackFromItem = function getFilterCallbackFromItem(filterItem, a
     item: newFilterItem,
     fn: function fn(rowId) {
       var params = apiRef.current.getCellParams(rowId, newFilterItem.field);
-      GLOBAL_API_REF.current = apiRef;
+      GLOBAL_API_REF.current = publicApiRef;
       if (ignoreDiacritics) {
         params.value = removeDiacritics(params.value);
       }
@@ -221,6 +223,7 @@ var buildAggregatedQuickFilterApplier = function buildAggregatedQuickFilterAppli
   var columnFields = quickFilterExcludeHiddenColumns ? gridVisibleColumnFieldsSelector(apiRef) : gridColumnFieldsSelector(apiRef);
   var appliersPerField = [];
   var ignoreDiacritics = apiRef.current.rootProps.ignoreDiacritics;
+  var publicApiRef = getPublicApiRef(apiRef);
   columnFields.forEach(function (field) {
     var column = apiRef.current.getColumn(field);
     var getApplyQuickFilterFn = column == null ? void 0 : column.getApplyQuickFilterFn;
@@ -234,7 +237,7 @@ var buildAggregatedQuickFilterApplier = function buildAggregatedQuickFilterAppli
           var value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
             v7: true,
-            fn: getApplyQuickFilterFnV7(value, column, apiRef)
+            fn: getApplyQuickFilterFnV7(value, column, publicApiRef)
           };
         })
       });
@@ -245,7 +248,7 @@ var buildAggregatedQuickFilterApplier = function buildAggregatedQuickFilterAppli
           var value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
             v7: false,
-            fn: getApplyQuickFilterFn(value, column, apiRef)
+            fn: getApplyQuickFilterFn(value, column, publicApiRef)
           };
         })
       });
@@ -267,7 +270,7 @@ var buildAggregatedQuickFilterApplier = function buildAggregatedQuickFilterAppli
           continue;
         }
         var applier = appliers[v];
-        var value = apiRef.current.getRowFormattedValue(row, column);
+        var value = apiRef.current.getRowValue(row, column);
         if (applier.fn === null) {
           continue;
         }
@@ -275,7 +278,7 @@ var buildAggregatedQuickFilterApplier = function buildAggregatedQuickFilterAppli
           if (ignoreDiacritics) {
             value = removeDiacritics(value);
           }
-          var isMatching = applier.fn(value, row, column, apiRef);
+          var isMatching = applier.fn(value, row, column, publicApiRef);
           if (isMatching) {
             result[filterValue] = true;
             continue outer;

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

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

package/legacy/index.js

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

package/legacy/internals/index.js

@@ -59,6 +59,7 @@ 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';

package/legacy/internals/utils/computeSlots.js

@@ -12,5 +12,12 @@ export function computeSlots(_ref) {
   if (!overrides || Object.keys(overrides).length === 0) {
     return defaultSlots;
   }
-  return _extends({}, defaultSlots, overrides);
+  var result = _extends({}, defaultSlots);
+  Object.keys(overrides).forEach(function (key) {
+    var k = key;
+    if (overrides[k] !== undefined) {
+      result[k] = overrides[k];
+    }
+  });
+  return result;
 }

package/legacy/utils/getPublicApiRef.js

@@ -0,0 +1,5 @@
+export function getPublicApiRef(apiRef) {
+  return {
+    current: apiRef.current.getPublicApi()
+  };
+}

package/models/api/gridFilterApi.d.ts

@@ -1,6 +1,7 @@
 import { GridFilterModel } from '../gridFilterModel';
 import { GridFilterItem, GridLogicOperator } from '../gridFilterItem';
 import { GridControlledStateReasonLookup } from '../events';
+import { DataGridProcessedProps } from '../props/DataGridProps';
 /**
  * The filter API interface that is available in the grid [[apiRef]].
  */
@@ -52,4 +53,8 @@ export interface GridFilterApi {
      * @param {any[]} values The list of element to quick filter
      */
     setQuickFilterValues: (values: any[]) => void;
+    /**
+     * Returns the value of the `ignoreDiacritics` prop.
+     */
+    ignoreDiacritics: DataGridProcessedProps['ignoreDiacritics'];
 }

package/modern/colDef/gridStringOperators.js

@@ -2,12 +2,17 @@ import { GridFilterInputValue } from '../components/panel/filterPanel/GridFilter
 import { escapeRegExp } from '../utils/utils';
 import { GridFilterInputMultipleValue } from '../components/panel/filterPanel/GridFilterInputMultipleValue';
 import { convertLegacyOperators, tagInternalFilter } from './utils';
+import { removeDiacritics } from '../hooks/features/filter/gridFilterUtils';
 export const getGridStringQuickFilterFn = tagInternalFilter(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;
   };
 });

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/hooks/features/filter/gridFilterUtils.js

@@ -3,6 +3,7 @@ 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 +70,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, '');
   }
@@ -109,6 +110,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
   }
   const hasUserFunctionLegacy = !isInternalFilter(filterOperator.getApplyFilterFn);
   const hasUserFunctionV7 = !isInternalFilter(filterOperator.getApplyFilterFnV7);
+  const publicApiRef = getPublicApiRef(apiRef);
   if (filterOperator.getApplyFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
     const applyFilterOnRow = filterOperator.getApplyFilterFnV7(newFilterItem, column);
     if (typeof applyFilterOnRow !== 'function') {
@@ -122,7 +124,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
         if (ignoreDiacritics) {
           value = removeDiacritics(value);
         }
-        return applyFilterOnRow(value, row, column, apiRef);
+        return applyFilterOnRow(value, row, column, publicApiRef);
       }
     };
   }
@@ -135,7 +137,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
     item: newFilterItem,
     fn: rowId => {
       const params = apiRef.current.getCellParams(rowId, newFilterItem.field);
-      GLOBAL_API_REF.current = apiRef;
+      GLOBAL_API_REF.current = publicApiRef;
       if (ignoreDiacritics) {
         params.value = removeDiacritics(params.value);
       }
@@ -214,6 +216,7 @@ 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;
@@ -227,7 +230,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
             v7: true,
-            fn: getApplyQuickFilterFnV7(value, column, apiRef)
+            fn: getApplyQuickFilterFnV7(value, column, publicApiRef)
           };
         })
       });
@@ -238,7 +241,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
             v7: false,
-            fn: getApplyQuickFilterFn(value, column, apiRef)
+            fn: getApplyQuickFilterFn(value, column, publicApiRef)
           };
         })
       });
@@ -263,7 +266,7 @@ 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;
         }
@@ -271,7 +274,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           if (ignoreDiacritics) {
             value = removeDiacritics(value);
           }
-          const isMatching = applier.fn(value, row, column, apiRef);
+          const isMatching = applier.fn(value, row, column, publicApiRef);
           if (isMatching) {
             result[filterValue] = true;
             continue outer;

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/index.js

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

package/modern/internals/index.js

@@ -59,6 +59,7 @@ 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';

package/modern/internals/utils/computeSlots.js

@@ -13,5 +13,12 @@ export function computeSlots({
   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/utils/getPublicApiRef.js

@@ -0,0 +1,5 @@
+export function getPublicApiRef(apiRef) {
+  return {
+    current: apiRef.current.getPublicApi()
+  };
+}

package/node/colDef/gridStringOperators.js

@@ -8,12 +8,17 @@ var _GridFilterInputValue = require("../components/panel/filterPanel/GridFilterI
 var _utils = require("../utils/utils");
 var _GridFilterInputMultipleValue = require("../components/panel/filterPanel/GridFilterInputMultipleValue");
 var _utils2 = require("./utils");
+var _gridFilterUtils = require("../hooks/features/filter/gridFilterUtils");
 const getGridStringQuickFilterFn = exports.getGridStringQuickFilterFn = (0, _utils2.tagInternalFilter)(value => {
   if (!value) {
     return null;
   }
   const filterRegex = new RegExp((0, _utils.escapeRegExp)(value), 'i');
-  return columnValue => {
+  return (_, row, column, apiRef) => {
+    let columnValue = apiRef.current.getRowFormattedValue(row, column);
+    if (apiRef.current.ignoreDiacritics) {
+      columnValue = (0, _gridFilterUtils.removeDiacritics)(columnValue);
+    }
     return columnValue != null ? filterRegex.test(columnValue.toString()) : false;
   };
 });

package/node/components/cell/GridActionsCell.js

@@ -81,10 +81,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);
@@ -112,19 +114,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/node/components/cell/GridCell.js

@@ -447,8 +447,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
@@ -586,7 +586,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/node/hooks/features/filter/gridFilterUtils.js

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sanitizeFilterModel = exports.passFilterLogic = exports.mergeStateWithFilterModel = exports.cleanFilterItem = exports.buildAggregatedFilterApplier = void 0;
+exports.sanitizeFilterModel = exports.removeDiacritics = exports.passFilterLogic = exports.mergeStateWithFilterModel = exports.cleanFilterItem = exports.buildAggregatedFilterApplier = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _models = require("../../../models");
 var _utils = require("../../../colDef/utils");
 var _gridFilterState = require("./gridFilterState");
 var _warning = require("../../../utils/warning");
+var _getPublicApiRef = require("../../../utils/getPublicApiRef");
 var _columns = require("../columns");
 // Fixes https://github.com/mui/mui-x/issues/10056
 const globalScope = typeof window === 'undefined' ? globalThis : window;
@@ -84,6 +85,7 @@ const removeDiacritics = value => {
   }
   return value;
 };
+exports.removeDiacritics = removeDiacritics;
 const getFilterCallbackFromItem = (filterItem, apiRef) => {
   if (!filterItem.field || !filterItem.operator) {
     return null;
@@ -118,6 +120,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
   }
   const hasUserFunctionLegacy = !(0, _utils.isInternalFilter)(filterOperator.getApplyFilterFn);
   const hasUserFunctionV7 = !(0, _utils.isInternalFilter)(filterOperator.getApplyFilterFnV7);
+  const publicApiRef = (0, _getPublicApiRef.getPublicApiRef)(apiRef);
   if (filterOperator.getApplyFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
     const applyFilterOnRow = filterOperator.getApplyFilterFnV7(newFilterItem, column);
     if (typeof applyFilterOnRow !== 'function') {
@@ -131,7 +134,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
         if (ignoreDiacritics) {
           value = removeDiacritics(value);
         }
-        return applyFilterOnRow(value, row, column, apiRef);
+        return applyFilterOnRow(value, row, column, publicApiRef);
       }
     };
   }
@@ -144,7 +147,7 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
     item: newFilterItem,
     fn: rowId => {
       const params = apiRef.current.getCellParams(rowId, newFilterItem.field);
-      _utils.GLOBAL_API_REF.current = apiRef;
+      _utils.GLOBAL_API_REF.current = publicApiRef;
       if (ignoreDiacritics) {
         params.value = removeDiacritics(params.value);
       }
@@ -223,6 +226,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
   const {
     ignoreDiacritics
   } = apiRef.current.rootProps;
+  const publicApiRef = (0, _getPublicApiRef.getPublicApiRef)(apiRef);
   columnFields.forEach(field => {
     const column = apiRef.current.getColumn(field);
     const getApplyQuickFilterFn = column?.getApplyQuickFilterFn;
@@ -236,7 +240,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
             v7: true,
-            fn: getApplyQuickFilterFnV7(value, column, apiRef)
+            fn: getApplyQuickFilterFnV7(value, column, publicApiRef)
           };
         })
       });
@@ -247,7 +251,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
           return {
             v7: false,
-            fn: getApplyQuickFilterFn(value, column, apiRef)
+            fn: getApplyQuickFilterFn(value, column, publicApiRef)
           };
         })
       });
@@ -272,7 +276,7 @@ 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;
         }
@@ -280,7 +284,7 @@ const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
           if (ignoreDiacritics) {
             value = removeDiacritics(value);
           }
-          const isMatching = applier.fn(value, row, column, apiRef);
+          const isMatching = applier.fn(value, row, column, publicApiRef);
           if (isMatching) {
             result[filterValue] = true;
             continue outer;

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

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

package/node/index.js

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

package/node/internals/index.js

@@ -716,6 +716,18 @@ var _keyboardUtils = require("../utils/keyboardUtils");
 var _utils2 = require("../utils/utils");
 var _warning = require("../utils/warning");
 var _exportAs = require("../utils/exportAs");
+var _getPublicApiRef = require("../utils/getPublicApiRef");
+Object.keys(_getPublicApiRef).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _getPublicApiRef[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _getPublicApiRef[key];
+    }
+  });
+});
 var _useGridPrivateApiContext = require("../hooks/utils/useGridPrivateApiContext");
 var _useOnMount = require("../hooks/utils/useOnMount");
 Object.keys(_useOnMount).forEach(function (key) {

package/node/internals/utils/computeSlots.js

@@ -19,5 +19,12 @@ function computeSlots({
   if (!overrides || Object.keys(overrides).length === 0) {
     return defaultSlots;
   }
-  return (0, _extends2.default)({}, defaultSlots, overrides);
+  const result = (0, _extends2.default)({}, defaultSlots);
+  Object.keys(overrides).forEach(key => {
+    const k = key;
+    if (overrides[k] !== undefined) {
+      result[k] = overrides[k];
+    }
+  });
+  return result;
 }

package/node/utils/getPublicApiRef.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPublicApiRef = getPublicApiRef;
+function getPublicApiRef(apiRef) {
+  return {
+    current: apiRef.current.getPublicApi()
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid",
-  "version": "6.18.0",
+  "version": "6.18.1",
   "description": "The community edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",

package/utils/getPublicApiRef.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import type { GridPrivateApiCommunity } from '../models/api/gridApiCommunity';
+export declare function getPublicApiRef<PrivateApi extends GridPrivateApiCommunity>(apiRef: React.MutableRefObject<PrivateApi>): import("react").MutableRefObject<ReturnType<PrivateApi["getPublicApi"]>>;

package/utils/getPublicApiRef.js

@@ -0,0 +1,5 @@
+export function getPublicApiRef(apiRef) {
+  return {
+    current: apiRef.current.getPublicApi()
+  };
+}