@openui5/sap.m 1.119.1 → 1.120.1

package/src/sap/m/ListBase.js

@@ -105,7 +105,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public
@@ -253,6 +253,7 @@ function(
 				/**
 				 * If set to true, this control remembers and retains the selection of the items after a binding update has been performed (e.g. sorting, filtering).
 				 * <b>Note:</b> This feature works only if two-way data binding for the <code>selected</code> property of the item is not used. It also needs to be turned off if the binding context of the item does not always point to the same entry in the model, for example, if the order of the data in the <code>JSONModel</code> is changed.
+				 * <b>Note:</b> This feature leverages the built-in selection mechanism of the corresponding binding context when the OData V4 model is used. Therefore, all binding-relevant limitations apply in this context as well. For more details, see the {@link sap.ui.model.odata.v4.Context#setSelected setSelected}, the {@link sap.ui.model.odata.v4.ODataModel#bindList bindList}, and the {@link sap.ui.model.odata.v4.ODataMetaModel#requestValueListInfo requestValueListInfo} API documentation. Do not enable this feature when <code>$$SharedRequests</code> is active.
 				 * @since 1.16.6
 				 */
 				rememberSelections : {type : "boolean", group : "Behavior", defaultValue : true},
@@ -964,9 +965,9 @@ function(
 	 * @since 1.18.6
 	 */
 	ListBase.prototype.getSelectedContexts = function(bAll) {
-		var oBindingInfo = this.getBindingInfo("items"),
-			sModelName = (oBindingInfo || {}).model,
-			oModel = this.getModel(sModelName);
+		const oBindingInfo = this.getBindingInfo("items");
+		const sModelName = oBindingInfo?.model;
+		const oModel = this.getModel(sModelName);
 
 		// only deal with binding case
 		if (!oBindingInfo || !oModel) {
@@ -975,15 +976,19 @@ function(
 
 		// return binding contexts from all selection paths
 		if (bAll && this.getRememberSelections()) {
-			return this._aSelectedPaths.map(function(sPath) {
-				return oModel.getContext(sPath);
-			});
+
+			// in ODataV4Model getAllCurrentContexts will also include previously selected contexts
+			if (oModel.isA("sap.ui.model.odata.v4.ODataModel")) {
+				const aContexts = this.getBinding("items").getAllCurrentContexts?.() || [];
+				return aContexts.filter((oContext) => this._aSelectedPaths.includes(oContext.getPath()));
+			}
+
+			// for all other models, ask model to provide context over binding path
+			return this._aSelectedPaths.map((sPath) => oModel.getContext(sPath));
 		}
 
 		// return binding context of current selected items
-		return this.getSelectedItems().map(function(oItem) {
-			return oItem.getBindingContext(sModelName);
-		});
+		return this.getSelectedItems().map((oItem) => oItem.getBindingContext(sModelName));
 	};
 
 
@@ -998,7 +1003,14 @@ function(
 	ListBase.prototype.removeSelections = function(bAll, bFireEvent, bDetectBinding) {
 		var aChangedListItems = [];
 		this._oSelectedItem = null;
-		bAll && (this._aSelectedPaths = []);
+		if (bAll) {
+			this._aSelectedPaths = [];
+			if (!bDetectBinding) {
+				const oBinding = this.getBinding("items");
+				const aContexts = oBinding?.getAllCurrentContexts?.() || [];
+				aContexts[0]?.setSelected && aContexts.forEach((oContext) => oContext.setSelected(false));
+			}
+		}
 		this.getItems(true).forEach(function(oItem) {
 			if (!oItem.getSelected()) {
 				return;
@@ -1670,18 +1682,24 @@ function(
 			return;
 		}
 
-		var sPath = oItem.getBindingContextPath();
+		const sModelName = this.getBindingInfo("items").model;
+		const oBindingContext = oItem.getBindingContext(sModelName);
+		const sPath = oBindingContext?.getPath();
 		if (!sPath) {
 			return;
 		}
 
+		const iIndex = this._aSelectedPaths.indexOf(sPath);
 		bSelect = (bSelect === undefined) ? oItem.getSelected() : bSelect;
-		var iIndex = this._aSelectedPaths.indexOf(sPath);
 		if (bSelect) {
 			iIndex < 0 && this._aSelectedPaths.push(sPath);
 		} else {
 			iIndex > -1 && this._aSelectedPaths.splice(iIndex, 1);
 		}
+
+		if (oBindingContext.setSelected && !oBindingContext.isTransient()) {
+			oBindingContext.setSelected(bSelect);
+		}
 	};
 
 	ListBase.prototype._destroyGrowingDelegate = function() {
@@ -2931,4 +2949,4 @@ function(
 
 	return ListBase;
 
-});
+});

package/src/sap/m/ListItemBase.js

@@ -75,7 +75,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MaskEnabler.js

@@ -26,7 +26,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.119.1
+	 * @version 1.120.1
 	 * @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.119.1
+	 * @version 1.120.1
 	 *
 	 * @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.119.1
+	 * @version 1.120.1
 	 * @public
 	 * @constructor
 	 * @since 1.34.0

package/src/sap/m/Menu.js

@@ -70,7 +70,7 @@ sap.ui.define([
 		 * @implements sap.ui.core.IContextMenu
 		 *
 		 * @author SAP SE
-		 * @version 1.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MenuButton.js

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @public
@@ -186,8 +186,8 @@ sap.ui.define([
 					defaultAction: {},
 
 					/**
-					 * Fired before menu opening when the <code>buttonMode</code> is set to <code>Split</code> and the user
-					 * presses the arrow button.
+					 * In <code>Regular</code> button mode – fires when the user presses the button.
+					 * Alternatively, if the <code>buttonMode</code> is set to <code>Split</code> - fires when the user presses the arrow button.
 					 *
 					 * @since 1.94.0
 					 */

package/src/sap/m/MenuItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MenuListItem.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MessageItem.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Item
 		 * @author SAP SE
-		 * @version 1.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessageListItem.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * @extends sap.m.StandardListItem
 		 *
 		 * @author SAP SE
-		 * @version 1.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/MessagePage.js

@@ -72,7 +72,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.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/MessagePopover.js

@@ -95,7 +95,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @public
@@ -708,8 +708,7 @@ function(
 		 * @private
 		 */
 		MessagePopover.prototype._expandMsgPopover = function () {
-			var sDomHeight,
-				sHeight = DEFAULT_CONTENT_HEIGHT,
+			var sHeight = DEFAULT_CONTENT_HEIGHT,
 				sDomHeight = this._oPopover.$("cont").css("height");
 
 			if (this.getInitiallyExpanded() && sDomHeight !== "0px") {

package/src/sap/m/MessagePopoverItem.js

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

package/src/sap/m/MessageStrip.js

@@ -85,7 +85,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MessageToast.js

@@ -9,13 +9,13 @@ sap.ui.define([
 	'sap/ui/core/Popup',
 	'sap/ui/core/library',
 	'sap/ui/core/Control',
+	'sap/ui/core/Element',
 	'sap/ui/Device',
-	'sap/ui/core/Core',
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/Configuration"
 ],
-	function(InstanceManager, Popup, coreLibrary, Control, Device, Core, Log, jQuery, Configuration) {
+	function(InstanceManager, Popup, coreLibrary, Control, Element, Device, Log, jQuery, Configuration) {
 		"use strict";
 
 		// shortcut for sap.ui.core.Dock
@@ -72,7 +72,7 @@ sap.ui.define([
 		 * 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.
 		 *
 		 * @author SAP SE
-		 * @version 1.119.1
+		 * @version 1.120.1
 		 *
 		 * @namespace
 		 * @public
@@ -405,9 +405,7 @@ sap.ui.define([
 		 * @public
 		 */
 		MessageToast.show = function(sMessage, mOptions) {
-			var oOpener = Core.byId(Core.getCurrentFocusedControlId()) || sap.ui.core.Element.closestTo(document.activeElement);
-			var oUI5Area = oOpener && oOpener.getUIArea && oOpener.getUIArea() || sap.ui.core.UIArea.registry.all()['body'] || sap.ui.core.UIArea.registry.all()['content'];
-			var oOpenerUI5Area = oOpener && oOpener.getUIArea  && oOpener.getUIArea();
+			var oOpener = Element.closestTo(document.activeElement);
 			var oAccSpan;
 			var that = MessageToast,
 				mSettings = jQuery.extend({}, MessageToast._mSettings, { message: sMessage }),
@@ -419,12 +417,6 @@ sap.ui.define([
 
 			MessageToast._mSettings.opener = oOpener;
 
-			// Find the uppper-most parent to attach the keyboard shortcut as we need to be
-			// able to open the message no matter where the focus is currently
-			if (!this._oRootNode || (this._oRootNode && oOpenerUI5Area && oOpenerUI5Area.getRootNode() !== this._oRootNode)) {
-				this._oRootNode = oUI5Area ? oUI5Area.getRootNode() : null;
-			}
-
 			mOptions = normalizeOptions(mOptions);
 
 			// merge mOptions into mSettings
@@ -477,13 +469,7 @@ sap.ui.define([
 			oAccSpan.setAttribute("class", "sapMMessageToastHiddenFocusable");
 
 			oPopup.getContent().prepend(oAccSpan);
-
-			if (this._oRootNode) {
-				this._oRootNode.removeEventListener("keydown", that._fnKeyDown.bind(that));
-				this._oRootNode.addEventListener("keydown", that._fnKeyDown.bind(that));
-
-				oAccSpan.addEventListener("keydown", handleKbdClose.bind(this));
-			}
+			oAccSpan.addEventListener("keydown", handleKbdClose.bind(this));
 
 			// opens the popup's content at the position specified via #setPosition
 			oPopup.open();

package/src/sap/m/MessageView.js

@@ -114,7 +114,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.119.1
+	 * @version 1.120.1
 	 *
 	 * @extends sap.ui.core.Control
 	 * @constructor

package/src/sap/m/MessageViewRenderer.js

@@ -16,15 +16,14 @@ sap.ui.define(["sap/ui/core/Core"], function (Core) {
 	MessageViewRenderer.render = function (oRm, oControl) {
 		var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
 
-		oRm.openStart("div", oControl);
+		oRm.openStart("section", oControl);
 		oRm.class(CSS_CLASS);
 		oRm.accessibilityState(oControl, {
-			role: "region",
 			label: oResourceBundle.getText("MESSAGE_VIEW_ARIA_LABEL")
 		});
 		oRm.openEnd();
 		oRm.renderControl(oControl._navContainer);
-		oRm.close("div");
+		oRm.close("section");
 	};
 
 	return MessageViewRenderer;

package/src/sap/m/MultiComboBox.js

@@ -145,7 +145,7 @@ function(
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @extends sap.m.ComboBoxBase

package/src/sap/m/MultiEditField.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/core/XMLComposite", "./library", "sap/ui/core/Item"], fun
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 * @experimental since 1.52
 	 * @since 1.52.0
 	 * @alias sap.m.MultiEditField

package/src/sap/m/MultiInput.js

@@ -107,7 +107,7 @@ function(
 	* @implements sap.ui.core.ISemanticFormContent
 	*
 	* @author SAP SE
-	* @version 1.119.1
+	* @version 1.120.1
 	*
 	* @constructor
 	* @public
@@ -1072,7 +1072,7 @@ function(
 			bNewFocusIsInSuggestionPopup = false,
 			bNewFocusIsInTokenizer = false,
 			bNewFocusIsInMultiInput = this.getDomRef() && containsOrEquals(this.getDomRef(), document.activeElement),
-			bFocusedOut = !bNewFocusIsInSuggestionPopup && oEvent.relatedControlId !== this.getId() && !bNewFocusIsInTokenizer,
+			bFocusedOut,
 			oRelatedControlDomRef,
 			bFocusIsInSelectedItemPopup;
 
@@ -1097,6 +1097,8 @@ function(
 			return;
 		}
 
+		bFocusedOut = !bNewFocusIsInSuggestionPopup && oEvent.relatedControlId !== this.getId() && !bNewFocusIsInTokenizer;
+
 		if (bFocusedOut && ((this.isMobileDevice() && !this.getShowSuggestion()) || !this.isMobileDevice())) {
 			this._validateCurrentText(true);
 		}

package/src/sap/m/NavContainer.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public
@@ -1915,9 +1915,10 @@ sap.ui.define([
 	 * @since 1.91
 	 */
 	NavContainer.prototype.showPlaceholder = function(mSettings) {
-		var pLoaded;
+		var pLoaded,
+			Placeholder = sap.ui.require("sap/ui/core/Placeholder");
 
-		if (!Configuration.getPlaceholder()) {
+		if (!Placeholder || !Placeholder.isEnabled()) {
 			return;
 		}
 

package/src/sap/m/NewsContent.js

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

package/src/sap/m/NotificationList.js

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

package/src/sap/m/NotificationListBase.js

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

package/src/sap/m/NotificationListGroup.js

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

package/src/sap/m/NotificationListItem.js

@@ -67,7 +67,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/NumericContent.js

@@ -13,8 +13,11 @@ sap.ui.define([
 	"./NumericContentRenderer",
 	"sap/ui/events/KeyCodes",
 	"sap/base/util/deepEqual",
-	"sap/ui/core/Configuration"
-], function (library, Control, IconPool, ResizeHandler, Image, NumericContentRenderer, KeyCodes, deepEqual, Configuration) {
+	"sap/ui/core/Configuration",
+	"sap/ui/core/Core",
+	"sap/ui/core/Lib",
+	"sap/ui/core/Theming"
+], function (library, Control, IconPool, ResizeHandler, Image, NumericContentRenderer, KeyCodes, deepEqual, Configuration, Core, CoreLib, Theming) {
 	"use strict";
 
 	var LANG_MAP = { // keys are compared in lowercase
@@ -108,7 +111,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 * @since 1.34
 	 *
 	 * @public
@@ -218,9 +221,9 @@ sap.ui.define([
 	/* --- Lifecycle methods --- */
 
 	NumericContent.prototype.init = function () {
-		this._rb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		this._rb = CoreLib.getResourceBundleFor("sap.m");
 		this.setTooltip("{AltText}");
-		sap.ui.getCore().attachInit(this._registerResizeHandler.bind(this));
+		Core.ready(this._registerResizeHandler.bind(this));
 	};
 
 	NumericContent.prototype._getParentTile = function () {
@@ -283,11 +286,7 @@ sap.ui.define([
 		this.$().on("mouseenter", this._addTooltip.bind(this));
 		this.$().on("mouseleave", this._removeTooltip.bind(this));
 
-		if (!sap.ui.getCore().isThemeApplied()) {
-			sap.ui.getCore().attachThemeChanged(this._checkIfIconFits, this);
-		} else {
-			this._checkIfIconFits();
-		}
+		Theming.attachApplied(this._checkIfIconFits.bind(this));
 	};
 
 	/**

package/src/sap/m/NumericContentRenderer.js

@@ -5,11 +5,12 @@
  */
 
 sap.ui.define([
-	"sap/m/library"
-], function (library) {
+	"sap/m/library",
+	"sap/ui/core/Lib"
+], function (library, CoreLib) {
 	"use strict";
 
-	var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+	var oResourceBundle = CoreLib.getResourceBundleFor("sap.m");
 
 	var DeviationIndicator = library.DeviationIndicator,
 		LoadState = library.LoadState,
@@ -50,7 +51,7 @@ sap.ui.define([
 			oRm.class("sapMNCAnimation");
 		}
 		if (oControl.getWidth()) {
-			oRm.style("width", oControl.getSize());
+			oRm.style("width", oControl.getWidth());
 
 		}
 		oRm.class("sapMNC");

package/src/sap/m/NumericInput.js

@@ -38,7 +38,7 @@ function(
 	 * @extends sap.m.Input
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/ObjectAttribute.js

@@ -43,7 +43,7 @@ function(library, Control, coreLibrary, Text, Element, KeyCodes, ObjectAttribute
 	 * <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.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectHeader.js

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

package/src/sap/m/ObjectIdentifier.js

@@ -54,7 +54,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.119.1
+	 * @version 1.120.1
 	 *
 	 * @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.119.1
+		 * @version 1.120.1
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ObjectMarker.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectNumber.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ObjectStatus.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public
@@ -136,8 +136,10 @@ sap.ui.define([
 
 				/**
 				 * Association to controls / ids which label this control (see WAI-ARIA attribute aria-labelledby).
+				 *
+				 * <b>Note:</b> The additional labelling text will take effect only if <code>active</code> property is set to <code>true</code>.
 				 */
-				 ariaLabelledBy: {type: "sap.ui.core.Control", multiple: true, singularName: "ariaLabelledBy"}
+				ariaLabelledBy: {type: "sap.ui.core.Control", multiple: true, singularName: "ariaLabelledBy"}
 			},
 			events : {
 
@@ -351,10 +353,6 @@ sap.ui.define([
 			sResult += sId + "-statusIcon ";
 		}
 
-		if (this.getState() !== ValueState.None) {
-			sResult += sId + "-state ";
-		}
-
 		return sResult.trim();
 	};