Fix nullable react-redux context references

reduxjs · Mar 27, 2024 · dff4cd2 · dff4cd2
1 parent 1d8c4b7
commit dff4cd2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/packages/toolkit/src/dynamicMiddleware/react/index.ts b/packages/toolkit/src/dynamicMiddleware/react/index.ts
@@ -79,7 +79,12 @@ export const createDynamicMiddleware = <
       // @ts-ignore
       context === ReactReduxContext
         ? useDefaultDispatch
-        : createDispatchHook(context)
+        : createDispatchHook(
+            context as Context<ReactReduxContextValue<
+              State,
+              ActionFromDispatch<Dispatch>
+            > | null>,
+          )
     function createDispatchWithMiddlewareHook<
       Middlewares extends Middleware<any, State, Dispatch>[],
     >(...middlewares: Middlewares) {

diff --git a/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx b/packages/toolkit/src/dynamicMiddleware/tests/react.test.tsx
@@ -89,7 +89,10 @@ describe('createReactDynamicMiddleware', () => {
       render(<Component />, {
         wrapper: ({ children }) => (
           <Provider store={store}>
-            <Provider context={context} store={store2}>
+            <Provider
+              context={context as React.Context<ReactReduxContextValue | null>}
+              store={store2}
+            >
               {children}
             </Provider>
           </Provider>

diff --git a/packages/toolkit/src/query/react/ApiProvider.tsx b/packages/toolkit/src/query/react/ApiProvider.tsx
@@ -38,7 +38,8 @@ export function ApiProvider<A extends Api<any, {}, any, any>>(props: {
   setupListeners?: Parameters<typeof setupListeners>[1] | false
   context?: Context<ReactReduxContextValue>
 }) {
-  const context = props.context || ReactReduxContext
+  const context = (props.context ||
+    ReactReduxContext) as Context<ReactReduxContextValue | null>
   const existingContext = useContext(context)
   if (existingContext) {
     throw new Error(

diff --git a/packages/toolkit/src/query/tests/buildCreateApi.test.tsx b/packages/toolkit/src/query/tests/buildCreateApi.test.tsx
@@ -16,7 +16,7 @@ import {
 } from 'react-redux'
 import { setupApiStore, useRenderCounter } from '../../tests/utils/helpers'
 
-const MyContext = React.createContext<ReactReduxContextValue>(null as any)
+const MyContext = React.createContext<ReactReduxContextValue | null>(null)
 
 describe('buildCreateApi', () => {
   test('Works with all hooks provided', async () => {