@openui5/sap.m 1.120.6 → 1.121.0

package/src/sap/m/ObjectAttributeRenderer.js

@@ -3,8 +3,8 @@
  * (c) Copyright 2009-2024 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/Configuration"],
-	function(coreLibrary, Configuration) {
+sap.ui.define(["sap/base/i18n/Localization", "sap/ui/core/library", "sap/ui/core/Locale"],
+	function(Localization, coreLibrary, Locale) {
 	"use strict";
 
 
@@ -112,7 +112,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Configuration"],
 		oRm.openStart("span", oOA.getId() + "-colon");
 		oRm.class("sapMObjectAttributeColon");
 		oRm.openEnd();
-		if (Configuration.getLocale().getLanguage().toLowerCase() === "fr") {
+		if (new Locale(Localization.getLanguageTag()).getLanguage().toLowerCase() === "fr") {
 			sColon = " " + sColon;
 		}
 		oRm.text(sColon);

package/src/sap/m/ObjectHeader.js

@@ -7,9 +7,12 @@
 // Provides control sap.m.ObjectHeader.
 sap.ui.define([
 	'./library',
+	"sap/base/i18n/Localization",
 	'sap/ui/core/Control',
 	'sap/ui/core/IconPool',
+	"sap/ui/core/Lib",
 	'sap/ui/core/library',
+	"sap/ui/core/RenderManager",
 	'sap/ui/core/util/ResponsivePaddingsEnablement',
 	'sap/ui/Device',
 	'sap/m/Text',
@@ -18,23 +21,24 @@ sap.ui.define([
 	'./ObjectMarker',
 	'./ObjectNumber',
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/Configuration",
 	"sap/m/ImageHelper"
 ],
 	function(
 		library,
+		Localization,
 		Control,
 		IconPool,
+		Library,
 		coreLibrary,
+		RenderManager,
 		ResponsivePaddingsEnablement,
 		Device,
 		Text,
 		KeyCodes,
 		ObjectHeaderRenderer,
-    ObjectMarker,
-    ObjectNumber,
+		ObjectMarker,
+		ObjectNumber,
 		jQuery,
-		Configuration,
 		ImageHelper
 	) {
 	"use strict";
@@ -82,7 +86,7 @@ sap.ui.define([
 	 * <code>sapUiResponsivePadding--header</code>.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -484,7 +488,7 @@ sap.ui.define([
 	 * @returns {Object} the resource bundle object
 	 */
 	ObjectHeader._getResourceBundle = function () {
-		return sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		return Library.getResourceBundleFor("sap.m");
 	};
 
 	ResponsivePaddingsEnablement.call(ObjectHeader.prototype, {
@@ -725,7 +729,7 @@ sap.ui.define([
 	 * Sets the alternative text of the <code>ObjectHeader</code> icon.
 	 * @override
 	 * @public
-	 * @param {boolean} sIconAlt the alternative icon text
+	 * @param {string} sIconAlt the alternative icon text
 	 * @returns {this} this pointer for chaining
 	 */
 	ObjectHeader.prototype.setIconAlt = function(sIconAlt) {
@@ -1005,7 +1009,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ObjectHeader.prototype._rerenderTitle = function(nCutLen) {
-		var oRm = sap.ui.getCore().createRenderManager();
+		var oRm = new RenderManager().getInterface();
 		this.getRenderer()._rerenderTitle(oRm, this, nCutLen);
 		oRm.destroy();
 	};
@@ -1016,7 +1020,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ObjectHeader.prototype._rerenderStates = function() {
-		var oRm = sap.ui.getCore().createRenderManager();
+		var oRm = new RenderManager().getInterface();
 		this.getRenderer()._rerenderResponsiveStates(oRm, this);
 		oRm.destroy();
 	};
@@ -1107,7 +1111,7 @@ sap.ui.define([
 
 	ObjectHeader.prototype.onAfterRendering = function() {
 		var oObjectNumber = this.getAggregation("_objectNumber");
-		var bPageRTL = Configuration.getRTL();
+		var bPageRTL = Localization.getRTL();
 		var $titleArrow = this.$("titleArrow");
 
 		$titleArrow.attr("role", "button");
@@ -1162,7 +1166,7 @@ sap.ui.define([
 	ObjectHeader.prototype._adjustNumberDiv = function() {
 		var sId = this.getId();
 		var oObjectNumber = this.getAggregation("_objectNumber");
-		var bPageRTL = Configuration.getRTL();
+		var bPageRTL = Localization.getRTL();
 
 		if (oObjectNumber && oObjectNumber.getNumber()) {
 			var $numberDiv = jQuery(document.getElementById(sId + "-number"));

package/src/sap/m/ObjectHeaderRenderer.js

@@ -4,6 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
+	"sap/base/i18n/Localization",
 	'sap/ui/core/Control',
 	'sap/ui/core/library',
 	'sap/m/library',
@@ -12,10 +13,9 @@ sap.ui.define([
 	'sap/m/Link',
 	'sap/m/Text',
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/util/defaultLinkTypes",
-	"sap/ui/core/Configuration"
+	"sap/ui/util/defaultLinkTypes"
 ],
-	function(Control, coreLibrary, library, Device, Log, Link, Text, jQuery, defaultLinkTypes, Configuration) {
+	function(Localization, Control, coreLibrary, library, Device, Log, Link, Text, jQuery, defaultLinkTypes) {
 	"use strict";
 
 
@@ -1077,7 +1077,7 @@ sap.ui.define([
 	ObjectHeaderRenderer._renderResponsiveMarkers = function(oRM, oControl) {
 		var aMarkers = [],
 			sTextDir = oControl.getTitleTextDirection(),
-			bPageRTL = Configuration.getRTL();
+			bPageRTL = Localization.getRTL();
 
 		// load markers based on control state
 		aMarkers = oControl._getVisibleMarkers();

package/src/sap/m/ObjectIdentifier.js

@@ -10,29 +10,31 @@ sap.ui.define([
 	'./Link',
 	'./Text',
 	'sap/ui/core/Control',
+	"sap/ui/core/ControlBehavior",
 	'sap/ui/core/IconPool',
 	'sap/ui/core/InvisibleText',
+	"sap/ui/core/Lib",
 	'sap/ui/core/library',
 	'sap/ui/Device',
 	'sap/ui/base/ManagedObject',
 	'./ObjectIdentifierRenderer',
-	"sap/ui/events/KeyCodes",
-	"sap/ui/core/Configuration"
+	"sap/ui/events/KeyCodes"
 ],
 function(
 	library,
 	Link,
 	Text,
 	Control,
+	ControlBehavior,
 	IconPool,
 	InvisibleText,
+	Library,
 	coreLibrary,
 	Device,
 	ManagedObject,
 	ObjectIdentifierRenderer,
-	KeyCodes,
-	Configuration
-	) {
+	KeyCodes
+) {
 	"use strict";
 
 
@@ -54,7 +56,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.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -172,9 +174,9 @@ function(
 	 * @private
 	 */
 	ObjectIdentifier.prototype.init = function() {
-		var oLibraryResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oLibraryResourceBundle = Library.getResourceBundleFor("sap.m");
 
-		if (Configuration.getAccessibility()) {
+		if (ControlBehavior.isAccessibilityEnabled()) {
 			ObjectIdentifier.OI_ARIA_ROLE = oLibraryResourceBundle.getText("OI_ARIA_ROLE");
 		}
 	};
@@ -303,6 +305,33 @@ function(
 		return oTitleControl;
 	};
 
+	/**
+	 * Sets title control.
+	 *
+	 * Possible controls are Link, SmartLink, Text.
+	 * @param {sap.ui.core.Control} oTitleControl the control placed as title.
+	 * @returns {sap.m.ObjectIdentifier} <code>this</code> for chaining
+	 * @private
+	 * @ui5-restricted sap.ui.comp
+	 */
+	ObjectIdentifier.prototype.setTitleControl = function(oTitleControl) {
+		this.setAggregation("_titleControl", oTitleControl);
+
+		return this;
+	};
+
+	/**
+	 * Returns the title control.
+	 *
+	 * Possible controls are Link, SmartLink, Text.
+	 * @returns {sap.ui.core.Control} oTitleControl the control placed as title.
+	 * @private
+	 * @ui5-restricted sap.ui.comp
+	 */
+	ObjectIdentifier.prototype.getTitleControl = function(oTitleControl) {
+		return this._getTitleControl();
+	};
+
 	/**
 	 * Lazy loads _textControl aggregation.
 	 * @returns {sap.ui.core.Control} The control for the text

package/src/sap/m/ObjectIdentifierRenderer.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['./library', 'sap/ui/core/Core'],
-	function(library, Core) {
+sap.ui.define(['./library', "sap/ui/core/Lib"],
+	function(library, Library) {
 	"use strict";
 
 
@@ -21,7 +21,7 @@ sap.ui.define(['./library', 'sap/ui/core/Core'],
 	var EmptyIndicatorMode = library.EmptyIndicatorMode;
 
 	// shortcut for library resource bundle
-	var oRb = Core.getLibraryResourceBundle("sap.m");
+	var oRb = Library.getResourceBundleFor("sap.m");
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.

package/src/sap/m/ObjectListItem.js

@@ -6,6 +6,7 @@
 
 // Provides control sap.m.ObjectListItem.
 sap.ui.define([
+	"sap/base/i18n/Localization",
 	'sap/ui/base/ManagedObjectObserver',
 	'./ListItemBase',
 	'./library',
@@ -15,10 +16,10 @@ sap.ui.define([
 	'./ObjectMarker',
 	'./Text',
 	'./ObjectListItemRenderer',
-	'sap/ui/core/Configuration',
 	"sap/m/ImageHelper"
 ],
 function(
+	Localization,
 	ManagedObjectObserver,
 	ListItemBase,
 	library,
@@ -28,7 +29,6 @@ function(
 	ObjectMarker,
 	Text,
 	ObjectListItemRenderer,
-	Configuration,
 	ImageHelper
 	) {
 		"use strict";
@@ -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.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public
@@ -244,7 +244,7 @@ function(
 
 		ObjectListItem.prototype.onAfterRendering = function() {
 			var oObjectNumber = this.getAggregation("_objectNumber"),
-				bPageRTL = Configuration.getRTL(),
+				bPageRTL = Localization.getRTL(),
 				sTextAlign = bPageRTL ? TextAlign.Left : TextAlign.Right;
 
 			if (oObjectNumber && oObjectNumber.getNumber()) { // adjust alignment according the design specification

package/src/sap/m/ObjectMarker.js

@@ -7,6 +7,7 @@
 // Provides control sap.m.ObjectMarker.
 sap.ui.define([
 	"sap/ui/core/Control",
+	"sap/ui/core/Lib",
 	"sap/ui/core/Renderer",
 	"sap/ui/Device",
 	"sap/m/library",
@@ -19,6 +20,7 @@ sap.ui.define([
 	"./ObjectMarkerRenderer"
 ], function(
 	Control,
+	Library,
 	Renderer,
 	Device,
 	library,
@@ -62,7 +64,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -309,7 +311,7 @@ sap.ui.define([
 		this._cleanup();
 	};
 
-	/**
+	/*
 	 * Intercepts <code>attachPress</code> to be able to re-render.
 	 * If <code>press</code> event is attached and the control is rendered as text, than the control will be
 	 * re-rendered as link.
@@ -331,7 +333,7 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
+	/*
 	 * Intercepts <code>detachPress</code> to be able to re-render.
 	 * If <code>press</code> event is detached and the control is rendered as a link, than the control will be
 	 * re-rendered as a text.
@@ -452,7 +454,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ObjectMarker.prototype._getMarkerText = function (oType, sType, sAdditionalInfo) {
-		var oRB = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oRB = Library.getResourceBundleFor("sap.m");
 
 		switch (sType) {
 			case "LockedBy":

package/src/sap/m/ObjectNumber.js

@@ -8,12 +8,13 @@
 sap.ui.define([
 	'./library',
 	'sap/ui/core/Control',
+	"sap/ui/core/Lib",
 	'sap/ui/core/library',
 	"sap/ui/core/LabelEnablement",
 	"sap/ui/events/KeyCodes",
 	'./ObjectNumberRenderer'
 ],
-	function(library, Control, coreLibrary, LabelEnablement, KeyCodes, ObjectNumberRenderer) {
+	function(library, Control, Library, coreLibrary, LabelEnablement, KeyCodes, ObjectNumberRenderer) {
 	"use strict";
 
 
@@ -48,7 +49,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IFormContent
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -153,7 +154,7 @@ sap.ui.define([
 	ObjectNumber.prototype._getStateText = function() {
 
 		var sState = this.getState(),
-			oRB = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+			oRB = Library.getResourceBundleFor("sap.m");
 
 			return oRB.getText("OBJECTNUMBER_ARIA_VALUE_STATE_" + sState.toUpperCase(), [], true);
 	};

package/src/sap/m/ObjectNumberRenderer.js

@@ -5,12 +5,12 @@
  */
 
 sap.ui.define([
+	"sap/ui/core/Lib",
 	'sap/ui/core/Renderer',
 	'sap/ui/core/library',
-	'./library',
-	'sap/ui/core/Core'
+	'./library'
 ],
-	function(Renderer, coreLibrary, library, oCore) {
+	function(Library, Renderer, coreLibrary, library) {
 	"use strict";
 
 
@@ -169,7 +169,7 @@ sap.ui.define([
 		oRm.openStart("span", oON.getId() + "-emphasized");
 		oRm.class("sapUiPseudoInvisibleText");
 		oRm.openEnd();
-		oRm.text(oCore.getLibraryResourceBundle("sap.m").getText("OBJECTNUMBER_EMPHASIZED"));
+		oRm.text(Library.getResourceBundleFor("sap.m").getText("OBJECTNUMBER_EMPHASIZED"));
 		oRm.close("span");
 	};
 
@@ -190,7 +190,7 @@ sap.ui.define([
 		oRm.openStart("span", oON.getId() + "-roledescription");
 		oRm.class("sapUiPseudoInvisibleText");
 		oRm.openEnd();
-		oRm.text(oCore.getLibraryResourceBundle("sap.m").getText("OBJECTNUMBER_NAME"));
+		oRm.text(Library.getResourceBundleFor("sap.m").getText("OBJECTNUMBER_NAME"));
 		oRm.close("span");
 	};
 
@@ -201,7 +201,7 @@ sap.ui.define([
 	 * @param {sap.m.ObjectNumber} oON An object representation of the control that should be rendered.
 	 */
 	ObjectNumberRenderer.renderEmptyIndicator = function(oRm, oON) {
-		var oRb = oCore.getLibraryResourceBundle("sap.m");
+		var oRb = Library.getResourceBundleFor("sap.m");
 		oRm.openStart("span");
 			oRm.class("sapMEmptyIndicator");
 			if (oON.getEmptyIndicatorMode() === EmptyIndicatorMode.Auto) {

package/src/sap/m/ObjectStatus.js

@@ -8,16 +8,16 @@
 sap.ui.define([
 	'./library',
 	'sap/ui/core/Control',
+	"sap/ui/core/Lib",
 	'sap/ui/core/ValueStateSupport',
 	'sap/ui/core/IndicationColorSupport',
 	'sap/ui/core/library',
 	'sap/ui/base/DataType',
 	'./ObjectStatusRenderer',
 	'sap/m/ImageHelper',
-	'sap/ui/core/LabelEnablement',
-	'sap/ui/core/InvisibleText'
+	'sap/ui/core/LabelEnablement'
 ],
-	function(library, Control, ValueStateSupport, IndicationColorSupport, coreLibrary, DataType, ObjectStatusRenderer, ImageHelper, LabelEnablement, InvisibleText) {
+	function(library, Control, Library, ValueStateSupport, IndicationColorSupport, coreLibrary, DataType, ObjectStatusRenderer, ImageHelper, LabelEnablement) {
 	"use strict";
 
 
@@ -45,8 +45,13 @@ sap.ui.define([
 
 	 *
 	 * @extends sap.ui.core.Control
-	 * @implements sap.ui.core.IFormContent
-	 * @version 1.120.6
+	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
+	 * @version 1.121.0
+	 *
+	 * @borrows sap.ui.core.ISemanticFormContent.getFormFormattedValue as #getFormFormattedValue
+	 * @borrows sap.ui.core.ISemanticFormContent.getFormValueProperty as #getFormValueProperty
+	 * @borrows sap.ui.core.ISemanticFormContent.getFormObservingProperties as #getFormObservingProperties
+	 * @borrows sap.ui.core.ISemanticFormContent.getFormRenderAsControl as #getFormRenderAsControl
 	 *
 	 * @constructor
 	 * @public
@@ -56,7 +61,7 @@ sap.ui.define([
 	var ObjectStatus = Control.extend("sap.m.ObjectStatus", /** @lends sap.m.ObjectStatus.prototype */ {
 		metadata : {
 
-			interfaces : ["sap.ui.core.IFormContent"],
+			interfaces : ["sap.ui.core.IFormContent", "sap.ui.core.ISemanticFormContent"],
 			library : "sap.m",
 			designtime: "sap/m/designtime/ObjectStatus.designtime",
 			properties : {
@@ -182,10 +187,6 @@ sap.ui.define([
 			this._oImageControl.destroy();
 			this._oImageControl = null;
 		}
-		if (this._oInvisibleStateText) {
-			this._oInvisibleStateText.destroy();
-			this._oInvisibleStateText = null;
-		}
 	};
 
 	/**
@@ -200,12 +201,12 @@ sap.ui.define([
 			mProperties = {
 				src : this.getIcon(),
 				densityAware : this.getIconDensityAware(),
-				useIconTooltip : false
+				useIconTooltip : false,
+				decorative: !this.getActive()
 			};
 
 		if (bIsIconOnly) {
-			mProperties.decorative = false;
-			mProperties.alt = sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("OBJECT_STATUS_ICON");
+			mProperties.alt = Library.getResourceBundleFor("sap.m").getText("OBJECT_STATUS_ICON");
 		}
 
 		this._oImageControl = ImageHelper.getImageControl(sImgId, this._oImageControl, this, mProperties);
@@ -317,7 +318,7 @@ sap.ui.define([
 		).trim();
 
 		sDescription = this._isActive()
-			? sDescription + (sDescription ? " " + sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("OBJECT_STATUS_ACTIVE") : "")
+			? sDescription + (sDescription ? " " + Library.getResourceBundleFor("sap.m").getText("OBJECT_STATUS_ACTIVE") : "")
 			: sDescription;
 
 		return { description: sDescription };
@@ -363,15 +364,20 @@ sap.ui.define([
 		return this._isActive() && (sSourceId === this.getId() + "-link" || sSourceId === this.getId() + "-text" || sSourceId === this.getId() + "-statusIcon" || sSourceId === this.getId() + "-icon");
 	};
 
-	ObjectStatus.prototype._fnInvisibleStateLabelFactory = function() {
-		if (!this._oInvisibleStateText) {
-			this._oInvisibleStateText = new InvisibleText({
-				id: this.getId() + "-state-text",
-				text: this._getStateText(this.getState())
-			}).toStatic();
-		}
+	ObjectStatus.prototype.getFormFormattedValue = function () {
+		return this.getText();
+	};
+
+	ObjectStatus.prototype.getFormValueProperty = function () {
+		return "text";
+	};
+
+	ObjectStatus.prototype.getFormObservingProperties = function() {
+		return ["text", "title"]; // title should not used inside Form as there is a Label
+	};
 
-		return this._oInvisibleStateText;
+	ObjectStatus.prototype.getFormRenderAsControl = function () {
+		return true;
 	};
 
 	return ObjectStatus;

package/src/sap/m/ObjectStatusRenderer.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
-	function(coreLibrary, library, oCore) {
+sap.ui.define(["sap/base/i18n/Localization", "sap/ui/core/Lib", 'sap/ui/core/library', './library'],
+	function(Localization, Library, coreLibrary, library) {
 	"use strict";
 
 
@@ -16,7 +16,7 @@ sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
 	var EmptyIndicatorMode = library.EmptyIndicatorMode;
 
 	// shortcut for library resource bundle
-	var oRb = oCore.getLibraryResourceBundle("sap.m");
+	var oRb = Library.getResourceBundleFor("sap.m");
 
 
 	/**
@@ -35,8 +35,6 @@ sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
 	 * @param {sap.m.ObjectStatus} oObjStatus An object representation of the control that should be rendered
 	 */
 	ObjectStatusRenderer.render = function(oRm, oObjStatus){
-		var sStatusTextId;
-
 		oRm.openStart("div", oObjStatus);
 
 		if (oObjStatus._isEmpty() && oObjStatus.getEmptyIndicatorMode() === EmptyIndicatorMode.Off) {
@@ -48,7 +46,7 @@ sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
 				sStateText = oObjStatus._getStateText(sState),
 				bInverted = oObjStatus.getInverted(),
 				sTextDir = oObjStatus.getTextDirection(),
-				bPageRTL = oCore.getConfiguration().getRTL(),
+				bPageRTL = Localization.getRTL(),
 				oAccAttributes = {},
 				sTooltip = oObjStatus.getTooltip_AsString();
 
@@ -70,7 +68,7 @@ sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
 				oRm.class("sapMObjStatusActive");
 				oRm.attr("tabindex", "0");
 				oAccAttributes.role = "button";
-				oAccAttributes.roledescription = oCore.getLibraryResourceBundle("sap.m").getText("OBJECT_STATUS_ACTIVE");
+				oAccAttributes.roledescription = Library.getResourceBundleFor("sap.m").getText("OBJECT_STATUS_ACTIVE");
 			}
 
 			var bTooltipAndAriaDescribedBy = sTooltip && oObjStatus.getAriaDescribedBy().length,
@@ -87,18 +85,6 @@ sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
 				};
 			}
 
-			if (sStateText) {
-				sStatusTextId = oObjStatus._fnInvisibleStateLabelFactory().getId();
-				if (oAccAttributes["describedby"]) {
-					oAccAttributes["describedby"].value += " " + sStatusTextId;
-				} else {
-					oAccAttributes["describedby"] = {
-						value: sStatusTextId,
-						append: true
-					};
-				}
-			}
-
 			if (oObjStatus._isActive()) {
 				oRm.accessibilityState(oObjStatus, oAccAttributes);
 			}
@@ -122,7 +108,7 @@ sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
 					oRm.attr("dir", sTextDir.toLowerCase());
 				}
 
-				oRm.attr("data-colon", oCore.getLibraryResourceBundle("sap.m").getText("LABEL_COLON"));
+				oRm.attr("data-colon", Library.getResourceBundleFor("sap.m").getText("LABEL_COLON"));
 
 				oRm.openEnd();
 				oRm.text(oObjStatus.getTitle());
@@ -135,6 +121,10 @@ sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
 				oRm.openEnd();
 			}
 
+			oRm.openStart("span", oObjStatus.getId() + "-wrapper");
+			oRm.class("sapMObjStatusWrapper");
+			oRm.openEnd();
+
 			if (oObjStatus.getIcon()) {
 				oRm.openStart("span", oObjStatus.getId() + "-statusIcon");
 				oRm.class("sapMObjStatusIcon");
@@ -161,8 +151,24 @@ sap.ui.define(['sap/ui/core/library', './library', 'sap/ui/core/Core'],
 				this.renderEmptyIndicator(oRm, oObjStatus);
 			}
 
+			oRm.close("span");
+
 			if (oObjStatus._isActive()) {
 				oRm.close("span");
+			} else {
+				oRm.openStart("span", oObjStatus.getId() + "-role");
+				oRm.class("sapUiPseudoInvisibleText");
+				oRm.openEnd();
+				oRm.text(Library.getResourceBundleFor("sap.m").getText("OBJECT_STATUS"));
+				oRm.close("span");
+			}
+
+			if (sStateText) {
+				oRm.openStart("span", oObjStatus.getId() + "-state-text");
+				oRm.class("sapUiPseudoInvisibleText");
+				oRm.openEnd();
+				oRm.text(sStateText);
+				oRm.close("span");
 			}
 		}
 

package/src/sap/m/OverflowToolbar.js

@@ -131,7 +131,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.Toolbar,sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -423,7 +423,7 @@ sap.ui.define([
 			$LastFocusableChildControl = this.$().lastFocusableDomRef();
 
 		if (this.sFocusedChildControlId) {
-			oFocusedChildControl = Element.registry.get(this.sFocusedChildControlId);
+			oFocusedChildControl = Element.getElementById(this.sFocusedChildControlId);
 		}
 
 		if (oFocusedChildControl && oFocusedChildControl.getDomRef()){