🍄 close #10195 close async defaultValues not load

react-hook-form · Mar 30, 2023 · 1fc89cd · 1fc89cd
1 parent 8c76ad3
commit 1fc89cd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/logic/createFormControl.ts b/src/logic/createFormControl.ts
@@ -1246,14 +1246,16 @@ export function createFormControl<
     };
   };
 
-  if (isFunction(_options.defaultValues)) {
-    _options.defaultValues().then((values) => {
-      reset(values, _options.resetOptions);
-      _subjects.state.next({
-        isLoading: false,
+  const _resetDefaultValues = () => {
+    if (isFunction(_options.defaultValues)) {
+      _options.defaultValues().then((values) => {
+        reset(values, _options.resetOptions);
+        _subjects.state.next({
+          isLoading: false,
+        });
       });
-    });
-  }
+    }
+  };
 
   return {
     control: {
@@ -1268,6 +1270,7 @@ export function createFormControl<
       _updateFieldArray,
       _getFieldArray,
       _reset,
+      _resetDefaultValues,
       _updateFormState,
       _subjects,
       _proxyFormState,

diff --git a/src/types/form.ts b/src/types/form.ts
@@ -747,6 +747,7 @@ export type Control<
   _reset: UseFormReset<TFieldValues>;
   _options: UseFormProps<TFieldValues, TContext>;
   _getDirty: GetIsDirty;
+  _resetDefaultValues: Noop;
   _formState: FormState<TFieldValues>;
   _updateValid: (shouldUpdateValid?: boolean) => void;
   _updateFormState: (formState: Partial<FormState<TFieldValues>>) => void;

diff --git a/src/useForm.ts b/src/useForm.ts
@@ -102,6 +102,8 @@ export function useForm<
   React.useEffect(() => {
     if (props.values && !deepEqual(props.values, control._defaultValues)) {
       control._reset(props.values, control._options.resetOptions);
+    } else {
+      control._resetDefaultValues();
     }
   }, [props.values, control]);