@openui5/sap.m 1.108.1 → 1.109.0

package/src/sap/m/Input.js

@@ -157,7 +157,7 @@ function(
 	 * @extends sap.m.InputBase
 	 * @implements sap.ui.core.IAccessKeySupport
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public
@@ -791,7 +791,7 @@ function(
 			oSuggestionsPopover = this._getSuggestionsPopover(),
 			oList = oSuggestionsPopover && oSuggestionsPopover.getItemsContainer();
 
-		if (sKey === '') {
+		if (!this._hasTabularSuggestions() && sKey === '') {
 			return;
 		}
 
@@ -808,11 +808,6 @@ function(
 		this.setProperty("selectedKey", '', true);
 		this.setAssociation("selectedRow", null, true);
 		this.setAssociation("selectedItem", null, true);
-
-		this.fireSuggestionItemSelected({
-			selectedItem: null,
-			selectedRow: null
-		});
 	};
 
 	/**
@@ -1413,6 +1408,7 @@ function(
 		if (this._isSuggestionsPopoverOpen()) {
 			// mark the event as already handled
 			oEvent.originalEvent._sapui_handledByControl = true;
+			this._setProposedItemText(null);
 			this.setSelectionUpdatedFromList(false);
 			this._closeSuggestionPopup();
 
@@ -1517,7 +1513,7 @@ function(
 
 		this.bValueHelpRequested = false;
 
-		if (!this._sProposedItemText && this.isMobileDevice()) {
+		if (!this._getProposedItemText() && this.isMobileDevice()) {
 			return;
 		}
 
@@ -1532,7 +1528,7 @@ function(
 			// but there is a proposed item due to the typeahead
 			var oSelectedItem = this.getSuggestionItems()
 				.filter(function (oItem) {
-					return oItem.getText() === this._sProposedItemText;
+					return oItem.getText() === this._getProposedItemText();
 				}.bind(this))[0];
 
 			if (oSelectedItem) {
@@ -1601,8 +1597,7 @@ function(
 	};
 
 	/**
-	 * Updates the selection, when the picker is closed and the suggestions selection
-	 * was updated, while navigating.
+	 * Updates the selection, when the picker closes and there is selected item/row in the list/table.
 	 *
 	 * @param {sap.m.StandardListItem | sap.m.ColumnListItem | sap.m.GroupHeaderListItem} oSelectedItem The selected from navigation item
 	 * @private
@@ -1793,7 +1788,6 @@ function(
 
 		if (this.getValueLiveUpdate()) {
 			this.setProperty("value", sValue, true);
-			this._onValueUpdated(sValue);
 		}
 
 		this.fireLiveChange({
@@ -1833,10 +1827,21 @@ function(
 	Input.prototype.onkeyup = function (oEvent) {
 		var sValue = this.getValue();
 		var sLastValue = this.getLastValue();
+		var bIsNavigationKey = (oEvent.which === KeyCodes.ARROW_DOWN) || (oEvent.which === KeyCodes.ARROW_UP);
+		var oSuggestionsPopover, oItemsContainer, oSelectedItem;
 
-		if ([KeyCodes.BACKSPACE, KeyCodes.DELETE].indexOf(oEvent.which) !== -1 && !sValue) {
+		if (!this._bDoTypeAhead && !sValue) {
 			this.getShowSuggestion() && this.setSelectedKey(null);
 			(sLastValue !== sValue) && this.setLastValue(sLastValue);
+		} else if (!this._bDoTypeAhead && !bIsNavigationKey && sValue) {
+			oSuggestionsPopover = this.getShowSuggestion() && this._getSuggestionsPopover();
+			oItemsContainer = oSuggestionsPopover && oSuggestionsPopover.getItemsContainer();
+			oSelectedItem = oItemsContainer && oItemsContainer.getSelectedItem();
+
+			this._setProposedItemText(null);
+			if (oSelectedItem) {
+				oSelectedItem.setSelected(false);
+			}
 		}
 
 		this.getShowClearIcon() && this.setProperty("effectiveShowClearIcon", !!sValue);
@@ -2186,19 +2191,24 @@ function(
 	/**
 	 * Handles Input's specific type ahead logic.
 	 *
-	 * @param oInput {sap.m.Input} Input's instance to which the type ahead would be applied. For example: this OR Dialog's Input instance.
+	 * @param {sap.m.Input} oInput Input's instance to which the type ahead would be applied. For example: this OR Dialog's Input instance.
+	 * @returns {null|object} Map object containing type-ahead info or null if no type-ahead is performed.
 	 * @private
 	 */
 	Input.prototype._handleTypeAhead = function (oInput) {
 		var sValue = this.getValue();
+		var mTypeAheadInfo = {
+			value: "",
+			selectedItem: null
+		};
 
 		// check if typeahead is already performed
-		if ((oInput && oInput.getValue().toLowerCase()) === (this._sProposedItemText && this._sProposedItemText.toLowerCase())) {
+		if ((oInput && oInput.getValue().toLowerCase()) === (this._getProposedItemText() && this._getProposedItemText().toLowerCase())) {
 			return;
 		}
 
 		this._setTypedInValue(sValue);
-		oInput._sProposedItemText = null;
+		oInput._setProposedItemText(null);
 
 		if (!this._bDoTypeAhead || sValue === "" ||
 			sValue.length < this.getStartSuggestion() || document.activeElement !== this.getFocusDomRef()) {
@@ -2219,7 +2229,12 @@ function(
 			return this._formatTypedAheadValue(fnExtractText(oItem));
 		}.bind(this));
 
-		oInput._sProposedItemText = fnExtractText(aItemsToSelect[0]);
+		mTypeAheadInfo.value = fnExtractText(aItemsToSelect[0]);
+		mTypeAheadInfo.selectedItem = aItemsToSelect[0];
+
+		oInput._setProposedItemText(mTypeAheadInfo.value);
+
+		return mTypeAheadInfo;
 	};
 
 	/**
@@ -2231,7 +2246,7 @@ function(
 	Input.prototype._resetTypeAhead = function (oInput) {
 		oInput = oInput || this;
 
-		oInput._sProposedItemText = null;
+		oInput._setProposedItemText(null);
 		this._setTypedInValue('');
 	};
 
@@ -2815,7 +2830,7 @@ function(
 
 		oInput.addEventDelegate({
 			onsapenter: function () {
-				this.setValue(this._sProposedItemText);
+				this.setValue(this._getProposedItemText());
 			}
 		}, this);
 
@@ -2919,7 +2934,25 @@ function(
 		}, this);
 
 		oPopover.attachAfterOpen(function () {
-			this._handleTypeAhead(this);
+			var mTypeAheadInfo;
+			var oSuggPopover = this.getShowSuggestion() && this._getSuggestionsPopover();
+			var oList = oSuggPopover && oSuggPopover.getItemsContainer();
+			var oItemToBeSelected;
+
+			mTypeAheadInfo = this._handleTypeAhead(this);
+
+			// In case the items were provided on a later stage and the type-ahead was called
+			// when the items were refreshed, there will be no selected item / row in the list,
+			// no matter that we use the first matching item to auto-complete the user's input.
+			// This will, later on, result in no item being added in the selectedItem/Row association.
+			// Here we need to make sure that the first item (which's text was already used) is indeed selected.
+			if (!(this._getProposedItemText() && oList && !oList.getSelectedItem() && mTypeAheadInfo && mTypeAheadInfo.selectedItem)) {
+				return;
+			}
+
+			oItemToBeSelected = this._hasTabularSuggestions() ? mTypeAheadInfo.selectedItem : ListHelpers.getListItem(mTypeAheadInfo.selectedItem);
+			oItemToBeSelected.setSelected(true);
+			this.setSelectionUpdatedFromList(true);
 		}, this);
 
 		if (this.isMobileDevice()) {
@@ -3233,7 +3266,10 @@ function(
 				oTabularRow.setVisible(bShowItem);
 				bShowItem && aFilteredItems.push(oTabularRow);
 
-				if (!bIsAnySuggestionAlreadySelected && bShowItem && this._sProposedItemText === this._getRowResultFunction()(oTabularRow)) {
+				if (!bIsAnySuggestionAlreadySelected && bShowItem && this._getProposedItemText() === this._getRowResultFunction()(oTabularRow)) {
+					// Setting the row to selected only works in case the items were there prior the user's input
+					// as otherwise there will be no proposed text.
+					// In case the items became available on a later stage, the typeahead functionality will set the selected row.
 					oTabularRow.setSelected(true);
 					bIsAnySuggestionAlreadySelected = true;
 				}
@@ -3280,7 +3316,10 @@ function(
 				oListItem = ListHelpers.createListItemFromCoreItem(oItem, true);
 				oList.addItem(oListItem);
 
-				if (!bIsAnySuggestionAlreadySelected && this._sProposedItemText === oItem.getText()) {
+				if (!bIsAnySuggestionAlreadySelected && this._getProposedItemText() === oItem.getText()) {
+					// Setting the item to selected only works in case the items were there prior the user's input
+					// as otherwise there will be no proposed text.
+					// In case the items became available on a later stage, the typeahead functionality will set the selected item.
 					oListItem.setSelected(true);
 					bIsAnySuggestionAlreadySelected = true;
 				}
@@ -3342,6 +3381,28 @@ function(
 		return this;
 	};
 
+	/**
+	 * Setter for the _sProposedItemText property, representing the text extracted from the proposed item/row.
+	 *
+	 * @private
+	 * @param {string} sProposedText The new proposed text, extracted from the item/row.
+	 * @returns {this} <code>this</code> to allow method chaining.
+	 */
+	Input.prototype._setProposedItemText = function (sProposedText) {
+		this._sProposedItemText = sProposedText;
+		return this;
+	};
+
+	/**
+	 * Getter for the _sProposedItemText property representing the text extracted from the proposed item/row.
+	 *
+	 * @private
+	 * @returns {string} The text extracted from the proposed item/row.
+	 */
+	Input.prototype._getProposedItemText = function () {
+		return this._sProposedItemText;
+	};
+
 	return Input;
 
 });

package/src/sap/m/InputBase.js

@@ -64,7 +64,7 @@ function(
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/InputBaseRenderer.js

@@ -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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Label.js

@@ -78,7 +78,7 @@ function(
 	 * @implements sap.ui.core.Label, sap.ui.core.IShrinkable, sap.ui.core.IAccessKeySupport
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/LightBox.js

@@ -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.1
+	 * @version 1.109.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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/LightBoxRenderer.js

@@ -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

@@ -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.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

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.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ListBase.js

@@ -23,6 +23,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/base/Log",
 	"sap/ui/core/InvisibleMessage",
+	"sap/m/table/Util",
 	"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"
@@ -44,7 +45,8 @@ function(
 	capitalize,
 	jQuery,
 	Log,
-	InvisibleMessage
+	InvisibleMessage,
+	Util
 ) {
 	"use strict";
 
@@ -87,12 +89,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.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public
@@ -1018,6 +1022,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 +2071,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);

package/src/sap/m/ListItemBase.js

@@ -78,7 +78,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public
@@ -394,7 +394,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() {

package/src/sap/m/ListItemBaseRenderer.js

@@ -285,8 +285,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 			sAriaDescribedBy = this.getAriaDescribedBy(oLI),
 			sRole = this.getAriaRole(oLI),
 			mAccessibilityState = {
-				role: sRole,
-				roledescription: sRole === "listitem" ? oLI.getAccessibilityType(Core.getLibraryResourceBundle("sap.m")) : null
+				role: sRole
 			};
 
 		if (sAriaLabelledBy) {
@@ -311,6 +310,7 @@ sap.ui.define(["./library", "sap/ui/core/Core", "sap/ui/Device", "sap/ui/core/In
 			mAccessibilityState.selected = null;
 			if (oLI.isGroupHeader()) {
 				mAccessibilityState.role = "group";
+				mAccessibilityState.roledescription = oLI.getAccessibilityType(Core.getLibraryResourceBundle("sap.m"));
 				var aGroupedItems = oLI.getGroupedItems();
 				if (aGroupedItems && aGroupedItems.length) {
 					mAccessibilityState.owns = aGroupedItems.join(" ");

package/src/sap/m/MaskEnabler.js

@@ -26,7 +26,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.108.1
+	 * @version 1.109.0
 	 * @private
 	 * @mixin
 	 * @alias sap.m.MaskEnabler

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.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @public