@openui5/sap.ui.unified 1.151.0 → 1.152.0

package/THIRDPARTY.txt

@@ -6,31 +6,31 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.f:
 
-Component: UI5 Web Components, version: 2.24.0
+Component: UI5 Web Components, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.f/src/sap/f/thirdparty/**
 
-Component: UI5 Web Components Fiori, version: 2.24.0
+Component: UI5 Web Components Fiori, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.f/src/sap/f/thirdparty/**
 
-Component: UI5 Web Components Icons, version: 2.24.0
+Component: UI5 Web Components Icons, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.f/src/sap/f/thirdparty/**
 
-Component: UI5 Web Components Icons Business Suite, version: 2.24.0
+Component: UI5 Web Components Icons Business Suite, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.f/src/sap/f/thirdparty/**
 
-Component: UI5 Web Components Icons TNT, version: 2.24.0
+Component: UI5 Web Components Icons TNT, version: 2.24.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/UI5/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.151.0",
+  "version": "1.152.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.151.0"
+    "@openui5/sap.ui.core": "1.152.0"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.151.0</version>
+  <version>1.152.0</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

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

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public
@@ -225,6 +225,9 @@ sap.ui.define([
 			 */
 			_currentPicker : {type : "string", group : "Appearance", visibility: "hidden"},
 
