react-hook-form 7.5.3-beta.2 → 7.5.3

package/dist/index.esm.js

@@ -133,7 +133,7 @@ function useFormState(props) {
 
 function useController({ name, rules, defaultValue, control, shouldUnregister, }) {
     const methods = useFormContext();
-    const { defaultValuesRef, register, fieldsRef, unregister, fieldArrayNamesRef, controllerSubjectRef, shouldUnmount, inFieldArrayActionRef, } = control || methods.control;
+    const { defaultValuesRef, register, fieldsRef, unregister, fieldArrayNamesRef, controllerSubjectRef, shouldUnmountUnregister, inFieldArrayActionRef, } = control || methods.control;
     const { onChange, onBlur, ref } = register(name, rules);
     const isFieldArray = isNameInFieldArray(fieldArrayNamesRef.current, name);
     const [value, setInputStateValue] = React.useState(isUndefined(get(fieldsRef.current, name)._f.value) || isFieldArray
@@ -153,10 +153,10 @@ function useController({ name, rules, defaultValue, control, shouldUnregister, }
         });
         return () => {
             controllerSubscription.unsubscribe();
-            const shouldUnmountField = shouldUnmount || shouldUnregister;
+            const shouldUnmount = shouldUnmountUnregister || shouldUnregister;
             if (isFieldArray
-                ? shouldUnmountField && !inFieldArrayActionRef.current
-                : shouldUnmountField) {
+                ? shouldUnmount && !inFieldArrayActionRef.current
+                : shouldUnmount) {
                 unregister(name);
             }
             else if (get(fieldsRef.current, name)) {
@@ -275,20 +275,21 @@ const getFieldsValues = (fieldsRef, defaultValuesRef, output = {}) => {
         if (field) {
             const _f = field._f;
             const current = omit(field, '_f');
-            set(output, name, _f && _f.ref
+            set(output, name, _f
                 ? _f.ref.disabled || (_f.refs && _f.refs.every((ref) => ref.disabled))
                     ? undefined
                     : _f.value
                 : Array.isArray(field)
                     ? []
                     : {});
-            current &&
+            if (current) {
                 getFieldsValues({
                     current,
                 }, defaultValuesRef, output[name]);
+            }
         }
     }
-    return output;
+    return Object.assign(Object.assign({}, defaultValuesRef), output);
 };
 
 var generateId = () => {
@@ -388,8 +389,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])) {
@@ -466,7 +465,7 @@ function unset(object, path) {
 const useFieldArray = ({ control, name, keyName = 'id', shouldUnregister, }) => {
     const methods = useFormContext();
     const focusNameRef = React.useRef('');
-    const { isWatchAllRef, watchFieldsRef, getIsDirty, watchSubjectRef, fieldArraySubjectRef, fieldArrayNamesRef, fieldsRef, defaultValuesRef, formStateRef, formStateSubjectRef, readFormStateRef, validFieldsRef, fieldsWithValidationRef, fieldArrayDefaultValuesRef, unregister, shouldUnmount, inFieldArrayActionRef, } = control || methods.control;
+    const { isWatchAllRef, watchFieldsRef, getIsDirty, watchSubjectRef, fieldArraySubjectRef, fieldArrayNamesRef, fieldsRef, defaultValuesRef, formStateRef, formStateSubjectRef, readFormStateRef, validFieldsRef, fieldsWithValidationRef, fieldArrayDefaultValuesRef, unregister, shouldUnmountUnregister, inFieldArrayActionRef, } = control || methods.control;
     const [fields, setFields] = React.useState(mapIds(get(fieldsRef.current, name)
         ? get(getFieldsValues(fieldsRef), name)
         : get(fieldArrayDefaultValuesRef.current, getNodeParentName(name))
@@ -476,7 +475,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
@@ -616,10 +615,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,
@@ -641,7 +640,7 @@ const useFieldArray = ({ control, name, keyName = 'id', shouldUnregister, }) =>
         !get(fieldsRef.current, name) && set(fieldsRef.current, name, []);
         return () => {
             fieldArraySubscription.unsubscribe();
-            (shouldUnmount || shouldUnregister) && unregister(name);
+            (shouldUnmountUnregister || shouldUnregister) && unregister(name);
         };
     }, []);
     return {
@@ -776,6 +775,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;
@@ -1138,7 +1139,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),
@@ -1311,7 +1312,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],
@@ -1343,7 +1344,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)
@@ -1353,7 +1356,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),
             });
@@ -1388,17 +1391,18 @@ 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;
         }
         const result = [];
-        for (const fieldName of convertToArrayPayload(fieldNames)) {
+        for (const fieldName of isArrayNames ? fieldNames : [fieldNames]) {
             isGlobal && watchFieldsRef.current.add(fieldName);
             result.push(get(fieldValues, fieldName));
         }
@@ -1504,7 +1508,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,
         });
@@ -1573,26 +1577,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) {
@@ -1602,11 +1586,13 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
                     const inputRef = Array.isArray(field._f.refs)
                         ? field._f.refs[0]
                         : field._f.ref;
-                    try {
-                        isHTMLElement(inputRef) && inputRef.closest('form').reset();
-                        break;
+                    if (isHTMLElement(inputRef)) {
+                        try {
+                            inputRef.closest('form').reset();
+                            break;
+                        }
+                        catch (_a) { }
                     }
-                    catch (_a) { }
                 }
             }
         }
@@ -1625,13 +1611,11 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
                 isReset: true,
             });
         }
-        !keepStateOptions.keepDefaultValues &&
-            registerAbsentFields(Object.assign({}, updatedValues));
         resetFromState(keepStateOptions, values);
+        isMountedRef.current = false;
     };
     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)) {
@@ -1659,14 +1643,14 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
     React.useEffect(() => {
         const isLiveInDom = (ref) => !isHTMLElement(ref) || !document.contains(ref);
         isMountedRef.current = true;
-        for (const name of unregisterFieldsNamesRef.current) {
+        unregisterFieldsNamesRef.current.forEach((name) => {
             const field = get(fieldsRef.current, name);
             field &&
                 (field._f.refs
                     ? field._f.refs.every(isLiveInDom)
                     : isLiveInDom(field._f.ref)) &&
                 unregister(name);
-        }
+        });
         unregisterFieldsNamesRef.current = new Set();
     });
     return {
@@ -1690,7 +1674,7 @@ function useForm({ mode = VALIDATION_MODE.onSubmit, reValidateMode = VALIDATION_
             defaultValuesRef,
             fieldArrayDefaultValuesRef,
             unregister,
-            shouldUnmount: shouldUnregister,
+            shouldUnmountUnregister: shouldUnregister,
         }), []),
         formState: getProxyFormState(isProxyEnabled, formState, readFormStateRef),
         trigger,