Skip to content

Fix DatePicker year picker crash in range mode #8469

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
Coderxrohan wants to merge 1 commit into
base: v11
Choose a base branch
from
Open

Fix DatePicker year picker crash in range mode #8469

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
35 changes: 24 additions & 11 deletions packages/@primereact/headless/src/datepicker/useDatePicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ import { defaultProps } from './useDatePicker.props';

const TICKS_TO_1970 = ((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) + Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000;

const getSafeDate = (value: any, viewDate: Date) => {
if (Array.isArray(value)) {
return value[0] || value[1] || viewDate;
}

return value || viewDate;
};

const primereact = {
config: {
locale: {
Expand Down Expand Up @@ -285,26 +293,31 @@ export const useDatePicker = withHeadless({
};

const isYearSelected = (year: number) => {
if (typeof rawValueState !== 'string' && rawValueState !== null) {
return (rawValueState as Date).getFullYear() === year;
} else if (Array.isArray(rawValueState)) {
if (Array.isArray(rawValueState)) {
if (isMultipleSelection()) {
return rawValueState?.some((currentValue) => {
return rawValueState.some((currentValue) => {
const parsedDate = parseValueForComparison(currentValue);

return parsedDate ? parsedDate.getFullYear() === year : false;
});
} else if (isRangeSelection()) {
const parsedStart = rawValueState?.[0] ? parseValueForComparison(rawValueState[0]) : null;
const parsedEnd = rawValueState?.[1] ? parseValueForComparison(rawValueState[1]) : null;
}

if (isRangeSelection()) {
const parsedStart = rawValueState[0] ? parseValueForComparison(rawValueState[0]) : null;
const parsedEnd = rawValueState[1] ? parseValueForComparison(rawValueState[1]) : null;

const start = parsedStart ? parsedStart.getFullYear() : null;
const end = parsedEnd ? parsedEnd.getFullYear() : null;
const start = parsedStart?.getFullYear();
const end = parsedEnd?.getFullYear();

if (!start || !end) return false;
if (start == null || end == null) return false;

return start === year || end === year || (start < year && end > year);
}

return false;
}

if (rawValueState instanceof Date) {
return rawValueState.getFullYear() === year;
}

return false;
Expand Down
Loading