@openui5/sap.ui.unified 1.96.2 → 1.98.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-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0
 
 
@@ -60,7 +60,7 @@ Comment: these files belong to: jQuery UI
 
 Files: src/sap.ui.commons/src/sap/ui/commons/Carousel.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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
@@ -75,35 +75,35 @@ Comment: these files belong to: jQuery 3
 
 Files: src/sap.ui.core/src/sap/base/util/isPlainObject.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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)
@@ -115,14 +115,14 @@ Comment: these files belong to: jQuery UI 1.10
 
 Files: src/sap.ui.core/src/jquery.sap.dom.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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
@@ -149,7 +149,7 @@ Comment: these files belong to: jQuery Mobile
 
 Files: src/sap.ui.core/src/sap/ui/util/_FeatureDetection.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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
@@ -281,14 +281,14 @@ Comment: these files belong to: blanket.js
 
 Files: src/sap.ui.core/src/sap/base/util/JSTokenizer.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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)
@@ -322,7 +322,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-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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
@@ -334,7 +334,7 @@ Comment: these files belong to: vkBeautify
 
 Files: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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.
@@ -370,21 +370,11 @@ Comment: these files belong to: Buttons extension for DataTables
 
 # Library: sap.ui.integration:
 
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*.*.json src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/bundle*
+Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
 
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/webcomponentsjs/*
-Copyright: 2015 The Polymer Authors
-License: BSD-3-Clause
-Comment: these files belong to: Webcomponentsjs
-
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
-Copyright: 1991-2014 Unicode, Inc.
-License: Unicode-DFS-2015
-Comment: these files belong to: Unicode Common Locale Data Repository
-
 Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards.js src/sap.ui.integration/src/sap/ui/integration/schemas/adaptive-card.json
 Copyright: 2017 Microsoft
 License: MIT
@@ -395,22 +385,27 @@ Copyright: 2017 Microsoft
 License: MIT
 Comment: these files belong to: Adaptive Cards Templating
 
+Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
+Copyright: Microsoft
+License: MIT
+Comment: these files belong to: Adaptive Expressions
+
 Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
-Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
+Copyright: 2020 Jeremy Danyow
 License: MIT
-Comment: these files belong to: ajv
+Comment: these files belong to: @cfworker/json-schema
 
 
 # Library: sap.ui.mdc:
 
 Files: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperators/BoolExprTool.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2015 unnikked
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and BooleanExpressionEvaluator: BoolExprTool.js is authored by SAP, but partly inspired by BooleanExpressionEvaluator
@@ -418,7 +413,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
 
 # Library: sap.ui.webc.common:
 
-Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* 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/*.*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
@@ -454,7 +449,7 @@ Comment: these files belong to: LESS
 
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 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

@@ -351,24 +351,11 @@ Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/D
 
 Library: sap.ui.integration:
 
-Component: UI5 Web Components, version: 1.0.0-rc.8
+Component: UI5 Web Components, version: 1.0.1
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*.*.json
-	src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/bundle*
-
-Component: Webcomponentsjs, version: 1.0.2
-Copyright: 2015 The Polymer Authors
-License: BSD-3-Clause
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/webcomponentsjs/*
-
-Component: Unicode Common Locale Data Repository
-Copyright: 1991-2014 Unicode, Inc.
-License: Unicode-DFS-2015
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
+Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*
 
 Component: Adaptive Cards, version: 2.9.0
 Copyright: 2017 Microsoft
@@ -377,23 +364,29 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards.js
 	src/sap.ui.integration/src/sap/ui/integration/schemas/adaptive-card.json
 
-Component: Adaptive Cards Templating, version: 0.1.1-alpha.0
+Component: Adaptive Cards Templating, version: 2.2.0
 Copyright: 2017 Microsoft
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards-templating.js
 
-Component: Markdown-it, version: 10.0.0
+Component: Adaptive Expressions, version: 4.15.0
+Copyright: Microsoft
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
+
+Component: Markdown-it, version: 12.2.0
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
+Component: @cfworker/json-schema, version: 1.6.8
+Copyright: 2020 Jeremy Danyow
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
 
 
 Library: sap.ui.mdc:
@@ -412,10 +405,11 @@ Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 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/theme-base/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
 	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
 Copyright: Google LLC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.96.2",
+  "version": "1.98.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.96.2"
+    "@openui5/sap.ui.core": "1.98.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-2021 SAP SE or an SAP affiliate company.
+ * (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.96.2</version>
+  <version>1.98.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-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 //Provides control sap.ui.unified.Calendar.
@@ -70,7 +70,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -1200,44 +1200,56 @@ sap.ui.define([
 	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 (!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();
-
+		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() + "-B2") {
-				if (this._bPoupupMode) {
-					this._moveFocusToCalContent();
-
-					oEvent.preventDefault();
-				} else {
-					// remove Tabindex from day, month, year - to break cycle
-					this._clearTabindex0();
-				}
-
 			}
+		} 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.getVisibleButton2()) {
+				if (oHeader.getVisibleCurrentDateButton()) {
+					oHeader.getDomRef("today").focus();
+				} else if (oHeader.getVisibleButton2()) {
 					oHeader.getDomRef("B2").focus();
 				} else {
 					oHeader.getVisibleButton1() && oHeader.getDomRef("B1").focus();
@@ -1249,7 +1261,6 @@ sap.ui.define([
 			}
 		} else if (oEvent.target.id === oHeader.getId() + "-B1") {
 			this._moveFocusToCalContent();
-
 			oEvent.preventDefault();
 		} else if (oEvent.target.id === oHeader.getId() + "-B2") {
 			if (oHeader.getVisibleButton1()) {
@@ -1258,6 +1269,16 @@ sap.ui.define([
 				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();
 		}
 	};
@@ -1289,6 +1310,7 @@ sap.ui.define([
 
 	Calendar.prototype._moveFocusToCalContent = function() {
 		var oYearPicker = this.getAggregation("yearPicker"),
+			oYearRangePicker = this.getAggregation("yearRangePicker"),
 			oMonthPicker = this._getMonthPicker(),
 			aMonths = this.getAggregation("month"),
 			oMonth, oMonthDate,
@@ -1301,7 +1323,7 @@ sap.ui.define([
 					oMonth = aMonths[i];
 					oMonthDate = CalendarDate.fromLocalJSDate(oMonth.getDate(), this.getPrimaryCalendarType());
 					if (oFocusedDate.isSame(oMonthDate)) {
-						oMonth._oItemNavigation.focusItem(oMonth._oItemNavigation.getFocusedIndex());
+						oMonth.focus();
 					} else {
 						oMonth._oItemNavigation.getItemDomRefs()[oMonth._oItemNavigation.getFocusedIndex()].setAttribute("tabindex", "0");
 					}
@@ -1310,16 +1332,23 @@ sap.ui.define([
 
 			case 1: // month picker
 				if (!this._getSucessorsPickerPopup()) {
-					oMonthPicker._oItemNavigation.focusItem(oMonthPicker._oItemNavigation.getFocusedIndex());
+					oMonthPicker.focus();
 				}
 				break;
 
 			case 2: // year picker
 				if (!this._getSucessorsPickerPopup()) {
-					oYearPicker._oItemNavigation.focusItem(oYearPicker._oItemNavigation.getFocusedIndex());
+					oYearPicker.focus();
+				}
+				break;
+
+			case 3: // year range picker
+				if (!this._getSucessorsPickerPopup()) {
+					oYearRangePicker.focus();
 				}
 				break;
-				// no default
+
+			// no default
 		}
 	};
 
@@ -1342,9 +1371,12 @@ sap.ui.define([
 
 	Calendar.prototype._focusOnShiftTab = function() {
 		var oHeader = this.getAggregation("header"),
-			oDomRefB2 = oHeader.getDomRef("B2");
+			oDomRefB2 = oHeader.getDomRef("B2"),
+			oDomRefToday = oHeader.getDomRef("today");
 
-		if (oDomRefB2) {
+		if (oDomRefToday) {
+			oDomRefToday.focus();
+		} else if (oDomRefB2) {
 			oDomRefB2.focus();
 		} else {
 			this.focus();
@@ -1716,8 +1748,19 @@ sap.ui.define([
 	 * @private
 	 */
 	Calendar.prototype._handleCurrentDate = function() {
+		var oNow = new Date(),
+			oMaxDate = this.getMaxDate(),
+			oMinDate = this.getMinDate();
+
 		this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
-		this.focusDate(new Date());
+
+		if (oMaxDate && oMaxDate.getTime() < oNow.getTime()) {
+			this.focusDate(oMaxDate);
+		} else if (oMinDate && oMinDate.getTime() > oNow.getTime()) {
+			this.focusDate(oMinDate);
+		} else {
+			this.focusDate(oNow);
+		}
 	};
 
 	Calendar.prototype._getYearString = function () {
@@ -2004,6 +2047,7 @@ sap.ui.define([
 			for (i = 0; i < aMonths.length; ++i) {
 				if (aMonths[i].checkDateFocusable(oFocusedDate.toLocalJSDate())) {
 					aMonths[i].setDate(oFocusedDate.toLocalJSDate());
+					aMonths[i]._focusDate(oFocusedDate);
 					return;
 				}
 			}

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -130,7 +130,7 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 			sFirstLineText,
 			sSecondLineText,
 			oCurrentDayStart = new Date(oCurrentlyDisplayedDate.getFullYear(), oCurrentlyDisplayedDate.getMonth(), oCurrentlyDisplayedDate.getDate(), 0, 0, 0),
-			oNextDayStart = new Date(oCurrentDayStart.getTime() + 24 * 60 * 60 * 1000),
+			oNextDayStart = new Date(oCurrentDayStart.getFullYear(), oCurrentDayStart.getMonth(), oCurrentDayStart.getDate() + 1),
 			oTimeFormat = DateFormat.getTimeInstance({pattern: "HH:mm"}),
 			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
 			oHourFormat = NumberFormat.getUnitInstance({
@@ -142,9 +142,9 @@ 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()) {
+		} else if (oStartDate.getTime() <= oCurrentDayStart.getTime() && oEndDate.getTime() >= oNextDayStart.getTime()) {
 			sFirstLineText = oResourceBundle.getText("PLANNINGCALENDAR_ALLDAY");
 		} else if (oStartDate.getTime() < oCurrentDayStart.getTime()) {
 			sFirstLineText = oResourceBundle.getText("PLANNINGCALENDAR_UNTIL");
@@ -249,7 +249,7 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 			return document.getElementById(sSuffix ? this.getId() + "-" + this._sAppointmentPartSuffix + "-" + sSuffix : this.getId() + "-" + this._sAppointmentPartSuffix);
 		}
 
-		var oAppointmentParts = document.querySelectorAll(".sapUiCalendarRowApps[id^=" + this. getId() + "]");
+		var oAppointmentParts = document.querySelectorAll(".sapUiCalendarRowApps[id^='" + this. getId() + "']");
 		return oAppointmentParts.length > 0 ? oAppointmentParts[0] : null;
 	};
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -314,7 +314,12 @@ sap.ui.define([
 	CalendarDateInterval.prototype._setHeaderText = function(oDate){
 
 		// sets the text for the month and the year button to the header
-		var oTexts = Calendar.prototype._setHeaderText.apply(this, arguments);
+		var oTexts;
+		if (this.getStartDate()) {
+			oTexts = Calendar.prototype._setHeaderText.apply(this, [CalendarDate.fromLocalJSDate(this.getStartDate(), this.getPrimaryCalendarType())]);
+		} else {
+			oTexts = Calendar.prototype._setHeaderText.apply(this, arguments);
+		}
 		var sText,
 			sAriaLabel = oTexts.sAriaLabel,
 			oHeader = this.getAggregation("header");

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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(['sap/ui/core/Element', './library'],
 	 * @class
 	 * Item to be displayed in a CalendarLegend.
 	 * @extends sap.ui.core.Element
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -1,6 +1,6 @@
 /*
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -67,7 +67,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.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public