@bombillazo/rhf-plus 7.62.0-plus.2 → 7.62.0-plus.4

package/dist/logic/createFormControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createFormControl.d.ts","sourceRoot":"","sources":["../../src/logic/createFormControl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAaV,WAAW,EACX,YAAY,EAgBZ,YAAY,EAIZ,aAAa,EAUd,MAAM,UAAU,CAAC;AAuDlB,wBAAgB,iBAAiB,CAC/B,YAAY,SAAS,WAAW,GAAG,WAAW,EAC9C,QAAQ,GAAG,GAAG,EACd,kBAAkB,GAAG,YAAY,EACjC,SAAS,SAAS,YAAY,GAAG,GAAG,EAEpC,KAAK,GAAE,YAAY,CACjB,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,SAAS,CACL,GACL,IAAI,CACL,aAAa,CAAC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAE,SAAS,CAAC,EACpE,WAAW,CACZ,GAAG;IACF,WAAW,EAAE,IAAI,CACf,aAAa,CAAC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAE,SAAS,CAAC,EACpE,WAAW,CACZ,CAAC;CACH,CAoiDA"}
+{"version":3,"file":"createFormControl.d.ts","sourceRoot":"","sources":["../../src/logic/createFormControl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAaV,WAAW,EACX,YAAY,EAgBZ,YAAY,EAIZ,aAAa,EAUd,MAAM,UAAU,CAAC;AAuDlB,wBAAgB,iBAAiB,CAC/B,YAAY,SAAS,WAAW,GAAG,WAAW,EAC9C,QAAQ,GAAG,GAAG,EACd,kBAAkB,GAAG,YAAY,EACjC,SAAS,SAAS,YAAY,GAAG,GAAG,EAEpC,KAAK,GAAE,YAAY,CACjB,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,SAAS,CACL,GACL,IAAI,CACL,aAAa,CAAC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAE,SAAS,CAAC,EACpE,WAAW,CACZ,GAAG;IACF,WAAW,EAAE,IAAI,CACf,aAAa,CAAC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAE,SAAS,CAAC,EACpE,WAAW,CACZ,CAAC;CACH,CA2kDA"}

package/dist/logic/skipValidation.d.ts

@@ -2,6 +2,10 @@ import type { ValidationModeFlags } from '../types';
 declare const _default: (isBlurEvent: boolean, isTouched: boolean, isSubmitted: boolean, reValidateMode: {
     isOnBlur: boolean;
     isOnChange: boolean;
-}, mode: Partial<ValidationModeFlags>) => boolean;
+}, mode: Partial<ValidationModeFlags>, 
+/**
+ * Need to keep this order of parameters for backward compatibility
+ */
+isFocusEvent: boolean) => boolean;
 export default _default;
 //# sourceMappingURL=skipValidation.d.ts.map

package/dist/logic/skipValidation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skipValidation.d.ts","sourceRoot":"","sources":["../../src/logic/skipValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;yBAGlD,aAAa,OAAO,EACpB,WAAW,OAAO,EAClB,aAAa,OAAO,EACpB,gBAAgB;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB,EACD,MAAM,OAAO,CAAC,mBAAmB,CAAC;AARpC,wBAoBE"}
+{"version":3,"file":"skipValidation.d.ts","sourceRoot":"","sources":["../../src/logic/skipValidation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;yBAGlD,aAAa,OAAO,EACpB,WAAW,OAAO,EAClB,aAAa,OAAO,EACpB,gBAAgB;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB,EACD,MAAM,OAAO,CAAC,mBAAmB,CAAC;AAClC;;GAEG;AACH,cAAc,OAAO;AAZvB,wBA6BE"}

package/dist/react-server.esm.mjs

@@ -13,7 +13,9 @@ var appendErrors = (name, validateAllFieldCriteria, errors, type, message) => va
 
 const EVENTS = {
     BLUR: 'blur',
-    FOCUS_OUT: 'focusout'};
+    FOCUS_OUT: 'focusout',
+    FOCUS: 'focus',
+    FOCUS_IN: 'focusin'};
 const VALIDATION_MODE = {
     onBlur: 'onBlur',
     onChange: 'onChange',
@@ -577,7 +579,15 @@ var shouldSubscribeByName = (name, signalName, exact) => !name ||
             : currentName.startsWith(signalName) ||
                 signalName.startsWith(currentName)));
 
