@mui/x-data-grid 7.0.0-beta.5 → 7.0.0-beta.7

package/node/hooks/features/scroll/useGridScroll.js

@@ -52,7 +52,7 @@ function scrollIntoView(dimensions) {
 const useGridScroll = (apiRef, props) => {
   const theme = (0, _styles.useTheme)();
   const logger = (0, _useGridLogger.useGridLogger)(apiRef, 'useGridScroll');
-  const colRef = apiRef.current.columnHeadersElementRef;
+  const colRef = apiRef.current.columnHeadersContainerRef;
   const virtualScrollerRef = apiRef.current.virtualScrollerRef;
   const visibleSortedRows = (0, _useGridSelector.useGridSelector)(apiRef, _gridFilterSelector.gridExpandedSortedRowEntriesSelector);
   const scrollToIndexes = React.useCallback(params => {

package/node/hooks/features/sorting/useGridSorting.js

@@ -50,7 +50,7 @@ const useGridSorting = (apiRef, props) => {
     const existingIdx = sortModel.findIndex(c => c.field === field);
     let newSortModel = [...sortModel];
     if (existingIdx > -1) {
-      if (!sortItem) {
+      if (sortItem?.sort == null) {
         newSortModel.splice(existingIdx, 1);
       } else {
         newSortModel.splice(existingIdx, 1, sortItem);
@@ -126,7 +126,7 @@ const useGridSorting = (apiRef, props) => {
     const sortItem = createSortItem(column, direction);
     let sortModel;
     if (!allowMultipleSorting || props.disableMultipleColumnsSorting) {
-      sortModel = !sortItem ? [] : [sortItem];
+      sortModel = sortItem?.sort == null ? [] : [sortItem];
     } else {
       sortModel = upsertSortModel(column.field, sortItem);
     }

package/node/hooks/features/virtualization/gridVirtualizationSelectors.js

@@ -38,8 +38,6 @@ const gridRenderContextSelector = exports.gridRenderContextSelector = (0, _creat
  * @ignore - do not document.
  */
 const gridRenderContextColumnsSelector = exports.gridRenderContextColumnsSelector = (0, _createSelector.createSelectorMemoized)(state => state.virtualization.renderContext.firstColumnIndex, state => state.virtualization.renderContext.lastColumnIndex, (firstColumnIndex, lastColumnIndex) => ({
-  firstRowIndex: -1,
-  lastRowIndex: -1,
   firstColumnIndex,
   lastColumnIndex
 }));

package/node/hooks/features/virtualization/useGridVirtualScroller.js

@@ -284,6 +284,11 @@ const useGridVirtualScroller = () => {
       if (panel) {
         rows.push(panel);
       }
+      if (isLastVisible) {
+        rows.push(apiRef.current.getInfiniteLoadingTriggerElement?.({
+          lastRowId: id
+        }));
+      }
     });
     return rows;
   };

package/node/hooks/utils/useLazyRef.js

@@ -1,19 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useLazyRef = useLazyRef;
-var React = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const UNINITIALIZED = {};
-
-// See https://github.com/facebook/react/issues/14490 for when to use this.
-function useLazyRef(init, initArg) {
-  const ref = React.useRef(UNINITIALIZED);
-  if (ref.current === UNINITIALIZED) {
-    ref.current = init(initArg);
+Object.defineProperty(exports, "useLazyRef", {
+  enumerable: true,
+  get: function () {
+    return _useLazyRef.default;
   }
-  return ref;
-}
+});
+var _useLazyRef = _interopRequireDefault(require("@mui/utils/useLazyRef"));

package/node/hooks/utils/useOnMount.js

@@ -1,15 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useOnMount = useOnMount;
-var React = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const EMPTY = [];
-function useOnMount(fn) {
-  /* eslint-disable react-hooks/exhaustive-deps */
-  React.useEffect(fn, EMPTY);
-  /* eslint-enable react-hooks/exhaustive-deps */
-}
+Object.defineProperty(exports, "useOnMount", {
+  enumerable: true,
+  get: function () {
+    return _useOnMount.default;
+  }
+});
+var _useOnMount = _interopRequireDefault(require("@mui/utils/useOnMount"));

package/node/hooks/utils/useTimeout.js

@@ -1,43 +1,13 @@
 "use strict";
-'use client';
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Timeout = void 0;
-exports.useTimeout = useTimeout;
-var _useLazyRef = require("./useLazyRef");
-var _useOnMount = require("./useOnMount");
-class Timeout {
-  constructor() {
-    this.currentId = null;
-    this.clear = () => {
-      if (this.currentId !== null) {
-        clearTimeout(this.currentId);
-        this.currentId = null;
-      }
-    };
-    this.disposeEffect = () => {
-      return this.clear;
-    };
+Object.defineProperty(exports, "useTimeout", {
+  enumerable: true,
+  get: function () {
+    return _useTimeout.default;
   }
-  static create() {
-    return new Timeout();
-  }
-  /**
-   * Executes `fn` after `delay`, clearing any previously scheduled call.
-   */
-  start(delay, fn) {
-    this.clear();
-    this.currentId = setTimeout(() => {
-      this.currentId = null;
-      fn();
-    }, delay);
-  }
-}
-exports.Timeout = Timeout;
-function useTimeout() {
-  const timeout = (0, _useLazyRef.useLazyRef)(Timeout.create).current;
-  (0, _useOnMount.useOnMount)(timeout.disposeEffect);
-  return timeout;
-}
+});
+var _useTimeout = _interopRequireDefault(require("@mui/utils/useTimeout"));

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-data-grid v7.0.0-beta.5
+ * @mui/x-data-grid v7.0.0-beta.7
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/node/internals/index.js

@@ -9,7 +9,6 @@ var _exportNames = {
   GridVirtualScrollerRenderZone: true,
   GridHeaders: true,
   GridBaseColumnHeaders: true,
-  GridColumnHeadersInner: true,
   DATA_GRID_DEFAULT_SLOTS_COMPONENTS: true,
   getGridFilter: true,
   useGridRegisterPipeProcessor: true,
@@ -72,6 +71,8 @@ var _exportNames = {
   useGridStatePersistence: true,
   useGridVirtualScroller: true,
   EMPTY_DETAIL_PANELS: true,
+  useGridColumnResize: true,
+  columnResizeStateInitializer: true,
   useTimeout: true,
   useGridVisibleRows: true,
   getVisibleRows: true,
@@ -80,7 +81,6 @@ var _exportNames = {
   defaultGetRowsToExport: true,
   createSelector: true,
   createSelectorMemoized: true,
-  unstable_resetCreateSelectorCache: true,
   findParentElementFromClassName: true,
   getActiveElement: true,
   isEventTargetInPortal: true,
@@ -121,12 +121,6 @@ Object.defineProperty(exports, "GridBaseColumnHeaders", {
     return _GridBaseColumnHeaders.GridBaseColumnHeaders;
   }
 });
-Object.defineProperty(exports, "GridColumnHeadersInner", {
-  enumerable: true,
-  get: function () {
-    return _GridColumnHeadersInner.GridColumnHeadersInner;
-  }
-});
 Object.defineProperty(exports, "GridHeaders", {
   enumerable: true,
   get: function () {
@@ -181,6 +175,12 @@ Object.defineProperty(exports, "columnMenuStateInitializer", {
     return _useGridColumnMenu.columnMenuStateInitializer;
   }
 });
+Object.defineProperty(exports, "columnResizeStateInitializer", {
+  enumerable: true,
+  get: function () {
+    return _useGridColumnResize.columnResizeStateInitializer;
+  }
+});
 Object.defineProperty(exports, "columnsStateInitializer", {
   enumerable: true,
   get: function () {
@@ -391,12 +391,6 @@ Object.defineProperty(exports, "sortingStateInitializer", {
     return _useGridSorting.sortingStateInitializer;
   }
 });
-Object.defineProperty(exports, "unstable_resetCreateSelectorCache", {
-  enumerable: true,
-  get: function () {
-    return _createSelector.unstable_resetCreateSelectorCache;
-  }
-});
 Object.defineProperty(exports, "unwrapPrivateAPI", {
   enumerable: true,
   get: function () {
@@ -421,6 +415,12 @@ Object.defineProperty(exports, "useGridColumnMenu", {
     return _useGridColumnMenu.useGridColumnMenu;
   }
 });
+Object.defineProperty(exports, "useGridColumnResize", {
+  enumerable: true,
+  get: function () {
+    return _useGridColumnResize.useGridColumnResize;
+  }
+});
 Object.defineProperty(exports, "useGridColumnSpanning", {
   enumerable: true,
   get: function () {
@@ -612,7 +612,6 @@ var _GridVirtualScrollerContent = require("../components/virtualization/GridVirt
 var _GridVirtualScrollerRenderZone = require("../components/virtualization/GridVirtualScrollerRenderZone");
 var _GridHeaders = require("../components/GridHeaders");
 var _GridBaseColumnHeaders = require("../components/columnHeaders/GridBaseColumnHeaders");
-var _GridColumnHeadersInner = require("../components/columnHeaders/GridColumnHeadersInner");
 var _defaultGridSlotsComponents = require("../constants/defaultGridSlotsComponents");
 var _GridFilterPanel = require("../components/panel/filterPanel/GridFilterPanel");
 var _pipeProcessing = require("../hooks/core/pipeProcessing");
@@ -700,6 +699,7 @@ Object.keys(_virtualization).forEach(function (key) {
     }
   });
 });
+var _useGridColumnResize = require("../hooks/features/columnResize/useGridColumnResize");
 var _useTimeout = require("../hooks/utils/useTimeout");
 var _useGridVisibleRows = require("../hooks/utils/useGridVisibleRows");
 var _useGridInitializeState = require("../hooks/utils/useGridInitializeState");

package/node/internals/utils/getPinnedCellOffset.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPinnedCellOffset = void 0;
+var _columns = require("../../hooks/features/columns");
+const getPinnedCellOffset = (pinnedPosition, computedWidth, columnIndex, columnPositions, dimensions) => {
+  const scrollbarWidth = dimensions.hasScrollY ? dimensions.scrollbarSize : 0;
+  let pinnedOffset;
+  switch (pinnedPosition) {
+    case _columns.GridPinnedColumnPosition.LEFT:
+      pinnedOffset = columnPositions[columnIndex];
+      break;
+    case _columns.GridPinnedColumnPosition.RIGHT:
+      pinnedOffset = dimensions.columnsTotalWidth - columnPositions[columnIndex] - computedWidth + scrollbarWidth;
+      break;
+    default:
+      pinnedOffset = 0;
+      break;
+  }
+  return pinnedOffset;
+};
+exports.getPinnedCellOffset = getPinnedCellOffset;

package/node/joy/joySlots.js

@@ -14,7 +14,6 @@ var _FormControl = _interopRequireDefault(require("@mui/joy/FormControl"));
 var _FormLabel = _interopRequireDefault(require("@mui/joy/FormLabel"));
 var _Button = _interopRequireDefault(require("@mui/joy/Button"));
 var _IconButton = _interopRequireDefault(require("@mui/joy/IconButton"));
-var _Switch = _interopRequireDefault(require("@mui/joy/Switch"));
 var _Select = _interopRequireDefault(require("@mui/joy/Select"));
 var _Option = _interopRequireDefault(require("@mui/joy/Option"));
 var _Box = _interopRequireDefault(require("@mui/joy/Box"));
@@ -32,10 +31,9 @@ const _excluded = ["touchRippleRef", "inputProps", "onChange", "color", "size",
   _excluded2 = ["onChange", "label", "placeholder", "value", "inputRef", "type", "size", "variant"],
   _excluded3 = ["startIcon", "color", "endIcon", "size", "sx", "variant"],
   _excluded4 = ["color", "size", "sx", "touchRippleRef"],
-  _excluded5 = ["name", "checkedIcon", "color", "disableRipple", "disableFocusRipple", "disableTouchRipple", "edge", "icon", "inputProps", "inputRef", "size", "sx", "onChange", "onClick"],
-  _excluded6 = ["open", "onOpen", "value", "onChange", "size", "color", "variant", "inputProps", "MenuProps", "inputRef", "error", "native", "fullWidth", "labelId"],
-  _excluded7 = ["native"],
-  _excluded8 = ["shrink", "variant", "sx"];
+  _excluded5 = ["open", "onOpen", "value", "onChange", "size", "color", "variant", "inputProps", "MenuProps", "inputRef", "error", "native", "fullWidth", "labelId"],
+  _excluded6 = ["native"],
+  _excluded7 = ["shrink", "variant", "sx"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function convertColor(color) {
@@ -162,43 +160,7 @@ const IconButton = /*#__PURE__*/React.forwardRef(function IconButton(_ref4, ref)
     sx: sx
   }));
 });
-const Switch = /*#__PURE__*/React.forwardRef(function Switch(_ref5, ref) {
-  let {
-      name,
-      color: colorProp,
-      edge,
-      icon,
-      inputProps,
-      inputRef,
-      size,
-      sx,
-      onChange,
-      onClick
-    } = _ref5,
-    props = (0, _objectWithoutPropertiesLoose2.default)(_ref5, _excluded5);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Switch.default, (0, _extends2.default)({}, props, {
-    onChange: onChange,
-    size: convertSize(size),
-    color: convertColor(colorProp),
-    ref: ref,
-    slotProps: {
-      input: (0, _extends2.default)({}, inputProps, {
-        name,
-        onClick: onClick,
-        ref: inputRef
-      }),
-      thumb: {
-        children: icon
-      }
-    },
-    sx: [(0, _extends2.default)({}, edge === 'start' && {
-      ml: '-8px'
-    }, edge === 'end' && {
-      mr: '-8px'
-    }), ...(Array.isArray(sx) ? sx : [sx])]
-  }));
-});
-const Select = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
+const Select = /*#__PURE__*/React.forwardRef((_ref5, ref) => {
   let {
       open,
       onOpen,
@@ -210,8 +172,8 @@ const Select = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
       MenuProps,
       inputRef,
       labelId
-    } = _ref6,
-    props = (0, _objectWithoutPropertiesLoose2.default)(_ref6, _excluded6);
+    } = _ref5,
+    props = (0, _objectWithoutPropertiesLoose2.default)(_ref5, _excluded5);
   const handleChange = (event, newValue) => {
     if (event && onChange) {
       // Same as in https://github.com/mui/material-ui/blob/e5558282a8f36856aef1299f3a36f3235e92e770/packages/mui-material/src/Select/SelectInput.js#L288-L300
@@ -262,17 +224,17 @@ const Select = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
     }
   }));
 });
-const Option = /*#__PURE__*/React.forwardRef((_ref7, ref) => {
-  let props = (0, _objectWithoutPropertiesLoose2.default)(_ref7, _excluded7);
+const Option = /*#__PURE__*/React.forwardRef((_ref6, ref) => {
+  let props = (0, _objectWithoutPropertiesLoose2.default)(_ref6, _excluded6);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Option.default, (0, _extends2.default)({}, props, {
     ref: ref
   }));
 });
-const InputLabel = /*#__PURE__*/React.forwardRef((_ref8, ref) => {
+const InputLabel = /*#__PURE__*/React.forwardRef((_ref7, ref) => {
   let {
       sx
-    } = _ref8,
-    props = (0, _objectWithoutPropertiesLoose2.default)(_ref8, _excluded8);
+    } = _ref7,
+    props = (0, _objectWithoutPropertiesLoose2.default)(_ref7, _excluded7);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormLabel.default, (0, _extends2.default)({}, props, {
     ref: ref,
     sx: sx
@@ -402,7 +364,6 @@ const joySlots = (0, _extends2.default)({}, _icons.default, {
   baseTextField: TextField,
   baseButton: Button,
   baseIconButton: IconButton,
-  baseSwitch: Switch,
   baseSelect: Select,
   baseSelectOption: Option,
   baseInputLabel: InputLabel,

package/node/locales/jaJP.js

@@ -36,10 +36,9 @@ const jaJPGrid = {
   toolbarExportPrint: '印刷',
   toolbarExportExcel: 'Excelダウンロード',
   // Columns management text
-  // columnsManagementSearchTitle: 'Search',
-  // columnsManagementNoColumns: 'No columns',
-  // columnsManagementShowHideAllText: 'Show/Hide All',
-
+  columnsManagementSearchTitle: '検索',
+  columnsManagementNoColumns: 'カラムなし',
+  columnsManagementShowHideAllText: 'すべて表示/非表示',
   // Filter panel text
   filterPanelAddFilter: 'フィルター追加',
   filterPanelRemoveAll: 'すべて削除',

package/node/material/index.js

@@ -10,7 +10,6 @@ var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
 var _Select = _interopRequireDefault(require("@mui/material/Select"));
-var _Switch = _interopRequireDefault(require("@mui/material/Switch"));
 var _Button = _interopRequireDefault(require("@mui/material/Button"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _InputAdornment = _interopRequireDefault(require("@mui/material/InputAdornment"));
@@ -63,7 +62,6 @@ const materialSlots = (0, _extends2.default)({}, iconSlots, {
   baseTextField: _TextField.default,
   baseFormControl: _FormControl.default,
   baseSelect: _Select.default,
-  baseSwitch: _Switch.default,
   baseButton: _Button.default,
   baseIconButton: _IconButton.default,
   baseInputAdornment: _InputAdornment.default,

package/node/models/api/gridInfiniteLoaderApi.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/node/utils/cellBorderUtils.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldCellShowRightBorder = exports.shouldCellShowLeftBorder = void 0;
+var _gridColumnsInterfaces = require("../hooks/features/columns/gridColumnsInterfaces");
+const shouldCellShowRightBorder = (pinnedPosition, indexInSection, sectionLength, showCellVerticalBorderRootProp) => {
+  const isSectionLastCell = indexInSection === sectionLength - 1;
+  return showCellVerticalBorderRootProp && (pinnedPosition !== _gridColumnsInterfaces.GridPinnedColumnPosition.LEFT ? !isSectionLastCell : true) || pinnedPosition === _gridColumnsInterfaces.GridPinnedColumnPosition.LEFT && isSectionLastCell;
+};
+exports.shouldCellShowRightBorder = shouldCellShowRightBorder;
+const shouldCellShowLeftBorder = (pinnedPosition, indexInSection) => {
+  return pinnedPosition === _gridColumnsInterfaces.GridPinnedColumnPosition.RIGHT && indexInSection === 0;
+};
+exports.shouldCellShowLeftBorder = shouldCellShowLeftBorder;

package/node/utils/createSelector.js

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unstable_resetCreateSelectorCache = exports.createSelectorMemoized = exports.createSelector = void 0;
+exports.createSelectorMemoized = exports.createSelector = void 0;
 var _reselect = require("reselect");
 var _warning = require("./warning");
-const cacheContainer = {
-  cache: new WeakMap()
-};
+const cache = new WeakMap();
 const missingInstanceIdWarning = (0, _warning.buildWarning)(['MUI X: A selector was called without passing the instance ID, which may impact the performance of the grid.', 'To fix, call it with `apiRef`, e.g. `mySelector(apiRef)`, or pass the instance ID explicitly, e.g. `mySelector(state, apiRef.current.instanceId)`.']);
 function checkIsAPIRef(value) {
   return 'current' in value && 'instanceId' in value.current;
@@ -82,8 +80,7 @@ const createSelector = (a, b, c, d, e, f, ...rest) => {
 };
 exports.createSelector = createSelector;
 const createSelectorMemoized = (...args) => {
-  const selector = (...selectorArgs) => {
-    const [stateOrApiRef, instanceId] = selectorArgs;
+  const selector = (stateOrApiRef, instanceId) => {
     const isAPIRef = checkIsAPIRef(stateOrApiRef);
     const cacheKey = isAPIRef ? stateOrApiRef.current.instanceId : instanceId ?? DEFAULT_INSTANCE_ID;
     const state = isAPIRef ? stateOrApiRef.current.state : stateOrApiRef;
@@ -92,20 +89,20 @@ const createSelectorMemoized = (...args) => {
         missingInstanceIdWarning();
       }
     }
-    const {
-      cache
-    } = cacheContainer;
-    if (cache.get(cacheKey) && cache.get(cacheKey)?.get(args)) {
+    const cacheArgsInit = cache.get(cacheKey);
+    const cacheArgs = cacheArgsInit ?? new Map();
+    const cacheFn = cacheArgs?.get(args);
+    if (cacheArgs && cacheFn) {
       // We pass the cache key because the called selector might have as
       // dependency another selector created with this `createSelector`.
-      return cache.get(cacheKey)?.get(args)(state, cacheKey);
+      return cacheFn(state, cacheKey);
     }
-    const newSelector = (0, _reselect.createSelector)(...args);
-    if (!cache.get(cacheKey)) {
-      cache.set(cacheKey, new Map());
+    const fn = (0, _reselect.createSelector)(...args);
+    if (!cacheArgsInit) {
+      cache.set(cacheKey, cacheArgs);
     }
-    cache.get(cacheKey)?.set(args, newSelector);
-    return newSelector(state, cacheKey);
+    cacheArgs.set(args, fn);
+    return fn(state, cacheKey);
   };
 
   // We use this property to detect if the selector was created with createSelector
@@ -113,10 +110,4 @@ const createSelectorMemoized = (...args) => {
   selector.acceptsApiRef = true;
   return selector;
 };
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-exports.createSelectorMemoized = createSelectorMemoized;
-const unstable_resetCreateSelectorCache = () => {
-  cacheContainer.cache = new WeakMap();
-};
-exports.unstable_resetCreateSelectorCache = unstable_resetCreateSelectorCache;
+exports.createSelectorMemoized = createSelectorMemoized;