@openui5/sap.m 1.93.3 → 1.96.2

package/src/sap/m/GenericTileRenderer.js

@@ -17,6 +17,8 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 	// shortcut for sap.m.FrameType
 	var frameTypes = library.FrameType;
 
+	var ValueColor = library.ValueColor;
+
 	var oRb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 	/**
@@ -48,7 +50,7 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 		var isHalfFrame = frameType === frameTypes.OneByHalf || frameType === frameTypes.TwoByHalf;
 
 		// Render a link when URL is provided, not in action scope and the state is enabled
-		var bRenderLink = oControl.getUrl() && !oControl._isInActionScope() && sState !== LoadState.Disabled;
+		var bRenderLink = oControl.getUrl() && !oControl._isInActionScope() && sState !== LoadState.Disabled && !oControl._isNavigateActionEnabled() && !oControl._isActionMode();
 
 		if (oControl._isInActionScope()) {
 			sScopeClass = encodeCSS("sapMGTScopeActions");
@@ -76,10 +78,40 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 		if (!oControl._isInActionScope() && oControl._bShowActionsView) {
 			oRm.class("sapMGTScopeActions");
 		}
-		oRm.class(frameType);
-		if (frameType === frameTypes.OneByOne && oControl.getSystemInfo() || oControl.getAppShortcut()){
+		//Set respective Class for IconMode
+		if (oControl._isIconMode()){
+			if (frameType === frameTypes.OneByOne) {
+				var sClass = "sapMGTOneByOne";
+			} else if (frameType === frameTypes.TwoByHalf) {
+				var sClass = "TwoByHalf";
+			}
+		}
+		oRm.class(oControl._isIconMode() ? sClass : frameType);
+
+		var bIsArticleMode = oControl.getMode() === GenericTileMode.ArticleMode,
+			bIsActionMode = oControl.getMode() === GenericTileMode.ActionMode;
+
+		if (bIsActionMode) {
+			oRm.class("sapMGTActionMode");
+		}
+		if (bIsArticleMode) {
+			oRm.class("sapMGTArticleMode");
+		}
+		if (oControl._isIconMode()) {
+			oRm.class("sapMGTIconMode");
+		}
+		if (!bIsArticleMode && !bIsActionMode && frameType === frameTypes.OneByOne && oControl.getSystemInfo() || oControl.getAppShortcut()) {
 			oRm.class("tileWithAppInfo");
 		}
+		//Set respective Class/ BackgroundColor for IconMode
+		if (oControl._isIconMode()) {
+			if (frameType === frameTypes.TwoByHalf) {
+				oRm.class("sapMGTTwoByHalf");
+			} else {
+				oRm.style("background-color", oControl.getBackgroundColor());
+			}
+		}
+
 		if (sAriaRole) {
 			oRm.attr("role", sAriaRole);
 		} else if (!bRenderLink) { // buttons only; <a> elements always have the default role
@@ -96,9 +128,12 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 			oRm.attr("aria-roledescription", oRb.getText("GENERIC_TILE_ROLE_DESCRIPTION"));
 		}
 		if (sState !== LoadState.Disabled) {
-			if (!oControl.isInActionRemoveScope()) {
+			if (!oControl.isInActionRemoveScope() && oControl.getPressEnabled()) {
 				oRm.class("sapMPointer");
 			}
+			if (!oControl.getPressEnabled()) {
+				oRm.class("sapMAutoPointer");
+			}
 			oRm.attr("tabindex", "0");
 		}
 		if (oControl.getWidth()) {
@@ -117,109 +152,192 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 		var isFooterPresent = false;
 		var isContentPresent = false;
 		if (sState === LoadState.Loading) {
-
-			oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItem");
-			oRm.class("sapMGTContentShimmerPlaceholderWithDescription");
-			oRm.openEnd();
-			oRm.openStart("div")
-				.class("sapMGTContentShimmerPlaceholderRows")
-				.openEnd();
-			oRm.openStart("div")
-				.class("sapMGTContentShimmerPlaceholderItemHeader")
-				.class("sapMGTLoadingShimmer")
-				.openEnd()
-				.close("div");
-			oRm.openStart("div")
-				.class("sapMGTContentShimmerPlaceholderItemText")
-				.class("sapMGTLoadingShimmer")
-				.openEnd()
-				.close("div");
-			if (!isHalfFrame) {
+			//Setplaceholders for IconMode.
+			if ( oControl._isIconMode() ) {
+				if (frameType === frameTypes.OneByOne) {
+					oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItemOneByOne");
+					oRm.class("sapMGTContentShimmerPlaceholderWithDescriptionOneByOne");
+					oRm.openEnd();
+					oRm.openStart("div")
+						.class("sapMGTContentShimmerPlaceholderRowsOneByOne")
+						.openEnd();
+					oRm.openStart("div")
+						.class("sapMGTContentShimmerPlaceholderIconOneByOne")
+						.class("sapMGTLoadingShimmer")
+						.openEnd()
+						.close("div");
+					oRm.openStart("div")
+						.class("sapMGTContentShimmerPlaceholderItemTextOneByOne")
+						.class("sapMGTLoadingShimmer")
+						.openEnd()
+						.close("div");
+				} else {
+					oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItemTwoByHalf");
+					oRm.class("sapMGTContentShimmerPlaceholderWithDescriptionTwoByHalf");
+					oRm.openEnd();
+					oRm.openStart("div")
+						.class("sapMGTContentShimmerPlaceholderRowsTwoByHalf")
+						.openEnd();
+					oRm.openStart("div")
+						.class("sapMGTContentShimmerPlaceholderIconTwoByHalf")
+						.class("sapMGTLoadingShimmer")
+						.openEnd()
+						.close("div");
+					oRm.openStart("div")
+						.class("sapMGTContentShimmerPlaceholderItemTextTwoByHalf")
+						.class("sapMGTLoadingShimmer")
+						.openEnd()
+						.close("div");
+				}
+				oRm.close("div");
+				oRm.close("div");
+			} else {
+				oRm.openStart("div").class("sapMGTContentShimmerPlaceholderItem");
+				oRm.class("sapMGTContentShimmerPlaceholderWithDescription");
+				oRm.openEnd();
 				oRm.openStart("div")
-					.class("sapMGTContentShimmerPlaceholderItemBox")
+					.class("sapMGTContentShimmerPlaceholderRows")
+					.openEnd();
+				oRm.openStart("div")
+					.class("sapMGTContentShimmerPlaceholderItemHeader")
 					.class("sapMGTLoadingShimmer")
 					.openEnd()
 					.close("div");
 				oRm.openStart("div")
-					.class("sapMGTContentShimmerPlaceholderItemTextFooter")
+					.class("sapMGTContentShimmerPlaceholderItemText")
 					.class("sapMGTLoadingShimmer")
 					.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");
+				}
+				oRm.close("div");
+				oRm.close("div");
+			}
+		} else {
+			if (this._isValueColorValid(oControl.getValueColor())) {
+				oRm.openStart("div");
+				oRm.class("sapMGTCriticalBorder");
+					oRm.class(oControl.getValueColor());
+				oRm.openEnd();
+				oRm.close("div");
+			}
+			//Set respective Class/ BackgroundColor for IconMode
+			if (oControl._isIconMode()) {
+				oRm.openStart("div");
+				if (frameType === frameTypes.OneByOne) {
+					oRm.class("sapMGTOneByOneIcon");
+				} else {
+					oRm.class("sapMGTTwoByHalfIcon");
+					oRm.style("background-color", oControl.getBackgroundColor());
+				}
+				oRm.openEnd();
+				if (oControl.getTileIcon()) {
+					var sAggregation = oControl._generateIconAggregation(oControl.getTileIcon());
+					if (sAggregation) {
+						oRm.renderControl(oControl.getAggregation(sAggregation));
+					}
+				}
+				oRm.close("div");
 			}
 
+			oRm.openStart("div");
+			oRm.class("sapMGTHdrContent");
+			if (oControl._isIconMode() ){
+				if (frameType === frameTypes.OneByOne) {
+					var sClass = "sapMGTOneByOne";
+				} else if (frameType === frameTypes.TwoByHalf) {
+					var sClass = "TwoByHalf";
+				}
+			}
+			oRm.class(oControl._isIconMode()	? sClass : frameType);
+			if (sTooltipText) {
+				oRm.attr("title", sTooltipText);
+			}
+			oRm.openEnd();
 
+			//Render Header Image
+			if (sHeaderImage) {
+				oControl._oImage.removeStyleClass(ValueColor.None);
+				if (this._sPreviousStyleClass) {
+					oControl._oImage.removeStyleClass(this._sPreviousStyleClass);
+				}
+				this._sPreviousStyleClass = this._isValueColorValid(oControl.getValueColor()) ? oControl.getValueColor() : ValueColor.None;
+				oControl._oImage.addStyleClass(this._sPreviousStyleClass);
 
-			oRm.close("div");
-			oRm.close("div");
-		} else {
-		oRm.openStart("div");
-		oRm.class("sapMGTHdrContent");
-		oRm.class(frameType);
-		if (sTooltipText) {
-			oRm.attr("title", sTooltipText);
-		}
-		oRm.openEnd();
-		if (sHeaderImage) {
-			oRm.renderControl(oControl._oImage);
-		}
+				oRm.renderControl(oControl._oImage);
+			}
 
-		this._renderHeader(oRm, oControl);
-		for (var i = 0; i < iLength; i++) {
-			isFooterPresent = oControl._checkFooter(aTileContent[i], oControl) && aTileContent[i].getFooter();
-			if (aTileContent[i].getAggregation("content") !== null){
-				if (frameType === frameTypes.OneByHalf && aTileContent[i].getAggregation("content").getMetadata()._sClassName === "sap.m.ImageContent") {
-					isContentPresent = false;
-				} else {
-					isContentPresent = true;
-					break;
+			this._renderHeader(oRm, oControl);
+			for (var i = 0; i < iLength; i++) {
+				isFooterPresent = oControl._checkFooter(aTileContent[i], oControl) && aTileContent[i].getFooter();
+				if (aTileContent[i].getAggregation("content") !== null){
+					if (frameType === frameTypes.OneByHalf && aTileContent[i].getAggregation("content").getMetadata()._sClassName === "sap.m.ImageContent") {
+						isContentPresent = false;
+					} else {
+						isContentPresent = true;
+						break;
+					}
 				}
 			}
-		}
-		if (!(isHalfFrame && isContentPresent)) {
-			if (oControl.getSubheader()) {
-				this._renderSubheader(oRm, oControl);
-			}
-		}
 
-		oRm.close("div");
+			if (!(isHalfFrame && isContentPresent)) {
+				if (oControl.getSubheader() && (!oControl._isIconMode())) {//Restrict creation of SubHeader for IconMode
+					this._renderSubheader(oRm, oControl);
+				}
+			}
 
-		oRm.openStart("div", oControl.getId() + "-content");
-		oRm.class("sapMGTContent");
-		if (isFooterPresent && frameType === frameTypes.OneByOne && (oControl.getSystemInfo() || oControl.getAppShortcut())) {
-			oRm.class("appInfoWithFooter");
-		} else {
-			oRm.class("appInfoWithoutFooter");
-		}
-		oRm.openEnd();
-		for (var i = 0; i < iLength; i++) {
-			oRm.renderControl(aTileContent[i]);
-		}
-		oRm.close("div");
-		if (frameType === frameTypes.OneByOne && (oControl.getSystemInfo() || oControl.getAppShortcut())){
+			oRm.close("div");
 
-			oRm.openStart("div", oControl.getId() + "-tInfo");
-			oRm.class("sapMGTTInfoContainer");
-			oRm.openEnd();
-			oRm.openStart("div");
-			oRm.class("sapMGTTInfo");
-			oRm.openEnd();
-			if (oControl.getAppShortcut()) {
-				oRm.openStart("div", oControl.getId() + "-appShortcut");
-				oRm.class("sapMGTAppShortcutText").openEnd();
-				oRm.renderControl(oControl._oAppShortcut);
+			if ( !oControl._isIconMode() ) { //Restrict creation of Footer for IconMode
+				oRm.openStart("div", oControl.getId() + "-content");
+				oRm.class("sapMGTContent");
+				if (isFooterPresent && frameType === frameTypes.OneByOne && (oControl.getSystemInfo() || oControl.getAppShortcut())) {
+					oRm.class("appInfoWithFooter");
+				} else {
+					oRm.class("appInfoWithoutFooter");
+				}
+				oRm.openEnd();
+				for (var i = 0; i < iLength; i++) {
+					oRm.renderControl(aTileContent[i]);
+				}
 				oRm.close("div");
 			}
-			if (oControl.getSystemInfo()) {
-				oRm.openStart("div", oControl.getId() + "-sytemInfo");
-				oRm.class("sapMGTSystemInfoText").openEnd();
-				oRm.renderControl(oControl._oSystemInfo);
+
+			//Restrict creation of InfoContainer for IconMode, ActionMode and ArticleMode
+			if (!bIsArticleMode && !bIsActionMode && !oControl._isIconMode() && (frameType === frameTypes.OneByOne && (oControl.getSystemInfo() || oControl.getAppShortcut()))){
+				oRm.openStart("div", oControl.getId() + "-tInfo");
+				oRm.class("sapMGTTInfoContainer");
+				oRm.openEnd();
+				oRm.openStart("div");
+				oRm.class("sapMGTTInfo");
+				oRm.openEnd();
+				if (oControl.getAppShortcut()) {
+					oRm.openStart("div", oControl.getId() + "-appShortcut");
+					oRm.class("sapMGTAppShortcutText").openEnd();
+					oRm.renderControl(oControl._oAppShortcut);
+					oRm.close("div");
+				}
+				if (oControl.getSystemInfo()) {
+					oRm.openStart("div", oControl.getId() + "-sytemInfo");
+					oRm.class("sapMGTSystemInfoText").openEnd();
+					oRm.renderControl(oControl._oSystemInfo);
+					oRm.close("div");
+				}
+				oRm.close("div");
 				oRm.close("div");
 			}
-			oRm.close("div");
-			oRm.close("div");
 		}
-	}
-	if (sState !== LoadState.Loaded && sState !== LoadState.Loading) {
+		if (sState !== LoadState.Loaded && sState !== LoadState.Loading) {
 			this._renderStateOverlay(oRm, oControl, sTooltipText);
 		}
 
@@ -241,6 +359,13 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 	GenericTileRenderer._renderFocusDiv = function(oRm, oControl) {
 		oRm.openStart("div", oControl.getId() + "-focus");
 		oRm.class("sapMGTFocusDiv");
+		if (oControl._isIconMode()) { //Set respective BorderRadius for IconMode
+			if (oControl.getFrameType() === frameTypes.OneByOne) {
+				oRm.style("border-radius", "1rem");
+			} else {
+				oRm.style("border-radius", "0.75rem");
+			}
+		}
 		oRm.openEnd();
 		oRm.close("div");
 	};
@@ -296,6 +421,13 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 			oRm.class("sapMGTWithImageHoverOverlay");
 		} else {
 			oRm.class("sapMGTWithoutImageHoverOverlay");
+			if (oControl._isIconMode()) { //Set respective BorderRadius for IconMode
+				if (oControl.getFrameType() === frameTypes.OneByOne) {
+					oRm.style("border-radius", "1rem");
+				} else {
+					oRm.style("border-radius", "0.75rem");
+				}
+			}
 		}
 		oRm.openEnd();
 		oRm.close("div");
@@ -331,6 +463,18 @@ sap.ui.define(["sap/m/library", "sap/base/security/encodeCSS"],
 		oRm.close("div");
 	};
 
+	/**
+	 * Checks for valid value color
+	 *
+	 * @private
+	 */
+	 GenericTileRenderer._isValueColorValid = function(sValueColor) {
+		if (sValueColor == ValueColor.Good || sValueColor == ValueColor.Error || sValueColor == ValueColor.Neutral || sValueColor == ValueColor.Critical) {
+			return true;
+		}
+		return false;
+	};
+
 	return GenericTileRenderer;
 
 }, /* bExport= */true);

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/HeaderContainer.js

