@openui5/sap.m 1.138.0 → 1.139.0

package/src/sap/m/Menu.js

@@ -61,7 +61,7 @@ sap.ui.define([
 		 * @implements sap.ui.core.IContextMenu
 		 *
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.139.0
 		 *
 		 * @constructor
 		 * @public
@@ -157,7 +157,7 @@ sap.ui.define([
 			this._openDuration = Device.system.phone ? null : 0;
 		};
 
-        /**
+		/**
 		 * Called from parent if the control is destroyed.
 		 */
 		Menu.prototype.exit = function() {
@@ -206,12 +206,23 @@ sap.ui.define([
 		 * @public
 		 */
 		Menu.prototype.openBy = function(oControl) {
-			const oPopover = this._getPopover();
+			const oPopover = this._getPopover(),
+				oBinding = this.getBinding("items");
+
 			if (!oControl) {
 				oControl = document.body;
 			}
-			oPopover._getPopup().setDurations(this._openDuration, 0);
-			oPopover.openBy(oControl);
+
+			if (oBinding && oBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
+				// Wait for the binding data to be received, then open
+				oBinding.attachEventOnce("dataReceived", function() {
+					this._openPopoverBy(oPopover, oControl);
+				}, this);
+			} else {
+				this._openPopoverBy(oPopover, oControl);
+			}
+
+			this.bIgnoreOpenerFocus = true; // reset the flag to allow the opener to be focused after the menu is closed
 
 			return this;
 		};
@@ -241,6 +252,18 @@ sap.ui.define([
 			return this;
 		};
 
+		/**
+		 * Opens the given popover next to the specified control, using the configured open duration.
+		 *
+		 * @param {sap.m.ResponsivePopover} oPopover The popover instance to open.
+		 * @param {sap.ui.core.Control|HTMLElement} oControl The control or DOM element that defines the position for the popover.
+		 * @private
+		 */
+		Menu.prototype._openPopoverBy = function(oPopover, oControl) {
+			oPopover._getPopup().setDurations(this._openDuration, 0);
+			oPopover.openBy(oControl);
+		};
+
 		/**
 		 * Captures the itemSelected event fired by the menu wrapper and fires the itemSelected event of the menu.
 		 *
@@ -250,6 +273,7 @@ sap.ui.define([
 		Menu.prototype._handleItemSelected = function(oEvent) {
 			oEvent.cancelBubble();
 			this.fireItemSelected({item: oEvent.getParameter("item")});
+			this.bIgnoreOpenerFocus = false; // allow the opener to be focused after the menu is closed
 		};
 
 		/**
@@ -301,9 +325,13 @@ sap.ui.define([
 		 */
 		Menu.prototype.openAsContextMenu = function(oEvent, oOpenerRef) {
 			const oPopover = this._getPopover(),
-				bPageCoordinates = oEvent && oEvent.pageX !== undefined && oEvent.pageY !== undefined,
-				bOffsetCoordinates = !bPageCoordinates && !oOpenerRef && oEvent.offsetX !== undefined && oEvent.offsetY !== undefined,
-				oOriginalEvent = oEvent && oEvent.originalEvent;
+				oOriginalEvent = oEvent ? oEvent.originalEvent || oEvent : null,
+				bPageCoordinates = oOriginalEvent && oOriginalEvent.button !== undefined && !!oOriginalEvent.type,
+				bOffsetCoordinates = oOriginalEvent && !bPageCoordinates && oOriginalEvent.type === undefined &&
+					(oOriginalEvent.offsetX !== undefined && oOriginalEvent.offsetY !== undefined),
+				bOpenerCoordinates = oOriginalEvent.type?.substr(0, 3) === "key"  || (bPageCoordinates && oOpenerRef && (
+					(oOriginalEvent.pageX === undefined && oOriginalEvent.clientX === undefined) ||
+					(oOriginalEvent.pageY === undefined && oOriginalEvent.clientY === undefined)));
 			let oOpenerDomRef = oOpenerRef && oOpenerRef.getDomRef ? oOpenerRef.getDomRef() : oOpenerRef,
 				oPointerElement = document.getElementById("sapMMenuContextMenuPointer"),
 				oPointerParent = document.body,
@@ -330,7 +358,13 @@ sap.ui.define([
 				oOpenerDomRef = oEvent.srcControl ? oEvent.srcControl.getDomRef() : null;
 
 				if (!oOpenerDomRef) {
-					oOpenerDomRef = oOriginalEvent && oOriginalEvent.currentTarget ? oOriginalEvent.currentTarget : null;
+					if (oOriginalEvent?.currentTarget) {
+						oOpenerDomRef = oOriginalEvent.currentTarget;
+					} else if (oOriginalEvent?.target) {
+						oOpenerDomRef = oOriginalEvent.target;
+					} else {
+						oOpenerDomRef = document.body;
+					}
 				}
 			}
 
@@ -344,13 +378,21 @@ sap.ui.define([
 			oPointerElement.id = "sapMMenuContextMenuPointer";
 			oPointerElement.className = "sapMMenuContextMenuPointer";
 
+			// if the opener DOM ref is provided, we should get its position data
 			const oOpenerData = oOpenerDomRef ? oOpenerDomRef.getBoundingClientRect() : null;
 
-			if (oOriginalEvent && bPageCoordinates) {
-				const iPageX = oOriginalEvent.pageX || oOriginalEvent.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft);
-				const iPageY = oOriginalEvent.pageY || oOriginalEvent.clientY + (document.documentElement.scrollTop || document.body.scrollTop);
-
-				if (oOpenerDomRef.tagName.toLowerCase() === "tr") {
+			// 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);
+			} 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);
+
+				if (oOpenerDomRef.tagName && oOpenerDomRef.tagName.toLowerCase() === "tr") {
 					oPointerParent = oOpenerDomRef.firstChild ? oOpenerDomRef.firstChild : oOpenerDomRef;
 					oPointerSibling = oPointerParent.firstChild ? oPointerParent.firstChild : null;
 				} else {
@@ -364,17 +406,17 @@ sap.ui.define([
 				if (Localization.getRTL()) {
 					iX = document.body.clientWidth - iX;
 				}
-
 			} else if (bOffsetCoordinates) {
-				// if the coordinates are provided, we create a pointer element at the specified position
-				iX = oEvent.offsetX;
-				iY = oEvent.offsetY;
+				// offsetX/offsetY coordinates are provided, we should use specified position
+				iX = oEvent.offsetX || 0;
+				iY = oEvent.offsetY || 0;
 			}
 
+			// insert the pointer element into the DOM and set its position
 			oPointerParent.insertBefore(oPointerElement, oPointerSibling);
 			oPointerElement.style.insetInlineStart = `${iX}px`;
 			oPointerElement.style.insetBlockStart = `${iY}px`;
-		    oPointerElement.setAttribute("aria-hidden", "true");
+			oPointerElement.setAttribute("aria-hidden", "true");
 
 			oPopover.openBy(oPointerElement);
 			oPopover.attachAfterClose(this._onContextMenuClose, this);
@@ -458,12 +500,12 @@ sap.ui.define([
 			this._fnEnhanceUnifiedMenuAccState = fn;
 		};
 
-        Menu.prototype._menuClosed = function(oEvent) {
+		Menu.prototype._menuClosed = function(oEvent) {
 			const oOpener = oEvent && oEvent.getParameter("openBy");
 
 			this.fireClosed();
 
-			if (oOpener) {
+			if (oOpener && !this.bIgnoreOpenerFocus) {
 				try {
 					oOpener.focus();
 				} catch (e) {

package/src/sap/m/MenuButton.js

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

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.138.0
+		 * @version 1.139.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.138.0
+	 * @version 1.139.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.138.0
+		 * @version 1.139.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MenuWrapper.js

@@ -12,6 +12,7 @@ sap.ui.define([
 	'sap/ui/dom/containsOrEquals',
 	'sap/ui/events/KeyCodes',
 	'sap/ui/Device',
+	'sap/ui/core/Lib',
 	'sap/base/i18n/Localization',
 	'sap/ui/events/PseudoEvents'
 ], function(
@@ -21,6 +22,7 @@ sap.ui.define([
 	containsOrEquals,
 	KeyCodes,
 	Device,
+	Library,
 	Localization,
 	PseudoEvents
 ) {
@@ -43,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @private
@@ -130,6 +132,7 @@ sap.ui.define([
 
 	MenuWrapper.prototype.init = function() {
 		this._aStyleClasses = [];
+		this._oRb = Library.getResourceBundleFor("sap.m");
 	};
 
 	MenuWrapper.prototype.onBeforeRendering = function() {
@@ -169,11 +172,16 @@ sap.ui.define([
 			return;
 		}
 
-		if (oEvent.target.closest(CSS.escape(`#${oItem.getId()}-endContent`))) {
+		if (oEvent.target.closest(`#${CSS.escape(oItem.getId())}-endContent`)) {
 			this.fireClosePopover({ bubbleToRoot: true });
 			return;
 		}
 
+
+		// If Shift is pressed, and the item is in Single- or Multi- selectable group,
+		// the menu popover should not be closed.
+		this._bPreventPopoverClose = this._isShiftKeyPressed(oEvent);
+
 		this._selectItem(oItem, true);
 		oEvent.preventDefault();
 		oEvent.stopPropagation();
@@ -185,8 +193,18 @@ sap.ui.define([
 		oEvent.stopPropagation();
 	};
 
-	MenuWrapper.prototype.onkeydown = function(oEvent) {
+	MenuWrapper.prototype.onsapselectmodifiers = function(oEvent) {
+		this._sapSelectOnKeyDown = true;
+
+		// If Shift is pressed, and the item is in Single- or Multi- selectable group,
+		// the menu popover should not be closed.
+		this._bPreventPopoverClose = this._isShiftKeyPressed(oEvent);
+
+		oEvent.preventDefault();
+		oEvent.stopPropagation();
+	};
 
+	MenuWrapper.prototype.onkeydown = function(oEvent) {
 		const iIdx = this.oHoveredItem ? this._getVisibleItems().indexOf(this.oHoveredItem) : -1,
 			bRtl = Localization.getRTL(),
 			iLeftArrow = bRtl ? KeyCodes.ARROW_RIGHT : KeyCodes.ARROW_LEFT,
@@ -261,12 +279,12 @@ sap.ui.define([
 		// The attribute _sapSelectOnKeyDown helps prevent issues in the reverse scenario. For example, when the spacebar is pressed
 		// on a Button, opening the menu may cause the space keyup event to select the first item immediately.
 		// Device checks are in place due to new functionality in iOS 13, which introduces desktop view functionality for tablets.
-		if (!this._sapSelectOnKeyDown) {
+		if (!this._sapSelectOnKeyDown && !this._bPreventPopoverClose) {
 			return;
 		} else {
 			this._sapSelectOnKeyDown = false;
 		}
-		if (!PseudoEvents.events.sapselect.fnCheck(oEvent) && oEvent.keyCode !== KeyCodes.ENTER) {
+		if (!PseudoEvents.events.sapselect.fnCheck(oEvent) && oEvent.keyCode !== KeyCodes.ENTER && !this._bPreventPopoverClose) {
 			return;
 		}
 
@@ -305,6 +323,16 @@ sap.ui.define([
 		return null;
 	};
 
+	/**
+	 * Determines whether only the Shift key is pressed during the event.
+	 * @param {jQuery.Event} oEvent Keyboard event.
+	 * @private
+	 * @returns {boolean} True if only the Shift key is pressed, false otherwise
+	 */
+	MenuWrapper.prototype._isShiftKeyPressed = function(oEvent) {
+		return oEvent.shiftKey && !oEvent.metaKey && !oEvent.altKey && !oEvent.ctrlKey;
+	};
+
 	/**
 	 * Adds, removes, toggles, or sets class name(s) in the internal _aStyleClasses array.
 	 * <b>Note: </b> Later these classes should be applied when menu item open its submenu popover.
@@ -372,11 +400,17 @@ sap.ui.define([
 
 			if (oItem._getItemSelectionMode && oItem._getItemSelectionMode() !== ItemSelectionMode.None) {
 				oItem.setSelected(!oItem.getSelected());
+			} else {
+				this._bPreventPopoverClose = false;
 			}
 
 			this.fireItemSelected({item: oItem});
 			oItem.firePress({item: oItem});
-			this.fireClosePopover({ bubbleToRoot: true, origin: oItem });
+
+			if (!this._bPreventPopoverClose) {
+				this.fireClosePopover({ bubbleToRoot: true, origin: oItem });
+			}
+			this._bPreventPopoverClose = false;
 		}
 	};
 

package/src/sap/m/MenuWrapperRenderer.js

@@ -5,8 +5,10 @@
  */
 
 sap.ui.define([
+	'sap/ui/core/library',
 	'sap/ui/core/ControlBehavior'
 ], function(
+	coreLibrary,
 	ControlBehavior
 ) {
 	"use strict";
@@ -19,6 +21,9 @@ sap.ui.define([
 		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}.
@@ -61,7 +66,8 @@ sap.ui.define([
 		let sCurrentGroup = null,
 			sItemGroup = null,
 			bGroupOpened = false,
-			bGroupEndSeparatorRendered = false;
+			bGroupEndSeparatorRendered = false,
+			sAriaLabel;
 
 		aItems.forEach((oItem, iIndex) => {
 			sItemGroup = oItem.getAssociation("_group");
@@ -80,8 +86,22 @@ sap.ui.define([
 			}
 
 			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;
 			}

package/src/sap/m/MessageItem.js

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

package/src/sap/m/MessageToast.js

@@ -76,7 +76,7 @@ sap.ui.define([
 		 * Note that the width can be customized up to a maximum of 15rem.
 		 *
 		 * @author SAP SE
-		 * @version 1.138.0
+		 * @version 1.139.0
 		 *
 		 * @namespace
 		 * @public

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.138.0
+	 * @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.138.0
+	 * @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/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.138.0
+	 * @version 1.139.0
 	 * @experimental since 1.52
 	 * @since 1.52.0
 	 * @alias sap.m.MultiEditField

package/src/sap/m/MultiInput.js

@@ -112,7 +112,7 @@ function(
 	* @extends sap.m.Input
 	*
 	* @author SAP SE
-	* @version 1.138.0
+	* @version 1.139.0
 	*
 	* @constructor
 	* @public
@@ -451,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);
@@ -939,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();
 		}
 	};
@@ -1140,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)) {
@@ -1201,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);
 		}
 
@@ -1231,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");
+		}
 	};
 
 	/**
@@ -1280,7 +1289,7 @@ function(
 		this.selectText(0, 0);
 
 		if (oPopup.isOpen()) {
-			oTokenizer._togglePopup(oPopup, this.getDomRef());
+			oTokenizer._togglePopup();
 		}
 
 		Input.prototype.onsapescape.apply(this, arguments);
@@ -1801,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.138.0
+	 * @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.138.0
+	 * @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.138.0
+	 * @version 1.139.0
 	 *
 	 * @constructor
 	 * @public