react-hook-form 7.40.0-next.0 → 7.40.0-next.1

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 = {
@@ -256,16 +253,14 @@ function useFormState(props) {
 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);
+    _names.watchAll = !!isGlobal;
     return formValues;
 };
 
@@ -1321,7 +1316,7 @@ var getResolverOptions = (fieldsNames, _fields, criteriaMode, shouldUseNativeVal
 };
 
 var getRuleValue = (rule) => isUndefined(rule)
-    ? undefined
+    ? rule
     : isRegex(rule)
         ? rule.source
         : isObject(rule)
@@ -1396,6 +1391,7 @@ function createFormControl(props = {}) {
         ...defaultOptions,
         ...props,
     };
+    const shouldCaptureDirtyFields = props.resetOptions && props.resetOptions.keepDirtyValues;
     let _formState = {
         submitCount: 0,
         isDirty: false,
@@ -1450,11 +1446,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({
@@ -1462,7 +1457,6 @@ function createFormControl(props = {}) {
                 });
             }
         }
-        return isValid;
     };
     const _updateFieldArray = (name, values = [], method, args, shouldSetValues = true, shouldUpdateFieldsAndState = true) => {
         if (args && method) {
@@ -1471,8 +1465,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);
@@ -1527,15 +1520,17 @@ function createFormControl(props = {}) {
             _formState.isDirty = output.isDirty = _getDirty();
             shouldUpdateField = isPreviousDirty !== output.isDirty;
         }
-        if (_proxyFormState.dirtyFields && (!isBlurEvent || shouldDirty)) {
-            isPreviousDirty = get(_formState.dirtyFields, name);
+        if (!isBlurEvent || shouldDirty) {
             const isCurrentFieldPristine = deepEqual(get(_defaultValues, name), fieldValue);
+            isPreviousDirty = get(_formState.dirtyFields, name);
             isCurrentFieldPristine
                 ? unset(_formState.dirtyFields, name)
                 : set(_formState.dirtyFields, name, true);
             output.dirtyFields = _formState.dirtyFields;
             shouldUpdateField =
-                shouldUpdateField || isPreviousDirty !== !isCurrentFieldPristine;
+                shouldUpdateField ||
+                    (_proxyFormState.dirtyFields &&
+                        isPreviousDirty !== !isCurrentFieldPristine);
         }
         if (isBlurEvent) {
             const isPreviousFieldTouched = get(_formState.touchedFields, name);
@@ -1620,6 +1615,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;
@@ -1636,7 +1634,7 @@ function createFormControl(props = {}) {
                     (await executeBuiltInValidation(fieldValue, shouldOnlyCheckValid, context));
             }
         }
-        return context.valid;
+        return context;
     };
     const _removeUnmounted = () => {
         for (const name of _names.unMount) {
@@ -1651,18 +1649,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);
@@ -1708,7 +1703,8 @@ function createFormControl(props = {}) {
         }
         (options.shouldDirty || options.shouldTouch) &&
             updateTouchAndDirty(name, fieldValue, options.shouldTouch, options.shouldDirty, true);
-        options.shouldValidate && trigger(name);
+        options.shouldValidate &&
+            trigger(name);
     };
     const setValues = (name, value, options) => {
         for (const fieldKey in value) {
@@ -1806,8 +1802,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);
@@ -1831,12 +1836,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) ||
@@ -2085,7 +2091,7 @@ function createFormControl(props = {}) {
             _defaultValues = updatedValues;
         }
         if (!keepStateOptions.keepValues) {
-            if (keepStateOptions.keepDirtyValues) {
+            if (keepStateOptions.keepDirtyValues || shouldCaptureDirtyFields) {
                 for (const fieldName of _names.mount) {
                     get(_formState.dirtyFields, fieldName)
                         ? set(values, fieldName, get(_formValues, fieldName))