@openui5/sap.m 1.136.3 → 1.139.0

package/src/sap/m/MenuWrapperRenderer.js

@@ -0,0 +1,143 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	'sap/ui/core/library',
+	'sap/ui/core/ControlBehavior'
+], function(
+	coreLibrary,
+	ControlBehavior
+) {
+	"use strict";
+
+	/**
+	 * MenuWrapper renderer.
+	 * @namespace
+	 */
+	const MenuWrapperRenderer = {
+		apiVersion: 2
+	};
+
+	// shortcut for sap.ui.core.ItemSelectionMode
+	const ItemSelectionMode = coreLibrary.ItemSelectionMode;
+
+	/**
+	 * Renders the HTML output for the specified control, using the provided
+	 * {@link sap.ui.core.RenderManager}.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the Render-Output-Buffer
+	 * @param {sap.m.MenuWrapper} oMenuWrapper the Menu Wrapper to be rendered
+	 */
+	MenuWrapperRenderer.render = function(oRm, oMenuWrapper) {
+		const aItems = oMenuWrapper._getVisibleItems(),
+			bAccessible = ControlBehavior.isAccessibilityEnabled();
+
+			if (aItems.length) {
+			oRm.openStart("ul", oMenuWrapper);
+
+			if (bAccessible) {
+				oRm.attr("role", "menu");
+				oMenuWrapper._prepareItemsAccessibilityInfo();
+			}
+
+			oRm.class("sapMMenuList");
+			if (!oMenuWrapper._getItemsWithIconCount()) {
+				oRm.class("sapMMenuNoIcons");
+			}
+			oRm.openEnd();
+
+			this.renderItems(oRm, oMenuWrapper);
+
+			oRm.close("ul");
+		}
+	};
+
+	/**
+	 * Renders the items of the MenuWrapper.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the Render-Output-Buffer
+	 * @param {sap.m.MenuWrapper} oMenuWrapper the Menu Wrapper to be rendered
+	 */
+	MenuWrapperRenderer.renderItems = function(oRm, oMenuWrapper) {
+		const aItems = oMenuWrapper._getVisibleItems();
+		let sCurrentGroup = null,
+			sItemGroup = null,
+			bGroupOpened = false,
+			bGroupEndSeparatorRendered = false,
+			sAriaLabel;
+
+		aItems.forEach((oItem, iIndex) => {
+			sItemGroup = oItem.getAssociation("_group");
+
+			if (bGroupOpened && sCurrentGroup !== sItemGroup) {
+				// group closing tag
+				oRm.close("div");
+				bGroupOpened = false;
+				// group closing separator
+				this.renderSeparator(oRm);
+				bGroupEndSeparatorRendered = true;
+			}
+
+			if ((sCurrentGroup !== sItemGroup || oItem.getStartsSection()) && !bGroupEndSeparatorRendered && iIndex !== 0) {
+				this.renderSeparator(oRm);
+			}
+
+			if (sItemGroup && !bGroupOpened) {
+				switch (oItem._itemSelectionMode) {
+					case ItemSelectionMode.None:
+						sAriaLabel = oMenuWrapper._oRb.getText("MENU_ITEM_GROUP_NONE_ACCESSIBLE_NAME");
+						break;
+					case ItemSelectionMode.SingleSelect:
+						sAriaLabel = oMenuWrapper._oRb.getText("MENU_ITEM_GROUP_SINGLE_ACCESSIBLE_NAME");
+						break;
+					case ItemSelectionMode.MultiSelect:
+						sAriaLabel = oMenuWrapper._oRb.getText("MENU_ITEM_GROUP_MULTI_ACCESSIBLE_NAME");
+						break;
+					default:
+						sAriaLabel = "";
+				}
+				oRm.openStart("div");
+				oRm.attr("role", "group");
+				sAriaLabel && oRm.attr("aria-label", sAriaLabel);
+				oRm.openEnd();
+				bGroupOpened = true;
+			}
+
+			sCurrentGroup = sItemGroup;
+			bGroupEndSeparatorRendered = false;
+
+			oRm.renderControl(oItem);
+		});
+
+		if (bGroupOpened) {
+			oRm.close("div");
+		}
+	};
+
+	/**
+	 * Renders menu separator.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the Render-Output-Buffer
+	 */
+	MenuWrapperRenderer.renderSeparator = function(oRm) {
+		const bAccessible = ControlBehavior.isAccessibilityEnabled();
+
+		oRm.openStart("li");
+		oRm.class("sapMMenuSeparator");
+
+		if (bAccessible) {
+			oRm.attr("role", "separator");
+		}
+
+		oRm.openEnd();
+
+		oRm.voidStart("hr").voidEnd();
+
+		oRm.close("li");
+	};
+
+	return MenuWrapperRenderer;
+}, /* bExport= */ true);

