Merge 0aefe6a into 57e168c

wellyshen · Nov 7, 2020 · 33c3d6a · 33c3d6a
2 parents 57e168c + 0aefe6a
commit 33c3d6a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/.changeset/healthy-geese-guess.md b/.changeset/healthy-geese-guess.md
@@ -0,0 +1,5 @@
+---
+"react-cool-form": patch
+---
+
+feat(useForm): accept function as the values argv of the reset method
diff --git a/examples/src/BasicForm/index.tsx b/examples/src/BasicForm/index.tsx
@@ -184,7 +184,7 @@ export default (): JSX.Element => {
   };
 
   const handleResetClick = (): void => {
-    reset({ ...initialValues, text: { nest: "new test" } }, [
+    reset((prevValues) => ({ ...prevValues, text: { nest: "new test" } }), [
       "touched",
       "submitCount",
     ]);

diff --git a/src/index.ts b/src/index.ts
@@ -405,11 +405,14 @@ const useForm = <V extends FormValues = FormValues>({
   );
 
   const reset = useCallback<Reset<V>>(
-    (values, exclude = []) =>
-      resetStateRef(values, exclude, (nextValues) =>
-        setAllDomsValue(nextValues)
-      ),
-    [resetStateRef, setAllDomsValue]
+    (values, exclude = []) => {
+      resetStateRef(
+        isFunction(values) ? values(stateRef.current.values) : values,
+        exclude,
+        (nextValues) => setAllDomsValue(nextValues)
+      );
+    },
+    [resetStateRef, setAllDomsValue, stateRef]
   );
 
   const getOptions = useCallback(

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -148,7 +148,10 @@ export interface ValidateField<V> {
 }
 
 export interface Reset<V> {
-  (values?: V, exclude?: (keyof FormState<V>)[]): void;
+  (
+    values?: V | ((previousValues: V) => V),
+    exclude?: (keyof FormState<V>)[]
+  ): void;
 }
 
 export interface EventHandler {

diff --git a/src/types/react-cool-form.d.ts b/src/types/react-cool-form.d.ts
@@ -107,7 +107,10 @@ declare module "react-cool-form" {
   }
 
   interface Reset<V> {
-    (values?: V, exclude?: (keyof FormState<V>)[]): void;
+    (
+      values?: V | ((previousValues: V) => V),
+      exclude?: (keyof FormState<V>)[]
+    ): void;
   }
 
   interface EventHandler {