@openui5/sap.ui.unified 1.111.6 → 1.112.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.111.6",
+  "version": "1.112.1",
   "description": "OpenUI5 UI Library sap.ui.unified",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.111.6"
+    "@openui5/sap.ui.core": "1.112.1"
   }
 }

package/src/sap/ui/unified/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.111.6</version>
+  <version>1.112.1</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

package/src/sap/ui/unified/Calendar.js

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public
@@ -138,14 +138,14 @@ sap.ui.define([
 			 * If not set, the calendar type of the global configuration is used.
 			 * @since 1.34.0
 			 */
-			primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance"},
+			primaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null},
 
 			/**
 			 * If set, the days are also displayed in this calendar type
 			 * If not set, the dates are only displayed in the primary calendar type
 			 * @since 1.34.0
 			 */
-			secondaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance"},
+			secondaryCalendarType : {type : "sap.ui.core.CalendarType", group : "Appearance", defaultValue : null},
 
 			/**
 			 * Width of Calendar
@@ -349,6 +349,11 @@ sap.ui.define([
 		this._iBreakPointDesktop = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[1];
 		this._iBreakPointLargeDesktop = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[2];
 
+		// set default calendar type from configuration
+		var sCalendarType = Configuration.getCalendarType();
+		this.setProperty("primaryCalendarType", sCalendarType);
+		this.setProperty("secondaryCalendarType", sCalendarType);
+
 		this._iColumns = 1; // default columns for the calendar
 
 		// Render the monthPicker first to get the length of the current month name. The _currentPicker property will
@@ -356,12 +361,12 @@ sap.ui.define([
 		this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH_PICKER);
 
 		// to format year with era in Japanese
-		this._oYearFormat = DateFormat.getDateInstance({format: "y", calendarType: this._getPrimaryCalendarType()});
+		this._oYearFormat = DateFormat.getDateInstance({format: "y", calendarType: sCalendarType});
 
 		this.data("sap-ui-fastnavgroup", "true", true); // Define group for F6 handling
 
-		this._oMinDate = CalendarUtils._minDate(this._getPrimaryCalendarType());
-		this._oMaxDate = CalendarUtils._maxDate(this._getPrimaryCalendarType());
+		this._oMinDate = CalendarUtils._minDate(this.getPrimaryCalendarType());
+		this._oMaxDate = CalendarUtils._maxDate(this.getPrimaryCalendarType());
 
 		this._initializeHeader();
 		this._initializeSecondMonthHeader();
@@ -484,7 +489,7 @@ sap.ui.define([
 	Calendar.prototype._initializeYearRangePicker = function() {
 		var oYearRangePicker = new YearRangePicker(this.getId() + "--YRP");
 		oYearRangePicker.attachEvent("select", this._selectYearRange, this);
-		oYearRangePicker.setPrimaryCalendarType(this._getPrimaryCalendarType());
+		oYearRangePicker.setPrimaryCalendarType(this.getPrimaryCalendarType());
 		this.setAggregation("yearRangePicker", oYearRangePicker); // do not invalidate
 	};
 
@@ -504,7 +509,7 @@ sap.ui.define([
 				weekDays: oWeekDays
 			});
 
-		this._focusDate(CalendarDate.fromLocalJSDate(oWeekDays.getStartDate(), this._getPrimaryCalendarType()), true, false, false);
+		this._focusDate(CalendarDate.fromLocalJSDate(oWeekDays.getStartDate(), this.getPrimaryCalendarType()), true, false, false);
 
 		if (!bExecuteDefault) {
 			oEvent.preventDefault();
@@ -537,7 +542,7 @@ sap.ui.define([
 
 		if (aMonths.length > 1 && oMonthDate) {
 			// for more than one month - re-render same months (if already rendered once)
-			oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this._getPrimaryCalendarType());
+			oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this.getPrimaryCalendarType());
 		} else if (aMonths.length > 1) {
 			oCalDate = _determineFirstMonthDate.call(this, this._getFocusedDate());
 		} else  {
@@ -564,6 +569,7 @@ sap.ui.define([
 		this._updateHeader(oCalDate);
 
 		this._updateHeadersButtons();
+		this._adjustYearRangeDisplay();
 
 		this._updateLegendParent();
 		if (this.getInitialFocusedDate()) {
@@ -729,7 +735,7 @@ sap.ui.define([
 	 */
 	Calendar.prototype._setFocusedDate = function(oDate){
 		CalendarUtils._checkCalendarDate(oDate);
-		this._oFocusedDate = new CalendarDate(oDate, this._getPrimaryCalendarType());
+		this._oFocusedDate = new CalendarDate(oDate, this.getPrimaryCalendarType());
 	};
 
 	/**
@@ -780,7 +786,7 @@ sap.ui.define([
 		if (this.getDomRef()) {
 			// if rendered just use the date of the first month
 			var aMonths = this.getAggregation("month");
-			oStartDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this._getPrimaryCalendarType());
+			oStartDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this.getPrimaryCalendarType());
 		} else {
 			// if not rendered use the focused date
 			oStartDate = new CalendarDate(this._getFocusedDate());
@@ -859,7 +865,6 @@ sap.ui.define([
 			i;
 
 		this.setProperty("primaryCalendarType", sCalendarType);
-		this._adjustYearRangeDisplay();
 
 		this._oYearFormat = DateFormat.getDateInstance({format: "y", calendarType: sCalendarType});
 
@@ -892,6 +897,7 @@ sap.ui.define([
 
 	Calendar.prototype.setSecondaryCalendarType = function(sCalendarType){
 
+		this._bSecondaryCalendarTypeSet = true; // as property can not be empty but we use it only if set
 		this.setProperty("secondaryCalendarType", sCalendarType);
 
 		this._oYearFormatSecondary = DateFormat.getDateInstance({format: "y", calendarType: sCalendarType});
@@ -911,22 +917,24 @@ sap.ui.define([
 
 	};
 
-	Calendar.prototype._getPrimaryCalendarType = function(){
-		return this.getProperty("primaryCalendarType") || Configuration.getCalendarType();
-	};
-
 	/**
 	 * Returns if there is secondary calendar type set and if it is different from the primary one.
-	 * @returns {string} if there is secondary calendar type set and if it is different from the primary one
+	 * @returns {boolean} if there is secondary calendar type set and if it is different from the primary one
 	 */
 	Calendar.prototype._getSecondaryCalendarType = function(){
-		var sSecondaryCalendarType = this.getSecondaryCalendarType();
 
-		if (sSecondaryCalendarType === this._getPrimaryCalendarType()) {
-			return undefined;
+		var sSecondaryCalendarType;
+
+		if (this._bSecondaryCalendarTypeSet) {
+			sSecondaryCalendarType = this.getSecondaryCalendarType();
+			var sPrimaryCalendarType = this.getPrimaryCalendarType();
+			if (sSecondaryCalendarType == sPrimaryCalendarType) {
+				sSecondaryCalendarType = undefined;
+			}
 		}
 
 		return sSecondaryCalendarType;
+
 	};
 
 	/**
@@ -962,7 +970,7 @@ sap.ui.define([
 	 */
 	Calendar.prototype.setMinDate = function(oDate){
 		var aMonths = this.getAggregation("month"),
-			sPrimaryCalendarType = this._getPrimaryCalendarType(),
+			sPrimaryCalendarType = this.getPrimaryCalendarType(),
 			iMinYear;
 
 		if (deepEqual(oDate, this.getMinDate())) {
@@ -1017,7 +1025,7 @@ sap.ui.define([
 	Calendar.prototype.setMaxDate = function(oDate){
 
 		var aMonths = this.getAggregation("month"),
-			sPrimaryCalendarType = this._getPrimaryCalendarType(),
+			sPrimaryCalendarType = this.getPrimaryCalendarType(),
 			iMaxYear;
 
 		if (deepEqual(oDate, this.getMaxDate())) {
@@ -1287,7 +1295,7 @@ sap.ui.define([
 
 		var oCalDate;
 		if (aMonths.length > 1) {
-			oCalDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this._getPrimaryCalendarType());
+			oCalDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this.getPrimaryCalendarType());
 		} else {
 			oCalDate = this._getFocusedDate();
 		}
@@ -1343,7 +1351,7 @@ sap.ui.define([
 		var oHeader = this.getAggregation("header");
 		var iMonths = _getMonths.call(this);
 
-		var oCheckDate = new CalendarDate(oDate, this._getPrimaryCalendarType());
+		var oCheckDate = new CalendarDate(oDate, this.getPrimaryCalendarType());
 
 		if (this._iMode === 1 && iMonths > 1) {
 			oCheckDate = _determineFirstMonthDate.call(this, oDate);
@@ -1395,7 +1403,7 @@ sap.ui.define([
 	Calendar.prototype._togglePrevNexYearPicker = function(){
 		var oYearRangePicker = this.getAggregation("yearRangePicker"),
 			oYearPicker = this._getYearPicker(),
-			sPrimaryType = this._getPrimaryCalendarType(),
+			sPrimaryType = this.getPrimaryCalendarType(),
 			oMinDate = new CalendarDate(this._oMinDate, sPrimaryType),
 			oMaxDate = new CalendarDate(this._oMaxDate, sPrimaryType),
 			oHeader = this.getAggregation("header"),
@@ -1444,7 +1452,7 @@ sap.ui.define([
 		switch (this._iMode) {
 		case 0: // day picker
 			if (iMonths > 1) {
-				oFirstMonthDate = CalendarDate.fromLocalJSDate(this.getAggregation("month")[0].getDate(), this._getPrimaryCalendarType());
+				oFirstMonthDate = CalendarDate.fromLocalJSDate(this.getAggregation("month")[0].getDate(), this.getPrimaryCalendarType());
 				oFirstMonthDate.setDate(1);
 				this._setFocusedDate(oFirstMonthDate);
 				oFocusedDate = this._getFocusedDate();
@@ -1503,7 +1511,7 @@ sap.ui.define([
 		switch (this._iMode) {
 		case 0: // day picker
 			if (iMonths > 1) {
-				oFirstMonthDate = CalendarDate.fromLocalJSDate(this.getAggregation("month")[0].getDate(), this._getPrimaryCalendarType());
+				oFirstMonthDate = CalendarDate.fromLocalJSDate(this.getAggregation("month")[0].getDate(), this.getPrimaryCalendarType());
 				oFirstMonthDate.setMonth(oFirstMonthDate.getMonth(),1);
 				this._setFocusedDate(oFirstMonthDate);
 				oFocusedDate = this._getFocusedDate();
@@ -1621,7 +1629,7 @@ sap.ui.define([
 
 	Calendar.prototype._getDisplayedSecondaryMonths = function(){
 
-		var sPrimaryCalendarType = this._getPrimaryCalendarType(),
+		var sPrimaryCalendarType = this.getPrimaryCalendarType(),
 			sSecondaryCalendarType = this._getSecondaryCalendarType(),
 			aMonths = this.getAggregation("month"),
 			oFirstDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), sPrimaryCalendarType),
@@ -1646,7 +1654,7 @@ sap.ui.define([
 	 * @returns {object} two values - start and end date
 	 */
 	Calendar.prototype._getDisplayedSecondaryYears = function(){
-		var sPrimaryCalendarType = this._getPrimaryCalendarType(),
+		var sPrimaryCalendarType = this.getPrimaryCalendarType(),
 			sSecondaryCalendarType = this._getSecondaryCalendarType(),
 			oFirstDate, oLastDate, oFocusedDate, oDate, aMonths, oYearPicker, iHalfRange;
 		switch (this._iMode) {
@@ -1738,7 +1746,7 @@ sap.ui.define([
 	*/
 	Calendar.prototype._handleFocus = function (oEvent) {
 
-		var oDate = CalendarDate.fromLocalJSDate(oEvent.getParameter("date"), this._getPrimaryCalendarType()),
+		var oDate = CalendarDate.fromLocalJSDate(oEvent.getParameter("date"), this.getPrimaryCalendarType()),
 			bOtherMonth = oEvent.getParameter("otherMonth"),
 			bRestoreOldDate = oEvent.getParameter("restoreOldDate");
 
@@ -1779,14 +1787,14 @@ sap.ui.define([
 			aMonths = this.getAggregation("month"),
 			oMonth,
 			oMonthDate,
-			oFirstDate = _determineFirstMonthDate.call(this, new CalendarDate(oDate, this._getPrimaryCalendarType())),
+			oFirstDate = _determineFirstMonthDate.call(this, new CalendarDate(oDate, this.getPrimaryCalendarType())),
 			i = 0,
 			bMonthContainsDate = aMonths[0].checkDateFocusable(oDate.toLocalJSDate()),
 			bFireStartDateChange = !bNoEvent && !bMonthContainsDate;
 
 		for (i = 0; i < aMonths.length; i++) {
 			oMonth = aMonths[i];
-			oMonthDate = new CalendarDate(oFirstDate, this._getPrimaryCalendarType());
+			oMonthDate = new CalendarDate(oFirstDate, this.getPrimaryCalendarType());
 			oMonthDate.setMonth(oFirstDate.getMonth() + i);
 			if (!bSkipFocus && CalendarUtils._isSameMonthAndYear(oMonthDate, oDate)) {
 				oMonth.setDate(oDate.toLocalJSDate());
@@ -1989,7 +1997,7 @@ sap.ui.define([
 		var sText;
 		var sYear;
 		var sPattern;
-		var sPrimaryCalendarType = this._getPrimaryCalendarType();
+		var sPrimaryCalendarType = this.getPrimaryCalendarType();
 		var sSecondaryCalendarType = this._getSecondaryCalendarType();
 		var sSecondaryMonthInfo = "";
 
@@ -2101,7 +2109,7 @@ sap.ui.define([
 
 		if (aMonths.length > 1 && oMonthDate) {
 			// for more than one month - re-render same months (if already rendered once)
-			oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this._getPrimaryCalendarType());
+			oCalDate = CalendarDate.fromLocalJSDate(oMonthDate, this.getPrimaryCalendarType());
 		} else if (aMonths.length > 1) {
 			oCalDate = _determineFirstMonthDate.call(this, this._getFocusedDate());
 		} else {
@@ -2130,19 +2138,23 @@ sap.ui.define([
 	};
 
 	Calendar.prototype._selectMonth = function () {
-		var oFocusedDate = new CalendarDate(this._getFocusedDate(), this._getPrimaryCalendarType()),
+		var oFocusedDate = new CalendarDate(this._getFocusedDate(), this.getPrimaryCalendarType()),
 			oMonthPicker = this._getMonthPicker(),
 			iFocusedMonth = oMonthPicker.getProperty("_focusedMonth"),
 			iMonth = (iFocusedMonth || iFocusedMonth === 0) ? iFocusedMonth : oMonthPicker.getMonth(),
-			oSecondDate = oMonthPicker._iYear ?
-				new CalendarDate(oMonthPicker._iYear, iMonth - 1, 1) :
+			oSecondCalDate = CalendarDate.fromLocalJSDate(UI5Date.getInstance(), this.getPrimaryCalendarType());
+
+			oSecondCalDate = oMonthPicker._iYear ?
+				oSecondCalDate
+					.setYear(oMonthPicker._iYear)
+					.setMonth(iMonth - 1, 1) :
 				new CalendarDate(this._getFocusedDate().getYear(), iMonth - 1, 1);
 
 		if (_getMonths.call(this) > 1) {
-			if (this._bActionTriggeredFromSecondHeader && oSecondDate.getYear() >= CalendarUtils._minDate().getYear()) {
-				oFocusedDate.setYear(oSecondDate.getYear());
-				iMonth = oSecondDate.getMonth();
-			} else if (oFocusedDate.getYear() === CalendarUtils._maxDate().getYear() && iMonth === 11) {
+			if (this._bActionTriggeredFromSecondHeader && oSecondCalDate.getYear() >= CalendarUtils._minDate(this.getPrimaryCalendarType()).getYear()) {
+				oFocusedDate.setYear(oSecondCalDate.getYear());
+				iMonth = oSecondCalDate.getMonth();
+			} else if (oFocusedDate.getYear() === CalendarUtils._maxDate(this.getPrimaryCalendarType()).getYear() && iMonth === 11) {
 				iMonth -= 1;
 			}
 		}
@@ -2175,10 +2187,10 @@ sap.ui.define([
 	 * @returns {void}
 	 */
 	Calendar.prototype._selectYear = function () {
-		var oFocusedDate = new CalendarDate(this._getFocusedDate(), this._getPrimaryCalendarType()),
+		var oFocusedDate = new CalendarDate(this._getFocusedDate(), this.getPrimaryCalendarType()),
 			oFocusedMonth = oFocusedDate.getMonth(),
 			oYearPicker = this._getYearPicker(),
-			oDate = CalendarDate.fromLocalJSDate(oYearPicker.getDate(), this._getPrimaryCalendarType());
+			oDate = CalendarDate.fromLocalJSDate(oYearPicker.getDate(), this.getPrimaryCalendarType());
 
 		// to keep day and month stable also for islamic date
 		if (!this._bActionTriggeredFromSecondHeader){
@@ -2219,7 +2231,7 @@ sap.ui.define([
 		var oYearRangePicker = this.getAggregation("yearRangePicker"),
 			oHeader = this.getAggregation("header"),
 			iRangeSize = oYearRangePicker.getRangeSize(),
-			sPrimaryCalendarType = this._getPrimaryCalendarType(),
+			sPrimaryCalendarType = this.getPrimaryCalendarType(),
 			oStartDate = CalendarDate.fromLocalJSDate(oYearRangePicker.getDate(), sPrimaryCalendarType),
 			oEndDate = new CalendarDate(oStartDate.getYear() + iRangeSize - 1, 0, 1, sPrimaryCalendarType),
 			oFocusedDate = this._getFocusedDate(),
@@ -2228,9 +2240,9 @@ sap.ui.define([
 		oFocusedDate.setYear(oStartDate.getYear() + iRangeSize / 2);
 		oStartDate.setMonth(0, 1); // always use the first of the month to have stable year in Japanese calendar
 		if (oFocusedDate.isBefore(this._oMinDate)) {
-			oFocusedDate = new CalendarDate(this._oMinDate, this._getPrimaryCalendarType());
+			oFocusedDate = new CalendarDate(this._oMinDate, this.getPrimaryCalendarType());
 		} else if (oFocusedDate.isAfter(this._oMaxDate)){
-			oFocusedDate = new CalendarDate(this._oMaxDate, this._getPrimaryCalendarType());
+			oFocusedDate = new CalendarDate(this._oMaxDate, this.getPrimaryCalendarType());
 		}
 		this._setFocusedDate(oFocusedDate);
 
@@ -2247,7 +2259,7 @@ sap.ui.define([
 	Calendar.prototype._showYearRangePicker = function () {
 		var oYearRangePicker = this.getAggregation("yearRangePicker"),
 			oYearPicker = this._getYearPicker(),
-			oRangeMidDate = CalendarDate.fromLocalJSDate(oYearPicker.getFirstRenderedDate(), this._getPrimaryCalendarType());
+			oRangeMidDate = CalendarDate.fromLocalJSDate(oYearPicker.getFirstRenderedDate(), this.getPrimaryCalendarType());
 
 		this.setProperty("_currentPicker", CURRENT_PICKERS.YEAR_RANGE_PICKER);
 
@@ -2431,14 +2443,14 @@ sap.ui.define([
 			oSecondMonthHeader = this.getAggregation("secondMonthHeader"),
 			sFirstHeaderText = sFirstHeaderYear,
 			sSecondHeaderText = sSecondHeaderYear || sFirstHeaderYear,
-			sPrimaryCalendarType = this._getPrimaryCalendarType();
+			sPrimaryCalendarType = this.getPrimaryCalendarType();
 
 		if (this._iMode === 2 && oYearPicker) {
 
 			var oDate = oYearPicker.getProperty("_middleDate") ? oYearPicker.getProperty("_middleDate") : oYearPicker._getDate(),
 				oFirstDate = new CalendarDate(oDate, sPrimaryCalendarType),
-				oMinYear = CalendarUtils._minDate(this._getPrimaryCalendarType()).getYear(),
-				oMaxYear = CalendarUtils._maxDate(this._getPrimaryCalendarType()).getYear(),
+				oMinYear = CalendarUtils._minDate(this.getPrimaryCalendarType()).getYear(),
+				oMaxYear = CalendarUtils._maxDate(this.getPrimaryCalendarType()).getYear(),
 				oSecondDate,
 				sFirstYear,
 				sSecondYear;
@@ -2481,21 +2493,25 @@ sap.ui.define([
 	};
 
 	Calendar.prototype._adjustYearRangeDisplay = function() {
-		var oYearRangePicker = this.getAggregation("yearRangePicker");
+		var oYearRangePicker = this.getAggregation("yearRangePicker"),
+			sLang = sap.ui.getCore().getConfiguration().getLanguage().toLocaleLowerCase(),
+			sPrimaryCalendarType = this.getPrimaryCalendarType();
 
 		if (!this._getSucessorsPickerPopup()) {
-			switch (this._getPrimaryCalendarType()) {
-				case CalendarType.Japanese:
-					oYearRangePicker.setColumns(1);
-					oYearRangePicker.setYears(4);
-					break;
-				case CalendarType.Gregorian:
-					oYearRangePicker.setColumns(3);
-					oYearRangePicker.setYears(9);
-					break;
-				default:
-					oYearRangePicker.setColumns(2);
-					oYearRangePicker.setYears(8);
+			// An evaluation about the count of year cells that could fit in the sap.ui.unified.calendar.YearRangePicker
+			// has to be made based not only on the sap.ui.core.CalendarType, but also on the language configuration.
+			// Based on those two criteria a couple of groups with different year cells count would be indicated and we
+			// could cover those scenarios with visual tests afterwards. Currently only the scenario with korean language
+			// is covered.
+			if (sPrimaryCalendarType == CalendarType.Japanese) {
+				oYearRangePicker.setColumns(1);
+				oYearRangePicker.setYears(4);
+			} else if (sLang == "ko" || sLang == "ko-kr" || sPrimaryCalendarType != CalendarType.Gregorian) {
+				oYearRangePicker.setColumns(2);
+				oYearRangePicker.setYears(8);
+			} else if (sPrimaryCalendarType == CalendarType.Gregorian) {
+				oYearRangePicker.setColumns(3);
+				oYearRangePicker.setYears(9);
 			}
 		}
 	};
@@ -2531,7 +2547,7 @@ sap.ui.define([
 	function _determineFocusedDate(){
 
 		var aSelectedDates = this.getSelectedDates();
-		var sCalendarType = this._getPrimaryCalendarType();
+		var sCalendarType = this.getPrimaryCalendarType();
 		if (aSelectedDates && aSelectedDates[0] && aSelectedDates[0].getStartDate()) {
 			// selected dates are provided -> use first one to focus
 			this._oFocusedDate = CalendarDate.fromLocalJSDate(aSelectedDates[0].getStartDate(), sCalendarType);
@@ -2650,7 +2666,7 @@ sap.ui.define([
 	 */
 	function _determineFirstMonthDate(oDate){
 
-		var oFirstDate = new CalendarDate(oDate, this._getPrimaryCalendarType());
+		var oFirstDate = new CalendarDate(oDate, this.getPrimaryCalendarType());
 		oFirstDate.setDate(1);
 
 		var iMonths = _getMonths.call(this); // to use validation
@@ -2688,7 +2704,7 @@ sap.ui.define([
 				oDate;
 
 				if (aMonths.length > 1) {
-					oDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this._getPrimaryCalendarType());
+					oDate = CalendarDate.fromLocalJSDate(aMonths[0].getDate(), this.getPrimaryCalendarType());
 				} else {
 					oDate = this._getFocusedDate();
 				}
@@ -2709,7 +2725,7 @@ sap.ui.define([
 	function _displayDate(oDate, bSkipFocus) {
 
 		var oCalDate,
-			sPrimaryCalendarType = this._getPrimaryCalendarType(),
+			sPrimaryCalendarType = this.getPrimaryCalendarType(),
 			iYear;
 
 		if (!oDate) {

package/src/sap/ui/unified/CalendarAppointment.js

@@ -5,8 +5,30 @@
  */
 
 // Provides control sap.ui.unified.CalendarAppointment.
-sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/format/NumberFormat', 'sap/ui/core/format/TimezoneUtil', 'sap/ui/core/Core', './calendar/CalendarUtils', './library', "sap/base/Log", "sap/ui/core/Configuration"],
-	function(DateTypeRange, DateFormat, NumberFormat, TimezoneUtil, Core, CalendarUtils, library, Log, Configuration) {
+sap.ui.define([
+	'./DateTypeRange',
+	'sap/ui/core/format/DateFormat',
+	'sap/ui/core/format/NumberFormat',
+	'sap/ui/core/format/TimezoneUtil',
+	'sap/ui/core/Core',
+	'./calendar/CalendarUtils',
+	'./library',
+	"sap/base/Log",
+	"sap/ui/core/Configuration",
+	"sap/ui/core/date/UI5Date"
+],
+	function(
+		DateTypeRange,
+		DateFormat,
+		NumberFormat,
+		TimezoneUtil,
+		Core,
+		CalendarUtils,
+		library,
+		Log,
+		Configuration,
+		UI5Date
+		) {
 	"use strict";
 
 	/**
@@ -21,7 +43,7 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public
@@ -124,12 +146,12 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 * @private
 	 */
 	CalendarAppointment.prototype._getDateRangeIntersectionText = function (oCurrentlyDisplayedDate) {
-		var oStartDate = this._getStartDateWithTimezoneAdaptation(),
-			oEndDate = this._getEndDateWithTimezoneAdaptation() ? this._getEndDateWithTimezoneAdaptation() : new Date(864000000000000), //in case of emergency call this number
+		var oStartDate = this.getStartDate(),
+			oEndDate = this.getEndDate() ? this.getEndDate() : UI5Date.getInstance(864000000000000), //in case of emergency call this number
 			sFirstLineText,
 			sSecondLineText,
-			oCurrentDayStart = new Date(oCurrentlyDisplayedDate.getFullYear(), oCurrentlyDisplayedDate.getMonth(), oCurrentlyDisplayedDate.getDate(), 0, 0, 0),
-			oNextDayStart = new Date(oCurrentDayStart.getFullYear(), oCurrentDayStart.getMonth(), oCurrentDayStart.getDate() + 1),
+			oCurrentDayStart = UI5Date.getInstance(oCurrentlyDisplayedDate.getFullYear(), oCurrentlyDisplayedDate.getMonth(), oCurrentlyDisplayedDate.getDate(), 0, 0, 0),
+			oNextDayStart = UI5Date.getInstance(oCurrentDayStart.getFullYear(), oCurrentDayStart.getMonth(), oCurrentDayStart.getDate() + 1),
 			oTimeFormat = DateFormat.getTimeInstance({pattern: "HH:mm"}),
 			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
 			oHourFormat = NumberFormat.getUnitInstance({
@@ -180,14 +202,14 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 */
 	CalendarAppointment._getComparer = function(oDate) {
 		var ONE_DAY = 24 * 60 * 60 * 1000,
-			iCurrentDayStartTime = new Date(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(), 0, 0, 0).getTime(),
+			iCurrentDayStartTime = UI5Date.getInstance(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(), 0, 0, 0).getTime(),
 			iNextDayStart = iCurrentDayStartTime + ONE_DAY;
 
 		return function(oAppInfo1, oAppInfo2) {
-			var iStartDateTime1 = oAppInfo1.appointment._getStartDateWithTimezoneAdaptation().getTime(),
-				iStartDateTime2 = oAppInfo2.appointment._getStartDateWithTimezoneAdaptation().getTime(),
-				iEndDateTime1 = oAppInfo1.appointment._getEndDateWithTimezoneAdaptation() ? oAppInfo1.appointment._getEndDateWithTimezoneAdaptation().getTime() : 864000000000000, //this is max date in case of no max date
-				iEndDateTime2 = oAppInfo2.appointment._getEndDateWithTimezoneAdaptation() ? oAppInfo2.appointment._getEndDateWithTimezoneAdaptation().getTime() : 864000000000000,
+			var iStartDateTime1 = oAppInfo1.appointment.getStartDate().getTime(),
+				iStartDateTime2 = oAppInfo2.appointment.getStartDate().getTime(),
+				iEndDateTime1 = oAppInfo1.appointment.getEndDate() ? oAppInfo1.appointment.getEndDate().getTime() : 864000000000000, //this is max date in case of no max date
+				iEndDateTime2 = oAppInfo2.appointment.getEndDate() ? oAppInfo2.appointment.getEndDate().getTime() : 864000000000000,
 				bWholeDay1 = iStartDateTime1 <= iCurrentDayStartTime && iEndDateTime1 >= iNextDayStart,
 				bWholeDay2 = iStartDateTime2 <= iCurrentDayStartTime && iEndDateTime2 >= iNextDayStart,
 				iResult;
@@ -252,42 +274,6 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 		return oAppointmentParts.length > 0 ? oAppointmentParts[0] : null;
 	};
 
-	CalendarAppointment.prototype._getEndDateWithTimezoneAdaptation = function() {
-		if (!this.getProperty("endDate")) {
-			return null;
-		}
-
-		var oEndDate = this._convertToTimezone(this.getEndDate());
-
-		return oEndDate;
-	};
-
-	CalendarAppointment.prototype._getStartDateWithTimezoneAdaptation = function() {
-		if (!this.getProperty("startDate")) {
-			return null;
-		}
-
-		var oStartDate = this._convertToTimezone(this.getStartDate());
-
-		return oStartDate;
-	};
-
-	/**
-	 * Aligns a date to the timezone from the configuration.
-	 *
-	 * @returns {Object} <code>oNewDate</code> aligned to the configured timezone.
-	 * @private
-	 */
-	CalendarAppointment.prototype._convertToTimezone = function(oDate) {
-		var sConfigTimezone = Core.getConfiguration().getTimezone();
-		var sLocalTimezone = TimezoneUtil.getLocalTimezone();
-
-		var iConfigOffsetMillis = TimezoneUtil.calculateOffset(oDate, sConfigTimezone) * 1000;
-		var iLocalOffsetMillis = TimezoneUtil.calculateOffset(oDate, sLocalTimezone) * 1000;
-
-		return new Date(oDate.getTime() - iConfigOffsetMillis + iLocalOffsetMillis);
-	};
-
 	return CalendarAppointment;
 
 });

package/src/sap/ui/unified/CalendarDateInterval.js

@@ -21,7 +21,9 @@ sap.ui.define([
 	"sap/ui/core/CalendarType",
 	"sap/ui/core/Core",
 	"sap/base/Log",
-	"./DateRange"
+	"./DateRange",
+	"sap/ui/core/date/UI5Date"
+
 ], function(
 	CalendarUtils,
 	Calendar,
@@ -38,7 +40,8 @@ sap.ui.define([
 	CalendarType,
 	Core,
 	Log,
-	DateRange
+	DateRange,
+    UI5Date
 ) {
 	"use strict";
 
@@ -56,7 +59,7 @@ sap.ui.define([
 	 * @class
 	 * <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
 	 * @extends sap.ui.unified.Calendar
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public
@@ -321,7 +324,7 @@ sap.ui.define([
 			sAriaLabel = oTexts.sAriaLabel,
 			oHeader = this.getAggregation("header");
 		var oLocaleData = this._getLocaleData();
-		var oEndDate = CalendarDate.fromLocalJSDate(new Date(oDate.toLocalJSDate().getTime() + (this._getDays() - 1) * 24 * 60 * 60 * 1000), this.getPrimaryCalendarType());
+		var oEndDate = CalendarDate.fromLocalJSDate(UI5Date.getInstance(oDate.toLocalJSDate().getTime() + (this._getDays() - 1) * 24 * 60 * 60 * 1000), this.getPrimaryCalendarType());
 		oEndDate.setDate(1); // always use the first of the month to have stable year in Japanese calendar
 		var sDelimiter = oLocaleData.getIntervalPattern().replace("{0}", "").replace("{1}", "");
 		var sEndYear = this._oYearFormat.format(oEndDate.toUTCJSDate(), true);
@@ -352,7 +355,7 @@ sap.ui.define([
 		var oStartDate = this.getStartDate(),
 			oCalPicker = this._getCalendar(),
 			oSelectedRange = new DateRange(),
-			oEndDate = new Date(oStartDate.getTime());
+			oEndDate = UI5Date.getInstance(oStartDate.getTime());
 
 		oEndDate.setDate(oEndDate.getDate() + this._getDays() - 1);
 		oSelectedRange.setStartDate(oStartDate);
@@ -432,13 +435,13 @@ sap.ui.define([
 		var oMinDate = this.getMinDate();
 		if (oMinDate && oStartDate.getTime() < oMinDate.getTime()) {
 			Log.warning("startDate < minDate -> minDate as startDate set", this);
-			oStartDate = new Date(oMinDate.getTime());
+			oStartDate = UI5Date.getInstance(oMinDate.getTime());
 		}
 
 		var oMaxDate = this.getMaxDate();
 		if (oMaxDate && oStartDate.getTime() > oMaxDate.getTime()) {
 			Log.warning("startDate > maxDate -> maxDate as startDate set", this);
-			oStartDate = new Date(oMaxDate.getTime());
+			oStartDate = UI5Date.getInstance(oMaxDate.getTime());
 		}
 
 		this.setProperty("startDate", oStartDate, true);

package/src/sap/ui/unified/CalendarLegend.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarLegendItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @class
 	 * Item to be displayed in a CalendarLegend.
 	 * @extends sap.ui.core.Element
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public