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 #6791: apply year change in Calendar when input changed #6794

Merged
merged 1 commit into from
Jun 26, 2024
Merged

Fix #6791: apply year change in Calendar when input changed #6794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions components/lib/calendar/Calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3070,29 +3070,29 @@ export const Calendar = React.memo(
isTypingRef.current = false;

// #3516 view date not updated when value set programatically
if (!visible && newDate) {
Copy link
Member

Choose a reason for hiding this comment

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

You remove the !visible check?

also did you retest ticket #3516 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I deleted !visible condition and changed to early return :)
I checked the #3516 ticket, It works as shown in the video below

2024-06-26.9.42.54.mov

let viewDate = newDate;
if (!newDate) return;

if (isMultipleSelection()) {
if (newDate.length) {
viewDate = newDate[newDate.length - 1];
}
} else if (isRangeSelection()) {
if (newDate.length) {
let startDate = newDate[0];
let endDate = newDate[1];
let viewDate = newDate;

viewDate = endDate || startDate;
}
if (isMultipleSelection()) {
if (newDate.length) {
viewDate = newDate[newDate.length - 1];
}
} else if (isRangeSelection()) {
if (newDate.length) {
let startDate = newDate[0];
let endDate = newDate[1];

if (viewDate instanceof Date) {
validateDate(viewDate);
setViewDateState(viewDate);
setCurrentMonth(viewDate.getMonth());
setCurrentYear(viewDate.getFullYear());
viewDate = endDate || startDate;
}
}

if (viewDate instanceof Date) {
validateDate(viewDate);
setViewDateState(viewDate);
setCurrentMonth(viewDate.getMonth());
setCurrentYear(viewDate.getFullYear());
}
}
}, [props.value, visible]);

Expand Down
Loading