package/src/sap/m/MessageBox.js

@@ -179,7 +179,7 @@ sap.ui.define([
 		 * Shows no icon in the message box.
 		 * @public
 		 */
-		NONE: undefined,
+		NONE: "NONE",
 
 		/**
 		 * Shows the information icon in the message box.
@@ -581,7 +581,7 @@ sap.ui.define([
 		}
 
 		oDialog.addContent(vMessageContent);
-		oDialog.setProperty("role",  DialogRoleType.AlertDialog);
+		oDialog.setProperty("role", DialogRoleType.AlertDialog);
 
 		if (mClasses[mOptions.icon]) {
 			oDialog.addStyleClass(mClasses[mOptions.icon]);

package/src/sap/m/MessageItem.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Item
 		 * @author SAP SE
-		 * @version 1.136.3
+		 * @version 1.139.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.136.3
+		 * @version 1.139.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.136.3
+		 * @version 1.139.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopover.js

@@ -97,7 +97,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.136.3
+		 * @version 1.139.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopoverItem.js

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

package/src/sap/m/MessageStrip.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public
@@ -355,7 +355,8 @@ sap.ui.define([
 	};
 
 	MessageStrip.prototype._ariaReferenceId = function () {
-		return this.getId() + "-info" + " " + this.getAggregation("_text").getId();
+		var sTextId = this.getEnableFormattedText() ? this.getAggregation("_formattedText").getId() : this.getAggregation("_text").getId();
+		return this.getId() + "-info" + " " + sTextId;
 	};
 
 

package/src/sap/m/MessageToast.js

@@ -44,8 +44,8 @@ sap.ui.define([
 		 * sap.m.MessageToast.show("This message should appear in the message toast", {
 		 *     duration: 3000,                  // default
 		 *     width: "15em",                   // default
-		 *     my: "center bottom",             // default
-		 *     at: "center bottom",             // default
+		 *     my: "CenterBottom",             // default
+		 *     at: "CenterBottom",             // default
 		 *     of: window,                      // default
 		 *     offset: "0 0",                   // default
 		 *     collision: "fit fit",            // default
@@ -71,10 +71,12 @@ sap.ui.define([
 		 * <li>You want users to be able to copy some part of the message text. (In this case, show a success {@link sap.m.Dialog Message Dialog}.)</li>
 		 * </ul>
 		 * <h3>Responsive Behavior</h3>
-		 * The message toast has the same behavior on all devices. However, you can adjust the width of the control, for example, for use on a desktop device.
+		 * The message toast has the same behavior on all devices.
+		 * However, you can adjust the width of the control depending on the device you're using, for example desktop.
+		 * Note that the width can be customized up to a maximum of 15rem.
 		 *
 		 * @author SAP SE
-		 * @version 1.136.3
+		 * @version 1.139.0
 		 *
 		 * @namespace
 		 * @public
@@ -97,8 +99,8 @@ sap.ui.define([
 		MessageToast._mSettings = {
 			duration: 3000,
 			width: "15em",
-			my: "center bottom",
-			at: "center bottom",
+			my: "CenterBottom",
+			at: "CenterBottom",
 			of: document.defaultView,
 			offset: "0 0",
 			collision: "fit fit",

package/src/sap/m/MessageView.js

@@ -119,7 +119,7 @@ sap.ui.define([
 	 * The responsiveness of the <code>MessageView</code> is determined by the container in which it is embedded. For that reason the control could not be visualized if the
 	 * container’s sizes are not defined.
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @extends sap.ui.core.Control
 	 * @constructor

package/src/sap/m/MultiComboBox.js

@@ -145,7 +145,7 @@ function(
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @extends sap.m.ComboBoxBase
@@ -648,7 +648,7 @@ function(
 
 		//Open popover with items if in readonly mode and has Nmore indicator
 		if (!this.getEditable() && oTokenizer.getHiddenTokensCount() && oEvent.target === this.getFocusDomRef()) {
-			oTokenizer._togglePopup(oTokenizer.getTokensPopup(), this.getDomRef());
+			oTokenizer._togglePopup();
 		}
 
 	};
@@ -1249,11 +1249,8 @@ function(
 		this.setProperty("hasSelection", !!this.getSelectedItems().length);
 
 		if (!this._bAlreadySelected) {
-			this._sInitialValueStateText = this.getValueStateText();
-		}
-
-		if (this.getValueState() !== ValueState.Error) {
 			this._sInitialValueState = this.getValueState();
+			this._sInitialValueStateText = this.getValueStateText();
 		}
 
 		if (this.getShowClearIcon()) {
@@ -2084,7 +2081,7 @@ function(
 			oPicker = this.getPicker();
 			oPicker.open();
 		} else {
-			oTokenizer._togglePopup(oTokenizer.getTokensPopup(), this.getDomRef());
+			oTokenizer._togglePopup();
 		}
 
 		if (this.isPickerDialog()) {
@@ -2122,7 +2119,6 @@ function(
 		var oTokenizer = new Tokenizer({
 			renderMode: TokenizerRenderMode.Narrow
 		}).attachTokenDelete(this._handleTokenDelete, this);
-
 		oTokenizer.getTokensPopup()
 			.attachAfterOpen(function () {
 				if (oTokenizer.hasOneTruncatedToken()) {
@@ -2261,6 +2257,7 @@ function(
 	 */
 	MultiComboBox.prototype.onAfterRendering = function() {
 		var oTokenizer = this.getAggregation("tokenizer");
+		var oTokenizerOpener = Element.getElementById(oTokenizer.getProperty("opener"))?.getDomRef();
 		var oTokenToFocus;
 
 		ComboBoxBase.prototype.onAfterRendering.apply(this, arguments);
@@ -2279,6 +2276,10 @@ function(
 
 			this.bShouldRestoreTokenizerFocus = false;
 		}
+
+		if (oTokenizerOpener !== this.getDomRef()) {
+			oTokenizer.setProperty("opener", this.getId(), true);
+		}
 	};
 
 	/**

package/src/sap/m/MultiComboBoxRenderer.js

@@ -7,8 +7,6 @@ sap.ui.define(['./ComboBoxBaseRenderer','./ComboBoxTextFieldRenderer', "sap/ui/c
 	function(ComboBoxBaseRenderer, ComboBoxTextFieldRenderer, Library, Renderer, coreLibrary) {
 	"use strict";
 
-	var ValueState = coreLibrary.ValueState;
-
 	/**
 	 * MultiComboBox renderer.
 	 * @namespace
@@ -47,7 +45,7 @@ sap.ui.define(['./ComboBoxBaseRenderer','./ComboBoxTextFieldRenderer', "sap/ui/c
 			oTokenizer = oControl.getAggregation("tokenizer"),
 			oInvisibleTextId = oTokenizer && oTokenizer.getTokensInfoId();
 
-		if (oControl.getValueState() !== ValueState.Error && oControl.getValueStateLinksForAcc().length ){
+		if (oControl.getValueStateLinksForAcc().length ){
 			sAriaDescribedBy = sAriaDescribedBy
 				? `${sAriaDescribedBy} ${oControl.getValueStateLinksShortcutsId()}`
 				: oControl.getValueStateLinksShortcutsId();
@@ -68,12 +66,6 @@ sap.ui.define(['./ComboBoxBaseRenderer','./ComboBoxTextFieldRenderer', "sap/ui/c
 
 		mAccessibilityState.roledescription = oResourceBundle.getText("MULTICOMBOBOX_ARIA_ROLE_DESCRIPTION");
 
-		if (oControl.getValueState() === ValueState.Error && oControl.getValueStateLinksForAcc().length) {
-			mAccessibilityState.errormessage = mAccessibilityState.errormessage
-			? `${mAccessibilityState.errormessage} ${oControl.getValueStateLinksShortcutsId()}`
-			: oControl.getValueStateLinksShortcutsId();
-		}
-
 		return mAccessibilityState;
 	};
 

package/src/sap/m/MultiEditField.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/core/Lib", "sap/ui/core/XMLComposite", "./library", "sap/
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @experimental since 1.52
 	 * @since 1.52.0
 	 * @alias sap.m.MultiEditField

package/src/sap/m/MultiInput.js

@@ -74,6 +74,8 @@ function(
 	* <li> When a single value is copied and pasted in the field, it is shown as a text value, as further editing might be required before it is converted into a token.</li>
 	* <li> Provide meaningful labels for all input fields. Do not use the placeholder as a replacement for the label.</li>
 	* <li> The <code>showValueHelp</code> property is overwritten and after initialization of the control, its value becomes <code>truthy</code>.</li>
+	* <li> A mix of read-only and deletable tokens isn't supported. </li>
+	* <li> The read-only state of tokens should be controlled using the <code>editable</code> property of the MultiInput control.</li>
 	* </ul>
 	* <h3>Usage</h3>
 	* <h4>When to use:</h4>
@@ -110,7 +112,7 @@ function(
 	* @extends sap.m.Input
 	*
 	* @author SAP SE
-	* @version 1.136.3
+	* @version 1.139.0
 	*
 	* @constructor
 	* @public
@@ -449,10 +451,16 @@ function(
 	 */
 	MultiInput.prototype.onAfterRendering = function () {
 		var oTokenizer = this.getAggregation("tokenizer");
+		var oTokenizerOpener = Element.getElementById(oTokenizer.getProperty("opener"))?.getDomRef();
+
 		this._bTokenIsValidated = false;
 
 		oTokenizer.setMaxWidth(this._calculateSpaceForTokenizer());
 
+		if (oTokenizerOpener !== this.getDomRef()) {
+			oTokenizer.setProperty("opener", this.getId(), true);
+		}
+
 		this._registerResizeHandler();
 
 		Input.prototype.onAfterRendering.apply(this, arguments);
@@ -937,7 +945,7 @@ function(
 
 		// ctrl/meta + I -> Open suggestions
 		if ((oEvent.ctrlKey || oEvent.metaKey) && oEvent.which === KeyCodes.I && oTokenizer.getTokens().length) {
-			oTokenizer._togglePopup(oTokenizer.getTokensPopup(), this.getDomRef());
+			oTokenizer._togglePopup();
 			oEvent.preventDefault();
 		}
 	};
@@ -1138,7 +1146,7 @@ function(
 		if (!this.getEditable()
 			&& oTokenizer.getHiddenTokensCount()
 			&& oEvent.target === this.getFocusDomRef()) {
-			oTokenizer._togglePopup(oTokenizer.getTokensPopup(), this.getDomRef());
+			oTokenizer._togglePopup();
 		}
 
 		if (!containsOrEquals(oTokenizer.getFocusDomRef(), document.activeElement)) {
@@ -1199,7 +1207,7 @@ function(
 		}
 
 		if (!bFocusIsInSelectedItemPopup && !bNewFocusIsInTokenizer) {
-			oSelectedItemsPopup.isOpen() && !this.isMobileDevice() && oTokenizer._togglePopup(oSelectedItemsPopup, this.getDomRef());
+			oSelectedItemsPopup.isOpen() && !this.isMobileDevice() && oTokenizer._togglePopup();
 			oTokenizer.setRenderMode(TokenizerRenderMode.Narrow);
 		}
 
@@ -1229,7 +1237,10 @@ function(
 			return;
 		}
 
-		Input.prototype.ontap.apply(this, arguments);
+		if (!bNMoreLabelClick) {
+			Input.prototype.ontap.apply(this, arguments);
+			this._getSuggestionsPopover()?.getInput()?.setValueHelpIconSrc("sap-icon://search");
+		}
 	};
 
 	/**
@@ -1278,7 +1289,7 @@ function(
 		this.selectText(0, 0);
 
 		if (oPopup.isOpen()) {
-			oTokenizer._togglePopup(oPopup, this.getDomRef());
+			oTokenizer._togglePopup();
 		}
 
 		Input.prototype.onsapescape.apply(this, arguments);
@@ -1799,7 +1810,7 @@ function(
 		const oTokenizer = this.getAggregation("tokenizer");
 
 		oTokenizer._bIsOpenedByNMoreIndicator = true;
-		oTokenizer._togglePopup(oTokenizer.getTokensPopup(), this.getDomRef());
+		oTokenizer._togglePopup();
 	};
 
 	/**

package/src/sap/m/NavContainer.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NewsContent.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NotificationList.js

@@ -27,7 +27,7 @@ function(
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NotificationListBase.js

@@ -91,7 +91,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.136.3
+		 * @version 1.139.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/NotificationListGroup.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NotificationListItem.js

@@ -67,7 +67,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public
@@ -259,5 +259,16 @@ function(
 		return this._footerIvisibleText.setText(ariaTexts.join(' '));
 	};
 
+	NotificationListItem.prototype.getList = function () {
+		let oParent = this.getParent();
+
+		while (oParent && !oParent.isA("sap.m.ListBase")) {
+			oParent = oParent.getParent();
+		}
+
+		return oParent;
+	};
+
 	return NotificationListItem;
 });
+

package/src/sap/m/NumericContent.js

@@ -111,7 +111,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NumericInput.js

@@ -38,7 +38,7 @@ function(
 	 * @extends sap.m.Input
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private
@@ -106,10 +106,10 @@ function(
 
 			return;
 		}
-
+		var oIsMinusSignAtZeroPosition =  iCursorPos === 0 && (oEvent.which === KeyCodes.SLASH || oEvent.which === KeyCodes.NUMPAD_MINUS);
 		sTypedValue = this.getValue().substring(0, iCursorPos) + oEvent.originalEvent.key + this.getValue().substring(iCursorPos);
 		fParsedValue = this._getNumberFormat().parse(sTypedValue);
-		if (!isKeyAllowed(oEvent.which) || (!fParsedValue && fParsedValue !== 0)) {
+		if (!isKeyAllowed(oEvent.which) || (!fParsedValue && fParsedValue !== 0 && !oIsMinusSignAtZeroPosition)) {
 			oEvent.preventDefault();
 		}
 	};

package/src/sap/m/ObjectAttribute.js

@@ -47,7 +47,7 @@ function(library, Localization, Control, coreLibrary, Text, Element, Locale, Key
 	 * <code>text</code> property is styled and acts as a link. In this case the <code>text</code>
 	 * property must also be set, as otherwise there will be no link displayed for the user.
 	 * @extends sap.ui.core.Control
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectHeader.js

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * <code>sapUiResponsivePadding--header</code>.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectIdentifier.js

@@ -59,7 +59,7 @@ function(
 	 *
 	* <b>Note:</b> This control should not be used with {@link sap.m.Label} or in Forms along with {@link sap.m.Label}.
 	 * @extends sap.ui.core.Control
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectListItem.js

@@ -60,7 +60,7 @@ function(
 		 *
 		 * <b>Note:</b> The control must only be used in the context of a list.
 		 * @extends sap.m.ListItemBase
-		 * @version 1.136.3
+		 * @version 1.139.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ObjectMarker.js

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.3
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public
@@ -414,6 +414,7 @@ sap.ui.define([
 			bIsIconVisible = this._isIconVisible(),
 			bIsTextVisible = this._isTextVisible(),
 			bIsIconOnly = bIsIconVisible && !bIsTextVisible,
+			bDecorative = !this.getVisible() || !bIsIconOnly,
 			sType = this.getType(),
 			sText,
 			oIconControl;
@@ -423,13 +424,15 @@ sap.ui.define([
 			return false;
 		}
 
+		// set icon to be decorative if the ObjectMarker is not visible or if we have text
+		oInnerIcon.setDecorative(bDecorative);
+
 		if (oType) {
 			sText = this._getMarkerText(oType, sType, sAdditionalInfo);
 		}
 
 		if (bIsIconVisible) {
 			oInnerControl.setIcon(oType.icon.src, bSuppressInvalidate);
-			oInnerIcon.setDecorative(!bIsIconOnly); // icon should be decorative if we have text
 			oInnerIcon.setUseIconTooltip(bIsIconOnly);
 			this.addStyleClass("sapMObjectMarkerIcon");
 		} else {