@mui/x-data-grid 6.9.2 → 6.10.0

package/modern/hooks/core/useGridApiInitialization.js

@@ -3,58 +3,79 @@ import { Store } from '../../utils/Store';
 import { useGridApiMethod } from '../utils/useGridApiMethod';
 import { GridSignature } from '../utils/useGridApiEventHandler';
 import { EventManager } from '../../utils/EventManager';
+const SYMBOL_API_PRIVATE = Symbol('mui.api_private');
 const isSyntheticEvent = event => {
   return event.isPropagationStopped !== undefined;
 };
+export function unwrapPrivateAPI(publicApi) {
+  return publicApi[SYMBOL_API_PRIVATE];
+}
 let globalId = 0;
-const wrapPublicApi = publicApi => {
-  const privateOnlyApi = {};
-  privateOnlyApi.getPublicApi = () => publicApi;
-  privateOnlyApi.register = (visibility, methods) => {
+function createPrivateAPI(publicApiRef) {
+  const existingPrivateApi = publicApiRef.current?.[SYMBOL_API_PRIVATE];
+  if (existingPrivateApi) {
+    return existingPrivateApi;
+  }
+  const state = {};
+  const privateApi = {
+    state,
+    store: Store.create(state),
+    instanceId: {
+      id: globalId
+    }
+  };
+  globalId += 1;
+  privateApi.getPublicApi = () => publicApiRef.current;
+  privateApi.register = (visibility, methods) => {
     Object.keys(methods).forEach(methodName => {
-      if (visibility === 'public') {
-        publicApi[methodName] = methods[methodName];
+      const method = methods[methodName];
+      const currentPrivateMethod = privateApi[methodName];
+      if (currentPrivateMethod?.spying === true) {
+        currentPrivateMethod.target = method;
       } else {
-        privateOnlyApi[methodName] = methods[methodName];
+        privateApi[methodName] = method;
+      }
+      if (visibility === 'public') {
+        const publicApi = publicApiRef.current;
+        const currentPublicMethod = publicApi[methodName];
+        if (currentPublicMethod?.spying === true) {
+          currentPublicMethod.target = method;
+        } else {
+          publicApi[methodName] = method;
+        }
       }
     });
   };
-  const handler = {
-    get: (obj, prop) => {
-      if (prop in obj) {
-        return obj[prop];
-      }
-      return privateOnlyApi[prop];
+  privateApi.register('private', {
+    caches: {},
+    eventManager: new EventManager()
+  });
+  return privateApi;
+}
+function createPublicAPI(privateApiRef) {
+  const publicApi = {
+    get state() {
+      return privateApiRef.current.state;
     },
-    set: (obj, prop, value) => {
-      obj[prop] = value;
-      return true;
-    }
+    get store() {
+      return privateApiRef.current.store;
+    },
+    get instanceId() {
+      return privateApiRef.current.instanceId;
+    },
+    [SYMBOL_API_PRIVATE]: privateApiRef.current
   };
-  return new Proxy(publicApi, handler);
-};
+  return publicApi;
+}
 export function useGridApiInitialization(inputApiRef, props) {
   const publicApiRef = React.useRef();
-  if (!publicApiRef.current) {
-    const state = {};
-    publicApiRef.current = {
-      state,
-      store: Store.create(state),
-      instanceId: {
-        id: globalId
-      }
-    };
-    globalId += 1;
-  }
   const privateApiRef = React.useRef();
   if (!privateApiRef.current) {
-    privateApiRef.current = wrapPublicApi(publicApiRef.current);
-    privateApiRef.current.register('private', {
-      caches: {},
-      eventManager: new EventManager()
-    });
+    privateApiRef.current = createPrivateAPI(publicApiRef);
+  }
+  if (!publicApiRef.current) {
+    publicApiRef.current = createPublicAPI(privateApiRef);
   }
-  React.useImperativeHandle(inputApiRef, () => publicApiRef.current, [publicApiRef]);
   const publishEvent = React.useCallback((...args) => {
     const [name, params, event = {}] = args;
     event.defaultMuiPrevented = false;
@@ -77,6 +98,7 @@ export function useGridApiInitialization(inputApiRef, props) {
     subscribeEvent,
     publishEvent
   }, 'public');
+  React.useImperativeHandle(inputApiRef, () => publicApiRef.current, [publicApiRef]);
   React.useEffect(() => {
     const api = privateApiRef.current;
     return () => {

package/modern/hooks/features/export/serializers/csvSerializer.js

@@ -35,43 +35,106 @@ export const serializeCellValue = (cellParams, options) => {
   return sanitizeCellValue(value, delimiterCharacter);
 };
 const objectFormattedValueWarning = buildWarning(['MUI: When the value of a field is an object or a `renderCell` is provided, the CSV export might not display the value correctly.', 'You can provide a `valueFormatter` with a string representation to be used.']);
+class CSVRow {
+  constructor(options) {
+    this.options = void 0;
+    this.rowString = '';
+    this.isEmpty = true;
+    this.options = options;
+  }
+  addValue(value) {
+    if (!this.isEmpty) {
+      this.rowString += this.options.delimiterCharacter;
+    }
+    if (value === null || value === undefined) {
+      this.rowString += '';
+    } else if (typeof this.options.sanitizeCellValue === 'function') {
+      this.rowString += this.options.sanitizeCellValue(value, this.options.delimiterCharacter);
+    } else {
+      this.rowString += value;
+    }
+    this.isEmpty = false;
+  }
+  getRowString() {
+    return this.rowString;
+  }
+}
 const serializeRow = ({
   id,
   columns,
   getCellParams,
   delimiterCharacter,
   ignoreValueFormatter
-}) => columns.map(column => {
-  const cellParams = getCellParams(id, column.field);
-  if (process.env.NODE_ENV !== 'production') {
-    if (String(cellParams.formattedValue) === '[object Object]') {
-      objectFormattedValueWarning();
+}) => {
+  const row = new CSVRow({
+    delimiterCharacter
+  });
+  columns.forEach(column => {
+    const cellParams = getCellParams(id, column.field);
+    if (process.env.NODE_ENV !== 'production') {
+      if (String(cellParams.formattedValue) === '[object Object]') {
+        objectFormattedValueWarning();
+      }
     }
-  }
-  return serializeCellValue(cellParams, {
-    delimiterCharacter,
-    ignoreValueFormatter
+    row.addValue(serializeCellValue(cellParams, {
+      delimiterCharacter,
+      ignoreValueFormatter
+    }));
   });
-});
+  return row.getRowString();
+};
 export function buildCSV(options) {
   const {
     columns,
     rowIds,
-    getCellParams,
     delimiterCharacter,
     includeHeaders,
-    ignoreValueFormatter
+    includeColumnGroupsHeaders,
+    ignoreValueFormatter,
+    apiRef
   } = options;
   const CSVBody = rowIds.reduce((acc, id) => `${acc}${serializeRow({
     id,
     columns,
-    getCellParams,
+    getCellParams: apiRef.current.getCellParams,
     delimiterCharacter,
     ignoreValueFormatter
-  }).join(delimiterCharacter)}\r\n`, '').trim();
+  })}\r\n`, '').trim();
   if (!includeHeaders) {
     return CSVBody;
   }
-  const CSVHead = `${columns.filter(column => column.field !== GRID_CHECKBOX_SELECTION_COL_DEF.field).map(column => sanitizeCellValue(column.headerName || column.field, delimiterCharacter)).join(delimiterCharacter)}\r\n`;
+  const filteredColumns = columns.filter(column => column.field !== GRID_CHECKBOX_SELECTION_COL_DEF.field);
+  const headerRows = [];
+  if (includeColumnGroupsHeaders) {
+    const columnGroupLookup = apiRef.current.unstable_getAllGroupDetails();
+    let maxColumnGroupsDepth = 0;
+    const columnGroupPathsLookup = filteredColumns.reduce((acc, column) => {
+      const columnGroupPath = apiRef.current.unstable_getColumnGroupPath(column.field);
+      acc[column.field] = columnGroupPath;
+      maxColumnGroupsDepth = Math.max(maxColumnGroupsDepth, columnGroupPath.length);
+      return acc;
+    }, {});
+    for (let i = 0; i < maxColumnGroupsDepth; i += 1) {
+      const headerGroupRow = new CSVRow({
+        delimiterCharacter,
+        sanitizeCellValue
+      });
+      headerRows.push(headerGroupRow);
+      filteredColumns.forEach(column => {
+        const columnGroupId = (columnGroupPathsLookup[column.field] || [])[i];
+        const columnGroup = columnGroupLookup[columnGroupId];
+        headerGroupRow.addValue(columnGroup ? columnGroup.headerName || columnGroup.groupId : '');
+      });
+    }
+  }
+  const mainHeaderRow = new CSVRow({
+    delimiterCharacter,
+    sanitizeCellValue
+  });
+  filteredColumns.forEach(column => {
+    mainHeaderRow.addValue(column.headerName || column.field);
+  });
+  headerRows.push(mainHeaderRow);
+  const CSVHead = `${headerRows.map(row => row.getRowString()).join('\r\n')}\r\n`;
   return `${CSVHead}${CSVBody}`.trim();
 }

package/modern/hooks/features/export/useGridCsvExport.js

@@ -31,10 +31,11 @@ export const useGridCsvExport = (apiRef, props) => {
     return buildCSV({
       columns: exportedColumns,
       rowIds: exportedRowIds,
-      getCellParams: apiRef.current.getCellParams,
       delimiterCharacter: options.delimiter || ',',
       includeHeaders: options.includeHeaders ?? true,
-      ignoreValueFormatter
+      includeColumnGroupsHeaders: options.includeColumnGroupsHeaders ?? true,
+      ignoreValueFormatter,
+      apiRef
     });
   }, [logger, apiRef, ignoreValueFormatter]);
   const exportDataAsCsv = React.useCallback(options => {

package/modern/hooks/features/filter/gridFilterUtils.js

@@ -3,7 +3,7 @@ import { GridLogicOperator } from '../../../models';
 import { GLOBAL_API_REF, isInternalFilter } from '../../../colDef/utils';
 import { getDefaultGridFilterModel } from './gridFilterState';
 import { buildWarning } from '../../../utils/warning';
-import { gridColumnFieldsSelector, gridColumnLookupSelector } from '../columns';
+import { gridColumnFieldsSelector, gridColumnLookupSelector, gridVisibleColumnFieldsSelector } from '../columns';
 /**
  * Adds default values to the optional fields of a filter items.
  * @param {GridFilterItem} item The raw filter item.
@@ -157,7 +157,8 @@ export const buildAggregatedQuickFilterApplier = (getRowId, filterModel, apiRef)
   if (quickFilterValues.length === 0) {
     return null;
   }
-  const columnFields = gridColumnFieldsSelector(apiRef);
+  const quickFilterExcludeHiddenColumns = filterModel.quickFilterExcludeHiddenColumns ?? false;
+  const columnFields = quickFilterExcludeHiddenColumns ? gridVisibleColumnFieldsSelector(apiRef) : gridColumnFieldsSelector(apiRef);
   const appliersPerField = [];
   columnFields.forEach(field => {
     const column = apiRef.current.getColumn(field);

package/modern/hooks/features/filter/useGridFilter.js

@@ -20,6 +20,7 @@ export const filterStateInitializer = (state, props, apiRef) => {
   return _extends({}, state, {
     filter: {
       filterModel: sanitizeFilterModel(filterModel, props.disableMultipleColumnsFiltering, apiRef),
+      filteredRowsLookup: {},
       filteredDescendantCountLookup: {}
     },
     visibleRowsLookup: {}
@@ -330,6 +331,13 @@ export const useGridFilter = (apiRef, props) => {
   useGridApiEventHandler(apiRef, 'columnsChange', handleColumnsChange);
   useGridApiEventHandler(apiRef, 'activeStrategyProcessorChange', handleStrategyProcessorChange);
   useGridApiEventHandler(apiRef, 'rowExpansionChange', updateVisibleRowsLookupState);
+  useGridApiEventHandler(apiRef, 'columnVisibilityModelChange', () => {
+    const filterModel = gridFilterModelSelector(apiRef);
+    if (filterModel.quickFilterValues && filterModel.quickFilterExcludeHiddenColumns) {
+      // re-apply filters because the quick filter results may have changed
+      apiRef.current.unstable_applyFilters();
+    }
+  });
 
   /**
    * 1ST RENDER

package/modern/hooks/features/rows/gridRowsUtils.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import { gridPinnedRowsSelector } from './gridRowsSelector';
 import { gridDensityFactorSelector } from '../density/densitySelector';
 export const GRID_ROOT_GROUP_ID = `auto-generated-group-node-root`;
-export const GRID_ID_AUTOGENERATED = Symbol('mui-autogenerated-id');
+export const GRID_ID_AUTOGENERATED = Symbol('mui.id_autogenerated');
 export const buildRootGroup = () => ({
   type: 'group',
   id: GRID_ROOT_GROUP_ID,

package/modern/hooks/utils/useGridApiMethod.js

@@ -1,27 +1,11 @@
 import * as React from 'react';
 export function useGridApiMethod(privateApiRef, apiMethods, visibility) {
-  const apiMethodsRef = React.useRef(apiMethods);
-  const [apiMethodsNames] = React.useState(Object.keys(apiMethods));
-  const installMethods = React.useCallback(() => {
-    if (!privateApiRef.current) {
-      return;
-    }
-    apiMethodsNames.forEach(methodName => {
-      if (!privateApiRef.current.hasOwnProperty(methodName)) {
-        privateApiRef.current.register(visibility, {
-          [methodName]: (...args) => {
-            const fn = apiMethodsRef.current[methodName];
-            return fn(...args);
-          }
-        });
-      }
-    });
-  }, [apiMethodsNames, privateApiRef, visibility]);
+  const isFirstRender = React.useRef(true);
   React.useEffect(() => {
-    apiMethodsRef.current = apiMethods;
-  }, [apiMethods]);
-  React.useEffect(() => {
-    installMethods();
-  }, [installMethods]);
-  installMethods();
+    isFirstRender.current = false;
+    privateApiRef.current.register(visibility, apiMethods);
+  }, [privateApiRef, visibility, apiMethods]);
+  if (isFirstRender.current) {
+    privateApiRef.current.register(visibility, apiMethods);
+  }
 }

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v6.9.2
+ * @mui/x-data-grid v6.10.0
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/internals/index.js

@@ -8,6 +8,7 @@ export { getGridFilter } from '../components/panel/filterPanel/GridFilterPanel';
 export { useGridRegisterPipeProcessor } from '../hooks/core/pipeProcessing';
 export { useGridRegisterStrategyProcessor, GRID_DEFAULT_STRATEGY } from '../hooks/core/strategyProcessing';
 export { useGridInitialization } from '../hooks/core/useGridInitialization';
+export { unwrapPrivateAPI } from '../hooks/core/useGridApiInitialization';
 export { useGridClipboard } from '../hooks/features/clipboard/useGridClipboard';
 export { useGridColumnHeaders } from '../hooks/features/columnHeaders/useGridColumnHeaders';
 export { unstable_gridHeaderFilteringEditFieldSelector, unstable_gridHeaderFilteringMenuSelector } from '../hooks/features/headerFiltering/gridHeaderFilteringSelectors';

package/modern/locales/plPL.js

@@ -37,7 +37,7 @@ const plPLGrid = {
   columnsPanelHideAllButton: 'Ukryj wszystko',
   // Filter panel text
   filterPanelAddFilter: 'Dodaj filtr',
-  // filterPanelRemoveAll: 'Remove all',
+  filterPanelRemoveAll: 'Usuń wszystkie',
   filterPanelDeleteIconLabel: 'Usuń',
   filterPanelLogicOperator: 'Operator logiczny',
   filterPanelOperator: 'Operator',
@@ -68,12 +68,12 @@ const plPLGrid = {
   // 'filterOperator<=': '<=',
 
   // Header filter operators text
-  // headerFilterOperatorContains: 'Contains',
-  // headerFilterOperatorEquals: 'Equals',
-  // headerFilterOperatorStartsWith: 'Starts with',
-  // headerFilterOperatorEndsWith: 'Ends with',
+  headerFilterOperatorContains: 'Zawiera',
+  headerFilterOperatorEquals: 'Równa się',
+  headerFilterOperatorStartsWith: 'Zaczyna się od',
+  headerFilterOperatorEndsWith: 'Kończy się na',
   // headerFilterOperatorIs: 'Is',
-  // headerFilterOperatorNot: 'Is not',
+  headerFilterOperatorNot: 'Niepuste',
   // headerFilterOperatorAfter: 'Is after',
   // headerFilterOperatorOnOrAfter: 'Is on or after',
   // headerFilterOperatorBefore: 'Is before',
@@ -95,7 +95,7 @@ const plPLGrid = {
   // Column menu text
   columnMenuLabel: 'Menu',
   columnMenuShowColumns: 'Pokaż wszystkie kolumny',
-  // columnMenuManageColumns: 'Manage columns',
+  columnMenuManageColumns: 'Zarządzaj kolumnami',
   columnMenuFilter: 'Filtr',
   columnMenuHideColumn: 'Ukryj',
   columnMenuUnsort: 'Anuluj sortowanie',

package/node/DataGrid/DataGrid.js

@@ -190,6 +190,7 @@ DataGridRaw.propTypes = {
       value: _propTypes.default.any
     })).isRequired,
     logicOperator: _propTypes.default.oneOf(['and', 'or']),
+    quickFilterExcludeHiddenColumns: _propTypes.default.bool,
     quickFilterLogicOperator: _propTypes.default.oneOf(['and', 'or']),
     quickFilterValues: _propTypes.default.array
   }),

package/node/components/toolbar/GridToolbarQuickFilter.js

@@ -64,18 +64,20 @@ function GridToolbarQuickFilter(props) {
   const rootProps = (0, _useGridRootProps.useGridRootProps)();
   const quickFilterValues = (0, _useGridSelector.useGridSelector)(apiRef, _filter.gridQuickFilterValuesSelector);
   const [searchValue, setSearchValue] = React.useState(() => quickFilterFormatter(quickFilterValues ?? []));
-  const [prevQuickFilterValues, setPrevQuickFilterValues] = React.useState(quickFilterValues);
+  const prevQuickFilterValuesRef = React.useRef(quickFilterValues);
   React.useEffect(() => {
-    if (!(0, _utils2.isDeepEqual)(prevQuickFilterValues, quickFilterValues)) {
+    if (!(0, _utils2.isDeepEqual)(prevQuickFilterValuesRef.current, quickFilterValues)) {
       // The model of quick filter value has been updated
-      setPrevQuickFilterValues(quickFilterValues);
+      prevQuickFilterValuesRef.current = quickFilterValues;
 
       // Update the input value if needed to match the new model
       setSearchValue(prevSearchValue => (0, _utils2.isDeepEqual)(quickFilterParser(prevSearchValue), quickFilterValues) ? prevSearchValue : quickFilterFormatter(quickFilterValues ?? []));
     }
-  }, [prevQuickFilterValues, quickFilterValues, quickFilterFormatter, quickFilterParser]);
+  }, [quickFilterValues, quickFilterFormatter, quickFilterParser]);
   const updateSearchValue = React.useCallback(newSearchValue => {
-    apiRef.current.setQuickFilterValues(quickFilterParser(newSearchValue));
+    const newQuickFilterValues = quickFilterParser(newSearchValue);
+    prevQuickFilterValuesRef.current = newQuickFilterValues;
+    apiRef.current.setQuickFilterValues(newQuickFilterValues);
   }, [apiRef, quickFilterParser]);
   const debouncedUpdateSearchValue = React.useMemo(() => (0, _utils.unstable_debounce)(updateSearchValue, debounceMs), [updateSearchValue, debounceMs]);
   const handleSearchValueChange = React.useCallback(event => {
@@ -95,8 +97,9 @@ function GridToolbarQuickFilter(props) {
     onChange: handleSearchValueChange,
     placeholder: apiRef.current.getLocaleText('toolbarQuickFilterPlaceholder'),
     "aria-label": apiRef.current.getLocaleText('toolbarQuickFilterLabel'),
-    type: "search",
-    InputProps: {
+    type: "search"
+  }, other, {
+    InputProps: (0, _extends2.default)({
       startAdornment: /*#__PURE__*/(0, _jsxRuntime.jsx)(rootProps.slots.quickFilterIcon, {
         fontSize: "small"
       }),
@@ -112,8 +115,8 @@ function GridToolbarQuickFilter(props) {
           fontSize: "small"
         })
       }))
-    }
-  }, other, rootProps.slotProps?.baseTextField));
+    }, other.InputProps)
+  }, rootProps.slotProps?.baseTextField));
 }
 process.env.NODE_ENV !== "production" ? GridToolbarQuickFilter.propTypes = {
   // ----------------------------- Warning --------------------------------

package/node/hooks/core/pipeProcessing/useGridPipeProcessing.js

@@ -42,13 +42,16 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 const useGridPipeProcessing = apiRef => {
   const processorsCache = React.useRef({});
+  const isRunning = React.useRef(false);
   const runAppliers = React.useCallback(groupCache => {
-    if (!groupCache) {
+    if (isRunning.current || !groupCache) {
       return;
     }
+    isRunning.current = true;
     Object.values(groupCache.appliers).forEach(callback => {
       callback();
     });
+    isRunning.current = false;
   }, []);
   const registerPipeProcessor = React.useCallback((group, id, processor) => {
     if (!processorsCache.current[group]) {

package/node/hooks/core/useGridApiInitialization.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.unwrapPrivateAPI = unwrapPrivateAPI;
 exports.useGridApiInitialization = useGridApiInitialization;
 var React = _interopRequireWildcard(require("react"));
 var _Store = require("../../utils/Store");
@@ -11,58 +12,79 @@ var _useGridApiEventHandler = require("../utils/useGridApiEventHandler");
 var _EventManager = require("../../utils/EventManager");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const SYMBOL_API_PRIVATE = Symbol('mui.api_private');
 const isSyntheticEvent = event => {
   return event.isPropagationStopped !== undefined;
 };
+function unwrapPrivateAPI(publicApi) {
+  return publicApi[SYMBOL_API_PRIVATE];
+}
 let globalId = 0;
-const wrapPublicApi = publicApi => {
-  const privateOnlyApi = {};
-  privateOnlyApi.getPublicApi = () => publicApi;
-  privateOnlyApi.register = (visibility, methods) => {
+function createPrivateAPI(publicApiRef) {
+  const existingPrivateApi = publicApiRef.current?.[SYMBOL_API_PRIVATE];
+  if (existingPrivateApi) {
+    return existingPrivateApi;
+  }
+  const state = {};
+  const privateApi = {
+    state,
+    store: _Store.Store.create(state),
+    instanceId: {
+      id: globalId
+    }
+  };
+  globalId += 1;
+  privateApi.getPublicApi = () => publicApiRef.current;
+  privateApi.register = (visibility, methods) => {
     Object.keys(methods).forEach(methodName => {
-      if (visibility === 'public') {
-        publicApi[methodName] = methods[methodName];
+      const method = methods[methodName];
+      const currentPrivateMethod = privateApi[methodName];
+      if (currentPrivateMethod?.spying === true) {
+        currentPrivateMethod.target = method;
       } else {
-        privateOnlyApi[methodName] = methods[methodName];
+        privateApi[methodName] = method;
+      }
+      if (visibility === 'public') {
+        const publicApi = publicApiRef.current;
+        const currentPublicMethod = publicApi[methodName];
+        if (currentPublicMethod?.spying === true) {
+          currentPublicMethod.target = method;
+        } else {
+          publicApi[methodName] = method;
+        }
       }
     });
   };
-  const handler = {
-    get: (obj, prop) => {
-      if (prop in obj) {
-        return obj[prop];
-      }
-      return privateOnlyApi[prop];
+  privateApi.register('private', {
+    caches: {},
+    eventManager: new _EventManager.EventManager()
+  });
+  return privateApi;
+}
+function createPublicAPI(privateApiRef) {
+  const publicApi = {
+    get state() {
+      return privateApiRef.current.state;
     },
-    set: (obj, prop, value) => {
-      obj[prop] = value;
-      return true;
-    }
+    get store() {
+      return privateApiRef.current.store;
+    },
+    get instanceId() {
+      return privateApiRef.current.instanceId;
+    },
+    [SYMBOL_API_PRIVATE]: privateApiRef.current
   };
-  return new Proxy(publicApi, handler);
-};
+  return publicApi;
+}
 function useGridApiInitialization(inputApiRef, props) {
   const publicApiRef = React.useRef();
-  if (!publicApiRef.current) {
-    const state = {};
-    publicApiRef.current = {
-      state,
-      store: _Store.Store.create(state),
-      instanceId: {
-        id: globalId
-      }
-    };
-    globalId += 1;
-  }
   const privateApiRef = React.useRef();
   if (!privateApiRef.current) {
-    privateApiRef.current = wrapPublicApi(publicApiRef.current);
-    privateApiRef.current.register('private', {
-      caches: {},
-      eventManager: new _EventManager.EventManager()
-    });
+    privateApiRef.current = createPrivateAPI(publicApiRef);
+  }
+  if (!publicApiRef.current) {
+    publicApiRef.current = createPublicAPI(privateApiRef);
   }
-  React.useImperativeHandle(inputApiRef, () => publicApiRef.current, [publicApiRef]);
   const publishEvent = React.useCallback((...args) => {
     const [name, params, event = {}] = args;
     event.defaultMuiPrevented = false;
@@ -85,6 +107,7 @@ function useGridApiInitialization(inputApiRef, props) {
     subscribeEvent,
     publishEvent
   }, 'public');
+  React.useImperativeHandle(inputApiRef, () => publicApiRef.current, [publicApiRef]);
   React.useEffect(() => {
     const api = privateApiRef.current;
     return () => {