Skip to content

Commit 7e731c4

Browse files
fix: datepicker custom id (#2040)
2 parents 65db519 + dc00550 commit 7e731c4

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

packages/shoreline/src/components/date-picker/date-picker.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ export function DatePicker<T extends DateValue>(props: DatePickerProps<T>) {
3232
const state = useDatePickerState(domProps)
3333
const ref = useRef(null)
3434
const anchorRef = useRef<HTMLDivElement>(null)
35-
const { groupProps, labelProps, fieldProps, buttonProps, calendarProps } =
36-
useDatePicker(domProps, state, ref)
3735

3836
const store = useFieldContext()
3937
const { id: contextId, error: contextError } = useStore(store, (s) => s)
4038

4139
const id = defaultId || contextId
4240
const error = defaultError || contextError
4341

42+
const { groupProps, labelProps, fieldProps, buttonProps, calendarProps } =
43+
useDatePicker({ ...domProps, id }, state, ref)
44+
4445
return (
4546
<PopoverProvider
4647
open={state.isOpen}

packages/shoreline/src/components/date-range-picker/date-range-picker.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,21 @@ export function DateRangePicker<T extends DateValue>(
2828
const state = useDateRangePickerState(domProps)
2929
const ref = useRef(null)
3030
const anchorRef = useRef<HTMLDivElement>(null)
31+
32+
const store = useFieldContext()
33+
const { id: contextId, error: contextError } = useStore(store, (s) => s)
34+
35+
const id = defaultId || contextId
36+
const error = defaultError || contextError
37+
3138
const {
3239
groupProps,
3340
labelProps,
3441
startFieldProps,
3542
endFieldProps,
3643
buttonProps,
3744
calendarProps,
38-
} = useDateRangePicker(domProps, state, ref)
39-
40-
const store = useFieldContext()
41-
const { id: contextId, error: contextError } = useStore(store, (s) => s)
42-
43-
const id = defaultId || contextId
44-
const error = defaultError || contextError
45+
} = useDateRangePicker({ ...domProps, id }, state, ref)
4546

4647
return (
4748
<PopoverProvider
@@ -52,7 +53,6 @@ export function DateRangePicker<T extends DateValue>(
5253
<div ref={anchorRef} data-sl-date-range-picker>
5354
<div {...labelProps} />
5455
<div
55-
id={id}
5656
data-sl-date-range-picker-input
5757
{...groupProps}
5858
ref={ref}

0 commit comments

Comments
 (0)