Fix types

mui · Oct 31, 2024 · 0f54568 · 0f54568
1 parent ed2a6aa
commit 0f54568
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/packages/x-data-grid/src/hooks/core/useGridStateInitialization.ts b/packages/x-data-grid/src/hooks/core/useGridStateInitialization.ts
@@ -9,7 +9,7 @@ export const useGridStateInitialization = <PrivateApi extends GridPrivateApiComm
   apiRef: React.MutableRefObject<PrivateApi>,
 ) => {
   const controlStateMapRef = React.useRef<
-    Record<string, GridControlStateItem<PrivateApi['state'], any>>
+    Record<string, GridControlStateItem<PrivateApi['state'], any, any>>
   >({});
   const [, rawForceUpdate] = React.useState<PrivateApi['state']>();
 

diff --git a/packages/x-data-grid/src/models/api/gridStateApi.ts b/packages/x-data-grid/src/models/api/gridStateApi.ts
@@ -43,6 +43,6 @@ export interface GridStatePrivateApi<State extends GridStateCommunity> {
    * @param {GridControlStateItem>} controlState The [[GridControlStateItem]] to be registered.
    */
   registerControlState: <E extends keyof GridControlledStateEventLookup>(
-    controlState: GridControlStateItem<State, E>,
+    controlState: GridControlStateItem<State, any, E>,
   ) => void;
 }
diff --git a/packages/x-data-grid/src/models/controlStateItem.ts b/packages/x-data-grid/src/models/controlStateItem.ts
@@ -5,12 +5,13 @@ import { GridStateCommunity } from './gridStateCommunity';
 
 export interface GridControlStateItem<
   State extends GridStateCommunity,
+  Args,
   E extends keyof GridControlledStateEventLookup,
 > {
   stateId: string;
   propModel?: GridEventLookup[E]['params'];
   stateSelector:
-    | OutputSelector<State, GridControlledStateEventLookup[E]['params']>
+    | OutputSelector<State, Args, GridControlledStateEventLookup[E]['params']>
     | ((state: State) => GridControlledStateEventLookup[E]['params']);
   propOnChange?: (
     model: GridControlledStateEventLookup[E]['params'],

diff --git a/packages/x-data-grid/src/utils/createSelector.test.ts b/packages/x-data-grid/src/utils/createSelector.test.ts
@@ -19,6 +19,7 @@ describe('createSelector', () => {
     it('should fallback to the default behavior when no cache key is provided', () => {
       const selector = createSelectorMemoized([], () => []) as OutputSelector<
         GridStateCommunity,
+        any,
         any
       >;
       const state = {} as GridStateCommunity;
@@ -48,6 +49,7 @@ describe('createSelector', () => {
     it('should return different selectors for different cache keys', () => {
       const selector = createSelectorMemoized([], () => []) as OutputSelector<
         GridStateCommunity,
+        any,
         any
       >;
       const apiRef1 = {
@@ -62,6 +64,7 @@ describe('createSelector', () => {
     it('should not clear the cache of one selector when another key is passed', () => {
       const selector = createSelectorMemoized([], () => []) as OutputSelector<
         GridStateCommunity,
+        any,
         any
       >;
       const apiRef1 = {

diff --git a/packages/x-data-grid/src/utils/createSelector.ts b/packages/x-data-grid/src/utils/createSelector.ts
@@ -13,14 +13,14 @@ const reselectCreateSelector = createSelectorCreator({
   },
 });
 
-type GridCreateSelectorFunction = ReturnType<typeof reselectCreateSelector> & {
+type CreateSelectorFunctionWithArgs = ReturnType<typeof reselectCreateSelector> & {
   selectorArgs?: any;
 };
 
 export interface OutputSelector<State, Args, Result> {
   (
     apiRef: React.MutableRefObject<{ state: State; instanceId: GridCoreApi['instanceId'] }>,
-    args: Args,
+    args?: Args,
   ): Result;
   (state: State, instanceId: GridCoreApi['instanceId']): Result;
   acceptsApiRef: boolean;
@@ -55,7 +55,6 @@ type SelectorArgs<Selectors extends ReadonlyArray<Selector<any>>, Args, Result>
   // Input selectors as separate inline arguments
   | [...Selectors, (...args: SelectorResultArrayWithArgs<Selectors, Args>) => Result];
 
-// TODO v8: Rename this type to `CreateSelectorFunction`
 type CreateSelectorFunction = <Selectors extends ReadonlyArray<Selector<any>>, Args, Result>(
   ...items: SelectorArgs<Selectors, Args, Result>
 ) => OutputSelector<StateFromSelectorList<Selectors>, Args, Result>;
@@ -153,7 +152,7 @@ export const createSelector = ((
 }) as unknown as CreateSelectorFunction;
 
 export const createSelectorMemoized: CreateSelectorFunction = (...args: any) => {
-  const selector = (stateOrApiRef: any, selectorArgs: any, instanceId?: any) => {
+  const selector = (stateOrApiRef: any, selectorArgs: any = undefined, instanceId?: any) => {
     const isAPIRef = checkIsAPIRef(stateOrApiRef);
     const cacheKey = isAPIRef
       ? stateOrApiRef.current.instanceId
@@ -179,7 +178,7 @@ export const createSelectorMemoized: CreateSelectorFunction = (...args: any) =>
           selectorArgs !== undefined
             ? [...args.slice(0, args.length - 1), () => selectorArgs, args[args.length - 1]]
             : args;
-        const fn: GridCreateSelectorFunction = reselectCreateSelector(...reselectArgs);
+        const fn: CreateSelectorFunctionWithArgs = reselectCreateSelector(...reselectArgs);
         fn.selectorArgs = selectorArgs;
         cacheArgs.set(args, fn);
         return fn(state, selectorArgs, cacheKey);
@@ -194,7 +193,7 @@ export const createSelectorMemoized: CreateSelectorFunction = (...args: any) =>
         ? [...args.slice(0, args.length - 1), () => selectorArgs, args[args.length - 1]]
         : args;
 
-    const fn: GridCreateSelectorFunction = reselectCreateSelector(...reselectArgs);
+    const fn: CreateSelectorFunctionWithArgs = reselectCreateSelector(...reselectArgs);
     fn.selectorArgs = selectorArgs;
 
     if (!cacheArgsInit) {