🍄 close react-hook-form#10195 close async defaultValues not load (rea…

…ct-hook-form#10203) * 🍄 close react-hook-form#10195 close async defaultValues not load * save some bytes * fix api contract * pin pnpm to v7
kylemclean · Feb 2, 2024 · 8dd25ac · 8dd25ac
1 parent 8a65d5a
commit 8dd25ac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: latest
+          version: 7
 
       - name: Cypress run
         uses: cypress-io/github-action@v4

diff --git a/reports/api-extractor.md b/reports/api-extractor.md
@@ -49,6 +49,7 @@ export type Control<TFieldValues extends FieldValues = FieldValues, TContext = a
     _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/logic/createFormControl.ts b/src/logic/createFormControl.ts
@@ -1246,14 +1246,14 @@ export function createFormControl<
     };
   };
 
-  if (isFunction(_options.defaultValues)) {
+  const _resetDefaultValues = () =>
+    isFunction(_options.defaultValues) &&
     _options.defaultValues().then((values) => {
       reset(values, _options.resetOptions);
       _subjects.state.next({
         isLoading: false,
       });
     });
-  }
 
   return {
     control: {
@@ -1268,6 +1268,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]);