From d164f9500af3b3026306a6b44d496f7610ac6924 Mon Sep 17 00:00:00 2001
From: huangxuan <huangxuan20@huawei.com>
Date: Tue, 24 Oct 2023 17:04:07 +0800
Subject: [PATCH] =?UTF-8?q?[inulax]=20=E4=BF=AE=E5=A4=8Dmiddleware(...)=20?=
 =?UTF-8?q?is=20not=20a=20function?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/inula/src/inulax/adapters/redux.ts   | 38 +++++++++++--------
 .../inula/src/inulax/adapters/reduxThunk.ts   |  4 +-
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/packages/inula/src/inulax/adapters/redux.ts b/packages/inula/src/inulax/adapters/redux.ts
index b996abed..832739d2 100644
--- a/packages/inula/src/inulax/adapters/redux.ts
+++ b/packages/inula/src/inulax/adapters/redux.ts
@@ -28,11 +28,11 @@ export {
 } from './reduxReact';
 
 export type ReduxStoreHandler = {
-  reducer: (state: any, action: { type: string }) => any;
-  dispatch: (action: { type: string }) => void;
-  getState: () => any;
-  subscribe: (listener: () => void) => () => void;
-  replaceReducer: (reducer: (state: any, action: { type: string }) => any) => void;
+  reducer(state: any, action: { type: string }): any;
+  dispatch(action: { type: string }): void;
+  getState(): any;
+  subscribe(listener: () => void): () => void;
+  replaceReducer(reducer: (state: any, action: { type: string }) => any): void;
 };
 
 export type ReduxAction = {
@@ -150,19 +150,25 @@ export function combineReducers(reducers: { [key: string]: Reducer }): Reducer {
   };
 }
 
-function applyMiddlewares(store: ReduxStoreHandler, middlewares: ReduxMiddleware[]): void {
-  middlewares = middlewares.slice();
-  middlewares.reverse();
-  let dispatch = store.dispatch;
-  middlewares.forEach(middleware => {
-    dispatch = middleware(store)(dispatch);
-  });
-  store.dispatch = dispatch;
+export type StoreCreator = (reducer: Reducer, preloadedState?: any) => ReduxStoreHandler
+
+function applyMiddlewares(store: StoreCreator, middlewares: ReduxMiddleware[]): StoreCreator {
+  return (reducer, preloadedState) => {
+    middlewares = middlewares.slice();
+    middlewares.reverse();
+    const storeObj = createStore(reducer, preloadedState);
+    let dispatch = storeObj.dispatch;
+    middlewares.forEach(middleware => {
+      dispatch = middleware(storeObj)(dispatch);
+    });
+    storeObj.dispatch = dispatch;
+    return { ...storeObj, dispatch: dispatch };
+  };
 }
 
-export function applyMiddleware(...middlewares: ReduxMiddleware[]): (store: ReduxStoreHandler) => void {
-  return store => {
-    return applyMiddlewares(store, middlewares);
+export function applyMiddleware(...middlewares: ReduxMiddleware[]): (createStore: StoreCreator) => StoreCreator {
+  return createStore => {
+    return applyMiddlewares(createStore, middlewares);
   };
 }
 
diff --git a/packages/inula/src/inulax/adapters/reduxThunk.ts b/packages/inula/src/inulax/adapters/reduxThunk.ts
index cd14fee6..7eaaf227 100644
--- a/packages/inula/src/inulax/adapters/reduxThunk.ts
+++ b/packages/inula/src/inulax/adapters/reduxThunk.ts
@@ -35,5 +35,5 @@ function createThunkMiddleware(extraArgument?: any): ReduxMiddleware {
 }
 
 export const thunk = createThunkMiddleware();
-// @ts-ignore
-thunk.withExtraArgument = createThunkMiddleware;
+
+export const withExtraArgument = createThunkMiddleware;
-- 
Gitee