react-hook-form 7.15.0 → 7.15.3

package/dist/index.esm.js

@@ -132,38 +132,10 @@ function useFormState(props) {
     return getProxyFormState(formState, control._proxyFormState, _localProxyFormState.current, false);
 }
 
-var isKey = (value) => /^\w*$/.test(value);
-
-var stringToPath = (input) => compact(input.replace(/["|']|\]/g, '').split(/\.|\[/));
-
-function set(object, path, value) {
-    let index = -1;
-    const tempPath = isKey(path) ? [path] : stringToPath(path);
-    const length = tempPath.length;
-    const lastIndex = length - 1;
-    while (++index < length) {
-        const key = tempPath[index];
-        let newValue = value;
-        if (index !== lastIndex) {
-            const objValue = object[key];
-            newValue =
-                isObject(objValue) || Array.isArray(objValue)
-                    ? objValue
-                    : !isNaN(+tempPath[index + 1])
-                        ? []
-                        : {};
-        }
-        object[key] = newValue;
-        object = object[key];
-    }
-    return object;
-}
-
 function useController(props) {
     const methods = useFormContext();
     const { name, control = methods.control, shouldUnregister } = props;
     const [value, setInputStateValue] = React.useState(get(control._formValues, name, get(control._defaultValues, name, props.defaultValue)));
-    set(control._formValues, name, value);
     const formState = useFormState({
         control: control || methods.control,
         name,
@@ -210,6 +182,7 @@ function useController(props) {
             onBlur: () => {
                 registerProps.onBlur({
                     target: {
+                        value,
                         name: name,
                     },
                     type: EVENTS.BLUR,
@@ -243,6 +216,33 @@ const Controller = (props) => props.render(useController(props));
 var appendErrors = (name, validateAllFieldCriteria, errors, type, message) => validateAllFieldCriteria
     ? Object.assign(Object.assign({}, errors[name]), { types: Object.assign(Object.assign({}, (errors[name] && errors[name].types ? errors[name].types : {})), { [type]: message || true }) }) : {};
 
+var isKey = (value) => /^\w*$/.test(value);
+
+var stringToPath = (input) => compact(input.replace(/["|']|\]/g, '').split(/\.|\[/));
+
+function set(object, path, value) {
+    let index = -1;
+    const tempPath = isKey(path) ? [path] : stringToPath(path);
+    const length = tempPath.length;
+    const lastIndex = length - 1;
+    while (++index < length) {
+        const key = tempPath[index];
+        let newValue = value;
+        if (index !== lastIndex) {
+            const objValue = object[key];
+            newValue =
+                isObject(objValue) || Array.isArray(objValue)
+                    ? objValue
+                    : !isNaN(+tempPath[index + 1])
+                        ? []
+                        : {};
+        }
+        object[key] = newValue;
+        object = object[key];
+    }
+    return object;
+}
+
 const focusFieldBy = (fields, callback, fieldsNames) => {
     for (const key of fieldsNames || Object.keys(fields)) {
         const field = get(fields, key);
@@ -1174,9 +1174,7 @@ function createFormControl(props = {}) {
                 !field._f.deps) ||
                 skipValidation(isBlurEvent, get(_formState.touchedFields, name), _formState.isSubmitted, reValidateMode, validationMode);
             const isWatched = !isBlurEvent && isFieldWatched(name);
-            if (!isUndefined(inputValue)) {
-                set(_formValues, name, inputValue);
-            }
+            set(_formValues, name, inputValue);
             const fieldState = updateTouchAndDirtyState(name, inputValue, isBlurEvent, false);
             const shouldRender = !isEmptyObject(fieldState) || isWatched;
             !isBlurEvent &&
@@ -1199,9 +1197,11 @@ function createFormControl(props = {}) {
                 error = get(errors, name);
                 if (isCheckBoxInput(target) && !error) {
                     const parentNodeName = getNodeParentName(name);
-                    const valError = get(errors, parentNodeName, {});
-                    valError.type && valError.message && (error = valError);
-                    if (valError || get(_formState.errors, parentNodeName)) {
+                    const parentField = get(_fields, parentNodeName);
+                    if (Array.isArray(parentField) &&
+                        parentField.every((field) => field._f && isCheckBoxInput(field._f.ref))) {
+                        const parentError = get(errors, parentNodeName, {});
+                        parentError.type && (error = parentError);
                         name = parentNodeName;
                     }
                 }
@@ -1264,8 +1264,8 @@ function createFormControl(props = {}) {
             ? setValues(fieldName, fieldValue, options)
             : setFieldValue(fieldName, fieldValue, options, true);
     });
-    const _getWatch = (fieldNames, defaultValue, isGlobal) => {
-        const fieldValues = Object.assign({}, (_isMounted
+    const _getWatch = (fieldNames, defaultValue, isMounted, isGlobal) => {
+        const fieldValues = Object.assign({}, (isMounted || _isMounted
             ? _formValues
             : isUndefined(defaultValue)
                 ? _defaultValues
@@ -1393,7 +1393,7 @@ function createFormControl(props = {}) {
         return isValid;
     };
     const getValues = (fieldNames) => {
-        const values = Object.assign(Object.assign({}, _defaultValues), _formValues);
+        const values = Object.assign(Object.assign({}, _defaultValues), (_isMounted ? _formValues : {}));
         return isUndefined(fieldNames)
             ? values
             : isString(fieldNames)
@@ -1422,7 +1422,7 @@ function createFormControl(props = {}) {
         ? _subjects.watch.subscribe({
             next: (info) => fieldName(_getWatch(undefined, defaultValue), info),
         })
-        : _getWatch(fieldName, defaultValue, true);
+        : _getWatch(fieldName, defaultValue, false, true);
     const unregister = (name, options = {}) => {
         for (const inputName of name ? convertToArrayPayload(name) : _names.mount) {
             _names.mount.delete(inputName);
@@ -1467,14 +1467,14 @@ function createFormControl(props = {}) {
                     ], ref: { type: ref.type, name } }) : Object.assign(Object.assign({}, field._f), { ref }),
         };
         set(_fields, name, field);
-        _updateValidAndInputValue(name, ref);
+        (!options || !options.disabled) && _updateValidAndInputValue(name, ref);
     };
     const register = (name, options = {}) => {
         const field = get(_fields, name);
         set(_fields, name, {
             _f: Object.assign(Object.assign(Object.assign({}, (field && field._f ? field._f : { ref: { name } })), { name, mount: true }), options),
         });
-        if (options.value) {
+        if (!isUndefined(options.value)) {
             set(_formValues, name, options.value);
         }
         if (isBoolean(options.disabled) && field) {
@@ -1555,7 +1555,9 @@ function createFormControl(props = {}) {
     const reset = (formValues, keepStateOptions = {}) => {
         const updatedValues = formValues || _defaultValues;
         const values = cloneObject(updatedValues);
-        _formValues = values;
+        if (!keepStateOptions.keepValues) {
+            _formValues = props.shouldUnregister ? {} : values;
+        }
         if (isWeb && !keepStateOptions.keepValues) {
             for (const name of _names.mount) {
                 const field = get(_fields, name);
@@ -1618,7 +1620,7 @@ function createFormControl(props = {}) {
             isSubmitting: false,
             isSubmitSuccessful: false,
         });
-        _isMounted = !!keepStateOptions.keepIsValid;
+        _isMounted = !_proxyFormState.isValid || !!keepStateOptions.keepIsValid;
     };
     const setFocus = (name) => get(_fields, name)._f.ref.focus();
     const _removeFields = () => {
@@ -1767,7 +1769,7 @@ function useWatch(props) {
                         fieldName &&
                         (fieldName.startsWith(name) ||
                             name.startsWith(fieldName)))) {
-                    const result = control._getWatch(_name.current, defaultValue);
+                    const result = control._getWatch(_name.current, defaultValue, true);
                     updateValue(isObject(result)
                         ? Object.assign({}, result) : Array.isArray(result)
                         ? [...result]