@openui5/sap.ui.mdc 1.134.0 → 1.136.0

package/src/sap/ui/mdc/field/FieldBase.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -35,7 +35,8 @@ sap.ui.define([
 	'sap/ui/model/base/ManagedObjectModel',
 	'sap/ui/base/ManagedObjectObserver',
 	'sap/ui/events/KeyCodes',
-	'sap/ui/Device'
+	'sap/ui/Device',
+	'sap/ui/mdc/enums/RequestShowContainerReason'
 ], (
 	Element,
 	Library,
@@ -68,7 +69,8 @@ sap.ui.define([
 	ManagedObjectModel,
 	ManagedObjectObserver,
 	KeyCodes,
-	Device
+	Device,
+	RequestShowContainerReason
 ) => {
 	"use strict";
 
@@ -99,7 +101,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.m.IOverflowToolbarContent, sap.ui.core.ILabelable
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -664,7 +666,7 @@ sap.ui.define([
 				handleTokenUpdate: _handleTokenUpdate.bind(this),
 				handleContentChange: _handleContentChange.bind(this),
 				handleContentLiveChange: _handleContentLiveChange.bind(this),
-				handleValueHelpRequest: _handleValueHelpRequest.bind(this),
+				handleValueHelpRequest: _handleContentValueHelpRequest.bind(this),
 				handleEnter: _handleEnter.bind(this),
 				handleContentPress: _handleContentPress.bind(this)
 			});
@@ -676,7 +678,7 @@ sap.ui.define([
 		const oValueHelp = _getValueHelp.call(this);
 		const oSuggestControl = this.getControlForSuggestion();
 		if (this.getEditMode() === FieldEditMode.Editable && oValueHelp && !this._iFocusTimer && !oValueHelp.isOpen() && containsOrEquals(oSuggestControl.getDomRef(), oEvent.target)) {
-			oValueHelp.shouldOpenOnFocus().then((bShouldOpen) => {
+			oValueHelp.requestShowTypeahead(RequestShowContainerReason.Focus).then((bShouldOpen) => {
 				if (bShouldOpen) {
 					this._iFocusTimer = setTimeout(() => {
 						if (!this.isFieldDestroyed() && !oValueHelp.isOpen() && _isFocused.call(this)) {
@@ -887,7 +889,7 @@ sap.ui.define([
 		this._handleNavigate(oEvent, 9999); // iStep are relative and can not be set to the last item
 	};
 
-	FieldBase.prototype._handleNavigate = function(oEvent, iStep) {
+	FieldBase.prototype._handleNavigate = async function(oEvent, iStep) {
 
 		if (this.getEditMode() === FieldEditMode.Editable) {
 			const oValueHelp = _getValueHelp.call(this);
@@ -899,10 +901,18 @@ sap.ui.define([
 					// if only type-ahead but no real value help, only navigate if open
 					const oContent = this.getControlForSuggestion();
 					const bFocusInField = oContent.hasStyleClass("sapMFocus");
+					const bOpen = oValueHelp.isOpen();
 					oEvent.preventDefault();
 					oEvent.stopPropagation();
-					oValueHelp.setFilterValue(this._sFilterValue); // to be sure to filter for typed value
-					oValueHelp.navigate(oValueHelp.isOpen() && bFocusInField && iStep === 1 ? 0 : iStep); // on first navigation just initial selected item should be navigated
+					if (!bOpen) {
+						oValueHelp.setFilterValue(this._sFilterValue); // to be sure to filter for typed value (only update if not already opened)
+						const bShowTypeahead = await oValueHelp.requestShowTypeahead(RequestShowContainerReason.Navigate);
+						if (!this.isFieldDestroyed() && !oValueHelp.isOpen() && bShowTypeahead) {
+							await _handleValueHelpRequest.call(this, oEvent, true);
+						}
+
+					}
+					oValueHelp.navigate(bOpen && bFocusInField && iStep === 1 ? 0 : iStep); // on first navigation just initial selected item should be navigated
 				}
 			}
 		}
@@ -942,12 +952,7 @@ sap.ui.define([
 		}
 	};
 
-	FieldBase.prototype.ontap = function(oEvent) {
-
-		if (oEvent.isMarked("tokenTap")) {
-			return; // only open if taped into input area (MultiInput case)
-		}
-
+	FieldBase.prototype._requestShowTypeahead = function(oEvent, sReason) {
 		// in "Select"-case the suggestion help should open on click into field
 		const oValueHelp = _getValueHelp.call(this);
 		const oSuggestControl = this.getControlForSuggestion();
@@ -957,7 +962,7 @@ sap.ui.define([
 			}
 			const bTapBeforeFocus = !_isFocused.call(this); // on thone the Focus event is triggered async after the Tap event
 			if (!oValueHelp.isOpen()) {
-				oValueHelp.shouldOpenOnClick().then((bShouldOpen) => {
+				oValueHelp.requestShowTypeahead(sReason).then((bShouldOpen) => {
 					if (bShouldOpen && !this.isFieldDestroyed() && (bTapBeforeFocus || _isFocused.call(this)) && !oValueHelp.isOpen()) {
 						if (bTapBeforeFocus) {
 							oSuggestControl.focus(); // if focus not already set (on phone) set it now before the popover opens
@@ -968,7 +973,19 @@ sap.ui.define([
 			}
 			this._redirectFocus(oEvent, oValueHelp);
 		}
+	};
 
+	FieldBase.prototype.onkeyup = function(oEvent) {
+		if (oEvent.keyCode === KeyCodes.TAB) {
+			this._requestShowTypeahead(oEvent, RequestShowContainerReason.Tab);
+		}
+	};
+
+	FieldBase.prototype.ontap = function(oEvent) {
+		if (oEvent.isMarked("tokenTap") || oEvent.getMark("tokenizerMoreIndicatorTap") || oEvent.srcControl.isA("sap.ui.core.Icon")) {
+			return; // only open if taped into input area (MultiInput case) and not at ValueHelp-Icon
+		}
+		this._requestShowTypeahead(oEvent, RequestShowContainerReason.Tap);
 	};
 
 	FieldBase.prototype.clone = function(sIdSuffix, aLocalIds) {
@@ -1752,7 +1769,7 @@ sap.ui.define([
 			if (sRoleDescription) {
 				oAttributes.aria["roledescription"] = sRoleDescription;
 			}
-			oAttributes.aria["haspopup"] = oAriaAttributes.ariaHasPopup;
+			oAttributes.aria["haspopup"] = "dialog";// always dialog, like in Input, ComboBox etc. //oAriaAttributes.ariaHasPopup;
 			oAttributes["autocomplete"] = "off";
 			if (bOpen) {
 				if (oAriaAttributes.role) {
@@ -1806,6 +1823,7 @@ sap.ui.define([
 		const aLabels = LabelEnablement.getReferencingLabels(this);
 		for (let i = 0; i < aLabels.length; i++) {
 			const oLabel = Element.getElementById(aLabels[i]);
+			oLabel.setLabelFor(oLabel.getLabelFor()); // to force Label to refresh the mapping
 			oLabel.invalidate();
 		}
 
@@ -1952,7 +1970,7 @@ sap.ui.define([
 		}
 		if (oContent.getMetadata().getAllEvents().valueHelpRequest) {
 			// content has valueHelpRequest event -> attach handler
-			oContent.attachEvent("valueHelpRequest", _handleValueHelpRequest, this);
+			oContent.attachEvent("valueHelpRequest", _handleContentValueHelpRequest, this);
 		}
 		if (oContent.getMetadata().getAllEvents().tokenUpdate) {
 			// content has tokenUpdate event -> attach handler
@@ -1965,6 +1983,7 @@ sap.ui.define([
 
 	}
 
+
 	function _detachContentHandlers(oContent) {
 
 		if (oContent.getMetadata().getAllEvents().change) {
@@ -1981,7 +2000,7 @@ sap.ui.define([
 		}
 		if (oContent.getMetadata().getAllEvents().valueHelpRequest) {
 			// oldContent has valueHelpRequest event -> detach handler
-			oContent.detachEvent("valueHelpRequest", _handleValueHelpRequest, this);
+			oContent.detachEvent("valueHelpRequest", _handleContentValueHelpRequest, this);
 		}
 		if (oContent.getMetadata().getAllEvents().tokenUpdate) {
 			// content has tokenUpdate event -> deattach handler
@@ -2549,6 +2568,9 @@ sap.ui.define([
 			oValueHelp.setHighlightId();
 			this._oNavigateCondition = undefined; // navigation item is not longer valid
 			this.getContentFactory().updateConditionType();
+			if (this.getMaxConditionsForHelp() === 1) {
+				oValueHelp.setConditions([]); // remove navigation from ValueHelp
+			}
 		}
 
 		if ("previousValue" in oEvent.getParameters()) {
@@ -2561,10 +2583,10 @@ sap.ui.define([
 
 		if (oValueHelp && (!this.getContentFactory().isMeasure() || oSource.getShowValueHelp())) {
 			if (bEscPressed) {
+				_setConditionsOnValueHelp.call(this, this.getConditions(), oValueHelp); // reset conditions
 				// close ValueHelp if escape pressed and not repoen it for last typed characters
 				if (oValueHelp.isOpen()) {
 					oValueHelp.close();
-					_setConditionsOnValueHelp.call(this, this.getConditions(), oValueHelp); // reset conditions
 					_clearLiveChangeTimer.call(this);
 					this._sFilterValue = "";
 				}
@@ -2642,23 +2664,18 @@ sap.ui.define([
 							}.bind(this);
 
 							if (this._bConnected && this.getCurrentContent()[0]) {
-								oValueHelp.isTypeaheadSupported().then((bTypeahead) => {
+								oValueHelp.requestShowTypeahead(RequestShowContainerReason.Typing).then((bTypeahead) => {
 									return !!bTypeahead && _handleTypeahead();
 								});
 								delete this._vLiveChangeValue;
 							}
 						}, 300, { leading: false, trailing: true });
 					}
-					const vOpenByTyping = oValueHelp.isTypeaheadSupported(); // trigger determination of search functionality
-					if (vOpenByTyping instanceof Promise) {
-						vOpenByTyping.then((bOpenByTyping) => {
-							// trigger open after Promise resolved
-							if (_isFocused.call(this) && this._fnLiveChangeTimer) { // if destroyed this._fnLiveChangeTimer is removed
-								this._fnLiveChangeTimer(); // if resolved while initial debounce-time frame, it will not triggered twice
-							}
-							this._bOpenByTyping = bOpenByTyping;
-						});
-					}
+					oValueHelp.requestShowTypeahead(RequestShowContainerReason.Typing).then((bOpenByTyping) => { // keeping this for compatibility, as it allows service handling before the debounce interval
+						if (_isFocused.call(this) && this._fnLiveChangeTimer) { // if destroyed this._fnLiveChangeTimer is removed
+							this._fnLiveChangeTimer(); // if resolved while initial debounce-time frame, it will not triggered twice
+						}
+					});
 					this._fnLiveChangeTimer();
 				}
 			}
@@ -2788,6 +2805,12 @@ sap.ui.define([
 
 	}
 
+	async function _handleContentValueHelpRequest(oEvent) {
+		if (await _getValueHelp.call(this)?.requestShowValueHelp()) {
+			_handleValueHelpRequest.call(this, oEvent, false);
+		}
+	}
+
 	// TODO: remove this function and replace by getValueHelp once ValueHelp association is completetly removed.
 	FieldBase.prototype._getValueHelp = function() {
 
@@ -2865,19 +2888,43 @@ sap.ui.define([
 			this._oValueHelpRequestPromise = _waitForFormatting.call(this);
 			await this._oValueHelpRequestPromise;
 			if (!this.isFieldDestroyed()) {
-				oValueHelp.setFilterValue(this._sFilterValue); // use types value for filtering, even if reopening ValueHelp
-				const aConditions = this.getConditions();
-				_setConditionsOnValueHelp.call(this, aConditions, oValueHelp);
-				oValueHelp.toggleOpen(!!bOpenAsTypeahed);
-				const bIsFocusInHelp = oValueHelp.isFocusInHelp();
-				this._bFocusOnValueHelp = !!oEvent.getSource && !bIsFocusInHelp; // show focus on dropdown if opened via F4 (set it only after really opened)
-				const oContent = oEvent.srcControl || oEvent.getSource(); // as, if called from Tap or other browser event getSource is not available
-				if (!bIsFocusInHelp) {
-					// need to reset bValueHelpRequested in Input, otherwise on focusout no change event and navigation don't work
-					if (oContent.bValueHelpRequested) {
-						oContent.bValueHelpRequested = false; // TODO: need API
+				if (!oValueHelp.isOpen()) { // when closing clean up after close
+					const bFromKeyboard = oEvent.getParameter?.("fromKeyboard");
+					const bIsFocusInHelp = oValueHelp.isFocusInHelp();
+					const iMaxConditions = this.getMaxConditionsForHelp();
+					const oContent = oEvent.srcControl || oEvent.getSource(); // as, if called from Tap or other browser event getSource is not available
+
+					oValueHelp.setFilterValue(this._sFilterValue); // use typed value for filtering, even if reopening ValueHelp
+					let aConditions;
+					if (this._oNavigateCondition && iMaxConditions === 1) {
+						aConditions = [this._oNavigateCondition]; // if navigated in closed state before, use navigated condition, In typeahed reopen with last suggested condition
+					} else if (this._bDirty && iMaxConditions === 1) {
+						aConditions = []; // if changed via typing (e.g. cleared) let typeahead do the work if needed
+					} else {
+						aConditions = this.getConditions();
+					}
+
+					if (bFromKeyboard && this._sFilterValue && !bIsFocusInHelp) {
+						this._sFilterValue = ""; // if dropdown manulally opened via F4 clear typeahed value
+						const sDomValue = oContent.getDOMValue?.();
+						if (oContent.selectText && sDomValue) {
+							oContent.selectText(0, sDomValue.length); // highligh whole text
+						}
+					}
+
+					_setConditionsOnValueHelp.call(this, aConditions, oValueHelp);
+
+					this._bFocusOnValueHelp = bFromKeyboard && !bIsFocusInHelp; // show focus on dropdown if opened via F4 (set it only after really opened)
+					if (!bIsFocusInHelp) {
+						// need to reset bValueHelpRequested in Input, otherwise on focusout no change event and navigation don't work
+						if (oContent.bValueHelpRequested) {
+							oContent.bValueHelpRequested = false; // TODO: need API
+						}
 					}
 				}
+
+				oValueHelp.toggleOpen(!!bOpenAsTypeahed);
+
 				this._oValueHelpRequestPromise = undefined;
 			}
 		}
@@ -3076,8 +3123,9 @@ sap.ui.define([
 		}
 
 		this._oNavigateCondition = _createNavigateCondition.call(this, oCondition, sItemId);
-		if (this._oNavigateCondition) {
+		if (this._oNavigateCondition && this.getMaxConditionsForHelp() === 1) {
 			[vKey, sValue] = this._oNavigateCondition.values;
+			oValueHelp.setConditions([oCondition]); // in single selection, the navigated condition should be selected one (use condition returned from valuehelp to prevent unneccessry update if not changed)
 		}
 
 		this._bPreventGetDescription = true; // if no description in navigated condition, no description exist. Don't try to read one
@@ -3121,6 +3169,10 @@ sap.ui.define([
 					oContent._doSelect();
 				}
 			}
+
+			if (oValueHelp.isOpen() && oContent.hasStyleClass("sapMFocus")) { // happens if navigated back from "show All items"-button
+				_setVisualFocusToValueHelp(oContent, oValueHelp);
+			}
 		}
 
 		this._bPreventGetDescription = false; // back to default
@@ -3154,6 +3206,7 @@ sap.ui.define([
 			if (sOutput) { // only if something returned
 				const oValueHelp = _getValueHelp.call(this);
 				if (oValueHelp?.isOpen()) {
+					_setVisualFocusToField(oContent, oValueHelp); // remove focus from dropdown
 					oValueHelp.setHighlightId(!this._bPreventAutocomplete && sItemId);
 				}
 
@@ -3280,8 +3333,10 @@ sap.ui.define([
 
 		// sync conditions with ValueHelp as we cannot e sure that it still is in sync
 		const oValueHelp = oEvent.getSource();
-		const aConditions = this.getConditions();
-		_setConditionsOnValueHelp.call(this, aConditions, oValueHelp);
+		if (!this._oNavigateCondition) { // if navigated keep state to allow closed navigation
+			const aConditions = this.getConditions();
+			_setConditionsOnValueHelp.call(this, aConditions, oValueHelp);
+		}
 
 		if (_isFocused.call(this)) { // restore focus visualization
 			_setVisualFocusToField(oContent, oValueHelp);
@@ -3306,8 +3361,10 @@ sap.ui.define([
 				sItemId = oEvent.getParameter("itemId");
 			}
 
-			// to focus selected item, typeahead match, or fist item (if none selected)
-			oValueHelp.navigate(0);
+			if (!this._sFilterValue && !this._oNavigateCondition && (this._bDirty || this.getConditions().length === 0)) {
+				// to focus first item (if none selected)
+				oValueHelp.navigate(0);
+			}
 		}
 		_setAriaAttributes.call(this, true, sItemId);
 		_setShowValueStateMessage.call(this, false);// close ValueState message on opening, because opened is sometimes very delayed what would lead to strange effect

package/src/sap/ui/mdc/field/FieldBaseDelegate.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/field/FieldBaseRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/field/FieldInfoBase.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -31,7 +31,7 @@ sap.ui.define([
 	 * A <code>FieldInfoBase</code> element is a base class that shows any kind of information related to the <code>Field</code> control, for example, navigation targets or contact details.
 	 * This is the basis for link-features. If the link is pressed a popover might be opened.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @since 1.54.0
 	 * @public

package/src/sap/ui/mdc/field/FieldInput.js

@@ -1,14 +1,17 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (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/m/Input', 'sap/ui/mdc/field/FieldInputRenderer'
+	'sap/m/Input',
+	'sap/ui/mdc/field/FieldInputRenderer',
+	'sap/ui/base/ManagedObjectObserver'
 ], (
 	Input,
-	FieldInputRenderer
+	FieldInputRenderer,
+	ManagedObjectObserver
 ) => {
 	"use strict";
 
@@ -21,7 +24,7 @@ sap.ui.define([
 	 * The <code>FieldInput</code> control is used to render an input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * It enhances the {@link sap.m.Input Input} control to add ARIA attributes and other {@link sap.ui.mdc.field.FieldBase FieldBase}-specific logic.
 	 * @extends sap.m.Input
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -49,6 +52,43 @@ sap.ui.define([
 		renderer: FieldInputRenderer
 	});
 
+	FieldInput.prototype.init = function() {
+
+		Input.prototype.init.apply(this, arguments);
+
+		this._oObserver = new ManagedObjectObserver(_observeChanges.bind(this));
+
+		this._oObserver.observe(this, {
+			properties: ["ariaAttributes"]
+		});
+
+	};
+
+	FieldInput.prototype.exit = function() {
+
+		Input.prototype.exit.apply(this, arguments);
+
+		this._oObserver.disconnect();
+		this._oObserver = undefined;
+
+	};
+
+	function _observeChanges(oChanges) {
+
+		if (oChanges.name === "ariaAttributes") {
+			// set aria-activedescendant directly to prevent anouncement of old one
+			if (oChanges.current.aria?.activedescendant !== oChanges.old.aria?.activedescendant) {
+				const oDomRef = this.getFocusDomRef();
+				if (!oChanges.current.aria?.activedescendant) {
+					oDomRef.removeAttribute("aria-activedescendant");
+				} else {
+					oDomRef.setAttribute("aria-activedescendant", oChanges.current.aria.activedescendant);
+				}
+			}
+		}
+
+	}
+
 	return FieldInput;
 
 });

package/src/sap/ui/mdc/field/FieldInputRenderUtil.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -16,7 +16,7 @@ sap.ui.define([
 		 * @class Functions uses in <code>FieldInputRenderer</code> and <code>FieldMultiInputRenderer</code> to adjust aria attributes.
 		 *
 		 * @author SAP SE
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 * @since 1.86.0
 		 * @alias sap.ui.mdc.field.FieldInputRenderUtil
 		 *

package/src/sap/ui/mdc/field/FieldInputRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/field/FieldMultiInput.js

@@ -1,21 +1,24 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (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/Element',
 	'sap/m/MultiInput',
+	'sap/m/Tokenizer',
 	'sap/ui/mdc/field/FieldMultiInputRenderer',
 	'sap/ui/Device',
-	'sap/m/Tokenizer'
+	'sap/ui/base/ManagedObjectObserver'
 ], (
 	Element,
 	MultiInput,
+	Tokenizer,
 	FieldMultiInputRenderer,
 	Device,
-	Tokenizer
+	ManagedObjectObserver
+
 ) => {
 	"use strict";
 
@@ -28,7 +31,7 @@ sap.ui.define([
 	 * The <code>FieldMultiInput</code> control is used to render a multi-input field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * It enhances the {@link sap.m.MultiInput MultiInput} control to add ARIA attributes and other {@link sap.ui.mdc.field.FieldBase FieldBase}-specific logic.
 	 * @extends sap.m.MultiInput
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -83,6 +86,21 @@ sap.ui.define([
 
 		};
 
+		this._oObserver = new ManagedObjectObserver(_observeChanges.bind(this));
+
+		this._oObserver.observe(this, {
+			properties: ["ariaAttributes"]
+		});
+
+	};
+
+	FieldMultiInput.prototype.exit = function() {
+
+		MultiInput.prototype.exit.apply(this, arguments);
+
+		this._oObserver.disconnect();
+		this._oObserver = undefined;
+
 	};
 
 	FieldMultiInput.prototype.onfocusin = function(oEvent) {
@@ -108,6 +126,16 @@ sap.ui.define([
 
 	};
 
+	FieldMultiInput.prototype.ontap = function(oEvent) {
+
+		if (oEvent.target.classList.contains("sapMTokenizerIndicator")) {
+			oEvent.setMark("tokenizerMoreIndicatorTap");
+		}
+
+		MultiInput.prototype.ontap.apply(this, arguments);
+
+	};
+
 	FieldMultiInput.prototype.onAfterRendering = function () {
 
 		const {bDeletePressed, bTokensUpdated} = this;
@@ -244,6 +272,22 @@ sap.ui.define([
 
 	}
 
+	function _observeChanges(oChanges) {
+
+		if (oChanges.name === "ariaAttributes") {
+			// set aria-activedescendant directly to prevent anouncement of old one
+			if (oChanges.current.aria?.activedescendant !== oChanges.old.aria?.activedescendant) {
+				const oDomRef = this.getFocusDomRef();
+				if (!oChanges.current.aria?.activedescendant) {
+					oDomRef.removeAttribute("aria-activedescendant");
+				} else {
+					oDomRef.setAttribute("aria-activedescendant", oChanges.current.aria.activedescendant);
+				}
+			}
+		}
+
+	}
+
 	return FieldMultiInput;
 
 });

package/src/sap/ui/mdc/field/FieldMultiInputRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/field/ListFieldHelpItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.valuehelp.content.FixedListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/MultiValueFieldDelegate.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/mdc/field/MultiValueFieldItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * Base type for <code>MultiValueFieldItem</code> control.
 	 * The {@link sap.ui.mdc.MultiValueField MultiValueField} holds its values as items. The <code>MultiValueFieldItem</code> element defines these items.
 	 * @extends sap.ui.core.Element
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @since 1.93.0
 	 * @public

package/src/sap/ui/mdc/field/TokenDisplay.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -22,7 +22,7 @@ sap.ui.define([
 	 * The <code>TokenDisplay</code> control is used to render a field inside a control based on {@link sap.ui.mdc.field.FieldBase FieldBase}.
 	 * It enhances the {@link sap.m.Token Token} control to add ARIA attributes and other {@link sap.ui.mdc.field.FieldBase FieldBase}-specific logic.
 	 * @extends sap.m.Token
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/TokenDisplayRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */