react-hook-form 7.52.1 → 7.53.0

package/dist/index.esm.mjs

@@ -407,6 +407,7 @@ function useController(props) {
     const formState = useFormState({
         control,
         name,
+        exact: true,
     });
     const _registerProps = React.useRef(control.register(name, {
         ...props.rules,
@@ -468,7 +469,7 @@ function useController(props) {
                 },
                 type: EVENTS.BLUR,
             }), [name, control]),
-            ref: (elm) => {
+            ref: React.useCallback((elm) => {
                 const field = get(control._fields, name);
                 if (field && elm) {
                     field._f.ref = {
@@ -478,7 +479,7 @@ function useController(props) {
                         reportValidity: () => elm.reportValidity(),
                     };
                 }
-            },
+            }, [control._fields, name]),
         },
         formState,
         fieldState: Object.defineProperties({}, {
@@ -692,20 +693,25 @@ const iterateFieldsByAction = (fields, action, fieldsNames, abortEarly) => {
             const { _f, ...currentField } = field;
             if (_f) {
                 if (_f.refs && _f.refs[0] && action(_f.refs[0], key) && !abortEarly) {
-                    break;
+                    return true;
                 }
                 else if (_f.ref && action(_f.ref, _f.name) && !abortEarly) {
-                    break;
+                    return true;
                 }
                 else {
-                    iterateFieldsByAction(currentField, action);
+                    if (iterateFieldsByAction(currentField, action)) {
+                        break;
+                    }
                 }
             }
             else if (isObject(currentField)) {
-                iterateFieldsByAction(currentField, action);
+                if (iterateFieldsByAction(currentField, action)) {
+                    break;
+                }
             }
         }
     }
+    return;
 };
 
 var updateFieldArrayRootError = (errors, error, name) => {
@@ -1465,6 +1471,13 @@ var getRuleValue = (rule) => isUndefined(rule)
                 : rule.value
             : rule;
 
+const ASYNC_FUNCTION = 'AsyncFunction';
+var hasPromiseValidation = (fieldReference) => (!fieldReference || !fieldReference.validate) &&
+    !!((isFunction(fieldReference.validate) &&
+        fieldReference.validate.constructor.name === ASYNC_FUNCTION) ||
+        (isObject(fieldReference.validate) &&
+            Object.values(fieldReference.validate).find((validateFunction) => validateFunction.constructor.name === ASYNC_FUNCTION)));
+
 var hasValidation = (options) => options.mount &&
     (options.required ||
         options.min ||
@@ -1775,9 +1788,14 @@ function createFormControl(props = {}) {
                 const { _f, ...fieldValue } = field;
                 if (_f) {
                     const isFieldArrayRoot = _names.array.has(_f.name);
-                    _updateIsValidating([name], true);
+                    const isPromiseFunction = field._f && hasPromiseValidation(field._f);
+                    if (isPromiseFunction && _proxyFormState.validatingFields) {
+                        _updateIsValidating([name], true);
+                    }
                     const fieldError = await validateField(field, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation && !shouldOnlyCheckValid, isFieldArrayRoot);
-                    _updateIsValidating([name]);
+                    if (isPromiseFunction && _proxyFormState.validatingFields) {
+                        _updateIsValidating([name]);
+                    }
                     if (fieldError[_f.name]) {
                         context.valid = false;
                         if (shouldOnlyCheckValid) {
@@ -1791,7 +1809,7 @@ function createFormControl(props = {}) {
                                 : set(_formState.errors, _f.name, fieldError[_f.name])
                             : unset(_formState.errors, _f.name));
                 }
-                fieldValue &&
+                !isEmptyObject(fieldValue) &&
                     (await executeBuiltInValidation(fieldValue, shouldOnlyCheckValid, context));
             }
         }
@@ -1920,7 +1938,7 @@ function createFormControl(props = {}) {
         const _updateIsFieldValueUpdated = (fieldValue) => {
             isFieldValueUpdated =
                 Number.isNaN(fieldValue) ||
-                    fieldValue === get(_formValues, name, fieldValue);
+                    deepEqual(fieldValue, get(_formValues, name, fieldValue));
         };
         if (field) {
             let error;
@@ -1950,7 +1968,16 @@ function createFormControl(props = {}) {
                     values: { ..._formValues },
                 });
             if (shouldSkipValidation) {
-                _proxyFormState.isValid && _updateValid();
+                if (_proxyFormState.isValid) {
+                    if (props.mode === 'onBlur') {
+                        if (isBlurEvent) {
+                            _updateValid();
+                        }
+                    }
+                    else {
+                        _updateValid();
+                    }
+                }
                 return (shouldRender &&
                     _subjects.state.next({ name, ...(watched ? {} : fieldState) }));
             }
@@ -2113,7 +2140,7 @@ function createFormControl(props = {}) {
     };
     const register = (name, options = {}) => {
         let field = get(_fields, name);
-        const disabledIsDefined = isBoolean(options.disabled);
+        const disabledIsDefined = isBoolean(options.disabled) || isBoolean(props.disabled);
         set(_fields, name, {
             ...(field || {}),
             _f: {
@@ -2127,7 +2154,9 @@ function createFormControl(props = {}) {
         if (field) {
             _updateDisabledField({
                 field,
-                disabled: options.disabled,
+                disabled: isBoolean(options.disabled)
+                    ? options.disabled
+                    : props.disabled,
                 name,
                 value: options.value,
             });
@@ -2136,7 +2165,9 @@ function createFormControl(props = {}) {
             updateValidAndValue(name, true, options.value);
         }
         return {
-            ...(disabledIsDefined ? { disabled: options.disabled } : {}),
+            ...(disabledIsDefined
+                ? { disabled: options.disabled || props.disabled }
+                : {}),
             ...(_options.progressive
                 ? {
                     required: !!options.required,