Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions src/date_utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -681,10 +681,22 @@ export function getEndOfDay(date: Date): Date {
* Gets the end of the week for a given date.
*
* @param date - The date.
* @param locale - The locale.
* @param calendarStartDay - The day the calendar starts on.
* @returns - The end of the week.
*/
export function getEndOfWeek(date: Date): Date {
return endOfWeek(date);
export function getEndOfWeek(
date: Date,
locale?: Locale,
calendarStartDay?: Day,
): Date {
const localeObj = locale
? getLocaleObject(locale)
: getLocaleObject(getDefaultLocale());
return endOfWeek(date, {
locale: localeObj,
weekStartsOn: calendarStartDay,
});
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ export class DatePicker extends Component<DatePickerProps, DatePickerState> {
newCalculatedDate = getStartOfWeek(date, locale, calendarStartDay);
break;
case KeyType.End:
newCalculatedDate = getEndOfWeek(date);
newCalculatedDate = getEndOfWeek(date, locale, calendarStartDay);
break;
}
return newCalculatedDate;
Expand Down
36 changes: 36 additions & 0 deletions src/test/date_utils_test.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
setMinutes,
} from "date-fns";
import { ptBR } from "date-fns/locale/pt-BR";
import { enGB } from "date-fns/locale/en-GB";

import {
newDate,
Expand Down Expand Up @@ -39,6 +40,8 @@ import {
isQuarterInRange,
isYearInRange,
getStartOfYear,
getStartOfWeek,
getEndOfWeek,
getYearsPeriod,
setDefaultLocale,
yearsDisabledAfter,
Expand Down Expand Up @@ -1382,6 +1385,39 @@ describe("date_utils", () => {
});
});

describe("getEndOfWeek", () => {
// 2024-06-12 is a Wednesday
const wednesday = new Date("2024-06-12T12:00:00");

it("defaults to a Sunday-Saturday week", () => {
// end of a Sunday-start week containing Wed 2024-06-12 is Sat 2024-06-15
expect(getEndOfWeek(wednesday).getDate()).toBe(15);
});

it("respects calendarStartDay for a Monday-Sunday week (#6326)", () => {
// end of a Monday-start week containing Wed 2024-06-12 is Sun 2024-06-16
expect(getEndOfWeek(wednesday, undefined, 1).getDate()).toBe(16);
});

it("stays symmetric with getStartOfWeek for the same calendarStartDay", () => {
const start = getStartOfWeek(wednesday, undefined, 1);
const end = getEndOfWeek(wednesday, undefined, 1);
expect(start.getDate()).toBe(10); // Mon 2024-06-10
expect(end.getDate()).toBe(16); // Sun 2024-06-16
});

it("uses the week start defined by a passed locale object", () => {
// enGB weeks start on Monday, so the week containing Wed 2024-06-12
// ends on Sun 2024-06-16
expect(getEndOfWeek(wednesday, enGB).getDate()).toBe(16);
});

it("uses the week start defined by a registered locale name", () => {
registerLocale("en-GB", enGB);
expect(getEndOfWeek(wednesday, "en-GB").getDate()).toBe(16);
});
});

describe("safeDateRangeFormat", () => {
const props = {
dateFormat: "MM/dd/yyyy",
Expand Down
16 changes: 16 additions & 0 deletions src/test/datepicker_test.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1494,6 +1494,22 @@ describe("DatePicker", () => {
);
});

it("should handle onDayKeyDown End honoring calendarStartDay (#6326)", () => {
const data = getOnInputKeyDownStuff({
selected: newDate("2024-06-12"), // Wednesday
calendarStartDay: 1, // Monday-Sunday week
});
fireEvent.keyDown(data.dateInput, getKey(KeyType.ArrowDown));
const selectedDayNode = getSelectedDayNode(data.container);
expect(selectedDayNode).toBeTruthy();
fireEvent.keyDown(selectedDayNode!, getKey(KeyType.End));
expect(data.instance.state.preSelection).toBeTruthy();
// last day of a Monday-Sunday week containing Wed 2024-06-12 is Sun 2024-06-16
expect(formatDate(data.instance.state.preSelection!, data.testFormat)).toBe(
"2024-06-16",
);
});

it("should handle onDayKeyDown when the minDate is null", () => {
const data = getOnInputKeyDownStuff({ minDate: null });
fireEvent.keyDown(data.dateInput, getKey(KeyType.ArrowDown));
Expand Down
Loading