Merge branch 'master' into trigger-validation-netsted-field

react-hook-form · Jun 10, 2024 · e60f895 · e60f895
2 parents 2afdac6 + 1d0503b
commit e60f895
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/reports/api-extractor.md b/reports/api-extractor.md
@@ -486,7 +486,7 @@ export type RegisterOptions<TFieldValues extends FieldValues = FieldValues, TFie
     onChange?: (event: any) => void;
     onBlur?: (event: any) => void;
     disabled: boolean;
-    deps: InternalFieldName | InternalFieldName[];
+    deps: FieldPath<TFieldValues> | FieldPath<TFieldValues>[];
 }> & ({
     pattern?: ValidationRule<RegExp>;
     valueAsNumber?: false;

diff --git a/src/logic/createFormControl.ts b/src/logic/createFormControl.ts
@@ -311,7 +311,9 @@ export function createFormControl<
       name,
     };
     const disabledField = !!(
-      get(_fields, name) && get(_fields, name)._f.disabled
+      get(_fields, name) &&
+      get(_fields, name)._f &&
+      get(_fields, name)._f.disabled
     );
 
     if (!isBlurEvent || shouldDirty) {
@@ -890,9 +892,9 @@ export function createFormControl<
   ) => ({
     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: UseFormClearErrors<TFieldValues> = (name) => {

diff --git a/src/types/validator.ts b/src/types/validator.ts
@@ -1,7 +1,7 @@
 import { INPUT_VALIDATION_RULES } from '../constants';
 
 import { Message } from './errors';
-import { FieldValues, InternalFieldName } from './fields';
+import { FieldValues } from './fields';
 import { FieldPath, FieldPathValue } from './path';
 
 export type ValidationValue = boolean | number | string | RegExp;
@@ -45,7 +45,7 @@ export type RegisterOptions<
   onChange?: (event: any) => void;
   onBlur?: (event: any) => void;
   disabled: boolean;
-  deps: InternalFieldName | InternalFieldName[];
+  deps: FieldPath<TFieldValues> | FieldPath<TFieldValues>[];
 }> &
   (
     | {