fix

mui · Jan 31, 2025 · 32e4dc2 · 32e4dc2
1 parent 9f95fee
commit 32e4dc2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/x-data-grid-premium/src/hooks/features/cellSelection/useGridCellSelection.ts b/packages/x-data-grid-premium/src/hooks/features/cellSelection/useGridCellSelection.ts
@@ -10,7 +10,6 @@ import {
   isNavigationKey,
   serializeCellValue,
   useGridRegisterPipeProcessor,
-  useGridVisibleRows,
 } from '@mui/x-data-grid-pro/internals';
 import {
   useGridApiEventHandler,
@@ -26,7 +25,6 @@ import {
   gridFocusCellSelector,
   GridCellParams,
   GRID_REORDER_COL_DEF,
-  useGridSelector,
   gridSortedRowIdsSelector,
   gridDimensionsSelector,
 } from '@mui/x-data-grid-pro';
@@ -64,12 +62,10 @@ export const useGridCellSelection = (
   >,
 ) => {
   const hasRootReference = apiRef.current.rootElementRef.current !== null;
-  const visibleRows = useGridVisibleRows(apiRef, props);
   const cellWithVirtualFocus = React.useRef<GridCellCoordinates>(null);
   const lastMouseDownCell = React.useRef<GridCellCoordinates>(null);
   const mousePosition = React.useRef<{ x: number; y: number }>(null);
   const autoScrollRAF = React.useRef<number>(null);
-  const sortedRowIds = useGridSelector(apiRef, gridSortedRowIdsSelector);
   const totalHeaderHeight = getTotalHeaderHeight(apiRef, props);
 
   const ignoreValueFormatterProp = props.ignoreValueFormatterDuringExport;
@@ -144,6 +140,7 @@ export const useGridCellSelection = (
       }
 
       const visibleColumns = apiRef.current.getVisibleColumns();
+      const visibleRows = getVisibleRows(apiRef);
       const rowsInRange = visibleRows.rows.slice(finalStartRowIndex, finalEndRowIndex + 1);
       const columnsInRange = visibleColumns.slice(finalStartColumnIndex, finalEndColumnIndex + 1);
 
@@ -160,7 +157,7 @@ export const useGridCellSelection = (
 
       apiRef.current.setCellSelectionModel(newModel);
     },
-    [apiRef, visibleRows.rows],
+    [apiRef],
   );
 
   const getSelectedCellsAsArray = React.useCallback<
@@ -440,6 +437,7 @@ export const useGridCellSelection = (
       endColumnIndex -= 1;
     }
 
+    const visibleRows = getVisibleRows(apiRef);
     if (endRowIndex < 0 || endRowIndex >= visibleRows.rows.length) {
       return;
     }
@@ -492,6 +490,7 @@ export const useGridCellSelection = (
 
   const addClassesToCells = React.useCallback<GridPipeProcessor<'cellClassName'>>(
     (classes, { id, field }) => {
+      const visibleRows = getVisibleRows(apiRef);
       if (!visibleRows.range || !apiRef.current.isCellSelected(id, field)) {
         return classes;
       }
@@ -540,7 +539,7 @@ export const useGridCellSelection = (
 
       return newClasses;
     },
-    [apiRef, visibleRows.range, visibleRows.rows],
+    [apiRef],
   );
 
   const canUpdateFocus = React.useCallback<GridPipeProcessor<'canUpdateFocus'>>(
@@ -568,6 +567,7 @@ export const useGridCellSelection = (
       if (apiRef.current.getSelectedCellsAsArray().length <= 1) {
         return value;
       }
+      const sortedRowIds = gridSortedRowIdsSelector(apiRef.current.state);
       const cellSelectionModel = apiRef.current.getCellSelectionModel();
       const unsortedSelectedRowIds = Object.keys(cellSelectionModel);
       const sortedSelectedRowIds = sortedRowIds.filter((id) =>
@@ -596,7 +596,7 @@ export const useGridCellSelection = (
       }, '');
       return copyData;
     },
-    [apiRef, ignoreValueFormatter, clipboardCopyCellDelimiter, sortedRowIds],
+    [apiRef, ignoreValueFormatter, clipboardCopyCellDelimiter],
   );
 
   useGridRegisterPipeProcessor(apiRef, 'isCellSelected', checkIfCellIsSelected);

diff --git a/packages/x-data-grid/src/hooks/utils/useGridSelector.ts b/packages/x-data-grid/src/hooks/utils/useGridSelector.ts
@@ -87,6 +87,7 @@ export const useGridSelector = <Api extends GridApiCommon, Args, T>(
     (didInit ? null : applySelector(apiRef, selector, args, apiRef.current.instanceId)) as T,
   );
 
+  refs.current.state = state;
   refs.current.equals = equals;
   refs.current.selector = selector;
   const prevArgs = refs.current.args;