@mui/x-data-grid-premium 7.0.0-beta.6 → 7.0.0

package/esm/hooks/features/rowGrouping/createGroupingColDef.js

@@ -26,10 +26,9 @@ const GROUPING_COL_DEF_FORCED_PROPERTIES = {
  * TODO: Make this index comparator depth invariant, the logic should not be inverted when sorting in the "desc" direction (but the current return format of `sortComparator` does not support this behavior).
  */
 const groupingFieldIndexComparator = (v1, v2, cellParams1, cellParams2) => {
-  var _groupingField, _groupingField2;
   const model = gridRowGroupingSanitizedModelSelector(cellParams1.api.state, cellParams1.api.instanceId);
-  const groupingField1 = (_groupingField = cellParams1.rowNode.groupingField) != null ? _groupingField : null;
-  const groupingField2 = (_groupingField2 = cellParams2.rowNode.groupingField) != null ? _groupingField2 : null;
+  const groupingField1 = cellParams1.rowNode.groupingField ?? null;
+  const groupingField2 = cellParams2.rowNode.groupingField ?? null;
   if (groupingField1 === groupingField2) {
     return 0;
   }
@@ -44,23 +43,20 @@ const groupingFieldIndexComparator = (v1, v2, cellParams1, cellParams2) => {
   }
   return 1;
 };
-const getLeafProperties = leafColDef => {
-  var _leafColDef$headerNam;
-  return {
-    headerName: (_leafColDef$headerNam = leafColDef.headerName) != null ? _leafColDef$headerNam : leafColDef.field,
-    sortable: leafColDef.sortable,
-    filterable: leafColDef.filterable,
-    valueOptions: isSingleSelectColDef(leafColDef) ? leafColDef.valueOptions : undefined,
-    filterOperators: leafColDef.filterOperators,
-    sortComparator: (v1, v2, cellParams1, cellParams2) => {
-      // We only want to sort the leaves
-      if (cellParams1.rowNode.type === 'leaf' && cellParams2.rowNode.type === 'leaf') {
-        return leafColDef.sortComparator(v1, v2, cellParams1, cellParams2);
-      }
-      return groupingFieldIndexComparator(v1, v2, cellParams1, cellParams2);
+const getLeafProperties = leafColDef => ({
+  headerName: leafColDef.headerName ?? leafColDef.field,
+  sortable: leafColDef.sortable,
+  filterable: leafColDef.filterable,
+  valueOptions: isSingleSelectColDef(leafColDef) ? leafColDef.valueOptions : undefined,
+  filterOperators: leafColDef.filterOperators,
+  sortComparator: (v1, v2, cellParams1, cellParams2) => {
+    // We only want to sort the leaves
+    if (cellParams1.rowNode.type === 'leaf' && cellParams2.rowNode.type === 'leaf') {
+      return leafColDef.sortComparator(v1, v2, cellParams1, cellParams2);
     }
-  };
-};
+    return groupingFieldIndexComparator(v1, v2, cellParams1, cellParams2);
+  }
+});
 const getGroupingCriteriaProperties = (groupedByColDef, applyHeaderName) => {
   const properties = {
     sortable: groupedByColDef.sortable,
@@ -68,16 +64,16 @@ const getGroupingCriteriaProperties = (groupedByColDef, applyHeaderName) => {
     valueOptions: isSingleSelectColDef(groupedByColDef) ? groupedByColDef.valueOptions : undefined,
     sortComparator: (v1, v2, cellParams1, cellParams2) => {
       // We only want to sort the groups of the current grouping criteria
-      if (cellParams1.rowNode.type === 'group' && cellParams1.rowNode.groupingField === groupedByColDef.field && cellParams2.rowNode.type === 'group' && cellParams2.rowNode.groupingField === groupedByColDef.field) {
-        return groupedByColDef.sortComparator(v1, v2, cellParams1, cellParams2);
+      if (cellParams1.rowNode.type === 'group' && cellParams2.rowNode.type === 'group' && cellParams1.rowNode.groupingField === cellParams2.rowNode.groupingField) {
+        const colDef = cellParams1.api.getColumn(cellParams1.rowNode.groupingField);
+        return colDef.sortComparator(v1, v2, cellParams1, cellParams2);
       }
       return groupingFieldIndexComparator(v1, v2, cellParams1, cellParams2);
     },
     filterOperators: groupedByColDef.filterOperators
   };
   if (applyHeaderName) {
-    var _groupedByColDef$head;
-    properties.headerName = (_groupedByColDef$head = groupedByColDef.headerName) != null ? _groupedByColDef$head : groupedByColDef.field;
+    properties.headerName = groupedByColDef.headerName ?? groupedByColDef.field;
   }
   return properties;
 };
@@ -90,8 +86,7 @@ export const createGroupingColDefForOneGroupingCriteria = ({
   groupingCriteria,
   colDefOverride
 }) => {
-  var _groupedByColDef$widt, _leafColDef$width;
-  const _ref = colDefOverride != null ? colDefOverride : {},
+  const _ref = colDefOverride ?? {},
     {
       leafField,
       mainGroupingCriteria,
@@ -102,7 +97,7 @@ export const createGroupingColDefForOneGroupingCriteria = ({
 
   // The properties that do not depend on the presence of a `leafColDef` and that can be overridden by `colDefOverride`
   const commonProperties = {
-    width: Math.max(((_groupedByColDef$widt = groupedByColDef.width) != null ? _groupedByColDef$widt : GRID_STRING_COL_DEF.width) + 40, (_leafColDef$width = leafColDef == null ? void 0 : leafColDef.width) != null ? _leafColDef$width : 0),
+    width: Math.max((groupedByColDef.width ?? GRID_STRING_COL_DEF.width) + 40, leafColDef?.width ?? 0),
     renderCell: params => {
       // Render footer
       if (params.rowNode.type === 'footer' || params.rowNode.type === 'pinnedRow') {
@@ -183,8 +178,7 @@ export const createGroupingColDefForAllGroupingCriteria = ({
   rowGroupingModel,
   colDefOverride
 }) => {
-  var _leafColDef$width2;
-  const _ref2 = colDefOverride != null ? colDefOverride : {},
+  const _ref2 = colDefOverride ?? {},
     {
       leafField,
       mainGroupingCriteria,
@@ -196,10 +190,7 @@ export const createGroupingColDefForAllGroupingCriteria = ({
   // The properties that do not depend on the presence of a `leafColDef` and that can be overridden by `colDefOverride`
   const commonProperties = {
     headerName: apiRef.current.getLocaleText('groupingColumnHeaderName'),
-    width: Math.max(...rowGroupingModel.map(field => {
-      var _columnsLookup$field$;
-      return ((_columnsLookup$field$ = columnsLookup[field].width) != null ? _columnsLookup$field$ : GRID_STRING_COL_DEF.width) + 40;
-    }), (_leafColDef$width2 = leafColDef == null ? void 0 : leafColDef.width) != null ? _leafColDef$width2 : 0),
+    width: Math.max(...rowGroupingModel.map(field => (columnsLookup[field].width ?? GRID_STRING_COL_DEF.width) + 40), leafColDef?.width ?? 0),
     renderCell: params => {
       // Render footer
       if (params.rowNode.type === 'footer' || params.rowNode.type === 'pinnedRow') {

package/esm/hooks/features/rowGrouping/gridRowGroupingUtils.js

@@ -142,13 +142,10 @@ export const getCellGroupingCriteria = ({
 export const getGroupingRules = ({
   sanitizedRowGroupingModel,
   columnsLookup
-}) => sanitizedRowGroupingModel.map(field => {
-  var _columnsLookup$field;
-  return {
-    field,
-    groupingValueGetter: (_columnsLookup$field = columnsLookup[field]) == null ? void 0 : _columnsLookup$field.groupingValueGetter
-  };
-});
+}) => sanitizedRowGroupingModel.map(field => ({
+  field,
+  groupingValueGetter: columnsLookup[field]?.groupingValueGetter
+}));
 
 /**
  * Compares two sets of grouping rules to determine if they are equal or not.

package/esm/hooks/features/rowGrouping/useGridRowGrouping.js

@@ -5,13 +5,12 @@ import { useGridRegisterPipeProcessor } from '@mui/x-data-grid-pro/internals';
 import { gridRowGroupingModelSelector, gridRowGroupingSanitizedModelSelector } from './gridRowGroupingSelector';
 import { getRowGroupingFieldFromGroupingCriteria, ROW_GROUPING_STRATEGY, isGroupingColumn, mergeStateWithRowGroupingModel, setStrategyAvailability, getGroupingRules, areGroupingRulesEqual } from './gridRowGroupingUtils';
 export const rowGroupingStateInitializer = (state, props, apiRef) => {
-  var _ref, _props$rowGroupingMod, _props$initialState;
   apiRef.current.caches.rowGrouping = {
     rulesOnLastRowTreeCreation: []
   };
   return _extends({}, state, {
     rowGrouping: {
-      model: (_ref = (_props$rowGroupingMod = props.rowGroupingModel) != null ? _props$rowGroupingMod : (_props$initialState = props.initialState) == null || (_props$initialState = _props$initialState.rowGrouping) == null ? void 0 : _props$initialState.model) != null ? _ref : []
+      model: props.rowGroupingModel ?? props.initialState?.rowGrouping?.model ?? []
     }
   });
 };
@@ -22,7 +21,6 @@ export const rowGroupingStateInitializer = (state, props, apiRef) => {
  * @requires useGridParamsApi (method) - can be after, async only
  */
 export const useGridRowGrouping = (apiRef, props) => {
-  var _props$initialState3;
   apiRef.current.registerControlState({
     stateId: 'rowGrouping',
     propModel: props.rowGroupingModel,
@@ -47,7 +45,7 @@ export const useGridRowGrouping = (apiRef, props) => {
     if (currentModel.includes(field)) {
       return;
     }
-    const cleanGroupingIndex = groupingIndex != null ? groupingIndex : currentModel.length;
+    const cleanGroupingIndex = groupingIndex ?? currentModel.length;
     const updatedModel = [...currentModel.slice(0, cleanGroupingIndex), field, ...currentModel.slice(cleanGroupingIndex)];
     apiRef.current.setRowGroupingModel(updatedModel);
   }, [apiRef]);
@@ -89,7 +87,6 @@ export const useGridRowGrouping = (apiRef, props) => {
     return columnMenuItems;
   }, [props.disableRowGrouping]);
   const stateExportPreProcessing = React.useCallback((prevState, context) => {
-    var _props$initialState2;
     const rowGroupingModelToExport = gridRowGroupingModelSelector(apiRef);
     const shouldExportRowGroupingModel =
     // Always export if the `exportOnlyDirtyModels` property is not activated
@@ -97,7 +94,7 @@ export const useGridRowGrouping = (apiRef, props) => {
     // Always export if the model is controlled
     props.rowGroupingModel != null ||
     // Always export if the model has been initialized
-    ((_props$initialState2 = props.initialState) == null || (_props$initialState2 = _props$initialState2.rowGrouping) == null ? void 0 : _props$initialState2.model) != null ||
+    props.initialState?.rowGrouping?.model != null ||
     // Export if the model is not empty
     Object.keys(rowGroupingModelToExport).length > 0;
     if (!shouldExportRowGroupingModel) {
@@ -108,13 +105,12 @@ export const useGridRowGrouping = (apiRef, props) => {
         model: rowGroupingModelToExport
       }
     });
-  }, [apiRef, props.rowGroupingModel, (_props$initialState3 = props.initialState) == null || (_props$initialState3 = _props$initialState3.rowGrouping) == null ? void 0 : _props$initialState3.model]);
+  }, [apiRef, props.rowGroupingModel, props.initialState?.rowGrouping?.model]);
   const stateRestorePreProcessing = React.useCallback((params, context) => {
-    var _context$stateToResto;
     if (props.disableRowGrouping) {
       return params;
     }
-    const rowGroupingModel = (_context$stateToResto = context.stateToRestore.rowGrouping) == null ? void 0 : _context$stateToResto.model;
+    const rowGroupingModel = context.stateToRestore.rowGrouping?.model;
     if (rowGroupingModel != null) {
       apiRef.current.setState(mergeStateWithRowGroupingModel(rowGroupingModel));
     }

package/esm/hooks/utils/useKeepGroupedColumnsHidden.js

@@ -3,13 +3,13 @@ import * as React from 'react';
 import { gridColumnVisibilityModelSelector } from '@mui/x-data-grid-pro';
 const updateColumnVisibilityModel = (columnVisibilityModel, rowGroupingModel, prevRowGroupingModel) => {
   const newColumnVisibilityModel = _extends({}, columnVisibilityModel);
-  rowGroupingModel == null || rowGroupingModel.forEach(field => {
-    if (!(prevRowGroupingModel != null && prevRowGroupingModel.includes(field))) {
+  rowGroupingModel?.forEach(field => {
+    if (!prevRowGroupingModel?.includes(field)) {
       newColumnVisibilityModel[field] = false;
     }
   });
-  prevRowGroupingModel == null || prevRowGroupingModel.forEach(field => {
-    if (!(rowGroupingModel != null && rowGroupingModel.includes(field))) {
+  prevRowGroupingModel?.forEach(field => {
+    if (!rowGroupingModel?.includes(field)) {
       newColumnVisibilityModel[field] = true;
     }
   });
@@ -22,9 +22,8 @@ const updateColumnVisibilityModel = (columnVisibilityModel, rowGroupingModel, pr
  * Does not work when used with the `hide` property of `GridColDef`
  */
 export const useKeepGroupedColumnsHidden = props => {
-  var _props$rowGroupingMod, _props$initialState;
   const initialProps = React.useRef(props);
-  const rowGroupingModel = React.useRef((_props$rowGroupingMod = props.rowGroupingModel) != null ? _props$rowGroupingMod : (_props$initialState = props.initialState) == null || (_props$initialState = _props$initialState.rowGrouping) == null ? void 0 : _props$initialState.model);
+  const rowGroupingModel = React.useRef(props.rowGroupingModel ?? props.initialState?.rowGrouping?.model);
   React.useEffect(() => {
     props.apiRef.current.subscribeEvent('rowGroupingModelChange', newModel => {
       const columnVisibilityModel = updateColumnVisibilityModel(gridColumnVisibilityModelSelector(props.apiRef), newModel, rowGroupingModel.current);
@@ -33,11 +32,10 @@ export const useKeepGroupedColumnsHidden = props => {
     });
   }, [props.apiRef]);
   return React.useMemo(() => {
-    var _invariantInitialStat;
     const invariantInitialState = initialProps.current.initialState;
-    const columnVisibilityModel = updateColumnVisibilityModel(invariantInitialState == null || (_invariantInitialStat = invariantInitialState.columns) == null ? void 0 : _invariantInitialStat.columnVisibilityModel, rowGroupingModel.current, undefined);
+    const columnVisibilityModel = updateColumnVisibilityModel(invariantInitialState?.columns?.columnVisibilityModel, rowGroupingModel.current, undefined);
     return _extends({}, invariantInitialState, {
-      columns: _extends({}, invariantInitialState == null ? void 0 : invariantInitialState.columns, {
+      columns: _extends({}, invariantInitialState?.columns, {
         columnVisibilityModel
       })
     });

package/esm/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTcwOTg1MjQwMDAwMA==";
+  const releaseInfo = "MTcxMTA1ODQwMDAwMA==";
   if (process.env.NODE_ENV !== 'production') {
     // A simple hack to set the value in the test environment (has no build step).
     // eslint-disable-next-line no-useless-concat

package/hooks/features/aggregation/wrapColumnWithAggregation.d.ts

@@ -64,7 +64,7 @@ export declare const unwrapColumnFromAggregation: ({ column, }: {
     disableReorder?: boolean | undefined;
     disableExport?: boolean | undefined;
     colSpan?: number | import("@mui/x-data-grid-pro").GridColSpanFn<import("@mui/x-data-grid-pro").GridValidRowModel, any, any> | undefined;
-    renderHeaderFilter?: ((params: import("@mui/x-data-grid-pro").GridHeaderFilterCellProps) => React.ReactNode) | undefined;
+    renderHeaderFilter?: ((params: import("@mui/x-data-grid-pro").GridRenderHeaderFilterProps) => React.ReactNode) | undefined;
     aggregable?: boolean | undefined;
     availableAggregationFunctions?: string[] | undefined;
     groupingValueGetter?: import("../../..").GridGroupingValueGetter<import("@mui/x-data-grid-pro").GridValidRowModel> | undefined;

package/hooks/features/cellSelection/useGridCellSelection.d.ts

@@ -3,4 +3,4 @@ import { GridStateInitializer } from '@mui/x-data-grid-pro/internals';
 import { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
 import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
 export declare const cellSelectionStateInitializer: GridStateInitializer<Pick<DataGridPremiumProcessedProps, 'cellSelectionModel' | 'initialState'>>;
-export declare const useGridCellSelection: (apiRef: React.MutableRefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, 'cellSelection' | 'cellSelectionModel' | 'onCellSelectionModelChange' | 'pagination' | 'paginationMode' | 'ignoreValueFormatterDuringExport' | 'clipboardCopyCellDelimiter'>) => void;
+export declare const useGridCellSelection: (apiRef: React.MutableRefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, 'cellSelection' | 'cellSelectionModel' | 'onCellSelectionModelChange' | 'pagination' | 'paginationMode' | 'ignoreValueFormatterDuringExport' | 'clipboardCopyCellDelimiter' | 'columnHeaderHeight'>) => void;

package/hooks/features/cellSelection/useGridCellSelection.js

@@ -30,6 +30,8 @@ const useGridCellSelection = (apiRef, props) => {
   const mousePosition = React.useRef(null);
   const autoScrollRAF = React.useRef();
   const sortedRowIds = (0, _xDataGridPro.useGridSelector)(apiRef, _xDataGridPro.gridSortedRowIdsSelector);
+  const dimensions = (0, _xDataGridPro.useGridSelector)(apiRef, _xDataGridPro.gridDimensionsSelector);
+  const totalHeaderHeight = (0, _internals.getTotalHeaderHeight)(apiRef, props.columnHeaderHeight);
   const ignoreValueFormatterProp = props.ignoreValueFormatterDuringExport;
   const ignoreValueFormatter = (typeof ignoreValueFormatterProp === 'object' ? ignoreValueFormatterProp?.clipboardExport : ignoreValueFormatterProp) || false;
   const clipboardCopyCellDelimiter = props.clipboardCopyCellDelimiter;
@@ -176,10 +178,6 @@ const useGridCellSelection = (apiRef, props) => {
     if (!apiRef.current.virtualScrollerRef?.current) {
       return;
     }
-    const virtualScrollerRect = apiRef.current.virtualScrollerRef?.current?.getBoundingClientRect();
-    if (!virtualScrollerRect) {
-      return;
-    }
     function autoScroll() {
       if (!mousePosition.current || !apiRef.current.virtualScrollerRef?.current) {
         return;
@@ -191,11 +189,10 @@ const useGridCellSelection = (apiRef, props) => {
       const {
         height,
         width
-      } = virtualScrollerRect;
+      } = dimensions.viewportInnerSize;
       let deltaX = 0;
       let deltaY = 0;
       let factor = 0;
-      const dimensions = apiRef.current.getRootDimensions();
       if (mouseY <= AUTO_SCROLL_SENSITIVITY && dimensions.hasScrollY) {
         // When scrolling up, the multiplier increases going closer to the top edge
         factor = (AUTO_SCROLL_SENSITIVITY - mouseY) / -AUTO_SCROLL_SENSITIVITY;
@@ -226,7 +223,7 @@ const useGridCellSelection = (apiRef, props) => {
       autoScrollRAF.current = requestAnimationFrame(autoScroll);
     }
     autoScroll();
-  }, [apiRef]);
+  }, [apiRef, dimensions]);
   const handleCellMouseOver = React.useCallback((params, event) => {
     if (!lastMouseDownCell.current) {
       return;
@@ -244,13 +241,15 @@ const useGridCellSelection = (apiRef, props) => {
       return;
     }
     const {
-      height,
-      width,
       x,
       y
     } = virtualScrollerRect;
+    const {
+      height,
+      width
+    } = dimensions.viewportInnerSize;
     const mouseX = event.clientX - x;
-    const mouseY = event.clientY - y;
+    const mouseY = event.clientY - y - totalHeaderHeight;
     mousePosition.current = {
       x: mouseX,
       y: mouseY
@@ -265,7 +264,7 @@ const useGridCellSelection = (apiRef, props) => {
       // Mouse has left the sensitivity area while auto scroll is on
       stopAutoScroll();
     }
-  }, [apiRef, startAutoScroll, stopAutoScroll]);
+  }, [apiRef, startAutoScroll, stopAutoScroll, totalHeaderHeight, dimensions]);
   const handleCellClick = (0, _utils.useEventCallback)((params, event) => {
     const {
       id,
@@ -457,7 +456,8 @@ const useGridCellSelection = (apiRef, props) => {
           const cellParams = apiRef.current.getCellParams(rowId, field);
           cellData = (0, _internals.serializeCellValue)(cellParams, {
             delimiterCharacter: clipboardCopyCellDelimiter,
-            ignoreValueFormatter
+            ignoreValueFormatter,
+            shouldAppendQuotes: true
           });
         } else {
           cellData = '';

package/hooks/features/clipboard/useGridClipboardImport.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
 import { GridPrivateApiPremium } from '../../../models/gridApiPremium';
 import type { DataGridPremiumProcessedProps } from '../../../models/dataGridPremiumProps';
-export declare const useGridClipboardImport: (apiRef: React.MutableRefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, 'pagination' | 'paginationMode' | 'processRowUpdate' | 'onProcessRowUpdateError' | 'getRowId' | 'onClipboardPasteStart' | 'onClipboardPasteEnd' | 'splitClipboardPastedText' | 'disableClipboardPaste'>) => void;
+export declare const useGridClipboardImport: (apiRef: React.MutableRefObject<GridPrivateApiPremium>, props: Pick<DataGridPremiumProcessedProps, 'pagination' | 'paginationMode' | 'processRowUpdate' | 'onProcessRowUpdateError' | 'getRowId' | 'onClipboardPasteStart' | 'onClipboardPasteEnd' | 'splitClipboardPastedText' | 'disableClipboardPaste' | 'onBeforeClipboardPasteStart'>) => void;

package/hooks/features/clipboard/useGridClipboardImport.js

@@ -13,7 +13,7 @@ var _xDataGridPro = require("@mui/x-data-grid-pro");
 var _utils = require("@mui/utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const missingOnProcessRowUpdateErrorWarning = (0, _internals.buildWarning)(['MUI X: A call to `processRowUpdate` threw an error which was not handled because `onProcessRowUpdateError` is missing.', 'To handle the error pass a callback to the `onProcessRowUpdateError` prop, e.g. `<DataGrid onProcessRowUpdateError={(error) => ...} />`.', 'For more detail, see https://mui.com/x/react-data-grid/editing/#server-side-persistence.'], 'error');
+const missingOnProcessRowUpdateErrorWarning = (0, _internals.buildWarning)(['MUI X: A call to `processRowUpdate` threw an error which was not handled because `onProcessRowUpdateError` is missing.', 'To handle the error pass a callback to the `onProcessRowUpdateError` prop, for example `<DataGrid onProcessRowUpdateError={(error) => ...} />`.', 'For more detail, see https://mui.com/x/react-data-grid/editing/#server-side-persistence.'], 'error');
 const columnFieldsToExcludeFromPaste = [_xDataGrid.GRID_CHECKBOX_SELECTION_FIELD, _xDataGridPro.GRID_REORDER_COL_DEF.field, _xDataGridPro.GRID_DETAIL_PANEL_TOGGLE_FIELD];
 
 // Batches rows that are updated during clipboard paste to reduce `updateRows` calls
@@ -249,7 +249,12 @@ const useGridClipboardImport = (apiRef, props) => {
   const getRowId = props.getRowId;
   const enableClipboardPaste = !props.disableClipboardPaste;
   const rootEl = apiRef.current.rootElementRef?.current;
+  const logger = (0, _internals.useGridLogger)(apiRef, 'useGridClipboardImport');
   const splitClipboardPastedText = props.splitClipboardPastedText;
+  const {
+    pagination,
+    onBeforeClipboardPasteStart
+  } = props;
   const handlePaste = React.useCallback(async (params, event) => {
     if (!enableClipboardPaste) {
       return;
@@ -276,6 +281,16 @@ const useGridClipboardImport = (apiRef, props) => {
     if (!pastedData) {
       return;
     }
+    if (onBeforeClipboardPasteStart) {
+      try {
+        await onBeforeClipboardPasteStart({
+          data: pastedData
+        });
+      } catch (error) {
+        logger.debug('Clipboard paste operation cancelled');
+        return;
+      }
+    }
     const cellUpdater = new CellValueUpdater({
       apiRef,
       processRowUpdate,
@@ -291,10 +306,10 @@ const useGridClipboardImport = (apiRef, props) => {
       updateCell: (...args) => {
         cellUpdater.updateCell(...args);
       },
-      pagination: props.pagination
+      pagination
     });
     cellUpdater.applyUpdates();
-  }, [apiRef, processRowUpdate, onProcessRowUpdateError, getRowId, enableClipboardPaste, rootEl, splitClipboardPastedText, props.pagination]);
+  }, [apiRef, processRowUpdate, onProcessRowUpdateError, getRowId, enableClipboardPaste, rootEl, splitClipboardPastedText, pagination, onBeforeClipboardPasteStart, logger]);
   const checkIfCanStartEditing = React.useCallback((initialValue, {
     event
   }) => {

package/hooks/features/rowGrouping/createGroupingColDef.js

@@ -73,8 +73,9 @@ const getGroupingCriteriaProperties = (groupedByColDef, applyHeaderName) => {
     valueOptions: (0, _internals.isSingleSelectColDef)(groupedByColDef) ? groupedByColDef.valueOptions : undefined,
     sortComparator: (v1, v2, cellParams1, cellParams2) => {
       // We only want to sort the groups of the current grouping criteria
-      if (cellParams1.rowNode.type === 'group' && cellParams1.rowNode.groupingField === groupedByColDef.field && cellParams2.rowNode.type === 'group' && cellParams2.rowNode.groupingField === groupedByColDef.field) {
-        return groupedByColDef.sortComparator(v1, v2, cellParams1, cellParams2);
+      if (cellParams1.rowNode.type === 'group' && cellParams2.rowNode.type === 'group' && cellParams1.rowNode.groupingField === cellParams2.rowNode.groupingField) {
+        const colDef = cellParams1.api.getColumn(cellParams1.rowNode.groupingField);
+        return colDef.sortComparator(v1, v2, cellParams1, cellParams2);
       }
       return groupingFieldIndexComparator(v1, v2, cellParams1, cellParams2);
     },

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid-premium v7.0.0-beta.6
+ * @mui/x-data-grid-premium v7.0.0
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/models/dataGridPremiumProps.d.ts

@@ -18,7 +18,7 @@ export interface DataGridPremiumPropsWithComplexDefaultValueBeforeProcessing ext
 /**
  * The props users can give to the `DataGridPremiumProps` component.
  */
-export interface DataGridPremiumProps<R extends GridValidRowModel = any> extends Omit<Partial<DataGridPremiumPropsWithDefaultValue> & DataGridPremiumPropsWithComplexDefaultValueBeforeProcessing & DataGridPremiumPropsWithoutDefaultValue<R>, DataGridPremiumForcedPropsKey> {
+export interface DataGridPremiumProps<R extends GridValidRowModel = any> extends Omit<Partial<DataGridPremiumPropsWithDefaultValue<R>> & DataGridPremiumPropsWithComplexDefaultValueBeforeProcessing & DataGridPremiumPropsWithoutDefaultValue<R>, DataGridPremiumForcedPropsKey> {
 }
 export interface DataGridPremiumPropsWithComplexDefaultValueAfterProcessing extends Pick<DataGridPropsWithComplexDefaultValueAfterProcessing, 'localeText'> {
     slots: GridPremiumSlotsComponent;
@@ -34,7 +34,7 @@ export type DataGridPremiumForcedPropsKey = 'signature';
  * None of the entry of this interface should be optional, they all have default values and `DataGridProps` already applies a `Partial<DataGridSimpleOptions>` for the public interface.
  * The controlled model do not have a default value at the prop processing level, so they must be defined in `DataGridOtherProps`.
  */
-export interface DataGridPremiumPropsWithDefaultValue extends DataGridProPropsWithDefaultValue {
+export interface DataGridPremiumPropsWithDefaultValue<R extends GridValidRowModel = any> extends DataGridProPropsWithDefaultValue<R> {
     /**
      * If `true`, the cell selection mode is enabled.
      * @default false
@@ -134,6 +134,16 @@ export interface DataGridPremiumPropsWithoutDefaultValue<R extends GridValidRowM
      * @param {string} inProgress Indicates if the task is in progress.
      */
     onExcelExportStateChange?: (inProgress: 'pending' | 'finished') => void;
+    /**
+     * Callback fired before the clipboard paste operation starts.
+     * Use it to confirm or cancel the paste operation.
+     * @param {object} params Params passed to the callback.
+     * @param {string[][]} params.data The raw pasted data split by rows and cells.
+     * @returns {Promise<any>} A promise that resolves to confirm the paste operation, and rejects to cancel it.
+     */
+    onBeforeClipboardPasteStart?: (params: {
+        data: string[][];
+    }) => Promise<any>;
     /**
      * Callback fired when the clipboard paste operation starts.
      */

package/models/gridApiPremium.d.ts

@@ -1,5 +1,5 @@
 import { GridPrivateOnlyApiCommon } from '@mui/x-data-grid/internals';
-import { GridApiCommon, GridColumnPinningApi, GridColumnResizeApi, GridDetailPanelApi, GridDetailPanelPrivateApi, GridRowPinningApi, GridRowMultiSelectionApi, GridColumnReorderApi, GridRowProApi } from '@mui/x-data-grid-pro';
+import { GridApiCommon, GridColumnPinningApi, GridDetailPanelApi, GridDetailPanelPrivateApi, GridRowPinningApi, GridRowMultiSelectionApi, GridColumnReorderApi, GridRowProApi } from '@mui/x-data-grid-pro';
 import { GridInitialStatePremium, GridStatePremium } from './gridStatePremium';
 import type { GridRowGroupingApi, GridExcelExportApi, GridAggregationApi } from '../hooks';
 import { GridCellSelectionApi } from '../hooks/features/cellSelection/gridCellSelectionInterfaces';
@@ -8,7 +8,7 @@ import type { DataGridPremiumProcessedProps } from './dataGridPremiumProps';
  * The api of `DataGridPremium`.
  * TODO: Do not redefine manually the pro features
  */
-export interface GridApiPremium extends GridApiCommon<GridStatePremium, GridInitialStatePremium>, GridRowProApi, GridColumnPinningApi, GridColumnResizeApi, GridDetailPanelApi, GridRowGroupingApi, GridExcelExportApi, GridAggregationApi, GridRowPinningApi, GridCellSelectionApi, GridRowMultiSelectionApi, GridColumnReorderApi {
+export interface GridApiPremium extends GridApiCommon<GridStatePremium, GridInitialStatePremium>, GridRowProApi, GridColumnPinningApi, GridDetailPanelApi, GridRowGroupingApi, GridExcelExportApi, GridAggregationApi, GridRowPinningApi, GridCellSelectionApi, GridRowMultiSelectionApi, GridColumnReorderApi {
 }
 export interface GridPrivateApiPremium extends GridApiPremium, GridPrivateOnlyApiCommon<GridApiPremium, GridPrivateApiPremium, DataGridPremiumProcessedProps>, GridDetailPanelPrivateApi {
 }

package/modern/DataGridPremium/DataGridPremium.js

@@ -138,10 +138,10 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    */
   clipboardCopyCellDelimiter: PropTypes.string,
   /**
-   * Number of extra columns to be rendered before/after the visible slice.
-   * @default 3
+   * Column region in pixels to render before/after the viewport
+   * @default 150
    */
-  columnBuffer: PropTypes.number,
+  columnBufferPx: PropTypes.number,
   columnGroupingModel: PropTypes.arrayOf(PropTypes.object),
   /**
    * Sets the height in pixel of the column headers in the Data Grid.
@@ -152,11 +152,6 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * Set of columns of type [[GridColDef]][].
    */
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
-  /**
-   * Number of rows from the `columnBuffer` that can be visible before a new slice is rendered.
-   * @default 3
-   */
-  columnThreshold: PropTypes.number,
   /**
    * Set the column visibility model of the Data Grid.
    * If defined, the Data Grid will ignore the `hide` property in [[GridColDef]].
@@ -288,7 +283,6 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * For each feature, if the flag is not explicitly set to `true`, then the feature is fully disabled, and neither property nor method calls will have any effect.
    */
   experimentalFeatures: PropTypes.shape({
-    lazyLoading: PropTypes.bool,
     warnIfFocusStateIsNotSynced: PropTypes.bool
   }),
   /**
@@ -504,6 +498,14 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * @param {GridCallbackDetails} details Additional details for this callback.
    */
   onAggregationModelChange: PropTypes.func,
+  /**
+   * Callback fired before the clipboard paste operation starts.
+   * Use it to confirm or cancel the paste operation.
+   * @param {object} params Params passed to the callback.
+   * @param {string[][]} params.data The raw pasted data split by rows and cells.
+   * @returns {Promise<any>} A promise that resolves to confirm the paste operation, and rejects to cancel it.
+   */
+  onBeforeClipboardPasteStart: PropTypes.func,
   /**
    * Callback fired when any cell is clicked.
    * @param {GridCellParams} params With all properties from [[GridCellParams]].
@@ -631,6 +633,11 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * @param {GridCallbackDetails} details Additional details for this callback.
    */
   onColumnWidthChange: PropTypes.func,
+  /**
+   * Callback fired when the density changes.
+   * @param {GridDensity} density New density value.
+   */
+  onDensityChange: PropTypes.func,
   /**
    * Callback fired when the detail panel of a row is opened or closed.
    * @param {GridRowId[]} ids The ids of the rows which have the detail panel open.
@@ -715,6 +722,11 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * @param {GridCallbackDetails} details Additional details for this callback.
    */
   onRowClick: PropTypes.func,
+  /**
+   * Callback fired when the row count has changed.
+   * @param {number} count Updated row count.
+   */
+  onRowCountChange: PropTypes.func,
   /**
    * Callback fired when a double click event comes from a row container element.
    * @param {GridRowParams} params With all properties from [[RowParams]].
@@ -827,10 +839,10 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    */
   processRowUpdate: PropTypes.func,
   /**
-   * Number of extra rows to be rendered before/after the visible slice.
-   * @default 3
+   * Row region in pixels to render before/after the viewport
+   * @default 150
    */
-  rowBuffer: PropTypes.number,
+  rowBufferPx: PropTypes.number,
   /**
    * Set the total number of rows, if it is different from the length of the value `rows` prop.
    * If some rows have children (for instance in the tree data), this number represents the amount of top level rows.
@@ -869,8 +881,9 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
   rowReordering: PropTypes.bool,
   /**
    * Set of rows of type [[GridRowsProp]].
+   * @default []
    */
-  rows: PropTypes.arrayOf(PropTypes.object).isRequired,
+  rows: PropTypes.arrayOf(PropTypes.object),
   /**
    * If `false`, the row selection mode is disabled.
    * @default true
@@ -892,11 +905,6 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    * @default "margin"
    */
   rowSpacingType: PropTypes.oneOf(['border', 'margin']),
-  /**
-   * Number of rows from the `rowBuffer` that can be visible before a new slice is rendered.
-   * @default 3
-   */
-  rowThreshold: PropTypes.number,
   /**
    * Override the height/width of the Data Grid inner scrollbar.
    */