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

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

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { ownerDocument, useEventCallback } from '@mui/material/utils';
-import { isNavigationKey, serializeCellValue, useGridRegisterPipeProcessor, useGridVisibleRows } from '@mui/x-data-grid-pro/internals';
-import { useGridApiEventHandler, useGridApiMethod, GRID_ACTIONS_COLUMN_TYPE, GRID_CHECKBOX_SELECTION_COL_DEF, GRID_DETAIL_PANEL_TOGGLE_FIELD, gridRowsDataRowIdToIdLookupSelector, gridClasses, gridFocusCellSelector, GRID_REORDER_COL_DEF, useGridSelector, gridSortedRowIdsSelector } from '@mui/x-data-grid-pro';
+import { getTotalHeaderHeight, isNavigationKey, serializeCellValue, useGridRegisterPipeProcessor, useGridVisibleRows } from '@mui/x-data-grid-pro/internals';
+import { useGridApiEventHandler, useGridApiMethod, GRID_ACTIONS_COLUMN_TYPE, GRID_CHECKBOX_SELECTION_COL_DEF, GRID_DETAIL_PANEL_TOGGLE_FIELD, gridRowsDataRowIdToIdLookupSelector, gridClasses, gridFocusCellSelector, GRID_REORDER_COL_DEF, useGridSelector, gridSortedRowIdsSelector, gridDimensionsSelector } from '@mui/x-data-grid-pro';
 import { gridCellSelectionStateSelector } from './gridCellSelectionSelector';
 export const cellSelectionStateInitializer = (state, props) => _extends({}, state, {
   cellSelection: _extends({}, props.cellSelectionModel ?? props.initialState?.cellSelection)
@@ -20,6 +20,8 @@ export const useGridCellSelection = (apiRef, props) => {
   const mousePosition = React.useRef(null);
   const autoScrollRAF = React.useRef();
   const sortedRowIds = useGridSelector(apiRef, gridSortedRowIdsSelector);
+  const dimensions = useGridSelector(apiRef, gridDimensionsSelector);
+  const totalHeaderHeight = getTotalHeaderHeight(apiRef, props.columnHeaderHeight);
   const ignoreValueFormatterProp = props.ignoreValueFormatterDuringExport;
   const ignoreValueFormatter = (typeof ignoreValueFormatterProp === 'object' ? ignoreValueFormatterProp?.clipboardExport : ignoreValueFormatterProp) || false;
   const clipboardCopyCellDelimiter = props.clipboardCopyCellDelimiter;
@@ -166,10 +168,6 @@ export 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;
@@ -181,11 +179,10 @@ export 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;
@@ -216,7 +213,7 @@ export const useGridCellSelection = (apiRef, props) => {
       autoScrollRAF.current = requestAnimationFrame(autoScroll);
     }
     autoScroll();
-  }, [apiRef]);
+  }, [apiRef, dimensions]);
   const handleCellMouseOver = React.useCallback((params, event) => {
     if (!lastMouseDownCell.current) {
       return;
@@ -234,13 +231,15 @@ export 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
@@ -255,7 +254,7 @@ export 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 = useEventCallback((params, event) => {
     const {
       id,
@@ -447,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.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/modern/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid-premium",
-  "version": "7.0.0-beta.6",
+  "version": "7.0.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.6",
-    "@mui/x-data-grid-pro": "7.0.0-beta.6",
-    "@mui/x-license": "7.0.0-beta.6",
+    "@mui/system": "^5.15.14",
+    "@mui/utils": "^5.15.14",
+    "@mui/x-data-grid": "7.0.0",
+    "@mui/x-data-grid-pro": "7.0.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 = "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