@openui5/sap.m 1.103.0 → 1.105.0

package/src/sap/m/Link.js

@@ -7,28 +7,30 @@
 // Provides control sap.m.Link.
 sap.ui.define([
 	"./library",
+	"sap/ui/core/Core",
 	"sap/ui/core/Control",
 	"sap/ui/core/InvisibleText",
 	"sap/ui/core/EnabledPropagator",
+	"sap/ui/core/AccessKeysEnablement",
 	"sap/ui/core/LabelEnablement",
 	"sap/ui/core/library",
 	"sap/ui/Device",
 	"./LinkRenderer",
 	"sap/ui/events/KeyCodes",
-	"sap/base/Log",
 	"sap/base/security/URLListValidator"
 ],
 function(
 	library,
+	Core,
 	Control,
 	InvisibleText,
 	EnabledPropagator,
+	AccessKeysEnablement,
 	LabelEnablement,
 	coreLibrary,
 	Device,
 	LinkRenderer,
 	KeyCodes,
-	Log,
 	URLListValidator
 ) {
 	"use strict";
@@ -42,6 +44,9 @@ function(
 	// shortcut for sap.ui.core.aria.HasPopup
 	var AriaHasPopup = coreLibrary.aria.HasPopup;
 
+	// shortcut for sap.m.LinkAccessibleRole
+	var LinkAccessibleRole = library.LinkAccessibleRole;
+
 	// shortcut for sap.m.EmptyIndicator
 	var EmptyIndicatorMode = library.EmptyIndicatorMode;
 
@@ -78,10 +83,10 @@ function(
 	 * @see {@link fiori:https://experience.sap.com/fiori-design-web/link/ Link}
 	 *
 	 * @extends sap.ui.core.Control
-	 * @implements sap.ui.core.IShrinkable, sap.ui.core.IFormContent, sap.ui.core.ITitleContent
+	 * @implements sap.ui.core.IShrinkable, sap.ui.core.IFormContent, sap.ui.core.ITitleContent, sap.ui.core.IAccessKeySupport
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public
@@ -94,7 +99,8 @@ function(
 		interfaces : [
 			"sap.ui.core.IShrinkable",
 			"sap.ui.core.IFormContent",
-			"sap.ui.core.ITitleContent"
+			"sap.ui.core.ITitleContent",
+			"sap.ui.core.IAccessKeySupport"
 		],
 		library : "sap.m",
 		designtime: "sap/m/designtime/Link.designtime",
@@ -135,8 +141,9 @@ function(
 			width : {type : "sap.ui.core.CSSSize", group : "Dimension", defaultValue : null},
 
 			/**
-			 * Defines the link target URI. Supports standard hyperlink behavior. If a JavaScript action should be triggered,
-			 * this should not be set, but instead an event handler for the <code>press</code> event should be registered.
+			 * Defines the link target URI. Supports standard hyperlink behavior.
+			 * <b>Note:</b> Don't set <code>href</code> property if an action should be triggered by the link. Instead set <code>accessibleRole</code>
+			 * property to <code>LinkAccessibleRole.Button</code> and register a <code>press</code> event handler.
 			 */
 			href : {type : "sap.ui.core.URI", group : "Data", defaultValue : null},
 
@@ -194,12 +201,38 @@ function(
 			 */
 			ariaHasPopup : {type : "sap.ui.core.aria.HasPopup", group : "Accessibility", defaultValue : AriaHasPopup.None},
 
+			/**
+			 * Describes the accessibility role of the link:<ul>
+			 * <li><code>LinkAccessibleRole.Default</code> - a navagation is expected to the location given in <code>href</code> property</li>
+			 * <li><code>LinkAccessibleRole.Button</code> - there will be <code>role</code> attribute with value "Button" rendered. In this scenario the <code>href</code>
+			 * property value shouldn't be set as navigation isn't expected to occur.</li></ul>
+			 *
+			 * @since 1.104.0
+			 */
+			accessibleRole : {type : "sap.m.LinkAccessibleRole", group : "Accessibility", defaultValue : LinkAccessibleRole.Default},
+
 			/**
 			 * Specifies if an empty indicator should be displayed when there is no text.
 			 *
 			 * @since 1.89
 			 */
-			emptyIndicatorMode: { type: "sap.m.EmptyIndicatorMode", group: "Appearance", defaultValue: EmptyIndicatorMode.Off }
+			emptyIndicatorMode: { type: "sap.m.EmptyIndicatorMode", group: "Appearance", defaultValue: EmptyIndicatorMode.Off },
+
+			/**
+			 * Indicates whether the access keys ref of the control should be highlighted.
+			 * NOTE: this property is used only when access keys feature is turned on.
+			 *
+			 * @private
+			 */
+			highlightAccKeysRef: { type: "boolean", defaultValue: false, visibility: "hidden" },
+
+			/**
+			 * Indicates which keyboard key should be pressed to focus the access key ref
+			 * NOTE: this property is used only when access keys feature is turned on.
+			 *
+			 * @private
+			 */
+			accesskey: { type: "string", defaultValue: "", visibility: "hidden" }
 		},
 		associations : {
 
@@ -245,6 +278,10 @@ function(
 
 	EnabledPropagator.call(Link.prototype); // inherit "disabled" state from parent controls
 
+	Link.prototype.init = function () {
+		AccessKeysEnablement.registerControl(this);
+	};
+
 	/**
 	 * Required adaptations before rendering.
 	 *
@@ -252,6 +289,39 @@ function(
 	 */
 	Link.prototype.onBeforeRendering = function() {};
 
+	Link.prototype.onAfterRendering = function() {
+		var oLinkElement = this.getDomRef(),
+			oTextBinding = this.getBinding("text");
+
+		if (!oLinkElement) {
+			return;
+		}
+
+		// Update the default no-navigation href attribute value via JS,
+		// so we don't confuse the Chrome browser accessibility mappings,
+		// in case there is double rendering resulting from a "text" property binding.
+		// Remove the href if there's no text. Otherwise virtual cursor would stop on the empty link. BCP 2070055617
+		if (oTextBinding) {
+			if (!oTextBinding.bInitial && !oTextBinding.getValue()) {
+				this.getDomRef().removeAttribute("href");
+			}
+		} else if (!this.getText()) {
+			this.getDomRef().removeAttribute("href");
+		}
+	};
+
+	Link.prototype.getAccessKeysFocusTarget = function () {
+		return this.getFocusDomRef();
+	};
+
+	Link.prototype.onAccKeysHighlightStart = function () {
+		setRefLabelsHighlightAccKeysRef.call(this, true);
+	};
+
+	Link.prototype.onAccKeysHighlightEnd = function () {
+		setRefLabelsHighlightAccKeysRef.call(this, false);
+	};
+
 	/**
 	 * Handle the key down event for SPACE
 	 * SHIFT or ESCAPE on pressed SPACE cancels the action
@@ -405,7 +475,8 @@ function(
 			sEmphasizedInfo = this.getEmphasized() ? oResourceBundle.getText("LINK_EMPHASIZED") : "",
 			sSubtleInfo = this.getSubtle() ? oResourceBundle.getText("LINK_SUBTLE") : "",
 			sText = this.getText(),
-			sDescription = sText;
+			sDescription = sText,
+			sAccessibleRole = this.getAccessibleRole();
 
 		if (sText) {
 			sEmphasizedInfo && (sDescription += " " + sEmphasizedInfo);
@@ -413,7 +484,7 @@ function(
 		}
 
 		return {
-			role: "link",
+			role: sAccessibleRole === LinkAccessibleRole.Default ? "link" : sAccessibleRole,
 			type: sText ? oResourceBundle.getText("ACC_CTR_TYPE_LINK") : undefined,
 			description: sDescription,
 			focusable: this.getEnabled(),
@@ -454,6 +525,20 @@ function(
 		return !bAlreadyHasSelfReference && (aAriaLabelledBy.length > 0 || bHasReferencingLabels || bAllowEnhancingByParent);
 	};
 
+	var setRefLabelsHighlightAccKeysRef = function (bHighlightAccKeysRef) {
+		var aLabels = this.getAriaLabelledBy();
+
+		if (aLabels.length) {
+			var oLabel = Core.byId(aLabels[0]);
+
+			oLabel.setProperty("highlightAccKeysRef", bHighlightAccKeysRef);
+
+			if (oLabel.getText && oLabel.getText()) {
+				this.setProperty("accesskey", oLabel.getText()[0].toLowerCase());
+			}
+		}
+	};
+
 	return Link;
 
 });

package/src/sap/m/LinkRenderer.js

@@ -7,11 +7,12 @@
  sap.ui.define([
 	 "sap/ui/core/Renderer",
 	 "sap/ui/core/library",
+	 'sap/ui/core/AccessKeysEnablement',
 	 "sap/ui/util/defaultLinkTypes",
 	 './library',
 	 'sap/ui/core/Core'
 	],
-	function(Renderer, coreLibrary, defaultLinkTypes, mobileLibrary, Core) {
+	function(Renderer, coreLibrary, AccessKeysEnablement, defaultLinkTypes, mobileLibrary, Core) {
 	"use strict";
 
 	// shortcut for sap.ui.core.TextDirection
@@ -20,6 +21,9 @@
 	// shortcut for sap.ui.core.aria.HasPopup
 	var AriaHasPopup = coreLibrary.aria.HasPopup;
 
+	// shortcut for sap.m.LinkAccessibleRole
+	var LinkAccessibleRole = mobileLibrary.LinkAccessibleRole;
+
 	/**
 	 * Link renderer
 	 * @namespace
@@ -46,15 +50,16 @@
 			sTextAlign = Renderer.getTextAlign(oControl.getTextAlign(), sTextDir),
 			bShouldHaveOwnLabelledBy = oControl._determineSelfReferencePresence(),
 			sHasPopupType = oControl.getAriaHasPopup(),
-			sHref = oControl.getHref(),
 			sRel = defaultLinkTypes(oControl.getRel(), oControl.getTarget()),
+			sHref = oControl.getHref(),
+			sAccessibleRole = oControl.getAccessibleRole(),
 			oAccAttributes =  {
 				labelledby: bShouldHaveOwnLabelledBy ? {value: oControl.getId(), append: true } : undefined,
 				haspopup: (sHasPopupType === AriaHasPopup.None) ? null : sHasPopupType.toLowerCase()
 			},
-			bIsValid = sHref && oControl._isHrefValid(sHref),
 			bEnabled = oControl.getEnabled(),
-			sTypeSemanticInfo = "";
+			sTypeSemanticInfo = "",
+			sAcccessKey = oControl.getProperty("accesskey");
 
 		// Link is rendered as a "<a>" element
 		oRm.openStart("a", oControl);
@@ -70,6 +75,23 @@
 			sTypeSemanticInfo += " " + oControl._sAriaLinkEmphasizedId;
 		}
 
+		if (sAcccessKey) {
+			oRm.attr("data-ui5-accesskey", sAcccessKey);
+		}
+
+		switch (sAccessibleRole) {
+			case LinkAccessibleRole.Button:
+				oAccAttributes.role = LinkAccessibleRole.Button;
+				break;
+			default:
+				// Set a valid non empty value for the href attribute representing that there is no navigation,
+				// so we don't confuse the screen readers.
+				/*eslint-disable no-script-url */
+				sHref = sHref && oControl._isHrefValid(sHref) && oControl.getEnabled() ? sHref : "javascript:void(0)";
+		}
+
+		sHref && oRm.attr("href", sHref);
+
 		oAccAttributes.describedby = sTypeSemanticInfo ? {value: sTypeSemanticInfo.trim(), append: true} : undefined;
 
 		if (!bEnabled) {
@@ -86,14 +108,6 @@
 			oRm.attr("title", oControl.getTooltip_AsString());
 		}
 
-		/* set href only if link is enabled - BCP incident 1570020625 */
-		if (bIsValid && bEnabled) {
-			oRm.attr("href", sHref);
-		} else if (oControl.getText()) {
-			// Add href only if there's text. Otherwise virtual cursor would stop on the empty link. BCP 2070055617
-			oRm.attr("href", "");
-		}
-
 		if (oControl.getTarget()) {
 			oRm.attr("target", oControl.getTarget());
 		}

package/src/sap/m/List.js

@@ -30,7 +30,7 @@ sap.ui.define(["./library", "./ListBase", "./ListRenderer"],
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public
@@ -51,6 +51,43 @@ sap.ui.define(["./library", "./ListBase", "./ListRenderer"],
 		}
 	}});
 
+	List.prototype.getAriaRole = function() {
+		return this._sAriaRole || "list";
+	};
+
+	/**
+	 * Applies the aria <code>role</code> attribute to the control.
+	 *
+	 * Supported values are:
+	 * <ul>
+	 * <li><code>list</code>: This is the default since version 1.105. The rendered items will have the <code>role="listitem"</code>.</li>
+	 * <li><code>listbox</code>: Legacy support. The rendererd items will have the <code>role="option"</code>.</li>
+	 * </ul>
+	 * <b>Note:</b> This method must be called before the control renders.
+	 * @param {string} sRole role attribute for the control
+	 * @protected
+	 * @ui5-restricted
+	 * @since 1.105
+	 */
+	List.prototype.applyAriaRole = function(sRole) {
+		this._sAriaRole = sRole;
+	};
+
+	List.prototype.enhanceAccessibilityState = function(oElement, mAriaProps) {
+		ListBase.prototype.enhanceAccessibilityState.apply(this, arguments);
+
+		// update listitem Accessibility state according to the list's role attribute
+		if (this.getAriaRole() === "listbox" && oElement.isA("sap.m.ListItemBase")) {
+			mAriaProps.roledescription = null;
+			mAriaProps.role = "option";
+			mAriaProps.owns = null;
+
+			if (oElement.isSelectable()) {
+				mAriaProps.selected = oElement.getSelected();
+			}
+		}
+	};
+
 	return List;
 
 });

package/src/sap/m/ListBase.js

@@ -22,6 +22,7 @@ sap.ui.define([
 	"sap/base/strings/capitalize",
 	"sap/ui/thirdparty/jquery",
 	"sap/base/Log",
+	"sap/ui/core/InvisibleMessage",
 	"sap/ui/dom/jquery/control", // jQuery Plugin "control"
 	"sap/ui/dom/jquery/Selectors", // jQuery custom selectors ":sapTabbable"
 	"sap/ui/dom/jquery/Aria" // jQuery Plugin "addAriaLabelledBy", "removeAriaLabelledBy"
@@ -42,7 +43,8 @@ function(
 	ListBaseRenderer,
 	capitalize,
 	jQuery,
-	Log
+	Log,
+	InvisibleMessage
 ) {
 	"use strict";
 
@@ -90,7 +92,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @public
@@ -590,7 +592,6 @@ function(
 	};
 
 	ListBase.prototype.exit = function () {
-		this._oSelectedItem = null;
 		this._aNavSections = [];
 		this._aSelectedPaths = [];
 		this._destroyGrowingDelegate();
@@ -624,6 +625,9 @@ function(
 		// Special handling for "AutoExpandSelect" of the V4 ODataModel.
 		if (oEventInfo && oEventInfo.detailedReason === "AddVirtualContext") {
 			createVirtualItem(this);
+			if (this._oGrowingDelegate) {
+				this._oGrowingDelegate.reset(true);
+			}
 			return;
 		} else if (oEventInfo && oEventInfo.detailedReason === "RemoveVirtualContext") {
 			destroyVirtualItem(this);
@@ -759,9 +763,6 @@ function(
 			return this;
 		}
 
-		// clean up the selection
-		this._oSelectedItem = null;
-
 		// suppress the synchronous DOM removal of the aggregation destroy
 		this.destroyAggregation("items", "KeepDom");
 
@@ -777,20 +778,6 @@ function(
 		return this;
 	};
 
-
-	ListBase.prototype.removeAllItems = function(sAggregationName) {
-		this._oSelectedItem = null;
-		return this.removeAllAggregation("items");
-	};
-
-	ListBase.prototype.removeItem = function(vItem) {
-		var oItem = this.removeAggregation("items", vItem);
-		if (oItem && oItem === this._oSelectedItem) {
-			this._oSelectedItem = null;
-		}
-		return oItem;
-	};
-
 	ListBase.prototype.getItems = function(bReadOnly) {
 		if (bReadOnly) {
 			return this.mAggregations["items"] || [];
@@ -1085,7 +1072,7 @@ function(
 	 * Returns growing information as object with "actual" and "total" keys.
 	 * Note: This function returns "null" if "growing" feature is disabled.
 	 *
-	 * @type object
+	 * @returns {{actual: int, total: int} | null}
 	 * @public
 	 * @since 1.16
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
@@ -1449,7 +1436,22 @@ function(
 		}
 	};
 
+	ListBase.prototype.onItemRemoved = function(oItem) {
+		oItem._bGroupHeader = false;
+		if (this._oLastGroupHeader == oItem) {
+			this._oLastGroupHeader = null;
+		}
+		if (this._oSelectedItem == oItem) {
+			this._oSelectedItem = null;
+		}
+	};
+
 	ListBase.prototype.onItemInserted = function(oItem, bSelectedDelayed) {
+		// trigger is also an item of the ListBase which should not me mapped to the groupHeaders
+		if (this._oLastGroupHeader && !oItem.isGroupHeader()) {
+			this._oLastGroupHeader.setGroupedItem(oItem);
+		}
+
 		if (bSelectedDelayed) {
 			// item was already selected before inserted to the list
 			this.onItemSelectedChange(oItem, true);
@@ -1523,10 +1525,15 @@ function(
 			return;
 		}
 
-		if (sMode === ListMode.MultiSelect) {
-			this._fireSelectionChangeEvent([oListItem]);
-		} else if (this._bSelectionMode && bSelected) {
+		if (sMode === ListMode.MultiSelect || (this._bSelectionMode && bSelected)) {
 			this._fireSelectionChangeEvent([oListItem]);
+
+			// announce the selection state changes
+			// but only announce if the document.activeElement is the listItem control, else selection control should announce the selection change
+			if (this.getAriaRole() === "list" && document.activeElement === oListItem.getDomRef()) {
+				var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+				InvisibleMessage.getInstance().announce(bSelected ? oResourceBundle.getText("LIST_ITEM_SELECTED") : oResourceBundle.getText("LIST_ITEM_NOT_SELECTED"), "Assertive");
+			}
 		}
 	};
 
@@ -1928,17 +1935,31 @@ function(
 
 	ListBase.prototype.addItemGroup = function(oGroup, oHeader, bSuppressInvalidate) {
 		if (!oHeader) {
-			oHeader = new GroupHeaderListItem();
-			// setter is used to avoid complex binding parser checks which happens when setting values in constructor (ManagedObject)
-			// i.e., to ignore binding strings "{" "[" from the value being set
-			oHeader.setTitle(oGroup.text || oGroup.key);
+			oHeader = this.getGroupHeaderTemplate(oGroup);
 		}
 
 		oHeader._bGroupHeader = true;
 		this.addAggregation("items", oHeader, bSuppressInvalidate);
+		this.setLastGroupHeader(oHeader);
+		return oHeader;
+	};
+
+	ListBase.prototype.getGroupHeaderTemplate = function(oGroup) {
+		var oHeader = new GroupHeaderListItem();
+		// setter is used to avoid complex binding parser checks which happens when setting values in constructor (ManagedObject)
+		// i.e., to ignore binding strings "{" "[" from the value being set
+		oHeader.setTitle(oGroup.text || oGroup.key);
 		return oHeader;
 	};
 
+	ListBase.prototype.setLastGroupHeader = function(oGroupHeader) {
+		this._oLastGroupHeader = oGroupHeader;
+	};
+
+	ListBase.prototype.getLastGroupHeader = function() {
+		return this._oLastGroupHeader;
+	};
+
 	ListBase.prototype.removeGroupHeaders = function(bSuppressInvalidate) {
 		this.getItems(true).forEach(function(oItem) {
 			if (oItem.isGroupHeader()) {
@@ -1990,15 +2011,25 @@ function(
 	ListBase.prototype.getAccessbilityPosition = function(oItem) {
 		var iSetSize = 0,
 			aItems = this.getVisibleItems(),
-			iPosInset = aItems.indexOf(oItem) + 1,
+			sAriaRole = this.getAriaRole(),
+			// exclude group headers from item count for role="list" || role="listbox" only
+			bExcludeGroupHeaderFromCount = sAriaRole === "list" || sAriaRole === "listbox";
+
+		if (bExcludeGroupHeaderFromCount) {
+			aItems = aItems.filter(function(oItem) {
+				return !oItem.isGroupHeader();
+			});
+		}
+
+		var iPosInset = aItems.indexOf(oItem) + 1,
 			oBinding = this.getBinding("items");
 
 		// use binding length if list is in scroll to load growing mode
 		if (this.getGrowing() && this.getGrowingScrollToLoad() && oBinding && oBinding.isLengthFinal()) {
 			iSetSize = oBinding.getLength();
-			if (oBinding.isGrouped()) {
+			if (oBinding.isGrouped() && !bExcludeGroupHeaderFromCount) {
 				iSetSize += aItems.filter(function(oItem) {
-					return oItem.isGroupHeader() && oItem.getVisible();
+					return oItem.isGroupHeader();
 				}).length;
 			}
 		} else {
@@ -2021,25 +2052,26 @@ function(
 			return;
 		}
 
-		var oItemDomRef = oItem.getDomRef(),
-			mPosition = this.getAccessbilityPosition(oItem);
+		var oItemDomRef = oItem.getDomRef();
 
 		if (!oItem.getContentAnnouncement) {
 			// let the screen reader announce the whole content
 			this.getNavigationRoot().setAttribute("aria-activedescendant", oItemDomRef.id);
-			oItemDomRef.setAttribute("aria-posinset", mPosition.posInset);
-			oItemDomRef.setAttribute("aria-setsize", mPosition.setSize);
 		} else {
 			// prepare the announcement for the screen reader
 			var oAccInfo = oItem.getAccessibilityInfo(),
 				oBundle = Core.getLibraryResourceBundle("sap.m"),
-				sDescription = oAccInfo.type + " . ";
+				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 + " . ";
+			}
 
-			if (!Device.browser.chrome || this.isA("sap.m.Table")) {
+			if (this.isA("sap.m.Table")) {
+				var mPosition = this.getAccessbilityPosition(oItem);
 				sDescription += oBundle.getText("LIST_ITEM_POSITION", [mPosition.posInset, mPosition.setSize]) + " . ";
-			} else {
-				oItemDomRef.setAttribute("aria-posinset", mPosition.posInset);
-				oItemDomRef.setAttribute("aria-setsize", mPosition.setSize);
 			}
 
 			sDescription += oAccInfo.description;
@@ -2860,6 +2892,38 @@ function(
 		}
 	};
 
+	/**
+	 * Return the <code>role</code> attribute of the control.
+	 * @returns {string} the <code>role</code> attribute of the control
+	 * @protected
+	 * @ui5-restricted
+	 * @since 1.105
+	 */
+	ListBase.prototype.getAriaRole = function() {
+		return "list";
+	};
+
+	/**
+	 * This method is a hook for the RenderManager that gets called
+	 * during the rendering of child Controls. It allows to add,
+	 * remove and update existing accessibility attributes (ARIA) of
+	 * those controls.
+	 *
+	 * @param {sap.ui.core.Control} oElement - The Control that gets rendered by the RenderManager
+	 * @param {object} mAriaProps - The mapping of "aria-" prefixed attributes
+	 * @protected
+	 */
+	ListBase.prototype.enhanceAccessibilityState = function(oElement, mAriaProps) {
+		if (!oElement.isA("sap.m.ListItemBase") || oElement.isGroupHeader()) {
+			return;
+		}
+
+		// add aria-posinset & aria-setsize attributes to listitem DOM (not for group headers)
+		var mPosition = this.getAccessbilityPosition(oElement);
+		mAriaProps.posinset = mPosition.posInset;
+		mAriaProps.setsize = mPosition.setSize;
+	};
+
 	return ListBase;
 
 });

package/src/sap/m/ListBaseRenderer.js

@@ -236,22 +236,13 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 		rm.accessibilityState(oControl, this.getAccessibilityState(oControl));
 	};
 
-	/**
-	 * Returns aria accessibility role
-	 *
-	 * @param {sap.m.ListBase} oControl an object representation of the control
-	 * @returns {string}
-	 */
-	ListBaseRenderer.getAriaRole = function(oControl) {
-		return "listbox";
-	};
-
 	/**
 	 * Returns aria accessibility role for the no data entry.
+	 * @param {sap.m.ListBase} oControl the control instance
 	 *
-	 * @returns {string}
+	 * @returns {string|null} the no data role attribute
 	 */
-	ListBaseRenderer.getNoDataAriaRole = function() {
+	ListBaseRenderer.getNoDataAriaRole = function(oControl) {
 		return null;
 	};
 
@@ -292,12 +283,13 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	 * Returns the accessibility state of the control
 	 *
 	 * @param {sap.m.ListBase} oControl an object representation of the control
+	 * @returns {object} the accessibility state object
 	 */
 	ListBaseRenderer.getAccessibilityState = function(oControl) {
-		var sRole = this.getAriaRole(oControl);
+		var sRole = oControl.getAriaRole();
 		return {
 			role : sRole,
-			multiselectable : (sRole && oControl._bSelectionMode) ? oControl.getMode() == "MultiSelect" : undefined,
+			multiselectable : (sRole === "listbox" && oControl._bSelectionMode) ? oControl.getMode() == "MultiSelect" : undefined,
 			labelledby : {
 				value : this.getAriaLabelledBy(oControl),
 				append : true
@@ -328,7 +320,7 @@ sap.ui.define(["sap/m/library", "sap/ui/Device", "sap/ui/core/InvisibleText", ".
 	ListBaseRenderer.renderNoData = function(rm, oControl) {
 		rm.openStart("li", oControl.getId("nodata"));
 		rm.attr("tabindex", oControl.getKeyboardMode() == ListKeyboardMode.Navigation ? -1 : 0);
-		var sAriaRole = this.getNoDataAriaRole();
+		var sAriaRole = this.getNoDataAriaRole(oControl);
 		if (sAriaRole) {
 			rm.attr("role", sAriaRole);
 		}