Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: datepicker custom id #2040

Merged
merged 2 commits into from
Nov 7, 2024
Merged

fix: datepicker custom id #2040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c78e6f
fix(data-range-picker): change to id from groupProps not override id …
lafray Nov 6, 2024
dc00550
fix(data-picker): change to id from groupProps not override id from f…
lafray Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/shoreline/src/components/date-picker/date-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,16 @@ export function DatePicker<T extends DateValue>(props: DatePickerProps<T>) {
const state = useDatePickerState(domProps)
const ref = useRef(null)
const anchorRef = useRef<HTMLDivElement>(null)
const { groupProps, labelProps, fieldProps, buttonProps, calendarProps } =
useDatePicker(domProps, state, ref)

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

const id = defaultId || contextId
const error = defaultError || contextError

const { groupProps, labelProps, fieldProps, buttonProps, calendarProps } =
useDatePicker({ ...domProps, id }, state, ref)

return (
<PopoverProvider
open={state.isOpen}
Expand Down
16 changes: 8 additions & 8 deletions packages/shoreline/src/components/date-range-picker/date-range-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,21 @@ export function DateRangePicker<T extends DateValue>(
const state = useDateRangePickerState(domProps)
const ref = useRef(null)
const anchorRef = useRef<HTMLDivElement>(null)

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

const id = defaultId || contextId
const error = defaultError || contextError

const {
groupProps,
labelProps,
startFieldProps,
endFieldProps,
buttonProps,
calendarProps,
} = useDateRangePicker(domProps, state, ref)

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

const id = defaultId || contextId
const error = defaultError || contextError
} = useDateRangePicker({ ...domProps, id }, state, ref)

return (
<PopoverProvider
Expand All @@ -52,7 +53,6 @@ export function DateRangePicker<T extends DateValue>(
<div ref={anchorRef} data-sl-date-range-picker>
<div {...labelProps} />
<div
id={id}
data-sl-date-range-picker-input
{...groupProps}
ref={ref}
Expand Down