@openui5/sap.m 1.103.1 → 1.106.0

package/src/sap/m/RatingIndicatorRenderer.js

@@ -61,6 +61,11 @@ sap.ui.define(
 				oRm.attr("tabindex", "-1");
 				bEnabled ? oRm.class("sapMRIDisplayOnly") : oRm.class("sapMRIDisabled");
 			}
+
+			if (!oControl.getIconSize()) {
+				oRm.class("sapMRINoCustomIconSize");
+			}
+
 			oRm.class("sapMRI");
 			oRm.class("sapUiRatingIndicator" + oControl._getIconSizeLabel(this._fIconSize));
 
@@ -126,7 +131,7 @@ sap.ui.define(
 			oRm.openEnd();
 
 			for (var i = 0; i < this._iSymbolCount; i++) {
-				this.renderIcon("SELECTED", oRm, oControl);
+				this.renderIcon("SELECTED", oRm, oControl, i);
 			}
 
 			oRm.close("div");
@@ -149,7 +154,7 @@ sap.ui.define(
 			oRm.openEnd();
 
 			for (var i = 0; i < this._iSymbolCount; i++) {
-				this.renderIcon("UNSELECTED", oRm, oControl);
+				this.renderIcon("UNSELECTED", oRm, oControl, i);
 			}
 
 			oRm.close("div");
@@ -163,7 +168,7 @@ sap.ui.define(
 				oRm.openEnd();
 
 				for (var i = 0; i < this._iSymbolCount; i++) {
-					this.renderIcon("HOVERED", oRm, oControl);
+					this.renderIcon("HOVERED", oRm, oControl, i);
 				}
 				oRm.close("div");
 			}
@@ -177,7 +182,7 @@ sap.ui.define(
 			oRm.close("div");
 		};
 
-		RatingIndicatorRenderer.renderIcon = function(iconType, oRm, oControl) {
+		RatingIndicatorRenderer.renderIcon = function(iconType, oRm, oControl, iValue) {
 			var sIconURI = this.getIconURI(iconType, oControl),
 				sTagName = this.getIconTag(sIconURI),
 				bIsIconURI = IconPool.isIconURI(sIconURI),
@@ -196,6 +201,10 @@ sap.ui.define(
 			oRm.class("sapUiIcon");
 			oRm.class(this.getIconClass(iconType));
 
+			if (iValue >= Math.ceil(oControl.getValue())) {
+				oRm.class("sapMRIunratedIcon");
+			}
+
 			oRm.style("width", sSize);
 			oRm.style("height", sSize);
 			oRm.style("line-height", sSize);

package/src/sap/m/ResponsivePopover.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public
@@ -418,8 +418,8 @@ sap.ui.define([
 	/**
 	 * Opens the ResponsivePopover. The ResponsivePopover is positioned relatively to the control parameter on tablet or desktop and is full screen on phone. Therefore the control parameter is only used on tablet or desktop and is ignored on phone.
 	 *
-	 * @param {object} oParent When this control is displayed on tablet or desktop, the ResponsivePopover is positioned relative to this control.
-	 * @returns {object} Reference to the opening control
+	 * @param {sap.ui.core.Control|HTMLElement} oParent When this control is displayed on tablet or desktop, the ResponsivePopover is positioned relative to this UI5 control or DOM element.
+	 * @returns {sap.m.Popover|sap.m.Dialog} Reference to the opening control
 	 * @public
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/m/ResponsiveScale.js

@@ -34,7 +34,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ScrollBar.js

@@ -25,7 +25,7 @@ function(Control, ScrollBarRenderer) {
 	 * care of only rendering the currently visible rows and use this <code>ScrollBar</code> control to make
 	 * the users think they are actually scrolling through a long list.
 	 * @extends sap.ui.core.Control
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @alias sap.m.ScrollBar

package/src/sap/m/ScrollContainer.js

@@ -37,7 +37,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SearchField.js

@@ -67,7 +67,7 @@ sap.ui.define([
 	* @extends sap.ui.core.Control
 	* @implements sap.ui.core.IFormContent
 	* @author SAP SE
-	* @version 1.103.1
+	* @version 1.106.0
 	*
 	* @constructor
 	* @public

package/src/sap/m/SearchFieldRenderer.js

@@ -93,6 +93,7 @@ sap.ui.define([
 			rm.voidStart('input', sId + "-I")
 				.class("sapMSFI")
 				.attr("type", "search")
+				.attr("aria-label", sPlaceholder)
 				.attr("autocomplete", "off");
 
 			if (oSF.getEnableSuggestions()) {

package/src/sap/m/SegmentedButton.js

@@ -55,7 +55,7 @@ function(
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SegmentedButtonItem.js

@@ -23,7 +23,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/m/Button', 'sap/ui/core/Cus
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/Select.js

@@ -103,7 +103,7 @@ function(
 		 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @public
@@ -346,7 +346,6 @@ function(
 					 *
 					 * <b>Note:</b> This property takes effect only when the <code>showSecondaryValues</code> property is set to <code>true</code>.
 					 * @since 1.86
-					 * @experimental As of version 1.86
 					 */
 					columnRatio: {
 						type: "sap.m.SelectColumnRatio",
@@ -2323,6 +2322,7 @@ function(
 		 * Retrieves the index of the selected item from the aggregation named <code>items</code>.
 		 *
 		 * @returns {int} An integer specifying the selected index, or -1 if no item is selected.
+		 * @private
 		 * @since 1.26.0
 		 */
 		Select.prototype.getSelectedIndex = function() {
@@ -2369,7 +2369,7 @@ function(
 		/**
 		 * Checks whether the provided element is the open area.
 		 *
-		 * @param {Element} oDomRef
+		 * @param {HTMLElement} oDomRef
 		 * @returns {boolean}
 		 * @since 1.22.0
 		 */
@@ -2881,35 +2881,29 @@ function(
 
 		Select.prototype.setValueState = function(sValueState) {
 			var sOldValueState = this.getValueState(),
+				oDomRef,
 				oPicker;
 
 			if (sValueState === sOldValueState) {
 				return this;
 			}
-
 			oPicker = this.getPicker();
 
 			if (oPicker && oPicker.isA("sap.m.Popover") && oPicker.isOpen() && oPicker.oPopup.getOpenState() === OpenState.CLOSING) {
 				oPicker.attachEventOnce("afterClose", function(oEvent) {
-					return this._finishSettingValueState(sValueState);
+					this._updatePickerAriaLabelledBy(sValueState);
 				}, this);
 			} else {
-				return this._finishSettingValueState(sValueState);
+				this._updatePickerAriaLabelledBy(sValueState);
 			}
 
-		};
-
-		Select.prototype._finishSettingValueState = function(sValueState) {
-
 			this.setProperty("valueState", sValueState);
 
-			this._updatePickerAriaLabelledBy(sValueState);
-
 			if (this._isFocused()) {
 				this._announceValueStateText();
 			}
 
-			var oDomRef = this.getDomRefForValueState();
+			oDomRef = this.getDomRefForValueState();
 
 			if (!oDomRef) {
 				return this;
@@ -3012,7 +3006,7 @@ function(
 		 * <b>Note: </b> If duplicate keys exist, the first item matching the key is returned.
 		 *
 		 * @param {string} sKey An item key that specifies the item to be retrieved.
-		 * @returns {sap.ui.core.Item} The <code>sap.ui.core.Item</code> instance or <code>null</code> if thre is no such item
+		 * @returns {sap.ui.core.Item|null} The <code>sap.ui.core.Item</code> instance or <code>null</code> if there is no such item
 		 * @public
 		 * @since 1.16
 		 */

package/src/sap/m/SelectDialog.js

@@ -119,7 +119,7 @@ function(
 	 * @extends sap.m.SelectDialogBase
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public
@@ -1062,6 +1062,7 @@ function(
 				// When reset the filter, the selected items might go outside
 				// the currently visible items (outside the current growing number).
 				// Set the growing to false to prevent this.
+				that._oList.destroyItems();
 				that._oList.setGrowing(false);
 				oBindings.filter([]);
 				that._oList.setGrowing(that.getGrowing());

package/src/sap/m/SelectDialogBase.js

@@ -27,7 +27,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SelectList.js

@@ -37,7 +37,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SelectListRenderer.js

@@ -3,8 +3,8 @@
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(["sap/ui/core/Element", "sap/ui/core/library", "sap/ui/core/Icon", "sap/ui/core/IconPool", "sap/ui/Device"],
-	function(Element, coreLibrary, Icon, IconPool, Device) {
+sap.ui.define(["sap/ui/core/Element", "sap/ui/core/library", "sap/ui/core/IconPool", "sap/ui/Device"],
+	function(Element, coreLibrary, IconPool, Device) {
 		"use strict";
 
 		// shortcut for sap.ui.core.TextDirection

package/src/sap/m/SelectionDetails.js

@@ -37,7 +37,7 @@ function(
 	 * <b><i>Note:</i></b>It is protected and should only be used within the framework itself.
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @extends sap.ui.core.Control
 	 * @constructor
@@ -294,7 +294,7 @@ function(
 	 * @param {function} Button The constructor for sap.m.Button.
 	 * @private
 	 */
-	SelectionDetails.prototype._handleNavLazy = function(pageTitle, content, Page, Toolbar, ToolbarSpacer, Title, Button) {
+	SelectionDetails.prototype._handleNavLazy = function(pageTitle, content, Page, Toolbar, ToolbarSpacer, Title) {
 		var sPageId = this.getId() + "-page-for-" + content.getId() + "-uid-" + uid();
 
 		this._setPopoverHeight(SelectionDetails._POPOVER_MAX_HEIGHT);

package/src/sap/m/SelectionDetailsFacade.js

@@ -10,7 +10,7 @@
  * @since 1.48.0
  * @public
  * @author SAP SE
- * @version 1.103.1
+ * @version 1.106.0
  * @borrows sap.ui.core.Element#addCustomData as #addCustomData
  * @borrows sap.ui.core.Element#getCustomData as #getCustomData
  * @borrows sap.ui.core.Element#indexOfCustomData as #indexOfCustomData
@@ -45,7 +45,7 @@
  * @since 1.48.0
  * @public
  * @author SAP SE
- * @version 1.103.1
+ * @version 1.106.0
  * @borrows sap.ui.core.Element#addCustomData as #addCustomData
  * @borrows sap.ui.core.Element#getCustomData as #getCustomData
  * @borrows sap.ui.core.Element#indexOfCustomData as #indexOfCustomData

package/src/sap/m/SelectionDetailsItem.js

@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @protected

package/src/sap/m/SelectionDetailsItemLine.js

@@ -23,7 +23,7 @@ sap.ui.define(["sap/ui/core/Element", "sap/base/Log", "sap/base/util/isPlainObje
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @protected

package/src/sap/m/Shell.js

@@ -35,7 +35,7 @@ sap.ui.define([
 		 * The Shell control can be used as root element of applications. It can contain an App or a <code>SplitApp</code> control.
 		 * The Shell provides some overarching functionality for the overall application and takes care of visual adaptation, such as a frame around the App, on desktop browser platforms.
 		 * @extends sap.ui.core.Control
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SimpleFixFlex.js

@@ -31,7 +31,7 @@ function (Control, ResizeHandler, Log /**, SimpleFixFlexRenderer */) {
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/SinglePlanningCalendar.js

@@ -19,7 +19,6 @@ sap.ui.define([
 	'sap/ui/core/ResizeHandler',
 	'sap/ui/core/format/DateFormat',
 	'sap/ui/unified/calendar/CalendarDate',
-	'sap/ui/unified/calendar/CalendarUtils',
 	'sap/ui/unified/DateRange',
 	'sap/ui/unified/DateTypeRange',
 	'sap/ui/unified/library',
@@ -40,7 +39,6 @@ function(
 	ResizeHandler,
 	DateFormat,
 	CalendarDate,
-	CalendarUtils,
 	DateRange,
 	DateTypeRange,
 	unifiedLibrary,
@@ -104,7 +102,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public
@@ -965,7 +963,7 @@ function(
 	 * Switches the visibility of the SegmentedButton in the _header and aligns the columns in the grid after an
 	 * operation (add, insert, remove, removeAll, destroy) with the views is performed.
 	 *
-	 * @returns {object} this for method chaining
+	 * @returns {this} this for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._alignView = function () {
@@ -1006,11 +1004,11 @@ function(
 	};
 
 	/**
-	 * Finds the view object by given key
+	 * Finds the view object by given key.
 	 * @param {string} sKey The key of the view
 	 * @public
 	 * @since 1.75
-	 * @returns {sap.m.SinglePlanningCalendarView} the view object which matched the given <code>sKey</code>, or null if there is no such view
+	 * @returns {sap.m.SinglePlanningCalendarView|null} the view object which matched the given <code>sKey</code>, or <code>null</code> if there is no such view
 	 */
 	SinglePlanningCalendar.prototype.getViewByKey = function (sKey) {
 		var aViews = this.getViews(),
@@ -1065,7 +1063,7 @@ function(
 	 * If the SinglePlanningCalendar has only one view added to its view aggregation, the button is not visible.
 	 * Otherwise, it is displayed in the _header.
 	 *
-	 * @returns {object} this for method chaining
+	 * @returns {this} this for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._switchViewButtonVisibility = function () {
@@ -1080,7 +1078,7 @@ function(
 	/**
 	 * Attaches handlers to the events in the _header aggregation.
 	 *
-	 * @returns {object} this for method chaining
+	 * @returns {this} this for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._attachHeaderEvents = function () {
@@ -1117,7 +1115,7 @@ function(
 	/**
 	 * Attaches handlers to the events in the _grid aggregation.
 	 *
-	 * @returns {object} this for method chaining
+	 * @returns {this} this for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._attachGridEvents = function () {

package/src/sap/m/SinglePlanningCalendarDayView.js

@@ -25,7 +25,7 @@ function (library, SinglePlanningCalendarView) {
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarGrid.js

@@ -15,11 +15,8 @@ sap.ui.define([
 		'sap/ui/core/format/TimezoneUtil',
 		'sap/ui/core/Core',
 		'sap/ui/core/date/UniversalDate',
-		'sap/ui/core/dnd/DragInfo',
-		'sap/ui/core/dnd/DropInfo',
 		'sap/ui/core/dnd/DragDropInfo',
 		'sap/ui/unified/library',
-		'sap/ui/unified/CalendarAppointment',
 		'sap/ui/unified/calendar/DatesRow',
 		'sap/ui/unified/calendar/CalendarDate',
 		'sap/ui/unified/calendar/CalendarUtils',
@@ -42,11 +39,8 @@ sap.ui.define([
 		TimezoneUtil,
 		Core,
 		UniversalDate,
-		DragInfo,
-		DropInfo,
 		DragDropInfo,
 		unifiedLibrary,
-		CalendarAppointment,
 		DatesRow,
 		CalendarDate,
 		CalendarUtils,
@@ -106,7 +100,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SinglePlanningCalendarMonthGrid.js

@@ -83,7 +83,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SinglePlanningCalendarMonthGridRenderer.js

@@ -8,7 +8,6 @@ sap.ui.define([
 	'sap/ui/unified/calendar/CalendarDate',
 	'sap/ui/unified/calendar/CalendarUtils',
 	'sap/ui/unified/calendar/Month',
-	'sap/ui/core/date/UniversalDate',
 	'sap/ui/core/IconPool',
 	'./PlanningCalendarLegend',
 	'sap/ui/core/InvisibleText',
@@ -19,7 +18,6 @@ sap.ui.define([
 		CalendarDate,
 		CalendarUtils,
 		Month,
-		UniversalDate,
 		IconPool,
 		PlanningCalendarLegend,
 		InvisibleText,

package/src/sap/m/SinglePlanningCalendarMonthView.js

@@ -28,7 +28,7 @@ sap.ui.define([
 		 * @extends sap.m.SinglePlanningCalendarView
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/SinglePlanningCalendarView.js

@@ -26,7 +26,7 @@ function (library, Log, Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarWeekView.js

@@ -28,7 +28,7 @@ function (library, SinglePlanningCalendarView, LocaleData, CalendarDate, Calenda
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public
@@ -75,20 +75,19 @@ function (library, SinglePlanningCalendarView, LocaleData, CalendarDate, Calenda
 	 * @public
 	 */
 	SinglePlanningCalendarWeekView.prototype.calculateStartDate = function (oStartDate) {
-		var oCalDate = CalendarDate.fromLocalJSDate(oStartDate),
-			oCalFirstDateOfWeek = CalendarUtils._getFirstDateOfWeek(oCalDate),
-			oSPCStart = oCalFirstDateOfWeek.toLocalJSDate(),
-			iOldFirstDayOfWeek = oSPCStart.getDay(),
-			iResultFirstDayOfWeek = this.getFirstDayOfWeek(),
-			oLocaleData;
+		var oLocaleData = LocaleData.getInstance(sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale()),
+			iFirstDayOfWeek = this.getFirstDayOfWeek(),
+			// -1 is the default value of firstDayOfWeek property. It means that the information from the used locale is used.
+			iCurrentFirstDayOfWeek = iFirstDayOfWeek === -1 ? oLocaleData.getFirstDayOfWeek() : iFirstDayOfWeek;
 
-		if (iResultFirstDayOfWeek === -1) { // -1 is the default value of firstDayOfWeek property. It means that the information from the used locale is used.
-			oLocaleData = LocaleData.getInstance(sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale());
-			iResultFirstDayOfWeek = oLocaleData.getFirstDayOfWeek();
-		}
-		oSPCStart.setDate(oSPCStart.getDate() - iOldFirstDayOfWeek + iResultFirstDayOfWeek);
+		oStartDate.setDate(oStartDate.getDate() - oStartDate.getDay() + iCurrentFirstDayOfWeek);
 
-		return oSPCStart;
+		return CalendarUtils
+			._getFirstDateOfWeek(CalendarDate.fromLocalJSDate(oStartDate), {
+				firstDayOfWeek: iFirstDayOfWeek,
+				minimalDaysInFirstWeek: oLocaleData.getMinimalDaysInFirstWeek()
+			})
+			.toLocalJSDate();
 	};
 
 	return SinglePlanningCalendarWeekView;

package/src/sap/m/SinglePlanningCalendarWorkWeekView.js

@@ -28,7 +28,7 @@ function (library, SinglePlanningCalendarView, CalendarDate, CalendarUtils, Loca
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SlideTile.js

@@ -8,7 +8,6 @@ sap.ui.define([
 	'./library',
 	'sap/ui/core/Control',
 	'sap/m/GenericTile',
-	'sap/ui/Device',
 	'sap/ui/core/Icon',
 	'./SlideTileRenderer',
 	"sap/ui/events/KeyCodes",
@@ -19,7 +18,6 @@ sap.ui.define([
 		library,
 		Control,
 		GenericTile,
-		Device,
 		Icon,
 		SlideTileRenderer,
 		KeyCodes,
@@ -41,7 +39,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @since 1.34
 	 *
 	 * @public
@@ -161,6 +159,11 @@ sap.ui.define([
 		this._stopAnimation();
 		this._sWidth = this._sHeight = undefined;
 		this._iCurrentTile = this._iPreviousTile = undefined;
+
+		//sets the extra width of 0.5rem when the grid container has 1rem gap for the TwoByxxxx tiles
+		if (this.getParent() && this.getParent().isA("sap.f.GridContainer")){
+			this._applyExtraWidth();
+		}
 	};
 
 	/**
@@ -385,7 +388,7 @@ sap.ui.define([
 	 */
 	SlideTile.prototype._setupResizeClassHandler = function () {
 		var fnCheckMedia = function () {
-			if (this.getSizeBehavior() === TileSizeBehavior.Small || window.matchMedia("(max-width: 374px)").matches) {
+			if (this.getSizeBehavior() === TileSizeBehavior.Small || window.matchMedia("(max-width: 374px)").matches || this._hasStretchTiles()){
 				this.$().addClass("sapMTileSmallPhone");
 			} else {
 				this.$().removeClass("sapMTileSmallPhone");
@@ -396,6 +399,18 @@ sap.ui.define([
 		fnCheckMedia();
 	};
 
+	/**
+	 *Checks if the tiles inside the slidetile has stretch frametype and the window size is below 600px
+	 *
+	 * @returns {boolean} True if the above mentioned condition is met
+	 * @private
+	 */
+	SlideTile.prototype._hasStretchTiles = function () {
+		return this.getTiles().some(function(tile) {
+			return tile._isSmallStretchTile();
+		});
+	};
+
 	/**
 	 * Checks if the focus is inside of SlideTile
 	 *
@@ -748,6 +763,16 @@ sap.ui.define([
 		return false;
 	};
 
+	SlideTile.prototype._applyExtraWidth = function() {
+		var sGap = this.getParent().getActiveLayoutSettings().getGap();
+		var bisGap16px = sGap === "16px" || sGap === "1rem";
+		if (bisGap16px){
+			this.addStyleClass("sapMSTWidthForGridContainer");
+		} else if (!bisGap16px && this.hasStyleClass("sapMSTWidthForGridContainer")){
+			this.removeStyleClass("sapMSTWidthForGridContainer");
+		}
+	};
+
 	/**
 	 * Determines the current action depending on the tile's scope.
 	 * @param {sap.ui.base.Event} oEvent which was fired
@@ -757,4 +782,4 @@ sap.ui.define([
 	SlideTile.prototype._getEventParams = GenericTile.prototype._getEventParams;
 
 	return SlideTile;
-});
+});