From ece2dfd5a4b557eedc9495bfb803e6add9f597e4 Mon Sep 17 00:00:00 2001
From: Andrew Cherniavskii <andrew@mui.com>
Date: Mon, 2 Dec 2024 17:47:46 +0100
Subject: [PATCH] [DataGridPro] Cleanup pinned rows on removal (#15697)

---
 .../useGridRowPinningPreProcessors.ts         | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/x-data-grid-pro/src/hooks/features/rowPinning/useGridRowPinningPreProcessors.ts b/packages/x-data-grid-pro/src/hooks/features/rowPinning/useGridRowPinningPreProcessors.ts
index 95ee0924838b..586e4f2f4f4a 100644
--- a/packages/x-data-grid-pro/src/hooks/features/rowPinning/useGridRowPinningPreProcessors.ts
+++ b/packages/x-data-grid-pro/src/hooks/features/rowPinning/useGridRowPinningPreProcessors.ts
@@ -13,7 +13,7 @@ import {
   GridRowModel,
 } from '@mui/x-data-grid';
 import { GridPrivateApiPro } from '../../../models/gridApiPro';
-import { GridPinnedRowsProp } from './gridRowPinningInterface';
+import type { GridPinnedRowsProp, GridRowPinningInternalCache } from './gridRowPinningInterface';
 import { insertNodeInTree } from '../../../utils/tree/utils';
 
 type GridPinnedRowPosition = keyof GridPinnedRowsProp;
@@ -92,9 +92,13 @@ export function addPinnedRow({
 export const useGridRowPinningPreProcessors = (
   apiRef: React.MutableRefObject<GridPrivateApiPro>,
 ) => {
+  const prevPinnedRowsCacheRef = React.useRef<GridRowPinningInternalCache | null>(null);
+
   const addPinnedRows = React.useCallback<GridPipeProcessor<'hydrateRows'>>(
     (groupingParams) => {
       const pinnedRowsCache = apiRef.current.caches.pinnedRows || {};
+      const prevPinnedRowsCache = prevPinnedRowsCacheRef.current;
+      prevPinnedRowsCacheRef.current = pinnedRowsCache;
 
       let newGroupingParams: GridHydrateRowsValue = {
         ...groupingParams,
@@ -105,6 +109,22 @@ export const useGridRowPinningPreProcessors = (
         },
       };
 
+      if (prevPinnedRowsCache) {
+        const pinnedRowCleanup = (rowId: GridRowId) => {
+          const node = newGroupingParams.tree[rowId];
+          if (node?.type === 'pinnedRow') {
+            delete newGroupingParams.tree[rowId];
+            delete newGroupingParams.dataRowIdToModelLookup[rowId];
+            delete newGroupingParams.dataRowIdToIdLookup[rowId];
+            delete apiRef.current.caches.rows.dataRowIdToIdLookup[rowId];
+            delete apiRef.current.caches.rows.dataRowIdToModelLookup[rowId];
+          }
+        };
+
+        prevPinnedRowsCache.topIds?.forEach(pinnedRowCleanup);
+        prevPinnedRowsCache.bottomIds?.forEach(pinnedRowCleanup);
+      }
+
       pinnedRowsCache.topIds?.forEach((rowId) => {
         newGroupingParams = addPinnedRow({
           groupingParams: newGroupingParams,