@ui5/webcomponents 0.0.0-e7dd012d7 → 0.0.0-e818f286e

package/src/DayPicker.js

@@ -1,125 +1,76 @@
-import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
-import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
-import { fetchCldr } from "@ui5/webcomponents-base/dist/asset-registries/LocaleData.js";
 import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
 import { getFirstDayOfWeek } from "@ui5/webcomponents-base/dist/config/FormatSettings.js";
-import DateFormat from "@ui5/webcomponents-localization/dist/DateFormat.js";
 import getCachedLocaleDataInstance from "@ui5/webcomponents-localization/dist/getCachedLocaleDataInstance.js";
-import { getCalendarType } from "@ui5/webcomponents-base/dist/config/CalendarType.js";
-import ItemNavigation from "@ui5/webcomponents-base/dist/delegate/ItemNavigation.js";
 import {
 	isSpace,
+	isSpaceShift,
 	isEnter,
+	isEnterShift,
 	isUp,
 	isDown,
 	isLeft,
 	isRight,
+	isHome,
+	isEnd,
 	isHomeCtrl,
 	isEndCtrl,
 	isPageUp,
 	isPageDown,
 	isPageUpShift,
+	isPageUpAlt,
 	isPageUpShiftCtrl,
 	isPageDownShift,
+	isPageDownAlt,
 	isPageDownShiftCtrl,
 } from "@ui5/webcomponents-base/dist/Keys.js";
 import Integer from "@ui5/webcomponents-base/dist/types/Integer.js";
 import CalendarDate from "@ui5/webcomponents-localization/dist/dates/CalendarDate.js";
 import calculateWeekNumber from "@ui5/webcomponents-localization/dist/dates/calculateWeekNumber.js";
 import CalendarType from "@ui5/webcomponents-base/dist/types/CalendarType.js";
-import ItemNavigationBehavior from "@ui5/webcomponents-base/dist/types/ItemNavigationBehavior.js";
-import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
-import RenderScheduler from "@ui5/webcomponents-base/dist/RenderScheduler.js";
+import CalendarSelectionMode from "./types/CalendarSelectionMode.js";
+import CalendarPart from "./CalendarPart.js";
 import DayPickerTemplate from "./generated/templates/DayPickerTemplate.lit.js";
 
 import {
 	DAY_PICKER_WEEK_NUMBER_TEXT,
 	DAY_PICKER_NON_WORKING_DAY,
+	DAY_PICKER_TODAY,
 } from "./generated/i18n/i18n-defaults.js";
 
-// Styles
 import dayPickerCSS from "./generated/themes/DayPicker.css.js";
 
