🕯️ close #9524 useWatch return undefined value

react-hook-form · Dec 23, 2022 · c8475ce · c8475ce
1 parent eb30119
commit c8475ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/logic/generateWatchOutput.ts b/src/logic/generateWatchOutput.ts
@@ -7,7 +7,7 @@ export default <T>(
   _names: Names,
   formValues?: FieldValues,
   isGlobal?: boolean,
-  defaultValue?: DeepPartial<T>,
+  defaultValue?: DeepPartial<T> | unknown,
 ) => {
   if (isString(names)) {
     isGlobal && _names.watch.add(names);

diff --git a/src/useWatch.ts b/src/useWatch.ts
@@ -3,7 +3,6 @@ import React from 'react';
 import generateWatchOutput from './logic/generateWatchOutput';
 import shouldSubscribeByName from './logic/shouldSubscribeByName';
 import cloneObject from './utils/cloneObject';
-import isUndefined from './utils/isUndefined';
 import {
   Control,
   DeepPartialSkipArrayKey,
@@ -167,14 +166,16 @@ export function useWatch<TFieldValues extends FieldValues>(
           exact,
         )
       ) {
-        const fieldValues = generateWatchOutput(
-          _name.current as InternalFieldName | InternalFieldName[],
-          control._names,
-          formState.values || control._formValues,
-        );
-
         updateValue(
-          isUndefined(fieldValues) ? defaultValue : cloneObject(fieldValues),
+          cloneObject(
+            generateWatchOutput(
+              _name.current as InternalFieldName | InternalFieldName[],
+              control._names,
+              formState.values || control._formValues,
+              false,
+              defaultValue,
+            ),
+          ),
         );
       }
     },