Skip to content

Commit 1c016d9

Browse files
committed
fix: perform field reset before all values reset closes #3934
1 parent b2bfdee commit 1c016d9

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

packages/vee-validate/src/useForm.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,10 @@ export function useForm<TValues extends Record<string, any> = Record<string, any
406406
*/
407407
function resetForm(state?: Partial<FormState<TValues>>) {
408408
RESET_LOCK = true;
409+
410+
// Reset all field states first
411+
mutateAllFields(f => f.resetField());
412+
409413
// set initial values if provided
410414
if (state?.values) {
411415
setInitialValues(state.values);
@@ -417,9 +421,6 @@ export function useForm<TValues extends Record<string, any> = Record<string, any
417421
setValues(originalInitialValues.value);
418422
}
419423

420-
// avoid resetting the field values, because they should've been reset already.
421-
mutateAllFields(f => f.resetField());
422-
423424
if (state?.touched) {
424425
setTouched(state.touched);
425426
}

0 commit comments

Comments
 (0)