Skip to content

fix: Updated DateRangePicker in limit future booking #20483

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

Merged
retrogtx merged 8 commits into from
Apr 4, 2025
Merged

fix: Updated DateRangePicker in limit future booking #20483

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5ecd217
fix: Updated DateRangePicker in limit future booking
21prnv Apr 1, 2025
7dbd918
removed unnecessary comments
21prnv Apr 1, 2025
5008346
minor changes in end date selection
21prnv Apr 2, 2025
94ec0e4
final changes in end date selection
21prnv Apr 3, 2025
79e00be
final changes in end date selection
21prnv Apr 3, 2025
7ff0776
minor changes in end date selection
21prnv Apr 3, 2025
fdbae43
fixed issue of logs
21prnv Apr 3, 2025
ec98e68
added allowPastDates props for out of office data selection
21prnv Apr 4, 2025
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
26 changes: 20 additions & 6 deletions packages/ui/components/form/date-range-picker/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,34 @@ export function DatePickerWithRange({
strictlyBottom,
}: React.HTMLAttributes<HTMLDivElement> & DatePickerWithRangeProps) {
function handleDayClick(date: Date) {
if (dates?.endDate) {
onDatesChange({ startDate: date, endDate: undefined });
} else {
const startDate = dates.startDate ? (date < dates.startDate ? date : dates.startDate) : date;
const endDate = dates.startDate ? (date < dates.startDate ? dates.startDate : date) : undefined;
if (!dates.startDate) {
// If no start date set it as both start and end date
onDatesChange({ startDate: date, endDate: date });
} else if (!dates.endDate) {
// If start date exists but no end date and clicked date is before start date set it as both start and end date
const startDate = date < dates.startDate ? date : dates.startDate;
const endDate = date < dates.startDate ? dates.startDate : date;
onDatesChange({ startDate, endDate });
} else {
// If both dates exist
if (date.getTime() === dates.startDate.getTime() && dates.endDate) {
// If clicking the start date again when there's a range, set it as both start and end
onDatesChange({ startDate: date, endDate: date });
} else if (date <= dates.endDate) {
Copy link
Contributor

@shawnCaza shawnCaza Apr 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this logic we can only change the start date. We can't change the end date unless we pick a date past the current end date. Makes for a confusing UX.

Copy link
Contributor Author

@21prnv 21prnv Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @shawnCaza thx for giving more clarity I'm working on this issue

// If clicking a date before or equal to end date, keep end date and set new start
onDatesChange({ startDate: date, endDate: dates.endDate });
} else {
// If clicking after end date, start new range
onDatesChange({ startDate: date, endDate: date });
}
}
}

const fromDate = minDate ?? new Date();

const calendar = (
<Calendar
initialFocus
//When explicitly null, we want past dates to be shown as well, otherwise show only dates passed or from current date
fromDate={minDate === null ? undefined : fromDate}
toDate={maxDate}
mode="range"
Expand Down
Loading