Skip to content

Commit 9cdaaef

Browse files
committed
fix: use disabled context after field props
1 parent 985cbf5 commit 9cdaaef

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

src/Fields/DatePickerField.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function DatePickerField<
3535

3636
return (
3737
<FieldWrapper controller={controller} formItem={formItem}>
38-
<DatePicker disabled={disabled} {...fieldProps} {...component} />
38+
<DatePicker {...fieldProps} disabled={disabled} {...component} />
3939
</FieldWrapper>
4040
);
4141
}

src/Fields/DateRangePickerField.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
UseControllerProps,
99
} from 'react-hook-form';
1010

11+
import { useFieldContext } from './FieldProvider';
1112
import { FieldWrapper, FieldWrapperProps } from './FieldWrapper';
1213
import { PICKER_LOCALE } from './pickerLocale';
1314

@@ -30,12 +31,15 @@ export function DateRangePickerField<
3031
...controller
3132
}: DateRangePickerFieldProps<TFieldValues, TName>) {
3233
const { field } = useController<TFieldValues, TName>(controller);
34+
const { disabled } = useFieldContext();
35+
3336
return (
3437
<FieldWrapper controller={controller} formItem={formItem}>
3538
<RangePicker
3639
format={['DD.MM.YYYY', 'DDMMYYYY']}
3740
locale={PICKER_LOCALE}
3841
{...field}
42+
disabled={disabled}
3943
{...component}
4044
/>
4145
</FieldWrapper>

0 commit comments

Comments
 (0)