@openui5/sap.ui.unified 1.143.1 → 1.145.0

package/REUSE.toml

@@ -7,7 +7,7 @@ SPDX-PackageComment = "The code in this project may include calls to APIs (“AP
 [[annotations]]
 path = "**"
 precedence = "aggregate"
-SPDX-FileCopyrightText = "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors"
+SPDX-FileCopyrightText = "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors"
 SPDX-License-Identifier = "Apache-2.0"
 
 #
@@ -102,7 +102,7 @@ SPDX-FileComment = "these files belong to: jQuery UI"
 path = "src/sap.ui.commons/src/sap/ui/commons/Carousel.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "Spencer Tipping"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -122,7 +122,7 @@ SPDX-FileComment = "these files belong to: jQuery 3"
 path = "src/sap.ui.core/src/sap/base/util/isPlainObject.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "OpenJS Foundation and other contributors"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -132,7 +132,7 @@ SPDX-FileComment = "these files contain content from SAP and jQuery 3: isPlainOb
 path = "src/sap.ui.core/src/sap/base/util/_merge.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "OpenJS Foundation and other contributors"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -142,7 +142,7 @@ SPDX-FileComment = "these files contain content from SAP and jQuery 3: _merge.js
 path = "src/sap.ui.core/src/jquery.sap.script.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "OpenJS Foundation and other contributors"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -152,7 +152,7 @@ SPDX-FileComment = "these files contain content from SAP and jQuery 3: jquery.sa
 path = "src/sap.ui.core/src/sap/ui/Device.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "2011, John Resig"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -162,7 +162,7 @@ SPDX-FileComment = "these files contain content from SAP and jQuery 1: Device.js
 path = "src/sap.ui.core/src/sap/ui/dom/jquery/Selectors.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "2014 jQuery Foundation and other contributors"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -179,7 +179,7 @@ SPDX-FileComment = "these files belong to: jQuery UI 1.10"
 path = "src/sap.ui.core/src/jquery.sap.dom.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "2014 jQuery Foundation and other contributors"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -189,7 +189,7 @@ SPDX-FileComment = "these files contain content from SAP and jQuery UI 1.10: jqu
 path = "src/sap.ui.core/src/sap/ui/dom/jquery/zIndex.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "2014 jQuery Foundation and other contributors"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -243,7 +243,7 @@ SPDX-FileComment = "these files belong to: jQuery Mobile"
 path = "src/sap.ui.core/src/sap/ui/util/_FeatureDetection.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "2012 Wei-Ko Kao"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -270,7 +270,7 @@ SPDX-FileComment = "these files belong to: JUnit Reporter for QUnit"
 path = "src/sap.ui.core/src/sap/ui/qunit/qunit-junit.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "jQuery Foundation and other contributors"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -421,7 +421,7 @@ SPDX-FileComment = "these files belong to: blanket.js"
 path = "src/sap.ui.core/src/sap/base/util/JSTokenizer.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "Douglas Crockford"
 ]
 SPDX-License-Identifier = "Apache-2.0 and LicenseRef-JSONinJSPublicDomain"
@@ -431,7 +431,7 @@ SPDX-FileComment = "these files contain content from SAP and JSON in JS: JSToken
 path = "src/sap.ui.core/src/sap/ui/base/ExpressionParser.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "2010 Douglas Crockford"
 ]
 SPDX-License-Identifier = "Apache-2.0"
@@ -479,7 +479,7 @@ SPDX-FileComment = "these files contain content from p-cancelable and @babel/hel
 path = "src/sap.ui.core/src/sap/ui/core/date/Persian.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "Behrang Norouzinia"
 ]
 SPDX-License-Identifier = "Apache-2.0 and MIT"
@@ -496,7 +496,7 @@ SPDX-FileComment = "these files belong to: vkBeautify"
 path = "src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "Isaac Z. Schlueter and Contributors"
 ]
 SPDX-License-Identifier = "Apache-2.0 and ISC"
@@ -589,6 +589,30 @@ SPDX-License-Identifier = "MIT"
 SPDX-FileComment = "these files belong to: @cfworker/json-schema"
 
 
+# Library: sap.ui.mdc:
+
+[[annotations]]
+path = "src/sap.ui.mdc/test/sap/ui/mdc/demokit/sample/Chart/ChartJS/control/ChartJS.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2025 Chart.js Contributors"
+SPDX-License-Identifier = "MIT"
+SPDX-FileComment = "these files belong to: Chart.js"
+
+[[annotations]]
+path = "src/sap.ui.mdc/test/sap/ui/mdc/demokit/sample/Chart/ChartJS/control/chartjs-plugin-zoom.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2016-2021 chartjs-plugin-zoom Contributors"
+SPDX-License-Identifier = "MIT"
+SPDX-FileComment = "these files belong to: chartjs-plugin-zoom"
+
+[[annotations]]
+path = "src/sap.ui.mdc/test/sap/ui/mdc/demokit/sample/Chart/ChartJS/control/hammerjs.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2011-2017 by Jorik Tangelder (Eight Media)"
+SPDX-License-Identifier = "MIT"
+SPDX-FileComment = "these files belong to: hammer.js"
+
+
 # Library: sap.ui.webc.common:
 
 [[annotations]]
@@ -646,7 +670,7 @@ SPDX-FileComment = "these files belong to: UI5 Web Components"
 path = "lib/jsdoc/ui5/plugin.js"
 precedence = "aggregate"
 SPDX-FileCopyrightText = [
-    "2025 SAP SE or an SAP affiliate company and OpenUI5 contributors",
+    "2026 SAP SE or an SAP affiliate company and OpenUI5 contributors",
     "2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc"
 ]
 SPDX-License-Identifier = "Apache-2.0"

package/THIRDPARTY.txt

@@ -202,7 +202,7 @@ License: Apache-2.0
 License Text: https://github.com/UI5/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: 46.1.0
+Component: Unicode Common Locale Data Repository, version: 48.0.0
 Copyright: 1991-2024 Unicode, Inc.
 License: LicenseRef-Unicode-3.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/LicenseRef-Unicode-3.0.txt
@@ -425,6 +425,27 @@ License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
 
 
+Library: sap.ui.mdc:
+
+Component: Chart.js, version: 4.5.0
+Copyright: 2025 Chart.js Contributors
+License: MIT
+License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.mdc/test/sap/ui/mdc/demokit/sample/Chart/ChartJS/control/ChartJS.js
+
+Component: chartjs-plugin-zoom, version: 1.0.1
+Copyright: 2016-2021 chartjs-plugin-zoom Contributors
+License: MIT
+License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.mdc/test/sap/ui/mdc/demokit/sample/Chart/ChartJS/control/chartjs-plugin-zoom.js
+
+Component: hammer.js, version: 2.0.7
+Copyright: 2011-2017 by Jorik Tangelder (Eight Media)
+License: MIT
+License Text: https://github.com/UI5/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.mdc/test/sap/ui/mdc/demokit/sample/Chart/ChartJS/control/hammerjs.js
+
+
 Library: sap.ui.webc.common:
 
 Component: UI5 Web Components, version: 1.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.143.1",
+  "version": "1.145.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/UI5/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.143.1"
+    "@openui5/sap.ui.core": "1.145.0"
   }
 }

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

@@ -4,9 +4,9 @@
   <name>sap.ui.unified</name>
   <vendor>SAP SE</vendor>
   <copyright>OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.143.1</version>
+  <version>1.145.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 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 //Provides control sap.ui.unified.Calendar.
@@ -80,7 +80,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @constructor
 	 * @public
