Skip to content

Commit e15797a

Browse files
committed
don't nest useDispatch inside a useDispatchWithMiddleware function
1 parent 375d048 commit e15797a

File tree

2 files changed

+11
-20
lines changed

2 files changed

+11
-20
lines changed

packages/toolkit/src/dynamicMiddleware/index.ts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,20 @@ export const createDynamicMiddleware = <
3939
const instanceId = nanoid()
4040
const middlewareMap = new Map<string, MiddlewareEntry<State, Dispatch>>()
4141

42-
const insertEntry = (entry: MiddlewareEntry<State, Dispatch>) => {
43-
middlewareMap.set(entry.id, entry)
44-
}
45-
46-
const withMiddleware = (() => {
47-
const withMiddleware = createAction(
42+
const withMiddleware = Object.assign(
43+
createAction(
4844
'dynamicMiddleware/add',
4945
(...middlewares: Middleware<any, State, Dispatch>[]) => ({
5046
payload: middlewares,
5147
meta: {
5248
instanceId,
5349
},
5450
})
55-
)
56-
// @ts-ignore
57-
withMiddleware.withTypes = () => withMiddleware
58-
return withMiddleware as WithMiddleware<State, Dispatch>
59-
})()
51+
),
52+
{ withTypes: () => withMiddleware }
53+
) as WithMiddleware<State, Dispatch>
6054

61-
const addMiddleware = (() => {
55+
const addMiddleware = Object.assign(
6256
function addMiddleware(...middlewares: Middleware<any, State, Dispatch>[]) {
6357
middlewares.forEach((middleware) => {
6458
let entry = find(
@@ -68,12 +62,11 @@ export const createDynamicMiddleware = <
6862
if (!entry) {
6963
entry = createMiddlewareEntry(middleware)
7064
}
71-
insertEntry(entry)
65+
middlewareMap.set(entry.id, entry)
7266
})
73-
}
74-
addMiddleware.withTypes = () => addMiddleware
75-
return addMiddleware as AddMiddleware<State, Dispatch>
76-
})()
67+
},
68+
{ withTypes: () => addMiddleware }
69+
) as AddMiddleware<State, Dispatch>
7770

7871
const getFinalMiddleware: Middleware<{}, State, Dispatch> = (api) => {
7972
const appliedMiddleware = Array.from(middlewareMap.values()).map(

packages/toolkit/src/dynamicMiddleware/react/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ export const createDynamicMiddleware = <
8484
Middlewares extends Middleware<any, State, Dispatch>[]
8585
>(...middlewares: Middlewares) {
8686
instance.addMiddleware(...middlewares)
87-
return function useDispatchWithMiddleware() {
88-
return useDispatch()
89-
}
87+
return useDispatch
9088
}
9189
createDispatchWithMiddlewareHook.withTypes = () =>
9290
createDispatchWithMiddlewareHook

0 commit comments

Comments
 (0)