[DataGrid] Fix memory leak on grid unmount (#6579)

mui · Oct 24, 2022 · 93a58b7 · 93a58b7
1 parent f9046a0
commit 93a58b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/grid/x-data-grid/src/hooks/core/useGridApiInitialization.ts b/packages/grid/x-data-grid/src/hooks/core/useGridApiInitialization.ts
@@ -4,6 +4,7 @@ import { GridSignature } from '../utils/useGridApiEventHandler';
 import { DataGridProcessedProps } from '../../models/props/DataGridProps';
 import { GridApiCommon, GridCoreApi } from '../../models';
 import { EventManager } from '../../utils/EventManager';
+import { unstable_resetCreateSelectorCache } from '../../utils/createSelector';
 
 const isSyntheticEvent = (event: any): event is React.SyntheticEvent => {
   return event.isPropagationStopped !== undefined;
@@ -68,6 +69,7 @@ export function useGridApiInitialization<Api extends GridApiCommon>(
     const api = apiRef.current;
 
     return () => {
+      unstable_resetCreateSelectorCache(api.instanceId);
       api.publishEvent('unmount');
     };
   }, [apiRef]);

diff --git a/packages/grid/x-data-grid/src/utils/createSelector.ts b/packages/grid/x-data-grid/src/utils/createSelector.ts
@@ -2,8 +2,10 @@ import * as React from 'react';
 import { createSelector as reselectCreateSelector, Selector, SelectorResultArray } from 'reselect';
 import { buildWarning } from './warning';
 
+type CacheKey = number | string;
+
 interface CacheContainer {
-  cache: Record<number | string, Map<any[], any>> | null;
+  cache: Record<CacheKey, Map<any[], any>> | null;
 }
 
 export interface OutputSelector<State, Result> {
@@ -92,6 +94,12 @@ export const createSelector: CreateSelectorFunction = (...args: any) => {
 };
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-export const unstable_resetCreateSelectorCache = () => {
-  cacheContainer.cache = null;
+export const unstable_resetCreateSelectorCache = (cacheKey?: CacheKey) => {
+  if (typeof cacheKey !== 'undefined') {
+    if (cacheContainer.cache && cacheContainer.cache[cacheKey]) {
+      delete cacheContainer.cache[cacheKey];
+    }
+  } else {
+    cacheContainer.cache = null;
+  }
 };