@@ -467,6 +467,7 @@ sap.ui.define([
 		// Set keyboard shortcuts for Calendar-specific usage
 		oHeader.setProperty("_keyShortcutButton1", this._oResourceBundle.getText("CALENDAR_HEADER_MONTH_BUTTON_SHORTCUT"));
 		oHeader.setProperty("_keyShortcutButton2", this._oResourceBundle.getText("CALENDAR_HEADER_YEAR_BUTTON_SHORTCUT"));
+		oHeader.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
 
 		this._afterHeaderRenderAdjustCSS = this._createOnAfterRenderingDelegate(oHeader);
 
@@ -1610,6 +1611,7 @@ sap.ui.define([
 			oMonthPicker._setDate(oFocusedDate);
 			oMonthPicker.invalidate();
 			this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH_PICKER);
+			this._setHeaderCurrentPicker(CURRENT_PICKERS.MONTH_PICKER);
 			break;
 
 		case 2: // year picker
@@ -1626,7 +1628,6 @@ sap.ui.define([
 			break;
 			// no default
 		}
-
 	};
 
 	/**
@@ -1655,7 +1656,7 @@ sap.ui.define([
 			this._addMonthFocusDelegate();
 			break;
 
-			case 1: // month picker
+		case 1: // month picker
 			oFocusedDate.setYear(oFocusedDate.getYear() + 1);
 			this._updateHeadersYearPrimaryText(this._oYearFormat.format(oFocusedDate.toUTCJSDate(), true));
 			this._updateHeadersYearAdditionalTextHelper();
@@ -1666,6 +1667,7 @@ sap.ui.define([
 			oMonthPicker._setDate(oFocusedDate);
 			oMonthPicker.invalidate();
 			this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH_PICKER);
+			this._setHeaderCurrentPicker(CURRENT_PICKERS.MONTH_PICKER);
 			break;
 
 		case 2: // year picker
@@ -1686,23 +1688,42 @@ sap.ui.define([
 	};
 
 	/**
-	 * Calculates the year picker button text in secondary calendar type.
+	 * Returns secondary calendar year(s) text if there is secondaryCalendarType set.
 	 * @private
 	 */
-	Calendar.prototype._updateHeadersYearAdditionalTextHelper = function() {
+	Calendar.prototype._getSecondaryYearText = function() {
 		if (!this._getSecondaryCalendarType()){
-			return;
+			return "";
+		}
+
+		const oSecondaryYears = this._getDisplayedSecondaryYears();
+		let sSecondaryYearText = "";
+
+		// Add null checks to prevent errors when secondary years are undefined
+		if (!oSecondaryYears || !oSecondaryYears.start || !oSecondaryYears.end) {
+			return "";
 		}
-		var oSecondaryYears = this._getDisplayedSecondaryYears();
+
 		if (oSecondaryYears.start.getYear() === oSecondaryYears.end.getYear()) {
-			this._updateHeadersYearAdditionalText(this._oYearFormatSecondary.format(oSecondaryYears.start.toUTCJSDate(), true));
+			sSecondaryYearText = this._oYearFormatSecondary.format(oSecondaryYears.start.toUTCJSDate(), true);
 		} else {
-			var oLocaleData = this._getLocaleData();
-			var sPattern = oLocaleData.getIntervalPattern();
-			var sSecondaryMonthInfo = sPattern.replace(/\{0\}/, this._oYearFormatSecondary.format(oSecondaryYears.start.toUTCJSDate(), true))
+			const  sPattern = this._getLocaleData().getIntervalPattern();
+			sSecondaryYearText = sPattern.replace(/\{0\}/, this._oYearFormatSecondary.format(oSecondaryYears.start.toUTCJSDate(), true))
 				.replace(/\{1\}/, this._oYearFormatSecondary.format(oSecondaryYears.end.toUTCJSDate(), true));
-			this._updateHeadersYearAdditionalText(sSecondaryMonthInfo);
 		}
+		return sSecondaryYearText;
+	};
+
+	/**
+	 * Calculates the year picker button text in secondary calendar type.
+	 * @private
+	 */
+	Calendar.prototype._updateHeadersYearAdditionalTextHelper = function() {
+		if (!this._getSecondaryCalendarType()){
+			return;
+		}
+
+		this._updateHeadersYearAdditionalText(this._getSecondaryYearText());
 	};
 
 	/**
@@ -1711,11 +1732,12 @@ sap.ui.define([
 	 * @private
 	 */
 	Calendar.prototype._handleCurrentDate = function() {
-		var oNow = UI5Date.getInstance(),
+		const oNow = UI5Date.getInstance(),
 			oMaxDate = this.getMaxDate(),
 			oMinDate = this.getMinDate();
 
 		this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
+		this._setHeaderCurrentPicker(CURRENT_PICKERS.MONTH);
 
 		if (oMaxDate && oMaxDate.getTime() < oNow.getTime()) {
 			this.focusDate(oMaxDate);
@@ -1726,6 +1748,21 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Sets the _currentPicker property on the header aggregation, if available.
+	 *
+	 * @param {string} sPicker The picker type to set (e.g. from CURRENT_PICKERS).
+	 * @private
+	 */
+	Calendar.prototype._setHeaderCurrentPicker = function(sPicker) {
+		const oHeader = this.getAggregation("header");
+		try {
+			oHeader.setProperty("_currentPicker", sPicker);
+		} catch (e) {
+			Log.warning("Property '_currentPicker' could not be set on the header aggregation.");
+		}
+	};
+
 	Calendar.prototype._getYearString = function () {
 		var oYearPicker = this._getYearPicker(),
 			oYearPickerDomRef = oYearPicker.getDomRef(),
@@ -1842,6 +1879,7 @@ sap.ui.define([
 
 	Calendar.prototype._closePickers = function () {
 		this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
+		this._setHeaderCurrentPicker(CURRENT_PICKERS.MONTH);
 		// show again hidden month button
 		this._togglePrevNext(this._getFocusedDate(), true);
 
@@ -1985,6 +2023,7 @@ sap.ui.define([
 		this._updateMonthButtonVisibility();
 
 		this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH_PICKER);
+		this._setHeaderCurrentPicker(CURRENT_PICKERS.MONTH_PICKER);
 
 		if (this._bActionTriggeredFromSecondHeader) {
 			oSecondDate.setDate(1);
@@ -2022,10 +2061,11 @@ sap.ui.define([
 	 * @private
 	 */
 	Calendar.prototype._showYearPicker = function () {
-		var oDate = this._getFocusedDate(),
+		const oDate = this._getFocusedDate(),
 			oYearPicker = this._getYearPicker();
 
 		this.setProperty("_currentPicker", CURRENT_PICKERS.YEAR_PICKER);
+		this._setHeaderCurrentPicker(CURRENT_PICKERS.YEAR_PICKER);
 
 		oYearPicker.setDate(oDate.toLocalJSDate());
 
@@ -2250,6 +2290,7 @@ sap.ui.define([
 			this._showMonthPicker();
 		} else {
 			this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
+			this._setHeaderCurrentPicker(CURRENT_PICKERS.MONTH);
 			this._addMonthFocusDelegate();
 		}
 	};
@@ -2422,6 +2463,7 @@ sap.ui.define([
 			oRangeMidDate = CalendarDate.fromLocalJSDate(oYearPicker.getFirstRenderedDate(), this._getPrimaryCalendarType());
 
 		this.setProperty("_currentPicker", CURRENT_PICKERS.YEAR_RANGE_PICKER);
+		this._setHeaderCurrentPicker(CURRENT_PICKERS.YEAR_RANGE_PICKER);
 
 		oYearRangePicker.getColumns() % 2 !== 0 ?
 			oRangeMidDate.setYear(oRangeMidDate.getYear() + Math.floor(oYearRangePicker.getRangeSize() / 2)) :
@@ -2609,10 +2651,13 @@ sap.ui.define([
 
 	Calendar.prototype._updateHeadersYearPrimaryText = function (sFirstHeaderYear, sSecondHeaderYear) {
 		var oYearPicker = this._getYearPicker(),
+			oMonthPicker = this._getMonthPicker(),
 			oHeader = this.getAggregation("header"),
 			oSecondMonthHeader = this.getAggregation("secondMonthHeader"),
 			sFirstHeaderText = sFirstHeaderYear,
 			sSecondHeaderText = sSecondHeaderYear || sFirstHeaderYear,
+			sFirstYearLabelText = [sFirstHeaderText, this._getSecondaryYearText()].filter(Boolean).join(", "),
+			sSecondYearLabelText = [sSecondHeaderText, this._getSecondaryYearText()].filter(Boolean).join(", "),
 			sPrimaryCalendarType = this._getPrimaryCalendarType(),
 			sFirstYear, sSecondYear;
 
@@ -2621,9 +2666,9 @@ sap.ui.define([
 		var sYearRangeShortcut = this._oResourceBundle.getText("CALENDAR_HEADER_YEAR_RANGE_BUTTON_SHORTCUT");
 
 		// Regular year button labels and tooltips
-		var sFirstYearLabel = this._oResourceBundle.getText("CALENDAR_HEADER_YEAR_BUTTON", [sFirstHeaderText]);
+		var sFirstYearLabel = this._oResourceBundle.getText("CALENDAR_HEADER_YEAR_BUTTON", [sFirstYearLabelText]);
 		var sFirstYearTooltip = `${sFirstYearLabel} (${sYearShortcut})`;
-		var sSecondYearLabel = this._oResourceBundle.getText("CALENDAR_HEADER_YEAR_BUTTON", [sSecondHeaderText]);
+		var sSecondYearLabel = this._oResourceBundle.getText("CALENDAR_HEADER_YEAR_BUTTON", [sSecondYearLabelText]);
 		var sSecondYearTooltip = `${sSecondYearLabel} (${sYearShortcut})`;
 
 		// Year range labels and tooltips (will be updated if in year picker mode)
@@ -2658,14 +2703,30 @@ sap.ui.define([
 					sFirstHeaderText = sFirstYear + " - " + sSecondYear;
 				}
 
-				// Update year range labels for year picker mode
+				// Update year range labels for year picker mode with secondary calendar support
+				var sSecondaryYearRangeText = "";
+				if (this._getSecondaryCalendarType()) {
+					var oSecondaryFirstYear = new CalendarDate(oFirstDate, this._getSecondaryCalendarType());
+					var oSecondarySecondYear = new CalendarDate(oSecondDate, this._getSecondaryCalendarType());
+					// Add null checks for secondary year dates
+					if (oSecondaryFirstYear && oSecondarySecondYear) {
+						var sFirstSecondaryYear = this._oYearFormatSecondary.format(oSecondaryFirstYear.toUTCJSDate(), true);
+						var sSecondSecondaryYear = this._oYearFormatSecondary.format(oSecondarySecondYear.toUTCJSDate(), true);
+						sSecondaryYearRangeText = sFirstSecondaryYear + " - " + sSecondSecondaryYear;
+					}
+				}
+
+				var sYearRangeLabelText = [sFirstYear + " - " + sSecondYear, sSecondaryYearRangeText].filter(Boolean).join(", ");
 				sYearRangeLabel = this._oResourceBundle.getText("CALENDAR_HEADER_YEAR_RANGE_BUTTON", [sFirstYear, sSecondYear]);
 				sYearRangeTooltip = `${sYearRangeLabel} (${sYearRangeShortcut})`;
 
 				// Set properties for button4 when in year picker mode (always set accessibility properties when button4 is used)
 				oHeader.setProperty("_tooltipButton4", sYearRangeTooltip);
 				oHeader.setProperty("_keyShortcutButton4", sYearRangeShortcut);
-				oHeader.setProperty("_descriptionButton4", sYearRangeLabel);
+				oHeader.setProperty("_descriptionButton4", sYearRangeLabelText);
+				this._setHeaderCurrentPicker(CURRENT_PICKERS.YEAR_PICKER);
+		} else if (this._iMode === 1 && oMonthPicker) {
+			this._setHeaderCurrentPicker(CURRENT_PICKERS.MONTH_PICKER);
 		} else {
 			// Set properties for button4 when not in year picker mode (always set accessibility properties when button4 is used)
 			oHeader.setProperty("_tooltipButton4", sSecondYearTooltip);
@@ -2681,7 +2742,7 @@ sap.ui.define([
 		var sSecondHeaderYearLabel, sSecondHeaderYearTooltip;
 
 		if (this._iMode === 2 && oYearPicker) {
-			sSecondHeaderYearLabel = sYearRangeLabel;
+			sSecondHeaderYearLabel = sYearRangeLabelText;
 			sSecondHeaderYearTooltip = sYearRangeTooltip;
 		} else {
 			sSecondHeaderYearLabel = sSecondYearLabel;
@@ -2696,14 +2757,14 @@ sap.ui.define([
 		oSecondMonthHeader.setProperty("_descriptionButton2", sSecondHeaderYearLabel);
 
 		oHeader.setTextButton2(sFirstHeaderText);
-		oHeader.setAriaLabelButton2(this._iMode === 2 && oYearPicker ? sYearRangeLabel : sFirstYearLabel);
+		oHeader.setAriaLabelButton2(this._iMode === 2 && oYearPicker ? sYearRangeLabelText : sFirstYearLabel);
 		oHeader.setProperty("_tooltipButton2", this._iMode === 2 && oYearPicker ? sYearRangeTooltip : sFirstYearTooltip);
-		oHeader.setProperty("_descriptionButton2", this._iMode === 2 && oYearPicker ? sYearRangeLabel : sFirstYearLabel);
+		oHeader.setProperty("_descriptionButton2", this._iMode === 2 && oYearPicker ? sYearRangeLabelText : sFirstYearLabel);
 
 		// In single header with two months scenario, button2 should represent the second month's year
 		if (this._isTwoMonthsInTwoColumns() && sSecondHeaderText !== sFirstHeaderText) {
 			// Button2 shows second month year, so update its accessibility properties
-			var sButton2Label = this._iMode === 2 && oYearPicker ? sYearRangeLabel : sSecondYearLabel;
+			var sButton2Label = this._iMode === 2 && oYearPicker ? sYearRangeLabelText : sSecondYearLabel;
 			var sButton2Tooltip = this._iMode === 2 && oYearPicker ? sYearRangeTooltip : sSecondYearTooltip;
 			var sButton2Shortcut = this._iMode === 2 && oYearPicker ? sYearRangeShortcut : sYearShortcut;
 
@@ -2720,9 +2781,24 @@ sap.ui.define([
 				// In year picker mode, extract years from the range string for button4
 				var aYears = sSecondHeaderText.split(" - ");
 				if (aYears.length === 2) {
+					// Create secondary year range text for button4
+					var sButton4SecondaryYearText = "";
+					if (this._getSecondaryCalendarType()) {
+						var oButton4FirstDate = new CalendarDate(oFirstDate, this._getSecondaryCalendarType());
+						var oButton4SecondDate = new CalendarDate(oSecondDate, this._getSecondaryCalendarType());
+						// Add null checks for button4 secondary year dates
+						if (oButton4FirstDate && oButton4SecondDate) {
+							var sButton4FirstSecondaryYear = this._oYearFormatSecondary.format(oButton4FirstDate.toUTCJSDate(), true);
+							var sButton4SecondSecondaryYear = this._oYearFormatSecondary.format(oButton4SecondDate.toUTCJSDate(), true);
+							sButton4SecondaryYearText = sButton4FirstSecondaryYear + " - " + sButton4SecondSecondaryYear;
+						}
+					}
+					var sButton4LabelText = [aYears[0] + " - " + aYears[1], sButton4SecondaryYearText].filter(Boolean).join(", ");
 					sButton4Label = this._oResourceBundle.getText("CALENDAR_HEADER_YEAR_RANGE_BUTTON", aYears);
 					sButton4Tooltip = `${sButton4Label} (${sYearRangeShortcut})`;
 					sButton4Shortcut = sYearRangeShortcut;
+					// Use the full label text with secondary years for accessibility
+					sButton4Label = sButton4LabelText;
 				} else {
 					// Fallback if string format is unexpected
 					sButton4Label = sSecondYearLabel;
@@ -2938,7 +3014,7 @@ sap.ui.define([
 			this._bNamesLengthChecked = true;
 
 			this.setProperty("_currentPicker", CURRENT_PICKERS.MONTH);
-
+			this._setHeaderCurrentPicker(CURRENT_PICKERS.MONTH);
 			if (!this._bLongMonth) {
 				// update short month name (long name used by default)
 				aMonths = this.getAggregation("month");

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -43,7 +43,7 @@ sap.ui.define([
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.143.1
+	 * @version 1.145.0
 	 *
 	 * @constructor
 	 * @public