+			/** Whether the high-zoom (≤320px) picker is active. @private */
+			_highZoomActive : {type : "boolean", defaultValue : false, visibility: "hidden"},
+
 			/**
 			 * If set, the calendar week numbering is used for display.
 			 * If not set, the calendar week numbering of the global configuration is used.
@@ -436,6 +439,11 @@ sap.ui.define([
 		//when used in a DatePicker, in mobile there is no cancel button
 		this._bSkipCancelButtonRendering = false;
 		this._bActionTriggeredFromSecondHeader = false;
+
+		// High-zoom (≤320px) support — only for standalone Calendar (not embedded in DatePicker)
+		this._oHZPicker = null;
+		this._bHZListenersRegistered = false;
+		this._fnHZResizeHandler = this._onHZResize.bind(this);
 	};
 
 	Calendar.prototype.exit = function(){
@@ -460,6 +468,19 @@ sap.ui.define([
 		}
 
 		this._oSelectedMonth = null;
+
+		// Cleanup high-zoom
+		if (this._bHZListenersRegistered) {
+			if (window.visualViewport) {
+				window.visualViewport.removeEventListener("resize", this._fnHZResizeHandler);
+			}
+			window.removeEventListener("resize", this._fnHZResizeHandler);
+		}
+		this._fnHZResizeHandler = null;
+		if (this._oHZPicker) {
+			this._oHZPicker.destroy();
+			this._oHZPicker = null;
+		}
 	};
 
 	Calendar.prototype._initializeHeader = function() {
@@ -649,6 +670,25 @@ sap.ui.define([
 
 	Calendar.prototype.onAfterRendering = function(oEvent){
 
+		// Check zoom state after first render (resize handler skips before DOM exists)
+		if (!this._oSpecialDatesControlOrigin) {
+			// Register listeners lazily so embedded Calendars (inside DatePicker) never get them
+			if (!this._bHZListenersRegistered) {
+				if (window.visualViewport) {
+					window.visualViewport.addEventListener("resize", this._fnHZResizeHandler);
+				}
+				window.addEventListener("resize", this._fnHZResizeHandler);
+				this._bHZListenersRegistered = true;
+			}
+			const bHighZoom = this._isHighZoom();
+			if (bHighZoom !== this.getProperty("_highZoomActive")) {
+				this.setProperty("_highZoomActive", bHighZoom);
+				if (bHighZoom) {
+					this._initHZPicker();
+				}
+			}
+		}
+
 		// check if day names and month names are too big -> use smaller ones
 		if (!this._getSucessorsPickerPopup()) {
 			_checkNamesLength.call(this);
@@ -1198,6 +1238,18 @@ sap.ui.define([
 		return this.setProperty("intervalSelection", bEnabled);
 	};
 
+	// Override to invalidate the high-zoom picker when interval selection changes
+	// so the correct picker type (DatePicker vs DateRangeSelection) is used on next zoom-in.
+	const _origSetIntervalSelection = Calendar.prototype.setIntervalSelection;
+	Calendar.prototype.setIntervalSelection = function(bEnabled) {
+		if (this._oHZPicker) {
+			this.removeDependent(this._oHZPicker);
+			this._oHZPicker.destroy();
+			this._oHZPicker = null;
+		}
+		return _origSetIntervalSelection.call(this, bEnabled);
+	};
+
 	/**
 	 * Setter for the property <code>singleSelection</code>. If set to <code>true</code> only a single date or single interval, when <code>intervalSelection</code> is set to <code>true</code>, can be selected.
 	 *
@@ -3154,6 +3206,133 @@ sap.ui.define([
 		this._updateHeadersYearPrimaryText(this._getYearString());
 	}
 
+	// ============================================================
+	// High-zoom (≤320px) support for standalone Calendar
+	// At ≤320px a DatePicker (or DateRangeSelection for intervalSelection)
+	// is shown instead of the calendar grid. DatePicker automatically
+	// activates its own DateHighZoomInputs layout at that viewport width.
+	// ============================================================
+
+	/**
+	 * Returns true when the viewport is ≤ 320 px.
+	 * @returns {boolean}
+	 * @private
+	 */
+	Calendar.prototype._isHighZoom = function() {
+		const iWidth = (window.visualViewport && window.visualViewport.width) || window.innerWidth;
+		return iWidth <= 320;
+	};
+
+	/**
+	 * Called on viewport resize. Activates or deactivates high-zoom mode
+	 * only for standalone Calendar (not when embedded in DatePicker).
+	 * @private
+	 */
+	Calendar.prototype._onHZResize = function() {
+		// Skip when Calendar is embedded in a picker — the picker manages zoom
+		if (this._oSpecialDatesControlOrigin) { return; }
+		// Skip until first render — visualViewport fires during initial layout
+		if (!this.getDomRef()) { return; }
+
+		const bHighZoom = this._isHighZoom();
+		if (bHighZoom === this.getProperty("_highZoomActive")) { return; }
+
+		if (bHighZoom) {
+			this.setProperty("_highZoomActive", true);
+			this._initHZPicker();
+		} else {
+			// Destroy the picker so Calendar re-renders cleanly as its own DOM root.
+			if (this._oHZPicker) {
+				this.removeDependent(this._oHZPicker);
+				this._oHZPicker.destroy();
+				this._oHZPicker = null;
+			}
+			this.setProperty("_highZoomActive", false);
+		}
+	};
+
+	/**
+	 * Lazily loads DatePicker (or DateRangeSelection) via runtime require
+	 * and shows it in place of the calendar grid at high zoom.
+	 * sap.ui.unified → sap.m is not a build-time dependency so we use
+	 * sap.ui.require (same pattern as FileUploader.js in this library).
+	 * @private
+	 */
+	Calendar.prototype._initHZPicker = function() {
+		const sModule = this.getIntervalSelection()
+			? "sap/m/DateRangeSelection"
+			: "sap/m/DatePicker";
+
+		const FnClass = sap.ui.require(sModule);
+		if (FnClass) {
+			this._createHZPicker(FnClass);
+		} else {
+			sap.ui.require([sModule], function(Cls) {
+				if (!this.bIsDestroyed) {
+					this._createHZPicker(Cls);
+				}
+			}.bind(this));
+		}
+	};
+
+	/**
+	 * Creates and configures the high-zoom picker (DatePicker or DateRangeSelection).
+	 * @param {function} FnClass - DatePicker or DateRangeSelection constructor
+	 * @private
+	 */
+		Calendar.prototype._createHZPicker = function(FnClass) {
+		if (!this._oHZPicker) {
+			const bRange = this.getIntervalSelection();
+			const sSecondary = this.getSecondaryCalendarType();
+			const sPrimary   = this.getProperty("primaryCalendarType");
+
+			const oPicker = new FnClass(this.getId() + "-hzPicker", {
+				displayFormat: "dd.MM.yyyy",
+				displayFormatType: sPrimary || undefined,
+				minDate: this._oMinDate.toLocalJSDate(),
+				maxDate: this._oMaxDate.toLocalJSDate(),
+				change: function(oEvent) {
+					// Propagate the selected date(s) back to the Calendar aggregation
+					const oDateValue = oPicker.getDateValue();
+					if (!oDateValue) { return; }
+
+					// DateRange is guaranteed loaded (transitive dep via Month/MonthPicker/YearPicker)
+					const DateRange = sap.ui.require("sap/ui/unified/DateRange");
+
+					if (DateRange) {
+						const oRange = new DateRange({ startDate: oDateValue });
+						if (bRange && oPicker.getSecondDateValue()) {
+							oRange.setEndDate(oPicker.getSecondDateValue());
+						}
+						this.removeAllSelectedDates();
+						this.addSelectedDate(oRange);
+						this.fireSelect();
+					}
+				}.bind(this)
+			});
+
+			// Pre-fill from current Calendar selection
+			const aSelected = this.getSelectedDates();
+			if (aSelected.length > 0 && aSelected[0].getStartDate()) {
+				oPicker.setDateValue(aSelected[0].getStartDate());
+				if (bRange && aSelected[0].getEndDate()) {
+					oPicker.setSecondDateValue(aSelected[0].getEndDate());
+				}
+			}
+
+			this._oHZPicker = oPicker;
+			// Use the setter so _bSecondaryCalendarTypeSet is flagged correctly —
+			// passing secondaryCalendarType in the constructor bypasses the setter.
+			if (sSecondary) {
+				oPicker.setSecondaryCalendarType(sSecondary);
+			}
+			this.addDependent(oPicker);
+		}
+
+		this._oHZPicker.setVisible(true);
+		this.invalidate();
+	};
+
 	return Calendar;
 
 });

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

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

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