@@ -17,6 +17,7 @@ sap.ui.define([
 		'sap/ui/core/Icon',
 		'./HeaderContainerRenderer',
 		"sap/base/Log",
+		"sap/ui/events/KeyCodes",
 		"sap/ui/events/PseudoEvents",
 		"sap/ui/thirdparty/jquery",
 		// jQuery Plugin "control"
@@ -42,6 +43,7 @@ sap.ui.define([
 		Icon,
 		HeaderContainerRenderer,
 		Log,
+		KeyCodes,
 		PseudoEvents,
 		jQuery
 	) {
@@ -122,7 +124,7 @@ sap.ui.define([
 		 * @since 1.44.0
 		 *
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.2
 		 *
 		 * @public
 		 * @alias sap.m.HeaderContainer
@@ -476,6 +478,56 @@ sap.ui.define([
 		/* =========================================================== */
 		/* Private methods                                             */
 		/* =========================================================== */
+		/**
+		 * Handle the key dwon event for Arrow Naviagtion.
+		 * @param {jQuery.Event} oEvent - the keyboard event.
+		 * @private
+		 */
+		 HeaderContainer.prototype.onkeydown = function(oEvent) {
+			var bHorizontal = this.getOrientation() === Orientation.Horizontal,
+				$prevButton = this.$("prev-button-container"),
+				$nextButton = this.$("next-button-container"),
+				iScrollSize, iButtonSize = 0,
+				aItems = this._filterVisibleItems();
+			if (oEvent.which === KeyCodes.ARROW_RIGHT && bHorizontal) {
+				iScrollSize = aItems[oEvent.srcControl.mProperties.position - 1].$().parent().outerWidth(true);
+				if (iScrollSize < this._getSize($prevButton.is(":visible"))){
+					this._scroll((iScrollSize - iButtonSize), this.getScrollTime());
+				}
+			} else if (oEvent.which === KeyCodes.ARROW_LEFT && bHorizontal) {
+				iScrollSize = aItems[oEvent.srcControl.mProperties.position - 1].$().parent().outerWidth(true);
+				if (iScrollSize < this._getSize($nextButton.is(":visible"))) {
+					if (!$nextButton.is(":visible")) {
+						var OFFSET = 10;
+						if (iScrollSize + OFFSET < this._getSize(true)) {
+							iButtonSize = $nextButton.width() + OFFSET;
+						} else {
+							iButtonSize = $nextButton.width();
+						}
+					}
+					this._scroll(-(iScrollSize - iButtonSize), this.getScrollTime());
+				}
+			}
+			if (oEvent.which === KeyCodes.ARROW_DOWN && !bHorizontal) {
+				iScrollSize = aItems[oEvent.srcControl.mProperties.position - 1].$().parent().outerHeight(true);
+				if (iScrollSize < this._getSize($prevButton.is(":visible"))) {
+					this._scroll((iScrollSize - iButtonSize), this.getScrollTime());
+				}
+			} else if (oEvent.which === KeyCodes.ARROW_UP && !bHorizontal) {
+				iScrollSize = aItems[oEvent.srcControl.mProperties.position - 1].$().parent().outerHeight(true);
+				if (iScrollSize < this._getSize($nextButton.is(":visible"))) {
+					if (!$nextButton.is(":visible")) {
+						var OFFSET = 10;
+						if (iScrollSize + OFFSET < this._getSize(true)) {
+							iButtonSize = $nextButton.height() + OFFSET;
+						} else {
+							iButtonSize = $nextButton.wheightidth();
+						}
+					}
+					this._scroll(-(iScrollSize - iButtonSize), this.getScrollTime());
+				}
+			}
+		};
 		HeaderContainer.prototype._setScrollInProcess = function (value) {
 			this.bScrollInProcess = value;
 		};

package/src/sap/m/HeaderContainerItemNavigator.js

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

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @alias sap.m.IconTabBar
@@ -289,6 +289,12 @@ sap.ui.define([
 					 */
 					key : {type : "string"},
 
+					/**
+					 * The key of the previous selected item
+					 * @since 1.96
+					 */
+					previousKey : {type : "string"},
+
 					/**
 					 * The selected item
 					 * @deprecated As of 1.15.0, replaced by parameter <code>item</code> instead.
@@ -627,6 +633,7 @@ sap.ui.define([
 			this._getIconTabHeader().$().remove();
 		}
 	};
+
 	/* =========================================================== */
 	/*           begin: reflectors for header properties           */
 	/* =========================================================== */

package/src/sap/m/IconTabBarSelectList.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/IconTabFilter.js

@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public
@@ -419,12 +419,14 @@ sap.ui.define([
 		if (!this.getVisible()) {
 			return;
 		}
+		var oIconTabHeader = this.getParent(),
+			oIconTabBar = oIconTabHeader.getParent();
 
-		this._prepareDragEventDelegate();
+		if (oIconTabHeader.getEnableTabReordering()) {
+			this._prepareDragEventDelegate();
+		}
 
-		var oIconTabHeader = this.getParent(),
-			oIconTabBar = oIconTabHeader.getParent(),
-			bHasIconTabBar = oIconTabHeader._isInsideIconTabBar(),
+		var bHasIconTabBar = oIconTabHeader._isInsideIconTabBar(),
 			mAriaParams = { role: "tab" },
 			sId = this.getId(),
 			sCount = this.getCount(),
@@ -453,7 +455,7 @@ sap.ui.define([
 
 			var aId = [];
 
-			if (sCount !== "") {
+			if (sCount !== "" && !bInLine) {
 				aId.push(sId + "-count");
 			}
 			if (sText.length) {

package/src/sap/m/IconTabFilterExpandButtonBadge.js

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

package/src/sap/m/IconTabHeader.js

@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public
@@ -220,7 +220,13 @@ sap.ui.define([
 					 * The key of the selected item
 					 * @since 1.15.0
 					 */
-					key : {type : "string"}
+					key : {type : "string"},
+
+					/**
+					 * The key of the previous selected item
+					 * @since 1.96
+					 */
+					previousKey : {type : "string"}
 				}
 			}
 		}
@@ -523,6 +529,7 @@ sap.ui.define([
 
 		var oParent = this.getParent();
 		var bIsParentIconTabBar = this._isInsideIconTabBar();
+		var sPrevKey = this.getSelectedKey();
 
 		//if the old selected tab and the new selected tab both have no own content, which means they both use the same content from the icontabbar
 		//there is no need to rerender the content
@@ -595,7 +602,8 @@ sap.ui.define([
 					selectedItem: this.oSelectedItem,
 					selectedKey: sSelectedKey,
 					item: this.oSelectedItem,
-					key: sSelectedKey
+					key: sSelectedKey,
+					previousKey: sPrevKey
 				});
 			} else {
 				// fire event on header
@@ -603,7 +611,8 @@ sap.ui.define([
 					selectedItem: this.oSelectedItem,
 					selectedKey: sSelectedKey,
 					item: this.oSelectedItem,
-					key: sSelectedKey
+					key: sSelectedKey,
+					previousKey: sPrevKey
 				});
 			}
 		}
@@ -1044,6 +1053,9 @@ sap.ui.define([
 		oOverflow.$().addClass("sapMITHOverflowVisible");
 		this.$().addClass("sapMITHEndOverflowList");
 
+		// width has changed after the overflow became visible
+		iTabStripWidth = oTabStrip.offsetWidth;
+
 		// has "end", but no "start" overflow
 		if (!bHasStartOverflow) {
 			iLastVisible = this._findLastVisibleItem(aItems, iTabStripWidth, mSelectedItem.width);

package/src/sap/m/IconTabSeparator.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Image.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @public
 	 * @alias sap.m.Image