@openui5/sap.m 1.120.6 → 1.121.0

package/src/sap/m/ListBase.js

@@ -8,9 +8,9 @@
 sap.ui.define([
 	"sap/base/i18n/Localization",
 	"sap/ui/core/ControlBehavior",
+	"sap/ui/core/RenderManager",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/Device",
-	"sap/ui/core/Core",
 	"sap/ui/core/Control",
 	"sap/ui/core/Element",
 	"sap/ui/core/InvisibleText",
@@ -35,9 +35,9 @@ sap.ui.define([
 function(
 	Localization,
 	ControlBehavior,
+	RenderManager,
 	KeyCodes,
 	Device,
-	Core,
 	Control,
 	Element,
 	InvisibleText,
@@ -105,7 +105,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -905,22 +905,22 @@ function(
 	/**
 	 * Selects or deselects the given list item.
 	 *
-	 * @param {sap.m.ListItemBase} oListItem
-	 *         The list item whose selection to be changed. This parameter is mandatory.
-	 * @param {boolean} [bSelect=true]
-	 *         Sets selected status of the list item
-	 * @type this
+	 * @param {sap.m.ListItemBase} oListItem The list item whose selection is changed
+	 * @param {boolean} [bSelect=true] Sets selected status of the list item provided
+	 * @param {boolean} [bFireEvent=false] Determines whether the <code>selectionChange</code> event is fired by this method call (as of version 1.121)
+	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @public
 	 */
 	ListBase.prototype.setSelectedItem = function(oListItem, bSelect, bFireEvent) {
 		if (this.indexOfItem(oListItem) < 0) {
 			Log.warning("setSelectedItem is called without valid ListItem parameter on " + this);
-			return;
+			return this;
 		}
 		if (this._bSelectionMode) {
 			oListItem.setSelected((bSelect === undefined) ? true : !!bSelect);
 			bFireEvent && this._fireSelectionChangeEvent([oListItem]);
 		}
+		return this;
 	};
 
 
@@ -948,7 +948,7 @@ function(
 	 * @public
 	 */
 	ListBase.prototype.setSelectedItemById = function(sId, bSelect) {
-		var oListItem = Core.byId(sId);
+		var oListItem = Element.getElementById(sId);
 		return this.setSelectedItem(oListItem, bSelect);
 	};
 
@@ -995,17 +995,17 @@ function(
 	/**
 	 * Removes visible selections of the current selection mode.
 	 *
-	 * @param {boolean} bAll
-	 *         Since version 1.16.3. This control keeps old selections after filter or sorting. Set this parameter "true" to remove all selections.
-	 * @type this
+	 * @param {boolean} [bAll=false] If the <code>rememberSelection</code> property is set to <code>true</code>, this control preserves selections after filtering or sorting. Set this parameter to <code>true</code> to remove all selections (as of version 1.16)
+	 * @param {boolean} [bFireEvent=false] Determines whether the <code>selectionChange</code> event is fired by this method call (as of version 1.121)
+	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @public
 	 */
-	ListBase.prototype.removeSelections = function(bAll, bFireEvent, bDetectBinding) {
+	ListBase.prototype.removeSelections = function(bAll, bFireEvent, _bDetectBinding) {
 		var aChangedListItems = [];
 		this._oSelectedItem = null;
 		if (bAll) {
 			this._aSelectedPaths = [];
-			if (!bDetectBinding) {
+			if (!_bDetectBinding) {
 				const oBinding = this.getBinding("items");
 				const aContexts = oBinding?.getAllCurrentContexts?.() || [];
 				aContexts[0]?.setSelected && aContexts.forEach((oContext) => oContext.setSelected(false));
@@ -1017,7 +1017,7 @@ function(
 			}
 
 			// if the selected property is two-way bound then we do not need to update the selection
-			if (bDetectBinding && oItem.isSelectedBoundTwoWay()) {
+			if (_bDetectBinding && oItem.isSelectedBoundTwoWay()) {
 				return;
 			}
 
@@ -1039,7 +1039,8 @@ function(
 	 * <b>Note:</b> If <code>growing</code> is enabled, only the visible items in the list are selected.
 	 * Since version 1.93, the items are not selected if <code>getMultiSelectMode=ClearAll</code>.
 	 *
-	 * @type this
+	 * @param {boolean} [bFireEvent=false] Determines whether the <code>selectionChange</code> event is fired by this method call (as of version 1.121)
+	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @public
 	 * @since 1.16
 	 */
@@ -1262,6 +1263,14 @@ function(
 		this._updateSelectedPaths(oListItem, bSelected);
 	};
 
+	// this gets called after the selected property of the ListItem is changed
+	ListBase.prototype.onItemAfterSelectedChange = function(oListItem, bSelected) {
+		this.fireEvent("itemSelectedChange", {
+			listItem: oListItem,
+			selected: bSelected
+		});
+	};
+
 	/*
 	 * Returns items container DOM reference
 	 * @protected
@@ -1418,6 +1427,12 @@ function(
 			if (this.getEnableBusyIndicator()) {
 				// only call the setBusy method if enableBusyIndicator=true
 				this.setBusy(false, "listUl");
+
+				// while the control is busy the focus events are blocked by the BlockLayer
+				const oNavigationRoot = this.getNavigationRoot();
+				if (document.activeElement == oNavigationRoot) {
+					jQuery(oNavigationRoot).trigger("focus");
+				}
 			}
 		}
 	};
@@ -1757,7 +1772,7 @@ function(
 		// render swipe content into swipe container if needed
 		if (this._bRerenderSwipeContent) {
 			this._bRerenderSwipeContent = false;
-			var rm = Core.createRenderManager();
+			var rm = new RenderManager().getInterface();
 			rm.render(this.getSwipeContent(), $container.empty()[0]);
 			rm.destroy();
 		}
@@ -2098,11 +2113,11 @@ function(
 	};
 
 	// this gets called when the focus is on the item or its content
-	ListBase.prototype.onItemFocusIn = function(oItem, oFocusedControl) {
+	ListBase.prototype.onItemFocusIn = function(oItem, oFocusedControl, oEvent) {
 		// focus and scroll handling for sticky elements
 		this._handleStickyItemFocus(oItem.getDomRef());
 
-		if (oItem !== oFocusedControl ||
+		if (oItem !== oFocusedControl || oEvent.isMarked("contentAnnouncementGenerated") ||
 			!ControlBehavior.isAccessibilityEnabled()) {
 			return;
 		}
@@ -2130,9 +2145,13 @@ function(
 	};
 
 	ListBase.prototype.onItemFocusOut = function(oItem) {
-		var oInvisibleText = ListBase.getInvisibleText(),
-			$ItemDomRef = jQuery(oItem.getDomRef());
-		$ItemDomRef.removeAriaLabelledBy(oInvisibleText.getId());
+		this.removeInvisibleTextAssociation(oItem.getDomRef());
+	};
+
+	ListBase.prototype.removeInvisibleTextAssociation = function(oDomRef) {
+		const oInvisibleText = ListBase.getInvisibleText(),
+			$FocusedItem = jQuery(oDomRef || document.activeElement);
+		$FocusedItem.removeAriaLabelledBy(oInvisibleText.getId());
 	};
 
 	ListBase.prototype.updateInvisibleText = function(sText, oItemDomRef, bPrepend) {
@@ -2555,7 +2574,7 @@ function(
 
 		var bExecuteDefault = this.fireBeforeOpenContextMenu({
 			listItem: oLI,
-			column: Core.byId(jQuery(oEvent.target).closest(".sapMListTblCell", this.getNavigationRoot()).attr("data-sap-ui-column"))
+			column: Element.getElementById(jQuery(oEvent.target).closest(".sapMListTblCell", this.getNavigationRoot()).attr("data-sap-ui-column"))
 		});
 		if (bExecuteDefault) {
 			oEvent.setMarked();

package/src/sap/m/ListItemBase.js

@@ -75,7 +75,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -425,11 +425,9 @@ function(
 
 		if (sType == ListItemType.Navigation) {
 			aOutput.push(oBundle.getText("LIST_ITEM_NAVIGATION"));
-		} else {
-			if (sType == ListItemType.Active || sType == ListItemType.DetailAndActive) {
+		} else if (sType == ListItemType.Active || sType == ListItemType.DetailAndActive) {
 				aOutput.push(oBundle.getText("LIST_ITEM_ACTIVE"));
 			}
-		}
 
 		var sGroupAnnouncement = this.getGroupAnnouncement() || "";
 		if (sGroupAnnouncement) {
@@ -820,6 +818,9 @@ function(
 		// set the property and do not invalidate
 		this.setProperty("selected", bSelected, true);
 
+		// let the list know the selected property is changed
+		this.informList("AfterSelectedChange", bSelected);
+
 		return this;
 	};
 
@@ -1232,12 +1233,12 @@ function(
 
 	// handle propagated focus to make the item row focusable
 	ListItemBase.prototype.onfocusin = function(oEvent) {
-		var oList = this.getList();
+		const oList = this.getList();
 		if (!oList || oEvent.isMarked()) {
 			return;
 		}
 
-		this.informList("FocusIn", oEvent.srcControl);
+		this.informList("FocusIn", oEvent.srcControl, oEvent);
 		oEvent.setMarked();
 	};
 

package/src/sap/m/ListItemBaseRenderer.js

@@ -328,6 +328,9 @@ sap.ui.define(["sap/ui/core/ControlBehavior", "./library", "sap/ui/Device", "sap
 			if (oLI.isGroupHeader()) {
 				bPositionNeeded = false;
 				mAccessibilityState.role = "group";
+				if (oLI.getTitle) {
+					mAccessibilityState.label = oLI.getTitle();
+				}
 				mAccessibilityState.roledescription = Library.getResourceBundleFor("sap.m").getText("LIST_ITEM_GROUP_HEADER");
 				var aGroupedItems = oLI.getGroupedItems();
 				if (aGroupedItems && aGroupedItems.length) {

package/src/sap/m/MaskEnabler.js

@@ -5,18 +5,20 @@
  */
 
 sap.ui.define([
+	"sap/base/i18n/Localization",
 	'sap/ui/core/Control',
 	'./InputBase',
 	'sap/ui/Device',
+	"sap/ui/core/Lib",
 	'sap/ui/core/library',
 	'sap/ui/core/IconPool',
 	"sap/ui/events/KeyCodes",
 	"sap/base/Log",
 	"sap/ui/thirdparty/jquery",
 	"sap/m/MaskInputRule",
-	"sap/ui/core/Configuration",
-	"sap/ui/dom/jquery/cursorPos" // jQuery Plugin "cursorPos"
-], function(Control, InputBase, Device, coreLibrary, IconPool, KeyCodes, Log, jQuery, MaskInputRule, Configuration) {
+	// jQuery Plugin "cursorPos"
+	"sap/ui/dom/jquery/cursorPos"
+], function(Localization, Control, InputBase, Device, Library, coreLibrary, IconPool, KeyCodes, Log, jQuery, MaskInputRule) {
 	"use strict";
 
 	// shortcut for sap.ui.core.TextDirection
@@ -26,7 +28,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.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @mixin
 	 * @alias sap.m.MaskEnabler
@@ -56,7 +58,7 @@ sap.ui.define([
 			// Skips setup of mask variables on every iteration when initializing default rules
 			this._bSkipSetupMaskVariables = null;
 
-			this._oRb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+			this._oRb = Library.getResourceBundleFor("sap.m");
 
 			this._setDefaultRules();
 			this._setupMaskVariables();
@@ -1428,7 +1430,7 @@ sap.ui.define([
 		 * @returns {boolean} Whether the current control is in RTL mode
 		 */
 		this._isRtlMode = function () {
-			return Configuration.getRTL() || (this.getTextDirection() === TextDirection.RTL);
+			return Localization.getRTL() || (this.getTextDirection() === TextDirection.RTL);
 		};
 
 		/**

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.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MaskInputRenderer.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['sap/ui/core/Renderer', './InputBaseRenderer'], function(Renderer, InputBaseRenderer) {
+sap.ui.define(["sap/ui/core/Lib", 'sap/ui/core/Renderer', './InputBaseRenderer'], function(Library, Renderer, InputBaseRenderer) {
 	"use strict";
 
 	/**
@@ -23,7 +23,7 @@ sap.ui.define(['sap/ui/core/Renderer', './InputBaseRenderer'], function(Renderer
 	 * @returns {Object}
 	 */
 	MaskInputRenderer.getAccessibilityState = function (oControl) {
-		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
+		var oResourceBundle = Library.getResourceBundleFor("sap.m"),
 			sCustomRole = oResourceBundle.getText("MASKINPUT_ROLE_DESCRIPTION"),
 			mAccessibilityState = InputBaseRenderer.getAccessibilityState.apply(this, arguments);
 

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.120.6
+	 * @version 1.121.0
 	 * @public
 	 * @constructor
 	 * @since 1.34.0

package/src/sap/m/Menu.js

@@ -14,6 +14,7 @@ sap.ui.define([
 	'./List',
 	'./Page',
 	'./MenuListItem',
+	"sap/ui/core/Lib",
 	'sap/ui/unified/Menu',
 	'sap/ui/unified/MenuItem',
 	'sap/ui/Device',
@@ -31,6 +32,7 @@ sap.ui.define([
 		List,
 		Page,
 		MenuListItem,
+		Library,
 		UfdMenu,
 		UfdMenuItem,
 		Device,
@@ -70,7 +72,7 @@ sap.ui.define([
 		 * @implements sap.ui.core.IContextMenu
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public
@@ -376,7 +378,7 @@ sap.ui.define([
 		};
 
 		Menu.prototype._initCloseButton = function() {
-			var oRB = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+			var oRB = Library.getResourceBundleFor("sap.m");
 
 			return new Button({
 				text: oRB.getText("MENU_CLOSE"),
@@ -400,7 +402,7 @@ sap.ui.define([
 		 * @private
 		 */
 		Menu.prototype._getNavContainer = function() {
-			return sap.ui.getCore().byId(this._navContainerId);
+			return Element.getElementById(this._navContainerId);
 		};
 
 		Menu.prototype._initAllPages = function() {
@@ -443,7 +445,7 @@ sap.ui.define([
 
 		Menu.prototype._handleListItemPress = function(oEvent) {
 			var oListItem = oEvent.getParameter("listItem"),
-				oMenuItem = sap.ui.getCore().byId(oListItem.getMenuItem()),
+				oMenuItem = Element.getElementById(oListItem.getMenuItem()),
 				pageId = oMenuItem._getVisualChild();
 
 			if (pageId) {
@@ -463,7 +465,7 @@ sap.ui.define([
 		 */
 		Menu.prototype._setBackButtonTooltipForPageWithParent = function(oParent, oPage) {
 			var oParentParent = oParent.getParent(),
-				oRb = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
+				oRb = Library.getResourceBundleFor("sap.m"),
 				sParentPageTitle;
 
 			sParentPageTitle = oParentParent instanceof Menu ? oParentParent.getTitle() : oParentParent.getText();
@@ -473,7 +475,7 @@ sap.ui.define([
 
 		Menu.prototype._createMenuListItemFromItem = function(oItem) {
 			var sMenuListItemId = this._generateListItemId(oItem.getId()),
-				oListItem = Element.registry.get(sMenuListItemId);
+				oListItem = Element.getElementById(sMenuListItemId);
 
 			if (oListItem) {
 				return oListItem;
@@ -500,7 +502,7 @@ sap.ui.define([
 
 		Menu.prototype._createVisualMenuItemFromItem = function(oItem) {
 			var sUfMenuItemId = this._generateUnifiedMenuItemId(oItem.getId()),
-				oUfMenuItem = Element.registry.get(sUfMenuItemId),
+				oUfMenuItem = Element.getElementById(sUfMenuItemId),
 				aCustomData = oItem.getCustomData(), i;
 
 			if (oUfMenuItem) {
@@ -577,7 +579,7 @@ sap.ui.define([
 		 * @private
 		 */
 		Menu.prototype._connectVisualItem = function(oItem, oControl, iIndex) {
-			if (!oControl || sap.ui.getCore().byId(oItem._getVisualControl())) {
+			if (!oControl || Element.getElementById(oItem._getVisualControl())) {
 				return;
 			}
 
@@ -741,7 +743,7 @@ sap.ui.define([
 		};
 
 		Menu.prototype._removeVisualItem = function(oItem, oParentItem) {
-			var oVisualItem = sap.ui.getCore().byId(oItem._getVisualControl()),
+			var oVisualItem = Element.getElementById(oItem._getVisualControl()),
 				vMenuOrList;
 
 			if (oVisualItem) {
@@ -756,7 +758,7 @@ sap.ui.define([
 						// now we need to update its parent list item - no to render its arrow and reset its visual child ref
 						if (oParentItem) {
 							oParentItem._setVisualChild(null);
-							sap.ui.getCore().byId(oParentItem._getVisualControl()).rerender();
+							Element.getElementById(oParentItem._getVisualControl()).invalidate();
 						}
 					}
 
@@ -787,7 +789,7 @@ sap.ui.define([
 			}
 
 			if (oItem._getVisualChild()) {
-				oSubMenuPage = sap.ui.getCore().byId(oItem._getVisualChild());
+				oSubMenuPage = Element.getElementById(oItem._getVisualChild());
 				if (this._getNavContainer() && oSubMenuPage) {
 					this._getNavContainer().removePage(oSubMenuPage);
 				}
@@ -827,7 +829,7 @@ sap.ui.define([
 				return;
 			}
 			sTargetItemId = fnGenerateTargetItemId(oEvent.getSource().getId());
-			oTargetItem = Element.registry.get(sTargetItemId);
+			oTargetItem = Element.getElementById(sTargetItemId);
 
 			if (oTargetItem) {
 				// Private aggregations are not going to get cloned if ManagedObject.prototype.clone method gets called.
@@ -875,7 +877,7 @@ sap.ui.define([
 				return;
 			}
 
-			oVisualItem = sap.ui.getCore().byId(sVisualItemId);
+			oVisualItem = Element.getElementById(sVisualItemId);
 
 			if (methodName === "set") {
 				oVisualItem.setTooltip(methodParams.item);
@@ -919,15 +921,15 @@ sap.ui.define([
 			var oLI;
 
 			if (oParentItem._getVisualChild()) { //this is not the first sub-item that is added
-				this._connectVisualItem(oNewItem, sap.ui.getCore().byId(oParentItem._getVisualChild()), iInsertIndex);
+				this._connectVisualItem(oNewItem, Element.getElementById(oParentItem._getVisualChild()), iInsertIndex);
 			} else {
 				if (Device.system.phone) {
 					this._initPageForParent(oParentItem);
 					oParentItem._setVisualChild(oParentItem.getItems()[0]._getVisualParent());
-					oLI = sap.ui.getCore().byId(oParentItem._getVisualControl());
+					oLI = Element.getElementById(oParentItem._getVisualControl());
 					oLI && oLI.invalidate();
 				} else {
-					this._initMenuForItems(oParentItem.getItems(), sap.ui.getCore().byId(oParentItem._getVisualControl()));
+					this._initMenuForItems(oParentItem.getItems(), Element.getElementById(oParentItem._getVisualControl()));
 					oParentItem._setVisualChild(oParentItem.getItems()[0]._getVisualParent());
 				}
 			}
@@ -938,7 +940,7 @@ sap.ui.define([
 			//so here we receive multiple aggregationChanged events, each one for a separate item
 
 			//in the time we re-render the visual item, it's menuitem still has its subitems, so remove the ref for a while
-			var oVisualItem = sap.ui.getCore().byId(oItem._getVisualControl());
+			var oVisualItem = Element.getElementById(oItem._getVisualControl());
 			if (oVisualItem && oVisualItem.setMenuItem) {
 				oVisualItem.setMenuItem(null);
 			}

package/src/sap/m/MenuButton.js

@@ -11,6 +11,7 @@ sap.ui.define([
 	'./Button',
 	'./SplitButton',
 	'sap/ui/Device',
+	"sap/ui/core/Element",
 	'sap/ui/core/EnabledPropagator',
 	'sap/ui/core/library',
 	'sap/ui/core/Popup',
@@ -23,6 +24,7 @@ sap.ui.define([
 	Button,
 	SplitButton,
 	Device,
+	Element,
 	EnabledPropagator,
 	coreLibrary,
 	Popup,
@@ -58,7 +60,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public
@@ -293,13 +295,13 @@ sap.ui.define([
 			if (!this._isSplitButton() && this._sDefaultText) {
 				this.setText(this._sDefaultText);
 			} else if (!this.getUseDefaultActionOnly() && this._getLastSelectedItem()) {
-				this.setText(sap.ui.getCore().byId(this._getLastSelectedItem()).getText());
+				this.setText(Element.getElementById(this._getLastSelectedItem()).getText());
 			}
 
 			if (!this._isSplitButton() && this._sDefaultIcon) {
 				this.setIcon(this._sDefaultIcon);
 			} else if (!this.getUseDefaultActionOnly() && this._getLastSelectedItem()) {
-				this.setIcon(sap.ui.getCore().byId(this._getLastSelectedItem()).getIcon());
+				this.setIcon(Element.getElementById(this._getLastSelectedItem()).getIcon());
 			}
 
 			this.invalidate();
@@ -387,8 +389,8 @@ sap.ui.define([
 				return;
 			}
 
-			if (this._bPopupOpen && !oEvent.getParameter("keyboard")) {
-				this.getMenu().close();
+			if (oMenu.isOpen() && !oEvent.getParameter("keyboard")) {
+				oMenu.close();
 				this._bPopupOpen = false;
 				return;
 			}
@@ -465,7 +467,7 @@ sap.ui.define([
 			var sLastSelectedItemId = this._getLastSelectedItem(),
 				oLastSelectedItem;
 			if (!this.getUseDefaultActionOnly() && sLastSelectedItemId) {
-				oLastSelectedItem = sap.ui.getCore().byId(sLastSelectedItemId);
+				oLastSelectedItem = Element.getElementById(sLastSelectedItemId);
 				this.getMenu().fireItemSelected({ item: oLastSelectedItem });
 			} else {
 				this.fireDefaultAction();

package/src/sap/m/MenuItem.js

@@ -5,8 +5,8 @@
  */
 
 // Provides control sap.m.MenuItem.
-sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserver'],
-	function(library, Item, ManagedObjectObserver) {
+sap.ui.define(['./library', "sap/ui/core/Element", 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserver'],
+	function(library, Element, Item, ManagedObjectObserver) {
 		"use strict";
 
 
@@ -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.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public
@@ -142,7 +142,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 			Item.prototype.addAggregation.apply(this, arguments);
 
 			if (sAggregationName === 'customData' && oVisualItemId) {
-				oVisualItem = sap.ui.getCore().byId(oVisualItemId);
+				oVisualItem = Element.getElementById(oVisualItemId);
 				this._addCustomData(oVisualItem, oObject);
 			}
 
@@ -158,7 +158,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 			Item.prototype.insertAggregation.apply(this, arguments);
 
 			if (sAggregationName === 'customData' && oVisualItemId) {
-				oVisualItem = sap.ui.getCore().byId(oVisualItemId);
+				oVisualItem = Element.getElementById(oVisualItemId);
 				oVisualItem.insertCustomData(oObject.clone(MenuItem.UNIFIED_MENU_ITEMS_ID_SUFFIX), iIndex);
 				this._observeCustomDataChanges(oObject);
 			}
@@ -208,7 +208,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 		};
 
 		MenuItem.prototype.destroy = function() {
-			var oVisualControl = sap.ui.getCore().byId(this._getVisualControl());
+			var oVisualControl = Element.getElementById(this._getVisualControl());
 
 			if (oVisualControl) {
 				oVisualControl.destroy();
@@ -221,7 +221,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 			Item.prototype.addEventDelegate.apply(this, arguments);
 
 			if (this._getVisualControl()) {
-				var oVisualControl = sap.ui.getCore().byId(this._getVisualControl());
+				var oVisualControl = Element.getElementById(this._getVisualControl());
 				oVisualControl.addEventDelegate(oDelegate, oThis);
 			}
 
@@ -232,7 +232,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 			Item.prototype.removeEventDelegate.apply(this, arguments);
 
 			if (this._getVisualControl()) {
-				var oVisualControl = sap.ui.getCore().byId(this._getVisualControl());
+				var oVisualControl = Element.getElementById(this._getVisualControl());
 				oVisualControl.removeEventDelegate(oDelegate);
 			}
 
@@ -270,7 +270,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/base/ManagedObjectObserv
 		 * @private
 		 */
 		MenuItem.prototype._customDataObserverCallbackFunction = function (oChanges) {
-			sap.ui.getCore().byId(oChanges.object.getId() + "-" + MenuItem.UNIFIED_MENU_ITEMS_ID_SUFFIX).setValue(oChanges.current);
+			Element.getElementById(oChanges.object.getId() + "-" + MenuItem.UNIFIED_MENU_ITEMS_ID_SUFFIX).setValue(oChanges.current);
 		};
 
 		/**

package/src/sap/m/MenuListItem.js

@@ -8,12 +8,13 @@
 sap.ui.define([
 	'./ListItemBase',
 	'./library',
+	"sap/ui/core/Element",
 	'sap/ui/core/IconPool',
 	'sap/ui/core/library',
 	'./MenuListItemRenderer',
-    'sap/m/Image'
+	'sap/m/Image'
 ],
-	function(ListItemBase, library, IconPool, coreLibrary, MenuListItemRenderer, Image) {
+	function(ListItemBase, library, Element, IconPool, coreLibrary, MenuListItemRenderer, Image) {
 		"use strict";
 
 		// shortcut for sap.ui.core.TextDirection
@@ -33,7 +34,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @private
@@ -155,7 +156,7 @@ sap.ui.define([
 		};
 
 		MenuListItem.prototype._hasSubItems = function() {
-			return !!(this.getMenuItem() && sap.ui.getCore().byId(this.getMenuItem()).getItems().length);
+			return !!(this.getMenuItem() && Element.getElementById(this.getMenuItem()).getItems().length);
 		};
 
 		MenuListItem.prototype.setProperty = function(sPropertyKey, vPropertyValue) {