@@ -64,7 +64,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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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.151.0
+	 * @version 1.152.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.151.0
+		 * @version 1.152.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -67,10 +67,16 @@ sap.ui.define(["sap/ui/core/Lib"],
 		}
 
 		if (this.addAttributes) {
-			// additional stuff by inherited controls
 			this.addAttributes(oRm, oCal);
 		}
-		oRm.openEnd(); // div element
+		oRm.openEnd();
+
+		// In high-zoom standalone mode render only the DatePicker/DateRangeSelection proxy
+		if (oCal.getProperty("_highZoomActive") && oCal._oHZPicker) {
+			oRm.renderControl(oCal._oHZPicker);
+			oRm.close("div");
+			return;
+		}
 
 		var oHeader = oCal.getAggregation("header");
 		oRm.renderControl(oHeader);

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

@@ -84,7 +84,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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

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

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.151.0
+		 * @version 1.152.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -49,7 +49,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.151.0
+		 * @version 1.152.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.151.0
+	 * @version 1.152.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.151.0
+		 * @version 1.152.0
 		 *
 		 * @constructor
 		 * @public

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

@@ -14,7 +14,7 @@ sap.ui.define(["sap/m/library", "sap/ui/core/Lib"],
 	/**
 	 * Currency renderer.
 	 *
-	 * @version 1.151.0
+	 * @version 1.152.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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -5,15 +5,24 @@
  */
 
 // Provides control sap.ui.unified.DateTypeRange.
-sap.ui.define(['./DateRange', './library'],
-	function(DateRange, library) {
+sap.ui.define([
+	'./DateRange',
+	'./library',
+	'sap/ui/core/library'
+],
+function(
+	DateRange,
+	library,
+	coreLibrary
+) {
 	"use strict";
 
-
-
 	// shortcut for sap.ui.unified.CalendarDayType
 	var CalendarDayType = library.CalendarDayType;
 
+	// shortcut for sap.ui.core.aria.HasPopup
+	var AriaHasPopup = coreLibrary.aria.HasPopup;
+
 
 
 	/**
@@ -25,7 +34,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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public
@@ -54,7 +63,19 @@ sap.ui.define(['./DateRange', './library'],
 			 * If set, this color will override the default background color defined in <code>Calendar</code> <code>specialDates</code> aggregation
 			 * @since 1.76.0
 			 */
-			color : {type : "sap.ui.core.CSSColor", group : "Appearance", defaultValue : null}
+			color : {type : "sap.ui.core.CSSColor", group : "Appearance", defaultValue : null},
+
+			/**
+			 * Defines the value of the <code>aria-haspopup</code> attribute of the day cell.
+			 *
+			 * <b>Note:</b> Use this property only when the cell is related to a popover/popup.
+			 * The value should be equal to the main/root role of the popup.
+			 *
+			 * <b>Note:</b> Setting <code>type</code> to <code>sap.ui.unified.CalendarDayType.None</code>
+			 * together with this property allows adding the attribute without any visual marking.
+			 * @since 1.152.0
+			 */
+			ariaHasPopup : {type : "sap.ui.core.aria.HasPopup", group : "Accessibility", defaultValue : AriaHasPopup.None}
 		}
 	}});
 

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

@@ -79,7 +79,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.unified.IProcessableBlobs
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.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.151.0
+		 * @version 1.152.0
 		 *
 		 * @constructor
 		 * @since 1.52

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

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IContextMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @implements sap.ui.unified.IMenuItem
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

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

@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Element', './library', 'sap/ui/core/IconPool', 'sap/
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @implements sap.ui.unified.IMenuItem
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 * @since 1.127.0
 	 *
 	 * @constructor

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

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

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @implements sap.ui.unified.IMenuItem
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 * @since 1.21.0
 	 *
 	 * @constructor

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @extends sap.ui.unified.RecurrenceRule
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * NonWorkingPeriod
 	 * @extends sap.ui.core.Element
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * </pre>
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.CalendarAppointment
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * Applications can inherit from this element to add own fields.
 	 * @extends sap.ui.unified.NonWorkingPeriod
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * Time range for use in <code>NonWorkingPeriod</code>
 	 * @extends sap.ui.core.Element
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * with <code>recurrenceType</code> set to <code>Weekly</code> is provided.
 	 *
 	 * @extends sap.ui.unified.RecurrenceRule
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * with <code>recurrenceType</code> set to <code>Yearly</code> is provided.
 	 *
 	 * @extends sap.ui.unified.MonthlyRecurrenceRule
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -39,7 +39,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.151.0
+	 * @version 1.152.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.151.0
+	 * @version 1.152.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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -78,7 +78,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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public
@@ -1012,10 +1012,10 @@ sap.ui.define([
 			// collects non working day with the first occurrence of one of the types01..types20
 			if ((oTimeStamp === oStartTimeStamp && !oEndDate) || (oTimeStamp >= oStartTimeStamp && oTimeStamp <= oEndTimeStamp)) {
 				if (!bNonWorkingType && !oType) {
-					oType = {type: oRange.getType(), secondaryType: oRange.getSecondaryType(), tooltip: oRange.getTooltip_AsString(), color: oRange.getColor(), customData: oRange.getCustomData()};
+					oType = Month.prototype._createDateTypeObject.call(this, oRange, true);
 					aTypes.push(oType);
 				} else if (bNonWorkingType && !oTypeNW) {
-						oTypeNW = {type: oRange.getType(), secondaryType: oRange.getSecondaryType(), tooltip: oRange.getTooltip_AsString(), customData: oRange.getCustomData()};
+						oTypeNW = Month.prototype._createDateTypeObject.call(this, oRange, false);
 						aTypes.push(oTypeNW);
 				}
 				if (oType && oTypeNW) {
@@ -1028,6 +1028,28 @@ sap.ui.define([
 
 	};
 
+	/*
+	 * Creates a date type object from a given date range.
+	 * @param {sap.ui.unified.DateRange} oRange the date range
+	 * @param {boolean} bSetColor whether to include the color property
+	 * @returns {object} the date type object
+	 * @private
+	 */
+	Month.prototype._createDateTypeObject = function(oRange, bSetColor) {
+		const oTypeObject = {
+			type: oRange.getType(),
+			secondaryType: oRange.getSecondaryType(),
+			tooltip: oRange.getTooltip_AsString(),
+			customData: oRange.getCustomData(),
+			ariaHasPopup: oRange.getAriaHasPopup(),
+			bAriaHasPopupExplicit: !oRange.isPropertyInitial("ariaHasPopup")
+		};
+		if (bSetColor) {
+			oTypeObject.color = oRange.getColor();
+		}
+		return oTypeObject;
+	};
+
 	/*
 	 * Checks if a given date is enabled
 	 * aside from the disabledDates aggregation the min. and max. dates are also checked

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

@@ -57,7 +57,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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -17,7 +17,8 @@ sap.ui.define([
 	'sap/ui/core/InvisibleText',
 	'sap/ui/core/date/UI5Date',
 	"sap/ui/core/date/CalendarUtils",
-	"sap/ui/core/Locale"
+	"sap/ui/core/Locale",
+	"sap/ui/core/library"
 ],
 	function(
 		CalendarType,
@@ -32,13 +33,17 @@ sap.ui.define([
 		InvisibleText,
 		UI5Date,
 		CalendarDateUtils,
-		Locale
+		Locale,
+		coreLibrary
 	) {
 	"use strict";
 
 
 	// shortcut for sap.ui.unified.CalendarDayType
-	var CalendarDayType = library.CalendarDayType;
+	const CalendarDayType = library.CalendarDayType;
+
+	// shortcut for sap.ui.core.aria.HasPopup
+	const AriaHasPopup = coreLibrary.aria.HasPopup;
 
 
 
@@ -456,6 +461,15 @@ sap.ui.define([
 		var bEnabled = oMonth._checkDateEnabled(oDay);
 		var bShouldBeMarkedAsSpecialDate = oMonth._isSpecialDateMarkerEnabled(oDay);
 
+		// Determine effective aria-haspopup from per-date value on matched DateTypeRange entries.
+		let sHasPopup = AriaHasPopup.None;
+		for (let i = 0; i < aDayTypes.length; i++) {
+			if (aDayTypes[i].bAriaHasPopupExplicit) {
+				sHasPopup = aDayTypes[i].ariaHasPopup;
+				break;
+			}
+		}
+
 		const sFirstSpecialDateType = aDayTypes.length > 0 && aDayTypes[0].type;
 		const sSecondaryDateType = aDayTypes.length > 0 && aDayTypes[0].secondaryType;
 		const bIsWeekend = oHelper.aNonWorkingDays && oHelper.aNonWorkingDays instanceof Array
@@ -594,6 +608,10 @@ sap.ui.define([
 			CalendarLegendRenderer.addCalendarTypeAccInfo(mAccProps, sAriaType, oLegend);
 		}
 
+		if (sHasPopup !== AriaHasPopup.None) {
+			mAccProps["haspopup"] = sHasPopup.toLowerCase();
+		}
+
 		if (aDayTypes[0] && aDayTypes[0].customData?.length && bShouldBeMarkedAsSpecialDate) {
 			//render customData
 			aDayTypes[0].customData.forEach((customData) => {
@@ -606,7 +624,8 @@ sap.ui.define([
 		oRm.accessibilityState(null, mAccProps);
 		oRm.openEnd(); // div element
 
-		if (aDayTypes[0] && bShouldBeMarkedAsSpecialDate){ //if there's a special date inside current month, render it
+		if (aDayTypes[0] && bShouldBeMarkedAsSpecialDate
+				&& (aDayTypes[0].type !== CalendarDayType.None || aDayTypes[0].color)) { //if there's a special date inside current month, render it
 			oRm.openStart("div");
 			oRm.class("sapUiCalSpecialDate");
 			const sColor = aDayTypes[0].color?.toLowerCase();

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

@@ -70,7 +70,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.151.0
+	 * @version 1.152.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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @private

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

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

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * The WeeksRow works with UI5Date or JavaScript Date objects for its API, but internally uses CalendarDate objects for calculations.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -61,7 +61,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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @public

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.151.0
+	 * @version 1.152.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -32,14 +32,14 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.unified
 	 * @author SAP SE
-	 * @version 1.151.0
+	 * @version 1.152.0
 	 * @since 1.28
 	 * @public
 	 */
 	var thisLib = Library.init({
 		name : "sap.ui.unified",
 		apiVersion: 2,
-		version: "1.151.0",
+		version: "1.152.0",
 		dependencies : ["sap.ui.core"],
 		designtime: "sap/ui/unified/designtime/library.designtime",
 		types: [