react-hook-form 7.76.0 → 7.76.1

package/dist/index.esm.mjs

@@ -18,15 +18,9 @@ var getEventValue = (event) => isObject(event) && event.target
         : event.target.value
     : event;
 
-var getFieldArrayParentNames = (names, name) => {
-    const parts = name.split('.');
-    const matches = [];
-    let prefix = parts[0];
-    for (let i = 1; i < parts.length; prefix += '.' + parts[i++]) {
-        !isNaN(+parts[i]) && names.has(prefix) && matches.push(prefix);
-    }
-    return matches;
-};
+var isNameInFieldArray = (names, name) => name
+    .split('.')
+    .some((part, index, arr) => !isNaN(Number(part)) && names.has(arr.slice(0, index).join('.')));
 
 var isPlainObject = (tempObject) => {
     const prototypeCopy = tempObject.constructor && tempObject.constructor.prototype;
@@ -402,8 +396,7 @@ function useWatch(props) {
 function useController(props) {
     const formControl = useFormControlContext();
     const { name, disabled, control = formControl, shouldUnregister, defaultValue, exact = true, } = props;
-    const isArrayField = !!getFieldArrayParentNames(control._names.array, name)
-        .length;
+    const isArrayField = isNameInFieldArray(control._names.array, name);
     const defaultValueMemo = React.useMemo(() => get(control._formValues, name, get(control._defaultValues, name, defaultValue)), [control, name, defaultValue]);
     const value = useWatch({
         control,
@@ -1273,8 +1266,7 @@ var validateField = async (field, disabledFieldNames, formValues, validateAllFie
         isUndefined(inputValue)) ||
         (isHTMLElement(ref) && ref.value === '') ||
         inputValue === '' ||
-        (Array.isArray(inputValue) && !inputValue.length) ||
-        (valueAsNumber && typeof inputValue === 'number' && isNaN(inputValue));
+        (Array.isArray(inputValue) && !inputValue.length);
     const appendErrorsCurry = appendErrors.bind(null, name, validateAllFieldCriteria, error);
     const getMinMaxMessage = (exceedMax, maxLengthMessage, minLengthMessage, maxType = INPUT_VALIDATION_RULES.maxLength, minType = INPUT_VALIDATION_RULES.minLength) => {
         const message = exceedMax ? maxLengthMessage : minLengthMessage;
@@ -1872,7 +1864,7 @@ function createFormControl(props = {}) {
                     : defaultValue),
     }, isGlobal, defaultValue);
     const _getFieldArray = (name) => compact(get(_state.mount ? _formValues : _defaultValues, name, _options.shouldUnregister ? get(_defaultValues, name, []) : []));
-    const setFieldValue = (name, value, options = {}) => {
+    const setFieldValue = (name, value, options = {}, skipClone = false) => {
         const field = get(_fields, name);
         let fieldValue = value;
         if (field) {
@@ -1913,7 +1905,7 @@ function createFormControl(props = {}) {
                     if (!fieldReference.ref.type) {
                         _subjects.state.next({
                             name,
-                            values: cloneObject(_formValues),
+                            values: skipClone ? _formValues : cloneObject(_formValues),
                         });
                     }
                 }
@@ -1923,7 +1915,7 @@ function createFormControl(props = {}) {
             updateTouchAndDirty(name, fieldValue, options.shouldTouch, options.shouldDirty, true);
         options.shouldValidate && trigger(name);
     };
-    const setFieldValues = (name, value, options) => {
+    const setFieldValues = (name, value, options, skipClone = false) => {
         for (const fieldKey in value) {
             if (!value.hasOwnProperty(fieldKey)) {
                 return;
@@ -1935,14 +1927,14 @@ function createFormControl(props = {}) {
                 isObject(fieldValue) ||
                 (field && !field._f)) &&
                 !isDateObject(fieldValue)
-                ? setFieldValues(fieldName, fieldValue, options)
-                : setFieldValue(fieldName, fieldValue, options);
+                ? setFieldValues(fieldName, fieldValue, options, skipClone)
+                : setFieldValue(fieldName, fieldValue, options, skipClone);
         }
     };
-    const setValue = (name, value, options = {}) => {
+    const _setValue = (name, value, options, skipClone) => {
         const field = get(_fields, name);
         const isFieldArray = _names.array.has(name);
-        const cloneValue = cloneObject(value);
+        const cloneValue = skipClone ? value : cloneObject(value);
         const previousValue = get(_formValues, name);
         const isValueUnchanged = deepEqual(previousValue, cloneValue);
         if (!isValueUnchanged) {
@@ -1951,7 +1943,7 @@ function createFormControl(props = {}) {
         if (isFieldArray) {
             _subjects.array.next({
                 name,
-                values: cloneObject(_formValues),
+                values: skipClone ? _formValues : cloneObject(_formValues),
             });
             if ((_proxyFormState.isDirty ||
                 _proxyFormState.dirtyFields ||
@@ -1970,20 +1962,15 @@ function createFormControl(props = {}) {
             const isEmpty = (Array.isArray(cloneValue) && !cloneValue.length) ||
                 isEmptyObject(cloneValue);
             if (!field || field._f || isNullOrUndefined(cloneValue) || isEmpty) {
-                setFieldValue(name, cloneValue, options);
+                setFieldValue(name, cloneValue, options, skipClone);
             }
             else {
-                setFieldValues(name, cloneValue, options);
+                setFieldValues(name, cloneValue, options, skipClone);
             }
         }
         if (!isValueUnchanged) {
             const watched = isWatched(name, _names);
-            const values = cloneObject(_formValues);
-            if (!isFieldArray) {
-                for (const arrayName of getFieldArrayParentNames(_names.array, name)) {
-                    _subjects.array.next({ name: arrayName, values });
-                }
-            }
+            const values = skipClone ? _formValues : cloneObject(_formValues);
             _subjects.state.next({
                 ...(watched && _formState),
                 name: _state.mount || watched ? name : undefined,
@@ -1991,7 +1978,8 @@ function createFormControl(props = {}) {
             });
         }
     };
-    const setValues = (formValues) => {
+    const setValue = (name, value, options = {}) => _setValue(name, value, options, false);
+    const setValues = (formValues, options = {}) => {
         const updatedFormValues = isFunction(formValues)
             ? formValues(_formValues)
             : formValues;
@@ -2001,9 +1989,17 @@ function createFormControl(props = {}) {
                 ...updatedFormValues,
             };
             for (const fieldName of _names.mount) {
-                setValue(fieldName, get(updatedFormValues, fieldName));
+                _setValue(fieldName, get(updatedFormValues, fieldName), options, true);
+            }
+            _subjects.state.next({
+                ..._formState,
+                name: undefined,
+                type: undefined,
+                values: _formValues,
+            });
+            if (options.shouldValidate) {
+                _setValid();
             }
-            _subjects.state.next({ ..._formState, values: _formValues });
         }
     };
     const onChange = async (event) => {
@@ -2373,8 +2369,7 @@ function createFormControl(props = {}) {
                         field._f.mount = false;
                     }
                     (_options.shouldUnregister || options.shouldUnregister) &&
-                        !(getFieldArrayParentNames(_names.array, name).length &&
-                            _state.action) &&
+                        !(isNameInFieldArray(_names.array, name) && _state.action) &&
                         _names.unMount.add(name);
                 }
             },