@mui/x-data-grid 6.17.0 → 6.18.1

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/components/containers/GridRootStyles.js

@@ -191,7 +191,8 @@ export const GridRootStyles = styled('div', {
         overflow: 'visible !important'
       },
       [`& .${gridClasses.cell} > *`]: {
-        overflow: 'visible !important'
+        overflow: 'visible !important',
+        whiteSpace: 'nowrap'
       }
     },
     [`& .${gridClasses['virtualScrollerContent--overflowed']} .${gridClasses['row--lastVisible']} .${gridClasses.cell}`]: {

package/modern/components/menu/columnMenu/menuItems/GridColumnMenuSortItem.js

@@ -33,6 +33,10 @@ function GridColumnMenuSortItem(props) {
   if (!colDef || !colDef.sortable || !sortingOrder.some(item => !!item)) {
     return null;
   }
+  const getLabel = key => {
+    const label = apiRef.current.getLocaleText(key);
+    return typeof label === 'function' ? label(colDef) : label;
+  };
   return /*#__PURE__*/_jsxs(React.Fragment, {
     children: [sortingOrder.includes('asc') && sortDirection !== 'asc' ? /*#__PURE__*/_jsxs(MenuItem, {
       onClick: onSortMenuItemClick,
@@ -42,7 +46,7 @@ function GridColumnMenuSortItem(props) {
           fontSize: "small"
         })
       }), /*#__PURE__*/_jsx(ListItemText, {
-        children: apiRef.current.getLocaleText('columnMenuSortAsc')
+        children: getLabel('columnMenuSortAsc')
       })]
     }) : null, sortingOrder.includes('desc') && sortDirection !== 'desc' ? /*#__PURE__*/_jsxs(MenuItem, {
       onClick: onSortMenuItemClick,
@@ -52,7 +56,7 @@ function GridColumnMenuSortItem(props) {
           fontSize: "small"
         })
       }), /*#__PURE__*/_jsx(ListItemText, {
-        children: apiRef.current.getLocaleText('columnMenuSortDesc')
+        children: getLabel('columnMenuSortDesc')
       })]
     }) : null, sortingOrder.includes(null) && sortDirection != null ? /*#__PURE__*/_jsxs(MenuItem, {
       onClick: onSortMenuItemClick,

package/modern/hooks/core/useGridInitialization.js

@@ -15,5 +15,8 @@ export const useGridInitialization = (inputApiRef, props) => {
   useGridPipeProcessing(privateApiRef);
   useGridStrategyProcessing(privateApiRef);
   useGridLocaleText(privateApiRef, props);
+  privateApiRef.current.register('private', {
+    rootProps: props
+  });
   return privateApiRef;
 };

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
@@ -17,7 +18,7 @@ try {
 /**
  * Adds default values to the optional fields of a filter items.
  * @param {GridFilterItem} item The raw filter item.
- * @param {React.MutableRefObject<GridApiCommunity>} apiRef The API of the grid.
+ * @param {React.MutableRefObject<GridPrivateApiCommunity>} apiRef The API of the grid.
  * @return {GridFilterItem} The clean filter item with an uniq ID and an always-defined operator.
  * TODO: Make the typing reflect the different between GridFilterInputItem and GridFilterItem.
  */
@@ -69,6 +70,12 @@ export const sanitizeFilterModel = (model, disableMultipleColumnsFiltering, apiR
 export const mergeStateWithFilterModel = (filterModel, disableMultipleColumnsFiltering, apiRef) => filteringState => _extends({}, filteringState, {
   filterModel: sanitizeFilterModel(filterModel, disableMultipleColumnsFiltering, apiRef)
 });
+export const removeDiacritics = value => {
+  if (typeof value === 'string') {
+    return value.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+  }
+  return value;
+};
 const getFilterCallbackFromItem = (filterItem, apiRef) => {
   if (!filterItem.field || !filterItem.operator) {
     return null;
@@ -84,6 +91,12 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
   } else {
     parsedValue = filterItem.value;
   }
+  const {
+    ignoreDiacritics
+  } = apiRef.current.rootProps;
+  if (ignoreDiacritics) {
+    parsedValue = removeDiacritics(parsedValue);
+  }
   const newFilterItem = _extends({}, filterItem, {
     value: parsedValue
   });
@@ -97,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') {
@@ -106,8 +120,11 @@ const getFilterCallbackFromItem = (filterItem, apiRef) => {
       v7: true,
       item: newFilterItem,
       fn: row => {
-        const value = apiRef.current.getRowValue(row, column);
-        return applyFilterOnRow(value, row, column, apiRef);
+        let value = apiRef.current.getRowValue(row, column);
+        if (ignoreDiacritics) {
+          value = removeDiacritics(value);
+        }
+        return applyFilterOnRow(value, row, column, publicApiRef);
       }
     };
   }
@@ -120,7 +137,10 @@ 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);
+      }
       const result = applyFilterOnRow(params);
       GLOBAL_API_REF.current = null;
       return result;
@@ -131,12 +151,11 @@ let filterItemsApplierId = 1;
 
 /**
  * Generates a method to easily check if a row is matching the current filter model.
- * @param {GridRowIdGetter | undefined} getRowId The getter for row's id.
  * @param {GridFilterModel} filterModel The model with which we want to filter the rows.
- * @param {React.MutableRefObject<GridApiCommunity>} apiRef The API of the grid.
+ * @param {React.MutableRefObject<GridPrivateApiCommunity>} apiRef The API of the grid.
  * @returns {GridAggregatedFilterItemApplier | null} A method that checks if a row is matching the current filter model. If `null`, we consider that all the rows are matching the filters.
  */
-export const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef, disableEval) => {
+const buildAggregatedFilterItemsApplier = (filterModel, apiRef, disableEval) => {
   const {
     items
   } = filterModel;
@@ -151,7 +170,7 @@ export const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef,
       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(getRowId ? getRowId(row) : row.id);
+          resultPerItemId[applier.item.id] = applier.v7 ? applier.fn(row) : applier.fn(apiRef.current.getRowId(row));
         }
       }
       return resultPerItemId;
@@ -167,14 +186,14 @@ export const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef,
       ${appliers.map((applier, i) => `${JSON.stringify(String(applier.item.id))}:
           !shouldApply${i} ?
             false :
-            ${applier.v7 ? `appliers[${i}].fn(row)` : `appliers[${i}].fn(${getRowId ? 'getRowId(row)' : 'row.id'})`},
+            ${applier.v7 ? `appliers[${i}].fn(row)` : `appliers[${i}].fn(getRowId(row))`},
       `).join('\n')}};
 
       return result$$;
     })`;
   const filterItemCore = evalCode(filterItemTemplate.replaceAll('$$', String(filterItemsApplierId)));
   const filterItem = (row, shouldApplyItem) => {
-    return filterItemCore(getRowId, appliers, row, shouldApplyItem);
+    return filterItemCore(apiRef.current.getRowId, appliers, row, shouldApplyItem);
   };
   filterItemsApplierId += 1;
   return filterItem;
@@ -182,12 +201,11 @@ export const buildAggregatedFilterItemsApplier = (getRowId, filterModel, apiRef,
 
 /**
  * Generates a method to easily check if a row is matching the current quick filter.
- * @param {GridRowIdGetter | undefined} getRowId The getter for row's id.
  * @param {any[]} filterModel The model with which we want to filter the rows.
- * @param {React.MutableRefObject<GridApiCommunity>} apiRef The API of the grid.
+ * @param {React.MutableRefObject<GridPrivateApiCommunity>} apiRef The API of the grid.
  * @returns {GridAggregatedFilterItemApplier | null} A method that checks if a row is matching the current filter model. If `null`, we consider that all the rows are matching the filters.
  */
-export const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef) => {
+const buildAggregatedQuickFilterApplier = (filterModel, apiRef) => {
   const quickFilterValues = filterModel.quickFilterValues?.filter(Boolean) ?? [];
   if (quickFilterValues.length === 0) {
     return null;
@@ -195,6 +213,10 @@ export const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef)
   const quickFilterExcludeHiddenColumns = filterModel.quickFilterExcludeHiddenColumns ?? false;
   const columnFields = quickFilterExcludeHiddenColumns ? gridVisibleColumnFieldsSelector(apiRef) : gridColumnFieldsSelector(apiRef);
   const appliersPerField = [];
+  const {
+    ignoreDiacritics
+  } = apiRef.current.rootProps;
+  const publicApiRef = getPublicApiRef(apiRef);
   columnFields.forEach(field => {
     const column = apiRef.current.getColumn(field);
     const getApplyQuickFilterFn = column?.getApplyQuickFilterFn;
@@ -204,18 +226,24 @@ export const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef)
     if (getApplyQuickFilterFnV7 && !(hasUserFunctionLegacy && !hasUserFunctionV7)) {
       appliersPerField.push({
         column,
-        appliers: quickFilterValues.map(value => ({
-          v7: true,
-          fn: getApplyQuickFilterFnV7(value, column, apiRef)
-        }))
+        appliers: quickFilterValues.map(quickFilterValue => {
+          const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
+          return {
+            v7: true,
+            fn: getApplyQuickFilterFnV7(value, column, publicApiRef)
+          };
+        })
       });
     } else if (getApplyQuickFilterFn) {
       appliersPerField.push({
         column,
-        appliers: quickFilterValues.map(value => ({
-          v7: false,
-          fn: getApplyQuickFilterFn(value, column, apiRef)
-        }))
+        appliers: quickFilterValues.map(quickFilterValue => {
+          const value = ignoreDiacritics ? removeDiacritics(quickFilterValue) : quickFilterValue;
+          return {
+            v7: false,
+            fn: getApplyQuickFilterFn(value, column, publicApiRef)
+          };
+        })
       });
     }
   });
@@ -238,18 +266,24 @@ export const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef)
           continue;
         }
         const applier = appliers[v];
-        const value = apiRef.current.getRowValue(row, column);
+        let value = apiRef.current.getRowValue(row, column);
         if (applier.fn === null) {
           continue;
         }
         if (applier.v7) {
-          const isMatching = applier.fn(value, row, column, apiRef);
+          if (ignoreDiacritics) {
+            value = removeDiacritics(value);
+          }
+          const isMatching = applier.fn(value, row, column, publicApiRef);
           if (isMatching) {
             result[filterValue] = true;
             continue outer;
           }
         } else {
-          const cellParams = usedCellParams[field] ?? apiRef.current.getCellParams(getRowId ? getRowId(row) : row.id, field);
+          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) {
@@ -265,9 +299,9 @@ export const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef)
     return result;
   };
 };
-export const buildAggregatedFilterApplier = (getRowId, filterModel, apiRef, disableEval) => {
-  const isRowMatchingFilterItems = buildAggregatedFilterItemsApplier(getRowId, filterModel, apiRef, disableEval);
-  const isRowMatchingQuickFilter = buildAggregatedQuickFilterApplier(getRowId, filterModel, apiRef);
+export const buildAggregatedFilterApplier = (filterModel, apiRef, disableEval) => {
+  const isRowMatchingFilterItems = buildAggregatedFilterItemsApplier(filterModel, apiRef, disableEval);
+  const isRowMatchingQuickFilter = buildAggregatedQuickFilterApplier(filterModel, apiRef);
   return function isRowMatchingFilters(row, shouldApplyFilter, result) {
     result.passingFilterItems = isRowMatchingFilterItems?.(row, shouldApplyFilter) ?? null;
     result.passingQuickFilterValues = isRowMatchingQuickFilter?.(row, shouldApplyFilter) ?? null;

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

@@ -59,7 +59,7 @@ export const useGridFilter = (apiRef, props) => {
   const updateFilteredRows = React.useCallback(() => {
     apiRef.current.setState(state => {
       const filterModel = gridFilterModelSelector(state, apiRef.current.instanceId);
-      const isRowMatchingFilters = props.filterMode === 'client' ? buildAggregatedFilterApplier(props.getRowId, filterModel, apiRef, props.disableEval) : null;
+      const isRowMatchingFilters = props.filterMode === 'client' ? buildAggregatedFilterApplier(filterModel, apiRef, props.disableEval) : null;
       const filteringResult = apiRef.current.applyStrategyProcessor('filtering', {
         isRowMatchingFilters,
         filterModel: filterModel ?? getDefaultGridFilterModel()
@@ -73,7 +73,7 @@ export const useGridFilter = (apiRef, props) => {
       });
     });
     apiRef.current.publishEvent('filteredRowsSet');
-  }, [apiRef, props.filterMode, props.getRowId, props.disableEval]);
+  }, [apiRef, props.filterMode, props.disableEval]);
   const addColumnMenuItem = React.useCallback((columnMenuItems, colDef) => {
     if (colDef == null || colDef.filterable === false || props.disableColumnFilter) {
       return columnMenuItems;
@@ -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.17.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/DataGrid/DataGrid.js

@@ -286,6 +286,12 @@ DataGridRaw.propTypes = {
    * @default false
    */
   hideFooterSelectedRowCount: _propTypes.default.bool,
+  /**
+   * If `true`, the diacritics (accents) are ignored when filtering or quick filtering.
+   * E.g. when filter value is `cafe`, the rows with `café` will be visible.
+   * @default false
+   */
+  ignoreDiacritics: _propTypes.default.bool,
   /**
    * The initial state of the DataGrid.
    * The data in it will be set in the state on initialization but will not be controlled.

package/node/DataGrid/useDataGridProps.js

@@ -60,6 +60,7 @@ const DATA_GRID_PROPS_DEFAULT_VALUES = exports.DATA_GRID_PROPS_DEFAULT_VALUES =
   hideFooterPagination: false,
   hideFooterRowCount: false,
   hideFooterSelectedRowCount: false,
+  ignoreDiacritics: false,
   logger: console,
   logLevel: process.env.NODE_ENV === 'production' ? 'error' : 'warn',
   pagination: false,

package/node/colDef/gridStringOperators.js

@@ -8,13 +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 (_, row, column, apiRef) => {
-    const columnValue = apiRef.current.getRowFormattedValue(row, column);
+    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/components/containers/GridRootStyles.js

@@ -198,7 +198,8 @@ const GridRootStyles = exports.GridRootStyles = (0, _styles.styled)('div', {
         overflow: 'visible !important'
       },
       [`& .${_gridClasses.gridClasses.cell} > *`]: {
-        overflow: 'visible !important'
+        overflow: 'visible !important',
+        whiteSpace: 'nowrap'
       }
     },
     [`& .${_gridClasses.gridClasses['virtualScrollerContent--overflowed']} .${_gridClasses.gridClasses['row--lastVisible']} .${_gridClasses.gridClasses.cell}`]: {

package/node/components/menu/columnMenu/menuItems/GridColumnMenuSortItem.js

@@ -41,6 +41,10 @@ function GridColumnMenuSortItem(props) {
   if (!colDef || !colDef.sortable || !sortingOrder.some(item => !!item)) {
     return null;
   }
+  const getLabel = key => {
+    const label = apiRef.current.getLocaleText(key);
+    return typeof label === 'function' ? label(colDef) : label;
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
     children: [sortingOrder.includes('asc') && sortDirection !== 'asc' ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_MenuItem.default, {
       onClick: onSortMenuItemClick,
@@ -50,7 +54,7 @@ function GridColumnMenuSortItem(props) {
           fontSize: "small"
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListItemText.default, {
-        children: apiRef.current.getLocaleText('columnMenuSortAsc')
+        children: getLabel('columnMenuSortAsc')
       })]
     }) : null, sortingOrder.includes('desc') && sortDirection !== 'desc' ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_MenuItem.default, {
       onClick: onSortMenuItemClick,
@@ -60,7 +64,7 @@ function GridColumnMenuSortItem(props) {
           fontSize: "small"
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListItemText.default, {
-        children: apiRef.current.getLocaleText('columnMenuSortDesc')
+        children: getLabel('columnMenuSortDesc')
       })]
     }) : null, sortingOrder.includes(null) && sortDirection != null ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_MenuItem.default, {
       onClick: onSortMenuItemClick,

package/node/hooks/core/useGridInitialization.js

@@ -20,6 +20,9 @@ const useGridInitialization = (inputApiRef, props) => {
   (0, _pipeProcessing.useGridPipeProcessing)(privateApiRef);
   (0, _strategyProcessing.useGridStrategyProcessing)(privateApiRef);
   (0, _useGridLocaleText.useGridLocaleText)(privateApiRef, props);
+  privateApiRef.current.register('private', {
+    rootProps: props
+  });
   return privateApiRef;
 };
 exports.useGridInitialization = useGridInitialization;