@openui5/sap.m 1.96.2 → 1.98.0

package/src/sap/m/IconTabHeader.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -242,6 +242,9 @@ sap.ui.define([
 	EnabledPropagator.apply(IconTabHeader.prototype, [true]);
 
 	IconTabHeader.prototype.init = function () {
+		// if it is "true", the "select" event will be fired
+		// even when the "selectedKey" property is changed via API (without user interaction).
+		this._bFireSelectEvent = false;
 		this._aTabKeys = [];
 		this._oAriaHeadText = null;
 		this._bIsRendered = false;
@@ -480,7 +483,8 @@ sap.ui.define([
 	IconTabHeader.prototype.setSelectedKey = function (sKey) {
 		var aItems = this.getTabFilters(),
 			bIsParentIconTabBar = this._isInsideIconTabBar(),
-			bSelectedItemFound;
+			bSelectedItemFound,
+			bApiChange = true;
 
 		if (aItems.length > 0) {
 			sKey = sKey || aItems[0]._getNonEmptyKey();
@@ -490,7 +494,7 @@ sap.ui.define([
 		if (this.$().length) {
 			for (var i = 0; i < aItems.length; i++) {
 				if (aItems[i]._getNonEmptyKey() === sKey) {
-					this.setSelectedItem(aItems[i], true);
+					this.setSelectedItem(aItems[i], bApiChange);
 					bSelectedItemFound = true;
 					break;
 				}
@@ -595,6 +599,12 @@ sap.ui.define([
 			oParent.setProperty("selectedKey", sSelectedKey, true);
 		}
 
+		if (bIsParentIconTabBar) {
+			bAPIChange = bAPIChange && !oParent._bFireSelectEvent;
+		} else {
+			bAPIChange = bAPIChange && !this._bFireSelectEvent;
+		}
+
 		if (!bAPIChange) {
 			// fire event on iconTabBar
 			if (bIsParentIconTabBar) {
@@ -1050,14 +1060,13 @@ sap.ui.define([
 			iLastVisible,
 			i;
 
-		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) {
+			oOverflow.$().addClass("sapMITHOverflowVisible");
+			this.$().addClass("sapMITHEndOverflowList");
+			// width has changed after the overflow became visible
+			iTabStripWidth = oTabStrip.offsetWidth;
+
 			iLastVisible = this._findLastVisibleItem(aItems, iTabStripWidth, mSelectedItem.width);
 
 			for (i = iLastVisible + 1; i < aItems.length; i++) {
@@ -1069,16 +1078,13 @@ sap.ui.define([
 			return;
 		}
 
-		oStartOverflow.$().addClass("sapMITHOverflowVisible");
-		this.$().addClass("sapMITHStartOverflowList");
-
-		oOverflow.$().removeClass("sapMITHOverflowVisible");
-		this.$().removeClass("sapMITHEndOverflowList");
-
-		iTabStripWidth = oTabStrip.offsetWidth;
-
 		// has "start", but no "end" overflow
 		if (!bHasEndOverflow) {
+			oStartOverflow.$().addClass("sapMITHOverflowVisible");
+			this.$().addClass("sapMITHStartOverflowList");
+			// width has changed after the overflow became visible
+			iTabStripWidth = oTabStrip.offsetWidth;
+
 			iFirstVisible = this._findFirstVisibleItem(aItems, iTabStripWidth, mSelectedItem.width);
 
 			for (i = iFirstVisible - 1; i >= 0; i--) {
@@ -1091,18 +1097,14 @@ sap.ui.define([
 		}
 
 		// has "start" and "end" overflows
+		oStartOverflow.$().addClass("sapMITHOverflowVisible");
+		this.$().addClass("sapMITHStartOverflowList");
+
 		oOverflow.$().addClass("sapMITHOverflowVisible");
 		this.$().addClass("sapMITHEndOverflowList");
-
+		// width has changed after the overflow became visible
 		iTabStripWidth = oTabStrip.offsetWidth;
 
-		var aLeftItems = [],
-			iIndex;
-
-		for (iIndex = 0; iIndex < mSelectedItem.index; iIndex++) {
-			aLeftItems.push(aItems[iIndex]);
-		}
-
 		iFirstVisible = this._findFirstVisibleItem(aItems, iTabStripWidth, mSelectedItem.width, mSelectedItem.index - 1);
 		iLastVisible = this._findLastVisibleItem(aItems, iTabStripWidth, mSelectedItem.width, iFirstVisible);
 
@@ -1121,7 +1123,6 @@ sap.ui.define([
 	};
 
 	IconTabHeader.prototype._hasStartOverflow = function (iTabStripWidth, aItems, mSelectedItem) {
-
 		if (mSelectedItem.index === 0) {
 			return false;
 		}
@@ -1133,11 +1134,25 @@ sap.ui.define([
 			iLeftItemsWidth += this._getItemSize(aItems[i]);
 		}
 
-		return iTabStripWidth < iLeftItemsWidth + mSelectedItem.width;
+		var bHasStartOverflow = iTabStripWidth < iLeftItemsWidth + mSelectedItem.width;
+
+		// if there is no "start" overflow, it has "end" overflow
+		// check it again with the "end" overflow
+		if (!bHasStartOverflow) {
+			this._getOverflow().$().addClass("sapMITHOverflowVisible");
+			this.$().addClass("sapMITHEndOverflowList");
+
+			iTabStripWidth = this.getDomRef("head").offsetWidth;
+			bHasStartOverflow = iTabStripWidth < iLeftItemsWidth + mSelectedItem.width;
+
+			this._getOverflow().$().removeClass("sapMITHOverflowVisible");
+			this.$().removeClass("sapMITHEndOverflowList");
+		}
+
+		return bHasStartOverflow;
 	};
 
 	IconTabHeader.prototype._hasEndOverflow = function (iTabStripWidth, aItems, mSelectedItem) {
-
 		if (mSelectedItem.index >= aItems.length) {
 			return false;
 		}
@@ -1149,7 +1164,22 @@ sap.ui.define([
 			iRightItemsWidth += this._getItemSize(aItems[i]);
 		}
 
-		return iTabStripWidth < iRightItemsWidth + mSelectedItem.width;
+		var bHasEndOverflow = iTabStripWidth < iRightItemsWidth + mSelectedItem.width;
+
+		// if there is no "end" overflow, it has "start" overflow
+		// check it again with the "start" overflow
+		if (!bHasEndOverflow) {
+			this._getStartOverflow().$().addClass("sapMITHOverflowVisible");
+			this.$().addClass("sapMITHStartOverflowList");
+
+			iTabStripWidth = this.getDomRef("head").offsetWidth;
+			bHasEndOverflow = iTabStripWidth < iRightItemsWidth + mSelectedItem.width;
+
+			this._getStartOverflow().$().removeClass("sapMITHOverflowVisible");
+			this.$().removeClass("sapMITHStartOverflowList");
+		}
+
+		return bHasEndOverflow;
 	};
 
 	IconTabHeader.prototype._getSelectedItemIndexAndSize = function (aItems, oSelectedItemDomRef) {
@@ -1167,6 +1197,7 @@ sap.ui.define([
 		// if previous item is a separator - remove it
 		if (oSelectedSeparator) {
 			aItems.splice(iSelectedItemIndex - 1, 1);
+			iSelectedItemIndex--;
 		}
 
 		return {
@@ -1176,7 +1207,7 @@ sap.ui.define([
 	};
 
 	IconTabHeader.prototype._findFirstVisibleItem = function (aItems, iTabStripWidth, iSelectedItemWidth, iStartIndex) {
-		var iLastVisible = aItems.length,
+		var iLastVisible,
 			iIndex,
 			iItemSize;
 
@@ -1184,6 +1215,8 @@ sap.ui.define([
 			iStartIndex = aItems.length - 1;
 		}
 
+		iLastVisible = iStartIndex + 1;
+
 		for (iIndex = iStartIndex; iIndex >= 0; iIndex--) {
 			iItemSize = this._getItemSize(aItems[iIndex]);
 
@@ -1199,11 +1232,12 @@ sap.ui.define([
 	};
 
 	IconTabHeader.prototype._findLastVisibleItem = function (aItems, iTabStripWidth, iSelectedItemWidth, iStartIndex) {
-		var iLastVisible = -1,
+		var iLastVisible,
 			iIndex,
 			iItemSize;
 
 		iStartIndex = iStartIndex || 0;
+		iLastVisible = iStartIndex - 1;
 
 		for (iIndex = iStartIndex; iIndex < aItems.length; iIndex++) {
 			iItemSize = this._getItemSize(aItems[iIndex]);
@@ -1519,7 +1553,7 @@ sap.ui.define([
 		}
 	};
 
-	IconTabHeader.prototype._getItemsForOverflow = function (bIsStartOverflow) {
+	IconTabHeader.prototype._getItemsForOverflow = function (bIsStartOverflow, bTopLevelTabs) {
 
 		var aItemsInStrip = this._getItemsInStrip(),
 			bIsStartAndEndMode = this.getTabsOverflowMode() === TabsOverflowMode.StartAndEnd,
@@ -1540,7 +1574,7 @@ sap.ui.define([
 			}
 
 			aItemsForList.push(oItem);
-			if (oItem.isA("sap.m.IconTabFilter")) {
+			if (oItem.isA("sap.m.IconTabFilter") && !bTopLevelTabs) {
 				oItem._getAllSubItems().forEach(function (oSubItem) {
 					aItemsForList.push(oSubItem);
 				});

package/src/sap/m/IconTabHeaderRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/IconTabSeparator.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public