From 0352f3484fa1f3943487e09e6b3de3896be6b94e Mon Sep 17 00:00:00 2001
From: EskiMojo14 <ben.j.durrant@gmail.com>
Date: Sat, 27 Jan 2024 19:22:24 +0000
Subject: [PATCH] allow providing options when calling buildHooks

---
 packages/toolkit/src/query/react/module.ts | 56 +++++++++++++---------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/packages/toolkit/src/query/react/module.ts b/packages/toolkit/src/query/react/module.ts
index 2b0d5efe5a..7b2ba19b23 100644
--- a/packages/toolkit/src/query/react/module.ts
+++ b/packages/toolkit/src/query/react/module.ts
@@ -45,7 +45,9 @@ declare module '@reduxjs/toolkit/query' {
     TagTypes extends string,
   > {
     [lazyReactHooksModuleName]: {
-      buildHooks(): ApiModules<
+      buildHooks(
+        options?: ReactHooksModuleOptions,
+      ): ApiModules<
         BaseQuery,
         Definitions,
         ReducerPath,
@@ -170,6 +172,17 @@ function buildInjectEndpoint(
   }
 }
 
+const defaultOptions: Required<ReactHooksModuleOptions> = {
+  batch: rrBatch,
+  hooks: {
+    useDispatch: rrUseDispatch,
+    useSelector: rrUseSelector,
+    useStore: rrUseStore,
+  },
+  createSelector: _createSelector,
+  unstable__sideEffectsInRender: false,
+}
+
 /**
  * Creates a module that generates react hooks from endpoints, for use with `buildCreateApi`.
  *
@@ -190,17 +203,16 @@ function buildInjectEndpoint(
  *
  * @returns A module for use with `buildCreateApi`
  */
-export const reactHooksModule = ({
-  batch = rrBatch,
-  hooks = {
-    useDispatch: rrUseDispatch,
-    useSelector: rrUseSelector,
-    useStore: rrUseStore,
-  },
-  createSelector = _createSelector,
-  unstable__sideEffectsInRender = false,
-  ...rest
-}: ReactHooksModuleOptions = {}): Module<ReactHooksModule> => {
+export const reactHooksModule = (
+  moduleOptions?: ReactHooksModuleOptions,
+): Module<ReactHooksModule> => {
+  const {
+    batch,
+    hooks,
+    createSelector,
+    unstable__sideEffectsInRender,
+    ...rest
+  } = { ...defaultOptions, ...moduleOptions }
   if (process.env.NODE_ENV !== 'production') {
     const hookNames = ['useDispatch', 'useSelector', 'useStore'] as const
     let warned = false
@@ -268,16 +280,9 @@ export const reactHooksModule = ({
   }
 }
 
-export const lazyReactHooksModule = ({
-  batch = rrBatch,
-  hooks = {
-    useDispatch: rrUseDispatch,
-    useSelector: rrUseSelector,
-    useStore: rrUseStore,
-  },
-  createSelector = _createSelector,
-  unstable__sideEffectsInRender = false,
-}: ReactHooksModuleOptions = {}): Module<LazyReactHooksModule> => ({
+export const lazyReactHooksModule = (
+  moduleOptions?: ReactHooksModuleOptions,
+): Module<LazyReactHooksModule> => ({
   name: lazyReactHooksModuleName,
   init(api, { serializeQueryArgs }, context) {
     const anyApi = api as any as Api<
@@ -288,7 +293,12 @@ export const lazyReactHooksModule = ({
       LazyReactHooksModule
     >
 
-    function buildEndpointHooks() {
+    function buildEndpointHooks(options?: ReactHooksModuleOptions) {
+      const { batch, hooks, unstable__sideEffectsInRender, createSelector } = {
+        ...defaultOptions,
+        ...moduleOptions,
+        ...options,
+      }
       const { buildQueryHooks, buildMutationHook, usePrefetch } = buildHooks({
         api,
         moduleOptions: {