@openui5/sap.ui.unified 1.109.0 → 1.111.0

package/.reuse/dep5

@@ -28,7 +28,7 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
 # OpenUI5 code
 
 Files: *
-Copyright: 2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0
 
 
@@ -68,7 +68,7 @@ Comment: these files belong to: jQuery UI
 
 Files: src/sap.ui.commons/src/sap/ui/commons/Carousel.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Spencer Tipping
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jquery.fix.clone: Carousel.js is authored by SAP, but contains an improved implementation of the clone function which is taken from jquery-fix-clone
@@ -83,35 +83,35 @@ Comment: these files belong to: jQuery 3
 
 Files: src/sap.ui.core/src/sap/base/util/isPlainObject.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: isPlainObject.js is overall written by SAP, but contains a modified implementation of jQuery.isPlainObject taken from jQuery
 
 Files: src/sap.ui.core/src/sap/base/util/_merge.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: _merge.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/jquery.sap.script.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: jquery.sap.script.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/sap/ui/Device.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011, John Resig
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 1: Device.js is overall written by SAP, but contains code taken from jQuery 1.7.1 (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/Selectors.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.8: Selectors.js is overall written by SAP, but contains code taken from jQuery UI (see the respective comments)
@@ -123,14 +123,14 @@ Comment: these files belong to: jQuery UI 1.10
 
 Files: src/sap.ui.core/src/jquery.sap.dom.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.10: jquery.sap.dom.js is overall written by SAP, but contains code taken from jQuery UI Core (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/zIndex.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.11: zIndex.js is overall written by SAP, but contains an implementation of the function 'fnzIndex' which is taken from jQuery UI Datepicker 1.11.1
@@ -162,7 +162,7 @@ Comment: these files belong to: jQuery Mobile
 
 Files: src/sap.ui.core/src/sap/ui/util/_FeatureDetection.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2012 Wei-Ko Kao
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
@@ -299,14 +299,14 @@ Comment: these files belong to: blanket.js
 
 Files: src/sap.ui.core/src/sap/base/util/JSTokenizer.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Douglas Crockford
 License: Apache-2.0 and LicenseRef-JSONinJSPublicDomain
 Comment: these files contain content from SAP and JSON in JS: JSTokenizer.js is overall written by SAP, but contains code has been taken from the component JSON in JavaScript (https://github.com/douglascrockford/JSON-js/blob/master/json2.js) from Douglas Crockford which is licensed under Public Domain
 
 Files: src/sap.ui.core/src/sap/ui/base/ExpressionParser.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2010 Douglas Crockford
 License: Apache-2.0
 Comment: these files contain content from SAP and Top Down Operator Precedence: ExpressionParser.js is overall written by SAP, but contains code taken from or inspired by TDOP by Douglas Crockford (see the respective comment)
@@ -340,7 +340,7 @@ Comment: these files contain content from p-cancelable and @babel/helpers: _Canc
 
 Files: src/sap.ui.core/src/sap/ui/core/date/Persian.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Behrang Norouzinia
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and Jalaali JS: Persian.js is overall written by SAP, but the calculation is taken from jalaali-js
@@ -352,14 +352,14 @@ Comment: these files belong to: vkBeautify
 
 Files: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Isaac Z. Schlueter and Contributors
 License: Apache-2.0 and ISC
 Comment: these files contain content from SAP and node-lru-cache: LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.
 
 Files: src/sap.ui.core/test/sap/ui/core/qunit/i18n/helper/_timezones.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Arthur David Olson, Paul Eggert and other contributors
 License: Apache-2.0 and LicenseRef-tzdata-PublicDomain
 Comment: these files contain content from SAP and Time Zone Database: _timezones.js is overall written by SAP, but the list of IANA timezone IDs is taken from the Timezone Database
@@ -469,7 +469,7 @@ Comment: these files belong to: LESS
 
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2023 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)

package/THIRDPARTY.txt

@@ -185,7 +185,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/caja-html-sanitizer.js
 
-Component: Unicode Common Locale Data Repository, version: 35.1
+Component: Unicode Common Locale Data Repository, version: 41
 Copyright: 1991-2014 Unicode, Inc.
 License: Unicode-DFS-2015
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
@@ -478,7 +478,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.44
+Component: SAP Theming Base Content, version: 11.1.48
 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.109.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.109.0"
+    "@openui5/sap.ui.core": "1.111.0"
   }
 }

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

