@bombillazo/rhf-plus 7.62.0-plus.1 → 7.62.0-plus.3

package/dist/index.esm.mjs

@@ -81,6 +81,21 @@ var get = (object, path, defaultValue) => {
 
 var isBoolean = (value) => typeof value === 'boolean';
 
+function mergeMissingKeysAsUndefined(oldObject, newObject) {
+    if (!newObject) {
+        return newObject;
+    }
+    const result = { ...newObject };
+    if (oldObject) {
+        for (const key in oldObject) {
+            if (!(key in result)) {
+                result[key] = undefined;
+            }
+        }
+    }
+    return result;
+}
+
 var set = (object, path, value) => {
     let index = -1;
     const tempPath = isKey(path) ? [path] : stringToPath(path);
@@ -427,11 +442,22 @@ function useController(props) {
         exact: true,
     });
     const _props = React.useRef(props);
+    const _previousRules = React.useRef(props.rules);
     const _registerProps = React.useRef(control.register(name, {
         ...props.rules,
         value,
         ...(isBoolean(props.disabled) ? { disabled: props.disabled } : {}),
     }));
+    const mergedRules = React.useMemo(() => mergeMissingKeysAsUndefined(_previousRules.current, props.rules), [props.rules]);
+    // Update register props when rules change
+    React.useEffect(() => {
+        _registerProps.current = control.register(name, {
+            ...mergedRules,
+            value,
+            ...(isBoolean(props.disabled) ? { disabled: props.disabled } : {}),
+        });
+        _previousRules.current = props.rules;
+    }, [mergedRules, props.rules, value, props.disabled, control, name]);
     _props.current = props;
     const fieldState = React.useMemo(() => Object.defineProperties({}, {
         invalid: {
@@ -469,17 +495,26 @@ function useController(props) {
         },
         type: EVENTS.BLUR,
     }), [name, control._formValues]);
+    const elementRef = React.useRef(null);
     const ref = React.useCallback((elm) => {
+        elementRef.current = elm;
         const field = get(control._fields, name);
         if (field && elm) {
             field._f.ref = {
-                focus: () => elm.focus && elm.focus(),
-                select: () => elm.select && elm.select(),
+                focus: () => { var _a; return (_a = elm.focus) === null || _a === void 0 ? void 0 : _a.call(elm); },
+                select: () => { var _a; return (_a = elm.select) === null || _a === void 0 ? void 0 : _a.call(elm); },
                 setCustomValidity: (message) => elm.setCustomValidity(message),
                 reportValidity: () => elm.reportValidity(),
             };
         }
     }, [control._fields, name]);
+    // Add scrollIntoView method to the ref callback function
+    ref.scrollIntoView = React.useCallback((options) => {
+        if (elementRef.current &&
+            typeof elementRef.current.scrollIntoView === 'function') {
+            elementRef.current.scrollIntoView(options);
+        }
+    }, []);
     const field = React.useMemo(() => {
         // Calculate if this specific field should be disabled
         let isFieldDisabled;
@@ -1136,7 +1171,17 @@ var updateFieldArrayRootError = (errors, error, name) => {
     return errors;
 };
 
-var isMessage = (value) => isString(value);
+var isMessage = (value) => {
+    // Support strings (existing functionality)
+    if (isString(value)) {
+        return true;
+    }
+    // Support React elements only (not primitives like null, undefined, numbers)
+    if (React.isValidElement(value)) {
+        return true;
+    }
+    return false;
+};
 
 function getValidateError(result, ref, type = 'validate') {
     if (isMessage(result) ||
@@ -1166,7 +1211,16 @@ var validateField = async (field, disabledFieldNames, formValues, validateAllFie
     const inputRef = refs ? refs[0] : ref;
     const setCustomValidity = (message) => {
         if (shouldUseNativeValidation && inputRef.reportValidity) {
-            inputRef.setCustomValidity(isBoolean(message) ? '' : message || '');
+            if (isBoolean(message)) {
+                inputRef.setCustomValidity('');
+            }
+            else if (typeof message === 'string') {
+                inputRef.setCustomValidity(message || '');
+            }
+            else {
+                // For ReactNode messages, convert to string or use empty string for native validation
+                inputRef.setCustomValidity('');
+            }
             inputRef.reportValidity();
         }
     };