react-hook-form 7.51.0 → 7.51.2

package/dist/index.esm.mjs

@@ -1354,8 +1354,6 @@ var isRadioOrCheckbox = (ref) => isRadioInput(ref) || isCheckBoxInput(ref);
 
 var live = (ref) => isHTMLElement(ref) && ref.isConnected;
 
-var objectHasTruthyValue = (value) => isObject(value) && Object.values(value).some((val) => val);
-
 var objectHasFunction = (data) => {
     for (const key in data) {
         if (isFunction(data[key])) {
@@ -1598,18 +1596,20 @@ function createFormControl(props = {}) {
             }
         }
     };
-    const _updateIsValidating = (isValidating, names) => {
-        if (!(_proxyFormState.isValidating || _proxyFormState.validatingFields)) {
-            return;
+    const _updateIsValidating = (names, isValidating) => {
+        if (_proxyFormState.isValidating || _proxyFormState.validatingFields) {
+            (names || Array.from(_names.mount)).forEach((name) => {
+                if (name) {
+                    isValidating
+                        ? set(_formState.validatingFields, name, isValidating)
+                        : unset(_formState.validatingFields, name);
+                }
+            });
+            _subjects.state.next({
+                validatingFields: _formState.validatingFields,
+                isValidating: !isEmptyObject(_formState.validatingFields),
+            });
         }
-        names.forEach((name) => {
-            set(_formState.validatingFields, name, isValidating);
-        });
-        _formState.isValidating = objectHasTruthyValue(_formState.validatingFields);
-        _subjects.state.next({
-            validatingFields: _formState.validatingFields,
-            isValidating: _formState.isValidating,
-        });
     };
     const _updateFieldArray = (name, values = [], method, args, shouldSetValues = true, shouldUpdateFieldsAndState = true) => {
         if (args && method) {
@@ -1739,9 +1739,13 @@ function createFormControl(props = {}) {
             };
             _subjects.state.next(updatedFormState);
         }
-        _updateIsValidating(false, Object.keys(_formState.validatingFields).filter((key) => key === name));
     };
-    const _executeSchema = async (name) => _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
+    const _executeSchema = async (name) => {
+        _updateIsValidating(name, true);
+        const result = await _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
+        _updateIsValidating(name);
+        return result;
+    };
     const executeSchemaAndUpdateState = async (names) => {
         const { errors } = await _executeSchema(names);
         if (names) {
@@ -1766,7 +1770,9 @@ function createFormControl(props = {}) {
                 const { _f, ...fieldValue } = field;
                 if (_f) {
                     const isFieldArrayRoot = _names.array.has(_f.name);
+                    _updateIsValidating([name], true);
                     const fieldError = await validateField(field, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation && !shouldOnlyCheckValid, isFieldArrayRoot);
+                    _updateIsValidating([name]);
                     if (fieldError[_f.name]) {
                         context.valid = false;
                         if (shouldOnlyCheckValid) {
@@ -1943,7 +1949,6 @@ function createFormControl(props = {}) {
                     _subjects.state.next({ name, ...(watched ? {} : fieldState) }));
             }
             !isBlurEvent && watched && _subjects.state.next({ ..._formState });
-            _updateIsValidating(true, [name]);
             if (_options.resolver) {
                 const { errors } = await _executeSchema([name]);
                 _updateIsFieldValueUpdated(fieldValue);
@@ -1956,7 +1961,9 @@ function createFormControl(props = {}) {
                 }
             }
             else {
+                _updateIsValidating([name], true);
                 error = (await validateField(field, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation))[name];
+                _updateIsValidating([name]);
                 _updateIsFieldValueUpdated(fieldValue);
                 if (isFieldValueUpdated) {
                     if (error) {
@@ -1985,7 +1992,6 @@ function createFormControl(props = {}) {
         let isValid;
         let validationResult;
         const fieldNames = convertToArrayPayload(name);
-        _updateIsValidating(true, fieldNames);
         if (_options.resolver) {
             const errors = await executeSchemaAndUpdateState(isUndefined(name) ? name : fieldNames);
             isValid = isEmptyObject(errors);
@@ -2010,7 +2016,6 @@ function createFormControl(props = {}) {
                 : { name }),
             ...(_options.resolver || !name ? { isValid } : {}),
             errors: _formState.errors,
-            isValidating: false,
         });
         options.shouldFocus &&
             !validationResult &&