fix: perform field reset before all values reset closes #3934

logaretm · Sep 19, 2022 · 1c016d9 · 1c016d9
1 parent b2bfdee
commit 1c016d9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/vee-validate/src/useForm.ts b/packages/vee-validate/src/useForm.ts
@@ -406,6 +406,10 @@ export function useForm<TValues extends Record<string, any> = Record<string, any
    */
   function resetForm(state?: Partial<FormState<TValues>>) {
     RESET_LOCK = true;
+
+    // Reset all field states first
+    mutateAllFields(f => f.resetField());
+
     // set initial values if provided
     if (state?.values) {
       setInitialValues(state.values);
@@ -417,9 +421,6 @@ export function useForm<TValues extends Record<string, any> = Record<string, any
       setValues(originalInitialValues.value);
     }
 
-    // avoid resetting the field values, because they should've been reset already.
-    mutateAllFields(f => f.resetField());
-
     if (state?.touched) {
       setTouched(state.touched);
     }