@mui/x-data-grid 5.15.2 → 5.17.0

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

@@ -69,72 +69,72 @@ export const sanitizeFilterModel = (model, disableMultipleColumnsFiltering, apiR
 export const mergeStateWithFilterModel = (filterModel, disableMultipleColumnsFiltering, apiRef) => filteringState => _extends({}, filteringState, {
   filterModel: sanitizeFilterModel(filterModel, disableMultipleColumnsFiltering, apiRef)
 });
-/**
- * Generates a method to easily check if a row is matching the current filter model.
- * @param {GridFilterModel} filterModel The model with which we want to filter the rows.
- * @param {React.MutableRefObject<GridApiCommunity>} 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 = (filterModel, apiRef) => {
-  const {
-    items
-  } = filterModel;
-
-  const getFilterCallbackFromItem = filterItem => {
-    if (!filterItem.columnField || !filterItem.operatorValue) {
-      return null;
-    }
+const getFilterCallbackFromItem = (filterItem, apiRef) => {
+  if (!filterItem.columnField || !filterItem.operatorValue) {
+    return null;
+  }
 
-    const column = apiRef.current.getColumn(filterItem.columnField);
+  const column = apiRef.current.getColumn(filterItem.columnField);
 
-    if (!column) {
-      return null;
-    }
+  if (!column) {
+    return null;
+  }
 
-    let parsedValue;
+  let parsedValue;
 
-    if (column.valueParser) {
-      const parser = column.valueParser;
-      parsedValue = Array.isArray(filterItem.value) ? filterItem.value?.map(x => parser(x)) : parser(filterItem.value);
-    } else {
-      parsedValue = filterItem.value;
-    }
+  if (column.valueParser) {
+    const parser = column.valueParser;
+    parsedValue = Array.isArray(filterItem.value) ? filterItem.value?.map(x => parser(x)) : parser(filterItem.value);
+  } else {
+    parsedValue = filterItem.value;
+  }
 
-    const newFilterItem = _extends({}, filterItem, {
-      value: parsedValue
-    });
+  const newFilterItem = _extends({}, filterItem, {
+    value: parsedValue
+  });
 
-    const filterOperators = column.filterOperators;
+  const filterOperators = column.filterOperators;
 
-    if (!filterOperators?.length) {
-      throw new Error(`MUI: No filter operators found for column '${column.field}'.`);
-    }
+  if (!filterOperators?.length) {
+    throw new Error(`MUI: No filter operators found for column '${column.field}'.`);
+  }
 
-    const filterOperator = filterOperators.find(operator => operator.value === newFilterItem.operatorValue);
+  const filterOperator = filterOperators.find(operator => operator.value === newFilterItem.operatorValue);
 
-    if (!filterOperator) {
-      throw new Error(`MUI: No filter operator found for column '${column.field}' and operator value '${newFilterItem.operatorValue}'.`);
-    }
+  if (!filterOperator) {
+    throw new Error(`MUI: No filter operator found for column '${column.field}' and operator value '${newFilterItem.operatorValue}'.`);
+  }
 
-    const applyFilterOnRow = filterOperator.getApplyFilterFn(newFilterItem, column);
+  const applyFilterOnRow = filterOperator.getApplyFilterFn(newFilterItem, column);
 
-    if (typeof applyFilterOnRow !== 'function') {
-      return null;
-    }
+  if (typeof applyFilterOnRow !== 'function') {
+    return null;
+  }
 
-    const fn = rowId => {
-      const cellParams = apiRef.current.getCellParams(rowId, newFilterItem.columnField);
-      return applyFilterOnRow(cellParams);
-    };
+  const fn = rowId => {
+    const cellParams = apiRef.current.getCellParams(rowId, newFilterItem.columnField);
+    return applyFilterOnRow(cellParams);
+  };
 
-    return {
-      fn,
-      item: newFilterItem
-    };
+  return {
+    fn,
+    item: newFilterItem
   };
+};
+/**
+ * Generates a method to easily check if a row is matching the current filter model.
+ * @param {GridFilterModel} filterModel The model with which we want to filter the rows.
+ * @param {React.MutableRefObject<GridApiCommunity>} 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.
+ */
 
-  const appliers = items.map(getFilterCallbackFromItem).filter(callback => !!callback);
+
+export const buildAggregatedFilterItemsApplier = (filterModel, apiRef) => {
+  const {
+    items
+  } = filterModel;
+  const appliers = items.map(item => getFilterCallbackFromItem(item, apiRef)).filter(callback => !!callback);
 
   if (appliers.length === 0) {
     return null;
@@ -215,7 +215,8 @@ export const buildAggregatedFilterApplier = (filterModel, apiRef) => {
     passingQuickFilterValues: isRowMatchingQuickFilter && isRowMatchingQuickFilter(rowId, shouldApplyFilter)
   });
 };
-export const passFilterLogic = (allFilterItemResults, allQuickFilterResults, filterModel) => {
+export const passFilterLogic = (allFilterItemResults, allQuickFilterResults, filterModel, apiRef) => {
+  const cleanedFilterItems = filterModel.items.filter(item => getFilterCallbackFromItem(item, apiRef) !== null);
   const cleanedAllFilterItemResults = allFilterItemResults.filter(result => result != null);
   const cleanedAllQuickFilterResults = allQuickFilterResults.filter(result => result != null); // Defaultize operators
 
@@ -229,13 +230,13 @@ export const passFilterLogic = (allFilterItemResults, allQuickFilterResults, fil
     };
 
     if (linkOperator === GridLinkOperator.And) {
-      const passesAllFilters = filterModel.items.every(filterItemPredicate);
+      const passesAllFilters = cleanedFilterItems.every(filterItemPredicate);
 
       if (!passesAllFilters) {
         return false;
       }
     } else {
-      const passesSomeFilters = filterModel.items.some(filterItemPredicate);
+      const passesSomeFilters = cleanedFilterItems.some(filterItemPredicate);
 
       if (!passesSomeFilters) {
         return false;

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

@@ -259,7 +259,7 @@ export const useGridFilter = (apiRef, props) => {
             passingFilterItems,
             passingQuickFilterValues
           } = params.isRowMatchingFilters(rowId);
-          isRowPassing = passFilterLogic([passingFilterItems], [passingQuickFilterValues], params.filterModel);
+          isRowPassing = passFilterLogic([passingFilterItems], [passingQuickFilterValues], params.filterModel, apiRef);
         }
 
         filteredRowsLookup[rowId] = isRowPassing;

package/modern/hooks/features/index.js

@@ -1,6 +1,7 @@
 // Only export the variable and types that should be publicly exposed and re-exported from `@mui/x-data-grid-pro`
 export * from './columnMenu';
 export * from './columns';
+export * from './columnGrouping';
 export * from './density';
 export * from './editRows';
 export * from './filter';

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

@@ -105,7 +105,7 @@ export function useGridParamsApi(apiRef) {
       formattedValue: value
     };
 
-    if (colDef.valueFormatter) {
+    if (colDef && colDef.valueFormatter) {
       params.formattedValue = colDef.valueFormatter({
         id,
         field: params.field,

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridLogger } from '../../utils/useGridLogger';
-import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowIdsSelector, gridRowGroupingNameSelector } from './gridRowsSelector';
+import { gridRowCountSelector, gridRowsLookupSelector, gridRowTreeSelector, gridRowIdsSelector, gridRowGroupingNameSelector, gridRowsIdToIdLookupSelector } from './gridRowsSelector';
 import { GridSignature, useGridApiEventHandler } from '../../utils/useGridApiEventHandler';
 import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 import { gridSortedRowIdsSelector } from '../sorting/gridSortingSelector';
@@ -100,14 +100,14 @@ export const useGridRows = (apiRef, props) => {
     } // we remove duplicate updates. A server can batch updates, and send several updates for the same row in one fn call.
 
 
-    const uniqUpdates = new Map();
+    const uniqueUpdates = new Map();
     updates.forEach(update => {
       const id = getRowIdFromRowModel(update, props.getRowId, 'A row was provided without id when calling updateRows():');
 
-      if (uniqUpdates.has(id)) {
-        uniqUpdates.set(id, _extends({}, uniqUpdates.get(id), update));
+      if (uniqueUpdates.has(id)) {
+        uniqueUpdates.set(id, _extends({}, uniqueUpdates.get(id), update));
       } else {
-        uniqUpdates.set(id, update);
+        uniqueUpdates.set(id, update);
       }
     });
     const deletedRowIds = [];
@@ -119,7 +119,7 @@ export const useGridRows = (apiRef, props) => {
       idToIdLookup: _extends({}, prevCache.idToIdLookup),
       ids: [...prevCache.ids]
     };
-    uniqUpdates.forEach((partialRow, id) => {
+    uniqueUpdates.forEach((partialRow, id) => {
       // eslint-disable-next-line no-underscore-dangle
       if (partialRow._action === 'delete') {
         delete newCache.idRowsLookup[id];
@@ -233,8 +233,64 @@ export const useGridRows = (apiRef, props) => {
         ids: updatedRows
       })
     }));
-    apiRef.current.applySorting();
+    apiRef.current.publishEvent('rowsSet');
   }, [apiRef, logger]);
+  const replaceRows = React.useCallback((firstRowToRender, newRows) => {
+    if (props.signature === GridSignature.DataGrid && newRows.length > 1) {
+      throw new Error(["MUI: You can't replace rows using `apiRef.current.unstable_replaceRows` on the DataGrid.", 'You need to upgrade to DataGridPro or DataGridPremium component to unlock this feature.'].join('\n'));
+    }
+
+    if (newRows.length === 0) {
+      return;
+    }
+
+    const allRows = gridRowIdsSelector(apiRef);
+    const updatedRows = [...allRows];
+    const idRowsLookup = gridRowsLookupSelector(apiRef);
+    const idToIdLookup = gridRowsIdToIdLookupSelector(apiRef);
+    const tree = gridRowTreeSelector(apiRef);
+
+    const updatedIdRowsLookup = _extends({}, idRowsLookup);
+
+    const updatedIdToIdLookup = _extends({}, idToIdLookup);
+
+    const updatedTree = _extends({}, tree);
+
+    const newRowEntries = newRows.map(newRowModel => {
+      const rowId = getRowIdFromRowModel(newRowModel, props.getRowId, 'A row was provided without id when calling replaceRows().');
+      return {
+        id: rowId,
+        model: newRowModel
+      };
+    });
+    newRowEntries.forEach((row, index) => {
+      const [replacedRowId] = updatedRows.splice(firstRowToRender + index, 1, row.id);
+      delete updatedIdRowsLookup[replacedRowId];
+      delete updatedIdToIdLookup[replacedRowId];
+      delete updatedTree[replacedRowId];
+    });
+    newRowEntries.forEach(row => {
+      const rowTreeNodeConfig = {
+        id: row.id,
+        parent: null,
+        depth: 0,
+        groupingKey: null,
+        groupingField: null
+      };
+      updatedIdRowsLookup[row.id] = row.model;
+      updatedIdToIdLookup[row.id] = row.id;
+      updatedTree[row.id] = rowTreeNodeConfig;
+    });
+    apiRef.current.setState(state => _extends({}, state, {
+      rows: _extends({}, state.rows, {
+        idRowsLookup: updatedIdRowsLookup,
+        idToIdLookup: updatedIdToIdLookup,
+        tree: updatedTree,
+        ids: updatedRows
+      })
+    }));
+    apiRef.current.publishEvent('rowsSet');
+  }, [apiRef, props.signature, props.getRowId]);
   const rowApi = {
     getRow,
     getRowModels,
@@ -246,7 +302,8 @@ export const useGridRows = (apiRef, props) => {
     setRowChildrenExpansion,
     getRowNode,
     getRowIndexRelativeToVisibleRows,
-    getRowGroupChildren
+    getRowGroupChildren,
+    unstable_replaceRows: replaceRows
   };
   /**
    * EVENTS

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

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { debounce } from '@mui/material/utils';
+import { debounce, capitalize } from '@mui/material/utils';
 import { useGridVisibleRows } from '../../utils/useGridVisibleRows';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { useGridSelector } from '../../utils/useGridSelector';
@@ -45,7 +45,7 @@ export const useGridRowsMeta = (apiRef, props) => {
       if (!rowsHeightLookup.current[row.id]) {
         rowsHeightLookup.current[row.id] = {
           sizes: {
-            base: rowHeightFromDensity
+            baseCenter: rowHeightFromDensity
           },
           isResized: false,
           autoHeight: false,
@@ -60,7 +60,7 @@ export const useGridRowsMeta = (apiRef, props) => {
         sizes
       } = rowsHeightLookup.current[row.id];
       let baseRowHeight = rowHeightFromDensity;
-      const existingBaseRowHeight = sizes.base;
+      const existingBaseRowHeight = sizes.baseCenter;
 
       if (isResized) {
         // Do not recalculate resized row height and use the value from the lookup
@@ -91,12 +91,19 @@ export const useGridRowsMeta = (apiRef, props) => {
         }
       } else {
         rowsHeightLookup.current[row.id].needsFirstMeasurement = false;
-      } // We use an object to make simple to check if a height is already added or not
+      }
 
+      const existingBaseSizes = Object.entries(sizes).reduce((acc, [key, size]) => {
+        if (/^base[A-Z]/.test(key)) {
+          acc[key] = size;
+        }
 
-      const initialHeights = {
-        base: baseRowHeight
-      };
+        return acc;
+      }, {}); // We use an object to make simple to check if a height is already added or not
+
+      const initialHeights = _extends({}, existingBaseSizes, {
+        baseCenter: baseRowHeight
+      });
 
       if (getRowSpacing) {
         const indexRelativeToCurrentPage = apiRef.current.getRowIndexRelativeToVisibleRows(row.id);
@@ -117,9 +124,17 @@ export const useGridRowsMeta = (apiRef, props) => {
     const positions = [];
     const currentPageTotalHeight = currentPage.rows.reduce((acc, row) => {
       positions.push(acc);
+      let maximumBaseSize = 0;
+      let otherSizes = 0;
       const processedSizes = calculateRowProcessedSizes(row);
-      const finalRowHeight = Object.values(processedSizes).reduce((acc2, value) => acc2 + value, 0);
-      return acc + finalRowHeight;
+      Object.entries(processedSizes).forEach(([size, value]) => {
+        if (/^base[A-Z]/.test(size)) {
+          maximumBaseSize = value > maximumBaseSize ? value : maximumBaseSize;
+        } else {
+          otherSizes += value;
+        }
+      });
+      return acc + maximumBaseSize + otherSizes;
     }, 0);
     pinnedRows?.top?.forEach(row => {
       calculateRowProcessedSizes(row);
@@ -145,27 +160,27 @@ export const useGridRowsMeta = (apiRef, props) => {
   }, [apiRef, currentPage.rows, rowHeightFromDensity, getRowHeightProp, getRowSpacing, getEstimatedRowHeight, pinnedRows]);
   const getRowHeight = React.useCallback(rowId => {
     const height = rowsHeightLookup.current[rowId];
-    return height ? height.sizes.base : rowHeightFromDensity;
+    return height ? height.sizes.baseCenter : rowHeightFromDensity;
   }, [rowHeightFromDensity]);
 
   const getRowInternalSizes = rowId => rowsHeightLookup.current[rowId]?.sizes;
 
   const setRowHeight = React.useCallback((id, height) => {
-    rowsHeightLookup.current[id].sizes.base = height;
+    rowsHeightLookup.current[id].sizes.baseCenter = height;
     rowsHeightLookup.current[id].isResized = true;
     rowsHeightLookup.current[id].needsFirstMeasurement = false;
     hydrateRowsMeta();
   }, [hydrateRowsMeta]);
   const debouncedHydrateRowsMeta = React.useMemo(() => debounce(hydrateRowsMeta), [hydrateRowsMeta]);
-  const storeMeasuredRowHeight = React.useCallback((id, height) => {
+  const storeMeasuredRowHeight = React.useCallback((id, height, position) => {
     if (!rowsHeightLookup.current[id] || !rowsHeightLookup.current[id].autoHeight) {
       return;
     } // Only trigger hydration if the value is different, otherwise we trigger a loop
 
 
-    const needsHydration = rowsHeightLookup.current[id].sizes.base !== height;
+    const needsHydration = rowsHeightLookup.current[id].sizes[`base${capitalize(position)}`] !== height;
     rowsHeightLookup.current[id].needsFirstMeasurement = false;
-    rowsHeightLookup.current[id].sizes.base = height;
+    rowsHeightLookup.current[id].sizes[`base${capitalize(position)}`] = height;
 
     if (needsHydration) {
       debouncedHydrateRowsMeta();
@@ -181,7 +196,11 @@ export const useGridRowsMeta = (apiRef, props) => {
     if (hasRowWithAutoHeight.current && index > lastMeasuredRowIndex.current) {
       lastMeasuredRowIndex.current = index;
     }
-  }, []); // The effect is used to build the rows meta data - currentPageTotalHeight and positions.
+  }, []);
+  const resetRowHeights = React.useCallback(() => {
+    rowsHeightLookup.current = {};
+    hydrateRowsMeta();
+  }, [hydrateRowsMeta]); // The effect is used to build the rows meta data - currentPageTotalHeight and positions.
   // Because of variable row height this is needed for the virtualization
 
   React.useEffect(() => {
@@ -195,7 +214,8 @@ export const useGridRowsMeta = (apiRef, props) => {
     unstable_getRowHeight: getRowHeight,
     unstable_getRowInternalSizes: getRowInternalSizes,
     unstable_setRowHeight: setRowHeight,
-    unstable_storeRowHeightMeasurement: storeMeasuredRowHeight
+    unstable_storeRowHeightMeasurement: storeMeasuredRowHeight,
+    resetRowHeights
   };
   useGridApiMethod(apiRef, rowsMetaApi, 'GridRowsMetaApi');
 };

package/modern/hooks/features/virtualization/useGridVirtualScroller.js

@@ -211,8 +211,19 @@ export const useGridVirtualScroller = props => {
   }, [renderContext, updateRenderZonePosition]);
   const updateRenderContext = React.useCallback(nextRenderContext => {
     setRenderContext(nextRenderContext);
+    const [firstRowToRender, lastRowToRender] = getRenderableIndexes({
+      firstIndex: nextRenderContext.firstRowIndex,
+      lastIndex: nextRenderContext.lastRowIndex,
+      minFirstIndex: 0,
+      maxLastIndex: currentPage.rows.length,
+      buffer: rootProps.rowBuffer
+    });
+    apiRef.current.publishEvent('renderedRowsIntervalChange', {
+      firstRowToRender,
+      lastRowToRender
+    });
     prevRenderContext.current = nextRenderContext;
-  }, [setRenderContext, prevRenderContext]);
+  }, [apiRef, setRenderContext, prevRenderContext, currentPage.rows.length, rootProps.rowBuffer]);
   React.useEffect(() => {
     if (containerWidth == null) {
       return;
@@ -283,8 +294,8 @@ export const useGridVirtualScroller = props => {
       minFirstColumn = renderZoneMinColumnIndex,
       maxLastColumn = renderZoneMaxColumnIndex,
       availableSpace = containerWidth,
-      ignoreAutoHeight,
-      rowIndexOffset = 0
+      rowIndexOffset = 0,
+      position = 'center'
     } = params;
 
     if (!nextRenderContext || availableSpace == null) {
@@ -352,7 +363,7 @@ export const useGridVirtualScroller = props => {
         model
       } = renderedRows[i];
       const lastVisibleRowIndex = firstRowToRender + i === currentPage.rows.length - 1;
-      const baseRowHeight = !apiRef.current.unstable_rowHasAutoHeight(id) || ignoreAutoHeight ? apiRef.current.unstable_getRowHeight(id) : 'auto';
+      const baseRowHeight = !apiRef.current.unstable_rowHasAutoHeight(id) ? apiRef.current.unstable_getRowHeight(id) : 'auto';
       let isSelected;
 
       if (selectedRowsLookup[id] == null) {
@@ -378,7 +389,8 @@ export const useGridVirtualScroller = props => {
         selected: isSelected,
         index: rowIndexOffset + (currentPage?.range?.firstRowIndex || 0) + firstRowToRender + i,
         containerWidth: availableSpace,
-        isLastVisible: lastVisibleRowIndex
+        isLastVisible: lastVisibleRowIndex,
+        position: position
       }, typeof getRowProps === 'function' ? getRowProps(id, model) : {}, rootProps.componentsProps?.row), id));
     }
 

package/modern/hooks/utils/useGridNativeEventListener.js

@@ -5,8 +5,8 @@ export const useGridNativeEventListener = (apiRef, ref, eventName, handler, opti
   const logger = useGridLogger(apiRef, 'useNativeEventListener');
   const [added, setAdded] = React.useState(false);
   const handlerRef = React.useRef(handler);
-  const wrapHandler = React.useCallback(args => {
-    return handlerRef.current && handlerRef.current(args);
+  const wrapHandler = React.useCallback(event => {
+    return handlerRef.current && handlerRef.current(event);
   }, []);
   React.useEffect(() => {
     handlerRef.current = handler;

package/modern/index.js

@@ -1,4 +1,4 @@
-/** @license MUI v5.15.2
+/** @license MUI v5.17.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/modern/internals/index.js

@@ -11,6 +11,8 @@ export { useGridColumnHeaders } from '../hooks/features/columnHeaders/useGridCol
 export { useGridColumnMenu, columnMenuStateInitializer } from '../hooks/features/columnMenu/useGridColumnMenu';
 export { useGridColumns, columnsStateInitializer } from '../hooks/features/columns/useGridColumns';
 export { useGridColumnSpanning } from '../hooks/features/columns/useGridColumnSpanning';
+export { useGridColumnGrouping, columnGroupsStateInitializer } from '../hooks/features/columnGrouping/useGridColumnGrouping';
+export { useGridColumnGroupingPreProcessors } from '../hooks/features/columnGrouping/useGridColumnGroupingPreProcessors';
 export { useGridDensity, densityStateInitializer } from '../hooks/features/density/useGridDensity';
 export { useGridCsvExport } from '../hooks/features/export/useGridCsvExport';
 export { useGridPrintExport } from '../hooks/features/export/useGridPrintExport';

package/modern/models/api/gridColumnGroupingApi.js

@@ -0,0 +1 @@
+export {};

package/modern/models/events/gridEvents.js

@@ -85,6 +85,8 @@ var GridEvents;
   GridEvents["preferencePanelOpen"] = "preferencePanelOpen";
   GridEvents["menuOpen"] = "menuOpen";
   GridEvents["menuClose"] = "menuClose";
+  GridEvents["renderedRowsIntervalChange"] = "renderedRowsIntervalChange";
+  GridEvents["fetchRows"] = "fetchRows";
 })(GridEvents || (GridEvents = {}));
 
 export { GridEvents };

package/modern/models/gridColumnGrouping.js

@@ -0,0 +1,6 @@
+export function isLeaf(node) {
+  return node.field !== undefined;
+}
+/**
+ * A function used to process headerClassName params.
+ */

package/modern/models/index.js

@@ -21,7 +21,8 @@ export * from './gridDensity';
 export * from './logger';
 export * from './muiEvent';
 export * from './events';
-export * from './gridSortModel'; // Do not export GridExportFormat and GridExportExtension which are override in pro package
+export * from './gridSortModel';
+export * from './gridColumnGrouping'; // Do not export GridExportFormat and GridExportExtension which are override in pro package
 
 export * from './gridFilterOperator';
 export {};

package/modern/models/params/gridRenderedRowsIntervalChangeParams.js

@@ -0,0 +1 @@
+export {};

package/modern/models/params/index.js

@@ -11,4 +11,5 @@ export * from './gridValueOptionsParams';
 export * from './gridCellParams';
 export * from './gridSortModelParams';
 export * from './gridPreferencePanelParams';
-export * from './gridMenuParams';
+export * from './gridMenuParams';
+export * from './gridRenderedRowsIntervalChangeParams';

package/modern/utils/utils.js

@@ -177,4 +177,20 @@ export function isDeepEqual(a, b) {
 
 
   return a !== a && b !== b;
+} // Pseudo random number. See https://stackoverflow.com/a/47593316
+
+function mulberry32(a) {
+  return () => {
+    /* eslint-disable */
+    let t = a += 0x6d2b79f5;
+    t = Math.imul(t ^ t >>> 15, t | 1);
+    t ^= t + Math.imul(t ^ t >>> 7, t | 61);
+    return ((t ^ t >>> 14) >>> 0) / 4294967296;
+    /* eslint-enable */
+  };
+}
+
+export function randomNumberBetween(seed, min, max) {
+  const random = mulberry32(seed);
+  return () => min + (max - min) * random();
 }

package/node/DataGrid/DataGrid.js

@@ -102,6 +102,7 @@ DataGridRaw.propTypes = {
    * @default 3
    */
   columnBuffer: _propTypes.default.number,
+  columnGroupingModel: _propTypes.default.arrayOf(_propTypes.default.object),
 
   /**
    * Set of columns of type [[GridColumns]].
@@ -217,6 +218,7 @@ DataGridRaw.propTypes = {
    * For each feature, if the flag is not explicitly set to `true`, the feature will be fully disabled and any property / method call will not have any effect.
    */
   experimentalFeatures: _propTypes.default.shape({
+    columnGrouping: _propTypes.default.bool,
     newEditingApi: _propTypes.default.bool,
     preventCommitWhileValidating: _propTypes.default.bool,
     warnIfFocusStateIsNotSynced: _propTypes.default.bool
@@ -370,7 +372,7 @@ DataGridRaw.propTypes = {
 
   /**
    * Allows to pass the logging level or false to turn off logging.
-   * @default "debug"
+   * @default "error" ("warn" in dev mode)
    */
   logLevel: _propTypes.default.oneOf(['debug', 'error', 'info', 'warn', false]),
 

package/node/DataGrid/useDataGridComponent.js

@@ -59,6 +59,10 @@ var _useGridStatePersistence = require("../hooks/features/statePersistence/useGr
 
 var _useGridColumnSpanning = require("../hooks/features/columns/useGridColumnSpanning");
 
+var _useGridColumnGrouping = require("../hooks/features/columnGrouping/useGridColumnGrouping");
+
+var _useGridColumnGroupingPreProcessors = require("../hooks/features/columnGrouping/useGridColumnGroupingPreProcessors");
+
 const useDataGridComponent = props => {
   var _props$experimentalFe, _props$experimentalFe2;
 
@@ -67,6 +71,7 @@ const useDataGridComponent = props => {
    * Register all pre-processors called during state initialization here.
    */
 
+  (0, _useGridColumnGroupingPreProcessors.useGridColumnGroupingPreProcessors)(apiRef, props);
   (0, _useGridSelectionPreProcessors.useGridSelectionPreProcessors)(apiRef, props);
   (0, _useGridRowsPreProcessors.useGridRowsPreProcessors)(apiRef);
   /**
@@ -75,6 +80,7 @@ const useDataGridComponent = props => {
 
   (0, _useGridInitializeState.useGridInitializeState)(_useGridSelection.selectionStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridColumns.columnsStateInitializer, apiRef, props);
+  (0, _useGridInitializeState.useGridInitializeState)(_useGridColumnGrouping.columnGroupsStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridRows.rowsStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)((_props$experimentalFe = props.experimentalFeatures) != null && _props$experimentalFe.newEditingApi ? _useGridEditing2.editingStateInitializer : _useGridEditing.editingStateInitializer, apiRef, props);
   (0, _useGridInitializeState.useGridInitializeState)(_useGridFocus.focusStateInitializer, apiRef, props);
@@ -91,6 +97,7 @@ const useDataGridComponent = props => {
   (0, _useGridRows.useGridRows)(apiRef, props);
   (0, _useGridParamsApi.useGridParamsApi)(apiRef);
   (0, _useGridColumnSpanning.useGridColumnSpanning)(apiRef);
+  (0, _useGridColumnGrouping.useGridColumnGrouping)(apiRef, props);
   const useGridEditing = (_props$experimentalFe2 = props.experimentalFeatures) != null && _props$experimentalFe2.newEditingApi ? _useGridEditing2.useGridEditing : _useGridEditing.useGridEditing;
   useGridEditing(apiRef, props);
   (0, _useGridFocus.useGridFocus)(apiRef, props);

package/node/components/DataGridColumnHeaders.js

@@ -38,7 +38,8 @@ const DataGridColumnHeaders = /*#__PURE__*/React.forwardRef(function GridColumns
     isDragging,
     getRootProps,
     getInnerProps,
-    getColumns
+    getColumnHeaders,
+    getColumnGroupHeaders
   } = (0, _useGridColumnHeaders.useGridColumnHeaders)({
     innerRef
   });
@@ -47,10 +48,10 @@ const DataGridColumnHeaders = /*#__PURE__*/React.forwardRef(function GridColumns
   }, getRootProps(other), {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_GridScrollArea.GridScrollArea, {
       scrollDirection: "left"
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridColumnHeadersInner.GridColumnHeadersInner, (0, _extends2.default)({
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_GridColumnHeadersInner.GridColumnHeadersInner, (0, _extends2.default)({
       isDragging: isDragging
     }, getInnerProps(), {
-      children: getColumns()
+      children: [getColumnGroupHeaders(), getColumnHeaders()]
     })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridScrollArea.GridScrollArea, {
       scrollDirection: "right"
     })]