@openui5/sap.ui.unified 1.98.0 → 1.101.0

package/.eslintrc.json

@@ -0,0 +1,19 @@
+{
+	"overrides": [
+		/*
+		 * Productive code, sample and unit test code of sap.ui.unified has been cleaned up.
+		 * No more references to the global jQuery allowed
+		 */
+		{
+			"files": [
+				"src/**/*.js",
+				"test/sap/ui/unified/demokit/**/*.js",
+				"test/sap/ui/unified/sample/**/*.js",
+				"test/sap/ui/unified/qunit/**/*.js"
+			],
+			"globals": {
+				"jQuery": "off"
+			}
+		}
+	]
+}

package/THIRDPARTY.txt

@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.7
+Component: URI.js, version: 1.19.10
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -400,7 +400,7 @@ Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperato
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -411,7 +411,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 1.4.1
+Component: lit-html, version: 2.0.1
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -420,7 +420,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +429,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -450,7 +450,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.34
+Component: SAP Theming Base Content, version: 11.1.38
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.98.0",
+  "version": "1.101.0",
   "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.98.0"
+    "@openui5/sap.ui.core": "1.101.0"
   }
 }

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

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

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

@@ -5,10 +5,11 @@
  */
 //Provides control sap.ui.unified.Calendar.
 sap.ui.define([
+	'sap/ui/core/CalendarType',
 	'sap/ui/core/Control',
+	'sap/ui/core/Core',
 	'sap/ui/core/LocaleData',
 	'sap/ui/unified/calendar/CalendarUtils',
-	'sap/ui/unified/DateRange',
 	'sap/ui/unified/DateTypeRange',
 	'./calendar/Header',
 	'./calendar/Month',
@@ -28,10 +29,11 @@ sap.ui.define([
 	"sap/base/util/deepEqual",
 	"sap/base/Log"
 ], function(
+	CalendarType,
 	Control,
+	oCore,
 	LocaleData,
 	CalendarUtils,
-	DateRange,
 	DateTypeRange,
 	Header,
 	Month,
@@ -53,8 +55,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var oCore = sap.ui.getCore(),
-		CalendarType = sap.ui.core.CalendarType;
 	/*
 	 * Inside the Calendar CalendarDate objects are used. But in the API JS dates are used.
 	 * So conversion must be done on API functions.
@@ -70,7 +70,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -304,7 +304,7 @@ sap.ui.define([
 				}
 			}
 		}
-	}});
+	}, renderer: CalendarRenderer});
 
 	/*
 	 * There are different modes (stored in this._iMode)
@@ -563,6 +563,13 @@ sap.ui.define([
 			}
 			this._bInitMonth = undefined;
 		}
+
+		var oSecondMonthHeader = this.getAggregation("secondMonthHeader");
+		if (oSecondMonthHeader.getDomRef()) {
+			// Second month header buttons are unreachable via keyboard
+			oSecondMonthHeader.getDomRef("B1").setAttribute("tabindex", "-1");
+			oSecondMonthHeader.getDomRef("B2").setAttribute("tabindex", "-1");
+		}
 	};
 
 	Calendar.prototype.removeSelectedDate = function(oSelectedDate) {
@@ -771,22 +778,6 @@ sap.ui.define([
 
 	};
 
-	/**
-	 * sets the Popup mode
-	 * e.G. Tab-chain should not leave calendar
-	 * only for internal use
-	 * @param {boolean} bPoupupMode <code>PopupMode</code>
-	 * @returns {this} <code>this</code> to allow method chaining
-	 * @private
-	 */
-	Calendar.prototype.setPopupMode = function(bPoupupMode){
-
-		this._bPoupupMode = bPoupupMode;
-
-		return this;
-
-	};
-
 	Calendar.prototype.setMonths = function(iMonths){
 
 		this._bDateRangeChanged = undefined; // to force rerendering
@@ -1197,236 +1188,6 @@ sap.ui.define([
 
 	Calendar.prototype.onsaphide = Calendar.prototype.onsapshow;
 
-	Calendar.prototype.onsaptabnext = function(oEvent){
-		var oHeader = this.getAggregation("header");
-
-		if (containsOrEquals(this.getDomRef("content"), oEvent.target)) {
-			if (oHeader.getVisibleButton1()) {
-				oHeader.getDomRef("B1").focus();
-				oEvent.preventDefault();
-			} else if (oHeader.getVisibleButton2()) {
-				oHeader.getDomRef("B2").focus();
-				oEvent.preventDefault();
-			} else if (oHeader.getVisibleCurrentDateButton()) {
-				oHeader.getDomRef("today").focus();
-				oEvent.preventDefault();
-			} else if (!this._bPoupupMode) {
-				// remove Tabindex from day, month, year - to break cycle
-				this._clearTabindex0();
-			} else {
-				this._clearTabindex0();
-				oEvent.preventDefault();
-			}
-		} else if (oEvent.target.id === oHeader.getId() + "-B1") {
-			oHeader.getVisibleButton2() && oHeader.getDomRef("B2").focus();
-			oEvent.preventDefault();
-		} else if (oEvent.target.id === oHeader.getId() + "-B2") {
-			if (oHeader.getVisibleCurrentDateButton()) {
-				oHeader.getDomRef("today").focus();
-				oEvent.preventDefault();
-			} else {
-				this._tabNextFinalize(this._bPoupupMode, oEvent);
-			}
-		} else if (oEvent.target.id === oHeader.getId() + "-today") {
-			this._tabNextFinalize(this._bPoupupMode, oEvent);
-		}
-
-	};
-
-	Calendar.prototype._tabNextFinalize = function(bPopupMode, oEvent) {
-		if (bPopupMode) {
-			this._moveFocusToCalContent();
-			oEvent.preventDefault();
-		} else {
-			// remove Tabindex from day, month, year - to break cycle
-			this._clearTabindex0();
-		}
-	};
-
-	Calendar.prototype.onsaptabprevious = function(oEvent){
-		var oHeader = this.getAggregation("header");
-		if (containsOrEquals(this.getDomRef("content"), oEvent.target)) {
-			if (this._bPoupupMode) {
-				if (oHeader.getVisibleCurrentDateButton()) {
-					oHeader.getDomRef("today").focus();
-				} else if (oHeader.getVisibleButton2()) {
-					oHeader.getDomRef("B2").focus();
-				} else {
-					oHeader.getVisibleButton1() && oHeader.getDomRef("B1").focus();
-				}
-				oEvent.preventDefault();
-			} else {
-				// remove Tabindex from day, month, year - to break cycle
-				this._clearTabindex0();
-			}
-		} else if (oEvent.target.id === oHeader.getId() + "-B1") {
-			this._moveFocusToCalContent();
-			oEvent.preventDefault();
-		} else if (oEvent.target.id === oHeader.getId() + "-B2") {
-			if (oHeader.getVisibleButton1()) {
-				oHeader.getDomRef("B1").focus();
-			} else {
-				this._moveFocusToCalContent();
-			}
-
-			oEvent.preventDefault();
-		} else if (oEvent.target.id === oHeader.getId() + "-today") {
-			if (oHeader.getVisibleButton2()) {
-				oHeader.getDomRef("B2").focus();
-			} else if (oHeader.getVisibleButton1()){
-				oHeader.getDomRef("B1").focus();
-			} else {
-				this._moveFocusToCalContent();
-			}
-
-			oEvent.preventDefault();
-		}
-	};
-
-	Calendar.prototype._clearTabindex0 = function() {
-		var aMonths = this.getAggregation("month"),
-			oMonthPicker = this._getMonthPicker(),
-			oYearPicker = this.getAggregation("yearPicker"),
-			oYearRangePicker = this.getAggregation("yearRangePicker"),
-			oMonth, i;
-
-		// remove Tabindex from day, month, year - to break cycle
-		for (i = 0; i < aMonths.length; i++) {
-			oMonth = aMonths[i];
-			oMonth._oItemNavigation.getItemDomRefs()[oMonth._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "-1");
-		}
-		if (!this._getSucessorsPickerPopup()) {
-			if (oMonthPicker.getDomRef()) {
-				oMonthPicker._oItemNavigation.getItemDomRefs()[oMonthPicker._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "-1");
-			}
-			if (oYearPicker.getDomRef()) {
-				oYearPicker._oItemNavigation.getItemDomRefs()[oYearPicker._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "-1");
-			}
-			if (oYearRangePicker.getDomRef()) {
-				oYearRangePicker._oItemNavigation.getItemDomRefs()[oYearRangePicker._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "-1");
-			}
-		}
-	};
-
-	Calendar.prototype._moveFocusToCalContent = function() {
-		var oYearPicker = this.getAggregation("yearPicker"),
-			oYearRangePicker = this.getAggregation("yearRangePicker"),
-			oMonthPicker = this._getMonthPicker(),
-			aMonths = this.getAggregation("month"),
-			oMonth, oMonthDate,
-			oFocusedDate, i;
-
-		switch (this._iMode) {
-			case 0: // day picker
-				oFocusedDate = this._getFocusedDate();
-				for (i = 0; i < aMonths.length; i++) {
-					oMonth = aMonths[i];
-					oMonthDate = CalendarDate.fromLocalJSDate(oMonth.getDate(), this.getPrimaryCalendarType());
-					if (oFocusedDate.isSame(oMonthDate)) {
-						oMonth.focus();
-					} else {
-						oMonth._oItemNavigation.getItemDomRefs()[oMonth._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "0");
-					}
-				}
-				break;
-
-			case 1: // month picker
-				if (!this._getSucessorsPickerPopup()) {
-					oMonthPicker.focus();
-				}
-				break;
-
-			case 2: // year picker
-				if (!this._getSucessorsPickerPopup()) {
-					oYearPicker.focus();
-				}
-				break;
-
-			case 3: // year range picker
-				if (!this._getSucessorsPickerPopup()) {
-					oYearRangePicker.focus();
-				}
-				break;
-
-			// no default
-		}
-	};
-
-	Calendar.prototype.onfocusin = function(oEvent){
-
-		if (oEvent.target.id == this.getId() + "-end") {
-			// focus via tab+shift (otherwise not possible to go to this element)
-			this._focusOnShiftTab();
-
-			if (!this._bPoupupMode) {
-				// remove Tabindex from day, month, year - to break cycle
-				this._clearTabindex0();
-			}
-		}
-
-		// remove tabindex of dummy element if focus is inside calendar
-		this.$("end").attr("tabindex", "-1");
-
-	};
-
-	Calendar.prototype._focusOnShiftTab = function() {
-		var oHeader = this.getAggregation("header"),
-			oDomRefB2 = oHeader.getDomRef("B2"),
-			oDomRefToday = oHeader.getDomRef("today");
-
-		if (oDomRefToday) {
-			oDomRefToday.focus();
-		} else if (oDomRefB2) {
-			oDomRefB2.focus();
-		} else {
-			this.focus();
-		}
-	};
-
-	Calendar.prototype.onsapfocusleave = function(oEvent){
-		var aMonths,
-			oMonth,
-			oMonthPicker,
-			oYearPicker;
-
-		if (!oEvent.relatedControlId || !containsOrEquals(this.getDomRef(), sap.ui.getCore().byId(oEvent.relatedControlId).getFocusDomRef())) {
-			// put dummy element back to tab-chain
-			this.$("end").attr("tabindex", "0");
-
-			if (!this._bPoupupMode) {
-				// restore Tabindex from day, month, year
-				aMonths = this.getAggregation("month");
-
-				switch (this._iMode) {
-				case 0: // day picker
-					for (var i = 0; i < aMonths.length; i++) {
-						oMonth = aMonths[i];
-						if (oMonth._oItemNavigation) {
-							oMonth._oItemNavigation.getItemDomRefs()[oMonth._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "0");
-						}
-					}
-					break;
-
-				case 1: // month picker
-					if (!this._getSucessorsPickerPopup()) {
-						oMonthPicker = this._getMonthPicker();
-						oMonthPicker._oItemNavigation.getItemDomRefs()[oMonthPicker._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "0");
-					}
-					break;
-
-				case 2: // year picker
-					if (!this._getSucessorsPickerPopup()) {
-						oYearPicker = this._getYearPicker();
-						oYearPicker._oItemNavigation.getItemDomRefs()[oYearPicker._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "0");
-					}
-					break;
-					// no default
-				}
-			}
-		}
-
-	};
-
 	Calendar.prototype.getFocusDomRef = function(){
 
 		// set focus on the day
@@ -2326,6 +2087,11 @@ 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());
+		} else if (oFocusedDate.isAfter(this._oMaxDate)){
+			oFocusedDate = new CalendarDate(this._oMaxDate, this.getPrimaryCalendarType());
+		}
 		this._setFocusedDate(oFocusedDate);
 
 		this._showYearPicker();
@@ -2531,13 +2297,19 @@ sap.ui.define([
 
 			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(),
 				oSecondDate,
 				sFirstYear,
 				sSecondYear;
 
 				oFirstDate.setDate(1); // always use the first of the month to have stable year in Japanese calendar
 				oFirstDate.setYear(oFirstDate.getYear() - Math.floor(oYearPicker.getYears() / 2));
-				oFirstDate = oYearPicker._checkFirstDate(oFirstDate);
+				if (oFirstDate.getYear() < oMinYear) {
+					oFirstDate.setYear(oMinYear);
+				} else if (oFirstDate.getYear() + oYearPicker.getYears() > oMaxYear) {
+					oFirstDate.setYear(oMaxYear - oYearPicker.getYears() + 1);
+				}
 
 				oSecondDate = new CalendarDate(oFirstDate, sPrimaryCalendarType);
 				oSecondDate.setYear(oSecondDate.getYear() + oYearPicker.getYears() - 1);

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

@@ -5,8 +5,8 @@
  */
 
 // Provides control sap.ui.unified.CalendarAppointment.
-sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/format/NumberFormat', 'sap/ui/core/LocaleData', './library', "sap/base/Log"],
-	function(DateTypeRange, DateFormat, NumberFormat, LocaleData, library, Log) {
+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"],
+	function(DateTypeRange, DateFormat, NumberFormat, TimezoneUtil, Core, CalendarUtils, library, Log) {
 	"use strict";
 
 	/**
@@ -21,7 +21,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.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -125,8 +125,8 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 * @private
 	 */
 	CalendarAppointment.prototype._getDateRangeIntersectionText = function (oCurrentlyDisplayedDate) {
-		var oStartDate = this.getStartDate(),
-			oEndDate = this.getEndDate() ? this.getEndDate() : new Date(864000000000000), //in case of emergency call this number
+		var oStartDate = this._getStartDateWithTimezoneAdaptation(),
+			oEndDate = this._getEndDateWithTimezoneAdaptation() ? this._getEndDateWithTimezoneAdaptation() : new Date(864000000000000), //in case of emergency call this number
 			sFirstLineText,
 			sSecondLineText,
 			oCurrentDayStart = new Date(oCurrentlyDisplayedDate.getFullYear(), oCurrentlyDisplayedDate.getMonth(), oCurrentlyDisplayedDate.getDate(), 0, 0, 0),
@@ -185,10 +185,10 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 			iNextDayStart = iCurrentDayStartTime + ONE_DAY;
 
 		return function(oAppInfo1, oAppInfo2) {
-			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,
+			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,
 				bWholeDay1 = iStartDateTime1 <= iCurrentDayStartTime && iEndDateTime1 >= iNextDayStart,
 				bWholeDay2 = iStartDateTime2 <= iCurrentDayStartTime && iEndDateTime2 >= iNextDayStart,
 				iResult;
@@ -253,6 +253,43 @@ 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 sTimezone = Core.getConfiguration().getTimezone();
+		var oNewDate = CalendarUtils._createUniversalUTCDate(oDate, undefined, true);
+
+		oNewDate = new Date(oDate.getUTCFullYear(), oDate.getUTCMonth(), oDate.getUTCDate(), oDate.getUTCHours(), oDate.getUTCMinutes(), oDate.getUTCSeconds());
+		oNewDate.setUTCFullYear(oDate.getUTCFullYear());
+		oNewDate = TimezoneUtil.convertToTimezone(oNewDate, sTimezone);
+
+		return oNewDate;
+	};
+
 	return CalendarAppointment;
 
 });

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

@@ -57,7 +57,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.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -96,7 +96,7 @@ sap.ui.define([
 
 		},
 		designtime: "sap/ui/unified/designtime/CalendarDateInterval.designtime"
-	}});
+	}, renderer: CalendarDateIntervalRenderer});
 
 	CalendarDateInterval.prototype.init = function(){
 
@@ -262,7 +262,6 @@ sap.ui.define([
 
 		if (!this._oCalendar) {
 			oCalendar = new Calendar(this.getId() + "--Cal");
-			oCalendar.setPopupMode(true);
 			oCalendar.attachEvent("select", this._handleCalendarPickerDateSelect, this);
 			oCalendar.attachEvent("cancel", function (oEvent) {
 				this._closeCalendarPicker(true);
@@ -388,14 +387,6 @@ sap.ui.define([
 
 		if (!bSkipFocus) {
 			this._renderMonth(); // to focus date
-
-			// restore tabindex
-			var aMonths = this.getAggregation("month");
-
-			for (var i = 0; i < aMonths.length; i++) {
-				var oMonth = aMonths[i];
-				oMonth._oItemNavigation.getItemDomRefs()[oMonth._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "0");
-			}
 		}
 
 		this._getCalendar()._closePickers();
@@ -687,12 +678,11 @@ sap.ui.define([
 	 */
 	CalendarDateInterval.prototype._focusDateExtend = function(oDate, bOtherMonth, bNoEvent) {
 		if (bOtherMonth) {
-			var oOldFocusedDate = this._getFocusedDate(),
-				oOldStartDate = this._getStartDate(),
-				iDay = CalendarUtils._daysBetween(oOldFocusedDate, oOldStartDate),
+			var oMonth = this.getAggregation("month")[0],
+				iFocusDayIndex = oMonth._oItemNavigation ? oMonth._oItemNavigation.getFocusedIndex() : 0,
 				oNewStartDate = new CalendarDate(oDate, this.getPrimaryCalendarType());
 
-			oNewStartDate.setDate(oNewStartDate.getDate() - iDay);
+			oNewStartDate.setDate(oNewStartDate.getDate() - iFocusDayIndex);
 
 			this._setStartDate(oNewStartDate, false, true);
 

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

@@ -8,13 +8,12 @@
 sap.ui.define([
 	'sap/ui/core/Control',
 	'./library',
-	'sap/ui/Device',
 	'./CalendarLegendRenderer',
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/unified/CalendarLegendItem"
 ],
-	function(Control, library, Device, CalendarLegendRenderer, Log, jQuery, CalendarLegendItem) {
+	function(Control, library, CalendarLegendRenderer, Log, jQuery, CalendarLegendItem) {
 	"use strict";
 
 	// shortcut for sap.ui.unified.CalendarDayType
@@ -34,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -86,7 +85,8 @@ sap.ui.define([
 
 			//don't render standardItems unless it's a PC legend
 			this._bShouldRenderStandardItems = true;
-		}
+		},
+		renderer: CalendarLegendRenderer
 	});
 
 	CalendarLegend.prototype.setStandardItems = function (aValues) {

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.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public