@mui/x-data-grid 6.5.0 → 6.6.0

package/legacy/DataGrid/DataGrid.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { chainPropTypes } from '@mui/utils';
@@ -14,15 +15,16 @@ var DataGridRaw = /*#__PURE__*/React.forwardRef(function DataGrid(inProps, ref)
   return /*#__PURE__*/_jsx(GridContextProvider, {
     privateApiRef: privateApiRef,
     props: props,
-    children: /*#__PURE__*/_jsxs(GridRoot, {
+    children: /*#__PURE__*/_jsxs(GridRoot, _extends({
       className: props.className,
       style: props.style,
       sx: props.sx,
-      ref: ref,
+      ref: ref
+    }, props.forwardedProps, {
       children: [/*#__PURE__*/_jsx(GridHeader, {}), /*#__PURE__*/_jsx(GridBody, {
         VirtualScrollerComponent: DataGridVirtualScroller
       }), /*#__PURE__*/_jsx(GridFooterPlaceholder, {})]
-    })
+    }))
   });
 });
 export var DataGrid = /*#__PURE__*/React.memo(DataGridRaw);
@@ -184,6 +186,11 @@ DataGridRaw.propTypes = {
     quickFilterLogicOperator: PropTypes.oneOf(['and', 'or']),
     quickFilterValues: PropTypes.array
   }),
