🐞 fix react-hook-form#11590 issue with trigger on validatingFields (r…

…eact-hook-form#11613) * 🐞 fix react-hook-form#11590 issue with trigger on validatingFields * fix unit tests and lint error
rafaelcalhau · May 5, 2024 · 68c44da · 68c44da
1 parent 07d19ec
commit 68c44da
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 36 deletions.
diff --git a/src/__tests__/utils/objectHasTruthyValue.test.ts b/src/__tests__/utils/objectHasTruthyValue.test.ts
diff --git a/src/logic/createFormControl.ts b/src/logic/createFormControl.ts
@@ -64,7 +64,6 @@ import isString from '../utils/isString';
 import isUndefined from '../utils/isUndefined';
 import isWeb from '../utils/isWeb';
 import live from '../utils/live';
-import objectHasTruthyValue from '../utils/objectHasTruthyValue';
 import set from '../utils/set';
 import unset from '../utils/unset';
 
@@ -178,18 +177,19 @@ export function createFormControl<
     }
   };
 
-  const _updateIsValidating = (isValidating: boolean, names: string[]) => {
-    if (!(_proxyFormState.isValidating || _proxyFormState.validatingFields)) {
-      return;
+  const _updateIsValidating = (names: string[], isValidating?: boolean) => {
+    if (_proxyFormState.isValidating || _proxyFormState.validatingFields) {
+      names.forEach((name) =>
+        set(_formState.validatingFields, name, !!isValidating),
+      );
+      _formState.isValidating = Object.values(_formState.validatingFields).some(
+        (val) => val,
+      );
+      _subjects.state.next({
+        validatingFields: _formState.validatingFields,
+        isValidating: _formState.isValidating,
+      });
     }
-    names.forEach((name) => {
-      set(_formState.validatingFields, name, isValidating);
-    });
-    _formState.isValidating = objectHasTruthyValue(_formState.validatingFields);
-    _subjects.state.next({
-      validatingFields: _formState.validatingFields,
-      isValidating: _formState.isValidating,
-    });
   };
 
   const _updateFieldArray: BatchFieldArrayUpdate = (
@@ -398,7 +398,6 @@ export function createFormControl<
     }
 
     _updateIsValidating(
-      false,
       Object.keys(_formState.validatingFields).filter((key) => key === name),
     );
   };
@@ -749,7 +748,7 @@ export function createFormControl<
 
       !isBlurEvent && watched && _subjects.state.next({ ..._formState });
 
-      _updateIsValidating(true, [name]);
+      _updateIsValidating([name], true);
 
       if (_options.resolver) {
         const { errors } = await _executeSchema([name]);
@@ -819,7 +818,7 @@ export function createFormControl<
     let validationResult;
     const fieldNames = convertToArrayPayload(name) as InternalFieldName[];
 
-    _updateIsValidating(true, fieldNames);
+    _updateIsValidating(fieldNames, true);
 
     if (_options.resolver) {
       const errors = await executeSchemaAndUpdateState(
@@ -853,9 +852,10 @@ export function createFormControl<
         : { name }),
       ...(_options.resolver || !name ? { isValid } : {}),
       errors: _formState.errors,
-      isValidating: false,
     });
 
+    _updateIsValidating(fieldNames);
+
     options.shouldFocus &&
       !validationResult &&
       iterateFieldsByAction(

diff --git a/src/utils/objectHasTruthyValue.ts b/src/utils/objectHasTruthyValue.ts