@openui5/sap.ui.unified 1.151.1 → 1.153.0

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.1
+	 * @version 1.153.0
 	 * @since 1.21.0
 	 *
 	 * @constructor
@@ -206,6 +206,30 @@ sap.ui.define([
 	};
 
 
+	MenuTextFieldItem.prototype.onsapprevious = function(oEvent){
+		if (oEvent.key !== "ArrowLeft") {
+			return;
+		}
+		if (this._checkCursorPosForNav(false)) {
+			this.getParent().onsapprevious(oEvent);
+		} else {
+			oEvent.stopPropagation();
+		}
+	};
+
+
+	MenuTextFieldItem.prototype.onsapnext = function(oEvent){
+		if (oEvent.key !== "ArrowRight") {
+			return;
+		}
+		if (this._checkCursorPosForNav(true)) {
+			this.getParent().onsapnext(oEvent);
+		} else {
+			oEvent.stopPropagation();
+		}
+	};
+
+
 	MenuTextFieldItem.prototype.onsaphome = function(oEvent){
 		if (this._checkCursorPosForNav(false)) {
 			this.getParent().onsaphome(oEvent);
@@ -252,7 +276,7 @@ sap.ui.define([
 	MenuTextFieldItem.prototype.onkeydown = function(oEvent){
 		//like sapenter but on keyup -> see Menu.prototype.onkeyup
 		if (!PseudoEvents.events.sapenter.fnCheck(oEvent) && oEvent.key !== "Enter") {
-			if (oEvent.key === "Home" || oEvent.key === "End") {
+			if (oEvent.key === "Home" || oEvent.key === "End" || oEvent.key === " ") {
 				oEvent.stopPropagation();
 			}
 

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @extends sap.ui.unified.RecurrenceRule
-	 * @version 1.151.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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
@@ -2215,12 +2237,7 @@ sap.ui.define([
 			this._sLastTargetId = oDomRef.id;
 			this._selectedWithMouse = true;
 		}
-
-		if (this._bFocusFromTouch) {
-			oDomRef.classList.add("sapUiCalItemFocusFromTouch");
-		} else {
-			oDomRef.classList.remove("sapUiCalItemFocusFromTouch");
-		}
+		oDomRef.classList.toggle("sapUiCalItemFocusFromTouch", !!this._bFocusFromTouch);
 
 		if (bFireFocus) {
 			this.fireFocus({date: oFocusedDate.toLocalJSDate(), otherMonth: bOtherMonth});

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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.0
 	 *
 	 * @constructor
 	 * @public
@@ -280,6 +280,14 @@ sap.ui.define([
 		// check if day names are too big -> use smaller ones
 		_checkNamesLength.call(this);
 
+		if (this._bFocusFromTouch) {
+			const iFocusedIndex = this._oItemNavigation.getFocusedIndex();
+			const oDomRef = this._oItemNavigation.getItemDomRefs()[iFocusedIndex];
+			if (oDomRef) {
+				oDomRef.classList.add("sapUiCalItemFocusFromTouch");
+			}
+		}
+
 	};
 
 	MonthsRow.prototype.onsapfocusleave = function(oEvent){
@@ -1008,6 +1016,8 @@ sap.ui.define([
 		if (this.getIntervalSelection()) {
 			this._selectedWithMouse = false;
 		}
+
+		this._bFocusFromTouch = false;
 	};
 
 	MonthsRow.prototype.onsapselect = function(oEvent){
@@ -1030,6 +1040,12 @@ sap.ui.define([
 
 	};
 
+	MonthsRow.prototype.ontouchstart = function(oEvent){
+		if (oEvent.target.closest(".sapUiCalItem")) {
+			this._bFocusFromTouch = true;
+		}
+	};
+
 	MonthsRow.prototype.onsappageupmodifiers = function(oEvent){
 
 		// not handled by ItemNavigation
@@ -1203,6 +1219,7 @@ sap.ui.define([
 		this.setDate(oFocusedDate.toLocalJSDate());
 
 		this.fireFocus({date: oFocusedDate.toLocalJSDate(), notVisible: false});
+		aDomRefs[iIndex].classList.toggle("sapUiCalItemFocusFromTouch", !!this._bFocusFromTouch);
 
 		if (oEvent.type == "mousedown") {
 			// as no click event is fired in some cases, e.g. if DOM changed select the month on mousedown

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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.0
 	 *
 	 * @constructor
 	 * @public
@@ -236,6 +236,24 @@ sap.ui.define([
 
 		_initItemNavigation.call(this);
 
+		if (this._bFocusFromTouch) {
+			const iFocusedIndex = this._oItemNavigation.getFocusedIndex();
+			const oDomRef = this._oItemNavigation.getItemDomRefs()[iFocusedIndex];
+			if (oDomRef) {
+				oDomRef.classList.add("sapUiCalItemFocusFromTouch");
+			}
+		}
+
+	};
+
+	TimesRow.prototype.ontouchstart = function(oEvent) {
+		if (oEvent.target.closest(".sapUiCalItem")) {
+			this._bFocusFromTouch = true;
+		}
+	};
+
+	TimesRow.prototype.onkeydown = function(oEvent) {
+		this._bFocusFromTouch = false;
 	};
 
 	TimesRow.prototype.onsapfocusleave = function(oEvent){
@@ -1081,6 +1099,9 @@ sap.ui.define([
 
 		this.fireFocus({date: CalendarUtils._createLocalDate(oFocusedDate, true), notVisible: false});
 
+		var oDomRef = aDomRefs[iIndex];
+		oDomRef.classList.toggle("sapUiCalItemFocusFromTouch", !!this._bFocusFromTouch);
+
 		if (oEvent.type == "mousedown") {
 			// as no click event is fired in some cases, e.g. if DOM changed select the month on mousedown
 			_handleMousedown.call(this, oEvent, oFocusedDate, iIndex);

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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.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.1
+	 * @version 1.153.0
 	 * @since 1.28
 	 * @public
 	 */
 	var thisLib = Library.init({
 		name : "sap.ui.unified",
 		apiVersion: 2,
-		version: "1.151.1",
+		version: "1.153.0",
 		dependencies : ["sap.ui.core"],
 		designtime: "sap/ui/unified/designtime/library.designtime",
 		types: [

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

@@ -189,6 +189,7 @@ html.sap-desktop .sapUiCalCancel:active {
 }
 
 html.sap-desktop .sapUiCalHead button.sapUiCalDsbl:focus,
+.sapUiCalHead button.sapUiCalDsbl:focus-visible,
 .sapUiCalHead button.sapUiCalDsbl:hover,
 .sapUiCalHead button.sapUiCalDsbl:active {
 	background-color: var(--sapButton_Lite_Background);

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

@@ -243,7 +243,8 @@ Use it only if there's one appointment per day for a row that doesn't have inter
 }
 
 html.sap-desktop .sapUiCalendarApp:hover:not(:active),
-html.sap-desktop .sapUiCalendarApp:focus:not(:active) > .sapUiCalendarAppCont {
+html.sap-desktop .sapUiCalendarApp:focus:not(:active) > .sapUiCalendarAppCont,
+.sapUiCalendarApp:not(.sapUiCalItemFocusFromTouch):focus-visible:not(:active) > .sapUiCalendarAppCont {
 	background-color: var(--sapList_Hover_Background);
 }
 
@@ -257,7 +258,8 @@ html.sap-desktop .sapUiCalendarApp:hover:not(:active) > .sapUiCalendarAppCont {
 }
 
 html.sap-desktop .sapUiCalendarApp.sapUiCalendarAppSel:hover:not(:active),
-html.sap-desktop .sapUiCalendarApp.sapUiCalendarAppSel:focus:not(:active) > .sapUiCalendarAppCont {
+html.sap-desktop .sapUiCalendarApp.sapUiCalendarAppSel:focus:not(:active) > .sapUiCalendarAppCont,
+.sapUiCalendarApp.sapUiCalendarAppSel:not(.sapUiCalItemFocusFromTouch):focus-visible:not(:active) > .sapUiCalendarAppCont {
 	background-color: darken(@sapUiSelected, 10);
 }
 

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

@@ -470,7 +470,9 @@
 	/* style the '%' symbols */
 	.sapUiCPPercentSymbol {
 		font-size: 0.75rem;
-		line-height: 3rem; /* vertical alignment of the '%' symbol */
+		display: flex;
+		align-items: center;
+		justify-content: center;
 		width: 0.9375rem;
 		padding-left: 1px;
 	}

package/src/sap/ui/unified/themes/sap_hcb/CalendarRow.less

@@ -21,7 +21,8 @@
 }
 
 /* as outlines can't have different offsets on one side (no left border) and don't work in IE just use a inner border */
-html.sap-desktop .sapUiCalendarApp:focus > .sapUiCalendarAppCont:after{
+html.sap-desktop .sapUiCalendarApp:focus > .sapUiCalendarAppCont:after,
+.sapUiCalendarApp:focus-visible > .sapUiCalendarAppCont:after{
 	position: absolute;
 	top: 0;
 	left: 0;