react-hook-form 7.19.0-next.0 → 7.19.3

package/dist/index.esm.js

@@ -177,6 +177,33 @@ function generateWatchOutput(names, _names, formValues, isGlobal) {
     return formValues;
 }
 
+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 useWatch(props) {
     const methods = useFormContext();
     const { control = methods.control, name, defaultValue, disabled, } = props || {};
@@ -187,8 +214,10 @@ function useWatch(props) {
         subject: control._subjects.watch,
         callback: (formState) => {
             if (shouldSubscribeByName(_name.current, formState.name)) {
-                const fieldValues = generateWatchOutput(_name.current, control._names, control._formValues);
-                updateValue(isObject(fieldValues)
+                const fieldValues = generateWatchOutput(_name.current, control._names, formState.values || control._formValues);
+                updateValue(isObject(fieldValues) &&
+                    !(isString(_name.current) &&
+                        get(control._fields, _name.current, {})._f)
                     ? Object.assign({}, fieldValues) : Array.isArray(fieldValues)
                     ? [...fieldValues]
                     : fieldValues);
@@ -232,7 +261,7 @@ function useController(props) {
             if (isNameInFieldArray(control._names.array, name)
                 ? _shouldUnregisterField && !control._stateFlags.action
                 : _shouldUnregisterField) {
-                control.unregister(name);
+                control.unregister(name, { keepDefaultValue: true });
             }
             else {
                 updateMounted(name, false);
@@ -287,33 +316,6 @@ 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);
@@ -1452,7 +1454,7 @@ function createFormControl(props = {}) {
                 const field = get(_fields, fieldName);
                 return await executeBuildInValidation(field && field._f ? { [fieldName]: field } : field);
             }))).every(Boolean);
-            _updateValid();
+            !(!validationResult && !_formState.isValid) && _updateValid();
         }
         else {
             validationResult = isValid = await executeBuildInValidation(_fields);
@@ -1526,6 +1528,7 @@ function createFormControl(props = {}) {
         });
         _names.mount.add(name);
         !isUndefined(options.value) &&
+            !options.disabled &&
             set(_formValues, name, get(_formValues, name, options.value));
         field
             ? isBoolean(options.disabled) &&
@@ -1582,7 +1585,9 @@ function createFormControl(props = {}) {
             e.persist && e.persist();
         }
         let hasNoPromiseError = true;
-        let fieldValues = Object.assign({}, _formValues);
+        let fieldValues = _options.shouldUnregister
+            ? cloneObject(_formValues)
+            : Object.assign({}, _formValues);
         _subjects.state.next({
             isSubmitting: true,
         });
@@ -1840,7 +1845,6 @@ function useForm(props = {}) {
         }
         control._removeUnmounted();
     });
-    React.useEffect(() => () => Object.values(control._subjects).forEach((subject) => subject.unsubscribe()), [control]);
     _formControl.current.formState = getProxyFormState(formState, control._proxyFormState);
     return _formControl.current;
 }