react-hook-form 7.51.5 → 7.52.0

package/dist/index.esm.mjs

@@ -417,7 +417,7 @@ function useController(props) {
         const _shouldUnregisterField = control._options.shouldUnregister || shouldUnregister;
         const updateMounted = (name, value) => {
             const field = get(control._fields, name);
-            if (field) {
+            if (field && field._f) {
                 field._f.mount = value;
             }
         };
@@ -1679,7 +1679,9 @@ function createFormControl(props = {}) {
         const output = {
             name,
         };
-        const disabledField = !!(get(_fields, name) && get(_fields, name)._f.disabled);
+        const disabledField = !!(get(_fields, name) &&
+            get(_fields, name)._f &&
+            get(_fields, name)._f.disabled);
         if (!isBlurEvent || shouldDirty) {
             if (_proxyFormState.isDirty) {
                 isPreviousDirty = _formState.isDirty;
@@ -2039,9 +2041,9 @@ function createFormControl(props = {}) {
     const getFieldState = (name, formState) => ({
         invalid: !!get((formState || _formState).errors, name),
         isDirty: !!get((formState || _formState).dirtyFields, name),
-        isTouched: !!get((formState || _formState).touchedFields, name),
-        isValidating: !!get((formState || _formState).validatingFields, name),
         error: get((formState || _formState).errors, name),
+        isValidating: !!get(_formState.validatingFields, name),
+        isTouched: !!get((formState || _formState).touchedFields, name),
     });
     const clearErrors = (name) => {
         name &&
@@ -2366,7 +2368,9 @@ function createFormControl(props = {}) {
                         : _formState.dirtyFields
                     : keepStateOptions.keepDefaultValues && formValues
                         ? getDirtyFields(_defaultValues, formValues)
-                        : {},
+                        : keepStateOptions.keepDirty
+                            ? _formState.dirtyFields
+                            : {},
             touchedFields: keepStateOptions.keepTouched
                 ? _formState.touchedFields
                 : {},