@openui5/sap.m 1.134.0 → 1.136.0

package/src/sap/m/BusyIndicatorRenderer.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(

package/src/sap/m/Button.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.
  */
 
@@ -101,7 +101,7 @@ sap.ui.define([
 	 * @mixes sap.ui.core.ContextMenuSupport
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ButtonRenderer.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/m/Carousel.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.
  */
 
@@ -132,7 +132,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CarouselLayout.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.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/base/ManagedObject", "./library"], function (ManagedObjec
 	 * Applies a <code>sap.m.CarouselLayout</code> to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *
@@ -53,7 +53,7 @@ sap.ui.define(["sap/ui/base/ManagedObject", "./library"], function (ManagedObjec
 
 	/*!
 	 * 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/m/CarouselRenderer.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.
  */
 
@@ -95,7 +95,8 @@ sap.ui.define([
 			.style("height", oCarousel.getHeight())
 			.attr("data-sap-ui-customfastnavgroup", true) // custom F6 handling
 			.accessibilityState(oCarousel, {
-				role: "listbox"
+				role: "list",
+				roledescription: Library.getResourceBundleFor("sap.m").getText("CAROUSEL_ARIA_ROLE_DESCRIPTION")
 			});
 
 		if (sTooltip) {
@@ -149,7 +150,7 @@ sap.ui.define([
 		oRM.openStart("div", oCarousel.getId() + "-" + oPage.getId() + "-slide")
 			.class("sapMCrslItem")
 			.accessibilityState(oPage, {
-				role: "option",
+				role: "listitem",
 				posinset: iIndex + 1,
 				setsize: aArray.length,
 				selected: bSelected,

package/src/sap/m/CheckBox.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.
  */
 
@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormRenderAsControl as #getFormRenderAsControl
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CheckBoxRenderer.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/m/ColorPalette.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.
  */
 
@@ -108,7 +108,7 @@ sap.ui.define([
 		 * To prevent this, apps using the <code>ColorPalette</code> should also load the <code>sap.ui.unified</code> library in advance.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ColorPalettePopover.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.
  */
 
@@ -39,7 +39,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.m.ColorPalette} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 *
 		 * @public
 		 * @since 1.54

package/src/sap/m/ColorPaletteRenderer.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/m/Column.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.
  */
 
@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @public
@@ -192,7 +192,13 @@ sap.ui.define([
 			/**
 			 * Control to be displayed in the column footer.
 			 */
-			footer : {type : "sap.ui.core.Control", multiple : false}
+			footer : {type : "sap.ui.core.Control", multiple : false},
+
+			/**
+			 * Control to be displayed as an action in the column header.
+			 * @since 1.136
+			 */
+			_action: {type: "sap.ui.core.Control", multiple: false, visibility: "hidden"}
 		},
 		associations: {
 			/**

package/src/sap/m/ColumnHeaderPopover.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([
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnListItem.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.
  */
 
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @implements sap.m.ITableItem
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColumnListItemRenderer.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.
  */
 
@@ -327,6 +327,13 @@ sap.ui.define([
 				oColumn.addDependent(oHeader);
 				oLI._addClonedHeader(oHeader);
 				rm.renderControl(oHeader);
+				const oColumnAction = oColumn.getAggregation("_action");
+				if (oColumnAction) {
+					const oColumnActionClone = oColumnAction.clone();
+					oColumn.addDependent(oColumnActionClone);
+					oLI._addClonedHeader(oColumnActionClone);
+					rm.renderControl(oColumnActionClone);
+				}
 				rm.openStart("span").class("sapMListTblSubCntSpr");
 				rm.attr("data-popin-colon", Library.getResourceBundleFor("sap.m").getText("TABLE_POPIN_LABEL_COLON"));
 				rm.openEnd().close("span");

package/src/sap/m/ColumnPopoverActionItem.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(['./ColumnPopoverItem', 'sap/m/Button'], function(ColumnPopoverItem, Button) {
@@ -16,7 +16,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/Button'], function(ColumnPopoverIte
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverCustomItem.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(['./ColumnPopoverItem', 'sap/m/ToggleButton'], function(ColumnPopoverItem, ToggleButton) {
@@ -17,7 +17,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/ToggleButton'], function(ColumnPopo
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverItem.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(['sap/ui/core/Element'], function(Element) {
@@ -16,7 +16,7 @@ sap.ui.define(['sap/ui/core/Element'], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverSelectListItem.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([
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @since 1.86

package/src/sap/m/ColumnPopoverSortItem.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([
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @since 1.66

package/src/sap/m/ComboBox.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.
  */
 
@@ -106,7 +106,7 @@ sap.ui.define([
 		 * </ul>
 		 *
 		 * @author SAP SE
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 *
 		 * @constructor
 		 * @extends sap.m.ComboBoxBase
@@ -1590,9 +1590,10 @@ sap.ui.define([
 			ComboBoxBase.prototype.open.call(this);
 
 			var oSelectedItem = ListHelpers.getListItem(this.getSelectedItem());
+			const oSuggestionPopover = this._getSuggestionsPopover();
 
-			if (!this._bInputFired) {
-				this._getSuggestionsPopover() && this._getSuggestionsPopover().updateFocus(this, oSelectedItem);
+			if (!this._bInputFired && oSuggestionPopover) {
+				oSuggestionPopover.updateFocus(this, oSelectedItem);
 			}
 
 			this._bInputFired = false;
@@ -1923,21 +1924,6 @@ sap.ui.define([
 			this.loadItems(fnLoadItemsListener);
 		};
 
-		/**
-		 * Gets <code>sap.m.FormattedText</code> aggregation based on its current parent.
-		 * If the SuggestionPopover is open that is the <code>sap.m.ValueStateHeader</code>, otherwise is the InputBase itself.
-		 *
-		 * @private
-		 * @returns {sap.m.FormattedText} Aggregation used for value state message that can contain links.
-		 * @since 1.78
-		 */
-		ComboBox.prototype._getFormattedValueStateText = function() {
-			if (this.isOpen()) {
-				return this._getSuggestionsPopover()._getValueStateHeader().getFormattedText();
-			} else {
-				return ComboBoxTextField.prototype.getFormattedValueStateText.call(this);
-			}
-		};
 
 		/**
 		 * Handles the clear icon press.

package/src/sap/m/ComboBoxBase.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.
  */
 
@@ -70,7 +70,7 @@ sap.ui.define([
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 *
 		 * @constructor
 		 * @public
@@ -555,6 +555,28 @@ sap.ui.define([
 			this.getShowClearIcon() && this.setProperty("effectiveShowClearIcon", !!this.getValue());
 		};
 
+		/**
+		 * The function handles keydown events for the <code>ComboBoxBase</code> component
+		 * and delegates initial processing to <code>ComboBoxTextField</code>
+		 *
+		 * @param {jQuery.Event} oEvent The event object
+		 * @private
+		 */
+		ComboBoxBase.prototype.onkeydown = function (oEvent) {
+			ComboBoxTextField.prototype.onkeydown.apply(this, arguments);
+
+			var oSuggestionsPopover = this._getSuggestionsPopover();
+			if (this.areHotKeysPressed(oEvent)) {
+				if (oSuggestionsPopover && oSuggestionsPopover.isOpen()) {
+					oSuggestionsPopover.setValueStateActiveState(true);
+					oSuggestionsPopover._handleValueStateLinkNav(this, oEvent);
+					oSuggestionsPopover.updateFocus(this, null);
+				} else {
+					this._handleValueStateLinkNav();
+				}
+			}
+		};
+
 		/**
 		 * Sets the value property of the control.
 		 *
@@ -688,7 +710,7 @@ sap.ui.define([
 				while the suggestions popover is open update the value state header.
 				If the input has FormattedText aggregation while the suggestions popover is open then
 				it's new, because the old is already switched to have the value state header as parent */
-				this._updateSuggestionsPopoverValueState();
+				this._updateSuggestionsPopoverValueState(true);
 			}
 		};
 
@@ -946,10 +968,10 @@ sap.ui.define([
 
 		/**
 		 * Updates the suggestions popover value state
-		 *
+		 * @param {boolean} bUpdateValueStateLinkDelagate Whether to reinitialize the value state link delegate
 		 * @private
 		 */
-		ComboBoxBase.prototype._updateSuggestionsPopoverValueState = function() {
+		ComboBoxBase.prototype._updateSuggestionsPopoverValueState = function(bUpdateValueStateLinkDelagate) {
 			var oSuggestionsPopover = this._getSuggestionsPopover();
 			if (!oSuggestionsPopover) {
 				return;
@@ -959,7 +981,7 @@ sap.ui.define([
 				bNewValueState = this.getValueState() !== oSuggestionsPopover._getValueStateHeader().getValueState(),
 				oNewFormattedValueStateText = this.getFormattedValueStateText(),
 				sValueStateText = this.getValueStateText(),
-				bShouldPopoverBeUpdated = oNewFormattedValueStateText || bNewValueState;
+				bShouldPopoverBeUpdated = (oNewFormattedValueStateText !== null) || bNewValueState;
 
 			/* If open and no new FormattedText or value state is set to the Input then this is called
 			onBeforeClose of the SuggestionsPopover. Switch the value state aggregation's
@@ -967,7 +989,7 @@ sap.ui.define([
 			if (oSuggestionsPopover.isOpen() && !bShouldPopoverBeUpdated) {
 				this.setFormattedValueStateText(oSuggestionsPopover._getValueStateHeader().getFormattedText());
 			}
-			oSuggestionsPopover.updateValueState(sValueState, (oNewFormattedValueStateText || sValueStateText), this.getShowValueStateMessage());
+			oSuggestionsPopover.updateValueState(sValueState, (oNewFormattedValueStateText || sValueStateText), this.getShowValueStateMessage(), bUpdateValueStateLinkDelagate);
 		};
 
 		ComboBoxBase.prototype.shouldValueStateMessageBeOpened = function() {
@@ -1581,6 +1603,22 @@ sap.ui.define([
 			this.loadItems(fnLoadItemsListener);
 		};
 
+		/**
+		 * Gets <code>sap.m.FormattedText</code> aggregation based on its current parent.
+		 * If the SuggestionPopover is open, the parent is <code>sap.m.ValueStateHeader</code>;
+		 * otherwise, the parent is the <code>InputBase</code> itself.
+		 *
+		 * @private
+		 * @returns {sap.m.FormattedText} Aggregation used for value state message that can contain links.
+		 */
+		ComboBoxBase.prototype._getFormattedValueStateText = function() {
+			if (this.isOpen()) {
+				return this._getSuggestionsPopover()._getValueStateHeader().getFormattedText();
+			} else {
+				return ComboBoxTextField.prototype.getFormattedValueStateText.call(this);
+			}
+		};
+
 		/**
 		 * Should be overwritten in children classes to apply control specific filtering over the items.
 		 *
@@ -1590,5 +1628,13 @@ sap.ui.define([
 		 */
 		ComboBoxBase.prototype.applyShowItemsFilters = function () {};
 
+		ComboBoxBase.prototype.getValueStateLinksForAcc = function(){
+			const oFormattedText = this._getFormattedValueStateText();
+			if (!oFormattedText){
+				return [];
+			}
+			return oFormattedText.getControls();
+		};
+
 		return ComboBoxBase;
 	});

package/src/sap/m/ComboBoxBaseRenderer.js

@@ -1,12 +1,14 @@
 /*!
  * 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(['./ComboBoxTextFieldRenderer', 'sap/ui/core/Renderer'],
-	function (ComboBoxTextFieldRenderer, Renderer) {
+sap.ui.define(['./ComboBoxTextFieldRenderer', 'sap/ui/core/Renderer', 'sap/ui/core/library'],
+	function (ComboBoxTextFieldRenderer, Renderer, coreLibrary) {
 		"use strict";
 
+		var ValueState = coreLibrary.ValueState;
+
 		/**
 		 * ComboBoxBase renderer.
 		 *
@@ -22,6 +24,18 @@ sap.ui.define(['./ComboBoxTextFieldRenderer', 'sap/ui/core/Renderer'],
 		 */
 		ComboBoxBaseRenderer.CSS_CLASS_COMBOBOXBASE = "sapMComboBoxBase";
 
+		ComboBoxBaseRenderer.getAriaDescribedBy = function(oControl) {
+			let sAriaDescribedBy = ComboBoxTextFieldRenderer.getAriaDescribedBy.apply(this, arguments);
+
+			if (oControl.getValueStateLinksForAcc().length && oControl.getValueState() !== ValueState.Error) {
+				sAriaDescribedBy =  sAriaDescribedBy
+					? `${sAriaDescribedBy} ${oControl.getValueStateLinksShortcutsId()}`
+					: oControl.getValueStateLinksShortcutsId();
+			}
+
+			return sAriaDescribedBy;
+		};
+
 		/**
 		 * Retrieves the accessibility state of the control.
 		 * To be overwritten by subclasses.
@@ -36,6 +50,13 @@ sap.ui.define(['./ComboBoxTextFieldRenderer', 'sap/ui/core/Renderer'],
 			if (oPicker) {
 				mAccessibilityState.controls = oPicker.getId();
 			}
+
+			if (oControl.getValueStateLinksForAcc().length && oControl.getValueState() === ValueState.Error) {
+				mAccessibilityState.errormessage = mAccessibilityState.errormessage
+				? `${mAccessibilityState.errormessage} ${oControl.getValueStateLinksShortcutsId()}`
+				: oControl.getValueStateLinksShortcutsId();
+			}
+
 			return mAccessibilityState;
 		};
 

package/src/sap/m/ComboBoxRenderer.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(['./ComboBoxBaseRenderer', 'sap/ui/core/Renderer', 'sap/m/inputUtils/ListHelpers'
@@ -80,17 +80,10 @@ sap.ui.define(['./ComboBoxBaseRenderer', 'sap/ui/core/Renderer', 'sap/m/inputUti
 			}
 
 			var oFocusedItem = oSuggestionPopover.getFocusedListItem();
-			var bValueStateFocused = oSuggestionPopover.getValueStateActiveState();
 
 			// If the picker is not opened, no active descendant should be set
 			// If there is no focused element in the picker, no active descendant should be set
-			if (!bOpen || (!oFocusedItem && !bValueStateFocused)) {
-				return;
-			}
-
-			// If the value state is focused, set the active descendant in order to read out the value state header
-			if (bValueStateFocused) {
-				oRm.attr("aria-activedescendant", oControl._getFormattedValueStateText().getId());
+			if (!bOpen || (!oFocusedItem)) {
 				return;
 			}
 

package/src/sap/m/ComboBoxTextField.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([
 		 * @extends sap.m.InputBase
 		 *
 		 * @author SAP SE
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ComboBoxTextFieldRenderer.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([

package/src/sap/m/ContentConfig.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([
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class This element is used within the TileAttribute control that generates either a link or text
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @public
 	 * @experimental since 1.122

package/src/sap/m/CustomListItem.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.
  */
 
@@ -24,7 +24,7 @@ sap.ui.define(['./ListItemBase', './library', './CustomListItemRenderer'],
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @public