From 9cdaaef5d048e5106ec155f3be1af68df5ad8782 Mon Sep 17 00:00:00 2001
From: Ilja Kiel <ilja.kiel@mll.com>
Date: Mon, 16 Mar 2026 14:40:39 +0100
Subject: [PATCH] fix: use disabled context after field props

---
 src/Fields/DatePickerField.tsx      | 2 +-
 src/Fields/DateRangePickerField.tsx | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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 (
     <FieldWrapper controller={controller} formItem={formItem}>
-      <DatePicker disabled={disabled} {...fieldProps} {...component} />
+      <DatePicker {...fieldProps} disabled={disabled} {...component} />
     </FieldWrapper>
   );
 }
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<TFieldValues, TName>) {
   const { field } = useController<TFieldValues, TName>(controller);
+  const { disabled } = useFieldContext();
+
   return (
     <FieldWrapper controller={controller} formItem={formItem}>
       <RangePicker
         format={['DD.MM.YYYY', 'DDMMYYYY']}
         locale={PICKER_LOCALE}
         {...field}
+        disabled={disabled}
         {...component}
       />
     </FieldWrapper>