@bombillazo/rhf-plus 7.72.0-plus.0 → 7.72.1-plus.1

package/dist/index.esm.mjs

@@ -19,9 +19,9 @@ var getEventValue = (event) => isObject(event) && event.target
         : event.target.value
     : event;
 
-var getNodeParentName = (name) => name.substring(0, name.search(/\.\d+(\.|$)/)) || name;
-
-var isNameInFieldArray = (names, name) => names.has(getNodeParentName(name));
+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;
@@ -285,8 +285,8 @@ function deepEqual(object1, object2, _internal_visited = new WeakSet()) {
         if (key !== 'ref') {
             const val2 = object2[key];
             if ((isDateObject(val1) && isDateObject(val2)) ||
-                (isObject(val1) && isObject(val2)) ||
-                (Array.isArray(val1) && Array.isArray(val2))
+                ((isObject(val1) || Array.isArray(val1)) &&
+                    (isObject(val2) || Array.isArray(val2)))
                 ? !deepEqual(val1, val2, _internal_visited)
                 : !Object.is(val1, val2)) {
                 return false;
@@ -740,46 +740,47 @@ const useFormContext = () => React.useContext(HookFormContext);
  */
 const FormProvider = (props) => {
     const { children, watch, getValues, getFieldState, setError, clearErrors, setValue, trigger, formState, resetField, reset, handleSubmit, unregister, control, register, setFocus, subscribe, id, submit, } = props;
-    return (React.createElement(HookFormContext.Provider, { value: React.useMemo(() => ({
-            watch,
-            getValues,
-            getFieldState,
-            setError,
-            clearErrors,
-            setValue,
-            trigger,
-            formState,
-            resetField,
-            reset,
-            handleSubmit,
-            unregister,
-            control,
-            register,
-            setFocus,
-            subscribe,
-            id,
-            submit,
-        }), [
-            clearErrors,
-            control,
-            formState,
-            getFieldState,
-            getValues,
-            handleSubmit,
-            id,
-            register,
-            reset,
-            resetField,
-            setError,
-            setFocus,
-            setValue,
-            submit,
-            subscribe,
-            trigger,
-            unregister,
-            watch,
-        ]) },
-        React.createElement(HookFormControlContext.Provider, { value: control }, children)));
+    const memoizedValue = React.useMemo(() => ({
+        watch,
+        getValues,
+        getFieldState,
+        setError,
+        clearErrors,
+        setValue,
+        trigger,
+        formState,
+        resetField,
+        reset,
+        handleSubmit,
+        unregister,
+        control,
+        register,
+        setFocus,
+        subscribe,
+        id,
+        submit,
+    }), [
+        clearErrors,
+        control,
+        formState,
+        getFieldState,
+        getValues,
+        handleSubmit,
+        id,
+        register,
+        reset,
+        resetField,
+        setError,
+        setFocus,
+        setValue,
+        submit,
+        subscribe,
+        trigger,
+        unregister,
+        watch,
+    ]);
+    return (React.createElement(HookFormContext.Provider, { value: memoizedValue },
+        React.createElement(HookFormControlContext.Provider, { value: memoizedValue.control }, children)));
 };
 
 const POST_REQUEST = 'post';
@@ -1160,6 +1161,8 @@ function getFieldValue(_f) {
     return getFieldValueAs(isUndefined(ref.value) ? _f.ref.value : ref.value, _f);
 }
 
+var getNodeParentName = (name) => name.substring(0, name.search(/\.\d+(\.|$)/)) || name;
+
 var getResolverOptions = (fieldsNames, _fields, criteriaMode, shouldUseNativeValidation) => {
     const fields = {};
     for (const name of fieldsNames) {
@@ -1599,6 +1602,7 @@ function createFormControl(props = {}) {
         unMount: new Set(),
         array: new Set(),
         watch: new Set(),
+        registerName: new Set(),
     };
     let delayErrorCallback;
     let timer = 0;
@@ -1678,6 +1682,11 @@ function createFormControl(props = {}) {
             });
         }
     };
+    const _updateDirtyFields = (name) => {
+        const fullDirtyFields = getDirtyFields(_defaultValues, _formValues);
+        const rootName = getNodeParentName(name);
+        set(_formState.dirtyFields, rootName, get(fullDirtyFields, rootName));
+    };
     const _setFieldArray = (name, values = [], method, args, shouldSetValues = true, shouldUpdateFieldsAndState = true) => {
         if (args && method && !_options.disabled) {
             _state.action = true;
@@ -1699,9 +1708,7 @@ function createFormControl(props = {}) {
                 shouldSetValues && set(_formState.touchedFields, name, touchedFields);
             }
             if (_proxyFormState.dirtyFields || _proxySubscribeFormState.dirtyFields) {
-                const fullDirtyFields = getDirtyFields(_defaultValues, _formValues);
-                const rootName = getNodeParentName(name);
-                set(_formState.dirtyFields, rootName, get(fullDirtyFields, rootName));
+                _updateDirtyFields(name);
             }
             _subjects.state.next({
                 name,
@@ -2077,9 +2084,10 @@ function createFormControl(props = {}) {
                 _proxyFormState.isDirtySinceSubmit ||
                 _proxySubscribeFormState.isDirtySinceSubmit) &&
                 options.shouldDirty) {
+                _updateDirtyFields(name);
                 _subjects.state.next({
                     name,
-                    dirtyFields: getDirtyFields(_defaultValues, _formValues),
+                    dirtyFields: _formState.dirtyFields,
                     isDirty: _getDirty(name, cloneValue),
                     ...((_formState.isSubmitted || _hasBeenSubmitted) &&
                         !_formState.isDirtySinceSubmit
@@ -2473,6 +2481,7 @@ function createFormControl(props = {}) {
         const disabledIsDefined = isBoolean(options.disabled) ||
             isBoolean(_options.disabled) ||
             Array.isArray(_options.disabled);
+        const shouldRevalidateRemount = !_names.registerName.has(name) && field && !field._f.mount;
         set(_fields, name, {
             ...(field || {}),
             _f: {
@@ -2483,7 +2492,7 @@ function createFormControl(props = {}) {
             },
         });
         _names.mount.add(name);
-        if (field) {
+        if (field && !shouldRevalidateRemount) {
             _setDisabledField({
                 disabled: isBoolean(options.disabled)
                     ? options.disabled
@@ -2522,7 +2531,9 @@ function createFormControl(props = {}) {
             onFocus: onChange,
             ref: (ref) => {
                 if (ref) {
+                    _names.registerName.add(name);
                     register(name, options);
+                    _names.registerName.delete(name);
                     field = get(_fields, name);
                     const fieldRef = isUndefined(ref.value)
                         ? ref.querySelectorAll
@@ -2768,6 +2779,7 @@ function createFormControl(props = {}) {
             mount: keepStateOptions.keepDirtyValues ? _names.mount : new Set(),
             unMount: new Set(),
             array: new Set(),
+            registerName: new Set(),
             disabled: new Set(),
             readonly: new Set(),
             watch: new Set(),