Skip to content
This repository has been archived by the owner on Nov 21, 2023. It is now read-only.

only onChange on Apply for range mode #99

Merged
merged 2 commits into from
Oct 6, 2023
Merged

only onChange on Apply for range mode #99

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
832edd4
only onChange on Apply for range mode
kasperkristensen Oct 6, 2023
58c2677
Merge branch 'develop' into chore/update-changeset
kasperkristensen Oct 6, 2023
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
12 changes: 6 additions & 6 deletions packages/ui/src/components/date-picker/date-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,6 @@ const RangeDatePicker = ({
}

setRange(newRange)
onChange?.(newRange)
}

const onCancel = () => {
Expand Down Expand Up @@ -641,6 +640,11 @@ const RangeDatePicker = ({
}`
}, [range, showTimePicker])

const onApply = () => {
setOpen(false)
onChange?.(range)
}

return (
<Primitives.Root open={open} onOpenChange={onOpenChange}>
<Display
Expand Down Expand Up @@ -717,11 +721,7 @@ const RangeDatePicker = ({
<Button variant="secondary" type="button" onClick={onCancel}>
Cancel
</Button>
<Button
variant="primary"
type="button"
onClick={() => setOpen(false)}
>
<Button variant="primary" type="button" onClick={onApply}>
Apply
</Button>
</div>
Expand Down
Loading