@openui5/sap.ui.unified 1.117.0 → 1.118.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.117.0",
+  "version": "1.118.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.117.0"
+    "@openui5/sap.ui.core": "1.118.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.117.0</version>
+  <version>1.118.0</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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -59,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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public
@@ -356,6 +356,15 @@ sap.ui.define([
 		return Object.keys(oFreeTypes);
 	};
 
+
+	CalendarLegend.prototype._extractItemIdsString = function(aItemArray) {
+		return aItemArray.map(
+			function (oItem) {
+				return oItem.getId();
+			}
+		).join(" ");
+	};
+
 	return CalendarLegend;
 
 });

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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -28,6 +28,9 @@ sap.ui.define(['sap/ui/core/InvisibleText'],
 			aCustomItems = oLeg.getItems(),
 			iCustomItemsLength = this.defineItemsLength(oLeg, aCustomItems.length),
 			iCount = (aStandardItems ? aStandardItems.length : 0) + (aCustomItems ? aCustomItems.length : 0),
+			sOwnedItemIds = "",
+			aStandardItems = aStandardItems || [],
+			aCustomItems = aCustomItems || [],
 			i,
 			iIdLength,
 			sColumnWidth,
@@ -37,6 +40,9 @@ sap.ui.define(['sap/ui/core/InvisibleText'],
 		oRm.class("sapUiUnifiedLegend");
 		oRm.attr("aria-label", oLeg._getLegendAriaLabel());
 		oRm.attr("role", "list");
+		sOwnedItemIds = oLeg._extractItemIdsString(aStandardItems.concat(aCustomItems));
+		oRm.attr("aria-owns", sOwnedItemIds);
+
 		oRm.openEnd();
 
 		this.renderItemsHeader(oRm, oLeg);

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

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * <b>Note:</b> UI5Date or 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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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.117.0
+		 * @version 1.118.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -88,7 +88,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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * @class
 	 * Calendar with granularity of time items displayed in one line.
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public
@@ -256,10 +256,17 @@ sap.ui.define([
 	};
 
 	CalendarTimeInterval.prototype._initializeHeader = function() {
-		var oHeader = new Header(this.getId() + "--Head");
+		var oHeader = new Header(this.getId() + "--Head"),
+			oResourceBundle = Core.getLibraryResourceBundle("sap.m");
 		oHeader.attachEvent("pressPrevious", this._handlePrevious, this);
 		oHeader.attachEvent("pressNext", this._handleNext, this);
 		this.setAggregation("header", oHeader);
+
+		if (oHeader) {
+			oHeader.setAriaLabelButton0(oResourceBundle.getText("DATETIMEPICKER_DATE"));
+			oHeader.setAriaLabelButton1(oResourceBundle.getText("MOBISCROLL_MONTH"));
+			oHeader.setAriaLabelButton2(oResourceBundle.getText("MOBISCROLL_YEAR"));
+		}
 	};
 
 	CalendarTimeInterval.prototype._initializeTimesRow = function() {

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.117.0
+		 * @version 1.118.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.117.0
+	 * @version 1.118.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.117.0
+		 * @version 1.118.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.117.0
+	 * @version 1.118.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.117.0
+		 * @version 1.118.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.117.0
+	 * @version 1.118.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.117.0
+	 * @version 1.118.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.117.0
+	 * @version 1.118.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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public
@@ -2072,11 +2072,35 @@ sap.ui.define([
 		if (this.oBrowse &&  this.oBrowse.$().length) {
 			$browse = this.oBrowse.$();
 			$browse.attr("type', 'button"); // The default type of button is submit that's why on click of label there are submit of the form. This way we are avoiding the submit of form.
-			$browse.off("click").on("click", function(oEvent) {
-				oEvent.preventDefault();
-				oEvent.stopPropagation();
-				this.FUEl.click(); // The default behaviour on click on label is to open "open file" dialog. The only way to attach click event that is transferred from the label to the button is this way. AttachPress and attachTap don't work in this case.
-			}.bind(this));
+			// exapnd to multiple event types listening
+
+			var oEvents = {
+				"click": (oEvent) => {
+					oEvent.preventDefault();
+					oEvent.stopPropagation();
+					this.FUEl.click(); // The default behaviour on click on label is to open "open file" dialog. The only way to attach click event that is transferred from the label to the button is this way. AttachPress and attachTap don't work in this case.
+				},
+				dragover: (oEvent) => oEvent.preventDefault(),
+				dragenter: (oEvent) => oEvent.preventDefault(),
+				drop: (oEvent) => {
+					oEvent.preventDefault();
+					var aFileList = oEvent.originalEvent.dataTransfer.files;
+					// TODO: enable directory drag and drop
+					if ((!this.getMultiple() && aFileList.length > 1) || this.getDirectory()) {
+						return;
+					}
+
+					this.oFileUpload.files = aFileList;
+					var oChangeEvent = {
+						target: {
+							files: aFileList
+						}
+					};
+					this.handlechange(oChangeEvent);
+				}
+			};
+
+			$browse.off(oEvents).on(oEvents);
 		}
 	};
 

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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.117.0
+		 * @version 1.118.0
 		 *
 		 * @constructor
 		 * @since 1.52

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

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IContextMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @since 1.21.0
 	 *
 	 * @constructor
@@ -238,7 +238,7 @@ sap.ui.define([
 	Menu.prototype.invalidate = function(oOrigin){
 		if (oOrigin instanceof MenuItemBase && this.getDomRef()) {
 			this._delayedRerenderItems();
-		} else {
+		} else if (this.oPopup && this.oPopup.isOpen()) {
 			Control.prototype.invalidate.apply(this, arguments);
 		}
 	};

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

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/IconPool', './MenuItemBase', './library', 'sap/ui/co
 	 * @extends sap.ui.unified.MenuItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @since 1.21.0
 	 *
 	 * @constructor
@@ -59,7 +59,8 @@ sap.ui.define(['sap/ui/core/IconPool', './MenuItemBase', './library', 'sap/ui/co
 	MenuItem.prototype.render = function(oRenderManager, oItem, oMenu, oInfo){
 		var rm = oRenderManager,
 			oSubMenu = oItem.getSubmenu(),
-			bIsEnabled = oItem.getEnabled();
+			bIsEnabled = oItem.getEnabled(),
+			oIcon;
 
 		rm.openStart("li", oItem);
 
@@ -106,12 +107,15 @@ sap.ui.define(['sap/ui/core/IconPool', './MenuItemBase', './library', 'sap/ui/co
 		rm.openEnd();
 		rm.close("div");
 
-		if (oItem.getIcon()) {
+		if (oItem.getIcon() && oItem._getIcon) {
 			// icon/check column
 			rm.openStart("div");
 			rm.class("sapUiMnuItmIco");
 			rm.openEnd();
-			rm.icon(oItem.getIcon(), null, {title: null});
+
+			oIcon = oItem._getIcon(oItem);
+			rm.renderControl(oIcon);
+
 			rm.close("div");
 		}
 

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

@@ -5,8 +5,8 @@
  */
 
 // Provides control sap.ui.unified.MenuItemBase.
-sap.ui.define(['sap/ui/core/Element', './library'],
-	function(Element, library) {
+sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/core/IconPool'],
+	function(Element, library, IconPool) {
 	"use strict";
 
 
@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @since 1.21.0
 	 *
 	 * @constructor
@@ -159,6 +159,14 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 		oEvent.preventDefault(); //IE focuses the address bar
 	};
 
+
+	MenuItemBase.prototype._getIcon = function(oItem) {
+		return IconPool.createControlByURI({
+			src: oItem.getIcon(),
+			useIconTooltip: false
+		});
+	};
+
 	MenuItemBase.prototype.onsaphide = MenuItemBase.prototype.onsapshow;
 
 	return MenuItemBase;

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

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/core/Configuration"],
 	 * Menu renderer.
 	 * @author SAP - TD Core UI&AM UI Infra
 	 *
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @namespace
 	 */
 	var MenuRenderer = {

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.unified.MenuItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @since 1.21.0
 	 *
 	 * @constructor
@@ -91,7 +91,8 @@ sap.ui.define([
 	MenuTextFieldItem.prototype.render = function(oRenderManager, oItem, oMenu, oInfo){
 		var rm = oRenderManager,
 			bIsEnabled = oMenu.checkEnabled(oItem),
-			itemId = oItem.getId();
+			itemId = oItem.getId(),
+			oIcon;
 
 		rm.openStart("li", oItem);
 		if (oItem.getVisible()) {
@@ -127,7 +128,11 @@ sap.ui.define([
 		if (oItem.getIcon()) {
 			// icon/check column
 			rm.openStart("div").class("sapUiMnuItmIco").openEnd();
-			rm.icon(oItem.getIcon(), null, {title: null});
+
+			oIcon = oItem._getIcon(oItem);
+
+			rm.renderControl(oIcon);
+
 			rm.close("div");
 		}
 
@@ -139,6 +144,7 @@ sap.ui.define([
 		rm.openStart("div", itemId + "-str").class("sapUiMnuTfItmStretch").openEnd().close("div"); // Helper to strech the width if needed
 		rm.openStart("div").class("sapUiMnuTfItemWrppr").openEnd();
 		rm.voidStart("input", itemId + "-tf").attr("tabindex", "-1");
+		rm.attr("role", "textbox");
 		if (oItem.getValue()) {
 			rm.attr("value", oItem.getValue());
 		}

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

@@ -25,7 +25,7 @@ sap.ui.define(['./ShellHeader', './ShellLayout', './library', './ShellRenderer']
 	 * @extends sap.ui.unified.ShellLayout
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/CalendarUtils.js

@@ -233,7 +233,7 @@ sap.ui.define([
 		 * If a given date is in the beginning of January (e.g. Friday, 2 Jan 2015, week 1), the function will return
 		 * week start date in the previous year(e.g. Sunday, 28 Dec 2014, week 53).
 		 *
-		 * @returns {Date} first date of the same week as the given <code>oDate</code> in local timezone.
+		 * @returns {Date} first date of the same week as the given <code>oDate</code> in UTC timezone.
 		 * @public
 		 */
 		CalendarUtils.getFirstDateOfWeek = function (oDate, oWeekConfig) {

package/src/sap/ui/unified/calendar/CustomMonthPicker.js

@@ -86,7 +86,7 @@ sap.ui.define([
 			oYearPicker = this._getYearPicker(),
 			oFocusedDate = this._getFocusedDate();
 
-		oFocusedDate.setYear(oYearPicker.getYear());
+		oFocusedDate.setYear(oYearPicker.getDate().getFullYear());
 		oMonthPicker._setYear(oFocusedDate.getYear());
 		oMonthPicker._setDate(oFocusedDate);
 

package/src/sap/ui/unified/calendar/DatesRow.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * If used inside the calendar the properties and aggregation are directly taken from the parent
 	 * (To not duplicate and sync DateRanges and so on...)
 	 * @extends sap.ui.unified.calendar.Month
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/Header.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * <b>Note:</b> This is used inside the calendar. Not for standalone usage
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/IndexPicker.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * This control serves for picking an item from a grid with items which are relative periods in Plannig Calendar.
 	 * This is used inside the sap.m.PlanningCalendar relative views. Not for stand alone usage.
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/unified/calendar/Month.js

@@ -79,7 +79,7 @@ sap.ui.define([
 	 * If used inside the calendar the properties and aggregation are directly taken from the parent
 	 * (To not duplicate and sync DateRanges and so on...)
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/MonthPicker.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * renders a MonthPicker with ItemNavigation
 	 * This is used inside the calendar. Not for stand alone usage
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/MonthsRow.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * The MontsRow works with UI5Date or JavaScript Date objects, but only the month and the year are used to display and interact.
 	 * As representation for a month, the 1st of the month will always be returned in the API.
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/OneMonthDatesRow.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * Other usages are not supported.
 	 *
 	 * @extends sap.ui.unified.calendar.DatesRow
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/unified/calendar/TimesRow.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 *
 	 * The TimesRow works with UI5Date or JavaScript Date objects.
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/calendar/YearPicker.js

@@ -17,6 +17,7 @@ sap.ui.define([
 	'sap/ui/core/library',
 	'sap/ui/core/Locale',
 	'sap/ui/core/LocaleData',
+	"sap/ui/core/date/UI5Date",
 	"./YearPickerRenderer",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/thirdparty/jquery",
@@ -33,6 +34,7 @@ sap.ui.define([
 	coreLibrary,
 	Locale,
 	LocaleData,
+	UI5Date,
 	YearPickerRenderer,
 	KeyCodes,
 	jQuery,
@@ -60,7 +62,7 @@ sap.ui.define([
 	 * As in all date-time controls, all pubic JS Date objects that are given (e.g. <code>setDate()</code>) or read
 	 * (e.g. <code>getFirstRenderedDate</code>) with values which are considered as date objects in browser(local) timezone.
 	 * @extends sap.ui.core.Control
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @public
@@ -151,6 +153,9 @@ sap.ui.define([
 	/* eslint-disable no-lonely-if */
 
 	YearPicker.prototype.init = function(){
+		var oInitialDate = UI5Date.getInstance();
+		oInitialDate.setFullYear(2000);
+		this.setProperty("date", oInitialDate);
 		// to format year with era in Japanese
 		this._oFormatYyyymmdd = DateFormat.getInstance({pattern: "yyyyMMdd", calendarType: CalendarType.Gregorian});
 
@@ -181,6 +186,12 @@ sap.ui.define([
 		return this.getDomRef() && this._oItemNavigation.getItemDomRefs()[this._iSelectedIndex];
 	};
 
+	/**
+	 * Sets year for the YearPicker.
+	 * @deprecated as of version 1.34, replaced by <code>setDate/code>
+	 * @param {int} iCount The counter to be set to
+	 * @returns {this} this for chaining
+	*/
 	YearPicker.prototype.setYear = function(iYear){
 
 		// no rerendering needed, just select new year or update years
@@ -230,6 +241,9 @@ sap.ui.define([
 		oCalDate.setMonth(0, 1);
 
 		this.setProperty("date", oDate);
+		/**
+		 * @deprecated As of version 1.34
+		 */
 		this.setProperty("year", oCalDate.getYear());
 		this._oDate = oCalDate;
 
@@ -256,7 +270,7 @@ sap.ui.define([
 	YearPicker.prototype._getDate = function(){
 
 		if (!this._oDate) {
-			var iYear = this.getYear();
+			var iYear = this.getDate().getFullYear();
 			this._oDate = new CalendarDate(iYear, 0, 1, this._getPrimaryCalendarType());
 		}
 
@@ -700,6 +714,10 @@ sap.ui.define([
 			// if rendering happens, the year picker will immediately render the beginning of the interval in the middle
 			var bSuppressInvalidate = true;
 		}
+
+		/**
+		 * @deprecated As of version 1.34
+		 */
 		this.setProperty("year", oFocusedDate.getYear(), bSuppressInvalidate);
 		this.setProperty("date", oFocusedDate.toLocalJSDate(), bSuppressInvalidate);
 

package/src/sap/ui/unified/calendar/YearRangePicker.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.unified.calendar.YearPicker
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private
@@ -96,6 +96,9 @@ sap.ui.define([
 		oCalDate.setMonth(0, 1);
 
 		this.setProperty("date", oRangeMidDate);
+		/**
+		 * @deprecated As of version 1.34
+		 */
 		this.setProperty("year", oCalDate.getYear());
 		this._oDate = oCalDate;
 
@@ -198,6 +201,9 @@ sap.ui.define([
 		}
 
 		this.setProperty("date", oDate.toLocalJSDate());
+		/**
+		 * @deprecated As of version 1.34
+		 */
 		this.setProperty("year", oDate.getYear());
 
 		return true;

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

@@ -28,13 +28,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.unified
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @since 1.28
 	 * @public
 	 */
 	var thisLib = sap.ui.getCore().initLibrary({
 		name : "sap.ui.unified",
-		version: "1.117.0",
+		version: "1.118.0",
 		dependencies : ["sap.ui.core"],
 		designtime: "sap/ui/unified/designtime/library.designtime",
 		types: [

package/src/sap/ui/unified/themes/base/Calendar.less

@@ -193,7 +193,6 @@ html.sap-desktop .sapUiCalHead > button.sapUiCalDsbl:focus,
 .sapUiCalMonthView,
 .sapUiCalMonthPicker,
 .sapUiCalYearPicker {
-	width: 14em;
 	display: inline-block;
 	width: 19rem; /* +1rem padding left and right = 320 px*/
 }
@@ -459,6 +458,38 @@ html.sap-desktop .sapUiCalHead > button.sapUiCalDsbl:focus,
 	}
 }
 
+	.sapUiSizeCozy {
+		.sapUiCal {
+			min-width: 19.9rem;
+			padding-top: 0.5rem;
+			.sapUiCalMonthView .sapUiCalWH,
+			.sapUiCalMonthView .sapUiCalItem,
+			.sapUiCalMonthView .sapUiCalWeekNum{
+				max-width: 2.25rem;
+			}
+
+			div[role=row] {
+				display: flex;
+				justify-content: space-between;
+			}
+			.sapUiCalHeadNext {
+				right: 0;
+			}
+			.sapUiCalHeadPrev {
+				left: 0;
+			}
+		}
+		.sapUiCal .sapUiCalMonthView,
+		.sapUiCal .sapUiCalRow {
+			padding-left: 0rem;
+			padding-right: 0rem;
+		}
+		.sapUiCal .sapUiCalMonthView {
+			padding-bottom: 0.5rem;
+		}
+
+	}
+
 .sapUiSizeCompact .sapUiCalMonthPicker.sapUiCalMonthSecType,
 .sapUiSizeCompact .sapUiCalYearPicker.sapUiCalMonthSecType {
 	.sapUiCalItem {
@@ -483,7 +514,7 @@ html.sap-desktop .sapUiCalHead > button.sapUiCalDsbl:focus,
 
 .sapUiCal:not(.sapUiCalInt){
 	width: 20rem;
-	min-width: 20rem;
+	min-width: 19.9rem;
 }
 
 .sapUiCalMulti:not(.sapUiCalInt){