Skip to content

fix: complete safeToDate adoption in Calendar.renderInputTime #6285

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

Open
GiorgiM000 wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −5
Open

fix: complete safeToDate adoption in Calendar.renderInputTime #6285

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
9 changes: 4 additions & 5 deletions src/calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import {
getEffectiveMaxDate,
addZero,
isValid,
safeToDate,
getYearsPeriod,
DEFAULT_YEAR_ITEM_NUMBER,
getMonthInLocale,
Expand Down Expand Up @@ -1189,14 +1190,14 @@ export default class Calendar extends Component<CalendarProps, CalendarState> {
if (this.props.selectsRange) {
const { startDate, endDate } = this.props;

const startTime = startDate ? new Date(startDate) : undefined;
const startTime = safeToDate(startDate) ?? undefined;
const startTimeValid =
startTime && isValid(startTime) && Boolean(startDate);
const startTimeString = startTimeValid
? `${addZero(startTime.getHours())}:${addZero(startTime.getMinutes())}`
: "";

const endTime = endDate ? new Date(endDate) : undefined;
const endTime = safeToDate(endDate) ?? undefined;
const endTimeValid = endTime && isValid(endTime) && Boolean(endDate);
const endTimeString = endTimeValid
? `${addZero(endTime.getHours())}:${addZero(endTime.getMinutes())}`
Expand Down Expand Up @@ -1229,9 +1230,7 @@ export default class Calendar extends Component<CalendarProps, CalendarState> {
}

// Single date mode (original behavior)
const time = this.props.selected
? new Date(this.props.selected)
: undefined;
const time = safeToDate(this.props.selected) ?? undefined;
const timeValid = time && isValid(time) && Boolean(this.props.selected);
const timeString = timeValid
? `${addZero(time.getHours())}:${addZero(time.getMinutes())}`
Expand Down