Skip to content

Commit 0795772

Browse files
committed
fix type issue with RTKQ and reselect
1 parent 09a8d78 commit 0795772

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

packages/toolkit/src/entities/state_selectors.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import type { CreateSelectorFunction, Selector } from 'reselect'
22
import { createDraftSafeSelector } from '../createDraftSafeSelector'
33
import type { EntityId, EntitySelectors, EntityState } from './models'
44

5-
type AnyFunction = (...args: any) => any
6-
type AnyCreateSelectorFunction = CreateSelectorFunction<
7-
<F extends AnyFunction>(f: F) => F,
8-
<F extends AnyFunction>(f: F) => F
9-
>
5+
type AnyCreateSelectorFunction = CreateSelectorFunction<any, any, any>
106

117
export type GetSelectorsOptions = {
128
createSelector?: AnyCreateSelectorFunction

packages/toolkit/src/query/core/module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import { createSelector as _createSelector } from './rtkImports'
7474
import { onFocus, onFocusLost, onOffline, onOnline } from './setupListeners'
7575
import type { InternalMiddlewareState } from './buildMiddleware/types'
7676
import { getOrInsertComputed } from '../utils'
77+
import type { CreateSelectorFunction } from 'reselect'
7778

7879
/**
7980
* `ifOlderThan` - (default: `false` | `number`) - _number is value in seconds_
@@ -492,7 +493,7 @@ export interface CoreModuleOptions {
492493
/**
493494
* A selector creator (usually from `reselect`, or matching the same signature)
494495
*/
495-
createSelector?: typeof _createSelector
496+
createSelector?: CreateSelectorFunction<any, any, any>
496497
}
497498

498499
/**

packages/toolkit/src/query/react/module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
useSelector as rrUseSelector,
1717
useStore as rrUseStore,
1818
} from 'react-redux'
19+
import type { CreateSelectorFunction } from 'reselect'
1920
import { createSelector as _createSelector } from 'reselect'
2021
import {
2122
isInfiniteQueryDefinition,
@@ -130,7 +131,7 @@ export interface ReactHooksModuleOptions {
130131
/**
131132
* A selector creator (usually from `reselect`, or matching the same signature)
132133
*/
133-
createSelector?: typeof _createSelector
134+
createSelector?: CreateSelectorFunction<any, any, any>
134135
}
135136

136137
/**

0 commit comments

Comments
 (0)