@@ -4,9 +4,9 @@
   <name>sap.ui.unified</name>
   <vendor>SAP SE</vendor>
   <copyright>OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (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.109.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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 //Provides control sap.ui.unified.Calendar.
@@ -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.109.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){
@@ -629,9 +642,10 @@ sap.ui.define([
 		this._oSpecialDatesControlOrigin = oControl;
 	};
 
-	/*
-	 * if used inside DatePicker get the value from the parent
-	 * To don't have sync issues...
+	/**
+	 * If used inside DatePicker get the value from the parent
+	 * To not have sync issues...
+	 * @returns {sap.ui.unified.DateTypeRange[]} Array with special dates
 	 */
 	Calendar.prototype.getSpecialDates = function(){
 
@@ -665,10 +679,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * sets the locale for the DatePicker
+	 * Sets the locale for the DatePicker
 	 * only for internal use
 	 * @param {string} sLocale  new value for <code>locale</code>
-	 * @returns {this} <code>this</code> to allow method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	Calendar.prototype.setLocale = function(sLocale){
@@ -685,9 +699,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * gets the used locale for the DatePicker
+	 * Gets the used locale for the DatePicker
 	 * only for internal use
-	 * @return {string} sLocale
+	 * @returns {string} sLocale
 	 * @private
 	 */
 	Calendar.prototype.getLocale = function(){
@@ -700,8 +714,8 @@ sap.ui.define([
 
 	};
 	/**
-	 * gets the focused date
-	 * @return {sap.ui.unified.calendar.CalendarDate} the focused date.
+	 * Gets the focused date
+	 * @returns {sap.ui.unified.calendar.CalendarDate} The focused date
 	 * @private
 	 */
 	Calendar.prototype._getFocusedDate = function(){
@@ -726,8 +740,8 @@ sap.ui.define([
 	/**
 	 * Displays and sets the focused date of the calendar.
 	 *
-	 * @param {Object} oDate A JavaScript date object for focused date
-	 * @returns {this} <code>this</code> to allow method chaining
+	 * @param {Date} oDate A JavaScript date object for focused date
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @public
 	 */
 	Calendar.prototype.focusDate = function(oDate) {
@@ -742,9 +756,8 @@ sap.ui.define([
 	/**
 	 * Displays a date in the calendar but doesn't set the focus.
 	 *
-	 * @param {Object} oDate
-	 *         JavaScript date object for focused date.
-	 * @returns {this} <code>this</code> to allow method chaining
+	 * @param {Date} oDate JavaScript date object for focused date
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @since 1.28.0
 	 * @public
 	 */
@@ -761,7 +774,7 @@ sap.ui.define([
 	 *
 	 * There might be some days of the previous month shown, but they can not be focused.
 	 *
-	 * @returns {Object} JavaScript date object for start date.
+	 * @returns {Date} JavaScript date object for start date
 	 * @since 1.34.1
 	 * @public
 	 */
@@ -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){
@@ -952,7 +965,7 @@ sap.ui.define([
 	/**
 	 * Sets a minimum date for the calendar.
 	 * @param {Date} oDate a JavaScript date
-	 * @return {this} <code>this</code> for method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @public
 	 */
 	Calendar.prototype.setMinDate = function(oDate){
@@ -974,7 +987,7 @@ sap.ui.define([
 			this._oMinDate = CalendarDate.fromLocalJSDate(oDate, sPrimaryCalendarType);
 
 			var iYear = this._oMinDate.getYear();
-			CalendarUtils._checkYearInValidRange(iYear);
+			CalendarUtils._checkYearInValidRange(iYear, sPrimaryCalendarType);
 
 			if (this._oMaxDate.isBefore(this._oMinDate)) {
 				Log.warning("minDate > maxDate -> maxDate set to end of the month", this);
@@ -1006,13 +1019,13 @@ sap.ui.define([
 	/**
 	 * Sets a maximum date for the calendar.
 	 * @param {Date} oDate a JavaScript date
-	 * @return {this} <code>this</code> for method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @public
 	 */
 	Calendar.prototype.setMaxDate = function(oDate){
 
 		var aMonths = this.getAggregation("month"),
-			sPrimaryCalendarType,
+			sPrimaryCalendarType = this.getPrimaryCalendarType(),
 			iMaxYear;
 
 		if (deepEqual(oDate, this.getMaxDate())) {
@@ -1028,7 +1041,7 @@ sap.ui.define([
 			this._oMaxDate = CalendarDate.fromLocalJSDate(oDate, sPrimaryCalendarType);
 
 			var iYear = this._oMaxDate.getYear();
-			CalendarUtils._checkYearInValidRange(iYear);
+			CalendarUtils._checkYearInValidRange(iYear, sPrimaryCalendarType);
 
 			if (this._oMinDate.isAfter(this._oMaxDate)) {
 				Log.warning("maxDate < minDate -> minDate set to begin of the month", this);
@@ -1060,7 +1073,7 @@ sap.ui.define([
 	 * Sets the visibility of the Current date button in the calendar.
 	 *
 	 * @param {boolean} bShow whether the Today button will be displayed
-	 * @return {this} <code>this</code> for method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @public
 	 */
 	Calendar.prototype.setShowCurrentDateButton = function(bShow){
@@ -1119,7 +1132,7 @@ sap.ui.define([
 
 	/**
 	 * Getter for monthPicker aggregation.
-	 * @return {sap.ui.unified.calendar.MonthPicker} The monthPicker control instance
+	 * @returns {sap.ui.unified.calendar.MonthPicker} The monthPicker control instance
 	 * @private
 	 */
 	Calendar.prototype._getMonthPicker = function () {
@@ -1128,7 +1141,7 @@ sap.ui.define([
 
 	/**
 	 * Getter for yearPicker aggregation.
-	 * @return {sap.ui.unified.calendar.YearPicker} The yearPicker control instance
+	 * @returns {sap.ui.unified.calendar.YearPicker} The yearPicker control instance
 	 * @private
 	 */
 	Calendar.prototype._getYearPicker = function () {
@@ -1137,7 +1150,7 @@ sap.ui.define([
 
 	/**
 	 * Getter for yearPicker aggregation.
-	 * @return {sap.ui.unified.calendar.YearRangePicker} The yearRangePicker control instance
+	 * @returns {sap.ui.unified.calendar.YearRangePicker} The yearRangePicker control instance
 	 * @private
 	 */
 	Calendar.prototype._getYearRangePicker = function () {
@@ -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
@@ -1377,7 +1397,7 @@ sap.ui.define([
 	 * Enables/Disables previous and next buttons in the year picker header.
 	 * This function assumes there is a "yearPicker" aggregation.
 	 * So callers must take care.
-	 * @return {void}
+	 * @returns {void}
 	 * @private
 	 */
 	Calendar.prototype._togglePrevNexYearPicker = function(){
@@ -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);
 
@@ -1419,7 +1439,7 @@ sap.ui.define([
 	 * Handles navigation to previous date.
 	 * This function assumes there are both "yearPicker" & "monthPicker" aggregation available.
 	 * So callers must take care.
-	 * @return {void}
+	 * @returns {void}
 	 * @private
 	 */
 	Calendar.prototype._handlePrevious = function(oEvent){
@@ -1479,7 +1499,7 @@ sap.ui.define([
 	 * Handles navigation to next date.
 	 * This function assumes there are both "yearPicker" & "monthPicker" aggregation available.
 	 * So callers must take care.
-	 * @return {void}
+	 * @returns {void}
 	 * @private
 	 */
 	Calendar.prototype._handleNext = function(oEvent){
@@ -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) {
@@ -1791,7 +1817,7 @@ sap.ui.define([
 	/**
 	 * Updates visibility of active Header month button
 	 * Only for internal use
-	 * @returns {this} <code>this</code> to allow method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	Calendar.prototype._updateMonthButtonVisibility = function(){
@@ -1810,7 +1836,7 @@ sap.ui.define([
 	 * Shows an embedded Month Picker.
 	 * This function assumes there is a "monthPicker" & "yearPicker" aggregation.
 	 * So callers must take care.
-	 * @return {void}
+	 * @returns {void}
 	 * @private
 	 */
 	Calendar.prototype._showMonthPicker = function (bSkipFocus) {
@@ -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());
 	};
@@ -1851,7 +1883,7 @@ sap.ui.define([
 	 * Shows an embedded year Picker.
 	 * This function assumes there is a "yearPicker" aggregation.
 	 * So callers must take care.
-	 * @return {void}
+	 * @returns {void}
 	 * @private
 	 */
 	Calendar.prototype._showYearPicker = function () {
@@ -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());
 	};
@@ -2251,7 +2288,7 @@ sap.ui.define([
 	 /**
 	 * Updates visibility of active Header Year button
 	 * Only for internal use
-	 * @returns {this} <code>this</code> to allow method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	Calendar.prototype._updateActiveHeaderYearButtonVisibility = function(){
@@ -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)) {
@@ -2680,16 +2717,17 @@ sap.ui.define([
 	function _displayDate(oDate, bSkipFocus) {
 
 		var oCalDate,
+			sPrimaryCalendarType = this.getPrimaryCalendarType(),
 			iYear;
 
 		if (!oDate) {
 			return;
 		}
 
-		oCalDate = CalendarDate.fromLocalJSDate(oDate, this.getPrimaryCalendarType());
+		oCalDate = CalendarDate.fromLocalJSDate(oDate, sPrimaryCalendarType);
 
 		iYear = oCalDate.getYear();
-		CalendarUtils._checkYearInValidRange(iYear);
+		CalendarUtils._checkYearInValidRange(iYear, sPrimaryCalendarType);
 
 		if (CalendarUtils._isOutside(oCalDate, this._oMinDate, this._oMaxDate)) {
 			throw new Error("Date must not be in valid range (minDate and maxDate); " + this);

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.109.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");
@@ -279,14 +279,13 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 * @private
 	 */
 	CalendarAppointment.prototype._convertToTimezone = function(oDate) {
-		var sTimezone = Core.getConfiguration().getTimezone();
-		var oNewDate = CalendarUtils._createUniversalUTCDate(oDate, undefined, true);
+		var sConfigTimezone = Core.getConfiguration().getTimezone();
+		var sLocalTimezone = TimezoneUtil.getLocalTimezone();
 
-		oNewDate = new Date(oDate.getUTCFullYear(), oDate.getUTCMonth(), oDate.getUTCDate(), oDate.getUTCHours(), oDate.getUTCMinutes(), oDate.getUTCSeconds());
-		oNewDate.setUTCFullYear(oDate.getUTCFullYear());
-		oNewDate = TimezoneUtil.convertToTimezone(oNewDate, sTimezone);
+		var iConfigOffsetMillis = TimezoneUtil.calculateOffset(oDate, sConfigTimezone) * 1000;
+		var iLocalOffsetMillis = TimezoneUtil.calculateOffset(oDate, sLocalTimezone) * 1000;
 
-		return oNewDate;
+		return new Date(oDate.getTime() - iConfigOffsetMillis + iLocalOffsetMillis);
 	};
 
 	return CalendarAppointment;