@openui5/sap.m 1.109.0 → 1.110.0

package/src/sap/m/MessageView.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.
  */
 
@@ -112,7 +112,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.109.0
+	 * @version 1.110.0
 	 *
 	 * @extends sap.ui.core.Control
 	 * @constructor
@@ -129,7 +129,7 @@ sap.ui.define([
 				 * Callback function for resolving a promise after description has been asynchronously loaded inside this function.
 				 * @callback sap.m.MessageView~asyncDescriptionHandler
 				 * @param {object} config A single parameter object
-				 * @param {MessagePopoverItem} config.item Reference to respective MessagePopoverItem instance
+				 * @param {sap.m.MessageItem} config.item Reference to respective MessageItem instance
 				 * @param {object} config.promise Object grouping a promise's reject and resolve methods
 				 * @param {function} config.promise.resolve Method to resolve promise
 				 * @param {function} config.promise.reject Method to reject promise
@@ -1114,7 +1114,7 @@ sap.ui.define([
 
 				// first check if there is a class attribute and enrich it with 'sapMMsgViewItemDisabledLink'
 				// else, add proper class
-				var sClasses = "sapMMsgViewItemDisabledLink sapMMsgViewItemPendingLink";
+				var sClasses = "sapMMsgViewItemDisabledLink sapMMsgViewItemPendingLink sapMLnk";
 				var indexOfClass = attrs.indexOf("class");
 				if (indexOfClass > -1) {
 					attrs[indexOfClass + 1] += sClasses;
@@ -1181,7 +1181,6 @@ sap.ui.define([
 	 */
 	MessageView.prototype._fnHandleForwardNavigation = function (oListItem, sTransiotionName) {
 		var oMessageItem = oListItem._oMessageItem,
-			aDetailsPageContent = this._detailsPage.getContent() || [],
 			asyncDescHandler = this.getAsyncDescriptionHandler();
 
 		this._previousIconTypeClass = this._previousIconTypeClass || "";
@@ -1191,7 +1190,7 @@ sap.ui.define([
 			messageTypeFilter: this._getCurrentMessageTypeFilter()
 		});
 
-		this._clearDetailsPage.call(this, aDetailsPageContent);
+		this._clearDetailsPage.call(this);
 
 		if (typeof asyncDescHandler === "function" && oMessageItem.getLongtextUrl()) {
 			// Set markupDescription to true as markup description should be processed as markup
@@ -1205,6 +1204,7 @@ sap.ui.define([
 			});
 
 			var proceed = function () {
+				this._clearDetailsPage.call(this);
 				this._detailsPage.setBusy(false);
 				this._navigateToDetails.call(this, oMessageItem, oListItem, sTransiotionName, true);
 			}.bind(this);
@@ -1258,8 +1258,8 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} aDetailsPageContent The details page content
 	 * @private
 	 */
-	MessageView.prototype._clearDetailsPage = function (aDetailsPageContent) {
-		aDetailsPageContent.forEach(function (oControl) {
+	MessageView.prototype._clearDetailsPage = function () {
+		this._detailsPage.getContent().forEach(function (oControl) {
 			oControl.destroy();
 		}, this);
 	};

package/src/sap/m/MessageViewRenderer.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/MultiComboBox.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.
  */
 
@@ -145,7 +145,7 @@ function(
 	 * </ul>
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @extends sap.m.ComboBoxBase
@@ -1285,6 +1285,12 @@ function(
 		if (this.getValueState() !== ValueState.Error) {
 			this._sInitialValueState = this.getValueState();
 		}
+
+		if (this.getShowClearIcon()) {
+			this._getClearIcon().setVisible(this.shouldShowClearIcon());
+		} else if (this._oClearIcon) {
+			this._getClearIcon().setVisible(false);
+		}
 	};
 
 	/**
@@ -1378,7 +1384,14 @@ function(
 	 */
 	MultiComboBox.prototype.onBeforeOpen = function() {
 		ComboBoxBase.prototype.onBeforeOpen.apply(this, arguments);
-		var fnPickerTypeBeforeOpen = this["_onBeforeOpen" + this.getPickerType()];
+		var fnPickerTypeBeforeOpen = this["_onBeforeOpen" + this.getPickerType()],
+			oDomRef = this.getFocusDomRef();
+
+		if (oDomRef) {
+			// expose a parent/child contextual relationship to assistive technologies,
+			// notice that the "aria-controls" attribute is set when the popover opened.
+			oDomRef.setAttribute("aria-controls", this.getPicker().getId());
+		}
 
 		// add the active state to the MultiComboBox's field
 		this.addContent();
@@ -2140,6 +2153,8 @@ function(
 			onAfterRendering: this._onAfterRenderingTokenizer
 		}, this);
 
+		oTokenizer.setShouldRenderTabIndex(false);
+
 		return oTokenizer;
 	};
 

package/src/sap/m/MultiComboBoxRenderer.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(['./ComboBoxBaseRenderer','./ComboBoxTextFieldRenderer', 'sap/ui/core/Renderer', 'sap/ui/core/Core'],

package/src/sap/m/MultiEditField.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/ui/core/XMLComposite", "./library", "sap/ui/core/Item"], function(XMLComposite, library, Item) {
@@ -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.109.0
+	 * @version 1.110.0
 	 * @experimental since 1.52
 	 * @since 1.52.0
 	 * @alias sap.m.MultiEditField

package/src/sap/m/MultiInput.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.
  */
 
@@ -22,7 +22,6 @@ sap.ui.define([
 	"sap/m/inputUtils/completeTextSelected",
 	"sap/ui/events/KeyCodes",
 	'sap/ui/core/InvisibleText',
-	"sap/ui/thirdparty/jquery",
 	// jQuery Plugin "cursorPos"
 	"sap/ui/dom/jquery/cursorPos"
 ],
@@ -42,8 +41,7 @@ function(
 	containsOrEquals,
 	completeTextSelected,
 	KeyCodes,
-	InvisibleText,
-	jQuery
+	InvisibleText
 ) {
 		"use strict";
 
@@ -107,7 +105,7 @@ function(
 	* @implements sap.ui.core.ISemanticFormContent
 	*
 	* @author SAP SE
-	* @version 1.109.0
+	* @version 1.110.0
 	*
 	* @constructor
 	* @public
@@ -261,6 +259,8 @@ function(
 			this.updateAggregation("tokens");
 		};
 
+		oTokenizer.setShouldRenderTabIndex(false);
+
 		this.setAggregation("tokenizer", oTokenizer);
 
 		oTokenizer.getTokensPopup()
@@ -1470,7 +1470,7 @@ function(
 	MultiInput.prototype.forwardEventHandlersToSuggPopover = function (oSuggPopover) {
 		oSuggPopover.setShowSelectedPressHandler(this._handleShowSelectedPress.bind(this));
 		oSuggPopover.setOkPressHandler(this._handleConfirmation.bind(this, true));
-		oSuggPopover.setCancelPressHandler(this._handleCancelPress.bind(this));
+		oSuggPopover.setCancelPressHandler(this._revertPopupSelection.bind(this));
 	};
 
 	// Handles "Enter" key press and OK button press
@@ -1488,11 +1488,6 @@ function(
 		this.onChange(oEvent, null, oPopupInput.getValue());
 	};
 
-	MultiInput.prototype._handleCancelPress  = function (oEvent) {
-		this._getSuggestionsPopover().getInput().setDOMValue(this.getLastValue());
-		this._closeSuggestionPopup();
-	};
-
 	MultiInput.prototype._handleShowSelectedPress = function (oEvent) {
 		this._bShowListWithTokens = oEvent.getSource().getPressed();
 		this._manageListsVisibility(this._bShowListWithTokens);

package/src/sap/m/MultiInputRenderer.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(['./InputRenderer', 'sap/ui/core/Renderer', "sap/ui/core/Core"],

package/src/sap/m/NavContainer.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.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -1815,7 +1815,7 @@ sap.ui.define([
 	 * @return {Promise} Promise that resolves with the placeholder
 	 *
 	 * @private
-	 * @ui5-restricted SAPUI5 Distribution libraries only
+	 * @ui5-restricted SAPUI5 Distribution Layer Libraries
 	 * @since 1.91
 	 */
 	NavContainer.prototype.showPlaceholder = function(mSettings) {

package/src/sap/m/NavContainerRenderer.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/NewsContent.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.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.110.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/NewsContentRenderer.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/NotificationList.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.
  */
 
@@ -27,7 +27,7 @@ function(
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -44,5 +44,30 @@ function(
 
 	NotificationList.prototype.onItemFocusIn = function() { };
 
+	NotificationList.prototype.setItemFocusable  = function() { };
+
+	NotificationList.prototype._startItemNavigation = function () {
+		ListBase.prototype._startItemNavigation.call(this);
+
+		if (this._oItemNavigation) {
+			this._oItemNavigation.setTableMode(false);
+		}
+	};
+
+	NotificationList.prototype.setNavigationItems = function(oItemNavigation, oNavigationRoot) {
+		var aItems = [],
+			aGroupItems = oNavigationRoot.querySelectorAll(":scope > .sapMNLGroup"),
+			aListItems = oNavigationRoot.querySelectorAll(":scope > .sapMNLI");
+
+		aGroupItems.forEach(function (oGroupItem) {
+			aItems.push(oGroupItem);
+			aItems = aItems.concat(Array.from(oGroupItem.querySelectorAll(".sapMNLI")));
+		});
+
+		aItems = aItems.concat(Array.from(aListItems));
+
+		oItemNavigation.setItemDomRefs(aItems);
+	};
+
 	return NotificationList;
 });

package/src/sap/m/NotificationListBase.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,25 +9,30 @@ sap.ui.define([
 		'sap/ui/core/Core',
 		'sap/ui/core/Element',
 		'sap/ui/Device',
+		"sap/ui/dom/isHidden",
 		'sap/ui/core/ResizeHandler',
 		'./ListItemBase',
 		'./Button',
 		'./ToolbarSeparator',
 		'sap/m/OverflowToolbar',
 		'sap/m/OverflowToolbarLayoutData',
+		'sap/ui/events/KeyCodes',
 		'sap/ui/core/IconPool',
 		'sap/ui/core/Icon',
-		'sap/ui/core/library'],
+		'sap/ui/core/library'
+	],
 	function (library,
 			  Core,
 			  Element,
 			  Device,
+			  isHidden,
 			  ResizeHandler,
 			  ListItemBase,
 			  Button,
 			  ToolbarSeparator,
 			  OverflowToolbar,
 			  OverflowToolbarLayoutData,
+			  KeyCodes,
 			  IconPool,
 			  Icon,
 			  coreLibrary) {
@@ -86,7 +91,7 @@ sap.ui.define([
 		 * @extends sap.m.ListItemBase
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.110.0
 		 *
 		 * @constructor
 		 * @public
@@ -373,6 +378,11 @@ sap.ui.define([
 			return null;
 		};
 
+		NotificationListBase.prototype._hasToolbarOverflowButton = function () {
+			var iMinLength =  this._isSmallSize() ? 0 : 1;
+			return this.getShowButtons() && this.getButtons().length > iMinLength;
+		};
+
 		NotificationListBase.prototype._hasActionButtons = function () {
 			return this.getShowButtons() && this.getButtons().length;
 		};
@@ -419,6 +429,186 @@ sap.ui.define([
 			this._sCurrentLayoutClassName = null;
 		};
 
+		NotificationListBase.prototype.onkeydown = function(event) {
+			var target = event.target;
+
+			switch (event.which) {
+				// Minus keys
+				// KeyCodes.MINUS is not returning 189
+				case 189:
+				case KeyCodes.NUMPAD_MINUS:
+				case KeyCodes.ARROW_LEFT:
+					if (target.classList.contains("sapMNLGroup")) {
+						this._collapse(event);
+						return;
+					}
+					break;
+				case KeyCodes.PLUS:
+				case KeyCodes.NUMPAD_PLUS:
+				case KeyCodes.ARROW_RIGHT:
+					if (target.classList.contains("sapMNLGroup")) {
+						this._expand(event);
+						return;
+					}
+					break;
+				case KeyCodes.F10:
+					if (target.classList.contains("sapMNLIB") && event.shiftKey && this._hasToolbarOverflowButton()) {
+						this._getOverflowToolbar()._getOverflowButton().firePress();
+						event.stopImmediatePropagation();
+						event.preventDefault();
+						return;
+					}
+					break;
+			}
+
+			this._focusSameItemOnNextRow(event);
+		};
+
+		NotificationListBase.prototype._focusSameItemOnNextRow = function (event) {
+			var list = this._getParentList(),
+				itemNavigation,
+				focusedIndex ,
+				itemDomRefs,
+				sourceControl,
+				listItemDomRef,
+				nextListItemControl,
+				nextFocusedDomRef;
+
+			if (!list) {
+				return;
+			}
+
+			if (event.which !== KeyCodes.ARROW_UP &&
+				event.which !== KeyCodes.ARROW_DOWN) {
+				return;
+			}
+
+			event.stopPropagation();
+			event.preventDefault();
+
+			itemNavigation = list.getItemNavigation();
+			if (!itemNavigation) {
+				return;
+			}
+
+			focusedIndex = itemNavigation.getFocusedIndex();
+			itemDomRefs = itemNavigation.getItemDomRefs();
+
+			switch (event.which) {
+				case KeyCodes.ARROW_UP:
+					do {
+						focusedIndex--;
+					} while (itemDomRefs[focusedIndex] && isHidden(itemDomRefs[focusedIndex]));
+					break;
+				case KeyCodes.ARROW_DOWN:
+					do {
+						focusedIndex++;
+					} while (itemDomRefs[focusedIndex] && isHidden(itemDomRefs[focusedIndex]));
+					break;
+			}
+
+			listItemDomRef = itemDomRefs[focusedIndex];
+			if (!listItemDomRef) {
+				return;
+			}
+
+			// focus the entire row first
+			listItemDomRef.focus();
+
+			if (this.getDomRef() === event.target) {
+				return;
+			}
+
+			sourceControl = Element.closestTo(event.target);
+
+			// collapse/expand button
+			if (sourceControl.getId() === this.getId() + "-collapseButton") {
+				nextFocusedDomRef = listItemDomRef.querySelector(":scope > .sapMNLGroupHeader .sapMNLGroupCollapseButton .sapMBtn");
+				if (nextFocusedDomRef) {
+					nextFocusedDomRef.focus();
+				}
+				return;
+			}
+
+			// "show more" link
+			if (sourceControl.isA("sap.m.Link")) {
+				nextFocusedDomRef = listItemDomRef.querySelector(":scope > .sapMNLIMain .sapMNLIShowMore a");
+				if (nextFocusedDomRef) {
+					nextFocusedDomRef.focus();
+				}
+
+				return;
+			}
+
+			nextListItemControl = Element.closestTo(listItemDomRef);
+
+			// close button
+			if (!sourceControl.getParent().isA("sap.m.OverflowToolbar")) {
+				if (!nextListItemControl._focusCloseButton()) {
+					nextListItemControl._focusToolbarButton();
+				}
+
+				return;
+			}
+
+			// toolbar button
+			if (!nextListItemControl._focusToolbarButton()) {
+				nextListItemControl._focusCloseButton();
+			}
+		};
+
+		NotificationListBase.prototype._focusCloseButton = function () {
+			if (this.getShowCloseButton() && this.getAggregation("_closeButton")) {
+				this.getAggregation("_closeButton").focus();
+				return true;
+			}
+
+			return false;
+		};
+
+		NotificationListBase.prototype._focusToolbarButton = function () {
+			var button,
+				overflowToolbar,
+				visibleContent;
+
+			if (this._shouldRenderOverflowToolbar()) {
+				overflowToolbar = this._getOverflowToolbar();
+
+				if (overflowToolbar._getOverflowButtonNeeded()) {
+					button = overflowToolbar._getOverflowButton();
+				} else {
+					visibleContent = overflowToolbar._getVisibleContent();
+					button = this._isSmallSize() ? visibleContent[visibleContent.length - 1] : visibleContent[0];
+				}
+
+				button.focus();
+
+				return true;
+			}
+
+			return false;
+		};
+
+		NotificationListBase.prototype._getParentList = function () {
+			var parent = this.getParent();
+			if (parent) {
+				if (parent.isA("sap.m.NotificationList")) {
+					return parent;
+				}
+
+				parent = parent.getParent();
+				if (parent && parent.isA("sap.m.NotificationList")) {
+					return parent;
+				}
+			}
+
+			return null;
+		};
+
+		NotificationListBase.prototype._collapse = function () { };
+
+		NotificationListBase.prototype._expand = function () { };
+
 		NotificationListBase.prototype._onResize = function () {
 			var oDomRef = this.getDomRef(),
 				oMediaRange,

package/src/sap/m/NotificationListGroup.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.
  */
 
@@ -62,7 +62,7 @@ function(
 	 * @extends sap.m.NotificationListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @public
@@ -114,7 +114,7 @@ function(
 				 *
 				 *  @deprecated As of version 1.73
 				 */
-				authorPicture: {type: 'sap.ui.core.URI', multiple: false, deprecated: true},
+				authorPicture: {type: 'sap.ui.core.URI', deprecated: true},
 
 				/**
 				 * Determines the due date of the NotificationListGroup.
@@ -190,6 +190,16 @@ function(
 		this._groupTitleInvisibleText = new InvisibleText({id: this.getId() + "-invisibleGroupTitleText"});
 	};
 
+	NotificationListGroup.prototype.onAfterRendering = function() {
+		NotificationListBase.prototype.onAfterRendering.apply(this, arguments);
+
+		var collapseButtonDomRef = this._getCollapseButton().getDomRef();
+		if (collapseButtonDomRef) {
+			collapseButtonDomRef.setAttribute("aria-expanded", !this.getCollapsed());
+			collapseButtonDomRef.setAttribute("aria-controls", this.getId() + "-childrenList");
+		}
+	};
+
 	/**
 	 * Handles the internal event exit.
 	 *
@@ -345,5 +355,21 @@ function(
 		};
 	};
 
+	NotificationListGroup.prototype._collapse = function (event) {
+		if (!this.getCollapsed()) {
+			this.setCollapsed(true);
+			this.fireOnCollapse({collapsed: true});
+			event.stopImmediatePropagation();
+		}
+	};
+
+	NotificationListGroup.prototype._expand = function (event) {
+		if (this.getCollapsed()) {
+			this.setCollapsed(false);
+			this.fireOnCollapse({collapsed: false});
+			event.stopImmediatePropagation();
+		}
+	};
+
 	return NotificationListGroup;
 });

package/src/sap/m/NotificationListGroupRenderer.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.
  */
 
@@ -49,6 +49,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/InvisibleRenderer"], function
 			sAriaLablledByIds = sGroupTitleId + ' ' + sInvisibleTitleText;
 
 		rm.openStart('li', control)
+			.attr('tabindex', '-1')
 			.class('sapMLIB')
 			.class('sapMNLIB')
 			.class('sapMNLGroup');
@@ -61,11 +62,8 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/InvisibleRenderer"], function
 			rm.class('sapMNLGroupUnread');
 		}
 
-		rm.attr('tabindex', '0');
-
 		rm.accessibilityState(control, {
 			role: "listitem",
-			expanded: !control.getCollapsed(),
 			labelledby: {
 				value: sAriaLablledByIds
 			}
@@ -141,7 +139,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/InvisibleRenderer"], function
 		// end group header
 		rm.close('div');
 
-		rm.openStart('ul')
+		rm.openStart('ul', sControlId + "-childrenList")
 			.class('sapMNLGroupChildren')
 			.attr('role', 'list')
 			.openEnd();