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

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 = "MTcxMDM3MDgwMDAwMA==";
+  const releaseInfo = "MTcxMTU4MDQwMDAwMA==";
   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/cellSelection/useGridCellSelection.js

@@ -456,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.7
+ * @mui/x-data-grid-premium v7.1.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/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]].
@@ -503,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]].
@@ -630,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.
@@ -831,10 +839,15 @@ process.env.NODE_ENV !== "production" ? DataGridPremiumRaw.propTypes = {
    */
   processRowUpdate: PropTypes.func,
   /**
-   * Number of extra rows to be rendered before/after the visible slice.
-   * @default 3
+   * The milliseconds throttle delay for resizing the grid.
+   * @default 60
+   */
+  resizeThrottleMs: PropTypes.number,
+  /**
+   * 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.
@@ -873,8 +886,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
@@ -896,11 +910,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.
    */

package/modern/hooks/features/cellSelection/useGridCellSelection.js

@@ -446,7 +446,8 @@ export const useGridCellSelection = (apiRef, props) => {
           const cellParams = apiRef.current.getCellParams(rowId, field);
           cellData = serializeCellValue(cellParams, {
             delimiterCharacter: clipboardCopyCellDelimiter,
-            ignoreValueFormatter
+            ignoreValueFormatter,
+            shouldAppendQuotes: true
           });
         } else {
           cellData = '';

package/modern/hooks/features/clipboard/useGridClipboardImport.js

@@ -1,10 +1,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { GRID_CHECKBOX_SELECTION_FIELD, gridFocusCellSelector, gridVisibleColumnFieldsSelector, useGridApiOptionHandler, useGridApiEventHandler, gridPaginatedVisibleSortedGridRowIdsSelector, gridExpandedSortedRowIdsSelector } from '@mui/x-data-grid';
-import { buildWarning, getRowIdFromRowModel, getActiveElement, useGridRegisterPipeProcessor, getPublicApiRef, isPasteShortcut } from '@mui/x-data-grid/internals';
+import { buildWarning, getRowIdFromRowModel, getActiveElement, useGridRegisterPipeProcessor, getPublicApiRef, isPasteShortcut, useGridLogger } from '@mui/x-data-grid/internals';
 import { GRID_DETAIL_PANEL_TOGGLE_FIELD, GRID_REORDER_COL_DEF } from '@mui/x-data-grid-pro';
 import { unstable_debounce as debounce } from '@mui/utils';
-const missingOnProcessRowUpdateErrorWarning = 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 = 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 = [GRID_CHECKBOX_SELECTION_FIELD, GRID_REORDER_COL_DEF.field, GRID_DETAIL_PANEL_TOGGLE_FIELD];
 
 // Batches rows that are updated during clipboard paste to reduce `updateRows` calls
@@ -240,7 +240,12 @@ export const useGridClipboardImport = (apiRef, props) => {
   const getRowId = props.getRowId;
   const enableClipboardPaste = !props.disableClipboardPaste;
   const rootEl = apiRef.current.rootElementRef?.current;
+  const logger = useGridLogger(apiRef, 'useGridClipboardImport');
   const splitClipboardPastedText = props.splitClipboardPastedText;
+  const {
+    pagination,
+    onBeforeClipboardPasteStart
+  } = props;
   const handlePaste = React.useCallback(async (params, event) => {
     if (!enableClipboardPaste) {
       return;
@@ -267,6 +272,16 @@ export 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,
@@ -282,10 +297,10 @@ export 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/modern/hooks/features/rowGrouping/createGroupingColDef.js

@@ -64,8 +64,9 @@ 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);
     },

package/modern/index.js

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

package/modern/utils/releaseInfo.js

@@ -1,6 +1,6 @@
 import { ponyfillGlobal } from '@mui/utils';
 export const getReleaseInfo = () => {
-  const releaseInfo = "MTcxMDM3MDgwMDAwMA==";
+  const releaseInfo = "MTcxMTU4MDQwMDAwMA==";
   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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-premium",
-  "version": "7.0.0-beta.7",
+  "version": "7.1.0",
   "description": "The Premium plan edition of the data grid component (MUI X).",
   "author": "MUI Team",
   "main": "./index.js",
@@ -33,11 +33,11 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.24.0",
-    "@mui/system": "^5.15.9",
-    "@mui/utils": "^5.15.9",
-    "@mui/x-data-grid": "7.0.0-beta.7",
-    "@mui/x-data-grid-pro": "7.0.0-beta.7",
-    "@mui/x-license": "7.0.0-beta.6",
+    "@mui/system": "^5.15.14",
+    "@mui/utils": "^5.15.14",
+    "@mui/x-data-grid": "7.1.0",
+    "@mui/x-data-grid-pro": "7.1.0",
+    "@mui/x-license": "7.0.0",
     "@types/format-util": "^1.0.4",
     "clsx": "^2.1.0",
     "exceljs": "^4.4.0",
@@ -45,7 +45,7 @@
     "reselect": "^4.1.8"
   },
   "peerDependencies": {
-    "@mui/material": "^5.15.0",
+    "@mui/material": "^5.15.14",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },

package/utils/releaseInfo.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getReleaseInfo = void 0;
 var _utils = require("@mui/utils");
 const getReleaseInfo = () => {
-  const releaseInfo = "MTcxMDM3MDgwMDAwMA==";
+  const releaseInfo = "MTcxMTU4MDQwMDAwMA==";
   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