+  /**
+   * Forwarded props for the grid root element.
+   * @ignore - do not document.
+   */
+  forwardedProps: PropTypes.object,
   /**
    * Function that applies CSS classes dynamically on cells.
    * @param {GridCellParams} params With all properties from [[GridCellParams]].

package/legacy/components/GridColumnHeaders.js

@@ -4,11 +4,10 @@ var _excluded = ["innerRef", "className", "visibleColumns", "sortColumnLookup",
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useGridColumnHeaders } from '../hooks/features/columnHeaders/useGridColumnHeaders';
-import { GridScrollArea } from './GridScrollArea';
 import { GridBaseColumnHeaders } from './columnHeaders/GridBaseColumnHeaders';
 import { GridColumnHeadersInner } from './columnHeaders/GridColumnHeadersInner';
-import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 var GridColumnHeaders = /*#__PURE__*/React.forwardRef(function GridColumnsHeaders(props, ref) {
   var innerRef = props.innerRef,
     className = props.className,
@@ -49,18 +48,14 @@ var GridColumnHeaders = /*#__PURE__*/React.forwardRef(function GridColumnsHeader
     getInnerProps = _useGridColumnHeaders.getInnerProps,
     getColumnHeaders = _useGridColumnHeaders.getColumnHeaders,
     getColumnGroupHeaders = _useGridColumnHeaders.getColumnGroupHeaders;
-  return /*#__PURE__*/_jsxs(GridBaseColumnHeaders, _extends({
+  return /*#__PURE__*/_jsx(GridBaseColumnHeaders, _extends({
     ref: ref
   }, getRootProps(other), {
-    children: [/*#__PURE__*/_jsx(GridScrollArea, {
-      scrollDirection: "left"
-    }), /*#__PURE__*/_jsxs(GridColumnHeadersInner, _extends({
+    children: /*#__PURE__*/_jsxs(GridColumnHeadersInner, _extends({
       isDragging: isDragging
     }, getInnerProps(), {
       children: [getColumnGroupHeaders(), getColumnHeaders()]
-    })), /*#__PURE__*/_jsx(GridScrollArea, {
-      scrollDirection: "right"
-    })]
+    }))
   }));
 });
 process.env.NODE_ENV !== "production" ? GridColumnHeaders.propTypes = {

package/legacy/components/cell/GridActionsCell.js

@@ -183,9 +183,9 @@ function GridActionsCell(props) {
       ref: buttonRef,
       id: buttonId,
       "aria-label": apiRef.current.getLocaleText('actionsCellMore'),
-      "aria-controls": menuId,
-      "aria-expanded": open ? 'true' : undefined,
-      "aria-haspopup": "true",
+      "aria-haspopup": "menu",
+      "aria-expanded": open,
+      "aria-controls": open ? menuId : undefined,
       role: "menuitem",
       size: "small",
       onClick: showMenu,

package/legacy/components/cell/GridEditSingleSelectCell.js

@@ -8,6 +8,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils';
+import { GridCellEditStopReasons } from '../../models/params/gridEditCellParams';
 import { isEscapeKey } from '../../utils/keyboardUtils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridEditModes } from '../../models/gridEditRowModel';
@@ -123,11 +124,10 @@ function GridEditSingleSelectCell(props) {
       return;
     }
     if (reason === 'backdropClick' || isEscapeKey(event.key)) {
-      apiRef.current.stopCellEditMode({
-        id: id,
-        field: field,
-        ignoreModifications: true
-      });
+      var params = apiRef.current.getCellParams(id, field);
+      apiRef.current.publishEvent('cellEditStop', _extends({}, params, {
+        reason: isEscapeKey(event.key) ? GridCellEditStopReasons.escapeKeyDown : GridCellEditStopReasons.cellFocusOut
+      }));
     }
   };
   var handleOpen = function handleOpen(event) {

package/legacy/components/columnHeaders/ColumnHeaderMenuIcon.js

@@ -45,9 +45,9 @@ export var ColumnHeaderMenuIcon = /*#__PURE__*/React.memo(function (props) {
         "aria-label": apiRef.current.getLocaleText('columnMenuLabel'),
         size: "small",
         onClick: handleMenuIconClick,
-        "aria-expanded": open ? 'true' : undefined,
-        "aria-haspopup": "true",
-        "aria-controls": columnMenuId,
+        "aria-haspopup": "menu",
+        "aria-expanded": open,
+        "aria-controls": open ? columnMenuId : undefined,
         id: columnMenuButtonId
       }, (_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseIconButton, {
         children: /*#__PURE__*/_jsx(rootProps.slots.columnMenuIcon, {

package/legacy/components/columnHeaders/GridColumnHeaderFilterIconButton.js

@@ -1,8 +1,9 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { unstable_composeClasses as composeClasses } from '@mui/utils';
+import { unstable_composeClasses as composeClasses, unstable_useId as useId } from '@mui/utils';
 import Badge from '@mui/material/Badge';
+import { useGridSelector } from '../../hooks';
 import { gridPreferencePanelStateSelector } from '../../hooks/features/preferencesPanel/gridPreferencePanelSelector';
 import { GridPreferencePanelsValue } from '../../hooks/features/preferencesPanel/gridPreferencePanelsValue';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
@@ -29,6 +30,9 @@ function GridColumnHeaderFilterIconButton(props) {
     classes: rootProps.classes
   });
   var classes = useUtilityClasses(ownerState);
+  var preferencePanel = useGridSelector(apiRef, gridPreferencePanelStateSelector);
+  var labelId = useId();
+  var panelId = useId();
   var toggleFilter = React.useCallback(function (event) {
     event.preventDefault();
     event.stopPropagation();
@@ -38,21 +42,26 @@ function GridColumnHeaderFilterIconButton(props) {
     if (open && openedPanelValue === GridPreferencePanelsValue.filters) {
       apiRef.current.hideFilterPanel();
     } else {
-      apiRef.current.showFilterPanel();
+      apiRef.current.showFilterPanel(undefined, panelId, labelId);
     }
     if (onClick) {
       onClick(apiRef.current.getColumnHeaderParams(field), event);
     }
-  }, [apiRef, field, onClick]);
+  }, [apiRef, field, onClick, panelId, labelId]);
   if (!counter) {
     return null;
   }
+  var open = preferencePanel.open && preferencePanel.labelId === labelId;
   var iconButton = /*#__PURE__*/_jsx(rootProps.slots.baseIconButton, _extends({
+    id: labelId,
     onClick: toggleFilter,
     color: "default",
     "aria-label": apiRef.current.getLocaleText('columnHeaderFiltersLabel'),
     size: "small",
-    tabIndex: -1
+    tabIndex: -1,
+    "aria-haspopup": "menu",
+    "aria-expanded": open,
+    "aria-controls": open ? panelId : undefined
   }, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseIconButton, {
     children: /*#__PURE__*/_jsx(rootProps.slots.columnFilteredIcon, {
       className: classes.icon,

package/legacy/components/containers/GridRoot.js

@@ -64,9 +64,7 @@ var GridRoot = /*#__PURE__*/React.forwardRef(function GridRoot(props, ref) {
     role: "grid",
     "aria-colcount": visibleColumns.length,
     "aria-rowcount": headerGroupingMaxDepth + 1 + pinnedRowsCount + totalRowCount,
-    "aria-multiselectable": !rootProps.disableMultipleRowSelection,
-    "aria-label": rootProps['aria-label'],
-    "aria-labelledby": rootProps['aria-labelledby']
+    "aria-multiselectable": !rootProps.disableMultipleRowSelection
   }, other, {
     children: children
   }));

package/legacy/components/index.js

@@ -15,5 +15,4 @@ export * from './GridNoRowsOverlay';
 export * from './GridPagination';
 export * from './GridRowCount';
 export * from './GridRow';
-export * from './GridSelectedRowCount';
-export * from './GridScrollArea';
+export * from './GridSelectedRowCount';

package/legacy/components/panel/GridPreferencesPanel.js

@@ -17,7 +17,9 @@ export var GridPreferencesPanel = /*#__PURE__*/React.forwardRef(function GridPre
   return /*#__PURE__*/_jsx(rootProps.slots.panel, _extends({
     ref: ref,
     as: rootProps.slots.basePopper,
-    open: columns.length > 0 && preferencePanelState.open
+    open: columns.length > 0 && preferencePanelState.open,
+    id: preferencePanelState.panelId,
+    "aria-labelledby": preferencePanelState.labelId
   }, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.panel, props, (_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.basePopper, {
     children: panelContent
   }));

package/legacy/components/panel/filterPanel/GridFilterInputSingleSelect.js

@@ -119,6 +119,7 @@ function GridFilterInputSingleSelect(props) {
     children: [/*#__PURE__*/_jsxs(rootProps.slots.baseFormControl, {
       children: [/*#__PURE__*/_jsx(rootProps.slots.baseInputLabel, _extends({}, (_rootProps$slotProps2 = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps2.baseInputLabel, {
         id: labelId,
+        htmlFor: id,
         shrink: true,
         variant: "standard",
         children: label

package/legacy/components/toolbar/GridToolbarColumnsButton.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["onClick"];
 import * as React from 'react';
+import { unstable_useId as useId } from '@mui/material/utils';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { gridPreferencePanelStateSelector } from '../../hooks/features/preferencesPanel/gridPreferencePanelSelector';
 import { GridPreferencePanelsValue } from '../../hooks/features/preferencesPanel/gridPreferencePanelsValue';
@@ -12,16 +13,16 @@ export var GridToolbarColumnsButton = /*#__PURE__*/React.forwardRef(function Gri
   var _rootProps$slotProps;
   var onClick = props.onClick,
     other = _objectWithoutProperties(props, _excluded);
+  var columnButtonId = useId();
+  var columnPanelId = useId();
   var apiRef = useGridApiContext();
   var rootProps = useGridRootProps();
-  var _useGridSelector = useGridSelector(apiRef, gridPreferencePanelStateSelector),
-    open = _useGridSelector.open,
-    openedPanelValue = _useGridSelector.openedPanelValue;
+  var preferencePanel = useGridSelector(apiRef, gridPreferencePanelStateSelector);
   var showColumns = function showColumns(event) {
-    if (open && openedPanelValue === GridPreferencePanelsValue.columns) {
+    if (preferencePanel.open && preferencePanel.openedPanelValue === GridPreferencePanelsValue.columns) {
       apiRef.current.hidePreferences();
     } else {
-      apiRef.current.showPreferences(GridPreferencePanelsValue.columns);
+      apiRef.current.showPreferences(GridPreferencePanelsValue.columns, columnPanelId, columnButtonId);
     }
     onClick == null ? void 0 : onClick(event);
   };
@@ -30,10 +31,15 @@ export var GridToolbarColumnsButton = /*#__PURE__*/React.forwardRef(function Gri
   if (rootProps.disableColumnSelector) {
     return null;
   }
+  var isOpen = preferencePanel.open && preferencePanel.panelId === columnPanelId;
   return /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
     ref: ref,
+    id: columnButtonId,
     size: "small",
     "aria-label": apiRef.current.getLocaleText('toolbarColumnsLabel'),
+    "aria-haspopup": "menu",
+    "aria-expanded": isOpen,
+    "aria-controls": isOpen ? columnPanelId : undefined,
     startIcon: /*#__PURE__*/_jsx(rootProps.slots.columnSelectorIcon, {})
   }, other, {
     onClick: showColumns

package/legacy/components/toolbar/GridToolbarDensitySelector.js

@@ -102,9 +102,9 @@ export var GridToolbarDensitySelector = /*#__PURE__*/React.forwardRef(function G
       size: "small",
       startIcon: startIcon,
       "aria-label": apiRef.current.getLocaleText('toolbarDensityLabel'),
-      "aria-expanded": open ? 'true' : undefined,
       "aria-haspopup": "menu",
-      "aria-controls": densityMenuId,
+      "aria-expanded": open,
+      "aria-controls": open ? densityMenuId : undefined,
       id: densityButtonId
     }, other, {
       onClick: handleDensitySelectorOpen

package/legacy/components/toolbar/GridToolbarExportContainer.js

@@ -19,8 +19,8 @@ export var GridToolbarExportContainer = /*#__PURE__*/React.forwardRef(function G
     other = _objectWithoutProperties(props, _excluded);
   var apiRef = useGridApiContext();
   var rootProps = useGridRootProps();
-  var buttonId = useId();
-  var menuId = useId();
+  var exportButtonId = useId();
+  var exportMenuId = useId();
   var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     open = _React$useState2[0],
@@ -60,11 +60,11 @@ export var GridToolbarExportContainer = /*#__PURE__*/React.forwardRef(function G
       ref: handleRef,
       size: "small",
       startIcon: /*#__PURE__*/_jsx(rootProps.slots.exportIcon, {}),
-      "aria-expanded": open ? 'true' : undefined,
+      "aria-expanded": open,
       "aria-label": apiRef.current.getLocaleText('toolbarExportLabel'),
       "aria-haspopup": "menu",
-      "aria-labelledby": menuId,
-      id: buttonId
+      "aria-controls": open ? exportMenuId : undefined,
+      id: exportButtonId
     }, other, {
       onClick: handleMenuOpen
     }, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseButton, {
@@ -75,9 +75,9 @@ export var GridToolbarExportContainer = /*#__PURE__*/React.forwardRef(function G
       onClickAway: handleMenuClickAway,
       position: "bottom-start",
       children: /*#__PURE__*/_jsx(MenuList, {
-        id: menuId,
+        id: exportMenuId,
         className: gridClasses.menuList,
-        "aria-labelledby": buttonId,
+        "aria-labelledby": exportButtonId,
         onKeyDown: handleListKeyDown,
         autoFocusItem: open,
         children: React.Children.map(children, function (child) {

package/legacy/components/toolbar/GridToolbarFilterButton.js

@@ -4,7 +4,7 @@ var _excluded = ["componentsProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
-import { unstable_composeClasses as composeClasses, unstable_capitalize as capitalize } from '@mui/utils';
+import { unstable_composeClasses as composeClasses, unstable_capitalize as capitalize, unstable_useId as useId } from '@mui/utils';
 import Badge from '@mui/material/Badge';
 import { gridColumnLookupSelector } from '../../hooks/features/columns/gridColumnsSelector';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
@@ -26,7 +26,7 @@ var useUtilityClasses = function useUtilityClasses(ownerState) {
 var GridToolbarFilterListRoot = styled('ul', {
   name: 'MuiDataGrid',
   slot: 'ToolbarFilterList',
-  overridesResolver: function overridesResolver(props, styles) {
+  overridesResolver: function overridesResolver(_props, styles) {
     return styles.toolbarFilterList;
   }
 })(function (_ref) {
@@ -48,6 +48,8 @@ var GridToolbarFilterButton = /*#__PURE__*/React.forwardRef(function GridToolbar
   var lookup = useGridSelector(apiRef, gridColumnLookupSelector);
   var preferencePanel = useGridSelector(apiRef, gridPreferencePanelStateSelector);
   var classes = useUtilityClasses(rootProps);
+  var filterButtonId = useId();
+  var filterPanelId = useId();
   var tooltipContentNode = React.useMemo(function () {
     if (preferencePanel.open) {
       return apiRef.current.getLocaleText('toolbarFiltersTooltipHide');
@@ -86,9 +88,9 @@ var GridToolbarFilterButton = /*#__PURE__*/React.forwardRef(function GridToolbar
     var open = preferencePanel.open,
       openedPanelValue = preferencePanel.openedPanelValue;
     if (open && openedPanelValue === GridPreferencePanelsValue.filters) {
-      apiRef.current.hideFilterPanel();
+      apiRef.current.hidePreferences();
     } else {
-      apiRef.current.showFilterPanel();
+      apiRef.current.showPreferences(GridPreferencePanelsValue.filters, filterPanelId, filterButtonId);
     }
     (_buttonProps$onClick = buttonProps.onClick) == null ? void 0 : _buttonProps$onClick.call(buttonProps, event);
   };
@@ -97,14 +99,19 @@ var GridToolbarFilterButton = /*#__PURE__*/React.forwardRef(function GridToolbar
   if (rootProps.disableColumnFilter) {
     return null;
   }
+  var isOpen = preferencePanel.open && preferencePanel.panelId === filterPanelId;
   return /*#__PURE__*/_jsx(rootProps.slots.baseTooltip, _extends({
     title: tooltipContentNode,
     enterDelay: 1000
   }, other, (_rootProps$slotProps = rootProps.slotProps) == null ? void 0 : _rootProps$slotProps.baseTooltip, {
     children: /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
       ref: ref,
+      id: filterButtonId,
       size: "small",
       "aria-label": apiRef.current.getLocaleText('toolbarFiltersLabel'),
+      "aria-controls": isOpen ? filterPanelId : undefined,
+      "aria-expanded": isOpen,
+      "aria-haspopup": true,
       startIcon: /*#__PURE__*/_jsx(Badge, {
         badgeContent: activeFilters.length,
         color: "primary",

package/legacy/hooks/core/strategyProcessing/useGridStrategyProcessing.js

@@ -7,7 +7,8 @@ export var GRID_DEFAULT_STRATEGY = 'none';
 export var GRID_STRATEGIES_PROCESSORS = {
   rowTreeCreation: 'rowTree',
   filtering: 'rowTree',
-  sorting: 'rowTree'
+  sorting: 'rowTree',
+  visibleRowsLookupCreation: 'rowTree'
 };
 /**
  * Implements a variant of the Strategy Pattern (see https://en.wikipedia.org/wiki/Strategy_pattern)

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

@@ -27,12 +27,12 @@ export var gridQuickFilterValuesSelector = createSelector(gridFilterModelSelecto
 });
 
 /**
- * @category Filtering
+ * @category Visible rows
  * @ignore - do not document.
  */
-export var gridVisibleRowsLookupSelector = createSelector(gridFilterStateSelector, function (filterState) {
-  return filterState.visibleRowsLookup;
-});
+export var gridVisibleRowsLookupSelector = function gridVisibleRowsLookupSelector(state) {
+  return state.visibleRowsLookup;
+};
 
 /**
  * @category Filtering

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

@@ -11,4 +11,10 @@ export var getDefaultGridFilterModel = function getDefaultGridFilterModel() {
 /**
  * @param {GridRowId} rowId The id of the row we want to filter.
  * @param {(filterItem: GridFilterItem) => boolean} shouldApplyItem An optional callback to allow the filtering engine to only apply some items.
+ */
+
+/**
+ * Visibility status for each row.
+ * A row is visible if it is passing the filters AND if its parents are expanded.
+ * If a row is not registered in this lookup, it is visible.
  */

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

@@ -21,11 +21,21 @@ export var filterStateInitializer = function filterStateInitializer(state, props
   return _extends({}, state, {
     filter: {
       filterModel: sanitizeFilterModel(filterModel, props.disableMultipleColumnsFiltering, apiRef),
-      visibleRowsLookup: {},
       filteredDescendantCountLookup: {}
-    }
+    },
+    visibleRowsLookup: {}
   });
 };
+var getVisibleRowsLookup = function getVisibleRowsLookup(params) {
+  // For flat tree, the `visibleRowsLookup` and the `filteredRowsLookup` are equals since no row is collapsed.
+  return params.filteredRowsLookup;
+};
+function getVisibleRowsLookupState(apiRef, state) {
+  return apiRef.current.applyStrategyProcessor('visibleRowsLookupCreation', {
+    tree: state.rows.tree,
+    filteredRowsLookup: state.filter.filteredRowsLookup
+  });
+}
 
 /**
  * @requires useGridColumns (method, event)
@@ -50,9 +60,13 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
         isRowMatchingFilters: isRowMatchingFilters,
         filterModel: filterModel != null ? filterModel : getDefaultGridFilterModel()
       });
-      return _extends({}, state, {
+      var newState = _extends({}, state, {
         filter: _extends({}, state.filter, filteringResult)
       });
+      var visibleRowsLookupState = getVisibleRowsLookupState(apiRef, newState);
+      return _extends({}, newState, {
+        visibleRowsLookup: visibleRowsLookupState
+      });
     });
     apiRef.current.publishEvent('filteredRowsSet');
   }, [props.filterMode, apiRef]);
@@ -114,7 +128,7 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
       items: items
     }), 'deleteFilterItem');
   }, [apiRef]);
-  var showFilterPanel = React.useCallback(function (targetColumnField) {
+  var showFilterPanel = React.useCallback(function (targetColumnField, panelId, labelId) {
     logger.debug('Displaying filter panel');
     if (targetColumnField) {
       var filterModel = gridFilterModelSelector(apiRef);
@@ -164,7 +178,7 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
         items: newFilterItems
       }));
     }
-    apiRef.current.showPreferences(GridPreferencePanelsValue.filters);
+    apiRef.current.showPreferences(GridPreferencePanelsValue.filters, panelId, labelId);
   }, [apiRef, logger, props.disableMultipleColumnsFiltering]);
   var hideFilterPanel = React.useCallback(function () {
     logger.debug('Hiding filter panel');
@@ -272,13 +286,10 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
       }
       return {
         filteredRowsLookup: filteredRowsLookup,
-        // For flat tree, the `visibleRowsLookup` and the `filteredRowsLookup` are equals since no row is collapsed.
-        visibleRowsLookup: filteredRowsLookup,
         filteredDescendantCountLookup: {}
       };
     }
     return {
-      visibleRowsLookup: {},
       filteredRowsLookup: {},
       filteredDescendantCountLookup: {}
     };
@@ -288,6 +299,7 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
   useGridRegisterPipeProcessor(apiRef, 'restoreState', stateRestorePreProcessing);
   useGridRegisterPipeProcessor(apiRef, 'preferencePanel', preferencePanelPreProcessing);
   useGridRegisterStrategyProcessor(apiRef, GRID_DEFAULT_STRATEGY, 'filtering', flatFilteringMethod);
+  useGridRegisterStrategyProcessor(apiRef, GRID_DEFAULT_STRATEGY, 'visibleRowsLookupCreation', getVisibleRowsLookup);
 
   /**
    * EVENTS
@@ -310,13 +322,21 @@ export var useGridFilter = function useGridFilter(apiRef, props) {
       apiRef.current.unstable_applyFilters();
     }
   }, [apiRef]);
+  var updateVisibleRowsLookupState = React.useCallback(function () {
+    apiRef.current.setState(function (state) {
+      return _extends({}, state, {
+        visibleRowsLookup: getVisibleRowsLookupState(apiRef, state)
+      });
+    });
+    apiRef.current.forceUpdate();
+  }, [apiRef]);
 
   // Do not call `apiRef.current.forceUpdate` to avoid re-render before updating the sorted rows.
   // Otherwise, the state is not consistent during the render
   useGridApiEventHandler(apiRef, 'rowsSet', updateFilteredRows);
-  useGridApiEventHandler(apiRef, 'rowExpansionChange', apiRef.current.unstable_applyFilters);
   useGridApiEventHandler(apiRef, 'columnsChange', handleColumnsChange);
   useGridApiEventHandler(apiRef, 'activeStrategyProcessorChange', handleStrategyProcessorChange);
+  useGridApiEventHandler(apiRef, 'rowExpansionChange', updateVisibleRowsLookupState);
 
   /**
    * 1ST RENDER

package/legacy/hooks/features/preferencesPanel/useGridPreferencesPanel.js

@@ -56,14 +56,16 @@ export var useGridPreferencesPanel = function useGridPreferencesPanel(apiRef, pr
   var hidePreferencesDelayed = React.useCallback(function () {
     hideTimeout.current = setTimeout(hidePreferences, 100);
   }, [hidePreferences]);
-  var showPreferences = React.useCallback(function (newValue) {
+  var showPreferences = React.useCallback(function (newValue, panelId, labelId) {
     logger.debug('Opening Preferences Panel');
     doNotHidePanel();
     apiRef.current.setState(function (state) {
       return _extends({}, state, {
         preferencePanel: _extends({}, state.preferencePanel, {
           open: true,
-          openedPanelValue: newValue
+          openedPanelValue: newValue,
+          panelId: panelId,
+          labelId: labelId
         })
       });
     });

package/legacy/hooks/features/rows/useGridRowsMeta.js

@@ -1,4 +1,3 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { unstable_debounce as debounce, unstable_capitalize as capitalize } from '@mui/utils';
@@ -105,20 +104,14 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
       } else {
         rowsHeightLookup.current[row.id].needsFirstMeasurement = false;
       }
-      var existingBaseSizes = Object.entries(sizes).reduce(function (acc, _ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          size = _ref2[1];
-        if (/^base[A-Z]/.test(key)) {
-          acc[key] = size;
+      var initialHeights = {};
+      /* eslint-disable-next-line no-restricted-syntax */
+      for (var _key in sizes) {
+        if (/^base[A-Z]/.test(_key)) {
+          initialHeights[_key] = sizes[_key];
         }
-        return acc;
-      }, {});
-
-      // We use an object to make simple to check if a height is already added or not
-      var initialHeights = _extends({}, existingBaseSizes, {
-        baseCenter: baseRowHeight
-      });
+      }
+      initialHeights.baseCenter = baseRowHeight;
       if (getRowSpacing) {
         var _spacing$top, _spacing$bottom;
         var indexRelativeToCurrentPage = apiRef.current.getRowIndexRelativeToVisibleRows(row.id);
@@ -140,16 +133,15 @@ export var useGridRowsMeta = function useGridRowsMeta(apiRef, props) {
       var maximumBaseSize = 0;
       var otherSizes = 0;
       var processedSizes = calculateRowProcessedSizes(row);
-      Object.entries(processedSizes).forEach(function (_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2),
-          size = _ref4[0],
-          value = _ref4[1];
-        if (/^base[A-Z]/.test(size)) {
+      /* eslint-disable-next-line no-restricted-syntax, guard-for-in */
+      for (var _key2 in processedSizes) {
+        var value = processedSizes[_key2];
+        if (/^base[A-Z]/.test(_key2)) {
           maximumBaseSize = value > maximumBaseSize ? value : maximumBaseSize;
         } else {
           otherSizes += value;
         }
-      });
+      }
       return acc + maximumBaseSize + otherSizes;
     }, 0);
     pinnedRows == null ? void 0 : (_pinnedRows$top = pinnedRows.top) == null ? void 0 : _pinnedRows$top.forEach(function (row) {

package/legacy/index.js

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

package/legacy/internals/utils/useProps.js

@@ -1,11 +1,33 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["components", "componentsProps"];
 import * as React from 'react';
+/** Gathers props for the root element into a single `.forwardedProps` field */
+function groupForwardedProps(props) {
+  var _props$forwardedProps;
+  var keys = Object.keys(props);
+  if (!keys.some(function (key) {
+    return key.startsWith('aria-') || key.startsWith('data-');
+  })) {
+    return props;
+  }
+  var newProps = {};
+  var forwardedProps = (_props$forwardedProps = props.forwardedProps) != null ? _props$forwardedProps : {};
+  for (var i = 0; i < keys.length; i += 1) {
+    var _key = keys[i];
+    if (_key.startsWith('aria-') || _key.startsWith('data-')) {
+      forwardedProps[_key] = props[_key];
+    } else {
+      newProps[_key] = props[_key];
+    }
+  }
+  newProps.forwardedProps = forwardedProps;
+  return newProps;
+}
 export function useProps(allProps) {
   return React.useMemo(function () {
     var components = allProps.components,
       componentsProps = allProps.componentsProps,
       themedProps = _objectWithoutProperties(allProps, _excluded);
-    return [components, componentsProps, themedProps];
+    return [components, componentsProps, groupForwardedProps(themedProps)];
   }, [allProps]);
 }