react-hook-form 7.15.2 → 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,
@@ -244,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);
@@ -1394,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)
@@ -1475,7 +1474,7 @@ function createFormControl(props = {}) {
         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) {
@@ -1556,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);
@@ -1619,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 = () => {