@openui5/sap.m 1.101.0 → 1.103.0

package/src/sap/m/GrowingEnablement.js

@@ -14,7 +14,8 @@ sap.ui.define([
 	'sap/ui/core/HTML',
 	'sap/m/CustomListItem',
 	'sap/base/security/encodeXML',
-	'sap/base/util/UriParameters'
+	'sap/ui/core/Core',
+	"sap/ui/thirdparty/jquery"
 ],
 	function(
 		BaseObject,
@@ -25,7 +26,8 @@ sap.ui.define([
 		HTML,
 		CustomListItem,
 		encodeXML,
-		UriParameters
+		Core,
+		jQuery
 	) {
 	"use strict";
 
@@ -65,13 +67,12 @@ sap.ui.define([
 			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") {
+			if (document.location.href.search("sap-ui-xx-enableItemsPool") > 0) {
 				this._aItemsPool = [];
 			}
 		},
@@ -100,7 +101,6 @@ sap.ui.define([
 			this._oControl.$("triggerList").remove();
 			this._oControl.bUseExtendedChangeDetection = false;
 			this._oControl.removeDelegate(this);
-			this._oContainerDomRef = null;
 			this._oControl = null;
 		},
 
@@ -132,6 +132,31 @@ sap.ui.define([
 			}
 		},
 
+		onsapdown: function(oEvent) {
+			// Navigate from last item to growing trigger and vice versa via arrow keys
+			var oControl = this._oControl;
+			if (oControl._oItemNavigation && !oEvent.isMarked()) {
+				var aItemDomRefs = oControl._oItemNavigation.getItemDomRefs();
+				var sDir = oControl.getGrowingDirection();
+				if ((sDir != ListGrowingDirection.Upwards && oEvent.type == "sapdown" && oEvent.target === aItemDomRefs[aItemDomRefs.length - 1])
+						|| (sDir == ListGrowingDirection.Upwards && oEvent.type == "sapup" && oEvent.target === aItemDomRefs[0])) {
+					var $Trigger = oControl.$("trigger");
+					$Trigger.trigger("focus");
+					oEvent.setMarked();
+					oEvent.stopImmediatePropagation(); // to prevent ItemNavigation
+				} else if ((sDir == ListGrowingDirection.Upwards && oEvent.type == "sapdown")
+						|| (sDir != ListGrowingDirection.Upwards && oEvent.type == "sapup")
+						&& oEvent.target === oControl.getDomRef("trigger")) {
+					jQuery(aItemDomRefs[oEvent.type == "sapdown" ? 0 : aItemDomRefs.length - 1]).trigger("focus");
+					oEvent.setMarked();
+				}
+			}
+		},
+
+		onsapup: function(oEvent) {
+			return this.onsapdown(oEvent);
+		},
+
 		setTriggerText : function(sText) {
 			this._oControl.$("triggerText").text(sText);
 		},
@@ -210,6 +235,10 @@ sap.ui.define([
 
 		// called after new page loaded
 		_onAfterPageLoaded : function(sChangeReason) {
+			if (!this._oControl) {
+				return;
+			}
+
 			this._bLoading = false;
 			this._updateTriggerDelayed(false);
 			this._oControl.onAfterPageLoaded(this.getInfo(), sChangeReason);
@@ -225,7 +254,7 @@ sap.ui.define([
 			var sTriggerID = this._oControl.getId() + "-trigger",
 				sTriggerText = this._oControl.getGrowingTriggerText();
 
-			sTriggerText = sTriggerText || sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("LOAD_MORE_DATA");
+			sTriggerText = sTriggerText || Core.getLibraryResourceBundle("sap.m").getText("LOAD_MORE_DATA");
 			this._oControl.addNavSection(sTriggerID);
 
 			if (this._oTrigger) {
@@ -244,6 +273,7 @@ sap.ui.define([
 										'<span class="sapMSLITitle" id="' + sTriggerID + 'Text">' + encodeXML(sTriggerText) + '</span>' +
 									'</div>' +
 									'<div class="sapMGrowingListDescription sapMSLIDescription" id="' + sTriggerID + 'Info"></div>' +
+									'<div class="sapUiInvisibleText" id="' + sTriggerID + 'Message"></div>' +
 								'</div>'
 				})
 			}).setParent(this._oControl, null, true).attachPress(this.requestNewPage, this).addDelegate({
@@ -263,7 +293,8 @@ sap.ui.define([
 					$oTrigger.attr({
 						"tabindex": 0,
 						"role": "button",
-						"aria-labelledby": sTriggerID + "Text" + " " + sTriggerID + "Info"
+						"aria-labelledby": sTriggerID + "Text",
+						"aria-describedby": sTriggerID + "Message"
 					});
 				}
 			}, this);
@@ -278,7 +309,14 @@ sap.ui.define([
 
 		// returns the growing information to be shown at the growing button
 		_getListItemInfo : function() {
-			return ("[ " + this._iRenderedDataItems + " / " + NumberFormat.getFloatInstance().format(this._oControl.getMaxItemsCount()) + " ]");
+			var aCounts = this._getItemCounts();
+			var oFormat = NumberFormat.getFloatInstance();
+			return "[ " + oFormat.format(aCounts[0]) + " / " + oFormat.format(aCounts[1]) + " ]";
+		},
+
+		// returns the item counts for the growing information (current vs. total)
+		_getItemCounts : function() {
+			return [this._iRenderedDataItems, this._oControl.getMaxItemsCount()];
 		},
 
 		// returns the first sorters grouping path when available
@@ -417,11 +455,29 @@ sap.ui.define([
 
 		// render all the collected items in the chunk and flush them into the DOM
 		// vInsert whether to append (true) or replace (falsy) or to insert at a certain position (int)
-		applyChunk : function(vInsert, oDomRef) {
+		applyChunk : function(vInsert, bAsync) {
+			if (!this._oControl) {
+				return;
+			}
+
 			this.applyPendingGroupItem();
 
+			var iTimer = this._iChunkTimer;
 			var iLength = this._aChunk.length;
-			if (!iLength || !this._oControl.shouldRenderItems()) {
+			var oDomRef = this._oControl.getItemsContainerDomRef();
+
+			if (iTimer) {
+				this._iChunkTimer = clearTimeout(iTimer);
+			}
+
+			if (!iLength || !oDomRef || !this._oControl.shouldRenderItems()) {
+				this._aChunk = [];
+				return;
+			}
+
+			if (iTimer && !bAsync) {
+				this._oControl.invalidate();
+				this._aChunk = [];
 				return;
 			}
 
@@ -434,17 +490,26 @@ sap.ui.define([
 				}
 			}
 
-			oDomRef = oDomRef || this._oContainerDomRef;
-			this._oRM = this._oRM || sap.ui.getCore().createRenderManager();
-
+			this._oRM = this._oRM || Core.createRenderManager();
 			for (var i = 0; i < iLength; i++) {
 				this._oRM.renderControl(this._aChunk[i]);
 			}
 
+			var bHasFocus = (vInsert == false) && oDomRef.contains(document.activeElement);
 			this._oRM.flush(oDomRef, false, this._getDomIndex(vInsert));
+			bHasFocus && this._oControl.focus();
 			this._aChunk = [];
 		},
 
+		// async version of applyChunk
+		applyChunkAsync : function(vInsert) {
+			if (this._bApplyChunkAsync) {
+				this._iChunkTimer = setTimeout(this.applyChunk.bind(this, vInsert, true));
+			} else {
+				this.applyChunk(vInsert);
+			}
+		},
+
 		// add multiple items to the list via BindingContext
 		addListItems : function(aContexts, oBindingInfo, bSuppressInvalidate) {
 			for (var i = 0; i < aContexts.length; i++) {
@@ -457,9 +522,7 @@ sap.ui.define([
 			this.destroyListItems(bSuppressInvalidate);
 			this.addListItems(aContexts, oBindingInfo, bSuppressInvalidate);
 			if (bSuppressInvalidate) {
-				var bHasFocus = this._oContainerDomRef.contains(document.activeElement);
-				this.applyChunk(false);
-				bHasFocus && this._oControl.focus();
+				this.applyChunkAsync(false);
 			} else {
 				this.applyPendingGroupItem();
 			}
@@ -482,26 +545,35 @@ sap.ui.define([
 		 * refresh items only for OData model.
 		 */
 		refreshItems : function(sChangeReason) {
+			var oControl = this._oControl;
+			var oBinding = oControl.getBinding("items");
+
+			// the value of the ODataV4PropertyBinding created during the template clone gets resolved asynchronously
+			this._bApplyChunkAsync = oBinding.isA("sap.ui.model.odata.v4.ODataListBinding") && oControl.checkGrowingFromScratch();
+
+			// if the data is not already requested then let the updateStarted event to be fired
 			if (!this._bDataRequested) {
 				this._bDataRequested = true;
 				this._onBeforePageLoaded(sChangeReason);
 			}
 
 			// 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();
-
+			if (!this._iLimit || this.shouldReset(sChangeReason) || !oControl.getItems(true).length) {
+				this._iLimit = oControl.getGrowingThreshold();
 			}
 
-			// send the request to get the context
-			var oBinding = this._oControl.getBinding("items");
-
+			// pre-initialize items during the request is ongoing
 			if (this._aItemsPool) {
-				oBinding.attachEventOnce("dataRequested", function() {
+				if (oControl._bBusy) {
 					setTimeout(this.fillItemsPool.bind(this));
-				}, this);
+				} else {
+					oBinding.attachEventOnce("dataRequested", function() {
+						setTimeout(this.fillItemsPool.bind(this));
+					}, this);
+				}
 			}
 
+			// send the request to get the context
 			oBinding.getContexts(0, this._iLimit);
 		},
 
@@ -513,7 +585,8 @@ sap.ui.define([
 			var oControl = this._oControl,
 				oBinding = oControl.getBinding("items"),
 				oBindingInfo = oControl.getBindingInfo("items"),
-				aItems = oControl.getItems(true);
+				aItems = oControl.getItems(true),
+				sGroupingPath = this._sGroupingPath;
 
 			// set limit to initial value if not set yet or no items at the control yet
 			if (!this._iLimit || this.shouldReset(sChangeReason) || !aItems.length) {
@@ -545,102 +618,101 @@ sap.ui.define([
 				}
 			}
 
-			// cache dom ref for internal functions not to lookup again and again
-			this._oContainerDomRef = oControl.getItemsContainerDomRef();
+			// let the grouping path to be stored
+			this._sGroupingPath = this._getGroupingPath(oBinding);
 
 			// aContexts.diff ==> undefined : New data we should build from scratch
 			// aContexts.diff ==> [] : There is no diff, means data did not changed at all
 			// aContexts.diff ==> [{index: 0, type: "delete"}, {index: 1, type: "insert"},...] : Run the diff logic
-			var aDiff = aContexts.diff,
-				bFromScratch = false,
-				vInsertIndex;
+			var aDiff = aContexts.diff;
 
 			// process the diff
 			if (!aContexts.length) {
 				// no context, destroy list items
 				this.destroyListItems();
-			} else if (!this._oContainerDomRef) {
+			} else if (!oControl.getItemsContainerDomRef()) {
 				// no dom ref for compatibility reason start from scratch
 				this.rebuildListItems(aContexts, oBindingInfo);
 			} else if (!aDiff || !aItems.length && aDiff.length) {
 				// new records need to be applied from scratch
 				this.rebuildListItems(aContexts, oBindingInfo, oControl.shouldGrowingSuppressInvalidation());
-			} else if (oBinding.isGrouped() || oControl.checkGrowingFromScratch()) {
+			} else {
+				// diff handling case for grouping and merging
+				var bFromScratch = false, vInsertIndex = true;
+				if (oBinding.isGrouped() || oControl.checkGrowingFromScratch()) {
 
-				if (this._sGroupingPath != this._getGroupingPath(oBinding)) {
-					// grouping is changed so we need to rebuild the list for the group headers
-					bFromScratch = true;
-				} else {
-					// append items if possible
-					for (var i = 0; i < aDiff.length; i++) {
-						var oDiff = aDiff[i],
-							oContext = aContexts[oDiff.index];
-
-						if (oDiff.type == "delete" || oDiff.type == "replace") {
-							// group header may need to be deleted as well
-							bFromScratch = true;
-							break;
-						} else if (oDiff.index != this._iRenderedDataItems) {
-							// this item is not appended
-							bFromScratch = true;
-							break;
-						} else {
-							this.addListItem(oContext, oBindingInfo, true);
-							vInsertIndex = true;
+					if (sGroupingPath != this._sGroupingPath) {
+						// grouping is changed so we need to rebuild the list for the group headers
+						bFromScratch = true;
+					} else {
+						// append items if possible
+						for (var i = 0; i < aDiff.length; i++) {
+							var oDiff = aDiff[i],
+								oContext = aContexts[oDiff.index];
+
+							if (oDiff.type == "delete" || oDiff.type == "replace") {
+								// group header may need to be deleted as well
+								bFromScratch = true;
+								break;
+							} else if (oDiff.index != this._iRenderedDataItems) {
+								// this item is not appended
+								bFromScratch = true;
+								break;
+							} else {
+								// the item is appended
+								this.addListItem(oContext, oBindingInfo, true);
+							}
 						}
 					}
-				}
 
-			} else {
-
-				if (this._sGroupingPath) {
-					// if it was already grouped then we need to remove group headers first
-					oControl.removeGroupHeaders(true);
-				}
+				} else {
 
-				vInsertIndex = -1;
-				var iLastInsertIndex = -1;
-				for (var i = 0; i < aDiff.length; i++) {
-					var oDiff = aDiff[i],
-						iDiffIndex = oDiff.index,
-						oContext = aContexts[iDiffIndex];
-
-					if (oDiff.type == "delete") {
-						if (vInsertIndex != -1) {
-							// this record is deleted while the chunk is getting build
-							this.applyChunk(vInsertIndex);
-							iLastInsertIndex = -1;
-							vInsertIndex = -1;
-						}
+					if (sGroupingPath && !this._sGroupingPath) {
+						// if it was already grouped then we need to remove group headers first
+						oControl.removeGroupHeaders(true);
+					}
 
-						this.deleteListItem(iDiffIndex);
-					} else if (oDiff.type == "insert") {
-						if (vInsertIndex == -1) {
-							// the subsequent of items needs to be inserted at this position
-							vInsertIndex = iDiffIndex;
-						} else if (iLastInsertIndex > -1 && iDiffIndex != iLastInsertIndex + 1) {
-							// this item is not simply appended to the last one but has been inserted
-							this.applyChunk(vInsertIndex);
-							vInsertIndex = iDiffIndex;
+					vInsertIndex = -1;
+					var iLastInsertIndex = -1;
+					for (var i = 0; i < aDiff.length; i++) {
+						var oDiff = aDiff[i],
+							iDiffIndex = oDiff.index,
+							oContext = aContexts[iDiffIndex];
+
+						if (oDiff.type == "delete") {
+							if (vInsertIndex != -1) {
+								// this record is deleted while the chunk is getting build
+								this.applyChunk(vInsertIndex);
+								iLastInsertIndex = -1;
+								vInsertIndex = -1;
+							}
+
+							this.deleteListItem(iDiffIndex);
+						} else if (oDiff.type == "insert") {
+							if (vInsertIndex == -1) {
+								// the subsequent of items needs to be inserted at this position
+								vInsertIndex = iDiffIndex;
+							} else if (iLastInsertIndex > -1 && iDiffIndex != iLastInsertIndex + 1) {
+								// this item is not simply appended to the last one but has been inserted
+								this.applyChunk(vInsertIndex);
+								vInsertIndex = iDiffIndex;
+							}
+
+							this.insertListItem(oContext, oBindingInfo, iDiffIndex);
+							iLastInsertIndex = iDiffIndex;
 						}
-
-						this.insertListItem(oContext, oBindingInfo, iDiffIndex);
-						iLastInsertIndex = iDiffIndex;
 					}
 				}
-			}
 
-			if (bFromScratch) {
-				this.rebuildListItems(aContexts, oBindingInfo, true);
-			} else if (this._oContainerDomRef && aDiff) {
-				// set the binding context of items inserting/deleting entries shifts the index of all following items
-				this.updateItemsBindingContext(aContexts, oBindingInfo.model);
-				this.applyChunk(vInsertIndex);
+				if (bFromScratch) {
+					this.rebuildListItems(aContexts, oBindingInfo, true);
+				} else {
+					// set the binding context of items inserting/deleting entries shifts the index of all following items
+					this.updateItemsBindingContext(aContexts, oBindingInfo.model);
+					this.applyChunkAsync(vInsertIndex);
+				}
 			}
 
-			this._oContainerDomRef = null;
-			this._sGroupingPath = this._getGroupingPath(oBinding);
-
 			if (!this._bDataRequested) {
 				this._onAfterPageLoaded(sChangeReason);
 			}
@@ -708,6 +780,10 @@ sap.ui.define([
 				} else {
 					if (bLengthFinal) {
 						oControl.$("triggerInfo").css("display", "block").text(this._getListItemInfo());
+						var aCounts = this._getItemCounts();
+						oControl.$("triggerMessage").text(Core.getLibraryResourceBundle("sap.m").getText("LOAD_MORE_DATA_ACC_WITH_COUNT", aCounts));
+					} else {
+						oControl.$("triggerMessage").text(Core.getLibraryResourceBundle("sap.m").getText("LOAD_MORE_DATA_ACC"));
 					}
 
 					oControl.$("triggerList").css("display", "");

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.101.0
+	 * @version 1.103.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.101.0
+	 * @version 1.103.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/HeaderContainer.js

@@ -125,7 +125,7 @@ sap.ui.define([
 		 * @since 1.44.0
 		 *
 		 * @author SAP SE
-		 * @version 1.101.0
+		 * @version 1.103.0
 		 *
 		 * @public
 		 * @alias sap.m.HeaderContainer
@@ -338,9 +338,6 @@ sap.ui.define([
 							this._oItemNavigation.attachEvent(ItemNavigation.Events.BorderReached, this._handleBorderReached, this);
 							this._oItemNavigation.attachEvent(ItemNavigation.Events.AfterFocus, this._handleAfterFocus, this);
 							this._oItemNavigation.attachEvent(ItemNavigation.Events.BeforeFocus, this._handleBeforeFocus, this);
-							if (Device.browser.msie || Device.browser.edge) {
-								this._oItemNavigation.attachEvent(ItemNavigation.Events.FocusAgain, this._handleFocusAgain, this);
-							}
 						}
 						this._oItemNavigation.setRootDomRef(oFocusRef);
 						this._oItemNavigation.setItemDomRefs(aDomRefs);
@@ -350,59 +347,63 @@ 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("scrollstart", function(oEvent){
+							var aItems = this._filterVisibleItems();
+							this.aItemSize = [];
+								this.aItemScrollValue = [0];
+								var fnGetItemSize = function (oItem) {
+									 if (oItem.getDomRef() && oItem.getDomRef().parentElement) {
+										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.triggerScrollStop = false;
+						}.bind(this));
 						this._oScrollCntr.attachBrowserEvent("scrollstop", function(oEvent){
-								if (!this.triggerScrollStop) {
-									this.triggerScrollStop = true;
-									var iScrollValue = 0, iScrollOffset = 15;
+							if (!this.triggerScrollStop) {
+								var aItems = this._filterVisibleItems();
+								this.triggerScrollStop = true;
+								var iScrollValue = 0, iScrollOffset = 15;
 
-									var iScrollContainerScrollLeft = this._oScrollCntr.getDomRef().scrollLeft;
-									var iScrollContainerWidth = iScrollContainerScrollLeft + this._oScrollCntr.getDomRef().clientWidth;
+								var iScrollContainerScrollLeft = this._oScrollCntr.getDomRef().scrollLeft;
+								var iScrollContainerWidth = iScrollContainerScrollLeft + this._oScrollCntr.getDomRef().clientWidth;
 
-									var oFinalItem = aItems[aItems.length - 1];
+								var oFinalItem = aItems[aItems.length - 1];
 
-									var iFinalElementScrollLeft = oFinalItem.getParent().getDomRef().offsetLeft;
-									var iFinalElementContainerWidth = iFinalElementScrollLeft + oFinalItem.getDomRef().clientWidth;
+								var iFinalElementScrollLeft = oFinalItem.getParent().getDomRef().offsetLeft;
+								var iFinalElementContainerWidth = iFinalElementScrollLeft + oFinalItem.getDomRef().clientWidth;
 
-									var bIsFinalItemVisible = ((iFinalElementContainerWidth <= iScrollContainerWidth) && (iFinalElementScrollLeft >= iScrollContainerScrollLeft));
-									var iCurrectScrollValue = this._bRtl ? Math.abs(oEvent.currentTarget.scrollLeft) : oEvent.currentTarget.scrollLeft;
+								var bIsFinalItemVisible = ((iFinalElementContainerWidth <= iScrollContainerWidth) && (iFinalElementScrollLeft >= iScrollContainerScrollLeft));
+								var iCurrectScrollValue = this._bRtl ? Math.abs(oEvent.currentTarget.scrollLeft) : oEvent.currentTarget.scrollLeft;
 
-									if (bIsFinalItemVisible) {
-										iScrollValue = this.aItemScrollValue[aItems.length - 1] - iScrollOffset - iCurrectScrollValue;
-										this.triggerScrollStop = false;
-									} else {
-										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;
+								if (bIsFinalItemVisible) {
+									iScrollValue = this.aItemScrollValue[aItems.length - 1] - iScrollOffset - iCurrectScrollValue;
+									this.triggerScrollStop = false;
+								} else {
+									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 {
-											iScrollValue = value - iScrollOffset - iCurrectScrollValue;
+											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));
+								this._scroll(iScrollValue, this.getScrollTime());
+							}
+						}.bind(this));
 					}
 				}.bind(this)
 			});
@@ -642,7 +643,7 @@ sap.ui.define([
 			if (!this._bRtl) {
 				iScrollLeft = oDomRef.scrollLeft;
 				iScrollWidth = oDomRef.scrollWidth;
-				iClientWidth = oDomRef.clientWidth + (Device.browser.msie ? 1 : 0);
+				iClientWidth = oDomRef.clientWidth;
 				iScrollTarget = iScrollLeft + delta;
 				iPaddingWidth = parseFloat(this.$("scroll-area").css("padding-left"));
 
@@ -923,7 +924,7 @@ sap.ui.define([
 				}
 				if (this._bRtl) {
 					var iScrollLeftRTL = jQuery(oBarHead).scrollLeftRTL();
-					if (iScrollLeftRTL > ((Device.browser.msie || Device.browser.edge) ? 1 : 0)) {
+					if (iScrollLeftRTL > 0) {
 						bScrollForward = true;
 					}
 				} else if (iScrollLeft > iFirst) {
@@ -1023,9 +1024,6 @@ sap.ui.define([
 		};
 
 		HeaderContainer.prototype._handleBorderReached = function (oEvt) {
-			if (Device.browser.msie && this.bScrollInProcess) {
-				return;
-			}
 			var iIndex = oEvt.getParameter("index");
 			if (iIndex === 0) {
 				this._scroll(this._getScrollValue(false), this.getScrollTime());
@@ -1035,14 +1033,6 @@ sap.ui.define([
 		};
 
 		HeaderContainer.prototype._handleAfterFocus = function (oEvt) {
-			//For Edge and IE on mousedown input element not getting focused.Hence setting focus manually.
-			var oSrcEvent = oEvt.getParameter("event");
-			if ((Device.browser.msie || Device.browser.edge) && oSrcEvent.type === "mousedown" && oSrcEvent.srcControl instanceof sap.m.Input) {
-				oSrcEvent.srcControl.focus();
-			}
-			if (Device.browser.msie && this.bScrollInProcess) {
-				return;
-			}
 			var iIndex = oEvt.getParameter("index");
 			if (iIndex === 0) {
 				this._scroll(this._getScrollValue(false), this.getScrollTime());
@@ -1053,11 +1043,6 @@ sap.ui.define([
 		};
 
 		HeaderContainer.prototype._handleFocusAgain = function (oEvt) {
-			//For Edge and IE on mousedown input element not getting focused.Hence setting focus manually.
-			var oSrcEvent = oEvt.getParameter("event");
-			if ((Device.browser.msie || Device.browser.edge) && oSrcEvent.type === "mousedown" && oSrcEvent.srcControl instanceof sap.m.Input) {
-				oSrcEvent.srcControl.focus();
-			}
 			oEvt.getParameter("event").preventDefault();
 		};
 

package/src/sap/m/HeaderContainerItemNavigator.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @since 1.67.0
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.103.0
 	 *
 	 * @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.101.0
+	 * @version 1.103.0
 	 *
 	 * @public
 	 * @alias sap.m.IconTabBar
@@ -201,6 +201,7 @@ sap.ui.define([
 			 * Specifies whether tab reordering is enabled. Relevant only for desktop devices.
 			 * The {@link sap.m.IconTabSeparator sap.m.IconTabSeparator} cannot be dragged and dropped
 			 * Items can be moved around {@link sap.m.IconTabSeparator sap.m.IconTabSeparator}
+			 * Reordering is enabled via keyboard using <code>Ctrl</code> + arrow keys (Windows) and <code>Control</code> + arrow keys (Mac OS)
 			 * @since 1.46
 			 */
 			enableTabReordering : {type : "boolean", group : "Behavior", defaultValue : false},
@@ -361,7 +362,7 @@ sap.ui.define([
 
 		// toggle animation if control is already rendered
 		if (this.$().length) {
-			this._toggleExpandCollapse(bExpanded);
+			this._toggleExpandCollapse(this.getProperty("expanded"));
 		}
 		return this;
 	};