diff --git a/src/Fields/DatePickerField.tsx b/src/Fields/DatePickerField.tsx
index a9db048e..34249f33 100644
--- a/src/Fields/DatePickerField.tsx
+++ b/src/Fields/DatePickerField.tsx
@@ -35,7 +35,7 @@ export function DatePickerField<
return (
-
+
);
}
diff --git a/src/Fields/DateRangePickerField.tsx b/src/Fields/DateRangePickerField.tsx
index f5acab44..69b181b9 100644
--- a/src/Fields/DateRangePickerField.tsx
+++ b/src/Fields/DateRangePickerField.tsx
@@ -8,6 +8,7 @@ import {
UseControllerProps,
} from 'react-hook-form';
+import { useFieldContext } from './FieldProvider';
import { FieldWrapper, FieldWrapperProps } from './FieldWrapper';
import { PICKER_LOCALE } from './pickerLocale';
@@ -30,12 +31,15 @@ export function DateRangePickerField<
...controller
}: DateRangePickerFieldProps) {
const { field } = useController(controller);
+ const { disabled } = useFieldContext();
+
return (