From e7dfd1b7e56557fc922c1135f056313f91872fd1 Mon Sep 17 00:00:00 2001
From: huangxuan <huangxuan20@huawei.com>
Date: Thu, 30 Nov 2023 16:15:44 +0800
Subject: [PATCH] =?UTF-8?q?[inulax]=20=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=99=A8=E6=9B=B4=E6=96=B0=E5=AE=8C=E5=80=BC?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8Cthis.props=E9=87=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=9C=80=E6=96=B0=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inula/src/inulax/adapters/reduxReact.ts   | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/packages/inula/src/inulax/adapters/reduxReact.ts b/packages/inula/src/inulax/adapters/reduxReact.ts
index 4f3bd675..c404976f 100644
--- a/packages/inula/src/inulax/adapters/reduxReact.ts
+++ b/packages/inula/src/inulax/adapters/reduxReact.ts
@@ -111,41 +111,36 @@ export function connect<StateProps, DispatchProps, OwnProps, MergedProps>(
 
   //this component should bear the type returned from mapping functions
   return (Component: OriginalComponent<MergedProps>): WrappedComponent<OwnProps> => {
-    const useStore = createStoreHook(options?.context || DefaultContext);
+    const useStore = createStoreHook(options.context || DefaultContext);
 
     //this component should mimic original type of component used
     const Wrapper: WrappedComponent<OwnProps> = (props: OwnProps) => {
-      const [f, forceReload] = useState(true);
+      const store = useStore() as ReduxStoreHandler;
+      const [state, setState] = useState(() => store.getState());
 
-      const store = useStore() as unknown as ReduxStoreHandler;
 
       useEffect(() => {
-        const unsubscribe = store.subscribe(() => forceReload(!f));
-        return () => {
-          unsubscribe();
-        };
+        const unsubscribe = store.subscribe(() => {
+          setState(store.getState());
+        });
+        return () => unsubscribe();
+      }, []);
+
+      const previous = useRef<{ state: { [key: string]: any }, mappedState: StateProps }>({
+        state: {},
+        mappedState: {} as StateProps,
       });
 
-      const previous = useRef({
-        state: {},
-        mappedState: {},
-      }) as {
-        current: {
-          state: { [key: string]: any };
-          mappedState: StateProps;
-        };
-      };
-
       let mappedState: StateProps;
-      if (options?.areStatesEqual) {
-        if (options.areStatesEqual(previous.current.state, store.getState())) {
+      if (options.areStatesEqual) {
+        if (options.areStatesEqual(previous.current.state, state)) {
           mappedState = previous.current.mappedState as StateProps;
         } else {
-          mappedState = mapStateToProps ? mapStateToProps(store.getState(), props) : ({} as StateProps);
+          mappedState = mapStateToProps ? mapStateToProps(state, props) : ({} as StateProps);
           previous.current.mappedState = mappedState;
         }
       } else {
-        mappedState = mapStateToProps ? mapStateToProps(store.getState(), props) : ({} as StateProps);
+        mappedState = mapStateToProps ? mapStateToProps(state, props) : ({} as StateProps);
         previous.current.mappedState = mappedState;
       }
       let mappedDispatch: DispatchProps = {} as DispatchProps;
@@ -154,6 +149,7 @@ export function connect<StateProps, DispatchProps, OwnProps, MergedProps>(
           Object.entries(mapDispatchToProps).forEach(([key, value]) => {
             mappedDispatch[key] = (...args: ReduxAction[]) => {
               store.dispatch(value(...args));
+              setState(store.getState());
             };
           });
         } else {
@@ -168,10 +164,9 @@ export function connect<StateProps, DispatchProps, OwnProps, MergedProps>(
         })
       )(mappedState, mappedDispatch, props);
 
-      previous.current.state = store.getState();
+      previous.current.state = state;
 
-      const node = createElement(Component, mergedProps);
-      return node;
+      return createElement(Component, mergedProps);
     };
 
     if (options.forwardRef) {