react-hook-form 7.39.5 → 7.39.7

package/dist/index.esm.mjs

@@ -263,7 +263,7 @@ var generateWatchOutput = (names, _names, formValues, isGlobal) => {
     if (Array.isArray(names)) {
         return names.map((fieldName) => (isGlobal && _names.watch.add(fieldName), get(formValues, fieldName)));
     }
-    _names.watchAll = !!isGlobal;
+    isGlobal && (_names.watchAll = true);
     return formValues;
 };
 
@@ -1115,7 +1115,7 @@ function useFieldArray(props) {
             values: control._formValues,
         });
         control._names.focus &&
-            focusFieldBy(control._fields, (key) => !!key && key.startsWith(control._names.focus));
+            focusFieldBy(control._fields, (key) => !!key && key.startsWith(control._names.focus || ''));
         control._names.focus = '';
         control._proxyFormState.isValid && control._updateValid();
     }, [fields, name, control]);
@@ -1443,11 +1443,10 @@ function createFormControl(props = {}) {
         timer = window.setTimeout(callback, wait);
     };
     const _updateValid = async () => {
-        let isValid = false;
         if (_proxyFormState.isValid) {
-            isValid = _options.resolver
+            const isValid = _options.resolver
                 ? isEmptyObject((await _executeSchema()).errors)
-                : await executeBuiltInValidation(_fields, true);
+                : (await executeBuiltInValidation(_fields, true)).valid;
             if (isValid !== _formState.isValid) {
                 _formState.isValid = isValid;
                 _subjects.state.next({
@@ -1455,7 +1454,6 @@ function createFormControl(props = {}) {
                 });
             }
         }
-        return isValid;
     };
     const _updateFieldArray = (name, values = [], method, args, shouldSetValues = true, shouldUpdateFieldsAndState = true) => {
         if (args && method) {
@@ -1480,6 +1478,7 @@ function createFormControl(props = {}) {
                 _formState.dirtyFields = getDirtyFields(_defaultValues, _formValues);
             }
             _subjects.state.next({
+                name,
                 isDirty: _getDirty(name, values),
                 dirtyFields: _formState.dirtyFields,
                 errors: _formState.errors,
@@ -1583,9 +1582,7 @@ function createFormControl(props = {}) {
             validateFields = {};
         }
     };
-    const _executeSchema = async (name) => _options.resolver
-        ? await _options.resolver({ ..._formValues }, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation))
-        : {};
+    const _executeSchema = async (name) => await _options.resolver(_formValues, _options.context, getResolverOptions(name || _names.mount, _fields, _options.criteriaMode, _options.shouldUseNativeValidation));
     const executeSchemaAndUpdateState = async (names) => {
         const { errors } = await _executeSchema();
         if (names) {
@@ -1612,6 +1609,9 @@ function createFormControl(props = {}) {
                     const isFieldArrayRoot = _names.array.has(_f.name);
                     const fieldError = await validateField(field, get(_formValues, _f.name), shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation, isFieldArrayRoot);
                     if (fieldError[_f.name]) {
+                        if (_f.name === context.name) {
+                            context.error = fieldError[context.name];
+                        }
                         context.valid = false;
                         if (shouldOnlyCheckValid) {
                             break;
@@ -1628,7 +1628,7 @@ function createFormControl(props = {}) {
                     (await executeBuiltInValidation(fieldValue, shouldOnlyCheckValid, context));
             }
         }
-        return context.valid;
+        return context;
     };
     const _removeUnmounted = () => {
         for (const name of _names.unMount) {
@@ -1795,8 +1795,17 @@ function createFormControl(props = {}) {
                 isValid = isEmptyObject(errors);
             }
             else {
-                error = (await validateField(field, get(_formValues, name), shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation))[name];
-                _updateValid();
+                if (_proxyFormState.isValid) {
+                    const buildInValidationResult = await executeBuiltInValidation(_fields, true, {
+                        name,
+                        valid: true,
+                    });
+                    error = buildInValidationResult.error || {};
+                    isValid = buildInValidationResult.valid;
+                }
+                if (!error || isEmptyObject(error)) {
+                    error = (await validateField(field, get(_formValues, name), shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation))[name];
+                }
             }
             field._f.deps &&
                 trigger(field._f.deps);
@@ -1820,12 +1829,13 @@ function createFormControl(props = {}) {
         else if (name) {
             validationResult = (await Promise.all(fieldNames.map(async (fieldName) => {
                 const field = get(_fields, fieldName);
-                return await executeBuiltInValidation(field && field._f ? { [fieldName]: field } : field);
+                return (await executeBuiltInValidation(field && field._f ? { [fieldName]: field } : field)).valid;
             }))).every(Boolean);
             !(!validationResult && !_formState.isValid) && _updateValid();
         }
         else {
-            validationResult = isValid = await executeBuiltInValidation(_fields);
+            validationResult = isValid = (await executeBuiltInValidation(_fields))
+                .valid;
         }
         _subjects.state.next({
             ...(!isString(name) ||
@@ -1881,7 +1891,7 @@ function createFormControl(props = {}) {
     };
     const watch = (name, defaultValue) => isFunction(name)
         ? _subjects.watch.subscribe({
-            next: (info) => name(_getWatch(undefined, defaultValue), info),
+            next: (payload) => name(_getWatch(undefined, defaultValue), payload),
         })
         : _getWatch(name, defaultValue, true);
     const unregister = (name, options = {}) => {
@@ -1966,9 +1976,7 @@ function createFormControl(props = {}) {
                                     refs: [
                                         ...refs.filter(live),
                                         fieldRef,
-                                        ...(!!Array.isArray(get(_defaultValues, name))
-                                            ? [{}]
-                                            : []),
+                                        ...(Array.isArray(get(_defaultValues, name)) ? [{}] : []),
                                     ],
                                     ref: { type: fieldRef.type, name },
                                 }