react-hook-form 7.41.3 → 7.42.0-next.0

package/dist/index.esm.mjs

@@ -656,8 +656,9 @@ var getValueAndMessage = (validationData) => isObject(validationData) && !isRege
         message: '',
     };
 
-var validateField = async (field, inputValue, validateAllFieldCriteria, shouldUseNativeValidation, isFieldArray) => {
+var validateField = async (field, formValues, validateAllFieldCriteria, shouldUseNativeValidation, isFieldArray) => {
     const { ref, refs, required, maxLength, minLength, min, max, pattern, validate, name, valueAsNumber, mount, disabled, } = field._f;
+    const inputValue = get(formValues, name);
     if (!mount || disabled) {
         return {};
     }
@@ -788,7 +789,7 @@ var validateField = async (field, inputValue, validateAllFieldCriteria, shouldUs
     }
     if (validate) {
         if (isFunction(validate)) {
-            const result = await validate(inputValue);
+            const result = await validate(inputValue, formValues);
             const validateError = getValidateError(result, inputRef);
             if (validateError) {
                 error[name] = {
@@ -807,7 +808,7 @@ var validateField = async (field, inputValue, validateAllFieldCriteria, shouldUs
                 if (!isEmptyObject(validationResult) && !validateAllFieldCriteria) {
                     break;
                 }
-                const validateError = getValidateError(await validate[key](inputValue), inputRef, key);
+                const validateError = getValidateError(await validate[key](inputValue, formValues), inputRef, key);
                 if (validateError) {
                     validationResult = {
                         ...validateError,
@@ -897,31 +898,21 @@ function isEmptyArray(obj) {
     return true;
 }
 function unset(object, path) {
-    const updatePath = isKey(path) ? [path] : stringToPath(path);
-    const childObject = updatePath.length == 1 ? object : baseGet(object, updatePath);
-    const key = updatePath[updatePath.length - 1];
-    let previousObjRef;
+    const paths = Array.isArray(path)
+        ? path
+        : isKey(path)
+            ? [path]
+            : stringToPath(path);
+    const childObject = paths.length === 1 ? object : baseGet(object, paths);
+    const index = paths.length - 1;
+    const key = paths[index];
     if (childObject) {
         delete childObject[key];
     }
-    for (let k = 0; k < updatePath.slice(0, -1).length; k++) {
-        let index = -1;
-        let objectRef;
-        const currentPaths = updatePath.slice(0, -(k + 1));
-        const currentPathsLength = currentPaths.length - 1;
-        if (k > 0) {
-            previousObjRef = object;
-        }
-        while (++index < currentPaths.length) {
-            const item = currentPaths[index];
-            objectRef = objectRef ? objectRef[item] : object[item];
-            if (currentPathsLength === index &&
-                ((isObject(objectRef) && isEmptyObject(objectRef)) ||
-                    (Array.isArray(objectRef) && isEmptyArray(objectRef)))) {
-                previousObjRef ? delete previousObjRef[item] : delete object[item];
-            }
-            previousObjRef = objectRef;
-        }
+    if (index !== 0 &&
+        ((isObject(childObject) && isEmptyObject(childObject)) ||
+            (Array.isArray(childObject) && isEmptyArray(childObject)))) {
+        unset(object, paths.slice(0, -1));
     }
     return object;
 }
@@ -1103,7 +1094,7 @@ function useFieldArray(props) {
             else {
                 const field = get(control._fields, name);
                 if (field && field._f) {
-                    validateField(field, get(control._formValues, name), control._options.criteriaMode === VALIDATION_MODE.all, control._options.shouldUseNativeValidation, true).then((error) => !isEmptyObject(error) &&
+                    validateField(field, control._formValues, control._options.criteriaMode === VALIDATION_MODE.all, control._options.shouldUseNativeValidation, true).then((error) => !isEmptyObject(error) &&
                         control._subjects.state.next({
                             errors: updateFieldArrayRootError(control._formState.errors, error, name),
                         }));
@@ -1609,7 +1600,7 @@ function createFormControl(props = {}, flushRootRender) {
                 const { _f, ...fieldValue } = field;
                 if (_f) {
                     const isFieldArrayRoot = _names.array.has(_f.name);
-                    const fieldError = await validateField(field, get(_formValues, _f.name), shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation, isFieldArrayRoot);
+                    const fieldError = await validateField(field, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation, isFieldArrayRoot);
                     if (fieldError[_f.name]) {
                         context.valid = false;
                         if (shouldOnlyCheckValid) {
@@ -1789,7 +1780,7 @@ function createFormControl(props = {}, flushRootRender) {
                 isValid = isEmptyObject(errors);
             }
             else {
-                error = (await validateField(field, get(_formValues, name), shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation))[name];
+                error = (await validateField(field, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation))[name];
                 if (error) {
                     isValid = false;
                 }
@@ -1991,48 +1982,37 @@ function createFormControl(props = {}, flushRootRender) {
             e.preventDefault && e.preventDefault();
             e.persist && e.persist();
         }
-        let hasNoPromiseError = true;
         let fieldValues = cloneObject(_formValues);
         _subjects.state.next({
             isSubmitting: true,
         });
-        try {
-            if (_options.resolver) {
-                const { errors, values } = await _executeSchema();
-                _formState.errors = errors;
-                fieldValues = values;
-            }
-            else {
-                await executeBuiltInValidation(_fields);
-            }
-            if (isEmptyObject(_formState.errors)) {
-                _subjects.state.next({
-                    errors: {},
-                    isSubmitting: true,
-                });
-                await onValid(fieldValues, e);
-            }
-            else {
-                if (onInvalid) {
-                    await onInvalid({ ..._formState.errors }, e);
-                }
-                _focusError();
-            }
+        if (_options.resolver) {
+            const { errors, values } = await _executeSchema();
+            _formState.errors = errors;
+            fieldValues = values;
         }
-        catch (err) {
-            hasNoPromiseError = false;
-            throw err;
+        else {
+            await executeBuiltInValidation(_fields);
         }
-        finally {
-            _formState.isSubmitted = true;
+        if (isEmptyObject(_formState.errors)) {
             _subjects.state.next({
-                isSubmitted: true,
-                isSubmitting: false,
-                isSubmitSuccessful: isEmptyObject(_formState.errors) && hasNoPromiseError,
-                submitCount: _formState.submitCount + 1,
-                errors: _formState.errors,
+                errors: {},
             });
+            await onValid(fieldValues, e);
+        }
+        else {
+            if (onInvalid) {
+                await onInvalid({ ..._formState.errors }, e);
+            }
+            _focusError();
         }
+        _subjects.state.next({
+            isSubmitted: true,
+            isSubmitting: false,
+            isSubmitSuccessful: isEmptyObject(_formState.errors),
+            submitCount: _formState.submitCount + 1,
+            errors: _formState.errors,
+        });
     };
     const resetField = (name, options = {}) => {
         if (get(_fields, name)) {