Skip to content

fix: render at most 7 weekdays in datepicker (#7542) (CP: 24.4) #7544

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

Merged
web-padawan merged 1 commit into from
Jul 12, 2024
Merged

fix: render at most 7 weekdays in datepicker (#7542) (CP: 24.4) #7544

Show file tree
Hide file tree
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
14 changes: 8 additions & 6 deletions packages/date-picker/src/vaadin-month-calendar-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,14 @@ export const MonthCalendarMixin = (superClass) =>
const weekDayNamesShort = this._applyFirstDayOfWeek(weekdaysShort, firstDayOfWeek);
const weekDayNames = this._applyFirstDayOfWeek(weekdays, firstDayOfWeek);

return weekDayNames.map((day, index) => {
return {
weekDay: day,
weekDayShort: weekDayNamesShort[index],
};
});
return weekDayNames
.map((day, index) => {
return {
weekDay: day,
weekDayShort: weekDayNamesShort[index],
};
})
.slice(0, 7);
}

/** @private */
Expand Down
12 changes: 12 additions & 0 deletions packages/date-picker/test/month-calendar.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,18 @@ describe('vaadin-month-calendar', () => {
expect(monthCalendar.shadowRoot.querySelector('[part="month-header"]').textContent).to.equal('January 2000');
});

it('should render at most 7 weekdays', async () => {
monthCalendar.i18n = {
...monthCalendar.i18n,
weekdays: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'],
weekdaysShort: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'],
};
await nextRender();

const weekdays = getWeekDayCells(monthCalendar);
expect(weekdays.length).to.equal(7);
});

it('should fire value change on tap', () => {
const dateElements = getDateCells(monthCalendar);
tap(dateElements[10]);
Expand Down