fix: 添加setState支持传递回调方法

AntmJS · Nov 17, 2021 · ee8f32b · ee8f32b
1 parent f9da97f
commit ee8f32b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/unite/src/index.ts b/packages/unite/src/index.ts
@@ -31,7 +31,7 @@ function useEventEnhancement<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 >(
   config: TypeUnite.Option<TState, TAll, TProps>,
-  setState: React.Dispatch<React.SetStateAction<TState>>,
+  setState: React.Dispatch<React.SetStateAction<TypeUnite.StateOpt<TState>>>,
   setError: React.Dispatch<React.SetStateAction<TypeUnite.IError | undefined>>,
   context: React.MutableRefObject<any>,
 ): TypeUnite.EventEnhancementResponse<TAll, TState> {
@@ -44,12 +44,18 @@ function useEventEnhancement<
     context.current.__init = true
 
     const _setState = function (
-      obj: Partial<TypeUnite.StateOpt<TState>>,
+      res:
+        | Partial<TypeUnite.StateOpt<TState>>
+        | React.SetStateAction<TypeUnite.StateOpt<TState>>,
     ): void {
       if (context.current.__mounted) {
-        setState((preState) => {
-          return { ...preState, ...obj }
-        })
+        if (toString.call(res) === '[object Object]') {
+          setState((preState) => {
+            return { ...preState, ...res }
+          })
+        } else {
+          setState(res as React.SetStateAction<TypeUnite.StateOpt<TState>>)
+        }
       }
     }
 

diff --git a/packages/unite/types/index.d.ts b/packages/unite/types/index.d.ts
@@ -45,7 +45,9 @@ declare namespace Unite {
   }
 
   interface InstanceMethods<TState extends IAnyObject> {
-    setState: (state: Partial<StateOpt<TState>>) => void
+    setState: (
+      state: Partial<StateOpt<TState>> | React.SetStateAction<StateOpt<TState>>,
+    ) => void
     setError: React.Dispatch<React.SetStateAction<IError | undefined>>
   }
   interface InstanceProperty<