@bombillazo/rhf-plus 7.62.0-plus.7 → 7.64.0-plus.0

package/dist/index.esm.mjs

@@ -448,6 +448,7 @@ function useController(props) {
     });
     const _props = React.useRef(props);
     const _previousRules = React.useRef(props.rules);
+    const _previousNameRef = React.useRef(undefined);
     const _registerProps = React.useRef(control.register(name, {
         ...props.rules,
         value,
@@ -567,6 +568,10 @@ function useController(props) {
     ]);
     React.useEffect(() => {
         const _shouldUnregisterField = control._options.shouldUnregister || shouldUnregister;
+        const previousName = _previousNameRef.current;
+        if (previousName && previousName !== name && !isArrayField) {
+            control.unregister(previousName);
+        }
         control.register(name, {
             ..._props.current.rules,
             ...(isBoolean(_props.current.disabled)
@@ -581,13 +586,14 @@ function useController(props) {
         };
         updateMounted(name, true);
         if (_shouldUnregisterField) {
-            const value = cloneObject(get(control._options.defaultValues, name));
+            const value = cloneObject(get(control._options.defaultValues, name, _props.current.defaultValue));
             set(control._defaultValues, name, value);
             if (isUndefined(get(control._formValues, name))) {
                 set(control._formValues, name, value);
             }
         }
         !isArrayField && control.register(name);
+        _previousNameRef.current = name;
         return () => {
             (isArrayField
                 ? _shouldUnregisterField && !control._state.action
@@ -843,6 +849,26 @@ function deepMerge(target, source) {
     return target;
 }
 
+function extractFormValues(fieldsState, formValues) {
+    const values = {};
+    for (const key in fieldsState) {
+        if (fieldsState.hasOwnProperty(key)) {
+            const fieldState = fieldsState[key];
+            const fieldValue = formValues[key];
+            if (fieldState && isObject(fieldState) && fieldValue) {
+                const nestedFieldsState = extractFormValues(fieldState, fieldValue);
+                if (isObject(nestedFieldsState)) {
+                    values[key] = nestedFieldsState;
+                }
+            }
+            else if (fieldsState[key]) {
+                values[key] = fieldValue;
+            }
+        }
+    }
+    return values;
+}
+
 var isEmptyObject = (value) => isObject(value) && !Object.keys(value).length;
 
 var isFileInput = (element) => element.type === 'file';
@@ -924,46 +950,40 @@ var objectHasFunction = (data) => {
     return false;
 };
 
+function isTraversable(value) {
+    return Array.isArray(value) || (isObject(value) && !objectHasFunction(value));
+}
 function markFieldsDirty(data, fields = {}) {
-    const isParentNodeArray = Array.isArray(data);
-    if (isObject(data) || isParentNodeArray) {
-        for (const key in data) {
-            if (Array.isArray(data[key]) ||
-                (isObject(data[key]) && !objectHasFunction(data[key]))) {
-                fields[key] = Array.isArray(data[key]) ? [] : {};
-                markFieldsDirty(data[key], fields[key]);
-            }
-            else if (!isNullOrUndefined(data[key])) {
-                fields[key] = true;
-            }
+    for (const key in data) {
+        if (isTraversable(data[key])) {
+            fields[key] = Array.isArray(data[key]) ? [] : {};
+            markFieldsDirty(data[key], fields[key]);
+        }
+        else if (!isNullOrUndefined(data[key])) {
+            fields[key] = true;
         }
     }
     return fields;
 }
-function getDirtyFieldsFromDefaultValues(data, formValues, dirtyFieldsFromValues) {
-    const isParentNodeArray = Array.isArray(data);
-    if (isObject(data) || isParentNodeArray) {
-        for (const key in data) {
-            if (Array.isArray(data[key]) ||
-                (isObject(data[key]) && !objectHasFunction(data[key]))) {
-                if (isUndefined(formValues) ||
-                    isPrimitive(dirtyFieldsFromValues[key])) {
-                    dirtyFieldsFromValues[key] = Array.isArray(data[key])
-                        ? markFieldsDirty(data[key], [])
-                        : { ...markFieldsDirty(data[key]) };
-                }
-                else {
-                    getDirtyFieldsFromDefaultValues(data[key], isNullOrUndefined(formValues) ? {} : formValues[key], dirtyFieldsFromValues[key]);
-                }
+function getDirtyFields(data, formValues, dirtyFieldsFromValues) {
+    if (!dirtyFieldsFromValues) {
+        dirtyFieldsFromValues = markFieldsDirty(formValues);
+    }
+    for (const key in data) {
+        if (isTraversable(data[key])) {
+            if (isUndefined(formValues) || isPrimitive(dirtyFieldsFromValues[key])) {
+                dirtyFieldsFromValues[key] = markFieldsDirty(data[key], Array.isArray(data[key]) ? [] : {});
             }
             else {
-                dirtyFieldsFromValues[key] = !deepEqual(data[key], formValues[key]);
+                getDirtyFields(data[key], isNullOrUndefined(formValues) ? {} : formValues[key], dirtyFieldsFromValues[key]);
             }
         }
+        else {
+            dirtyFieldsFromValues[key] = !deepEqual(data[key], formValues[key]);
+        }
     }
     return dirtyFieldsFromValues;
 }
-var getDirtyFields = (defaultValues, formValues) => getDirtyFieldsFromDefaultValues(defaultValues, formValues, markFieldsDirty(formValues));
 
 const defaultResult = {
     value: false,
@@ -1739,7 +1759,7 @@ function createFormControl(props = {}) {
                     const isFieldArrayRoot = _names.array.has(_f.name);
                     const isPromiseFunction = field._f && hasPromiseValidation(field._f);
                     if (isPromiseFunction && _proxyFormState.validatingFields) {
-                        _updateIsValidating([name], true);
+                        _updateIsValidating([_f.name], true);
                     }
                     // Combine disabled and readonly field names for validation skipping
                     const skipValidationFields = new Set([
@@ -1748,7 +1768,7 @@ function createFormControl(props = {}) {
                     ]);
                     const fieldError = await validateField(field, skipValidationFields, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation && !shouldOnlyCheckValid, isFieldArrayRoot);
                     if (isPromiseFunction && _proxyFormState.validatingFields) {
-                        _updateIsValidating([name]);
+                        _updateIsValidating([_f.name]);
                     }
                     if (fieldError[_f.name]) {
                         context.valid = false;
@@ -2061,6 +2081,7 @@ function createFormControl(props = {}) {
             }
             if (isFieldValueUpdated) {
                 field._f.deps &&
+                    (!Array.isArray(field._f.deps) || field._f.deps.length > 0) &&
                     trigger(field._f.deps);
                 shouldRenderByError(name, isValid, error, fieldState);
             }
@@ -2108,10 +2129,13 @@ function createFormControl(props = {}) {
             iterateFieldsByAction(_fields, _focusInput, name ? fieldNames : _names.mount);
         return validationResult;
     };
-    const getValues = (fieldNames) => {
-        const values = {
+    const getValues = (fieldNames, config) => {
+        let values = {
             ...(_state.mount ? _formValues : _defaultValues),
         };
+        if (config) {
+            values = extractFormValues(config.dirtyFields ? _formState.dirtyFields : _formState.touchedFields, values);
+        }
         return isUndefined(fieldNames)
             ? values
             : isString(fieldNames)
@@ -2843,9 +2867,7 @@ function useFieldArray(props) {
     const { control = methods.control, name, keyName = 'id', shouldUnregister, rules, } = props;
     const [fields, setFields] = React.useState(control._getFieldArray(name));
     const ids = React.useRef(control._getFieldArray(name).map(generateId));
-    const _fieldIds = React.useRef(fields);
     const _actioned = React.useRef(false);
-    _fieldIds.current = fields;
     control._names.array.add(name);
     React.useMemo(() => rules &&
         control.register(name, rules), [control, rules, name]);