@openui5/sap.m 1.128.0 → 1.130.0

package/src/sap/m/IconTabHeader.js

@@ -85,7 +85,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/IconTabSeparator.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/IllustratedMessage.js

@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Illustration.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Image.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @borrows sap.ui.core.IFormContent.getFormDoNotAdjustWidth as #getFormDoNotAdjustWidth
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @public
 	 * @alias sap.m.Image

package/src/sap/m/ImageContent.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @since 1.38
 	 *
 	 * @public

package/src/sap/m/Input.js

@@ -162,7 +162,7 @@ function(
 	 * @extends sap.m.InputBase
 	 * @implements sap.ui.core.IAccessKeySupport
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public
@@ -629,6 +629,7 @@ function(
 		// even though there is no user input (check Input.prototype.onsapright).
 		this._setTypedInValue("");
 		this._bDoTypeAhead = false;
+		this._bBackspaceOrDelete = false;
 		this._isValueInitial = false;
 		this._previousInputType = this.getType();
 
@@ -1849,7 +1850,8 @@ function(
 
 	Input.prototype.onkeydown = function (oEvent) {
 		// disable the typeahead feature for android devices due to an issue on android soft keyboard, which always returns keyCode 229
-		this._bDoTypeAhead = !Device.os.android && this.getAutocomplete() && (oEvent.which !== KeyCodes.BACKSPACE) && (oEvent.which !== KeyCodes.DELETE);
+		this._bBackspaceOrDelete = (oEvent.which === KeyCodes.BACKSPACE) || (oEvent.which === KeyCodes.DELETE);
+		this._bDoTypeAhead = !Device.os.android && this.getAutocomplete() && !this._bBackspaceOrDelete;
 	};
 
 	Input.prototype.onkeyup = function (oEvent) {
@@ -2291,7 +2293,9 @@ function(
 
 		const bExactMatch = this._hasTabularSuggestions() ? this.checkMatchingTabularSuggestionItems(sValue) : this.checkMatchingSuggestionItems(sValue);
 
-		if (!bDoTypeAhead && !bExactMatch) {
+		// perform typeahead only if typeahead prerequisites are met or
+		// backspace is pressed and exact match is present
+		if (!bDoTypeAhead && !(bExactMatch && this._bBackspaceOrDelete)) {
 			return;
 		}
 
@@ -3089,7 +3093,6 @@ function(
 
 			oItemToBeSelected = this._hasTabularSuggestions() ? mTypeAheadInfo.selectedItem : ListHelpers.getListItem(mTypeAheadInfo.selectedItem);
 			oItemToBeSelected.setSelected(true);
-			this.setSelectionUpdatedFromList(true);
 		}, this);
 
 		if (this.isMobileDevice()) {

package/src/sap/m/InputBase.js

@@ -65,15 +65,16 @@ function(
 	 * The <code>sap.m.InputBase</code> control provides a basic functionality for input controls.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
+	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.ui.core.ILabelable
 	 *
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormFormattedValue as #getFormFormattedValue
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormValueProperty as #getFormValueProperty
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormObservingProperties as #getFormObservingProperties
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormRenderAsControl as #getFormRenderAsControl
+	 * @borrows sap.ui.core.ILabelable.hasLabelableHTMLElement as #hasLabelableHTMLElement
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public
@@ -86,7 +87,8 @@ function(
 			interfaces : [
 				"sap.ui.core.IFormContent",
 				"sap.ui.core.ISemanticFormContent",
-				"sap.m.IToolbarInteractiveControl"
+				"sap.m.IToolbarInteractiveControl",
+				"sap.ui.core.ILabelable"
 			],
 			library: "sap.m",
 			properties: {
@@ -1219,6 +1221,16 @@ function(
 		return this.getId() + "-inner";
 	};
 
+	/**
+	 * Returns if the control can be bound to a label
+	 *
+	 * @returns {boolean} <code>true</code> if the control can be bound to a label
+	 * @public
+	 */
+	InputBase.prototype.hasLabelableHTMLElement = function () {
+		return true;
+	};
+
 	/**
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 * @returns {sap.ui.core.AccessibilityInfo} The accessibility information for this <code>InputBase</code>

package/src/sap/m/InputListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public
@@ -52,7 +52,13 @@ sap.ui.define([
 				 * This property specifies the label text directionality with enumerated options. By default, the label inherits text direction from the DOM.
 				 * @since 1.30.0
 				 */
-				labelTextDirection : {type : "sap.ui.core.TextDirection", group : "Appearance", defaultValue : TextDirection.Inherit}
+				labelTextDirection : {type : "sap.ui.core.TextDirection", group : "Appearance", defaultValue : TextDirection.Inherit},
+
+				/**
+				 * Determines how much space is allocated for the input control.
+				 * @since 1.130
+				 */
+				contentSize: {type : "sap.m.InputListItemContentSize", group : "Appearance", defaultValue : library.InputListItemContentSize.L}
 			},
 			defaultAggregation : "content",
 			aggregations : {

package/src/sap/m/InputListItemRenderer.js

@@ -34,12 +34,18 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 	};
 
 	InputListItemRenderer.renderLIContent = function(rm, oLI) {
+		rm.openStart("div", oLI.getId() + "-contentWrapper").class("sapMILIContentWrapper");
+		rm.class("sapMILIContentWrapper" + oLI.getContentSize());
+		rm.openEnd();
+		this.renderLabel(rm, oLI);
+		this.renderInput(rm, oLI);
+		rm.close("div");
+	};
 
-		// List item label
+	InputListItemRenderer.renderLabel = function(rm, oLI) {
 		var sLabel = oLI.getLabel();
-		var sInnerLabel = oLI.getId() + "-label";
 		if (sLabel) {
-			rm.openStart("span", sInnerLabel);
+			rm.openStart("span", oLI.getId() + "-label");
 			rm.class("sapMILILabel");
 
 			var sLabelDir = oLI.getLabelTextDirection();
@@ -51,18 +57,22 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Renderer", "./ListItemBaseRen
 			rm.text(sLabel);
 			rm.close("span");
 		}
+	};
 
+	InputListItemRenderer.renderInput = function(rm, oLI) {
 		rm.openStart("div").class("sapMILIDiv").class("sapMILI-CTX").openEnd();
 		oLI.getContent().forEach(function(oControl) {
-			if (oControl.addAriaLabelledBy && oControl.getAriaLabelledBy().indexOf(sInnerLabel) === -1) {
-				oControl.addAriaLabelledBy(sInnerLabel);
+			if (oControl.addAriaLabelledBy) {
+				const sInnerLabel = oLI.getId() + "-label";
+				if (oControl.getAriaLabelledBy().indexOf(sInnerLabel) === -1) {
+					oControl.addAriaLabelledBy(sInnerLabel);
+				}
 			}
 			rm.renderControl(oControl);
 		});
 		rm.close("div");
 	};
 
-
 	return InputListItemRenderer;
 
 }, /* bExport= */ true);

package/src/sap/m/Label.js

@@ -75,10 +75,10 @@ function(
 	 * <li> It is not recommended to use labels in Bold.</li>
 	 * </ul>
 	 * @extends sap.ui.core.Control
-	 * @implements sap.ui.core.Label, sap.ui.core.IShrinkable, sap.ui.core.IAccessKeySupport
+	 * @implements sap.ui.core.Label, sap.ui.core.IShrinkable, sap.ui.core.IAccessKeySupport, sap.ui.core.ILabelable
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public
@@ -94,7 +94,8 @@ function(
 				"sap.m.IOverflowToolbarContent",
 				"sap.m.IToolbarInteractiveControl",
 				"sap.m.IHyphenation",
-				"sap.ui.core.IAccessKeySupport"
+				"sap.ui.core.IAccessKeySupport",
+				"sap.ui.core.ILabelable"
 			],
 			library : "sap.m",
 			properties : {
@@ -335,6 +336,16 @@ function(
 		return false;
 	};
 
+	/**
+	 * Returns if the control can be bound to a label
+	 *
+	 * @returns {boolean} <code>true</code> if the control can be bound to a label
+	 * @public
+	 */
+	Label.prototype.hasLabelableHTMLElement = function () {
+		return false;
+	};
+
 	// enrich Label functionality
 	LabelEnablement.enrich(Label.prototype);
 	HyphenationSupport.mixInto(Label.prototype);

package/src/sap/m/LabelRenderer.js

@@ -12,6 +12,8 @@ sap.ui.define(['sap/ui/core/Lib', 'sap/ui/core/Renderer', 'sap/ui/core/AccessKey
 	// shortcut for sap.ui.core.TextDirection
 	var TextDirection = coreLibrary.TextDirection;
 
+	const TextAlign = coreLibrary.TextAlign;
+
 	// shortcut for sap.ui.core.VerticalAlign
 	var VerticalAlign = coreLibrary.VerticalAlign;
 
@@ -36,8 +38,7 @@ sap.ui.define(['sap/ui/core/Lib', 'sap/ui/core/Renderer', 'sap/ui/core/AccessKey
 	 */
 	LabelRenderer.render = function(rm, oLabel){
 		// convenience variable
-		var r = LabelRenderer,
-			sTextDir = oLabel.getTextDirection(),
+		var sTextDir = oLabel.getTextDirection(),
 			sTextAlign = oLabel.getTextAlign(),
 			sWidth = oLabel.getWidth(),
 			sLabelText = oLabel.getText(),
@@ -89,9 +90,10 @@ sap.ui.define(['sap/ui/core/Lib', 'sap/ui/core/Renderer', 'sap/ui/core/AccessKey
 
 		// style for text alignment
 		if (sTextAlign) {
-			sTextAlign = r.getTextAlign(sTextAlign, sTextDir);
-			if (sTextAlign) {
-				rm.style("text-align", sTextAlign);
+			const sActualTextAlign = LabelRenderer.getTextAlign(sTextAlign, sTextDir);
+
+			if (sActualTextAlign) {
+				rm.style("text-align", sActualTextAlign);
 			}
 		}
 
@@ -115,6 +117,19 @@ sap.ui.define(['sap/ui/core/Lib', 'sap/ui/core/Renderer', 'sap/ui/core/AccessKey
 
 		rm.openEnd();
 
+		rm.openStart("div").class("sapMLabelInner");
+
+		// style for text alignment
+		if (sTextAlign) {
+			const sJustifyContent = LabelRenderer.textAlignToJustifyContent(sTextAlign);
+
+			if (sJustifyContent) {
+				rm.style("justify-content", sJustifyContent);
+			}
+		}
+
+		rm.openEnd();
+
 		// wrap the label text
 		rm.openStart("span", oLabel.getId() + "-text");
 		rm.class("sapMLabelTextWrapper");
@@ -154,6 +169,8 @@ sap.ui.define(['sap/ui/core/Lib', 'sap/ui/core/Renderer', 'sap/ui/core/AccessKey
 		rm.openEnd();
 		rm.close("span");
 
+		rm.close("div");
+
 		rm.close(sHtmlTagToRender);
 	};
 
@@ -164,6 +181,32 @@ sap.ui.define(['sap/ui/core/Lib', 'sap/ui/core/Renderer', 'sap/ui/core/AccessKey
 	 */
 	LabelRenderer.getTextAlign = Renderer.getTextAlign;
 
+	LabelRenderer.textAlignToJustifyContent = function (sTextAlign) {
+		let sJustifyContent;
+
+		switch (sTextAlign) {
+			case TextAlign.Begin:
+				sJustifyContent = "flex-start";
+				break;
+			case TextAlign.End:
+				sJustifyContent = "flex-end";
+				break;
+			case TextAlign.Left:
+				sJustifyContent = "left";
+				break;
+			case TextAlign.Right:
+				sJustifyContent = "right";
+				break;
+			case TextAlign.Center:
+				sJustifyContent = "center";
+				break;
+			default:
+				sJustifyContent = "";
+		}
+
+		return sJustifyContent;
+	};
+
 	return LabelRenderer;
 
 }, /* bExport= */ true);

package/src/sap/m/LightBox.js

@@ -96,7 +96,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/LightBoxItem.js

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

package/src/sap/m/Link.js

@@ -91,15 +91,16 @@ function(
 	 * @see {@link fiori:https://experience.sap.com/fiori-design-web/link/ Link}
 	 *
 	 * @extends sap.ui.core.Control
-	 * @implements sap.ui.core.IShrinkable, sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.ui.core.ITitleContent, sap.ui.core.IAccessKeySupport
+	 * @implements sap.ui.core.IShrinkable, sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.ui.core.ITitleContent, sap.ui.core.IAccessKeySupport, sap.ui.core.ILabelable
 	 *
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormFormattedValue as #getFormFormattedValue
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormValueProperty as #getFormValueProperty
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormObservingProperties as #getFormObservingProperties
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormRenderAsControl as #getFormRenderAsControl
+	 * @borrows sap.ui.core.ILabelable.hasLabelableHTMLElement as #hasLabelableHTMLElement
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public
@@ -115,7 +116,8 @@ function(
 				"sap.ui.core.ISemanticFormContent",
 				"sap.ui.core.ITitleContent",
 				"sap.ui.core.IAccessKeySupport",
-				"sap.m.IToolbarInteractiveControl"
+				"sap.m.IToolbarInteractiveControl",
+				"sap.ui.core.ILabelable"
 			],
 			library : "sap.m",
 			designtime: "sap/m/designtime/Link.designtime",
@@ -356,14 +358,18 @@ function(
 
 	Link.prototype.onAfterRendering = function() {
 		if (Device.system.phone || Device.system.tablet) {
-			var oAnchorElement = this.getDomRef();
+			var oAnchorElement = this.getDomRef(),
+				sEventID = Device.browser.safari ? "touchstart" : "click";
+
 			// TODO: Adjust sap.m.internal.ObjectMarkerCustomLink rendering part of the sap.m.ObjectMarker implementation
 			if (!oAnchorElement) {
 				return;
 			}
-			oAnchorElement.removeEventListener("click", this._onClick);
-			if (oAnchorElement.getAttribute("href") == "#") {
-				oAnchorElement.addEventListener("click", this._onClick);
+
+			oAnchorElement.removeEventListener(sEventID, this._onClick);
+
+			if (oAnchorElement.getAttribute("href") === "#") {
+				oAnchorElement.addEventListener(sEventID, this._onClick);
 			}
 		}
 	};
@@ -373,11 +379,14 @@ function(
 			oEndIcon = this.getAggregation("_endIcon");
 
 		if (Device.system.phone || Device.system.tablet) {
-			var oAnchorElement = this.getDomRef();
+			var oAnchorElement = this.getDomRef(),
+				sEventID = Device.browser.safari ? "touchstart" : "click";
+
 			if (!oAnchorElement) {
 				return;
 			}
-			oAnchorElement.removeEventListener("click", this._onClick);
+
+			oAnchorElement.removeEventListener(sEventID, this._onClick);
 		}
 
 		if (oIcon) {
@@ -706,6 +715,16 @@ function(
 		return oIcon;
 	};
 
+	/**
+	 * Returns if the control can be bound to a label
+	 *
+	 * @returns {boolean} <code>true</code> if the control can be bound to a label
+	 * @public
+	 */
+	Link.prototype.hasLabelableHTMLElement = function () {
+		return false;
+	};
+
 	return Link;
 
 });

package/src/sap/m/LinkTileContent.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @class This element is used within the GenericTile control that generates a combination of an icon and a linkl
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @public
 	 * @since 1.120

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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ListBase.js

@@ -103,7 +103,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public
@@ -2747,14 +2747,19 @@ function(
 		return this;
 	};
 
-	// Returns the sticky value to be added to the sticky table container.
-	// sapMSticky7 is the result of sticky headerToolbar, infoToolbar and column headers.
-	// sapMSticky6 is the result of sticky infoToolbar and column headers.
-	// sapMSticky5 is the result of sticky headerToolbar and column headers.
-	// sapMSticky4 is the result of sticky column headers only.
-	// sapMSticky3 is the result of sticky headerToolbar and infoToolbar.
-	// sapMSticky2 is the result of sticky infoToolbar.
-	// sapMSticky1 is the result of sticky headerToolbar.
+	/**
+	 * Returns the sticky value that is added to the sticky table container.
+	 *
+	 * Numeric values for each possible sticky element:
+	 * 1 - <code>headerToolbar</code>
+	 * 2 - <code>infoToolbar</code>
+	 * 4 - <code>columnHeaders</code>
+	 * 8 - <code>groupHeaders</code>
+	 *
+	 * The sticky value is created by adding up the values of the individual elements.
+	 * For example, sapMSticky15 (1 + 2 + 4 + 8) corresponds to sticky <code>headerToolbar</code>, <code>infoToolbar</code>, <code>columnHeaders</code>, and <code>groupHeaders</code>.
+	 * @returns {number} The sticky value
+	 */
 	ListBase.prototype.getStickyStyleValue = function() {
 		var aSticky = this.getSticky();
 		if (!aSticky || !aSticky.length) {
@@ -2768,7 +2773,8 @@ function(
 			bHeaderToolbarVisible = sHeaderText || (oHeaderToolbar && oHeaderToolbar.getVisible()),
 			oInfoToolbar = this.getInfoToolbar(),
 			bInfoToolbar = oInfoToolbar && oInfoToolbar.getVisible(),
-			bColumnHeadersVisible = false;
+			bColumnHeadersVisible = false,
+			bGroupHeaders = false;
 
 		if (this.isA("sap.m.Table")) {
 			bColumnHeadersVisible = this.getColumns().some(function(oColumn) {
@@ -2776,6 +2782,10 @@ function(
 			});
 		}
 
+		bGroupHeaders = this.getItems(true).some((oItem) => {
+			return oItem.isGroupHeader();
+		});
+
 		aSticky.forEach(function(sSticky) {
 			if (sSticky === Sticky.HeaderToolbar && bHeaderToolbarVisible) {
 				iStickyValue += 1;
@@ -2783,6 +2793,8 @@ function(
 				iStickyValue += 2;
 			} else if (sSticky === Sticky.ColumnHeaders && bColumnHeadersVisible) {
 				iStickyValue += 4;
+			} else if (sSticky === Sticky.GroupHeaders && bGroupHeaders) {
+				iStickyValue += 8;
 			}
 		});
 
@@ -2801,8 +2813,10 @@ function(
 			return;
 		}
 
-		// check the all the sticky element and get their height
-		var iTHRectHeight = 0,
+		// check the all the sticky elements and get their height
+		var iGHRectHeight = 0,
+			iGHRectBottom = 0,
+			iTHRectHeight = 0,
 			iTHRectBottom = 0,
 			iInfoTBarContainerRectHeight = 0,
 			iInfoTBarContainerRectBottom = 0,
@@ -2810,6 +2824,15 @@ function(
 			iHeaderToolbarRectBottom = 0,
 			iStickyFocusOffset = this.getStickyFocusOffset();
 
+		if (this._iStickyValue & 8 /* GroupHeaders */) {
+			var oGroupHeaderDomRef = this.getItems(true).find((oItem) => {
+				return oItem.isGroupHeader();
+			}).getDomRef();
+			var oGroupHeaderRect = oGroupHeaderDomRef.getBoundingClientRect();
+			iGHRectBottom = parseInt(oGroupHeaderRect.bottom);
+			iGHRectHeight = parseInt(oGroupHeaderRect.height);
+		}
+
 		if (this._iStickyValue & 4 /* ColumnHeaders */) {
 			var oTblHeaderDomRef = this.getDomRef("tblHeader").firstChild;
 			var oTblHeaderRect = oTblHeaderDomRef.getBoundingClientRect();
@@ -2837,9 +2860,9 @@ function(
 		}
 
 		var iItemTop = Math.round(oTargetItemDomRef.getBoundingClientRect().top);
-		if (iTHRectBottom > iItemTop || iInfoTBarContainerRectBottom > iItemTop || iHeaderToolbarRectBottom > iItemTop) {
+		if (iGHRectBottom > iItemTop || iTHRectBottom > iItemTop || iInfoTBarContainerRectBottom > iItemTop || iHeaderToolbarRectBottom > iItemTop) {
 			window.requestAnimationFrame(function () {
-				oScrollDelegate.scrollToElement(oTargetItemDomRef, 0, [0, -iTHRectHeight - iInfoTBarContainerRectHeight - iHeaderToolbarRectHeight - iStickyFocusOffset], true);
+				oScrollDelegate.scrollToElement(oTargetItemDomRef, 0, [0, -iGHRectHeight - iTHRectHeight - iInfoTBarContainerRectHeight - iHeaderToolbarRectHeight - iStickyFocusOffset], true);
 			});
 		}
 	};
@@ -2989,15 +3012,21 @@ function(
 			switch (stickyOption) {
 				case Sticky.HeaderToolbar:
 					oControl = this.getHeaderToolbar();
-					oDomRef = oControl && oControl.getDomRef() || this.getDomRef("header");
+					oDomRef = oControl?.getDomRef() || this.getDomRef("header");
 					break;
 				case Sticky.InfoToolbar:
 					oControl = this.getInfoToolbar();
-					oDomRef = oControl && oControl.getDomRef();
+					oDomRef = oControl?.getDomRef();
 					break;
 				case Sticky.ColumnHeaders:
 					oDomRef = this.getDomRef("tblHeader");
 					break;
+				case Sticky.GroupHeaders:
+					//get domRef which is in view currently (Multiple groupHeaders)
+					oDomRef = this.getItems(true).find((oItem) => {
+						return oItem.isGroupHeader();
+					})?.getDomRef();
+					break;
 				default:
 			}
 

package/src/sap/m/ListItemBase.js

@@ -72,7 +72,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MaskEnabler.js

@@ -28,7 +28,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.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/MaskInputRule.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element', "sap/base/Log"], function(Element, Log) {
 	 *
 	 * @author SAP SE
 	 * @extends sap.ui.core.Element
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @public
 	 * @constructor
 	 * @since 1.34.0