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

X2-10221 | fixed datepicker for specific case #336

Merged
merged 5 commits into from
Aug 2, 2024
Merged

X2-10221 | fixed datepicker for specific case #336

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c010747
X2-10221 | fixed datepicker for case when user first clicked on the d…
VitalyDevico Jul 24, 2024
04cb531
fexed lint issue
VitalyDevico Jul 24, 2024
6e29abc
added comment
VitalyDevico Jul 25, 2024
b4effd3
added missing argument
VitalyDevico Jul 26, 2024
21d953d
added condition for same date
VitalyDevico Aug 1, 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
12 changes: 11 additions & 1 deletion src/components/DatePicker/DatePicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,22 @@ export const DatePicker = ({
const to = toDate(now(day, timezoneName).endOf("day"), false);

onChange({ from, to }, options, event);
} else {
} else if (DateUtils.isDayBefore(value.from, toDate(now(day, timezoneName)))) {
onChange(
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a one line comment for this condition. Same as what you've done below.

DateUtils.addDayToRange(toDate(now(day, timezoneName).endOf("day"), false), value),
options,
event,
);
} else if (DateUtils.isDayAfter(value.from, toDate(now(day, timezoneName)))) {
// this works if the user first clicked on the date that will go to "to", and the second click to "from"
onChange(
{
from: toDate(now(day, timezoneName).startOf("day")),
to: toDate(now(value.from).endOf("day")),
},
options,
event,
);
}
} else {
onChange(toDate(now(day, timezoneName)), options, event);
Expand Down
Loading