@openui5/sap.m 1.108.2 → 1.110.0

package/src/sap/m/InputBaseRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -603,7 +603,7 @@ sap.ui.define(['sap/ui/core/Renderer', 'sap/ui/core/Core', 'sap/ui/core/library'
 	/**
 	 * This method is reserved for derived classes to add extra styles for the placeholder, if rendered as label.
 	 *
-	 * @deprecated
+	 * @deprecated Since version 1.58.0.
 	 * @protected
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
 	 * @param {sap.m.InputBase} oControl An object representation of the control that should be rendered.
@@ -615,7 +615,7 @@ sap.ui.define(['sap/ui/core/Renderer', 'sap/ui/core/Core', 'sap/ui/core/library'
 	 * To be overwritten by subclasses.
 	 * Note that this method should not be used anymore as native placeholder is used on all browsers
 	 *
-	 * @deprecated
+	 * @deprecated Since version 1.58.0.
 	 * @protected
 	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
 	 * @param {sap.m.InputBase} oControl An object representation of the control that should be rendered.

package/src/sap/m/InputListItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/InputListItemRenderer.js

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

package/src/sap/m/InputRenderer.js

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

package/src/sap/m/InstanceManager.js

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

package/src/sap/m/Label.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -78,7 +78,7 @@ function(
 	 * @implements sap.ui.core.Label, sap.ui.core.IShrinkable, sap.ui.core.IAccessKeySupport
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -92,6 +92,7 @@ function(
 				"sap.ui.core.Label",
 				"sap.ui.core.IShrinkable",
 				"sap.m.IOverflowToolbarContent",
+				"sap.m.IToolbarInteractiveControl",
 				"sap.m.IHyphenation",
 				"sap.ui.core.IAccessKeySupport"
 			],
@@ -201,7 +202,7 @@ function(
 	 *
 	 * @protected
 	 *
-	 * @returns {object} AccessibilityInfo of the <code>sap.m.Label</code>
+	 * @returns {sap.ui.core.AccessibilityInfo} AccessibilityInfo of the <code>sap.m.Label</code>
 	 */
 	Label.prototype.getAccessibilityInfo = function() {
 		var sDescription = this.getText();
@@ -236,7 +237,7 @@ function(
 	 * Required by the {@link sap.m.IOverflowToolbarContent} interface.
 	 *
 	 * @public
-	 * @returns {object} Configuration information for the <code>sap.m.IOverflowToolbarContent</code> interface.
+	 * @returns {sap.m.OverflowToolbarConfig} Configuration information for the <code>sap.m.IOverflowToolbarContent</code> interface.
 	 */
 	Label.prototype.getOverflowToolbarConfig = function() {
 		var oConfig = {
@@ -321,6 +322,19 @@ function(
 		this._isInColumnHeaderContext = !!bIsInColumnHeaderContext;
 	};
 
+	/**
+	 * Required by the {@link sap.m.IToolbarInteractiveControl} interface.
+	 * Determines if the Control is interactive.
+	 *
+	 * @returns {boolean} If it is an interactive Control
+	 *
+	 * @private
+	 * @ui5-restricted sap.m.OverflowToolBar, sap.m.Toolbar
+	 */
+	Label.prototype._getToolbarInteractive = function () {
+		return false;
+	};
+
 	// enrich Label functionality
 	LabelEnablement.enrich(Label.prototype);
 	HyphenationSupport.mixInto(Label.prototype);

package/src/sap/m/LabelRenderer.js

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

package/src/sap/m/LightBox.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -9,12 +9,12 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/Popup",
 	"sap/ui/core/Core",
-	"sap/m/Text",
+	"sap/m/IllustratedMessage",
+	"sap/m/IllustratedMessageType",
+	"sap/m/IllustratedMessageSize",
 	"sap/m/Button",
 	"sap/ui/core/ResizeHandler",
 	"sap/ui/Device",
-	"sap/ui/core/Icon",
-	"sap/ui/layout/VerticalLayout",
 	"./InstanceManager",
 	"sap/ui/core/InvisibleText",
 	"sap/ui/core/library",
@@ -27,12 +27,12 @@ sap.ui.define([
 	Control,
 	Popup,
 	Core,
-	Text,
+	IllustratedMessage,
+	IllustratedMessageType,
+	IllustratedMessageSize,
 	Button,
 	ResizeHandler,
 	Device,
-	Icon,
-	VerticalLayout,
 	InstanceManager,
 	InvisibleText,
 	coreLibrary,
@@ -52,9 +52,6 @@ sap.ui.define([
 	// shortcut for sap.ui.core.OpenState
 	var OpenState = coreLibrary.OpenState;
 
-	// shortcut for sap.ui.core.TextAlign
-	var TextAlign = coreLibrary.TextAlign;
-
 	/**
 	 * Constructor for a new LightBox.
 	 *
@@ -99,7 +96,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -127,10 +124,10 @@ sap.ui.define([
 				_closeButton: {type: "sap.m.Button", multiple: false, visibility: "hidden"},
 
 				/**
-				 * A layout control used to display the error texts when the image could not be loaded.
+				 * Control used to display the error message when the image could not be loaded.
 				 * @private
 				 */
-				_verticalLayout: {type: "sap.ui.layout.VerticalLayout", multiple: false, visibility: "hidden"},
+				 _errorMessage: {type: "sap.m.IllustratedMessage", multiple: false, visibility: "hidden"},
 
 				/**
 				 * Hidden text used for accessibility of the popup.
@@ -218,6 +215,7 @@ sap.ui.define([
 				this._calculateSizes(oNativeImage);
 				break;
 			case LightBoxLoadingStates.Error:
+			case LightBoxLoadingStates.TimeOutError:
 				clearTimeout(this._iTimeoutId);
 				sInvisiblePopupText += " " + sErrorMessageTitle + " " + sErrorMessageSubtitle;
 				break;
@@ -310,7 +308,7 @@ sap.ui.define([
 		this._oPopup.setContent(this);
 
 		if (oImageContent && oImageContent.getImageSrc()) {
-			this._oPopup.open(300, "center center", "center center", document.body, null);
+			this._oPopup.open(300, Popup.Dock.CenterCenter, Popup.Dock.CenterCenter, window, null);
 			InstanceManager.addLightBoxInstance(this);
 		}
 
@@ -397,13 +395,12 @@ sap.ui.define([
 	 * Forces invalidation of the control when an image loads/fails to load.
 	 *
 	 * @private
-	 * @param {sap.m.LightBoxLoadingStates} sNewState The new state of the image. Possible values are: "LOADING", "LOADED" and "ERROR".
+	 * @param {sap.m.LightBoxLoadingStates} sNewState The new state of the image.
 	 */
 	LightBox.prototype._imageStateChanged = function (sNewState) {
-		var bEndState = sNewState === LightBoxLoadingStates.Loaded || sNewState === LightBoxLoadingStates.Error;
 
-		if (bEndState && !this._isRendering) {
-			this.rerender();
+		if (sNewState !== LightBoxLoadingStates.Loading && !this._isRendering) {
+			this.invalidate();
 		}
 	};
 
@@ -447,41 +444,33 @@ sap.ui.define([
 	 * @private
 	 */
 	LightBox.prototype._createErrorControls = function() {
-		var sErrorTitle,
-			sErrorSubtitle,
-			oTitle,
-			oSubtitle,
-			oIcon;
+		var sErrorTitle = this._oRB.getText("LIGHTBOX_IMAGE_TIMED_OUT"),
+		sErrorSubtitle = this._oRB.getText("LIGHTBOX_IMAGE_TIMED_OUT_DETAILS"),
+		oIllustratedMessage;
+
+		if (this.getAggregation("_errorMessage")) {
+			if (this._getImageContent()._getImageState() === LightBoxLoadingStates.TimeOutError) {
+				this.getAggregation("_errorMessage").setTitle(sErrorTitle);
+				this.getAggregation("_errorMessage").setDescription(sErrorSubtitle);
+			}
 
-		if (this.getAggregation("_verticalLayout")) {
 			return;
 		}
 
-		if (this._getImageContent()._getImageState() === LightBoxLoadingStates.TimeOutError) {
-			sErrorTitle = this._oRB.getText("LIGHTBOX_IMAGE_TIMED_OUT");
-			sErrorSubtitle = this._oRB.getText("LIGHTBOX_IMAGE_TIMED_OUT_DETAILS");
-		} else {
+		if (this._getImageContent()._getImageState() !== LightBoxLoadingStates.TimeOutError) {
 			sErrorTitle = this._oRB.getText("LIGHTBOX_IMAGE_ERROR");
 			sErrorSubtitle = this._oRB.getText("LIGHTBOX_IMAGE_ERROR_DETAILS");
 		}
 
-		oTitle = new Text({
-			text: sErrorTitle,
-			textAlign: TextAlign.Center
-		}).addStyleClass("sapMLightBoxErrorTitle");
-
-		oSubtitle = new Text({
-			text: sErrorSubtitle,
-			textAlign: TextAlign.Center
-		}).addStyleClass("sapMLightBoxErrorSubtitle");
-
-		oIcon = new Icon({
-			src: "sap-icon://picture"
-		}).addStyleClass("sapMLightBoxErrorIcon");
+		oIllustratedMessage = new IllustratedMessage({
+			illustrationType: IllustratedMessageType.UnableToLoadImage,
+			illustrationSize: Device.system.phone ? IllustratedMessageSize.Auto : IllustratedMessageSize.Scene,
+			enableVerticalResponsiveness: true,
+			title: sErrorTitle,
+			description: sErrorSubtitle
+		});
 
-		this.setAggregation("_verticalLayout", new VerticalLayout({
-			content: [oIcon, oTitle, oSubtitle]
-		}).addStyleClass("sapMLightBoxVerticalLayout"));
+		this.setAggregation("_errorMessage", oIllustratedMessage);
 	};
 
 	/**
@@ -490,16 +479,20 @@ sap.ui.define([
 	 * @private
 	 */
 	LightBox.prototype._onResize = function () {
-		var iMinimumSideOffset = this._calculateOffset() / 2 + "px",
-			vTop = iMinimumSideOffset,
-			vLeft = iMinimumSideOffset,
-			vMarginTop = "",
-			vMarginLeft = "",
-			oImageContent = this._getImageContent(),
-			oDomRef = this.getDomRef(),
-			vLightBoxWidth,
+		var oDomRef = this.getDomRef();
+		if (!oDomRef) {
+			return;
+		}
+
+		var vLightBoxWidth,
 			vLightBoxHeight,
-			iMinimumOffset = this._calculateOffset();
+			fHeight,
+			fWidth,
+			iScrollOffsetY = Math.round(window.scrollY),
+			iScrollOffsetX = Math.round(window.scrollX),
+			iTop,
+			iLeft,
+			oImageContent = this._getImageContent();
 
 		if (oImageContent._getImageState() === LightBoxLoadingStates.Loaded) {
 			this._calculateSizes(oImageContent._getNativeImage());
@@ -514,21 +507,14 @@ sap.ui.define([
 			vLightBoxHeight = oDomRef.clientHeight;
 		}
 
-		if (window.innerWidth > vLightBoxWidth + iMinimumOffset) {
-			vLeft = "50%";
-			vMarginLeft = Math.round(-vLightBoxWidth / 2);
-		}
-
-		if (window.innerHeight > vLightBoxHeight + iMinimumOffset) {
-			vTop = "50%";
-			vMarginTop = Math.round(-vLightBoxHeight / 2);
-		}
+		fHeight = window.innerHeight - vLightBoxHeight;
+		fWidth = window.innerWidth - vLightBoxWidth;
+		iTop = iScrollOffsetY + Math.round(fHeight / 2);
+		iLeft = iScrollOffsetX + Math.round(fWidth / 2);
 
 		this._$lightBox.css({
-			"top": vTop,
-			"margin-top": vMarginTop,
-			"left": vLeft,
-			"margin-left": vMarginLeft
+			"top": iTop,
+			"left": iLeft
 		});
 	};
 

package/src/sap/m/LightBoxItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/LightBoxRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -52,11 +52,13 @@ sap.ui.define([
 			oRM.class("sapMLightBoxTopCornersRadius");
 		}
 
-		if (oImageState !== LightBoxLoadingStates.Error) {
+		if (oImageState === LightBoxLoadingStates.TimeOutError || oImageState === LightBoxLoadingStates.Error) {
+			oRM.class("sapMLightBoxError");
+			oRM.style("width", "auto");
+			oRM.style("height", "auto");
+		} else {
 			oRM.style("width", oControl._iWidth + "px");
 			oRM.style("height", oControl._iHeight + "px");
-		} else {
-			oRM.class("sapMLightBoxError");
 		}
 
 		oRM.openEnd();
@@ -109,7 +111,7 @@ sap.ui.define([
 
 		oRM.openEnd();
 
-		oRM.renderControl(oControl.getAggregation("_verticalLayout"));
+		oRM.renderControl(oControl.getAggregation("_errorMessage"));
 
 		oRM.close("div");
 	};

package/src/sap/m/Link.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -86,7 +86,7 @@ function(
 	 * @implements sap.ui.core.IShrinkable, sap.ui.core.IFormContent, sap.ui.core.ITitleContent, sap.ui.core.IAccessKeySupport
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -100,7 +100,8 @@ function(
 				"sap.ui.core.IShrinkable",
 				"sap.ui.core.IFormContent",
 				"sap.ui.core.ITitleContent",
-				"sap.ui.core.IAccessKeySupport"
+				"sap.ui.core.IAccessKeySupport",
+				"sap.m.IToolbarInteractiveControl"
 			],
 			library : "sap.m",
 			designtime: "sap/m/designtime/Link.designtime",
@@ -450,7 +451,7 @@ function(
 	 *
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 * @protected
-	 * @returns {object} The <code>sap.m.Link</code>  accessibility information
+	 * @returns {sap.ui.core.AccessibilityInfo} The <code>sap.m.Link</code>  accessibility information
 	 */
 	Link.prototype.getAccessibilityInfo = function() {
 		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
@@ -507,6 +508,20 @@ function(
 		return !bAlreadyHasSelfReference && (aAriaLabelledBy.length > 0 || bHasReferencingLabels || bAllowEnhancingByParent);
 	};
 
+	/**
+	 * Required by the {@link sap.m.IToolbarInteractiveControl} interface.
+	 * Determines if the Control is interactive.
+	 *
+	 * @returns {boolean} If it is an interactive Control
+	 *
+	 * @private
+	 * @ui5-restricted sap.m.OverflowToolBar, sap.m.Toolbar
+	 */
+	Link.prototype._getToolbarInteractive = function () {
+		return true;
+	};
+
+
 	var setRefLabelsHighlightAccKeysRef = function (bHighlightAccKeysRef) {
 		var aLabels = this.getAriaLabelledBy();
 

package/src/sap/m/LinkRenderer.js

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

package/src/sap/m/List.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -30,7 +30,7 @@ sap.ui.define(["./library", "./ListBase", "./ListRenderer"],
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ListBase.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -10,6 +10,7 @@ sap.ui.define([
 	"sap/ui/Device",
 	"sap/ui/core/Core",
 	"sap/ui/core/Control",
+	"sap/ui/core/Element",
 	"sap/ui/core/InvisibleText",
 	"sap/ui/core/LabelEnablement",
 	"sap/ui/core/delegate/ItemNavigation",
@@ -23,7 +24,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/base/Log",
 	"sap/ui/core/InvisibleMessage",
-	"sap/ui/dom/jquery/control", // jQuery Plugin "control"
+	"sap/m/table/Util",
 	"sap/ui/dom/jquery/Selectors", // jQuery custom selectors ":sapTabbable"
 	"sap/ui/dom/jquery/Aria" // jQuery Plugin "addAriaLabelledBy", "removeAriaLabelledBy"
 ],
@@ -32,6 +33,7 @@ function(
 	Device,
 	Core,
 	Control,
+	Element,
 	InvisibleText,
 	LabelEnablement,
 	ItemNavigation,
@@ -44,7 +46,8 @@ function(
 	capitalize,
 	jQuery,
 	Log,
-	InvisibleMessage
+	InvisibleMessage,
+	Util
 ) {
 	"use strict";
 
@@ -87,12 +90,14 @@ function(
 	 *
 	 * See section "{@link topic:295e44b2d0144318bcb7bdd56bfa5189 List, List Item, and Table}"
 	 * in the documentation for an introduction to subclasses of <code>sap.m.ListBase</code> control.
+	 * More information on how to use binding-related functionality, such as {@link topic:ec79a5d5918f4f7f9cbc2150e66778cc Sorting, Grouping, and Filtering},
+	 * is also available in the documentation.
 	 *
 	 * <b>Note:</b> The ListBase including all contained items may be completely re-rendered when the data of a bound model is changed. Due to the limited hardware resources of mobile devices this can lead to longer delays for lists that contain many items. As such the usage of a list is not recommended for these use cases.
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -1018,6 +1023,18 @@ function(
 			this._fireSelectionChangeEvent(aChangedListItems, bFireEvent);
 		}
 
+		var iSelectableItemCount = this.getItems().filter(function(oListItem) {
+			return oListItem.isSelectable();
+		}).length;
+		if (bFireEvent && this.getGrowing() && this.getMultiSelectMode() === "SelectAll" && this.getBinding("items").getLength() > iSelectableItemCount) {
+			var oSelectAllDomRef = this._getSelectAllCheckbox ? this._getSelectAllCheckbox() : undefined;
+			if (oSelectAllDomRef) {
+				Util.showSelectionLimitPopover(iSelectableItemCount, oSelectAllDomRef);
+			} else {
+				throw Error("Unsupported Operation");
+			}
+		}
+
 		return this;
 	};
 
@@ -2055,13 +2072,7 @@ function(
 			// prepare the announcement for the screen reader
 			var oAccInfo = oItem.getAccessibilityInfo(),
 				oBundle = Core.getLibraryResourceBundle("sap.m"),
-				sDescription = "";
-
-			// when items have the role="listitem", aria-roledescription attribute containing the "type" info is already added to DOM,
-			// hence there is no need to add this information again to the custom announcement
-			if (this.getAriaRole() !== "list") {
-				sDescription += oAccInfo.type + " . ";
-			}
+				sDescription = oAccInfo.type + " . ";
 
 			if (this.isA("sap.m.Table")) {
 				var mPosition = this.getAccessbilityPosition(oItem);
@@ -2417,7 +2428,7 @@ function(
 		var $LastFocused = jQuery(aNavigationDomRefs[iLastFocusedIndex]);
 
 		// find related item control to get tabbables
-		var oRelatedControl = $LastFocused.control(0) || {};
+		var oRelatedControl = Element.closestTo($LastFocused[0]) || {};
 		var $Tabbables = oRelatedControl.getTabbables ? oRelatedControl.getTabbables() : $LastFocused.find(":sapTabbable");
 
 		// get the last tabbable item or itself and focus

package/src/sap/m/ListBaseRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", "./ListItemBaseRenderer"],

package/src/sap/m/ListItemBase.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -78,7 +78,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -273,9 +273,6 @@ function(
 	// defines the root tag name for rendering purposes
 	ListItemBase.prototype.TagName = "li";
 
-	// enable the ACC announcement for "not selected"
-	ListItemBase.prototype._bAnnounceNotSelected = true;
-
 	// internal active state of the listitem
 	ListItemBase.prototype.init = function() {
 		this._active = false;
@@ -394,7 +391,7 @@ function(
 	};
 
 	ListItemBase.prototype.getAccessibilityType = function(oBundle) {
-		return oBundle.getText("ACC_CTR_TYPE_OPTION");
+		return this.getListProperty("ariaRole") == "list" ? oBundle.getText("ACC_CTR_TYPE_LISTITEM") : "";
 	};
 
 	ListItemBase.prototype.getGroupAnnouncement = function() {
@@ -446,14 +443,15 @@ function(
 		}
 
 		if (this.getContentAnnouncement) {
-			aOutput.push((this.getContentAnnouncement(oBundle) || "").trim());
+			var sContentAnnouncement = (this.getContentAnnouncement(oBundle) || "").trim();
+			sContentAnnouncement && aOutput.push(sContentAnnouncement);
 		}
 
 		if (sTooltip) {
 			aOutput.push(sTooltip);
 		}
 
-		if (this._bAnnounceNotSelected && this.isSelectable() && !this.getSelected()) {
+		if (this.getListProperty("ariaRole") != "listbox" && this.isSelectable() && !this.getSelected()) {
 			aOutput.push(oBundle.getText("LIST_ITEM_NOT_SELECTED"));
 		}