🪜 fix set defaultValues for controlled components with values pro…

…ps (#9780) * fix set defaultValues for controlled components with values props * update test and save some bytes
react-hook-form · Jan 16, 2023 · a500857 · a500857
1 parent aaa2329
commit a500857
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/__tests__/controller.test.tsx b/src/__tests__/controller.test.tsx
@@ -1429,4 +1429,28 @@ describe('Controller', () => {
       show: false,
     });
   });
+
+  it('should set up defaultValues for controlled component with values prop', () => {
+    function App() {
+      const { control } = useForm<any>({
+        values: {
+          firstName: 'test',
+        },
+      });
+
+      return (
+        <Controller
+          render={({ field }) => <input {...field} />}
+          control={control}
+          name="firstName"
+        />
+      );
+    }
+
+    render(<App />);
+
+    expect((screen.getByRole('textbox') as HTMLInputElement).value).toEqual(
+      'test',
+    );
+  });
 });
diff --git a/src/logic/createFormControl.ts b/src/logic/createFormControl.ts
@@ -114,9 +114,10 @@ export function createFormControl<
     errors: {},
   };
   let _fields = {};
-  let _defaultValues = isObject(_options.defaultValues)
-    ? cloneObject(_options.defaultValues) || {}
-    : {};
+  let _defaultValues =
+    isObject(_options.defaultValues) || isObject(_options.values)
+      ? cloneObject(_options.defaultValues || _options.values) || {}
+      : {};
   let _formValues = _options.shouldUnregister
     ? {}
     : cloneObject(_defaultValues);