@bombillazo/rhf-plus 7.62.0-plus.6 → 7.63.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)
@@ -588,6 +593,7 @@ function useController(props) {
             }
         }
         !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,
@@ -1236,10 +1256,10 @@ var getValueAndMessage = (validationData) => isObject(validationData) && !isRege
         message: '',
     };
 
-var validateField = async (field, disabledFieldNames, formValues, validateAllFieldCriteria, shouldUseNativeValidation, isFieldArray) => {
+var validateField = async (field, skippedFieldNames, formValues, validateAllFieldCriteria, shouldUseNativeValidation, isFieldArray) => {
     const { ref, refs, required, maxLength, minLength, min, max, pattern, validate, name, valueAsNumber, mount, } = field._f;
     const inputValue = get(formValues, name);
-    if (!mount || disabledFieldNames.has(name)) {
+    if (!mount || skippedFieldNames.has(name)) {
         return {};
     }
     const inputRef = refs ? refs[0] : ref;
@@ -1428,6 +1448,7 @@ const defaultOptions = {
     mode: VALIDATION_MODE.onSubmit,
     reValidateMode: VALIDATION_MODE.onChange,
     shouldFocusError: true,
+    shouldSkipReadOnlyValidation: false,
 };
 function createFormControl(props = {}) {
     let _options = {
@@ -1472,6 +1493,7 @@ function createFormControl(props = {}) {
     let _names = {
         mount: new Set(),
         disabled: new Set(),
+        readonly: new Set(),
         unMount: new Set(),
         array: new Set(),
         watch: new Set(),
@@ -1737,11 +1759,16 @@ 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);
                     }
-                    const fieldError = await validateField(field, _names.disabled, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation && !shouldOnlyCheckValid, isFieldArrayRoot);
+                    // Combine disabled and readonly field names for validation skipping
+                    const skipValidationFields = new Set([
+                        ..._names.disabled,
+                        ..._names.readonly,
+                    ]);
+                    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;
@@ -1945,6 +1972,36 @@ function createFormControl(props = {}) {
                 }
                 return;
             }
+            // Check if field is readonly and should skip validation (only when flag is enabled)
+            if (_options.shouldSkipReadOnlyValidation && target && target.readOnly) {
+                // Add to readonly fields set for validation skipping
+                _names.readonly.add(name);
+                // For readonly fields, we still want to update the form values
+                // but skip validation (similar to disabled fields behavior)
+                const fieldValue = target.type
+                    ? getFieldValue(field._f)
+                    : getEventValue(event);
+                const isBlurEvent = event.type === EVENTS.BLUR || event.type === EVENTS.FOCUS_OUT;
+                const isFocusEvent = event.type === EVENTS.FOCUS || event.type === EVENTS.FOCUS_IN;
+                const watched = isWatched(name, _names, isBlurEvent || isFocusEvent);
+                // Update form values but skip validation and error handling
+                set(_formValues, name, fieldValue);
+                // Update touch and dirty state
+                const fieldState = updateTouchAndDirty(name, fieldValue, isBlurEvent, isFocusEvent, !isBlurEvent);
+                const shouldRender = !isEmptyObject(fieldState) || watched;
+                !isBlurEvent &&
+                    _subjects.state.next({
+                        name,
+                        type: event.type,
+                        values: cloneObject(_formValues),
+                    });
+                return (shouldRender &&
+                    _subjects.state.next({ name, ...(watched ? {} : fieldState) }));
+            }
+            else if (_options.shouldSkipReadOnlyValidation) {
+                // Remove from readonly fields set if not readonly anymore (only when flag is enabled)
+                _names.readonly.delete(name);
+            }
             let error;
             let isValid;
             const fieldValue = target.type
@@ -2004,7 +2061,12 @@ function createFormControl(props = {}) {
             }
             else {
                 _updateIsValidating([name], true);
-                error = (await validateField(field, _names.disabled, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation))[name];
+                // Combine disabled and readonly field names for validation skipping
+                const skipValidationFields = new Set([
+                    ..._names.disabled,
+                    ..._names.readonly,
+                ]);
+                error = (await validateField(field, skipValidationFields, _formValues, shouldDisplayAllAssociatedErrors, _options.shouldUseNativeValidation, false))[name];
                 _updateIsValidating([name]);
                 _updateIsFieldValueUpdated(fieldValue);
                 if (isFieldValueUpdated) {
@@ -2019,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);
             }
@@ -2066,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)
@@ -2255,6 +2321,13 @@ function createFormControl(props = {}) {
                         },
                     });
                     updateValidAndValue(name, false, undefined, fieldRef);
+                    // Check if field is readonly and should skip validation (only when flag is enabled)
+                    if (_options.shouldSkipReadOnlyValidation &&
+                        fieldRef &&
+                        'readOnly' in fieldRef &&
+                        fieldRef.readOnly) {
+                        _names.readonly.add(name);
+                    }
                 }
                 else {
                     field = get(_fields, name, {});
@@ -2455,6 +2528,7 @@ function createFormControl(props = {}) {
             unMount: new Set(),
             array: new Set(),
             disabled: new Set(),
+            readonly: new Set(),
             watch: new Set(),
             watchAll: false,
             focus: '',
@@ -2554,6 +2628,28 @@ function createFormControl(props = {}) {
             });
         }
     };
+    const _updateReadonlyFieldTracking = () => {
+        // Re-evaluate all registered fields and update readonly tracking
+        // based on current shouldSkipReadOnlyValidation flag and field readonly state
+        Object.keys(_fields).forEach((fieldName) => {
+            const field = get(_fields, fieldName);
+            if (field && field._f) {
+                // Get the actual DOM element reference
+                const fieldRef = field._f.refs ? field._f.refs[0] : field._f.ref;
+                if (fieldRef && 'readOnly' in fieldRef) {
+                    const isFieldReadonly = Boolean(fieldRef.readOnly);
+                    const shouldTrackAsReadonly = _options.shouldSkipReadOnlyValidation && isFieldReadonly;
+                    // Update readonly tracking set
+                    if (shouldTrackAsReadonly) {
+                        _names.readonly.add(fieldName);
+                    }
+                    else {
+                        _names.readonly.delete(fieldName);
+                    }
+                }
+            }
+        });
+    };
     const setMetadata = (metadata) => {
         let _metadata;
         if (!metadata) {
@@ -2598,6 +2694,7 @@ function createFormControl(props = {}) {
             _removeUnmounted,
             _disableForm,
             _updateIsLoading,
+            _updateReadonlyFieldTracking,
             _subjects,
             _proxyFormState,
             get _fields() {
@@ -3060,6 +3157,11 @@ function useForm(props = {}) {
         return sub;
     }, [control]);
     React.useEffect(() => control._disableForm(props.disabled), [control, props.disabled]);
+    // Handle shouldSkipReadOnlyValidation flag changes
+    React.useEffect(() => {
+        // Re-evaluate readonly field tracking when the flag changes
+        control._updateReadonlyFieldTracking();
+    }, [control, props.shouldSkipReadOnlyValidation]);
     React.useEffect(() => {
         control._updateIsLoading(props.isLoading);
     }, [control, props.isLoading]);