-var skipValidation = (isBlurEvent, isTouched, isSubmitted, reValidateMode, mode) => {
+var skipValidation = (isBlurEvent, isTouched, isSubmitted, reValidateMode, mode, 
+/**
+ * Need to keep this order of parameters for backward compatibility
+ */
+isFocusEvent) => {
+    // Focus events should always skip validation
+    if (isFocusEvent) {
+        return true;
+    }
     if (mode.isOnAll) {
         return false;
     }
@@ -844,6 +854,7 @@ function createFormControl(props = {}) {
         isValid: false,
         touchedFields: {},
         dirtyFields: {},
+        focusedField: undefined,
         validatingFields: {},
         errors: _options.errors || {},
         disabled: Array.isArray(_options.disabled)
@@ -877,6 +888,7 @@ function createFormControl(props = {}) {
         dirtyFields: false,
         validatingFields: false,
         touchedFields: false,
+        focusedField: false,
         isValidating: false,
         isValid: false,
         errors: false,
@@ -988,7 +1000,7 @@ function createFormControl(props = {}) {
             _state.mount && _setValid();
         }
     };
-    const updateTouchAndDirty = (name, fieldValue, isBlurEvent, shouldDirty, shouldRender) => {
+    const updateTouchAndDirty = (name, fieldValue, isBlurEvent, isFocusEvent, shouldDirty, shouldRender) => {
         let shouldUpdateField = false;
         let isPreviousDirty = false;
         const output = {
@@ -1025,6 +1037,25 @@ function createFormControl(props = {}) {
                                 isPreviousFieldTouched !== isBlurEvent);
                 }
             }
+            // Handle focus state
+            if (isFocusEvent || isBlurEvent) {
+                const wasPreviouslyFocused = _formState.focusedField === name;
+                const shouldBeFocused = isFocusEvent && !isBlurEvent;
+                if (wasPreviouslyFocused !== shouldBeFocused) {
+                    if (shouldBeFocused) {
+                        _formState.focusedField = name;
+                    }
+                    else {
+                        _formState.focusedField = undefined;
+                    }
+                    output.focusedField = _formState.focusedField;
+                    shouldUpdateField =
+                        shouldUpdateField ||
+                            ((_proxyFormState.focusedField ||
+                                _proxySubscribeFormState.focusedField) &&
+                                wasPreviouslyFocused !== shouldBeFocused);
+                }
+            }
             shouldUpdateField && shouldRender && _subjects.state.next(output);
         }
         return shouldUpdateField ? output : {};
@@ -1190,7 +1221,8 @@ function createFormControl(props = {}) {
             }
         }
         (options.shouldDirty || options.shouldTouch) &&
-            updateTouchAndDirty(name, fieldValue, options.shouldTouch, options.shouldDirty, true);
+            updateTouchAndDirty(name, fieldValue, options.shouldTouch, false, // isFocusEvent - not applicable for setValue
+            options.shouldDirty, true);
         options.shouldValidate && trigger(name);
     };
     const setValues = (name, value, options) => {
@@ -1279,12 +1311,13 @@ function createFormControl(props = {}) {
                 ? 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 shouldSkipValidation = (!hasValidation(field._f) &&
                 !_options.resolver &&
                 !get(_formState.errors, name) &&
                 !field._f.deps) ||
-                skipValidation(isBlurEvent, get(_formState.touchedFields, name), _formState.isSubmitted, validationModeAfterSubmit, validationModeBeforeSubmit);
-            const watched = isWatched(name, _names, isBlurEvent);
+                skipValidation(isBlurEvent, get(_formState.touchedFields, name), _formState.isSubmitted, validationModeAfterSubmit, validationModeBeforeSubmit, isFocusEvent);
+            const watched = isWatched(name, _names, isBlurEvent || isFocusEvent);
             set(_formValues, name, fieldValue);
             if (isBlurEvent) {
                 if (!target || !target.readOnly) {
@@ -1295,7 +1328,7 @@ function createFormControl(props = {}) {
             else if (field._f.onChange) {
                 field._f.onChange(event);
             }
-            const fieldState = updateTouchAndDirty(name, fieldValue, isBlurEvent);
+            const fieldState = updateTouchAndDirty(name, fieldValue, isBlurEvent, isFocusEvent);
             const shouldRender = !isEmptyObject(fieldState) || watched;
             !isBlurEvent &&
                 _subjects.state.next({
@@ -1409,6 +1442,7 @@ function createFormControl(props = {}) {
         error: get((formState || _formState).errors, name),
         isValidating: !!get(_formState.validatingFields, name),
         isTouched: !!get((formState || _formState).touchedFields, name),
+        isFocused: (formState || _formState).focusedField === name,
     });
     const clearErrors = (name) => {
         name &&
@@ -1548,6 +1582,7 @@ function createFormControl(props = {}) {
             name,
             onChange,
             onBlur: onChange,
+            onFocus: onChange,
             ref: (ref) => {
                 if (ref) {
                     register(name, options);
@@ -1813,6 +1848,7 @@ function createFormControl(props = {}) {
             touchedFields: keepStateOptions.keepTouched
                 ? _formState.touchedFields
                 : {},
+            focusedField: undefined, // Always reset focused field on form reset
             errors: keepStateOptions.keepErrors ? _formState.errors : {},
             isSubmitSuccessful: keepStateOptions.keepIsSubmitSuccessful
                 ? _formState.isSubmitSuccessful