react-hook-form 7.55.0-next.3 → 7.55.0-next.5

package/dist/index.esm.mjs

@@ -314,6 +314,7 @@ function useWatch(props) {
     const methods = useFormContext();
     const { control = methods.control, name, defaultValue, disabled, exact, } = props || {};
     const _name = React.useRef(name);
+    const _defaultValue = React.useRef(defaultValue);
     _name.current = name;
     React.useEffect(() => control._subscribe({
         name: _name.current,
@@ -322,8 +323,8 @@ function useWatch(props) {
         },
         exact,
         callback: (formState) => !disabled &&
-            updateValue(generateWatchOutput(_name.current, control._names, formState.values || control._formValues, false, defaultValue)),
-    }), [control, defaultValue, disabled, exact]);
+            updateValue(generateWatchOutput(_name.current, control._names, formState.values || control._formValues, false, _defaultValue.current)),
+    }), [control, disabled, exact]);
     const [value, updateValue] = React.useState(control._getWatch(name, defaultValue));
     React.useEffect(() => control._removeUnmounted());
     return value;
@@ -1695,8 +1696,10 @@ function createFormControl(props = {}) {
                 });
             if (shouldSkipValidation) {
                 if (_proxyFormState.isValid || _proxySubscribeFormState.isValid) {
-                    if (_options.mode === 'onBlur' && isBlurEvent) {
-                        _setValid();
+                    if (_options.mode === 'onBlur') {
+                        if (isBlurEvent) {
+                            _setValid();
+                        }
                     }
                     else if (!isBlurEvent) {
                         _setValid();
@@ -1994,11 +1997,6 @@ function createFormControl(props = {}) {
             e.persist && e.persist();
         }
         let fieldValues = cloneObject(_formValues);
-        if (_names.disabled.size) {
-            for (const name of _names.disabled) {
-                set(fieldValues, name, undefined);
-            }
-        }
         _subjects.state.next({
             isSubmitting: true,
         });
@@ -2010,6 +2008,11 @@ function createFormControl(props = {}) {
         else {
             await executeBuiltInValidation(_fields);
         }
+        if (_names.disabled.size) {
+            for (const name of _names.disabled) {
+                set(fieldValues, name, undefined);
+            }
+        }
         unset(_formState.errors, 'root');
         if (isEmptyObject(_formState.errors)) {
             _subjects.state.next({
@@ -2656,7 +2659,7 @@ function useForm(props = {}) {
         }
     }, [props.values, control]);
     React.useEffect(() => {
-        if (props.errors) {
+        if (props.errors && !isEmptyObject(props.errors)) {
             control._setErrors(props.errors);
         }
     }, [props.errors, control]);