🦮 fix: isLoading form state (#10095)

Co-authored-by: Adam Towle <atowle@ldms.com>
react-hook-form · Mar 13, 2023 · a68f683 · a68f683
1 parent 236dd6b
commit a68f683
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/__tests__/useForm.test.tsx b/src/__tests__/useForm.test.tsx
@@ -1907,6 +1907,14 @@ describe('useForm', () => {
     });
   });
 
+  it('should not update isLoading when literal defaultValues are provided', async () => {
+    const { result } = renderHook(() =>
+      useForm({ defaultValues: { test: 'default' } }),
+    );
+
+    expect(result.current.formState.isLoading).toBe(false);
+  });
+
   it('should update isValidating to true when using with resolver', async () => {
     jest.useFakeTimers();
 

diff --git a/src/logic/createFormControl.ts b/src/logic/createFormControl.ts
@@ -101,7 +101,7 @@ export function createFormControl<
   let _formState: FormState<TFieldValues> = {
     submitCount: 0,
     isDirty: false,
-    isLoading: true,
+    isLoading: isFunction(_options.defaultValues),
     isValidating: false,
     isSubmitted: false,
     isSubmitting: false,

diff --git a/src/useForm.ts b/src/useForm.ts
@@ -55,7 +55,7 @@ export function useForm<
   const [formState, updateFormState] = React.useState<FormState<TFieldValues>>({
     isDirty: false,
     isValidating: false,
-    isLoading: true,
+    isLoading: isFunction(props.defaultValues),
     isSubmitted: false,
     isSubmitting: false,
     isSubmitSuccessful: false,