react-hook-form 7.5.2-beta.0 → 7.5.2

package/dist/index.esm.js

@@ -279,13 +279,14 @@ const getFieldsValues = (fieldsRef, defaultValuesRef, output = {}) => {
                 : Array.isArray(field)
                     ? []
                     : {});
-            current &&
+            if (current) {
                 getFieldsValues({
                     current,
                 }, defaultValuesRef, output[name]);
+            }
         }
     }
-    return output;
+    return Object.assign(Object.assign({}, defaultValuesRef), output);
 };
 
 var generateId = () => {
@@ -385,8 +386,6 @@ function insert(data, index, value) {
     ];
 }
 
-var isString = (value) => typeof value === 'string';
-
 var moveArrayAt = (data, from, to) => {
     if (Array.isArray(data)) {
         if (isUndefined(data[to])) {
@@ -473,7 +472,7 @@ const useFieldArray = ({ control, name, keyName = 'id', shouldUnregister, }) =>
     fieldArrayNamesRef.current.add(name);
     const omitKey = (fields) => fields.map((field) => omit((field || {}), keyName));
     const getCurrentFieldsValues = () => {
-        const values = get(getFieldsValues(fieldsRef), name, []);
+        const values = get(getFieldsValues(fieldsRef, defaultValuesRef.current), name, []);
         return mapIds(get(fieldArrayDefaultValuesRef.current, name, []).map((item, index) => (Object.assign(Object.assign({}, item), values[index]))), keyName);
     };
     const getFocusDetail = (index, options) => options
@@ -611,10 +610,10 @@ const useFieldArray = ({ control, name, keyName = 'id', shouldUnregister, }) =>
         }
         watchSubjectRef.current.next({
             name,
-            value: get(getFieldsValues(fieldsRef), name, []),
+            value: get(getFieldsValues(fieldsRef, defaultValuesRef.current), name, []),
         });
         focusNameRef.current &&
-            focusFieldBy(fieldsRef.current, (key) => isString(key) && key.startsWith(focusNameRef.current));
+            focusFieldBy(fieldsRef.current, (key) => key.startsWith(focusNameRef.current));
         focusNameRef.current = '';
         fieldArraySubjectRef.current.next({
             name,
@@ -771,6 +770,8 @@ var skipValidation = ({ isOnBlur, isOnChange, isOnTouch, isTouched, isReValidate
 
 var isFunction = (value) => typeof value === 'function';
 
+var isString = (value) => typeof value === 'string';
+
 var isMessage = (value) => isString(value) || React.isValidElement(value);
 
 var isRegex = (value) => value instanceof RegExp;
@@ -1132,7 +1133,7 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
         return isUndefined(error);
     }, [isValidateAllFieldCriteria]);
     const executeSchemaOrResolverValidation = React.useCallback(async (names, currentNames = []) => {
-        const { errors } = await resolverRef.current(getFieldsValues(fieldsRef), contextRef.current, {
+        const { errors } = await resolverRef.current(getFieldsValues(fieldsRef, shouldUnregister ? {} : defaultValuesRef.current), contextRef.current, {
             criteriaMode,
             names: currentNames,
             fields: getFields(fieldsNamesRef.current, fieldsRef.current),
@@ -1305,7 +1306,7 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
                 isValidating: true,
             });
             if (resolverRef.current) {
-                const { errors } = await resolverRef.current(getFieldsValues(fieldsRef), contextRef.current, {
+                const { errors } = await resolverRef.current(getFieldsValues(fieldsRef, shouldUnregister ? {} : defaultValuesRef.current), contextRef.current, {
                     criteriaMode,
                     fields: getFields([name], fieldsRef.current),
                     names: [name],
@@ -1337,7 +1338,9 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
         }
     }, []);
     const getValues = (fieldNames) => {
-        const values = Object.assign(Object.assign({}, defaultValuesRef.current), getFieldsValues(fieldsRef));
+        const values = isMountedRef.current
+            ? getFieldsValues(fieldsRef, shouldUnregister ? {} : defaultValuesRef.current)
+            : defaultValuesRef.current;
         return isUndefined(fieldNames)
             ? values
             : isString(fieldNames)
@@ -1347,7 +1350,7 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
     const updateIsValid = React.useCallback(async (values = {}) => {
         const previousIsValid = formStateRef.current.isValid;
         if (resolver) {
-            const { errors } = await resolverRef.current(Object.assign(Object.assign({}, getFieldsValues(fieldsRef)), values), contextRef.current, {
+            const { errors } = await resolverRef.current(Object.assign(Object.assign({}, getFieldsValues(fieldsRef, shouldUnregister ? {} : defaultValuesRef.current)), values), contextRef.current, {
                 criteriaMode,
                 fields: getFields(fieldsNamesRef.current, fieldsRef.current),
             });
@@ -1382,11 +1385,12 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
     const watchInternal = React.useCallback((fieldNames, defaultValue, isGlobal) => {
         const isArrayNames = Array.isArray(fieldNames);
         const fieldValues = isMountedRef.current
-            ? Object.assign(Object.assign({}, defaultValuesRef.current), getFieldsValues(fieldsRef)) : isUndefined(defaultValue)
-            ? defaultValuesRef.current
-            : isArrayNames
-                ? defaultValue || {}
-                : { [fieldNames]: defaultValue };
+            ? getFieldsValues(fieldsRef, defaultValuesRef.current)
+            : isUndefined(defaultValue)
+                ? defaultValuesRef.current
+                : isArrayNames
+                    ? defaultValue || {}
+                    : { [fieldNames]: defaultValue };
         if (isUndefined(fieldNames)) {
             isGlobal && (isWatchAllRef.current = true);
             return fieldValues;
@@ -1495,7 +1499,7 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
             e.persist && e.persist();
         }
         let hasNoPromiseError = true;
-        let fieldValues = getFieldsValues(fieldsRef);
+        let fieldValues = getFieldsValues(fieldsRef, shouldUnregister ? {} : defaultValuesRef.current);
         formStateSubjectRef.current.next({
             isSubmitting: true,
         });
@@ -1564,26 +1568,6 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
             isSubmitSuccessful: false,
         });
     }, []);
-    const registerAbsentFields = (value, name = '') => {
-        !get(fieldsRef.current, name) &&
-            (isPrimitive(value) ||
-                (isWeb && (value instanceof File || value instanceof Date))) &&
-            set(fieldsRef.current, name, {
-                _f: {
-                    ref: { name, value },
-                    value,
-                    name,
-                },
-            });
-        if (Array.isArray(value) || isObject(value)) {
-            if (name && !get(fieldsRef.current, name)) {
-                set(fieldsRef.current, name, Array.isArray(value) ? [] : {});
-            }
-            for (const key in value) {
-                registerAbsentFields(value[key], name + (name ? '.' : '') + key);
-            }
-        }
-    };
     const reset = (values, keepStateOptions = {}) => {
         const updatedValues = values || defaultValuesRef.current;
         if (isWeb && !keepStateOptions.keepValues) {
@@ -1603,10 +1587,8 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
                 }
             }
         }
-        if (!keepStateOptions.keepDefaultValues) {
-            defaultValuesRef.current = Object.assign({}, updatedValues);
-            registerAbsentFields(updatedValues);
-        }
+        !keepStateOptions.keepDefaultValues &&
+            (defaultValuesRef.current = Object.assign({}, updatedValues));
         if (!keepStateOptions.keepValues) {
             fieldsRef.current = {};
             controllerSubjectRef.current.next({
@@ -1625,7 +1607,6 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
     };
     const setFocus = (name) => get(fieldsRef.current, name)._f.ref.focus();
     React.useEffect(() => {
-        registerAbsentFields(defaultValuesRef.current);
         const formStateSubscription = formStateSubjectRef.current.subscribe({
             next(formState) {
                 if (shouldRenderFormState(formState, readFormStateRef.current, true)) {