@openui5/sap.m 1.141.2 → 1.143.0

package/src/sap/m/LightBoxItem.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Link.js

@@ -101,7 +101,7 @@ function(
 	 * @borrows sap.ui.core.ILabelable.hasLabelableHTMLElement as #hasLabelableHTMLElement
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/LinkTileContent.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @class This element is used within the GenericTile control that generates a combination of an icon and a linkl
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @constructor
 	 * @public
 	 * @since 1.120

package/src/sap/m/List.js

@@ -30,7 +30,7 @@ sap.ui.define(["./library", "./ListBase", "./ListRenderer", "sap/ui/core/Lib", "
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ListBase.js

@@ -105,7 +105,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @public
@@ -604,7 +604,7 @@ function(
 						/**
 						 * The list item action that fired the event
 						 */
-						itemAction : {type : "sap.m.ListItemAction"},
+						action : {type : "sap.m.ListItemAction"},
 
 						/**
 						 * The list item in which the action was performed
@@ -3005,7 +3005,7 @@ function(
 	 * @since 1.76
 	 * @public
 	 */
-	ListBase.prototype.scrollToIndex = function(iIndex) {
+	ListBase.prototype.scrollToIndex = function(iIndex, _lastChance) {
 		return new Promise(function(resolve, reject) {
 			var oItem, oScrollDelegate;
 
@@ -3016,19 +3016,24 @@ function(
 			}
 
 			oItem = getItemAtIndex(this, iIndex);
-			if (!oItem) {
+			if (!oItem && _lastChance) {
 				return reject();
 			}
-
-			// adding timeout of 0 ensures the DOM is ready in case of rerendering
-			setTimeout(function() {
-				try {
-					oScrollDelegate.scrollToElement(oItem.getDomRef(), null, [0, this._getStickyAreaHeight() * -1], true);
-					resolve();
-				} catch (e) {
-					reject(e);
-				}
-			}.bind(this), 0);
+			if (!oItem || !oItem.getDomRef()) {
+				this.attachEventOnce("updateFinished", () => {
+					this.scrollToIndex(iIndex, true).then(resolve).catch(reject);
+				});
+			} else {
+				// adding timeout of 0 ensures the DOM is ready in case of rerendering
+				setTimeout(() => {
+					try {
+						oScrollDelegate.scrollToElement(oItem.getDomRef(), null, [0, this._getStickyAreaHeight() * -1], true);
+						resolve();
+					} catch (e) {
+						reject(e);
+					}
+				}, 0);
+			}
 		}.bind(this));
 	};
 

package/src/sap/m/ListItemAction.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.m.ListItemActionBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ListItemActionBase.js

@@ -18,7 +18,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ListItemBase.js

@@ -66,7 +66,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @public
@@ -443,6 +443,11 @@ function(
 			sContentAnnouncement && aOutput.push(sContentAnnouncement);
 		}
 
+		const sCustomActionsAnnouncement = this._getCustomActionsAnnouncement();
+		if (sCustomActionsAnnouncement) {
+			aOutput.push(sCustomActionsAnnouncement);
+		}
+
 		if (this.getListProperty("ariaRole") == "list" && !bIsTree && this.isSelectable() && !this.getSelected()) {
 			aOutput.push(oBundle.getText("LIST_ITEM_NOT_SELECTED"));
 		}
@@ -1348,6 +1353,18 @@ function(
 		return this._oOverflowButton;
 	};
 
+	ListItemBase.prototype._getCustomActionsAnnouncement = function(bAnnounceEmpty) {
+		const $CustomActionsContainer = this.$("actions");
+		const iCustomActionsLength = $CustomActionsContainer.length ? $CustomActionsContainer.find(":sapTabbable").length : 0;
+		if (!iCustomActionsLength && !bAnnounceEmpty) {
+			return "";
+		}
+
+		const aBundleKeys = ["CONTROL_EMPTY", "LIST_ITEM_SINGLE_ACTION", "LIST_ITEM_MULTIPLE_ACTIONS"];
+		const sBundleKey = aBundleKeys[Math.min(iCustomActionsLength, 2)];
+		return Library.getResourceBundleFor("sap.m").getText(sBundleKey, [iCustomActionsLength]);
+	};
+
 	return ListItemBase;
 
 });

package/src/sap/m/MaskEnabler.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * Applies mask support for input controls.
 	 * It should should be applied to the prototype of a <code>sap.m.InputBase</code>.
 	 *
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @private
 	 * @mixin
 	 * @alias sap.m.MaskEnabler

package/src/sap/m/MaskInput.js

@@ -29,7 +29,7 @@ sap.ui.define(['./InputBase', './MaskEnabler', './MaskInputRenderer'], function(
 	 *
 	 * @author SAP SE
 	 * @extends sap.m.InputBase
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MaskInputRule.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log"], function(Element, Log) {
 	 *
 	 * @author SAP SE
 	 * @extends sap.ui.core.Element
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @public
 	 * @constructor
 	 * @since 1.34.0

package/src/sap/m/Menu.js

@@ -63,7 +63,7 @@ sap.ui.define([
 		 * @implements sap.ui.core.IContextMenu
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @public
@@ -443,18 +443,31 @@ sap.ui.define([
 			oPointerElement.className = "sapMMenuContextMenuPointer";
 
 			// if the opener DOM ref is provided, we should get its position data
-			const oOpenerData = oOpenerDomRef ? oOpenerDomRef.getBoundingClientRect() : null;
+			const oOpenerData = oOpenerDomRef ? oOpenerDomRef.getBoundingClientRect() : null,
+				iScrollX = document.documentElement.scrollLeft || document.body.scrollLeft,
+				iScrollY = document.documentElement.scrollTop || document.body.scrollTop,
+				isRTL = Localization.getRTL();
 
 			// calculate the position of the pointer element
 			if ((!oOriginalEvent || bOpenerCoordinates) && oOpenerData) {
 				// opener is provided, no event is provided, or there are missing important coordinates in the event,
 				// we should use the opener's position data
-				iX = oOpenerData.left + (oOpenerData.width / 2) + (document.documentElement.scrollLeft || document.body.scrollLeft);
-				iY = oOpenerData.top + (oOpenerData.height / 2) + (document.documentElement.scrollTop || document.body.scrollTop);
+				const iPointerPageX = oOpenerData.left + (oOpenerData.width / 2) + iScrollX;
+				const iPointerPageY = oOpenerData.top + (oOpenerData.height / 2) + iScrollY;
+
+				// compute inline-start offset (start = left in LTR, right in RTL)
+				if (isRTL) {
+					// distance from opener's right edge to pointer
+					iX = (oOpenerData.right + iScrollX) - iPointerPageX;
+				} else {
+					// distance from opener's left edge to pointer
+					iX = iPointerPageX - (oOpenerData.left + iScrollX);
+				}
+				iY = iPointerPageY - (oOpenerData.top + iScrollY);
 			} else if (oOriginalEvent && bPageCoordinates) {
 				// the event with coordinates is provided, we should use them
-				const iPageX = (oOriginalEvent.pageX || oOriginalEvent.clientX) + (document.documentElement.scrollLeft || document.body.scrollLeft);
-				const iPageY = (oOriginalEvent.pageY || oOriginalEvent.clientY) + (document.documentElement.scrollTop || document.body.scrollTop);
+				const iPageX = (oOriginalEvent.pageX || oOriginalEvent.clientX) + iScrollX;
+				const iPageY = (oOriginalEvent.pageY || oOriginalEvent.clientY) + iScrollY;
 
 				if (oOpenerDomRef.tagName && oOpenerDomRef.tagName.toLowerCase() === "tr") {
 					oPointerParent = oOpenerDomRef.firstChild ? oOpenerDomRef.firstChild : oOpenerDomRef;
@@ -464,11 +477,18 @@ sap.ui.define([
 					oPointerSibling = oOpenerDomRef.firstChild ? oOpenerDomRef.firstChild : null;
 				}
 
-				iX = (iPageX - oOpenerData.left - window.scrollX);
-				iY = (iPageY - oOpenerData.top - window.scrollY);
-
-				if (Localization.getRTL()) {
-					iX = document.body.clientWidth - iX;
+				// compute inline-start offset relative to opener considering RTL
+				if (oOpenerData) {
+					if (isRTL) {
+						iX = (oOpenerData.right + iScrollX) - iPageX;
+					} else {
+						iX = iPageX - (oOpenerData.left + iScrollX);
+					}
+					iY = iPageY - (oOpenerData.top + iScrollY);
+				} else {
+					// fallback if no opener data: use page coordinates
+					iX = iPageX;
+					iY = iPageY;
 				}
 			} else if (bOffsetCoordinates) {
 				// offsetX/offsetY coordinates are provided, we should use specified position

package/src/sap/m/MenuButton.js

@@ -17,6 +17,7 @@ sap.ui.define([
 	'sap/ui/core/Popup',
 	'sap/ui/core/LabelEnablement',
 	"./MenuButtonRenderer",
+	'sap/base/i18n/Localization',
 	"sap/ui/events/KeyCodes"
 ], function(
 	library,
@@ -30,6 +31,7 @@ sap.ui.define([
 	Popup,
 	LabelEnablement,
 	MenuButtonRenderer,
+	Localization,
 	KeyCodes
 ) {
 		"use strict";
@@ -60,7 +62,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @public
@@ -367,6 +369,181 @@ sap.ui.define([
 			return this.getAggregation("_button");
 		};
 
+		/**
+		 * Parses the dock string to extract horizontal and vertical alignment values
+		 * @param {string} sDock The dock string to parse
+		 * @returns {object} Object with sHorizontalAlign and sVerticalAlign properties
+		 * @private
+		 */
+		MenuButton.prototype._parseDockAlignment = function(sDock) {
+			let sHorizontalAlign = "Begin";
+			let sVerticalAlign = "Bottom";
+
+			// Determine horizontal alignment (test first part)
+			if (sDock.substring(0, 5) === "Begin") {
+				sHorizontalAlign = "Begin";
+			} else if (sDock.substring(0, 3) === "End") {
+				sHorizontalAlign = "End";
+			} else if (sDock.substring(0, 4) === "Left") {
+				sHorizontalAlign = "Left";
+			} else if (sDock.substring(0, 5) === "Right") {
+				sHorizontalAlign = "Right";
+			} else if (sDock.substring(0, 6) === "Center") {
+				sHorizontalAlign = "Center";
+			}
+
+			// Determine vertical alignment (test last part)
+			if (sDock.substring(sDock.length - 3) === "Top") {
+				sVerticalAlign = "Top";
+			} else if (sDock.substring(sDock.length - 6) === "Bottom") {
+				sVerticalAlign = "Bottom";
+			} else if (sDock.substring(sDock.length - 6) === "Center") {
+				sVerticalAlign = "Center";
+			}
+
+			return { sHorizontalAlign, sVerticalAlign };
+		};
+
+		/**
+		 * Adjusts the popover position after it opens according to the dock rules
+		 * @param {string} sDock The dock string to parse
+		 * @param {sap.m.ResponsivePopover} oPopover The popover instance
+		 * @param {object} oOpenerRect The opener rectangle
+		 * @private
+		 */
+		MenuButton.prototype._adjustPopoverPosition = function(sDock, oPopover, oOpenerRect) {
+			const { sHorizontalAlign, sVerticalAlign } = this._parseDockAlignment(sDock),
+				oPopoverDomRef = oPopover._oControl.getDomRef(),
+				oPopoverRect = oPopoverDomRef.getBoundingClientRect(),
+				iScrollX = window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0,
+				iScrollY = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0,
+				bLeftOrRight = (sHorizontalAlign === "Left" || sHorizontalAlign === "Right"),
+				bRTL = Localization.getRTL();
+			let iTargetLeft,
+				iTargetTop,
+				iOffsetLeft = 0,
+				iOffsetTop = 0;
+
+			// Calculate horizontal position based on sHorizontalAlign
+			switch (sHorizontalAlign) {
+				case "Begin":
+					iTargetLeft = (bRTL)
+									? (oOpenerRect.right + iScrollX) - oPopoverRect.width
+									: oOpenerRect.left + iScrollX;
+					iOffsetLeft = (bRTL) ? -1 : 1;
+					break;
+				case "End":
+					iTargetLeft = (bRTL)
+									? oOpenerRect.left + iScrollX
+									: (oOpenerRect.right + iScrollX) - oPopoverRect.width;
+					iOffsetLeft = (bRTL) ? 1 : -1;
+					break;
+				case "Left":
+					iTargetLeft = (oOpenerRect.left + iScrollX) - oPopoverRect.width;
+					iOffsetLeft = -2;
+					break;
+				case "Right":
+					iTargetLeft = oOpenerRect.right + iScrollX;
+					iOffsetLeft = 2;
+					break;
+				default: // Center
+					var iButtonCenterX = oOpenerRect.left + (oOpenerRect.width / 2) + iScrollX;
+					iTargetLeft = iButtonCenterX - (oPopoverRect.width / 2);
+			}
+
+			// Calculate vertical position based on sVerticalAlign
+			switch (sVerticalAlign) {
+				case "Top":
+					iTargetTop = bLeftOrRight
+									? (oOpenerRect.top + oOpenerRect.height + iScrollY) - oPopoverRect.height
+									: (oOpenerRect.top + iScrollY) - oPopoverRect.height;
+					iOffsetTop = bLeftOrRight ? -5 : 2;
+					break;
+				case "Bottom":
+					iTargetTop = bLeftOrRight
+									? oOpenerRect.top + iScrollY
+									: oOpenerRect.top + oOpenerRect.height + iScrollY;
+					iOffsetTop = bLeftOrRight ? 5 : -2;
+					break;
+				default: // Center
+					var iButtonCenterY = oOpenerRect.top + (oOpenerRect.height / 2) + iScrollY;
+					iTargetTop = iButtonCenterY - (oPopoverRect.height / 2);
+			}
+
+			// Apply the computed position
+			oPopoverDomRef.style.left = Math.round(iTargetLeft + iOffsetLeft) + "px";
+			oPopoverDomRef.style.top = Math.round(iTargetTop + iOffsetTop) + "px";
+			oPopoverDomRef.style.right = "";
+			oPopoverDomRef.style.bottom = "";
+
+			oPopover.detachEvent("afterOpen", this._adjustPopoverPosition);
+		};
+
+		/**
+		 * Destroys the menu button anchor element
+		 * @param {sap.m.ResponsivePopover | undefined} oPopover The popover instance (if provided)
+		 * @private
+		 */
+		MenuButton.prototype._destroyAnchorElement = function(oPopover) {
+			if (this._menuButtonAnchor && this._menuButtonAnchor.parentNode) {
+				this._menuButtonAnchor.parentNode.removeChild(this._menuButtonAnchor);
+			}
+			this._menuButtonAnchor = null;
+			oPopover && oPopover.detachEvent("afterClose", this._destroyAnchorElement);
+		};
+
+		/**
+		 * Creates and configures the DOM anchor element for menu positioning
+		 * @param {object} oOpenerRect The opener rectangle
+		 * @private
+		 */
+		MenuButton.prototype._createAnchorElement = function(oOpenerRect) {
+			// remove any previous anchor
+			this._destroyAnchorElement();
+
+			const iScrollX = window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0,
+				iScrollY = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0,
+				iAnchorX = oOpenerRect.left + (oOpenerRect.width / 2) + iScrollX,
+				iAnchorY = oOpenerRect.top + (oOpenerRect.height / 2) + iScrollY,
+				oAnchor = document.createElement("div");
+
+			oAnchor.style.position = "absolute";
+			oAnchor.style.width = "1px";
+			oAnchor.style.height = "1px";
+			oAnchor.style.left = Math.round(iAnchorX) + "px";
+			oAnchor.style.top = Math.round(iAnchorY) + "px";
+			oAnchor.style.zIndex = "2147483647";
+			oAnchor.style.pointerEvents = "none";
+			oAnchor.setAttribute("aria-hidden", "true");
+			oAnchor.className = "sapMMenuButtonAnchor";
+
+			document.body.appendChild(oAnchor);
+			this._menuButtonAnchor = oAnchor;
+		};
+
+		/**
+		 * Create a temporary DOM anchor at the coordinates computed from a Popup.Dock-like token (menuPosition).
+		 * The anchor is appended to document.body and will be removed after the popover closes.
+		 *
+		 * @param {string} sDock Popup.Dock-like token (e.g. "BeginTop", "EndCenter", "LeftBottom")
+		 * @param {sap.m.ResponsivePopover} oPopover the popover instance to attach cleanup to
+		 * @private
+		 */
+		MenuButton.prototype._createMenuPositionAnchor = function(sDock, oPopover) {
+			if (!sDock || !oPopover || !Dock[sDock]) {
+				return;
+			}
+
+			const oOpenerRect = this.getDomRef().getBoundingClientRect();
+
+			// create new anchor
+			this._createAnchorElement(oOpenerRect);
+
+			// Attach event handlers
+			oPopover.attachEvent("afterOpen", this._adjustPopoverPosition.bind(this, sDock, oPopover, oOpenerRect));
+			oPopover.attachEvent("afterClose", this._destroyAnchorElement.bind(this, oPopover));
+		};
+
 		/**
 		 * Handles the <code>buttonPress</code> event and opens the menu.
 		 * @param {boolean} oEvent event object
@@ -396,7 +573,11 @@ sap.ui.define([
 			// adjust the positioning of the Menu Popover to align with MenuButton, because of padding around inner button
 			var oPopover = oMenu._getPopover();
 
-			oPopover && oPopover.setOffsetX(1).setOffsetY(-3);
+			// create anchor according to menuPosition
+			var sDock = this.getMenuPosition();
+			if (sDock && oPopover) {
+				this._createMenuPositionAnchor(sDock, oPopover);
+			}
 
 			oMenu.openBy.apply(oMenu, aParam);
 

package/src/sap/m/MenuItem.js

@@ -64,7 +64,7 @@ sap.ui.define([
 		 * @implements sap.m.IMenuItem, sap.m.IMenuItemBehavior
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MenuItemGroup.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @implements sap.m.IMenuItem
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @since 1.127.0
 	 *
 	 * @constructor

package/src/sap/m/MenuListItem.js

@@ -37,7 +37,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MenuWrapper.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/MessageBox.js

@@ -390,7 +390,7 @@ sap.ui.define([
 	 *      Custom action(s) string or an array can be provided, and then the translation
 	 *      of custom actions needs to be done by the application.
 	 * @param {sap.m.MessageBox.Action|string} [mOptions.emphasizedAction=sap.m.MessageBox.Action.OK] Added since version 1.75.0. Specifies which action of the created dialog will be emphasized. EmphasizedAction will apply only if the property <code>actions</code> is provided.
-	 * @param {function} [mOptions.onClose] Function to be called when the user taps a button or closes the message box.
+	 * @param {function((sap.m.MessageBox.Action | string | null)):void} [mOptions.onClose] Function to be called when the user taps a button or closes the message box.
 	 * @param {string} [mOptions.id] ID to be used for the dialog. Intended for test scenarios, not recommended for productive apps
 	 * @param {string} [mOptions.styleClass] Added since version 1.21.2. CSS style class which is added to the dialog's root DOM node. The compact design can be activated by setting this to "sapUiSizeCompact"
 	 * @param {string|sap.m.MessageBox.Action} [mOptions.initialFocus] Added since version 1.28.0. initialFocus, this option sets the action name, the text of the button or the control that gets the focus as first focusable element after the MessageBox is opened.
@@ -535,12 +535,10 @@ sap.ui.define([
 								oInitialFocusControl = aButtons[i];
 								break;
 							}
-						} else {
-							if (mOptions.initialFocus.toLowerCase() === aButtons[i].getText().toLowerCase()) {
+						} else if (mOptions.initialFocus.toLowerCase() === aButtons[i].getText().toLowerCase()) {
 								oInitialFocusControl = aButtons[i];
 								break;
 							}
-						}
 					}
 				}
 			}
@@ -632,7 +630,7 @@ sap.ui.define([
 	 *
 	 * @param {string} vMessage Message to be displayed in the alert dialog. The usage of sap.core.Control as vMessage is deprecated since version 1.30.4.
 	 * @param {object} [mOptions] Other options (optional)
-	 * @param {function} [mOptions.onClose] callback function to be called when the user closes the dialog
+	 * @param {function((sap.m.MessageBox.Action | string | null)):void} [mOptions.onClose] callback function to be called when the user closes the dialog
 	 * @param {string} [mOptions.title='Alert'] Title to be displayed in the alert dialog
 	 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
 	 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
@@ -729,7 +727,7 @@ sap.ui.define([
 	 *
 	 * @param {string} vMessage Message to be displayed in the alert dialog. The usage of sap.core.Control as vMessage is deprecated since version 1.30.4.
 	 * @param {object} [mOptions] Other options (optional)
-	 * @param {function} [mOptions.onClose] Callback to be called when the user closes the dialog
+	 * @param {function((sap.m.MessageBox.Action | string | null)):void} [mOptions.onClose] Callback to be called when the user closes the dialog
 	 * @param {string} [mOptions.title='Confirmation'] Title to display in the confirmation dialog
 	 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
 	 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
@@ -820,7 +818,7 @@ sap.ui.define([
 	 *
 	 * @param {string} vMessage Message to be displayed in the alert dialog. The usage of sap.core.Control as vMessage is deprecated since version 1.30.4.
 	 * @param {object} [mOptions] Other options (optional)
-	 * @param {function} [mOptions.onClose] Callback when the user closes the dialog
+	 * @param {function((sap.m.MessageBox.Action | string | null)):void} [mOptions.onClose] Callback when the user closes the dialog
 	 * @param {string} [mOptions.title='Error'] Title of the error dialog
 	 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
 	 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
@@ -896,7 +894,7 @@ sap.ui.define([
 	 *
 	 * @param {string} vMessage Message to be displayed in the alert dialog. The usage of sap.core.Control as vMessage is deprecated since version 1.30.4.
 	 * @param {object} [mOptions] Other options (optional)
-	 * @param {function} [mOptions.onClose] Callback when the user closes the dialog
+	 * @param {function((sap.m.MessageBox.Action | string | null)):void} [mOptions.onClose] Callback when the user closes the dialog
 	 * @param {string} [mOptions.title='Information'] Title of the information dialog
 	 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
 	 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
@@ -972,7 +970,7 @@ sap.ui.define([
 	 *
 	 * @param {string} vMessage Message to be displayed in the alert dialog. The usage of sap.core.Control as vMessage is deprecated since version 1.30.4.
 	 * @param {object} [mOptions] Other options (optional)
-	 * @param {function} [mOptions.onClose] Callback when the user closes the dialog
+	 * @param {function((sap.m.MessageBox.Action | string | null)):void} [mOptions.onClose] Callback when the user closes the dialog
 	 * @param {string} [mOptions.title='Warning'] Title of the warning dialog
 	 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
 	 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.
@@ -1048,7 +1046,7 @@ sap.ui.define([
 	 *
 	 * @param {string} vMessage Message to be displayed in the alert dialog. The usage of sap.core.Control as vMessage is deprecated since version 1.30.4.
 	 * @param {object} [mOptions] Other options (optional)
-	 * @param {function} [mOptions.onClose] Callback when the user closes the dialog
+	 * @param {function((sap.m.MessageBox.Action | string | null)):void} [mOptions.onClose] Callback when the user closes the dialog
 	 * @param {string} [mOptions.title='Success'] Title of the success dialog
 	 * @param {sap.m.MessageBox.Action|sap.m.MessageBox.Action[]|string|string[]} [mOptions.actions=sap.m.MessageBox.Action.OK] Either a single action, or an array of actions.
 	 *      If no action(s) are given, the single action MessageBox.Action.OK is taken as a default for the parameter.

package/src/sap/m/MessageItem.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Item
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessageListItem.js

@@ -34,7 +34,7 @@ sap.ui.define([
 		 * @extends sap.m.StandardListItem
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MessagePage.js

@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @see {@link fiori:https://experience.sap.com/fiori-design-web/message-page/ Message Page}
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopover.js

@@ -97,7 +97,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @public
@@ -405,7 +405,7 @@ function(
 
 			this._oPopover._setAriaModal(false);
 			this._oPopover.addContent(this._oMessageView);
-			this._oPopover.addAssociation("ariaLabelledBy", this.getId() + "-messageView-HeadingDescr", true);
+			this._oPopover.addAssociation("ariaLabelledBy", this._oMessageView.getHeadingAriaLabelledBy(), true);
 
 			oPopupControl = this._oPopover.getAggregation("_popup");
 			oPopupControl.oPopup.setAutoClose(false);

package/src/sap/m/MessagePopoverItem.js

@@ -19,7 +19,7 @@ sap.ui.define(["./library", "./MessageItem"],
 		 * @extends sap.m.MessageItem
 		 *
 		 * @author SAP SE
-		 * @version 1.141.2
+		 * @version 1.143.0
 		 *
 		 * @constructor
 		 * @public