@openui5/sap.ui.unified 1.110.0 → 1.111.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.110.0",
+  "version": "1.111.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.110.0"
+    "@openui5/sap.ui.core": "1.111.0"
   }
 }

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.110.0</version>
+  <version>1.111.0</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

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

@@ -17,7 +17,8 @@ sap.ui.define([
 	'./calendar/YearPicker',
 	'./calendar/YearRangePicker',
 	'./calendar/CalendarDate',
-	"sap/ui/core/date/UniversalDate",
+	'sap/ui/core/date/UniversalDate',
+	'sap/ui/core/date/UI5Date',
 	'./library',
 	'sap/ui/Device',
 	'sap/ui/core/format/DateFormat',
@@ -44,6 +45,7 @@ sap.ui.define([
 	YearRangePicker,
 	CalendarDate,
 	UniversalDate,
+	UI5Date,
 	library,
 	Device,
 	DateFormat,
@@ -74,7 +76,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -207,7 +209,14 @@ sap.ui.define([
 			 * Note: This property should not be used with firstDayOfWeek property.
 			 * @since 1.108.0
 			 */
-			calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
+			calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null},
+
+			/**
+			 * Holds a reference to a JavaScript Date Object to define the initially navigated date in the calendar.
+			 *
+			 * @since 1.111
+			 */
+			initialFocusedDate: {type: "object", group: "Data", defaultValue: null}
 
 		},
 		aggregations : {
@@ -561,6 +570,10 @@ sap.ui.define([
 
 		this._updateHeadersButtons();
 
+		this._updateLegendParent();
+		if (this.getInitialFocusedDate()) {
+			this.focusDate(this.getInitialFocusedDate());
+		}
 	};
 
 	Calendar.prototype.onAfterRendering = function(oEvent){
@@ -795,6 +808,7 @@ sap.ui.define([
 
 		return this;
 	};
+
 	Calendar.prototype.setMonths = function(iMonths){
 
 		this._bDateRangeChanged = undefined; // to force rerendering
@@ -814,10 +828,9 @@ sap.ui.define([
 				oMonth.attachEvent("_bindMousemove", _handleBindMousemove, this);
 				oMonth.attachEvent("_unbindMousemove", _handleUnbindMousemove, this);
 				oMonth._bNoThemeChange = true;
-				oMonth._bNotInTabChain = true;
 				oMonth.setCalendarWeekNumbering(this.getCalendarWeekNumbering());
 				oMonth.setSecondaryCalendarType(this._getSecondaryCalendarType());
-				this.addAggregation("month",oMonth);
+				this.addAggregation("month", oMonth);
 			}
 			this._toggleTwoMonthsInTwoColumnsCSS();
 		} else if (aMonths.length > iMonths){
@@ -1291,6 +1304,13 @@ sap.ui.define([
 		this._toggleTwoMonthsInTwoColumnsCSS();
 	};
 
+	Calendar.prototype._updateLegendParent = function(){
+		var sLegend = this.getLegend(),
+			oLegend = oCore.byId(sLegend);
+
+		oLegend && oLegend._setParent(this);
+	};
+
 	/**
 	 * @param {sap.ui.unified.calendar.CalendarDate} oDate A date to be used for the header buttons
 	 * @private
@@ -1403,7 +1423,7 @@ sap.ui.define([
 			oHighDate.setYear(oHighDate.getYear() + (iRangeSize * iYears) / 2 - 1);
 		} else {
 			iYears = oYearPicker.getYears();
-			oDate = oYearPicker.getProperty("_middleDate") ? oYearPicker.getProperty("_middleDate") : CalendarDate.fromLocalJSDate(new Date());
+			oDate = oYearPicker.getProperty("_middleDate") ? oYearPicker.getProperty("_middleDate") : CalendarDate.fromLocalJSDate(UI5Date.getInstance());
 			oLowDate = new CalendarDate(oDate);
 			oHighDate = new CalendarDate(oDate);
 
@@ -1557,7 +1577,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Calendar.prototype._handleCurrentDate = function() {
-		var oNow = new Date(),
+		var oNow = UI5Date.getInstance(),
 			oMaxDate = this.getMaxDate(),
 			oMinDate = this.getMinDate();
 
@@ -1690,6 +1710,12 @@ sap.ui.define([
 		this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
 		// show again hidden month button
 		this._togglePrevNext(this._getFocusedDate(), true);
+
+		if (this.getAggregation("month").length > 1) {
+			this.getAggregation("month").forEach(function(oMonth) {
+				oMonth._oItemNavigation.iActiveTabIndex = 0;
+			});
+		}
 	};
 
 	Calendar.prototype._setDisabledMonths = function(iYear, oMonthPicker) {
@@ -1843,6 +1869,12 @@ sap.ui.define([
 			this._setDisabledMonths(oDate.getYear(), oMonthPicker);
 		}
 
+		if (this.getAggregation("month").length > 1 && this.getProperty("_currentPicker") == CURRENT_PICKERS.MONTH_PICKER) {
+			this.getAggregation("month").forEach(function(oMonth) {
+				oMonth._oItemNavigation.iActiveTabIndex = -1;
+			});
+		}
+
 		this._togglePrevNext(oDate, true);
 		this._setHeaderText(this._getFocusedDate());
 	};
@@ -1880,6 +1912,12 @@ sap.ui.define([
 			oYearPicker.setDate(oDate.toLocalJSDate());
 			this._updateHeadersYearPrimaryText(this._getYearString());
 		}
+
+		if (this.getAggregation("month").length > 1 && this.getProperty("_currentPicker") == CURRENT_PICKERS.YEAR_PICKER) {
+			this.getAggregation("month").forEach(function(oMonth) {
+				oMonth._oItemNavigation.iActiveTabIndex = -1;
+			});
+		}
 	};
 
 	/**
@@ -2161,8 +2199,7 @@ sap.ui.define([
 		oFocusedDate = oDate;
 
 		this._focusDate(oFocusedDate, true, false, false);
-		this._togglePrevNext(this._getFocusedDate(), true);
-		this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
+		this._closePickers();
 		this._addMonthFocusDelegate();
 		this._setHeaderText(this._getFocusedDate());
 	};
@@ -2508,7 +2545,7 @@ sap.ui.define([
 			this._oFocusedDate = CalendarDate.fromLocalJSDate(aSelectedDates[0].getStartDate(), sCalendarType);
 		} else {
 			// use current date
-			this._oFocusedDate = CalendarDate.fromLocalJSDate(new Date(), sCalendarType);
+			this._oFocusedDate = CalendarDate.fromLocalJSDate(UI5Date.getInstance(), sCalendarType);
 		}
 
 		if (this._oFocusedDate.isBefore(this._oMinDate)) {

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

@@ -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.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -141,7 +141,7 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 			iHour, iMinute, sHour, sMinute;
 
 		//have no intersection with the given day
-		if (oStartDate.getTime() >= oNextDayStart.getTime() || oEndDate.getTime() <= oCurrentDayStart.getTime()) {
+		if (oStartDate.getTime() > oNextDayStart.getTime() || oEndDate.getTime() < oCurrentDayStart.getTime()) {
 			sFirstLineText = "";
 		} else if (oStartDate.getTime() <= oCurrentDayStart.getTime() && oEndDate.getTime() >= oNextDayStart.getTime()) {
 			sFirstLineText = oResourceBundle.getText("PLANNINGCALENDAR_ALLDAY");

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

@@ -56,7 +56,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.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -11,11 +11,17 @@ sap.ui.define([
 	'./CalendarLegendRenderer',
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/unified/CalendarLegendItem"
+	"sap/ui/unified/CalendarLegendItem",
+	"sap/ui/core/Core",
+	"sap/ui/Device",
+	"sap/ui/core/delegate/ItemNavigation"
 ],
-	function(Control, library, CalendarLegendRenderer, Log, jQuery, CalendarLegendItem) {
+	function(Control, library, CalendarLegendRenderer, Log, jQuery, CalendarLegendItem, Core, Device, ItemNavigation) {
 	"use strict";
 
+	// Resource Bundle
+	var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.unified");
+
 	// shortcut for sap.ui.unified.CalendarDayType
 	var CalendarDayType = library.CalendarDayType;
 
@@ -30,10 +36,27 @@ sap.ui.define([
 	 *
 	 * @class
 	 * A legend for the Calendar Control. Displays special dates colors with their corresponding description. The aggregation specialDates can be set herefor.
+	 *
+	 * <h3>Calendar Legend Navigation</h3>
+	 *
+	 * If the Calendar Legend is associated with a <code>sap.ui.unified.Calendar</code> control, the users can navigate through the Calendar Legend items.
+	 * Only special dates related to the navigated legend's item type are displayed in the calendar grid.
+	 * <b>Note: </b> Standard calendar legend items (Today, Selected, Working Day and Non-Working Day) are also navigatable, but focusing them does
+	 * not affect the special dates display (all calendar special dates are displayed).
+	 *
+	 * <h3>Keyboard shortcuts (when the legend is navigatable)</h3>
+	 *
+	 * <ul>
+	 * <li>[Arrow Up], [Arrow Left] - Move to the previous calendar legend item</li>
+	 * <li>[Arrow Down], [Arrow Right] - Move to the next calendar legend item</li>
+	 * <li>[Home], [Page Up] - Move to the first calendar legend item</li>
+	 * <li>[End], [Page Down] - Move to the last calendar legend item</li>
+	 * </ul>
+	 *
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -84,10 +107,18 @@ sap.ui.define([
 
 			//don't render standardItems unless it's a PC legend
 			this._bShouldRenderStandardItems = true;
+
+			this._oItemNavigation = null;
 		},
 		renderer: CalendarLegendRenderer
 	});
 
+	CalendarLegend.prototype.onAfterRendering = function () {
+		if (!Device.system.phone && this._oParentControl) {
+			this._initItemNavigation();
+		}
+	};
+
 	CalendarLegend.prototype.setStandardItems = function (aValues) {
 		var i;
 
@@ -110,6 +141,108 @@ sap.ui.define([
 		return this;
 	};
 
+	CalendarLegend.prototype._initItemNavigation = function() {
+		var aStandardItems = this.getAggregation("_standardItems") || [],
+			aLegendItems = this.getItems() || [],
+			aItems,
+			aItemsDomRef = [],
+			oItemDomRef,
+			oRootDomRef;
+
+		aItems = aStandardItems.concat(aLegendItems);
+
+		if (!aItems.length) {
+			return;
+		}
+
+		oRootDomRef = aItems[0].getDomRef().parentElement;
+
+		// find a collection of all legend items
+		aItems.forEach(function(oItem, iIndex) {
+			oItemDomRef = oItem.getFocusDomRef();
+			oItemDomRef.setAttribute("tabindex", "-1");
+			aItemsDomRef.push(oItemDomRef);
+		});
+
+		if (!this._oItemNavigation) {
+			this._oItemNavigation = new ItemNavigation()
+				.setCycling(false)
+				.attachEvent(ItemNavigation.Events.AfterFocus, this._onItemNavigationAfterFocus, this)
+				.attachEvent(ItemNavigation.Events.FocusLeave, this._onItemNavigationFocusLeave, this)
+				.setDisabledModifiers({
+					sapnext : ["alt", "meta", "ctrl"],
+					sapprevious : ["alt", "meta", "ctrl"],
+					saphome: ["alt", "meta", "ctrl"],
+					sapend: ["meta", "ctrl"]
+				});
+
+			this.addDelegate(this._oItemNavigation);
+		}
+
+		// reinitialize the ItemNavigation after rendering
+		this._oItemNavigation.setRootDomRef(oRootDomRef)
+			.setItemDomRefs(aItemsDomRef)
+			.setPageSize(aItems.length) // set the page size equal to the items number so when we press pageUp/pageDown to focus first/last tab
+			.setFocusedIndex(0);
+	};
+
+	CalendarLegend.prototype._onItemNavigationAfterFocus = function(oEvent) {
+		var oSource = oEvent.getSource(),
+			oLegendItemDomRef = oSource.getItemDomRefs()[oSource.getFocusedIndex()],
+			sType = Core.byId(oLegendItemDomRef.id).getType(),
+			oParent = this._getParent();
+
+		this._setSpecialDateTypeFilter(sType);
+		oParent && oParent.invalidate();
+	};
+
+	CalendarLegend.prototype._onItemNavigationFocusLeave = function(oEvent) {
+		var oParent = this._getParent();
+
+		this._setSpecialDateTypeFilter();
+		oParent && oParent.invalidate();
+	};
+
+	/**
+	 * Sets a special date type that should be filtered. Only dates with this type should be displayed as special.
+	 * @param {string} sType special date type that should be displayed only
+	 */
+	CalendarLegend.prototype._setSpecialDateTypeFilter = function(sType) {
+		this._sSpecialDateTypeFilter = sType || "";
+	};
+
+	/**
+	 * Returns a special date type that should be filtered.
+	 * @returns {string} special date type that should be displayed only.
+	 */
+	CalendarLegend.prototype._getSpecialDateTypeFilter = function() {
+		return this._sSpecialDateTypeFilter || "";
+	};
+
+	/**
+	 * Sets parent control of the Calendar Legend.
+	 * @param {sap.ui.core.Control} oControl parent control
+	 */
+	CalendarLegend.prototype._setParent = function(oControl) {
+		this._oParentControl = oControl;
+	};
+
+	/**
+	 * Returns parent control of the Calendar Legend.
+	 * @returns {sap.ui.core.Control} parent control
+	 */
+	CalendarLegend.prototype._getParent = function() {
+		return this._oParentControl;
+	};
+
+	/**
+	 * Returns aria-label text of the Calendar Legend.
+	 * @returns {string} aria-label text
+	 */
+	CalendarLegend.prototype._getLegendAriaLabel = function () {
+		return oResourceBundle.getText("LEGEND_ARIA_LABEL");
+	};
+
 	/**
 	 * Populates the standard items.
 	 * @param {string[]|sap.ui.unified.StandardCalendarLegendItem[]} aStandardItems array of items specified by their key
@@ -119,7 +252,6 @@ sap.ui.define([
 	 */
 	CalendarLegend.prototype._addStandardItems = function(aStandardItems, replace) {
 		var i,
-			rb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.unified"),
 			sId = this.getId();
 
 		if (replace) {
@@ -128,7 +260,7 @@ sap.ui.define([
 
 		for (i = 0; i < aStandardItems.length; i++) {
 			var oItem = new CalendarLegendItem(sId + "-" + aStandardItems[i], {
-				text: rb.getText(CalendarLegend._Standard_Items_TextKeys[aStandardItems[i]])
+				text: oResourceBundle.getText(CalendarLegend._Standard_Items_TextKeys[aStandardItems[i]])
 			});
 			this.addAggregation("_standardItems", oItem);
 		}

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.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -27,12 +27,16 @@ sap.ui.define(['sap/ui/core/InvisibleText'],
 		var aStandardItems = oLeg.getAggregation("_standardItems"),
 			aCustomItems = oLeg.getItems(),
 			iCustomItemsLength = this.defineItemsLength(oLeg, aCustomItems.length),
+			iCount = (aStandardItems ? aStandardItems.length : 0) + (aCustomItems ? aCustomItems.length : 0),
 			i,
 			iIdLength,
-			sColumnWidth;
+			sColumnWidth,
+			iIndex = 1;
 
 		oRm.openStart("div", oLeg);
 		oRm.class("sapUiUnifiedLegend");
+		oRm.attr("aria-label", oLeg._getLegendAriaLabel());
+		oRm.attr("role", "list");
 		oRm.openEnd();
 
 		this.renderItemsHeader(oRm, oLeg);
@@ -51,14 +55,14 @@ sap.ui.define(['sap/ui/core/InvisibleText'],
 				iIdLength = oLeg.getId().length + 1; //+1, because of the dash in "CalLeg1-Today"?
 				for (i = 0; i < aStandardItems.length; ++i) {
 					var sClass = "sapUiUnifiedLegend" + aStandardItems[i].getId().slice(iIdLength);
-					this.renderLegendItem(oRm, sClass, aStandardItems[i], ["sapUiUnifiedLegendSquareColor"]);
+					this.renderLegendItem(oRm, sClass, aStandardItems[i], ["sapUiUnifiedLegendSquareColor"], iIndex++, iCount);
 				}
 			}
 
 			if (aCustomItems) {
 				// rendering special day and colors
 				for (i = 0; i < iCustomItemsLength; i++) {
-					this.renderLegendItem(oRm, "sapUiCalLegDayType" + oLeg._getItemType(aCustomItems[i], aCustomItems).slice(4), aCustomItems[i], ["sapUiUnifiedLegendSquareColor"]);
+					this.renderLegendItem(oRm, "sapUiCalLegDayType" + oLeg._getItemType(aCustomItems[i], aCustomItems).slice(4), aCustomItems[i], ["sapUiUnifiedLegendSquareColor"], iIndex++, iCount);
 				}
 			}
 			this.renderAdditionalItems(oRm, oLeg); //like more sections with items
@@ -78,7 +82,7 @@ sap.ui.define(['sap/ui/core/InvisibleText'],
 	 * @param {sap.ui.unified.CalenderLegendItem} oItem item element
 	 * @param {string[]} aColorClasses Css classes to be added to the color bullet item in front of the legend item
 	 */
-	CalendarLegendRenderer.renderLegendItem = function(oRm, sClass, oItem, aColorClasses) {
+	CalendarLegendRenderer.renderLegendItem = function(oRm, sClass, oItem, aColorClasses, iIndex, iCount) {
 
 		var sText = oItem.getText();
 		var sTooltip = oItem.getTooltip_AsString();
@@ -90,6 +94,10 @@ sap.ui.define(['sap/ui/core/InvisibleText'],
 			oRm.attr('title', sTooltip);
 		}
 
+		oRm.attr("role", "listitem");
+		oRm.attr("aria-posinset", iIndex);
+		oRm.attr("aria-setsize", iCount);
+
 		oRm.class("sapUiUnifiedLegendItem");
 		oRm.class(sClass);
 		oRm.openEnd();

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

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * <b>Note:</b> JavaScript Date objects are used to set and return the months, mark them as selected or as a special type.
 	 * But the date part of the Date object is not used. If a Date object is returned the date will be set to the 1st of the corresponding month.
 	 * @extends sap.ui.core.Control
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -54,6 +54,9 @@ sap.ui.define([],
 
 		oRm.openEnd(); // div element
 
+		var oHeader = oCal.getAggregation("header");
+		oRm.renderControl(oHeader);
+
 		oRm.openStart("div", sId + "-content");
 		oRm.class("sapUiCalContent");
 		oRm.openEnd();
@@ -66,9 +69,6 @@ sap.ui.define([],
 		oRm.text(rb.getText("CALENDAR_CANCEL"));
 		oRm.close("button");
 
-		var oHeader = oCal.getAggregation("header");
-		oRm.renderControl(oHeader);
-
 		if (oCal.getPickerPopup()) {
 			oRm.openStart("div", sId + "-contentOver");
 			oRm.class("sapUiCalContentOver");

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

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * Navigation via year picker switches to the corresponding year and the same month as before the navigation.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.110.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -68,6 +68,9 @@ sap.ui.define([],
 		}
 		oRm.openEnd(); // div element
 
+		var oHeader = oCal.getAggregation("header");
+		oRm.renderControl(oHeader);
+
 		oRm.openStart("div", sId + "-content");
 		oRm.class("sapUiCalContent");
 		oRm.openEnd();
@@ -101,9 +104,6 @@ sap.ui.define([],
 
 		oRm.close("div");
 
-		var oHeader = oCal.getAggregation("header");
-		oRm.renderControl(oHeader);
-
 		//when used in a DatePicker, in mobile there is no cancel button
 		if (!oCal._bSkipCancelButtonRendering) {
 			oRm.openStart("button", sId + "-cancel");

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

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @class
 	 * A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
 	 * @extends sap.ui.core.Control
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @class
 	 * Calendar with granularity of time items displayed in one line.
 	 * @extends sap.ui.core.Control
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -59,6 +59,9 @@ sap.ui.define([],
 
 		oRm.openEnd(); // div element
 
+		var oHeader = oCal.getAggregation("header");
+		oRm.renderControl(oHeader);
+
 		oRm.openStart("div", sId + "-content");
 		oRm.class("sapUiCalContent");
 		oRm.openEnd();
@@ -66,9 +69,6 @@ sap.ui.define([],
 
 		oRm.close("div");
 
-		var oHeader = oCal.getAggregation("header");
-		oRm.renderControl(oHeader);
-
 		oRm.openStart("button", sId + "-cancel");
 		oRm.class("sapUiCalCancel");
 		oRm.attr("tabindex", "-1");

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

@@ -39,7 +39,7 @@ sap.ui.define(['sap/ui/unified/calendar/CalendarUtils', 'sap/ui/unified/calendar
 		 * its start date to the first date of the same week as the date the user chose.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.110.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -47,7 +47,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.ui.unified.ColorPicker} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.110.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @public

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.110.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @public

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

@@ -14,7 +14,7 @@ sap.ui.define(["sap/m/library", "sap/ui/core/Core"],
 	/**
 	 * Currency renderer.
 	 *
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @namespace
 	 */
 	var CurrencyRenderer = {

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

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/unified/calendar/Cale
 	 * @class
 	 * Date range for use in DatePicker
 	 * @extends sap.ui.core.Element
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -25,7 +25,7 @@ sap.ui.define(['./DateRange', './library'],
 	 * @class
 	 * Date range with calendar day type information. Used to visualize special days in the Calendar.
 	 * @extends sap.ui.unified.DateRange
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.unified.IProcessableBlobs
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public