@mui/x-data-grid 8.0.0-alpha.7 → 8.0.0-alpha.8

package/locales/csCZ.js

@@ -110,6 +110,8 @@ const csCZGrid = {
   'headerFilterOperator>=': 'Větší než nebo rovno',
   'headerFilterOperator<': 'Menší než',
   'headerFilterOperator<=': 'Menší než nebo rovno',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'jakýkoliv',
   filterValueTrue: 'ano',

package/locales/daDK.js

@@ -102,6 +102,8 @@ const daDKGrid = {
   'headerFilterOperator>=': 'Større end eller lig med',
   'headerFilterOperator<': 'Mindre end',
   'headerFilterOperator<=': 'Mindre end eller lig med',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'hvilken som helst',
   filterValueTrue: 'positiv',

package/locales/deDE.js

@@ -100,6 +100,8 @@ const deDEGrid = {
   'headerFilterOperator>=': 'Größer als oder gleich',
   'headerFilterOperator<': 'Kleiner als',
   'headerFilterOperator<=': 'Kleiner als oder gleich',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'Beliebig',
   filterValueTrue: 'Ja',

package/locales/elGR.js

@@ -102,6 +102,8 @@ const elGRGrid = {
   'headerFilterOperator>=': 'Μεγαλύτερο ή ίσο με',
   'headerFilterOperator<': 'Μικρότερο από',
   'headerFilterOperator<=': 'Μικρότερο ή ίσο με',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'οποιοδήποτε',
   filterValueTrue: 'αληθές',

package/locales/esES.js

@@ -100,6 +100,8 @@ const esESGrid = {
   'headerFilterOperator>=': 'Es mayor o igual que',
   'headerFilterOperator<': 'Es menor que',
   'headerFilterOperator<=': 'Es menor o igual que',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'cualquiera',
   filterValueTrue: 'verdadero',

package/locales/faIR.js

@@ -102,6 +102,8 @@ const faIRGrid = {
   'headerFilterOperator>=': 'بزرگتر یا مساوی',
   'headerFilterOperator<': 'کوچکتر',
   'headerFilterOperator<=': 'کوچکتر یا مساوی',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'هرچیزی',
   filterValueTrue: 'صحیح',

package/locales/fiFI.js

@@ -102,6 +102,8 @@ const fiFIGrid = {
   'headerFilterOperator>=': 'Enemmän tai yhtä paljon kuin',
   'headerFilterOperator<': 'Vähemmän kuin',
   'headerFilterOperator<=': 'Vähemmän tai yhtä paljon kuin',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'mikä tahansa',
   filterValueTrue: 'tosi',

package/locales/frFR.js

@@ -102,6 +102,8 @@ const frFRGrid = {
   'headerFilterOperator>=': 'Est supérieur ou égal à',
   'headerFilterOperator<': 'Est inférieur à',
   'headerFilterOperator<=': 'Est inférieur ou égal à',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'tous',
   filterValueTrue: 'vrai',

package/locales/heIL.js

@@ -100,6 +100,8 @@ const heILGrid = {
   'headerFilterOperator>=': 'גדול שווה ל-',
   'headerFilterOperator<': 'קטן מ-',
   'headerFilterOperator<=': 'קטן שווה ל-',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'כל ערך',
   filterValueTrue: 'כן',

package/locales/hrHR.js

@@ -110,6 +110,8 @@ const hrHRGrid = {
   'headerFilterOperator>=': 'Veće ili jednako',
   'headerFilterOperator<': 'Manje od',
   'headerFilterOperator<=': 'Manje od ili jednako',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'bilo koji',
   filterValueTrue: 'tačno',

package/locales/huHU.js

@@ -102,6 +102,8 @@ const huHUGrid = {
   'headerFilterOperator>=': 'Nagyobb vagy egyenlő',
   'headerFilterOperator<': 'Kisebb mint',
   'headerFilterOperator<=': 'Kisebb vagy egyenlő',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'bármilyen',
   filterValueTrue: 'igaz',

package/locales/isIS.js

@@ -102,6 +102,8 @@ const isISGrid = {
   'headerFilterOperator>=': 'Stærra en eða jafnt og',
   'headerFilterOperator<': 'Minna en',
   'headerFilterOperator<=': 'Minna en eða jafnt og',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'hvað sem er',
   filterValueTrue: 'satt',

package/locales/itIT.js

@@ -102,6 +102,8 @@ const itITGrid = {
   'headerFilterOperator>=': 'Maggiore o uguale a',
   'headerFilterOperator<': 'Minore di',
   'headerFilterOperator<=': 'Minore o uguale a',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'qualunque',
   filterValueTrue: 'vero',

package/locales/jaJP.js

@@ -102,6 +102,8 @@ const jaJPGrid = {
   'headerFilterOperator>=': '以上',
   'headerFilterOperator<': '未満',
   'headerFilterOperator<=': '以下',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'いずれか',
   filterValueTrue: '真',

package/locales/koKR.js

@@ -100,6 +100,8 @@ const koKRGrid = {
   'headerFilterOperator>=': '같거나 더 큰',
   'headerFilterOperator<': '더 작은',
   'headerFilterOperator<=': '같거나 더 작은',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: '아무값',
   filterValueTrue: '참',

package/locales/nbNO.js

@@ -102,6 +102,8 @@ const nbNOGrid = {
   'headerFilterOperator>=': 'Større enn eller lik',
   'headerFilterOperator<': 'Mindre enn',
   'headerFilterOperator<=': 'Mindre enn eller lik',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'noen',
   filterValueTrue: 'sant',

package/locales/nlNL.js

@@ -101,6 +101,8 @@ const nlNLGrid = {
   'headerFilterOperator>=': 'Is groter dan of gelijk aan',
   'headerFilterOperator<': 'Is kleiner dan',
   'headerFilterOperator<=': 'Is kleiner dan of gelijk aan',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'alles',
   filterValueTrue: 'waar',

package/locales/nnNO.js

@@ -102,6 +102,8 @@ const nnNOGrid = {
   'headerFilterOperator>=': 'Større enn eller lik',
   'headerFilterOperator<': 'Mindre enn',
   'headerFilterOperator<=': 'Mindre enn eller lik',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'nokon',
   filterValueTrue: 'sant',

package/locales/plPL.js

@@ -103,6 +103,8 @@ const plPLGrid = {
   'headerFilterOperator>=': 'Większy lub równy',
   'headerFilterOperator<': 'Mniejszy niż',
   'headerFilterOperator<=': 'Mniejszy lub równe',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'dowolny',
   filterValueTrue: 'prawda',

package/locales/ptBR.js

@@ -100,6 +100,8 @@ const ptBRGrid = {
   'headerFilterOperator>=': 'Maior que ou igual a',
   'headerFilterOperator<': 'Menor que',
   'headerFilterOperator<=': 'Menor que ou igual a',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'qualquer',
   filterValueTrue: 'verdadeiro',

package/locales/ptPT.js

@@ -100,6 +100,8 @@ const ptPTGrid = {
   'headerFilterOperator>=': 'Melhor que ou igual a',
   'headerFilterOperator<': 'Menor que',
   'headerFilterOperator<=': 'Menos que ou igual a',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'qualquer',
   filterValueTrue: 'verdadeiro',

package/locales/roRO.js

@@ -100,6 +100,8 @@ const roROGrid = {
   'headerFilterOperator>=': 'Mai mare sau egal cu',
   'headerFilterOperator<': 'Mai mic decât',
   'headerFilterOperator<=': 'Mai mic sau egal cu',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'Aleatoriu',
   filterValueTrue: 'Da',

package/locales/ruRU.js

@@ -117,6 +117,8 @@ const ruRUGrid = {
   'headerFilterOperator>=': 'больше или равно',
   'headerFilterOperator<': 'меньше чем',
   'headerFilterOperator<=': 'меньше или равно',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'любой',
   filterValueTrue: 'истина',

package/locales/skSK.js

@@ -110,6 +110,8 @@ const skSKGrid = {
   'headerFilterOperator>=': 'Väčší ako alebo rovný',
   'headerFilterOperator<': 'Menší ako',
   'headerFilterOperator<=': 'Menší ako alebo rovný',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'akýkoľvek',
   filterValueTrue: 'áno',

package/locales/svSE.js

@@ -102,6 +102,8 @@ const svSEGrid = {
   'headerFilterOperator>=': 'Större eller lika med',
   'headerFilterOperator<': 'Mindre än',
   'headerFilterOperator<=': 'Mindre eller lika med',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'något',
   filterValueTrue: 'sant',

package/locales/trTR.js

@@ -100,6 +100,8 @@ const trTRGrid = {
   'headerFilterOperator>=': 'Büyük veya eşit',
   'headerFilterOperator<': 'Küçüktür',
   'headerFilterOperator<=': 'Küçük veya eşit',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'herhangi',
   filterValueTrue: 'doğru',

package/locales/ukUA.js

@@ -117,6 +117,8 @@ const ukUAGrid = {
   'headerFilterOperator>=': 'Більше або дорівнює',
   'headerFilterOperator<': 'Менше ніж',
   'headerFilterOperator<=': 'Менше або дорівнює',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'будь-який',
   filterValueTrue: 'так',

package/locales/urPK.js

@@ -102,6 +102,8 @@ const urPKGrid = {
   'headerFilterOperator>=': 'ذیادہ یا برابر ہے',
   'headerFilterOperator<': 'کم ہے',
   'headerFilterOperator<=': 'کم یا برابر ہے',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'کوئی بھی',
   filterValueTrue: 'صحیح',

package/locales/viVN.js

@@ -102,6 +102,8 @@ const viVNGrid = {
   'headerFilterOperator>=': 'Lớn hơn hoặc bằng',
   'headerFilterOperator<': 'Nhỏ hơn',
   'headerFilterOperator<=': 'Nhỏ hơn hoặc bằng',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: 'bất kỳ giá trị nào',
   filterValueTrue: 'Có',

package/locales/zhCN.js

@@ -100,6 +100,8 @@ const zhCNGrid = {
   'headerFilterOperator>=': '大于或等于',
   'headerFilterOperator<': '小于',
   'headerFilterOperator<=': '小于或等于',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: '任何',
   filterValueTrue: '真',

package/locales/zhHK.js

@@ -102,6 +102,8 @@ const zhHKGrid = {
   'headerFilterOperator>=': '大於或等於',
   'headerFilterOperator<': '少於',
   'headerFilterOperator<=': '小於或等於',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: '任何',
   filterValueTrue: '真的',

package/locales/zhTW.js

@@ -102,6 +102,8 @@ const zhTWGrid = {
   'headerFilterOperator>=': '大於或等於',
   'headerFilterOperator<': '小於',
   'headerFilterOperator<=': '小於或等於',
+  // headerFilterClear: 'Clear filter',
+
   // Filter values text
   filterValueAny: '任何值',
   filterValueTrue: '真',

package/material/index.js

@@ -61,7 +61,8 @@ const iconSlots = {
   loadIcon: GridLoadIcon,
   filterPanelAddIcon: GridAddIcon,
   filterPanelRemoveAllIcon: GridDeleteForeverIcon,
-  columnReorderIcon: GridDragIcon
+  columnReorderIcon: GridDragIcon,
+  menuItemCheckIcon: GridCheckIcon
 };
 const baseSlots = {
   baseBadge: MUIBadge,

package/models/api/gridLocaleTextApi.d.ts

@@ -97,6 +97,7 @@ export interface GridLocaleText {
     'headerFilterOperator>=': string;
     'headerFilterOperator<': string;
     'headerFilterOperator<=': string;
+    headerFilterClear: string;
     filterValueAny: string;
     filterValueTrue: string;
     filterValueFalse: string;

package/models/colDef/gridColDef.d.ts

@@ -24,13 +24,13 @@ export type ValueOptions = string | number | {
  * Value that can be used as a key for grouping rows
  */
 export type GridKeyValue = string | number | boolean;
-export type GridApplyQuickFilter<R extends GridValidRowModel = GridValidRowModel, V = any> = (value: V, row: R, column: GridColDef, apiRef: React.MutableRefObject<GridApiCommunity>) => boolean;
-export type GetApplyQuickFilterFn<R extends GridValidRowModel = GridValidRowModel, V = any> = (value: any, colDef: GridStateColDef<R, V>, apiRef: React.MutableRefObject<GridApiCommunity>) => null | GridApplyQuickFilter<R, V>;
-export type GridValueGetter<R extends GridValidRowModel = GridValidRowModel, V = any, F = V, TValue = never> = (value: TValue, row: R, column: GridColDef<R, V, F>, apiRef: React.MutableRefObject<GridApiCommunity>) => V;
-export type GridValueFormatter<R extends GridValidRowModel = GridValidRowModel, V = any, F = V, TValue = never> = (value: TValue, row: R, column: GridColDef<R, V, F>, apiRef: React.MutableRefObject<GridApiCommunity>) => F;
-export type GridValueSetter<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> = (value: V, row: R, column: GridColDef<R, V, F>, apiRef: React.MutableRefObject<GridApiCommunity>) => R;
-export type GridValueParser<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> = (value: F | undefined, row: R | undefined, column: GridColDef<R, V, F>, apiRef: React.MutableRefObject<GridApiCommunity>) => V;
-export type GridColSpanFn<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> = (value: V, row: R, column: GridColDef<R, V, F>, apiRef: React.MutableRefObject<GridApiCommunity>) => number | undefined;
+export type GridApplyQuickFilter<R extends GridValidRowModel = GridValidRowModel, V = any> = (value: V, row: R, column: GridColDef, apiRef: React.RefObject<GridApiCommunity>) => boolean;
+export type GetApplyQuickFilterFn<R extends GridValidRowModel = GridValidRowModel, V = any> = (value: any, colDef: GridStateColDef<R, V>, apiRef: React.RefObject<GridApiCommunity>) => null | GridApplyQuickFilter<R, V>;
+export type GridValueGetter<R extends GridValidRowModel = GridValidRowModel, V = any, F = V, TValue = never> = (value: TValue, row: R, column: GridColDef<R, V, F>, apiRef: React.RefObject<GridApiCommunity>) => V;
+export type GridValueFormatter<R extends GridValidRowModel = GridValidRowModel, V = any, F = V, TValue = never> = (value: TValue, row: R, column: GridColDef<R, V, F>, apiRef: React.RefObject<GridApiCommunity>) => F;
+export type GridValueSetter<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> = (value: V, row: R, column: GridColDef<R, V, F>, apiRef: React.RefObject<GridApiCommunity>) => R;
+export type GridValueParser<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> = (value: F | undefined, row: R | undefined, column: GridColDef<R, V, F>, apiRef: React.RefObject<GridApiCommunity>) => V;
+export type GridColSpanFn<R extends GridValidRowModel = GridValidRowModel, V = any, F = V> = (value: V, row: R, column: GridColDef<R, V, F>, apiRef: React.RefObject<GridApiCommunity>) => number | undefined;
 /**
  * Column Definition base interface.
  */
@@ -217,7 +217,7 @@ export interface GridBaseColDef<R extends GridValidRowModel = GridValidRowModel,
      * This function can return `null` to skip filtering for this value and column.
      * @param {any} value The value with which we want to filter the column.
      * @param {GridStateColDef} colDef The column from which we want to filter the rows.
-     * @param {React.MutableRefObject<GridApiCommunity>} apiRef Deprecated: The API of the grid.
+     * @param {React.RefObject<GridApiCommunity>} apiRef Deprecated: The API of the grid.
      * @returns {null | GridApplyQuickFilter} The function to call to check if a row pass this filter value or not.
      */
     getApplyQuickFilterFn?: GetApplyQuickFilterFn<R, V>;

package/models/events/gridEventLookup.d.ts

@@ -584,7 +584,12 @@ export interface GridEventLookup extends GridRowEventLookup, GridColumnHeaderEve
      * Fired when the content size used by the `GridVirtualScroller` changes.
      * @ignore - do not document.
      */
-    virtualScrollerContentSizeChange: {};
+    virtualScrollerContentSizeChange: {
+        params: {
+            columnsTotalWidth: number;
+            contentHeight: number;
+        };
+    };
     /**
      * Fired when the content is scrolled by the mouse wheel.
      * It's attached to the "mousewheel" event.

package/models/gridExport.d.ts

@@ -49,7 +49,7 @@ export interface GridGetRowsToExportParams<Api extends GridApiCommon = GridApiCo
     /**
      * The API of the grid.
      */
-    apiRef: React.MutableRefObject<Api>;
+    apiRef: React.RefObject<Api>;
 }
 export interface GridCsvGetRowsToExportParams<Api extends GridApiCommon = GridApiCommunity> extends GridGetRowsToExportParams<Api> {
 }

package/models/gridFilterOperator.d.ts

@@ -3,7 +3,7 @@ import { GridFilterItem } from './gridFilterItem';
 import type { GridColDef } from './colDef/gridColDef';
 import type { GridValidRowModel } from './gridRows';
 import type { GridApiCommunity } from './api/gridApiCommunity';
-type ApplyFilterFn<R extends GridValidRowModel = any, V = any, F = V> = (value: V, row: R, column: GridColDef<R, V, F>, apiRef: React.MutableRefObject<GridApiCommunity>) => boolean;
+type ApplyFilterFn<R extends GridValidRowModel = any, V = any, F = V> = (value: V, row: R, column: GridColDef<R, V, F>, apiRef: React.RefObject<GridApiCommunity>) => boolean;
 export type GetApplyFilterFn<R extends GridValidRowModel = any, V = any, F = V> = (filterItem: GridFilterItem, column: GridColDef<R, V, F>) => null | ApplyFilterFn<R, V, F>;
 /**
  * Filter operator definition interface.

package/models/gridIconSlotsComponent.d.ts

@@ -178,4 +178,9 @@ export interface GridIconSlotsComponent {
      * @default GridDragIcon
      */
     columnReorderIcon: React.JSXElementConstructor<any>;
+    /**
+     * Icon displayed to indicate that a menu item is selected.
+     * @default GridCheckIcon
+     */
+    menuItemCheckIcon: React.JSXElementConstructor<any>;
 }

package/models/gridStateCommunity.d.ts

@@ -45,4 +45,8 @@ export interface GridInitialStateCommunity {
     columns?: GridColumnsInitialState;
     preferencePanel?: GridPreferencePanelInitialState;
     density?: GridDensityState;
+    scroll?: {
+        top: number;
+        left: number;
+    };
 }

package/modern/DataGrid/DataGrid.js

@@ -4,14 +4,14 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { forwardRef } from '@mui/x-internals/forwardRef';
-import { GridBody, GridFooterPlaceholder, GridHeader, GridRoot } from "../components/index.js";
+import { GridRoot } from "../components/index.js";
 import { useGridAriaAttributes } from "../hooks/utils/useGridAriaAttributes.js";
 import { useGridRowAriaAttributes } from "../hooks/features/rows/useGridRowAriaAttributes.js";
 import { GridContextProvider } from "../context/GridContextProvider.js";
 import { useDataGridComponent } from "./useDataGridComponent.js";
 import { useDataGridProps } from "./useDataGridProps.js";
 import { propValidatorsDataGrid, validateProps } from "../internals/utils/propValidation.js";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 const configuration = {
   hooks: {
     useGridAriaAttributes,
@@ -34,13 +34,12 @@ const DataGridRaw = forwardRef(function DataGrid(inProps, ref) {
     privateApiRef: privateApiRef,
     configuration: configuration,
     props: props,
-    children: /*#__PURE__*/_jsxs(GridRoot, _extends({
+    children: /*#__PURE__*/_jsx(GridRoot, _extends({
       className: props.className,
       style: props.style,
       sx: props.sx
     }, props.slotProps?.root, {
-      ref: ref,
-      children: [/*#__PURE__*/_jsx(GridHeader, {}), /*#__PURE__*/_jsx(GridBody, {}), /*#__PURE__*/_jsx(GridFooterPlaceholder, {})]
+      ref: ref
     }))
   });
 });

package/modern/DataGrid/useDataGridComponent.js

@@ -44,6 +44,7 @@ export const useDataGridComponent = (inputApiRef, props) => {
   useGridInitializeState(dimensionsStateInitializer, apiRef, props);
   useGridInitializeState(rowSelectionStateInitializer, apiRef, props);
   useGridInitializeState(columnsStateInitializer, apiRef, props);
+  useGridInitializeState(paginationStateInitializer, apiRef, props);
   useGridInitializeState(rowsStateInitializer, apiRef, props);
   useGridInitializeState(editingStateInitializer, apiRef, props);
   useGridInitializeState(focusStateInitializer, apiRef, props);
@@ -53,7 +54,6 @@ export const useDataGridComponent = (inputApiRef, props) => {
   useGridInitializeState(rowSpanningStateInitializer, apiRef, props);
   useGridInitializeState(densityStateInitializer, apiRef, props);
   useGridInitializeState(columnResizeStateInitializer, apiRef, props);
-  useGridInitializeState(paginationStateInitializer, apiRef, props);
   useGridInitializeState(rowsMetaStateInitializer, apiRef, props);
   useGridInitializeState(columnMenuStateInitializer, apiRef, props);
   useGridInitializeState(columnGroupsStateInitializer, apiRef, props);

package/modern/components/GridHeaders.js

@@ -18,7 +18,7 @@ function GridHeaders() {
   const filterColumnLookup = useGridSelector(apiRef, gridFilterActiveItemsLookupSelector);
   const sortColumnLookup = useGridSelector(apiRef, gridSortColumnLookupSelector);
   const columnHeaderTabIndexState = useGridSelector(apiRef, gridTabIndexColumnHeaderSelector);
-  const cellTabIndexState = useGridSelector(apiRef, gridTabIndexCellSelector);
+  const hasNoCellTabIndexState = useGridSelector(apiRef, () => gridTabIndexCellSelector(apiRef) === null);
   const columnGroupHeaderTabIndexState = useGridSelector(apiRef, gridTabIndexColumnGroupHeaderSelector);
   const columnHeaderFocus = useGridSelector(apiRef, gridFocusColumnHeaderSelector);
   const columnGroupHeaderFocus = useGridSelector(apiRef, gridFocusColumnGroupHeaderSelector);
@@ -26,7 +26,7 @@ function GridHeaders() {
   const columnMenuState = useGridSelector(apiRef, gridColumnMenuSelector);
   const columnVisibility = useGridSelector(apiRef, gridColumnVisibilityModelSelector);
   const columnGroupsHeaderStructure = useGridSelector(apiRef, gridColumnGroupsHeaderStructureSelector);
-  const hasOtherElementInTabSequence = !(columnGroupHeaderTabIndexState === null && columnHeaderTabIndexState === null && cellTabIndexState === null);
+  const hasOtherElementInTabSequence = !(columnGroupHeaderTabIndexState === null && columnHeaderTabIndexState === null && hasNoCellTabIndexState);
   const columnsContainerRef = apiRef.current.columnHeadersContainerRef;
   return /*#__PURE__*/_jsx(rootProps.slots.columnHeaders, _extends({
     ref: columnsContainerRef,