@openui5/sap.m 1.97.1 → 1.100.0

package/src/sap/m/GenericTileRenderer.js

@@ -209,16 +209,9 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 					.openEnd()
 					.close("div");
 				if (!isHalfFrame) {
-					oRm.openStart("div")
-						.class("sapMGTContentShimmerPlaceholderItemBox")
-						.class("sapMGTLoadingShimmer")
-						.openEnd()
-						.close("div");
-					oRm.openStart("div")
-						.class("sapMGTContentShimmerPlaceholderItemTextFooter")
-						.class("sapMGTLoadingShimmer")
-						.openEnd()
-						.close("div");
+					for (var i = 0; i < iLength; i++) {
+						oRm.renderControl(aTileContent[i]);
+					}
 				}
 				oRm.close("div");
 				oRm.close("div");
@@ -242,7 +235,10 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 				}
 				oRm.openEnd();
 				if (oControl.getTileIcon()) {
-					oRm.renderControl(oControl._renderTileIcon(oControl.getTileIcon()));
+					var sAggregation = oControl._generateIconAggregation(oControl.getTileIcon());
+					if (sAggregation) {
+						oRm.renderControl(oControl.getAggregation(sAggregation));
+					}
 				}
 				oRm.close("div");
 			}
@@ -288,8 +284,11 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 			}
 
 			if (!(isHalfFrame && isContentPresent)) {
-				if (oControl.getSubheader() && (!oControl._isIconMode())) {//Restrict creation of SubHeader for IconMode
-					this._renderSubheader(oRm, oControl);
+				if (oControl.getSubheader()) {
+					//Restrict creation of SubHeader for IconMode & OneByOne frameType
+					if (!(oControl._isIconMode() && oControl.getFrameType() == frameTypes.OneByOne)) {
+						this._renderSubheader(oRm, oControl);
+					}
 				}
 			}
 
@@ -435,7 +434,7 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 	 *
 	 * @private
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control whose title should be rendered
+	 * @param {sap.m.GenericTile} oControl an object representation of the control whose title should be rendered
 	 */
 	GenericTileRenderer._renderHeader = function(oRm, oControl) {
 		oRm.openStart("div", oControl.getId() + "-hdr-text");
@@ -454,7 +453,7 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 	 *
 	 * @private
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control whose description should be rendered
+	 * @param {sap.m.GenericTile} oControl an object representation of the control whose description should be rendered
 	 */
 	GenericTileRenderer._renderSubheader = function(oRm, oControl) {
 		oRm.openStart("div", oControl.getId() + "-subHdr-text");

package/src/sap/m/GroupHeaderListItem.js

@@ -30,7 +30,7 @@ sap.ui.define(["sap/ui/core/library", "./library", "./ListItemBase", "./GroupHea
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/GroupHeaderListItemRenderer.js

@@ -44,7 +44,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 	 * @param {sap.ui.core.RenderManager}
 	 *          rm the RenderManager that can be used for writing to the
 	 *          Render-Output-Buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.m.GroupHeaderListItem}
 	 *          oLI an object representation of the list item that should be
 	 *          rendered
 	 */
@@ -62,7 +62,7 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 	 * @param {sap.ui.core.RenderManager}
 	 *          rm the RenderManager that can be used for writing to the
 	 *          Render-Output-Buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.m.GroupHeaderListItem}
 	 *          oLI an object representation of the list item that should be
 	 *          rendered
 	 */

package/src/sap/m/GrowingEnablement.js

@@ -13,7 +13,8 @@ sap.ui.define([
 	'sap/ui/base/ManagedObjectMetadata',
 	'sap/ui/core/HTML',
 	'sap/m/CustomListItem',
-	"sap/base/security/encodeXML"
+	'sap/base/security/encodeXML',
+	'sap/base/util/UriParameters'
 ],
 	function(
 		BaseObject,
@@ -23,7 +24,8 @@ sap.ui.define([
 		ManagedObjectMetadata,
 		HTML,
 		CustomListItem,
-		encodeXML
+		encodeXML,
+		UriParameters
 	) {
 	"use strict";
 
@@ -62,11 +64,16 @@ sap.ui.define([
 			this._bLoading = false;
 			this._sGroupingPath = "";
 			this._bDataRequested = false;
+			this._bSkippedItemsUpdateUntilDataReceived = false;
 			this._oContainerDomRef = null;
 			this._iLastItemsCount = 0;
 			this._iTriggerTimer = 0;
 			this._aChunk = [];
 			this._oRM = null;
+
+			if (UriParameters.fromQuery(window.location.href).get("sap-ui-xx-enableItemsPool") === "true") {
+				this._aItemsPool = [];
+			}
 		},
 
 		/**
@@ -86,6 +93,9 @@ sap.ui.define([
 				this._oRM.destroy();
 				this._oRM = null;
 			}
+			this._aItemsPool && this._aItemsPool.forEach(function(oItem) {
+				oItem.destroy();
+			});
 
 			this._oControl.$("triggerList").remove();
 			this._oControl.bUseExtendedChangeDetection = false;
@@ -364,9 +374,27 @@ sap.ui.define([
 			}
 		},
 
+		fillItemsPool: function() {
+			if (!this._iLimit || this._iRenderedDataItems || this._aItemsPool.length) {
+				return;
+			}
+
+			var oBindingInfo = this._oControl.getBindingInfo("items");
+			if (oBindingInfo && oBindingInfo.template) {
+				for (var i = 0; i < this._iLimit; i++) {
+					this._aItemsPool.push(oBindingInfo.factory());
+				}
+			}
+		},
+
 		// creates list item from the factory
 		createListItem : function(oContext, oBindingInfo) {
 			this._iRenderedDataItems++;
+
+			if (this._aItemsPool && this._aItemsPool.length) {
+				return this._aItemsPool.pop().setBindingContext(oContext, oBindingInfo.model);
+			}
+
 			return GrowingEnablement.createItem(oContext, oBindingInfo);
 		},
 
@@ -462,10 +490,19 @@ sap.ui.define([
 			// set iItemCount to initial value if not set or no items at the control yet
 			if (!this._iLimit || this.shouldReset(sChangeReason) || !this._oControl.getItems(true).length) {
 				this._iLimit = this._oControl.getGrowingThreshold();
+
 			}
 
 			// send the request to get the context
-			this._oControl.getBinding("items").getContexts(0, this._iLimit);
+			var oBinding = this._oControl.getBinding("items");
+
+			if (this._aItemsPool) {
+				oBinding.attachEventOnce("dataRequested", function() {
+					setTimeout(this.fillItemsPool.bind(this));
+				}, this);
+			}
+
+			oBinding.getContexts(0, this._iLimit);
 		},
 
 		/**
@@ -483,6 +520,8 @@ sap.ui.define([
 				this._iLimit = oControl.getGrowingThreshold();
 			}
 
+			this._bSkippedItemsUpdateUntilDataReceived = false;
+
 			// fire growing started event if data was requested this is a followup call of updateItems
 			if (this._bDataRequested) {
 				this._bDataRequested = false;
@@ -499,6 +538,9 @@ sap.ui.define([
 
 				// a partial response may already be contained, so only return here without updating the list when diff is empty
 				if (aContexts.diff && !aContexts.diff.length) {
+					if (sChangeReason === ChangeReason.Context) {
+						this._bSkippedItemsUpdateUntilDataReceived = true;
+					}
 					return;
 				}
 			}
@@ -604,6 +646,14 @@ sap.ui.define([
 			}
 		},
 
+		_onBindingDataReceivedListener: function(oEvent) {
+			if (this._bSkippedItemsUpdateUntilDataReceived && !oEvent.getParameter("data") /* request failed */) {
+				this._bSkippedItemsUpdateUntilDataReceived = false;
+				this.destroyListItems();
+				this._onAfterPageLoaded();
+			}
+		},
+
 		_updateTriggerDelayed: function(bLoading) {
 			if (this._oControl.getGrowingScrollToLoad()) {
 				this._iTriggerTimer && window.cancelAnimationFrame(this._iTriggerTimer);

package/src/sap/m/GrowingList.js

@@ -22,7 +22,7 @@ sap.ui.define(['./List', './library', './GrowingListRenderer'],
 	 * @extends sap.m.List
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/HBox.js

@@ -25,7 +25,7 @@ sap.ui.define(['./FlexBox', './library', './HBoxRenderer'],
 	 * @extends sap.m.FlexBox
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/HBoxRenderer.js

@@ -20,7 +20,7 @@ sap.ui.define(['./FlexBoxRenderer'],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.HBox} oControl an object representation of the control that should be rendered
 	 */
 	HBoxRenderer.render = function(oRm, oControl){
 		FlexBoxRenderer.render.apply(this, [oRm, oControl]);

package/src/sap/m/HeaderContainer.js

@@ -51,6 +51,7 @@ sap.ui.define([
 
 		// shortcut for sap.ui.core.Orientation
 		var Orientation = coreLibrary.Orientation;
+		var ScreenSizes = library.ScreenSizes;
 
 		var HeaderContainerItemContainer = Control.extend("sap.m.HeaderContainerItemContainer", {
 			metadata: {
@@ -124,7 +125,7 @@ sap.ui.define([
 		 * @since 1.44.0
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 *
 		 * @public
 		 * @alias sap.m.HeaderContainer
@@ -201,7 +202,14 @@ sap.ui.define([
 					/**
 					 * The height of the whole HeaderContainer. If not specified, it is rendered as 'auto' in horizontal orientation and as '100%' in vertical orientation.
 					 */
-					height: {type: "sap.ui.core.CSSSize", group: "Appearance"}
+					height: {type: "sap.ui.core.CSSSize", group: "Appearance"},
+					/**
+					* Enables grid layout in mobile view.
+                                        * @private
+                                        * @since 1.99
+					* @experimental since 1.99
+					*/
+					gridLayout: {type: "boolean", defaultValue: false}
 				},
 				defaultAggregation: "content",
 				aggregations: {
@@ -303,15 +311,17 @@ sap.ui.define([
 				}).addStyleClass("sapMHdrCntrBtn").addStyleClass("sapMHdrCntrRight");
 				this._oArrowNext._bExcludeFromTabChain = true;
 				this.setAggregation("_nextButton", this._oArrowNext, true);
-			} else if (Device.system.phone || Device.system.tablet) {
-				this._oArrowPrev = new Icon({
-					id: this.getId() + "-scrl-prev-button"
-				}).addStyleClass("sapMHdrCntrBtn").addStyleClass("sapMHdrCntrLeft");
-				this.setAggregation("_prevButton", this._oArrowPrev, true);
-				this._oArrowNext = new Icon({
-					id: this.getId() + "-scrl-next-button"
-				}).addStyleClass("sapMHdrCntrBtn").addStyleClass("sapMHdrCntrRight");
-				this.setAggregation("_nextButton", this._oArrowNext, true);
+			} else if ((Device.system.phone || Device.system.tablet)) {
+				if (!this._isMobileView()) {
+					this._oArrowPrev = new Icon({
+						id: this.getId() + "-scrl-prev-button"
+					}).addStyleClass("sapMHdrCntrBtn").addStyleClass("sapMHdrCntrLeft");
+					this.setAggregation("_prevButton", this._oArrowPrev, true);
+					this._oArrowNext = new Icon({
+						id: this.getId() + "-scrl-next-button"
+					}).addStyleClass("sapMHdrCntrBtn").addStyleClass("sapMHdrCntrRight");
+					this.setAggregation("_nextButton", this._oArrowNext, true);
+				}
 			}
 
 			this._oScrollCntr.addDelegate({
@@ -339,6 +349,45 @@ sap.ui.define([
 
 						this._handleMobileScrolling();
 					}
+					if (this._isMobileView()) {
+						var aItems = this._filterVisibleItems();
+						this.aItemSize = [];
+						this.aItemScrollValue = [0];
+						var fnGetItemSize = function (oItem) {
+							return oItem.getDomRef().parentElement.offsetWidth
+									+ parseFloat(getComputedStyle(oItem.getDomRef().parentElement).marginLeft)
+									+ parseFloat(getComputedStyle(oItem.getDomRef().parentElement).marginRight);
+						};
+						for (var i = 0; i < aItems.length; i++) {
+							this.aItemSize.push(fnGetItemSize(aItems[i]));
+							this.aItemScrollValue.push(this.aItemScrollValue[i] ? this.aItemScrollValue[i] + this.aItemSize[i] : this.aItemSize[i]);
+						}
+						this._oScrollCntr.attachBrowserEvent("scrollstop", function(oEvent){
+								if (!this.triggerScrollStop) {
+									this.triggerScrollStop = true;
+									var iScrollValue = 0, iScrollOffset = 15;
+									var iCurrectScrollValue = this._bRtl ? Math.abs(oEvent.currentTarget.scrollLeft) : oEvent.currentTarget.scrollLeft;
+									var value = this.aItemScrollValue.reduce(function(a, b) {
+										var aDiff = Math.abs(a - iCurrectScrollValue);
+										var bDiff = Math.abs(b - iCurrectScrollValue);
+										if (aDiff == bDiff) {
+											return a > b ? a : b;
+										} else {
+											return bDiff < aDiff ? b : a;
+										}
+									});
+									if (iCurrectScrollValue == 0) {
+										iScrollValue = 0;
+										this.triggerScrollStop = false;
+									} else {
+										iScrollValue = value - iScrollOffset - iCurrectScrollValue;
+									}
+									this._scroll(iScrollValue, this.getScrollTime());
+								} else {
+									this.triggerScrollStop = false;
+								}
+							}.bind(this));
+					}
 				}.bind(this)
 			});
 			IntervalTrigger.addListener(this._checkOverflow, this);
@@ -651,6 +700,7 @@ sap.ui.define([
 				}
 
 				return iSize !== 0 ? iSize + OFFSET - iButtonSize : 0;
+
 			}.bind(this);
 
 			var fnGetItemSize = function (oItem) {
@@ -693,7 +743,6 @@ sap.ui.define([
 				// we sum width (height for vertical) of each item and compare it with scrolling start position
 				for (var i = 0; i < aItems.length; i++) {
 					iSize += fnGetItemSize(aItems[i]);
-
 					if (iSize >= iScroll) {
 						iTarget = i;
 						break;
@@ -879,22 +928,22 @@ sap.ui.define([
 				bScrollForward = this._checkForOverflowItem(bScrollForward);
 
 				var bOldScrollBack = $ButtonContainer.is(":visible");
-				if (bOldScrollBack && !bScrollBack) {
+				if (bOldScrollBack && !bScrollBack && !this._isMobileView()) {
 					$ButtonContainer.hide();
 					this.$().removeClass("sapMHrdrLeftPadding");
 				}
-				if (!bOldScrollBack && bScrollBack) {
+				if (!bOldScrollBack && bScrollBack && !this._isMobileView()) {
 					$ButtonContainer.show();
 					this.$().addClass("sapMHrdrLeftPadding");
 				}
 
 				$ButtonContainer = this.$("next-button-container");
 				var bOldScrollForward = $ButtonContainer.is(":visible");
-				if (bOldScrollForward && !bScrollForward) {
+				if (bOldScrollForward && !bScrollForward && !this._isMobileView()) {
 					$ButtonContainer.hide();
 					this.$().removeClass("sapMHrdrRightPadding");
 				}
-				if (!bOldScrollForward && bScrollForward) {
+				if (!bOldScrollForward && bScrollForward && !this._isMobileView()) {
 					$ButtonContainer.show();
 					this.$().addClass("sapMHrdrRightPadding");
 				}
@@ -1008,6 +1057,12 @@ sap.ui.define([
 			}
 		};
 
+		HeaderContainer.prototype._isMobileView = function() {
+			return this.getGridLayout()
+						&& this.getOrientation() === Orientation.Horizontal
+						&& Device.resize.width >= ScreenSizes.xsmall && Device.resize.width < ScreenSizes.tablet;
+		};
+
 		/**
 		 * @description Unwraps the content of HeaderContainerItemContainer. Ignores elements that are not
 		 * HeaderContainerItemContainer (allowing the proper behavior if used with indexOf).

package/src/sap/m/HeaderContainerItemNavigator.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @since 1.67.0
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @alias sap.m.HeaderContainerItemNavigator

package/src/sap/m/HeaderContainerRenderer.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/library'],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm RenderManager that can be used for writing to the Render-Output-Buffer
-	 * @param {sap.ui.core.Control} oControl the control to be rendered
+	 * @param {sap.m.HeaderContainer} oControl the control to be rendered
 	 */
 	HeaderContainerRenderer.render = function(oRm, oControl) {
 		var sTooltip = oControl.getTooltip_AsString();

package/src/sap/m/HyphenationSupport.js

@@ -67,7 +67,7 @@ sap.ui.define([
 		 * first tries to set the <code>nodeValue</code> of the first child if it exists.
 		 *
 		 * @param {HTMLElement} oDomRef DOM reference of the text node container.
-		 * @param {String} [sNodeValue] new Node value.
+		 * @param {string} [sNodeValue] new Node value.
 		 * @private
 		 */
 		function setNodeValue(oDomRef, sNodeValue) {
@@ -134,10 +134,6 @@ sap.ui.define([
 				return false;
 			}
 
-			if (oControl.getWrapping && !oControl.getWrapping() && oControl.getWrappingType() === WrappingType.Hyphenated) {
-				Log.warning("[UI5 Hyphenation] The property wrappingType=Hyphenated will not take effect unless wrapping=true.", oControl.getId());
-			}
-
 			return (!oControl.getWrapping || oControl.getWrapping()) && oControl.getWrappingType() === WrappingType.Hyphenated;
 		}
 

package/src/sap/m/IconTabBar.js

@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @implements sap.m.ObjectHeaderContainer, sap.f.IDynamicPageStickyContent
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @public
 	 * @alias sap.m.IconTabBar

package/src/sap/m/IconTabBarDragAndDropUtil.js

@@ -32,9 +32,10 @@ sap.ui.define([
 
 			/**
 			 * Inserts control at correct place in the DOM.
-			 * @param {String} sInsertAfterBeforePosition comes from drop event, it can be "Before" or "After"
-			 * @param {object} $DraggedControl control that is being dragged
-			 * @param {object} $DroppedControl control that the dragged control will be dropped on
+			 * @param {string} sInsertAfterBeforePosition comes from drop event, it can be "Before" or "After"
+			 * @param {object} oDraggedControl control that is being dragged
+			 * @param {object} oDroppedControl control that the dragged control will be dropped on
+			 * @param {boolean} bIsOverflow
 			 */
 			_insertControl: function(sInsertAfterBeforePosition, oDraggedControl, oDroppedControl, bIsOverflow) {
 				var $DraggedControl = oDraggedControl.$(),
@@ -82,7 +83,7 @@ sap.ui.define([
 			/**
 			 * Handles drop event.
 			 * @param {object} oContext from which context function is called (sap.m.IconTabHeader or sap.m.IconTabSelectList)
-			 * @param {String} sDropPosition comes from drop event, it can be "Before", "After", or "On"
+			 * @param {string} sDropPosition comes from drop event, it can be "Before", "After", or "On"
 			 * @param {object} oDraggedControl control that is being dragged
 			 * @param {object} oDroppedControl control that the dragged control will be dropped on
 			 * @param {boolean} bIgnoreRTL should RTL configuration be ignored for drag and drop logic

package/src/sap/m/IconTabBarSelectList.js

@@ -12,8 +12,7 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/delegate/ItemNavigation",
 	"sap/ui/core/theming/Parameters",
-	"sap/ui/core/library",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/core/library"
 ], function(
 	library,
 	IconTabBarDragAndDropUtil,
@@ -21,8 +20,7 @@ sap.ui.define([
 	Control,
 	ItemNavigation,
 	Parameters,
-	coreLibrary,
-	jQuery
+	coreLibrary
 ) {
 	"use strict";
 
@@ -40,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private
@@ -228,6 +226,17 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * Checks if all tabs are textOnly version.
+	 * @private
+	 * @returns {boolean} True if all tabs are textOnly version, otherwise false
+	 */
+	IconTabBarSelectList.prototype._checkTextOnly = function () {
+		return this.getItems().every(function (oItem) {
+			return oItem.isA('sap.m.IconTabSeparator') || !oItem.getIcon();
+		});
+	};
+
 	/**
 	 * Handles tap event.
 	 * @private

package/src/sap/m/IconTabBarSelectListRenderer.js

@@ -31,7 +31,7 @@ sap.ui.define([
 		var mParams = oSelectList._getParams(),
 			aItems = oSelectList.getVisibleItems(),
 			oIconTabHeader = oSelectList._oIconTabHeader,
-			bTextOnly = oIconTabHeader._checkTextOnly(),
+			bTextOnly = oSelectList._checkTextOnly(),
 			iTotalItemsCount = oIconTabHeader.getVisibleTabFilters().length,
 			fNestedItemPaddingLeft = mParams.fNestedItemPaddingLeft,
 			bExtraIndent = false;

package/src/sap/m/IconTabFilter.js

@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -176,7 +176,6 @@ sap.ui.define([
 			/**
 			 * The sub items of this filter (optional).
 			 * @since 1.77
-			 * @experimental As of 1.77
 			 */
 			items : {type : "sap.m.IconTab", multiple : true, singularName : "item"},
 
@@ -441,6 +440,10 @@ sap.ui.define([
 			bShowAll = this.getShowAll(),
 			sTextDir = this.getTextDirection();
 
+		if (this._isOverflow()){
+			mAriaParams.role = "button";
+		}
+
 		if (bHasIconTabBar) {
 			mAriaParams.controls = oIconTabBar.getId() + "-content";
 		}
@@ -515,7 +518,9 @@ sap.ui.define([
 				.attr("aria-disabled", true);
 		}
 
-		oRM.attr("aria-selected", false);
+		if (!this._isOverflow()) {
+			oRM.attr("aria-selected", false);
+		}
 
 		var sTooltip = this.getTooltip_AsString();
 		if (sTooltip) {
@@ -663,14 +668,14 @@ sap.ui.define([
 			return;
 		}
 
-		var bTextOnly = true,
-			bIconOnly = oSelectList._bIconOnly,
+		var bIconOnly = oSelectList._bIconOnly,
+			bTextOnlyItemsInSelectList = true,
 			oIconTabHeader = oSelectList._oIconTabHeader,
 			sIconColor = this.getIconColor(),
 			bEnabled = this.getEnabled();
 
 		if (oIconTabHeader) {
-			bTextOnly = oIconTabHeader._bTextOnly;
+			bTextOnlyItemsInSelectList = oSelectList._checkTextOnly();
 		}
 
 		oRM.openStart("li", this)
@@ -720,7 +725,7 @@ sap.ui.define([
 			aLabelledByIds.push(sItemId + "-text");
 		}
 
-		if (!bTextOnly && this.getIcon()) {
+		if (!bTextOnlyItemsInSelectList && this.getIcon()) {
 			aLabelledByIds.push(sItemId + "-icon");
 		}
 
@@ -735,7 +740,7 @@ sap.ui.define([
 			this._renderIconColorDescription(oRM);
 		}
 
-		if (!bTextOnly) {
+		if (!bTextOnlyItemsInSelectList) {
 			this._renderIcon(oRM, bIconOnly);
 		}
 
@@ -865,7 +870,7 @@ sap.ui.define([
 		}
 
 		var iTabFilters = this._getIconTabHeader()
-			._getItemsForOverflow(this._bIsStartOverflow)
+			._getItemsForOverflow(this._bIsStartOverflow, true)
 			.filter(function (oItem) { return oItem.isA("sap.m.IconTabFilter"); })
 			.length;
 

package/src/sap/m/IconTabFilterExpandButtonBadge.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private