@mui/x-data-grid 8.0.0-alpha.2 → 8.0.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-data-grid",
-  "version": "8.0.0-alpha.2",
+  "version": "8.0.0-alpha.4",
   "description": "The Community plan edition of the Data Grid components (MUI X).",
   "author": "MUI Team",
   "main": "./node/index.js",

package/utils/createSelector.d.ts

@@ -1,20 +1,12 @@
 import * as React from 'react';
 import { Selector, SelectorResultArray } from 'reselect';
 import type { GridCoreApi } from '../models/api/gridCoreApi';
-export interface OutputSelector<State, Result> {
-    (apiRef: React.MutableRefObject<{
-        state: State;
-        instanceId: GridCoreApi['instanceId'];
-    }>): Result;
-    (state: State, instanceId: GridCoreApi['instanceId']): Result;
-    acceptsApiRef: boolean;
-}
-export interface OutputSelectorV8<State, Args, Result> {
+export interface OutputSelector<State, Args, Result> {
     (apiRef: React.MutableRefObject<{
         state: State;
         instanceId: GridCoreApi['instanceId'];
     }>, args?: Args): Result;
-    (state: State, instanceId: GridCoreApi['instanceId']): Result;
+    (state: State, args?: Args, instanceId?: GridCoreApi['instanceId']): Result;
     acceptsApiRef: boolean;
 }
 type StateFromSelector<T> = T extends (first: infer F, ...args: any[]) => any ? F extends {
@@ -24,19 +16,15 @@ type StateFromSelectorList<Selectors extends readonly any[]> = Selectors extends
     f: infer F,
     ...other: infer R
 ] ? StateFromSelector<F> extends StateFromSelectorList<R> ? StateFromSelector<F> : StateFromSelectorList<R> : {};
-type SelectorArgs<Selectors extends ReadonlyArray<Selector<any>>, Result> = [selectors: [...Selectors], combiner: (...args: SelectorResultArray<Selectors>) => Result] | [...Selectors, (...args: SelectorResultArray<Selectors>) => Result];
 type SelectorResultArrayWithArgs<Selectors extends ReadonlyArray<Selector<any>>, Args> = [
     ...SelectorResultArray<Selectors>,
     Args
 ];
-type SelectorArgsV8<Selectors extends ReadonlyArray<Selector<any>>, Args, Result> = [
+type SelectorArgs<Selectors extends ReadonlyArray<Selector<any>>, Args, Result> = [
     selectors: [...Selectors],
     combiner: (...args: SelectorResultArrayWithArgs<Selectors, Args>) => Result
 ] | [...Selectors, (...args: SelectorResultArrayWithArgs<Selectors, Args>) => Result];
-type CreateSelectorFunction = <Selectors extends ReadonlyArray<Selector<any>>, Result>(...items: SelectorArgs<Selectors, Result>) => OutputSelector<StateFromSelectorList<Selectors>, Result>;
-type CreateSelectorFunctionV8 = <Selectors extends ReadonlyArray<Selector<any>>, Args, Result>(...items: SelectorArgsV8<Selectors, Args, Result>) => OutputSelectorV8<StateFromSelectorList<Selectors>, Args, Result>;
+type CreateSelectorFunction = <Selectors extends ReadonlyArray<Selector<any>>, Args, Result>(...items: SelectorArgs<Selectors, Args, Result>) => OutputSelector<StateFromSelectorList<Selectors>, Args, Result>;
 export declare const createSelector: CreateSelectorFunction;
-export declare const createSelectorV8: CreateSelectorFunctionV8;
 export declare const createSelectorMemoized: CreateSelectorFunction;
-export declare const createSelectorMemoizedV8: CreateSelectorFunctionV8;
 export {};

package/utils/createSelector.js

@@ -8,19 +8,6 @@ const reselectCreateSelector = createSelectorCreator({
     equalityCheck: Object.is
   }
 });
-
-// TODO v8: Remove this type
-
-// TODO v8: Rename this type to `OutputSelector`
-
-// TODO v8: Remove this type
-
-// TODO v8: Rename this type to `SelectorArgs`
-
-// TODO v8: Remove this type
-
-// TODO v8: Rename this type to `CreateSelectorFunction`
-
 const cache = new WeakMap();
 function checkIsAPIRef(value) {
   return 'current' in value && 'instanceId' in value.current;
@@ -28,83 +15,12 @@ function checkIsAPIRef(value) {
 const DEFAULT_INSTANCE_ID = {
   id: 'default'
 };
-
-// TODO v8: Remove this function
 export const createSelector = (a, b, c, d, e, f, ...other) => {
   if (other.length > 0) {
     throw new Error('Unsupported number of selectors');
   }
   let selector;
 
-  // eslint-disable-next-line id-denylist
-  if (a && b && c && d && e && f) {
-    selector = (stateOrApiRef, instanceIdParam) => {
-      const isAPIRef = checkIsAPIRef(stateOrApiRef);
-      const instanceId = instanceIdParam ?? (isAPIRef ? stateOrApiRef.current.instanceId : DEFAULT_INSTANCE_ID);
-      const state = isAPIRef ? stateOrApiRef.current.state : stateOrApiRef;
-      const va = a(state, instanceId);
-      const vb = b(state, instanceId);
-      const vc = c(state, instanceId);
-      const vd = d(state, instanceId);
-      const ve = e(state, instanceId);
-      return f(va, vb, vc, vd, ve);
-    };
-    // eslint-disable-next-line id-denylist
-  } else if (a && b && c && d && e) {
-    selector = (stateOrApiRef, instanceIdParam) => {
-      const isAPIRef = checkIsAPIRef(stateOrApiRef);
-      const instanceId = instanceIdParam ?? (isAPIRef ? stateOrApiRef.current.instanceId : DEFAULT_INSTANCE_ID);
-      const state = isAPIRef ? stateOrApiRef.current.state : stateOrApiRef;
-      const va = a(state, instanceId);
-      const vb = b(state, instanceId);
-      const vc = c(state, instanceId);
-      const vd = d(state, instanceId);
-      return e(va, vb, vc, vd);
-    };
-  } else if (a && b && c && d) {
-    selector = (stateOrApiRef, instanceIdParam) => {
-      const isAPIRef = checkIsAPIRef(stateOrApiRef);
-      const instanceId = instanceIdParam ?? (isAPIRef ? stateOrApiRef.current.instanceId : DEFAULT_INSTANCE_ID);
-      const state = isAPIRef ? stateOrApiRef.current.state : stateOrApiRef;
-      const va = a(state, instanceId);
-      const vb = b(state, instanceId);
-      const vc = c(state, instanceId);
-      return d(va, vb, vc);
-    };
-  } else if (a && b && c) {
-    selector = (stateOrApiRef, instanceIdParam) => {
-      const isAPIRef = checkIsAPIRef(stateOrApiRef);
-      const instanceId = instanceIdParam ?? (isAPIRef ? stateOrApiRef.current.instanceId : DEFAULT_INSTANCE_ID);
-      const state = isAPIRef ? stateOrApiRef.current.state : stateOrApiRef;
-      const va = a(state, instanceId);
-      const vb = b(state, instanceId);
-      return c(va, vb);
-    };
-  } else if (a && b) {
-    selector = (stateOrApiRef, instanceIdParam) => {
-      const isAPIRef = checkIsAPIRef(stateOrApiRef);
-      const instanceId = instanceIdParam ?? (isAPIRef ? stateOrApiRef.current.instanceId : DEFAULT_INSTANCE_ID);
-      const state = isAPIRef ? stateOrApiRef.current.state : stateOrApiRef;
-      const va = a(state, instanceId);
-      return b(va);
-    };
-  } else {
-    throw new Error('Missing arguments');
-  }
-
-  // We use this property to detect if the selector was created with createSelector
-  // or it's only a simple function the receives the state and returns part of it.
-  selector.acceptsApiRef = true;
-  return selector;
-};
-
-// TODO v8: Rename this function to `createSelector`
-export const createSelectorV8 = (a, b, c, d, e, f, ...other) => {
-  if (other.length > 0) {
-    throw new Error('Unsupported number of selectors');
-  }
-  let selector;
-
   // eslint-disable-next-line id-denylist
   if (a && b && c && d && e && f) {
     selector = (stateOrApiRef, args, instanceIdParam) => {
@@ -166,49 +82,14 @@ export const createSelectorV8 = (a, b, c, d, e, f, ...other) => {
   selector.acceptsApiRef = true;
   return selector;
 };
-
-// TODO v8: Remove this function
 export const createSelectorMemoized = (...args) => {
-  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;
-    if (process.env.NODE_ENV !== 'production') {
-      if (cacheKey.id === 'default') {
-        warnOnce(['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`, for example `mySelector(apiRef)`, or pass the instance ID explicitly, for example `mySelector(state, apiRef.current.instanceId)`.']);
-      }
-    }
-    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 cacheFn(state, cacheKey);
-    }
-    const fn = reselectCreateSelector(...args);
-    if (!cacheArgsInit) {
-      cache.set(cacheKey, cacheArgs);
-    }
-    cacheArgs.set(args, fn);
-    return fn(state, cacheKey);
-  };
-
-  // We use this property to detect if the selector was created with createSelector
-  // or it's only a simple function the receives the state and returns part of it.
-  selector.acceptsApiRef = true;
-  return selector;
-};
-
-// TODO v8: Rename this function to `createSelectorMemoized`
-export const createSelectorMemoizedV8 = (...args) => {
   const selector = (stateOrApiRef, selectorArgs, instanceId) => {
     const isAPIRef = checkIsAPIRef(stateOrApiRef);
     const cacheKey = isAPIRef ? stateOrApiRef.current.instanceId : instanceId ?? DEFAULT_INSTANCE_ID;
     const state = isAPIRef ? stateOrApiRef.current.state : stateOrApiRef;
     if (process.env.NODE_ENV !== 'production') {
       if (cacheKey.id === 'default') {
-        warnOnce(['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`, for example `mySelector(apiRef)`, or pass the instance ID explicitly, for example `mySelector(state, apiRef.current.instanceId)`.']);
+        warnOnce(['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`, for example `mySelector(apiRef)`, or pass the instance ID explicitly, for example `mySelector(state, args, apiRef.current.instanceId)`.']);
       }
     }
     const cacheArgsInit = cache.get(cacheKey);