react-hook-form 7.39.4 → 7.39.6

package/dist/index.esm.mjs

@@ -122,10 +122,7 @@ const useFormContext = () => React.useContext(HookFormContext);
  * }
  * ```
  */
-const FormProvider = (props) => {
-    const { children, ...data } = props;
-    return (React.createElement(HookFormContext.Provider, { value: data }, children));
-};
+const FormProvider = ({ children, ...data }) => (React.createElement(HookFormContext.Provider, { value: React.useState(data)[0] }, children));
 
 var getProxyFormState = (formState, control, localProxyFormState, isRoot = true) => {
     const result = {
@@ -239,24 +236,29 @@ function useFormState(props) {
     });
     React.useEffect(() => {
         _mounted.current = true;
+        const isDirty = control._proxyFormState.isDirty && control._getDirty();
+        if (isDirty !== control._formState.isDirty) {
+            control._subjects.state.next({
+                isDirty,
+            });
+        }
+        control._updateValid();
         return () => {
             _mounted.current = false;
         };
-    }, []);
+    }, [control]);
     return getProxyFormState(formState, control, _localProxyFormState.current, false);
 }
 
 var isString = (value) => typeof value === 'string';
 
 var generateWatchOutput = (names, _names, formValues, isGlobal) => {
-    const isArray = Array.isArray(names);
     if (isString(names)) {
         isGlobal && _names.watch.add(names);
         return get(formValues, names);
     }
-    if (isArray) {
-        return names.map((fieldName) => (isGlobal && _names.watch.add(fieldName),
-            get(formValues, fieldName)));
+    if (Array.isArray(names)) {
+        return names.map((fieldName) => (isGlobal && _names.watch.add(fieldName), get(formValues, fieldName)));
     }
     isGlobal && (_names.watchAll = true);
     return formValues;
@@ -322,16 +324,12 @@ function useWatch(props) {
     useSubscribe({
         disabled,
         subject: control._subjects.watch,
-        callback: React.useCallback((formState) => {
+        callback: (formState) => {
             if (shouldSubscribeByName(_name.current, formState.name, exact)) {
                 const fieldValues = generateWatchOutput(_name.current, control._names, formState.values || control._formValues);
-                updateValue(isUndefined(_name.current) || !isUndefined(fieldValues)
-                    ? cloneObject(fieldValues)
-                    : isUndefined(fieldValues)
-                        ? defaultValue
-                        : fieldValues);
+                updateValue(isUndefined(fieldValues) ? defaultValue : cloneObject(fieldValues));
             }
-        }, [control, exact, defaultValue]),
+        },
     });
     const [value, updateValue] = React.useState(isUndefined(defaultValue)
         ? control._getWatch(name)
@@ -1114,7 +1112,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]);
@@ -1315,7 +1313,7 @@ var getResolverOptions = (fieldsNames, _fields, criteriaMode, shouldUseNativeVal
 };
 
 var getRuleValue = (rule) => isUndefined(rule)
-    ? undefined
+    ? rule
     : isRegex(rule)
         ? rule.source
         : isObject(rule)
@@ -1442,11 +1440,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({
@@ -1454,7 +1451,6 @@ function createFormControl(props = {}) {
                 });
             }
         }
-        return isValid;
     };
     const _updateFieldArray = (name, values = [], method, args, shouldSetValues = true, shouldUpdateFieldsAndState = true) => {
         if (args && method) {
@@ -1463,8 +1459,7 @@ function createFormControl(props = {}) {
                 const fieldValues = method(get(_fields, name), args.argA, args.argB);
                 shouldSetValues && set(_fields, name, fieldValues);
             }
-            if (_proxyFormState.errors &&
-                shouldUpdateFieldsAndState &&
+            if (shouldUpdateFieldsAndState &&
                 Array.isArray(get(_formState.errors, name))) {
                 const errors = method(get(_formState.errors, name), args.argA, args.argB);
                 shouldSetValues && set(_formState.errors, name, errors);
@@ -1480,6 +1475,7 @@ function createFormControl(props = {}) {
                 _formState.dirtyFields = getDirtyFields(_defaultValues, _formValues);
             }
             _subjects.state.next({
+                name,
                 isDirty: _getDirty(name, values),
                 dirtyFields: _formState.dirtyFields,
                 errors: _formState.errors,
@@ -1509,37 +1505,39 @@ function createFormControl(props = {}) {
         }
     };
     const updateTouchAndDirty = (name, fieldValue, isBlurEvent, shouldDirty, shouldRender) => {
-        let isFieldDirty = false;
+        let shouldUpdateField = false;
+        let isPreviousDirty = false;
         const output = {
             name,
         };
-        const isPreviousFieldTouched = get(_formState.touchedFields, name);
         if (_proxyFormState.isDirty) {
-            const isPreviousFormDirty = _formState.isDirty;
+            isPreviousDirty = _formState.isDirty;
             _formState.isDirty = output.isDirty = _getDirty();
-            isFieldDirty = isPreviousFormDirty !== output.isDirty;
+            shouldUpdateField = isPreviousDirty !== output.isDirty;
         }
         if (_proxyFormState.dirtyFields && (!isBlurEvent || shouldDirty)) {
-            const isPreviousFieldDirty = get(_formState.dirtyFields, name);
+            isPreviousDirty = get(_formState.dirtyFields, name);
             const isCurrentFieldPristine = deepEqual(get(_defaultValues, name), fieldValue);
             isCurrentFieldPristine
                 ? unset(_formState.dirtyFields, name)
                 : set(_formState.dirtyFields, name, true);
             output.dirtyFields = _formState.dirtyFields;
-            isFieldDirty =
-                isFieldDirty ||
-                    isPreviousFieldDirty !== get(_formState.dirtyFields, name);
+            shouldUpdateField =
+                shouldUpdateField || isPreviousDirty !== !isCurrentFieldPristine;
         }
-        if (isBlurEvent && !isPreviousFieldTouched) {
-            set(_formState.touchedFields, name, isBlurEvent);
-            output.touchedFields = _formState.touchedFields;
-            isFieldDirty =
-                isFieldDirty ||
-                    (_proxyFormState.touchedFields &&
-                        isPreviousFieldTouched !== isBlurEvent);
+        if (isBlurEvent) {
+            const isPreviousFieldTouched = get(_formState.touchedFields, name);
+            if (!isPreviousFieldTouched) {
+                set(_formState.touchedFields, name, isBlurEvent);
+                output.touchedFields = _formState.touchedFields;
+                shouldUpdateField =
+                    shouldUpdateField ||
+                        (_proxyFormState.touchedFields &&
+                            isPreviousFieldTouched !== isBlurEvent);
+            }
         }
-        isFieldDirty && shouldRender && _subjects.state.next(output);
-        return isFieldDirty ? output : {};
+        shouldUpdateField && shouldRender && _subjects.state.next(output);
+        return shouldUpdateField ? output : {};
     };
     const shouldRenderByError = (name, isValid, error, fieldState) => {
         const previousFieldError = get(_formState.errors, name);
@@ -1581,9 +1579,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) {
@@ -1610,6 +1606,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;
@@ -1626,7 +1625,7 @@ function createFormControl(props = {}) {
                     (await executeBuiltInValidation(fieldValue, shouldOnlyCheckValid, context));
             }
         }
-        return context.valid;
+        return context;
     };
     const _removeUnmounted = () => {
         for (const name of _names.unMount) {
@@ -1641,18 +1640,15 @@ function createFormControl(props = {}) {
     };
     const _getDirty = (name, data) => (name && data && set(_formValues, name, data),
         !deepEqual(getValues(), _defaultValues));
-    const _getWatch = (names, defaultValue, isGlobal) => {
-        const fieldValues = {
-            ...(_stateFlags.mount
-                ? _formValues
-                : isUndefined(defaultValue)
-                    ? _defaultValues
-                    : isString(names)
-                        ? { [names]: defaultValue }
-                        : defaultValue),
-        };
-        return generateWatchOutput(names, _names, fieldValues, isGlobal);
-    };
+    const _getWatch = (names, defaultValue, isGlobal) => generateWatchOutput(names, _names, {
+        ...(_stateFlags.mount
+            ? _formValues
+            : isUndefined(defaultValue)
+                ? _defaultValues
+                : isString(names)
+                    ? { [names]: defaultValue }
+                    : defaultValue),
+    }, isGlobal);
     const _getFieldArray = (name) => compact(get(_stateFlags.mount ? _formValues : _defaultValues, name, props.shouldUnregister ? get(_defaultValues, name, []) : []));
     const setFieldValue = (name, value, options = {}) => {
         const field = get(_fields, name);
@@ -1796,8 +1792,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);
@@ -1821,12 +1826,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) ||
@@ -1882,7 +1888,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 = {}) => {
@@ -1967,9 +1973,7 @@ function createFormControl(props = {}) {
                                     refs: [
                                         ...refs.filter(live),
                                         fieldRef,
-                                        ...(!!Array.isArray(get(_defaultValues, name))
-                                            ? [{}]
-                                            : []),
+                                        ...(Array.isArray(get(_defaultValues, name)) ? [{}] : []),
                                     ],
                                     ref: { type: fieldRef.type, name },
                                 }