-const monthDiff = (startDate, endDate) => {
-	let months;
-	const _startDate = CalendarDate.fromTimestamp(startDate).toLocalJSDate(),
-		_endDate = CalendarDate.fromTimestamp(endDate).toLocalJSDate();
-
-	months = (_endDate.getFullYear() - _startDate.getFullYear()) * 12;
-	months -= _startDate.getMonth();
-	months += _endDate.getMonth();
-	return months;
-};
-
 /**
  * @public
  */
 const metadata = {
 	tag: "ui5-daypicker",
-	languageAware: true,
-	properties: /** @lends  sap.ui.webcomponents.main.DayPicker.prototype */ {
-		/**
-		 * A UNIX timestamp - seconds since 00:00:00 UTC on Jan 1, 1970.
-		 * @type {number}
-		 * @public
-		 */
-		timestamp: {
-			type: Integer,
-		},
-
+	properties: /** @lends sap.ui.webcomponents.main.DayPicker.prototype */ {
 		/**
-		 * Sets a calendar type used for display.
-		 * If not set, the calendar type of the global configuration is used.
-		 * @type {CalendarType}
-		 * @public
-		 */
-		primaryCalendarType: {
-			type: CalendarType,
-		},
-
-		/**
-		 * Sets the selected dates as UTC timestamps.
+		 * An array of UTC timestamps representing the selected date or dates depending on the capabilities of the picker component.
 		 * @type {Array}
 		 * @public
 		 */
 		selectedDates: {
 			type: Integer,
 			multiple: true,
+			compareValues: true,
 		},
 
 		/**
-		 * Determines the minimum date available for selection.
-		 *
-		 * @type {string}
-		 * @defaultvalue ""
-		 * @since 1.0.0-rc.6
-		 * @public
-		 */
-		minDate: {
-			type: String,
-		},
-
-		/**
-		 * Determines the maximum date available for selection.
-		 *
-		 * @type {string}
-		 * @defaultvalue ""
-		 * @since 1.0.0-rc.6
+		 * Defines the type of selection used in the day picker component.
+		 * Accepted property values are:<br>
+		 * <ul>
+		 * <li><code>CalendarSelectionMode.Single</code> - enables a single date selection.(default value)</li>
+		 * <li><code>CalendarSelectionMode.Range</code> - enables selection of a date range.</li>
+		 * <li><code>CalendarSelectionMode.Multiple</code> - enables selection of multiple dates.</li>
+		 * </ul>
+		 * @type {CalendarSelectionMode}
+		 * @defaultvalue "Single"
 		 * @public
 		 */
-		maxDate: {
-			type: String,
-		},
-
-		/**
-		 * Determines the format, displayed in the input field.
-		 *
-		 * @type {string}
-		 * @defaultvalue ""
-		 * @public
-		 */
-		formatPattern: {
-			type: String,
+		selectionMode: {
+			type: CalendarSelectionMode,
+			defaultValue: CalendarSelectionMode.Single,
 		},
 
 		/**
@@ -138,16 +89,6 @@ const metadata = {
 			type: Boolean,
 		},
 
-		/**
-		 * Defines the effective weeks numbers visibility,
-		 * based on the <code>primaryCalendarType</code> and <code>hideWeekNumbers</code> property.
-		 * @type {boolean}
-		 * @private
-		 */
-		_hideWeekNumbers: {
-			type: Boolean,
-		},
-
 		/**
 		 * @type {Object}
 		 * @private
@@ -157,7 +98,13 @@ const metadata = {
 			multiple: true,
 		},
 
+		_dayNames: {
+			type: Object,
+			multiple: true,
+		},
+
 		/**
+		 * When set, the component will skip all work in onBeforeRendering and will not automatically set the focus on itself
 		 * @type {boolean}
 		 * @private
 		 */
@@ -165,16 +112,24 @@ const metadata = {
 			type: Boolean,
 			noAttribute: true,
 		},
+
+		/**
+		 * When selectionMode="Range" and the first day in the range is selected, this is the currently hovered (when using mouse) or focused (when using keyboard) day by the user
+		 * @private
+		 */
+		_secondTimestamp: {
+			type: String,
+		},
 	},
-	events: /** @lends  sap.ui.webcomponents.main.DayPicker.prototype */ {
+	events: /** @lends sap.ui.webcomponents.main.DayPicker.prototype */ {
 		/**
-		 * Fired when the user selects a new Date on the Web Component.
+		 * Fired when the selected date(s) change
 		 * @public
 		 * @event
 		 */
 		change: {},
 		/**
-		 * Fired when month, year has changed due to item navigation.
+		 * Fired when the timestamp changes (user navigates with the keyboard) or clicks with the mouse
 		 * @public
 		 * @event
 		 */
@@ -182,6 +137,10 @@ const metadata = {
 	},
 };
 
+const isBetween = (x, num1, num2) => x > Math.min(num1, num2) && x < Math.max(num1, num2);
+
+const DAYS_IN_WEEK = 7;
+
 /**
  * @class
  *
@@ -190,19 +149,15 @@ const metadata = {
  * @constructor
  * @author SAP SE
  * @alias sap.ui.webcomponents.main.DayPicker
- * @extends sap.ui.webcomponents.base.UI5Element
+ * @extends CalendarPart
  * @tagname ui5-daypicker
  * @public
  */
-class DayPicker extends UI5Element {
+class DayPicker extends CalendarPart {
 	static get metadata() {
 		return metadata;
 	}
 
-	static get render() {
-		return litRender;
-	}
-
 	static get template() {
 		return DayPickerTemplate;
 	}
@@ -211,173 +166,158 @@ class DayPicker extends UI5Element {
 		return dayPickerCSS;
 	}
 
-	constructor() {
-		super();
-
-		this._itemNav = new ItemNavigation(this, {
-			rowSize: 7,
-			pageSize: 42,
-			behavior: ItemNavigationBehavior.Paging,
-		});
-
-		this._itemNav.getItemsCallback = function getItemsCallback() {
-			return this.focusableDays;
-		}.bind(this);
-
-		this._itemNav.attachEvent(
-			ItemNavigation.BORDER_REACH,
-			this._handleItemNavigationBorderReach.bind(this)
-		);
-
-		this._itemNav.attachEvent(
-			ItemNavigation.AFTER_FOCUS,
-			this._handleItemNavigationAfterFocus.bind(this)
-		);
-
-		this._itemNav.attachEvent(
-			"PageBottom",
-			this._handleMonthBottomOverflow.bind(this)
-		);
-
-		this._itemNav.attachEvent(
-			"PageTop",
-			this._handleMonthTopOverflow.bind(this)
-		);
-
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
-	}
-
 	onBeforeRendering() {
 		const localeData = getCachedLocaleDataInstance(getLocale());
+		this._buildWeeks(localeData);
+		this._buildDayNames(localeData);
+	}
 
-		let oCalDate,
-			day,
-			timestamp,
-			lastWeekNumber = -1,
-			isDaySelected = false,
-			todayIndex = 0;
+	/**
+	 * Builds the _weeks object that represents the month
+	 * @param localeData
+	 * @private
+	 */
+	_buildWeeks(localeData) {
+		if (this._hidden) {
+			return; // Optimization to not do any work unless the current picker
+		}
 
-		const _aVisibleDays = this._getVisibleDays(this._calendarDate);
 		this._weeks = [];
+
+		const firstDayOfWeek = this._getFirstDayOfWeek();
+		const monthsNames = localeData.getMonths("wide", this._primaryCalendarType);
+		const secondaryMonthsNames = this.hasSecondaryCalendarType && localeData.getMonths("wide", this.secondaryCalendarType);
+		const nonWorkingDayLabel = DayPicker.i18nBundle.getText(DAY_PICKER_NON_WORKING_DAY);
+		const todayLabel = DayPicker.i18nBundle.getText(DAY_PICKER_TODAY);
+		const tempDate = this._getFirstDay(); // date that will be changed by 1 day 42 times
+		const todayDate = CalendarDate.fromLocalJSDate(new Date(), this._primaryCalendarType); // current day date - calculate once
+		const calendarDate = this._calendarDate; // store the _calendarDate value as this getter is expensive and degrades IE11 perf
+		const minDate = this._minDate; // store the _minDate (expensive getter)
+		const maxDate = this._maxDate; // store the _maxDate (expensive getter)
+
+		const tempSecondDate = this.hasSecondaryCalendarType && this._getSecondaryDay(tempDate);
+
 		let week = [];
-		this._weekNumbers = [];
-		let weekday;
-		const _monthsNameWide = localeData.getMonths("wide", this._calendarDate._oUDate.sCalendarType);
-
-		this._minDateObject = new Date(this._minDate);
-		this._maxDateObject = new Date(this._maxDate);
-
-		/* eslint-disable no-loop-func */
-		for (let i = 0; i < _aVisibleDays.length; i++) {
-			oCalDate = _aVisibleDays[i];
-			timestamp = oCalDate.valueOf() / 1000; // no need to round because CalendarDate does it
-
-			// day of the week
-			weekday = oCalDate.getDay() - this._getFirstDayOfWeek();
-			if (weekday < 0) {
-				weekday += 7;
-			}
+		for (let i = 0; i < DAYS_IN_WEEK * 6; i++) { // always show 6 weeks total, 42 days to avoid jumping
+			const timestamp = tempDate.valueOf() / 1000; // no need to round because CalendarDate does it
 
-			const nonWorkingAriaLabel = this._isWeekend(oCalDate) ? `${this._dayPickerNonWorkingDay} ` : "";
+			let dayOfTheWeek = tempDate.getDay() - firstDayOfWeek;
+			if (dayOfTheWeek < 0) {
+				dayOfTheWeek += DAYS_IN_WEEK;
+			}
 
-			day = {
+			const isFocused = tempDate.getMonth() === calendarDate.getMonth() && tempDate.getDate() === calendarDate.getDate();
+			const isSelected = this._isDaySelected(timestamp);
+			const isSelectedBetween = this._isDayInsideSelectionRange(timestamp);
+			const isOtherMonth = tempDate.getMonth() !== calendarDate.getMonth();
+			const isWeekend = this._isWeekend(tempDate);
+			const isDisabled = tempDate.valueOf() < minDate.valueOf() || tempDate.valueOf() > maxDate.valueOf();
+			const isToday = tempDate.isSame(todayDate);
+			const isFirstDayOfWeek = tempDate.getDay() === firstDayOfWeek;
+
+			const nonWorkingAriaLabel = isWeekend ? `${nonWorkingDayLabel} ` : "";
+			const todayAriaLabel = isToday ? `${todayLabel} ` : "";
+			const ariaLabel = this.hasSecondaryCalendarType
+				? `${todayAriaLabel}${nonWorkingAriaLabel}${monthsNames[tempDate.getMonth()]} ${tempDate.getDate()}, ${tempDate.getYear()}; ${secondaryMonthsNames[tempSecondDate.getMonth()]} ${tempSecondDate.getDate()}, ${tempSecondDate.getYear()}`
+				: `${todayAriaLabel}${nonWorkingAriaLabel}${monthsNames[tempDate.getMonth()]} ${tempDate.getDate()}, ${tempDate.getYear()}`;
+
+			const day = {
 				timestamp: timestamp.toString(),
-				selected: this._selectedDates.some(d => {
-					return d === timestamp;
-				}),
-				selectedBetween: this._selectedDates.slice(1, this._selectedDates.length - 1).some(d => {
-					return d === timestamp;
-				}),
-				iDay: oCalDate.getDate(),
-				_index: i.toString(),
-				classes: `ui5-dp-item ui5-dp-wday${weekday}`,
-				ariaLabel: `${nonWorkingAriaLabel}${_monthsNameWide[oCalDate.getMonth()]} ${oCalDate.getDate()}, ${oCalDate.getYear()}`,
+				focusRef: isFocused,
+				_tabIndex: isFocused ? "0" : "-1",
+				selected: isSelected,
+				day: tempDate.getDate(),
+				secondDay: this.hasSecondaryCalendarType && tempSecondDate.getDate(),
+				_isSecondaryCalendarType: this.hasSecondaryCalendarType,
+				classes: `ui5-dp-item ui5-dp-wday${dayOfTheWeek}`,
+				ariaLabel,
+				ariaSelected: isSelected ? "true" : "false",
+				ariaDisabled: isOtherMonth ? "true" : undefined,
+				disabled: isDisabled,
 			};
 
-			const isToday = oCalDate.isSame(CalendarDate.fromLocalJSDate(new Date(), this._primaryCalendarType));
-
-			week.push(day);
-
-			if (oCalDate.getDay() === this._getFirstDayOfWeek()) {
+			if (isFirstDayOfWeek) {
 				day.classes += " ui5-dp-firstday";
 			}
 
-			if (day.selected) {
+			if (isSelected) {
 				day.classes += " ui5-dp-item--selected";
-				isDaySelected = true;
 			}
 
-			if (day.selectedBetween) {
+			if (isSelectedBetween) {
 				day.classes += " ui5-dp-item--selected-between";
 			}
 
 			if (isToday) {
 				day.classes += " ui5-dp-item--now";
-				todayIndex = i;
-				day.ariaLabel = `today ${day.ariaLabel}`;
 			}
 
-			if (oCalDate.getMonth() !== this._month) {
+			if (isOtherMonth) {
 				day.classes += " ui5-dp-item--othermonth";
-				day.ariaDisabled = "true";
 			}
 
-			day.id = `${this._id}-${timestamp}`;
-
-			if (this._isWeekend(oCalDate)) {
+			if (isWeekend) {
 				day.classes += " ui5-dp-item--weeekend";
 			}
-			if ((this.minDate || this.maxDate) && this._isOutOfSelectableRange(oCalDate)) {
+
+			if (isDisabled) {
 				day.classes += " ui5-dp-item--disabled";
-				day.disabled = true;
 			}
 
-			this._hideWeekNumbers = this.shouldHideWeekNumbers;
-
-			if (day.classes.indexOf("ui5-dp-wday6") !== -1
-				|| _aVisibleDays.length - 1 === i) {
-				const weekNumber = calculateWeekNumber(getFirstDayOfWeek(), oCalDate.toUTCJSDate(), oCalDate.getYear(), getLocale(), localeData);
-				if (lastWeekNumber !== weekNumber) {
-					const weekNum = {
-						weekNum: weekNumber,
-						isHidden: this._hideWeekNumbers,
-					};
-					week.unshift(weekNum);
-					lastWeekNumber = weekNumber;
-				}
+			if (this.hasSecondaryCalendarType) {
+				day.classes += " ui5-dp-item--withsecondtype";
+			}
 
+			week.push(day);
+
+			if (dayOfTheWeek === DAYS_IN_WEEK - 1) { // 0-indexed so 6 is the last day of the week
+				week.unshift({
+					weekNum: calculateWeekNumber(getFirstDayOfWeek(), tempDate.toUTCJSDate(), tempDate.getYear(), getLocale(), localeData),
+					isHidden: this.shouldHideWeekNumbers,
+				});
+			}
+
+			if (week.length === DAYS_IN_WEEK + 1) { // 7 entries for each day + 1 for the week numbers
 				this._weeks.push(week);
 				week = [];
 			}
+
+			tempDate.setDate(tempDate.getDate() + 1);
+			if (this.hasSecondaryCalendarType) {
+				tempSecondDate.setDate(tempSecondDate.getDate() + 1);
+			}
 		}
-		while (this._weeks.length < 6) {
-			this._weeks.push([]);
-		}
-		/* eslint-enable no-loop-func */
+	}
 
-		if (!isDaySelected && todayIndex && this._itemNav.current === 0) {
-			this._itemNav.current = todayIndex;
+	/**
+	 * Builds the dayNames object (header of the month)
+	 * @param localeData
+	 * @private
+	 */
+	_buildDayNames(localeData) {
+		if (this._hidden) {
+			return; // Optimization to not do any work unless the current picker
 		}
 
+		let dayOfTheWeek;
+
 		const aDayNamesWide = localeData.getDays("wide", this._primaryCalendarType);
 		const aDayNamesAbbreviated = localeData.getDays("abbreviated", this._primaryCalendarType);
-		const aUltraShortNames = aDayNamesAbbreviated.map(n => n);
 		let dayName;
 
 		this._dayNames = [];
 		this._dayNames.push({
 			classes: "ui5-dp-dayname",
-			name: this._dayPickerWeekNumberText,
+			name: DayPicker.i18nBundle.getText(DAY_PICKER_WEEK_NUMBER_TEXT),
 		});
-		for (let i = 0; i < 7; i++) {
-			weekday = i + this._getFirstDayOfWeek();
-			if (weekday > 6) {
-				weekday -= 7;
+		for (let i = 0; i < DAYS_IN_WEEK; i++) {
+			dayOfTheWeek = i + this._getFirstDayOfWeek();
+			if (dayOfTheWeek > DAYS_IN_WEEK - 1) { // 0-indexed so index of 6 is the maximum allowed
+				dayOfTheWeek -= DAYS_IN_WEEK;
 			}
 			dayName = {
-				id: `${this._id}-WH${i.toString()}`,
-				name: aDayNamesWide[weekday],
-				ultraShortName: aUltraShortNames[weekday],
+				name: aDayNamesWide[dayOfTheWeek],
+				ultraShortName: aDayNamesAbbreviated[dayOfTheWeek],
 				classes: "ui5-dp-dayname",
 			};
 
@@ -385,418 +325,363 @@ class DayPicker extends UI5Element {
 		}
 
 		this._dayNames[1].classes += " ui5-dp-firstday";
+
+		if (this.shouldHideWeekNumbers) {
+			this._dayNames.shift();
+		}
 	}
 
 	onAfterRendering() {
-		this._fireDayPickerRendered();
-		if (this._inputLiveChangeTrigger) {
-			this._inputLiveChangeTrigger = false;
-		} else {
-			this._itemNav.focusCurrent();
+		if (this._autoFocus && !this._hidden) {
+			this.focus();
 		}
 	}
 
-	_onmousedown(event) {
-		const target = event.target;
-		const dayPressed = this._isDayPressed(target);
-
-		if (dayPressed) {
-			const targetDate = parseInt(target.getAttribute("data-sap-timestamp"));
-
-			// findIndex, give it to item navigation
-			for (let i = 0; i < this._weeks.length; i++) {
-				for (let j = 0; j < this._weeks[i].length; j++) {
-					if (parseInt(this._weeks[i][j].timestamp) === targetDate) {
-						let index = parseInt(target.getAttribute("data-sap-index"));
-						if (this.minDate || this.maxDate) {
-							const focusableItem = this.focusableDays.find(item => parseInt(item._index) === index);
-							index = focusableItem ? this.focusableDays.indexOf(focusableItem) : index;
-						}
-
-						this._itemNav.current = index;
-						this._itemNav.update();
-						break;
-					}
-				}
-			}
+	_onfocusin() {
+		this._autoFocus = true;
+	}
 
-			this.targetDate = targetDate;
-		}
+	_onfocusout() {
+		this._autoFocus = false;
 	}
 
-	_onmouseup(event) {
-		const dayPressed = this._isDayPressed(event.target);
-		if (this.targetDate) {
-			this._modifySelectionAndNotifySubscribers(this.targetDate, event.ctrlKey);
-			this.targetDate = null;
+	/**
+	 * Tells if the day is selected (dark blue)
+	 * @param timestamp
+	 * @returns {boolean}
+	 * @private
+	 */
+	_isDaySelected(timestamp) {
+		if (this.selectionMode === CalendarSelectionMode.Single) {
+			return timestamp === this.selectedDates[0];
 		}
 
-		if (!dayPressed) {
-			this._itemNav.focusCurrent();
-		}
+		// Multiple, Range
+		return this.selectedDates.includes(timestamp);
 	}
 
-	_onitemmouseover(event) {
-		if (this.selectedDates.length === 1) {
-			this.fireEvent("item-mouseover", event);
+	/**
+	 * Tells if the day is inside a selection range (light blue)
+	 * @param timestamp
+	 * @returns {*}
+	 * @private
+	 */
+	_isDayInsideSelectionRange(timestamp) {
+		// No selection at all (or not in range selection mode)
+		if (this.selectionMode !== CalendarSelectionMode.Range || !this.selectedDates.length) {
+			return false;
 		}
-	}
 
-	_onitemkeydown(event) {
-		if (this.selectedDates.length === 1) {
-			this.fireEvent("item-keydown", event);
+		// Only one date selected - the user is hovering with the mouse or navigating with the keyboard to select the second one
+		if (this.selectedDates.length === 1 && this._secondTimestamp) {
+			return isBetween(timestamp, this.selectedDates[0], this._secondTimestamp);
 		}
+
+		// Two dates selected - stable range
+		return isBetween(timestamp, this.selectedDates[0], this.selectedDates[1]);
 	}
 
-	_onkeydown(event) {
-		if (isEnter(event)) {
-			return this._handleEnter(event);
-		}
+	/**
+	 * Selects/deselects a day
+	 * @param event
+	 * @param isShift true if the user did Click+Shift or Enter+Shift (but not Space+Shift)
+	 * @private
+	 */
+	_selectDate(event, isShift) {
+		const target = event.target;
 
-		if (isSpace(event)) {
-			event.preventDefault();
+		if (!this._isDayPressed(target)) {
 			return;
 		}
 
-		if (isHomeCtrl(event)) {
-			this._navToStartEndDayOfTheMonth(event, true);
-		}
+		const timestamp = this._getTimestampFromDom(target);
 
-		if (isEndCtrl(event)) {
-			this._navToStartEndDayOfTheMonth(event, false);
-		}
-
-		if (isPageUpShift(event)) {
-			this._changeYears(event, false, 1);
-		}
-
-		if (isPageUpShiftCtrl(event)) {
-			this._changeYears(event, false, 10);
-		}
+		this._safelySetTimestamp(timestamp);
+		this._updateSecondTimestamp();
 
-		if (isPageDownShift(event)) {
-			this._changeYears(event, true, 1);
+		if (this.selectionMode === CalendarSelectionMode.Single) {
+			this.selectedDates = [timestamp];
+		} else if (this.selectionMode === CalendarSelectionMode.Multiple) {
+			if (this.selectedDates.length > 0 && isShift) {
+				this._multipleSelection(timestamp);
+			} else {
+				this._toggleTimestampInSelection(timestamp);
+			}
+		} else {
+			this.selectedDates = (this.selectedDates.length === 1) ? [...this.selectedDates, timestamp]	: [timestamp];
 		}
 
-		if (isPageDownShiftCtrl(event)) {
-			this._changeYears(event, true, 10);
-		}
+		this.fireEvent("change", {
+			timestamp: this.timestamp,
+			dates: this.selectedDates,
+		});
 	}
 
-	_onkeyup(event) {
-		if (isSpace(event)) {
-			this._handleSpace(event);
-		}
-	}
+	/**
+	 * Selects/deselects the whole row (week)
+	 * @param event
+	 * @private
+	 */
+	_selectWeek(event) {
+		this._weeks.forEach(week => {
+			const dayInThisWeek = week.findIndex(item => {
+				const date = CalendarDate.fromTimestamp(parseInt(item.timestamp) * 1000);
+				return date.getMonth() === this._calendarDate.getMonth() && date.getDate() === this._calendarDate.getDate();
+			}) !== -1;
+			if (dayInThisWeek) { // The current day is in this week
+				const notAllDaysOfThisWeekSelected = week.some(item => item.timestamp && !this.selectedDates.includes(parseInt(item.timestamp)));
+				if (notAllDaysOfThisWeekSelected) { // even if one day is not selected, select the whole week
+					week.filter(item => item.timestamp).forEach(item => {
+						this._addTimestampToSelection(parseInt(item.timestamp));
+					});
+				} else { // only if all days of this week are selected, deselect them
+					week.filter(item => item.timestamp).forEach(item => {
+						this._removeTimestampFromSelection(parseInt(item.timestamp));
+					});
+				}
+			}
+		});
 
-	_handleEnter(event) {
-		event.preventDefault();
-		if (event.target.className.indexOf("ui5-dp-item") > -1) {
-			const targetDate = parseInt(event.target.getAttribute("data-sap-timestamp"));
-			this._modifySelectionAndNotifySubscribers(targetDate, event.ctrlKey);
-		}
+		this.fireEvent("change", {
+			timestamp: this.timestamp,
+			dates: this.selectedDates,
+		});
 	}
 
-	_handleSpace(event) {
-		event.preventDefault();
-		if (event.target.className.indexOf("ui5-dp-item") > -1) {
-			const targetDate = parseInt(event.target.getAttribute("data-sap-timestamp"));
-			this._modifySelectionAndNotifySubscribers(targetDate, event.ctrlKey);
+	_toggleTimestampInSelection(timestamp) {
+		if (this.selectedDates.includes(timestamp)) {
+			this._removeTimestampFromSelection(timestamp);
+		} else {
+			this._addTimestampToSelection(timestamp);
 		}
 	}
 
-	_navToStartEndDayOfTheMonth(event, start) {
-		event.preventDefault();
-
-		const currentItem = this._itemNav._getCurrentItem();
-		let currentTimestamp = parseInt(currentItem.getAttribute("data-sap-timestamp")) * 1000;
-		let calDate = CalendarDate.fromTimestamp(currentTimestamp, this._primaryCalendarType);
-
-		if (currentItem.classList.contains("ui5-dp-item--othermonth")) {
-			return;
-		}
-
-		calDate.setDate(1);
-		if (!start) {
-			// set the day to be the last day of the current month
-			calDate.setMonth(calDate.getMonth() + 1, 0);
-		}
-
-		if (calDate.valueOf() < this._minDate) {
-			calDate = CalendarDate.fromLocalJSDate(new Date(this._minDate), this._primaryCalendarType);
-		} else if (calDate.valueOf() > this._maxDate) {
-			calDate = CalendarDate.fromLocalJSDate(new Date(this._maxDate), this._primaryCalendarType);
+	_addTimestampToSelection(timestamp) {
+		if (!this.selectedDates.includes(timestamp)) {
+			this.selectedDates = [...this.selectedDates, timestamp];
 		}
+	}
 
-		currentTimestamp = calDate.valueOf() / 1000;
-		const newItemIndex = this._itemNav._getItems().findIndex(item => parseInt(item.timestamp) === currentTimestamp);
-
-		this._itemNav.currentIndex = newItemIndex;
-		this._itemNav.focusCurrent();
+	_removeTimestampFromSelection(timestamp) {
+		this.selectedDates = this.selectedDates.filter(value => value !== timestamp);
 	}
 
 	/**
-	 * Converts "timestamp" property value into a Java Script Date object and
-	 * adds or extracts a given number of years from it
-	 *
-	 * @param {object} event used to prevent the default browser behavior
-	 * @param {boolean} forward if true indicates addition
-	 * @param {int} step for year number to substract or add
+	 * When at least one day is selected and the user pressed shift
+	 * @param timestamp
+	 * @private
 	 */
-	_changeYears(event, forward, step) {
-		const currentItem = this._itemNav._getCurrentItem();
-		let currentTimestamp = parseInt(currentItem.getAttribute("data-sap-timestamp") * 1000);
-		const currentDate = CalendarDate.fromTimestamp(currentTimestamp, this._primaryCalendarType);
-		let newDate = new CalendarDate(currentDate, this._primaryCalendarType);
-
-		if (forward) {
-			newDate.setYear(newDate.getYear() + step);
+	_multipleSelection(timestamp) {
+		const min = Math.min(...this.selectedDates);
+		const max = Math.max(...this.selectedDates);
+		let start;
+		let end;
+		let toggle = false;
+
+		if (timestamp < min) {
+			start = timestamp;
+			end = min;
+		} else if (timestamp >= min && timestamp <= max) { // inside the current range - toggle all between the selected and focused
+			const distanceToMin = Math.abs(timestamp - min);
+			const distanceToMax = Math.abs(timestamp - max);
+
+			if (distanceToMin < distanceToMax) {
+				start = timestamp;
+				end = max;
+			} else {
+				start = min;
+				end = timestamp;
+			}
+			toggle = true;
 		} else {
-			newDate.setYear(newDate.getYear() - step);
+			start = max;
+			end = timestamp;
 		}
 
-		if (currentDate.getMonth() !== newDate.getMonth()) {
-			newDate.setDate(0);
-		}
+		const startDate = CalendarDate.fromTimestamp(start * 1000);
+		const endDate = CalendarDate.fromTimestamp(end * 1000);
 
-		if (newDate.valueOf() < this._minDate) {
-			newDate = CalendarDate.fromLocalJSDate(new Date(this._minDate), this._primaryCalendarType);
-		} else if (newDate.valueOf() > this._maxDate) {
-			newDate = CalendarDate.fromLocalJSDate(new Date(this._maxDate), this._primaryCalendarType);
+		while (startDate.valueOf() <= endDate.valueOf()) {
+			this[toggle ? "_toggleTimestampInSelection" : "_addTimestampToSelection"](startDate.valueOf() / 1000);
+			startDate.setDate(startDate.getDate() + 1);
 		}
-
-		currentTimestamp = (newDate.valueOf() / 1000);
-
-		this._navigateAndWaitRerender(currentTimestamp);
-
-		event.preventDefault();
 	}
 
-	get shouldHideWeekNumbers() {
-		if (this._primaryCalendarType !== CalendarType.Gregorian) {
-			return true;
+	/**
+	 * Set the hovered day as the _secondTimestamp
+	 * @param event
+	 * @private
+	 */
+	_onmouseover(event) {
+		const hoveredItem = event.target.closest(".ui5-dp-item");
+		if (hoveredItem && this.selectionMode === CalendarSelectionMode.Range && this.selectedDates.length === 1) {
+			this._secondTimestamp = this._getTimestampFromDom(hoveredItem);
 		}
-
-		return this.hideWeekNumbers;
 	}
 
-	get _timestamp() {
-		return this.timestamp !== undefined ? this.timestamp : Math.floor(new Date().getTime() / 1000);
-	}
-
-	get _localDate() {
-		return new Date(this._timestamp * 1000);
-	}
-
-	get _calendarDate() {
-		return CalendarDate.fromTimestamp(this._localDate.getTime(), this._primaryCalendarType);
-	}
+	_onkeydown(event) {
+		let preventDefault = true;
 
-	get _formatPattern() {
-		return this.formatPattern || "medium"; // get from config
-	}
+		if (isEnter(event) || isEnterShift(event)) {
+			this._selectDate(event, isEnterShift(event));
+		} else if (isSpace(event) || isSpaceShift(event)) {
+			event.preventDefault();
+		} else if (isLeft(event)) {
+			this._modifyTimestampBy(-1, "day");
+		} else if (isRight(event)) {
+			this._modifyTimestampBy(1, "day");
+		} else if (isUp(event)) {
+			this._modifyTimestampBy(-7, "day");
+		} else if (isDown(event)) {
+			this._modifyTimestampBy(7, "day");
+		} else if (isPageUp(event)) {
+			this._modifyTimestampBy(-1, "month");
+		} else if (isPageDown(event)) {
+			this._modifyTimestampBy(1, "month");
+		} else if (isPageUpShift(event) || isPageUpAlt(event)) {
+			this._modifyTimestampBy(-1, "year");
+		} else if (isPageDownShift(event) || isPageDownAlt(event)) {
+			this._modifyTimestampBy(1, "year");
+		} else if (isPageUpShiftCtrl(event)) {
+			this._modifyTimestampBy(-10, "year");
+		} else if (isPageDownShiftCtrl(event)) {
+			this._modifyTimestampBy(10, "year");
+		} else if (isHome(event) || isEnd(event)) {
+			this._onHomeOrEnd(isHome(event));
+		} else if (isHomeCtrl(event)) {
+			const tempDate = new CalendarDate(this._calendarDate, this._primaryCalendarType);
+			tempDate.setDate(1); // Set the first day of the month
+			this._setTimestamp(tempDate.valueOf() / 1000);
+		} else if (isEndCtrl(event)) {
+			const tempDate = new CalendarDate(this._calendarDate, this._primaryCalendarType);
+			tempDate.setMonth(tempDate.getMonth() + 1);
+			tempDate.setDate(0); // Set the last day of the month (0th day of next month)
+			this._setTimestamp(tempDate.valueOf() / 1000);
+		} else {
+			preventDefault = false;
+		}
 
-	get _month() {
-		return this._calendarDate.getMonth();
+		if (preventDefault) {
+			event.preventDefault();
+		}
 	}
 
-	get _year() {
-		return this._calendarDate.getYear();
+	_onkeyup(event) {
+		// Even if Space+Shift was pressed, ignore the shift unless in Multiple selection
+		if (isSpace(event) || (isSpaceShift(event) && this.selectionMode !== CalendarSelectionMode.Multiple)) {
+			this._selectDate(event, false);
+		} else if (isSpaceShift(event)) {
+			this._selectWeek(event);
+		}
 	}
 
-	get _currentCalendarDate() {
-		return CalendarDate.fromTimestamp(new Date().getTime(), this._primaryCalendarType);
+	/**
+	 * Click is the same as Enter: Click+Shift has the same effect as Enter+Shift
+	 * @param event
+	 * @private
+	 */
+	_onclick(event) {
+		this._selectDate(event, event.shiftKey);
 	}
 
-	get _selectedDates() {
-		return this.selectedDates || [];
+	/**
+	 * One Home or End, move the focus to the first or last item in the row
+	 * @param homePressed
+	 * @private
+	 */
+	_onHomeOrEnd(homePressed) {
+		this._weeks.forEach(week => {
+			const dayInThisWeek = week.findIndex(item => {
+				const date = CalendarDate.fromTimestamp(parseInt(item.timestamp) * 1000);
+				return date.getMonth() === this._calendarDate.getMonth() && date.getDate() === this._calendarDate.getDate();
+			}) !== -1;
+			if (dayInThisWeek) { // The current day is in this week
+				const index = homePressed ? 1 : 7; // select the first (if Home) or last (if End) day of the week
+				this._setTimestamp(parseInt(week[index].timestamp));
+			}
+		});
 	}
 
-	get _primaryCalendarType() {
-		const localeData = getCachedLocaleDataInstance(getLocale());
-		return this.primaryCalendarType || getCalendarType() || localeData.getPreferredCalendarType();
+	/**
+	 * Called from Calendar.js
+	 * @protected
+	 */
+	_hasPreviousPage() {
+		return !(this._calendarDate.getMonth() === this._minDate.getMonth() && this._calendarDate.getYear() === this._minDate.getYear());
 	}
 
-	get focusableDays() {
-		const focusableDays = [];
-
-		for (let i = 0; i < this._weeks.length; i++) {
-			const week = this._weeks[i].slice(1).filter(x => !x.disabled);
-			focusableDays.push(week);
-		}
-
-		return [].concat(...focusableDays);
+	/**
+	 * Called from Calendar.js
+	 * @protected
+	 */
+	_hasNextPage() {
+		return !(this._calendarDate.getMonth() === this._maxDate.getMonth() && this._calendarDate.getYear() === this._maxDate.getYear());
 	}
 
-	get _dayPickerWeekNumberText() {
-		return this.i18nBundle.getText(DAY_PICKER_WEEK_NUMBER_TEXT);
+	/**
+	 * Called from Calendar.js
+	 * Same as PageUp
+	 * @protected
+	 */
+	_showPreviousPage() {
+		this._modifyTimestampBy(-1, "month");
 	}
 
-	get _dayPickerNonWorkingDay() {
-		return this.i18nBundle.getText(DAY_PICKER_NON_WORKING_DAY);
+	/**
+	 * Called from Calendar.js
+	 * Same as PageDown
+	 * @protected
+	 */
+	_showNextPage() {
+		this._modifyTimestampBy(1, "month");
 	}
 
-	_modifySelectionAndNotifySubscribers(sNewDate, bAdd) {
-		if (bAdd) {
-			this.selectedDates = [...this._selectedDates, sNewDate];
-		} else {
-			this.selectedDates = [sNewDate];
-		}
-
-		this.fireEvent("change", { dates: [...this._selectedDates] });
-	}
+	/**
+	 * Modifies the timestamp by a certain amount of days/months/years
+	 * @param amount
+	 * @param unit
+	 * @private
+	 */
+	_modifyTimestampBy(amount, unit) {
+		// Modify the current timestamp
+		this._safelyModifyTimestampBy(amount, unit);
+		this._updateSecondTimestamp();
 
-	_handleMonthBottomOverflow(event) {
-		this._itemNav.hasNextPage = this._hasNextMonth();
+		// Notify the calendar to update its timestamp
+		this.fireEvent("navigate", { timestamp: this.timestamp });
 	}
 
-	_handleMonthTopOverflow(event) {
-		this._itemNav.hasPrevPage = this._hasPrevMonth();
+	/**
+	 * Sets the timestamp to an absolute value
+	 * @param value
+	 * @private
+	 */
+	_setTimestamp(value) {
+		this._safelySetTimestamp(value);
+		this._updateSecondTimestamp();
+		this.fireEvent("navigate", { timestamp: this.timestamp });
 	}
 
-	_hasNextMonth() {
-		let newMonth = this._month + 1;
-		let newYear = this._year;
-		const maxCalendarYear = CalendarDate.fromTimestamp(this._getMaxCalendarDate(), this._primaryCalendarType).getYear();
-
-		if (newMonth > 11) {
-			newMonth = 0;
-			newYear++;
-		}
-
-		if (newYear > maxCalendarYear && newMonth === 0) {
-			return false;
-		}
-
-		if (!this.maxDate) {
-			return true;
-		}
-
-		const oNewDate = this._calendarDate;
-		oNewDate.setDate(oNewDate.getDate());
-		oNewDate.setYear(newYear);
-		oNewDate.setMonth(newMonth);
-
-		const monthsBetween = monthDiff(oNewDate.valueOf(), this._maxDate);
-		if (monthsBetween < 0) {
-			return false;
-		}
-
-		const lastFocusableDay = this.focusableDays[this.focusableDays.length - 1].iDay;
-		if (monthsBetween === 0 && CalendarDate.fromTimestamp(this._maxDate).toLocalJSDate().getDate() === lastFocusableDay) {
-			return false;
+	/**
+	 * During range selection, when the user is navigating with the keyboard, the currently focused day is considered the "second day"
+	 * @private
+	 */
+	_updateSecondTimestamp() {
+		if (this.selectionMode === CalendarSelectionMode.Range && this.selectedDates.length === 1) {
+			this._secondTimestamp = this.timestamp;
 		}
-
-		return true;
 	}
 
-	_hasPrevMonth() {
-		let newMonth = this._month - 1;
-		let newYear = this._year;
-		const minCalendarYear = CalendarDate.fromTimestamp(this._getMinCalendarDate(), this._primaryCalendarType).getYear();
-
-		if (newMonth < 0) {
-			newMonth = 11;
-			newYear--;
-		}
-
-		if (newYear < minCalendarYear && newMonth === 11) {
-			return false;
-		}
-
-		if (!this.minDate) {
+	get shouldHideWeekNumbers() {
+		if (this._primaryCalendarType !== CalendarType.Gregorian) {
 			return true;
 		}
 
-		const oNewDate = this._calendarDate;
-		oNewDate.setDate(oNewDate.getDate());
-		oNewDate.setYear(newYear);
-		oNewDate.setMonth(newMonth);
-
-		const monthsBetween = monthDiff(this._minDate, oNewDate.valueOf());
-		if (this.minDate && monthsBetween < 0) {
-			return false;
-		}
-
-		return true;
-	}
-
-	_handleItemNavigationBorderReach(event) {
-		const currentItem = this._itemNav._getCurrentItem();
-		let newDate;
-		let currentDate;
-		let currentTimestamp;
-
-		if (isUp(event.originalEvent) || isLeft(event.originalEvent)) {
-			currentTimestamp = this._weeks[0][event.offset + 1].timestamp * 1000;
-			newDate = CalendarDate.fromTimestamp(currentTimestamp, this._primaryCalendarType);
-			newDate.setDate(newDate.getDate() - 7);
-		}
-
-		if (isDown(event.originalEvent) || isRight(event.originalEvent)) {
-			currentTimestamp = this._weeks[this._weeks.length - 1][event.offset + 1].timestamp * 1000;
-			newDate = CalendarDate.fromTimestamp(currentTimestamp, this._primaryCalendarType);
-			newDate.setDate(newDate.getDate() + 7);
-		}
-
-		if (isPageUp(event.originalEvent)) {
-			currentTimestamp = parseInt(currentItem.getAttribute("data-sap-timestamp") * 1000);
-			currentDate = CalendarDate.fromTimestamp(currentTimestamp, this._primaryCalendarType);
-			newDate = new CalendarDate(currentDate, this._primaryCalendarType);
-			newDate.setMonth(newDate.getMonth() - 1);
-			if (currentDate.getMonth() === newDate.getMonth()) {
-				newDate.setDate(0);
-			}
-		}
-
-		if (isPageDown(event.originalEvent)) {
-			currentTimestamp = parseInt(currentItem.getAttribute("data-sap-timestamp") * 1000);
-			currentDate = CalendarDate.fromTimestamp(currentTimestamp, this._primaryCalendarType);
-			newDate = new CalendarDate(currentDate, this._primaryCalendarType);
-			newDate.setMonth(newDate.getMonth() + 1);
-			if (newDate.getMonth() - currentDate.getMonth() > 1) {
-				newDate.setDate(0);
-			}
-		}
-
-		if (!newDate) {
-			return;
-		}
-
-		if (newDate.valueOf() < this._minDate) {
-			newDate = CalendarDate.fromLocalJSDate(new Date(this._minDate), this._primaryCalendarType);
-		} else if (newDate.valueOf() > this._maxDate) {
-			newDate = CalendarDate.fromLocalJSDate(new Date(this._maxDate), this._primaryCalendarType);
-		}
-
-		currentTimestamp = (newDate.valueOf() / 1000);
-
-		this._navigateAndWaitRerender(currentTimestamp);
-	}
-
-	_handleItemNavigationAfterFocus() {
-		const currentItem = this._itemNav._getCurrentItem();
-		const currentTimestamp = parseInt(currentItem.getAttribute("data-sap-timestamp"));
-
-		if (currentItem.classList.contains("ui5-dp-item--othermonth")) {
-			this._navigateAndWaitRerender(currentTimestamp);
-		}
-	}
-
-	async _navigateAndWaitRerender(timestamp) {
-		this.fireEvent("navigate", { timestamp });
-		await RenderScheduler.whenFinished();
-
-		const newItemIndex = this._itemNav._getItems().findIndex(item => parseInt(item.timestamp) === timestamp);
-		this._itemNav.currentIndex = newItemIndex;
-		this._itemNav.focusCurrent();
-		this._fireDayPickerRendered();
+		return this.hideWeekNumbers;
 	}
 
-	_fireDayPickerRendered() {
-		if (this.selectedDates.length === 1) {
-			this.fireEvent("daypickerrendered", { focusedItemIndex: this._itemNav.currentIndex });
-		}
+	get hasSecondaryCalendarType() {
+		return !!this.secondaryCalendarType;
 	}
 
 	_isWeekend(oDate) {
@@ -812,126 +697,31 @@ class DayPicker extends UI5Element {
 
 	_isDayPressed(target) {
 		const targetParent = target.parentNode;
-		return (target.className.indexOf("ui5-dp-item") > -1) || (targetParent && target.parentNode.classList.contains("ui5-dp-item"));
+		return (target.className.indexOf("ui5-dp-item") > -1) || (targetParent && targetParent.classList && targetParent.classList.contains("ui5-dp-item"));
 	}
 
-	_isOutOfSelectableRange(date) {
-		const currentDate = date._oUDate ? date.toLocalJSDate() : CalendarDate.fromTimestamp(date).toLocalJSDate();
-		const minDate = this._minDateObject;
-		const maxDate = this._maxDateObject;
-
-		currentDate.setHours(0);
-		if (minDate) {
-			minDate.setHours(0);
-		}
-		if (maxDate) {
-			maxDate.setHours(0);
-		}
-
-		return currentDate > maxDate || currentDate < minDate;
+	_getSecondaryDay(tempDate) {
+		return new CalendarDate(tempDate, this.secondaryCalendarType);
 	}
 
-	get _maxDate() {
-		return this.maxDate ? this._getTimeStampFromString(this.maxDate) : this._getMaxCalendarDate();
-	}
+	_getFirstDay() {
+		let daysFromPreviousMonth;
 
-	get _minDate() {
-		return this.minDate ? this._getTimeStampFromString(this.minDate) : this._getMinCalendarDate();
-	}
-
-	_getTimeStampFromString(value) {
-		const jsDate = this.getFormat().parse(value);
-		if (jsDate) {
-			const calDate = CalendarDate.fromLocalJSDate(jsDate, this._primaryCalendarType);
-			return calDate.toUTCJSDate().valueOf();
-		}
-		return undefined;
-	}
-
-	_getMinCalendarDate() {
-		const minDate = new CalendarDate(1, 0, 1, this._primaryCalendarType);
-		minDate.setYear(1);
-		minDate.setMonth(0);
-		minDate.setDate(1);
-		return minDate.toUTCJSDate().valueOf();
-	}
-
-	_getMaxCalendarDate() {
-		const maxDate = new CalendarDate(1, 0, 1, this._primaryCalendarType);
-		maxDate.setYear(9999);
-		maxDate.setMonth(11);
-		const tempDate = new CalendarDate(maxDate, this._primaryCalendarType);
-		tempDate.setDate(1);
-		tempDate.setMonth(tempDate.getMonth() + 1, 0);
-		maxDate.setDate(tempDate.getDate());// 31st for Gregorian Calendar
-		return maxDate.toUTCJSDate().valueOf();
-	}
-
-	getFormat() {
-		if (this._isPattern) {
-			this._oDateFormat = DateFormat.getInstance({
-				pattern: this._formatPattern,
-				calendarType: this._primaryCalendarType,
-			});
-		} else {
-			this._oDateFormat = DateFormat.getInstance({
-				style: this._formatPattern,
-				calendarType: this._primaryCalendarType,
-			});
-		}
-		return this._oDateFormat;
-	}
-
-	get _isPattern() {
-		return this._formatPattern !== "medium" && this._formatPattern !== "short" && this._formatPattern !== "long";
-	}
-
-	_getVisibleDays(oStartDate, bIncludeBCDates) {
-		let oCalDate,
-			iDaysOldMonth,
-			iYear;
-
-		const minCalendarDateYear = CalendarDate.fromTimestamp(this._getMinCalendarDate(), this._primaryCalendarType).getYear();
-		const maxCalendarDateYear = CalendarDate.fromTimestamp(this._getMaxCalendarDate(), this._primaryCalendarType).getYear();
-		const _aVisibleDays = [];
-
-		// If date passed generate days for new start date else return the current one
-		if (!oStartDate) {
-			return _aVisibleDays;
-		}
-
-		const iFirstDayOfWeek = this._getFirstDayOfWeek();
+		const firstDayOfWeek = this._getFirstDayOfWeek();
 
 		// determine weekday of first day in month
-		const oFirstDay = new CalendarDate(oStartDate, this._primaryCalendarType);
-		oFirstDay.setDate(1);
-		iDaysOldMonth = oFirstDay.getDay() - iFirstDayOfWeek;
-		if (iDaysOldMonth < 0) {
-			iDaysOldMonth = 7 + iDaysOldMonth;
-		}
-
-		if (iDaysOldMonth > 0) {
-			// determine first day for display
-			oFirstDay.setDate(1 - iDaysOldMonth);
+		const firstDay = new CalendarDate(this._calendarDate, this._primaryCalendarType);
+		firstDay.setDate(1);
+		daysFromPreviousMonth = firstDay.getDay() - firstDayOfWeek;
+		if (daysFromPreviousMonth < 0) {
+			daysFromPreviousMonth = 7 + daysFromPreviousMonth;
 		}
 
-		const oDay = new CalendarDate(oFirstDay);
-		for (let i = 0; i < 42; i++) {
-			iYear = oDay.getYear();
-			oCalDate = new CalendarDate(oDay, this._primaryCalendarType);
-			if (bIncludeBCDates && iYear < minCalendarDateYear) {
-				// For dates before 0001-01-01 we should render only empty squares to keep
-				// the month square matrix correct.
-				oCalDate._bBeforeFirstYear = true;
-				_aVisibleDays.push(oCalDate);
-			} else if (iYear >= minCalendarDateYear && iYear <= maxCalendarDateYear) {
-				// Days before 0001-01-01 or after 9999-12-31 should not be rendered.
-				_aVisibleDays.push(oCalDate);
-			}
-			oDay.setDate(oDay.getDate() + 1);
+		if (daysFromPreviousMonth > 0) {
+			firstDay.setDate(1 - daysFromPreviousMonth);
 		}
 
-		return _aVisibleDays;
+		return firstDay;
 	}
 
 	_getFirstDayOfWeek() {
@@ -944,6 +734,7 @@ class DayPicker extends UI5Element {
 		return {
 			wrapper: {
 				display: this._hidden ? "none" : "flex",
+				"justify-content": "center",
 			},
 			main: {
 				width: "100%",
@@ -951,11 +742,10 @@ class DayPicker extends UI5Element {
 		};
 	}
 
-	static async onDefine() {
-		await Promise.all([
-			fetchCldr(getLocale().getLanguage(), getLocale().getRegion(), getLocale().getScript()),
-			fetchI18nBundle("@ui5/webcomponents"),
-		]);
+	get ariaRoledescription() {
+		return this.hasSecondaryCalendarType
+			? `${this._primaryCalendarType} calendar with secondary ${this.secondaryCalendarType} calendar`
+			: `${this._primaryCalendarType} calendar`;
 	}
 }