🐞 fix #5678 reset with keep default values with Controller (#5688)

* fix #5678 reset with keey default values with Controller

* follow up with unit test coverage

src/__tests__/useForm/reset.test.tsx

@@ -9,7 +9,8 @@ import {
 import { act, renderHook } from '@testing-library/react-hooks';
 
 import { Controller } from '../../controller';
-import { NestedValue, UseFormReturn } from '../../types';
+import { Control, NestedValue, UseFormReturn } from '../../types';
+import { useController } from '../../useController';
 import { useFieldArray } from '../../useFieldArray';
 import { useForm } from '../../useForm';
 
@@ -464,4 +465,54 @@ describe('reset', () => {
 
     expect(getValuesResult).toMatchSnapshot();
   });
+
+  it('should keep defaultValues after reset with shouldKeepDefaultValues', async () => {
+    type FormValues = { test: string; test1: string };
+    const ControlledInput = ({ control }: { control: Control<FormValues> }) => {
+      const { field } = useController({
+        name: 'test',
+        control,
+      });
+
+      return <input {...field} />;
+    };
+
+    function App() {
+      const { control, register, reset } = useForm<FormValues>({
+        defaultValues: { test: 'test', test1: 'test1' },
+      });
+      const resetData = () => {
+        reset({}, { keepDefaultValues: true });
+      };
+
+      return (
+        <form>
+          <ControlledInput control={control} />
+          <input {...register('test1')} />
+          <input type="button" onClick={resetData} value="Reset" />
+        </form>
+      );
+    }
+
+    render(<App />);
+
+    fireEvent.change(screen.getAllByRole('textbox')[0], {
+      target: { value: 'data' },
+    });
+
+    fireEvent.change(screen.getAllByRole('textbox')[1], {
+      target: { value: 'data' },
+    });
+
+    await actComponent(async () => {
+      fireEvent.click(screen.getByRole('button'));
+    });
+
+    expect(
+      (screen.getAllByRole('textbox')[0] as HTMLInputElement).value,
+    ).toEqual('test');
+    expect(
+      (screen.getAllByRole('textbox')[1] as HTMLInputElement).value,
+    ).toEqual('test1');
+  });
 });

src/useForm.ts

@@ -1094,7 +1094,9 @@ export function useForm<
       fieldsRef.current = {};
 
       subjectsRef.current.control.next({
-        values: { ...updatedValues },
+        values: keepStateOptions.keepDefaultValues
+          ? defaultValuesRef.current
+          : { ...updatedValues },
       });
 
       subjectsRef.current.watch.next({