fix: SW-710 Datepicker UI/UX updates

This commit is contained in:
Hrishikesh Vaipurkar
2024-10-31 09:18:33 +01:00
parent 256f4dfce3
commit 71c7f3c0a4
3 changed files with 34 additions and 33 deletions

View File

@@ -48,7 +48,7 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
toDate: undefined,
})
setIsSelectingFrom(false)
} else {
} else if (!dt(selectedDate.fromDate).isSame(dt(selected))) {
const fromDate = dt(selectedDate.fromDate)
const toDate = dt(selected)
if (toDate.isAfter(fromDate)) {
@@ -70,6 +70,14 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
function handleClickOutside(evt: Event) {
const target = evt.target as HTMLElement
if (ref.current && target && !ref.current.contains(target)) {
if (!selectedDate.toDate) {
setValue(name, {
fromDate: selectedDate.fromDate,
toDate: dt(selectedDate.fromDate)
.add(1, "day")
.format("YYYY-MM-DD"),
})
}
setIsOpen(false)
}
}
@@ -77,7 +85,7 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
return () => {
document.body.removeEventListener("click", handleClickOutside)
}
}, [setIsOpen])
}, [setIsOpen, setValue, selectedDate, name])
const selectedFromDate = dt(selectedDate.fromDate)
.locale(lang)