@openui5/sap.m 1.94.0 → 1.97.0

package/src/sap/m/SplitApp.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.SplitContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SplitButton.js

@@ -48,7 +48,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/SplitButtonRenderer.js

@@ -50,7 +50,11 @@ sap.ui.define(["sap/m/library", "sap/ui/core/InvisibleText", "sap/ui/core/Shortc
 				|| sType === ButtonType.Reject
 				|| sType === ButtonType.Emphasized
 				|| sType === ButtonType.Transparent
-				|| sType === ButtonType.Attention) {
+				|| sType === ButtonType.Attention
+				|| sType === ButtonType.Neutral
+				|| sType === ButtonType.Critical
+				|| sType === ButtonType.Success
+				|| sType === ButtonType.Negative) {
 				oRm.class(SplitButtonRenderer.CSS_CLASS + sType);
 			}
 

package/src/sap/m/SplitContainer.js

@@ -86,7 +86,7 @@ function(
 	 *
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -2138,11 +2138,16 @@ function(
 	 * @param {object} mSettings Object containing the aggregation name
 	 * @param {string} mSettings.aggregation The aggregation name to decide on which column/container the placeholder should be shown
 	 *
-	 * @public
+	 * @private
+	 * @ui5-restricted SAPUI5 Distribution libraries only
 	 * @since 1.91
 	 */
 	SplitContainer.prototype.showPlaceholder = function(mSettings) {
-		switch (mSettings.aggregation) {
+		if (!sap.ui.getCore().getConfiguration().getPlaceholder()) {
+			return;
+		}
+
+		switch (mSettings && mSettings.aggregation) {
 			case "masterPages":
 				return this.getAggregation("_navMaster").showPlaceholder(mSettings);
 			default:
@@ -2156,7 +2161,8 @@ function(
 	 * @param {object} mSettings Object containing the aggregation name
 	 * @param {string} mSettings.aggregation The aggregation name to decide on which column/container the placeholder should be hidden
 	 *
-	 * @public
+	 * @private
+	 * @ui5-restricted SAP internal apps
 	 * @since 1.91
 	 */
 	SplitContainer.prototype.hidePlaceholder = function(mSettings) {

package/src/sap/m/StandardDynamicDateOption.js

@@ -5,8 +5,8 @@
  */
 
 // Provides control sap.m.StandardDynamicDateOption.
-sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepInput', './RadioButton', './RadioButtonGroup', 'sap/ui/unified/Calendar', 'sap/ui/unified/calendar/MonthPicker', 'sap/ui/core/format/DateFormat', './StandardDynamicDateRangeKeys', 'sap/ui/core/date/UniversalDateUtils', 'sap/ui/core/date/UniversalDate', 'sap/m/DynamicDateValueHelpUIType', './library'],
-	function(Element, DynamicDateOption, Label, StepInput, RadioButton, RadioButtonGroup, Calendar, MonthPicker, DateFormat, StandardDynamicDateRangeKeys, UniversalDateUtils, UniversalDate, DynamicDateValueHelpUIType, library) {
+sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepInput', './RadioButton', './RadioButtonGroup', 'sap/ui/unified/Calendar', 'sap/ui/unified/calendar/MonthPicker', 'sap/ui/core/format/DateFormat', 'sap/ui/core/date/UniversalDateUtils', 'sap/ui/core/date/UniversalDate', 'sap/m/DynamicDateValueHelpUIType', './library'],
+	function(Element, DynamicDateOption, Label, StepInput, RadioButton, RadioButtonGroup, Calendar, MonthPicker, DateFormat, UniversalDateUtils, UniversalDate, DynamicDateValueHelpUIType, library) {
 		"use strict";
 
 		/**
@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @public
 		 * @alias sap.m.StandardDynamicDateOption
@@ -69,6 +69,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 			"FROM": "FROM",
 			"TO": "TO",
 			"YEARTODATE": "YEARTODATE",
+			"DATETOYEAR":"DATETOYEAR",
 			"TODAYFROMTO": "TODAYFROMTO",
 			"QUARTER1": "QUARTER1",
 			"QUARTER2": "QUARTER2",
@@ -117,6 +118,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 			"FROM": _Groups.DateRanges,
 			"TO": _Groups.DateRanges,
 			"YEARTODATE": _Groups.DateRanges,
+			"DATETOYEAR": _Groups.DateRanges,
 			"TODAYFROMTO": _Groups.DateRanges,
 			"QUARTER1": _Groups.Quarters,
 			"QUARTER2": _Groups.Quarters,
@@ -134,6 +136,16 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 
 		StandardDynamicDateOption.Keys = Keys;
 
+		StandardDynamicDateOption.prototype.exit = function() {
+			if (this.aValueHelpUITypes) {
+				while (this.aValueHelpUITypes.length) {
+					this.aValueHelpUITypes.pop().destroy();
+				}
+
+				delete this.aValueHelpUITypes;
+			}
+		};
+
 		StandardDynamicDateOption.prototype.getText = function(oControl) {
 			var sKey = this.getKey();
 			var oOptions = oControl._getOptions();
@@ -171,71 +183,82 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 		StandardDynamicDateOption.prototype.getValueHelpUITypes = function(oControl) {
 			var sKey = this.getKey();
 
-			switch (sKey) {
-				case Keys.TODAY:
-				case Keys.YESTERDAY:
-				case Keys.TOMORROW:
-				case Keys.THISWEEK:
-				case Keys.THISMONTH:
-				case Keys.THISQUARTER:
-				case Keys.THISYEAR:
-				case Keys.LASTWEEK:
-				case Keys.LASTMONTH:
-				case Keys.LASTQUARTER:
-				case Keys.LASTYEAR:
-				case Keys.NEXTWEEK:
-				case Keys.NEXTMONTH:
-				case Keys.NEXTQUARTER:
-				case Keys.NEXTYEAR:
-				case Keys.YEARTODATE:
-				case Keys.QUARTER1:
-				case Keys.QUARTER2:
-				case Keys.QUARTER3:
-				case Keys.QUARTER4:
-					return [];
-				case Keys.DATE:
-				case Keys.FROM:
-				case Keys.TO:
-					return [
-						new DynamicDateValueHelpUIType({
-							type: "date"
-						})];
-				case Keys.DATERANGE:
-					return [
-						new DynamicDateValueHelpUIType({
-							type: "daterange"
-						})];
-				case Keys.SPECIFICMONTH:
-					return [
-						new DynamicDateValueHelpUIType({
-							type: "month"
-						})];
-				case Keys.LASTDAYS:
-				case Keys.LASTWEEKS:
-				case Keys.LASTMONTHS:
-				case Keys.LASTQUARTERS:
-				case Keys.LASTYEARS:
-				case Keys.NEXTDAYS:
-				case Keys.NEXTWEEKS:
-				case Keys.NEXTMONTHS:
-				case Keys.NEXTQUARTERS:
-				case Keys.NEXTYEARS:
-					return [
-						new DynamicDateValueHelpUIType({
-							text: _resourceBundle.getText("DDR_LASTNEXTX_LABEL"),
-							type: "int"
-						})];
-				case Keys.TODAYFROMTO:
-					return [
-						new DynamicDateValueHelpUIType({
-							text: _resourceBundle.getText("DDR_TODAYFROMTO_FROM_LABEL"),
-							type: "int"
-						}),
-						new DynamicDateValueHelpUIType({
-							text: _resourceBundle.getText("DDR_TODAYFROMTO_TO_LABEL"),
-							type: "int"
-						})];
+			if (!this.aValueHelpUITypes) { //the empty array is still an initialized value and can be reused
+				switch (sKey) {
+					case Keys.TODAY:
+					case Keys.YESTERDAY:
+					case Keys.TOMORROW:
+					case Keys.THISWEEK:
+					case Keys.THISMONTH:
+					case Keys.THISQUARTER:
+					case Keys.THISYEAR:
+					case Keys.LASTWEEK:
+					case Keys.LASTMONTH:
+					case Keys.LASTQUARTER:
+					case Keys.LASTYEAR:
+					case Keys.NEXTWEEK:
+					case Keys.NEXTMONTH:
+					case Keys.NEXTQUARTER:
+					case Keys.NEXTYEAR:
+					case Keys.YEARTODATE:
+					case Keys.DATETOYEAR:
+					case Keys.QUARTER1:
+					case Keys.QUARTER2:
+					case Keys.QUARTER3:
+					case Keys.QUARTER4:
+						this.aValueHelpUITypes = [];
+						break;
+					case Keys.DATE:
+					case Keys.FROM:
+					case Keys.TO:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								type: "date"
+							})];
+						break;
+					case Keys.DATERANGE:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								type: "daterange"
+							})];
+						break;
+					case Keys.SPECIFICMONTH:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								type: "month"
+							})];
+						break;
+					case Keys.LASTDAYS:
+					case Keys.LASTWEEKS:
+					case Keys.LASTMONTHS:
+					case Keys.LASTQUARTERS:
+					case Keys.LASTYEARS:
+					case Keys.NEXTDAYS:
+					case Keys.NEXTWEEKS:
+					case Keys.NEXTMONTHS:
+					case Keys.NEXTQUARTERS:
+					case Keys.NEXTYEARS:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								text: _resourceBundle.getText("DDR_LASTNEXTX_LABEL"),
+								type: "int"
+							})];
+						break;
+					case Keys.TODAYFROMTO:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								text: _resourceBundle.getText("DDR_TODAYFROMTO_FROM_LABEL"),
+								type: "int"
+							}),
+							new DynamicDateValueHelpUIType({
+								text: _resourceBundle.getText("DDR_TODAYFROMTO_TO_LABEL"),
+								type: "int"
+							})];
+						break;
+				}
 			}
+
+			return this.aValueHelpUITypes.slice(0);
 		};
 
 		/**
@@ -497,9 +520,12 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 					oDate = UniversalDateUtils.getMonthStartDate(oDate);
 					return UniversalDateUtils.getRange(0, "MONTH", oDate);
 				case "DATE":
-					return [oValue.values[0], oValue.values[0]];
+					return UniversalDateUtils.getRange(0, "DAY", UniversalDate.getInstance(oValue.values[0]));
 				case "DATERANGE":
-					return oValue.values.slice(0);
+					var oStart = UniversalDate.getInstance(oValue.values[0]);
+					var oEnd = UniversalDate.getInstance(oValue.values[1]);
+
+					return [UniversalDateUtils.resetStartTime(oStart), UniversalDateUtils.resetEndTime(oEnd)];
 				case "TODAY":
 					return UniversalDateUtils.ranges.today();
 				case "YESTERDAY":
@@ -556,6 +582,8 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 					return [oValue.values[0], oValue.values[0]];
 				case "YEARTODATE":
 					return UniversalDateUtils.ranges.yearToDate();
+				case "DATETOYEAR":
+					return UniversalDateUtils.ranges.dateToYear();
 				case "TODAYFROMTO":
 					if (oValue.values.length !== 2) {
 						return [];
@@ -602,6 +630,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 				case "NEXTQUARTER":
 				case "NEXTYEAR":
 				case "YEARTODATE":
+				case "DATETOYEAR":
 				case "QUARTER1":
 				case "QUARTER2":
 				case "QUARTER3":

package/src/sap/m/StandardListItem.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public
@@ -85,6 +85,8 @@ sap.ui.define([
 
 			/**
 			 * Defines an additional information text.
+			 * <b>Note:</b>
+			 * A wrapping of the information text is also supported as of version 1.95, if <code>wrapping=true</code>. Although long strings are supported for the information text, it is recommended to use short strings. For more details, see {@link #getWrapping wrapping}.
 			 */
 			info : {type : "string", group : "Misc", defaultValue : null},
 
@@ -116,7 +118,9 @@ sap.ui.define([
 			 *
 			 * <b>Note:</b>
 			 *
-			 * In the desktop mode, initial rendering of the control contains 300 characters along with a button to expand and collapse the text whereas in the phone mode, the character limit is set to 100 characters.
+			 * In the desktop mode, initial rendering of the control contains 300 characters along with a button to expand and collapse the text whereas in the phone mode, the character limit is set to 100 characters.<br>
+			 * A wrapping of the information text is supported as of 1.95. But expanding and collapsing the information text is not possible.
+			 * A wrapping of the information text is disabled if <code>infoStateInverted</code> is set to <code>true</code>.
 			 * @since 1.67
 			 */
 			wrapping : {type : "boolean", group : "Behavior", defaultValue : false},
@@ -278,34 +282,33 @@ sap.ui.define([
 			StandardListItem._themeInfo = {};
 		}
 
+		var fBaseFontSize = parseFloat(library.BaseFontSize) || 16;
+
 		if (!StandardListItem._themeInfo.sFontFamily || bThemeChanged) {
-			StandardListItem._themeInfo.sFontFamily = ThemeParameters.get("sapUiFontFamily");
+			StandardListItem._themeInfo.sFontFamily = ThemeParameters.get({
+				name: "sapUiFontFamily"
+			}) || "Arial";
 		}
 
 		if (!StandardListItem._themeInfo.sFontStyleInfoStateInverted || bThemeChanged) {
-			StandardListItem._themeInfo.sFontStyleInfoStateInverted = "bold " + parseFloat(ThemeParameters.get("sapMFontSmallSize")) * 16 + "px" + " " + StandardListItem._themeInfo.sFontFamily;
+			StandardListItem._themeInfo.sFontStyleInfoStateInverted = "bold " + parseFloat(ThemeParameters.get({
+				name: "sapMFontSmallSize"
+			}) || "0.75rem") * fBaseFontSize + "px " + StandardListItem._themeInfo.sFontFamily;
 		}
 
 		if (!StandardListItem._themeInfo.sFontStyle || bThemeChanged) {
-			StandardListItem._themeInfo.sFontStyle = parseFloat(ThemeParameters.get("sapMFontMediumSize")) * 16 + "px" + " " + StandardListItem._themeInfo.sFontFamily;
+			StandardListItem._themeInfo.sFontStyle = parseFloat(ThemeParameters.get({
+				name: "sapMFontMediumSize"
+			}) || "0.875rem") * fBaseFontSize + "px " + StandardListItem._themeInfo.sFontFamily;
 		}
 
-		if (!StandardListItem._themeInfo.iBaseFontSize || bThemeChanged) {
-			StandardListItem._themeInfo.iBaseFontSize = parseInt(library.BaseFontSize) || 16;
+		if (!StandardListItem._oCtx) {
+			StandardListItem._oCtx = document.createElement("canvas").getContext("2d");
 		}
 
-		if (!StandardListItem._oCanvas) {
-			StandardListItem._oCanvas = document.createElement("canvas");
-			StandardListItem._oCtx = StandardListItem._oCanvas.getContext("2d");
-		}
+		StandardListItem._oCtx.font = StandardListItem._themeInfo[this.getInfoStateInverted() ? "sFontStyleInfoStateInverted" : "sFontStyle"];
 
-		if (this.getInfoStateInverted()) {
-			StandardListItem._oCtx.font = StandardListItem._themeInfo.sFontStyleInfoStateInverted || "";
-		} else {
-			StandardListItem._oCtx.font = StandardListItem._themeInfo.sFontStyle || "";
-		}
-
-		return Math.ceil(StandardListItem._oCtx.measureText(this.getInfo()).width) / StandardListItem._themeInfo.iBaseFontSize;
+		return Math.ceil(StandardListItem._oCtx.measureText(this.getInfo()).width) / fBaseFontSize;
 	};
 
 	/**
@@ -331,11 +334,20 @@ sap.ui.define([
 	StandardListItem.prototype.ontap = function(oEvent) {
 		this._checkExpandCollapse(oEvent);
 
-		if (!oEvent.isMarked()) {
-			return ListItemBase.prototype.ontap.apply(this, arguments);
-		}
+		return ListItemBase.prototype.ontap.apply(this, arguments);
 	};
 
+	StandardListItem.prototype.ontouchstart = function(oEvent) {
+		var sId = oEvent.target && oEvent.target.id,
+			sStdListId = this.getId();
+
+		if (sId === sStdListId + "-titleButton" || sId === sStdListId + "-descriptionButton") {
+			oEvent.setMarked();
+		}
+
+		return ListItemBase.prototype.ontouchstart.apply(this, arguments);
+	  };
+
 	StandardListItem.prototype.onsapspace = function(oEvent) {
 		// prevent default not to scroll down, hence 2nd parameter is true
 		this._checkExpandCollapse(oEvent, true);

package/src/sap/m/StandardListItemRenderer.js

@@ -218,7 +218,11 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 		rm.style("min-width", oLI._getInfoTextMinWidth(fWidth));
 
 		rm.openEnd();
-		rm.text(oLI.getInfo());
+		if (oLI.getWrapping() && !bInfoStateInverted) {
+			this.renderWrapping(rm, oLI, "info");
+		} else {
+			rm.text(oLI.getInfo());
+		}
 		rm.close("div");
 	};
 
@@ -255,25 +259,33 @@ sap.ui.define(["sap/ui/core/library", "sap/ui/core/Core", "sap/ui/core/Renderer"
 	 */
 	StandardListItemRenderer.renderWrapping = function(rm, oLI, sWrapArea) {
 		var sId = oLI.getId(),
-			bTitle = sWrapArea == "title" ? true : false,
-			sText = bTitle ? oLI.getTitle() : oLI.getDescription(),
-			bTextExpanded = bTitle ? oLI._bTitleTextExpanded : oLI._bDescriptionTextExpanded,
-			iMaxCharacters = oLI._getWrapCharLimit();
+			iMaxCharacters = oLI._getWrapCharLimit(),
+			sText, bTextExpanded;
+
+		if (sWrapArea === "title") {
+			sText = oLI.getTitle();
+			bTextExpanded = oLI._bTitleTextExpanded;
+		} else if (sWrapArea === "description") {
+			sText = oLI.getDescription();
+			bTextExpanded = oLI._bDescriptionTextExpanded;
+		} else {
+			sText = oLI.getInfo();
+		}
 
 		rm.openStart("span", sId + "-" + sWrapArea + "Text").attr("aria-live", "polite").openEnd();
 
-		if (!bTextExpanded) {
+		if (!bTextExpanded && sWrapArea !== "info") {
 			var sCollapsedText = oLI._getCollapsedText(sText);
 			rm.text(sCollapsedText);
-		} else if (bTitle) {
+		} else if (sWrapArea == "title") {
 			this.renderTitle(rm, oLI);
 		} else {
-			rm.text(oLI.getDescription());
+			rm.text(sText);
 		}
 
 		rm.close("span");
 
-		if (sText.length > iMaxCharacters) {
+		if (sText.length > iMaxCharacters && sWrapArea !== "info") {
 			this.renderExpandCollapse(rm, oLI, sWrapArea);
 		}
 	};

package/src/sap/m/StandardTile.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.m.Tile
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StandardTreeItem.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.m.TreeItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StepInput.js

@@ -130,7 +130,7 @@ function(
 		 * @implements sap.ui.core.IFormContent
 		 *
 		 * @author SAP SE
-		 * @version 1.94.0
+		 * @version 1.97.0
 		 *
 		 * @constructor
 		 * @public
@@ -430,7 +430,7 @@ function(
 			Input.prototype.setValue.apply(this, arguments);
 
 			if (this.getDomRef()) {
-				document.getElementById(this.getId() + "-inner").setAttribute("aria-valuenow", sValue);
+				this.getDomRef("inner").setAttribute("aria-valuenow", sValue);
 			}
 
 			return this;
@@ -461,7 +461,7 @@ function(
 		StepInput.prototype.onBeforeRendering = function () {
 			var fMin = this._getMin(),
 				fMax = this._getMax(),
-				vValue = this._getInput()._$input.val() || this.getValue(),
+				vValue = this._sOriginalValue || this.getValue(),
 				bEditable = this.getEditable();
 
 			this._iRealPrecision = this._getRealValuePrecision();
@@ -486,6 +486,7 @@ function(
 
 		StepInput.prototype.exit = function () {
 			this.$().off(Device.browser.firefox ? "DOMMouseScroll" : "mousewheel", this._onmousewheel);
+			this._sOriginalValue = null;
 		};
 
 		StepInput.prototype.setProperty = function (sPropertyName, oValue, bSuppressInvalidate) {
@@ -919,6 +920,7 @@ function(
 				return this;
 			}
 
+			this._sOriginalValue = oValue;
 			this._applyValue(oValue);
 			this._disableButtons(Number(this._getInput().getValue()), this._getMax(), this._getMin());
 
@@ -1590,7 +1592,8 @@ function(
 					onmouseup: function (oEvent) {
 						// check if the left mouse button is up
 						// handled in touchend for mobile
-						if (Device.system.desktop && oEvent.button === 0) {
+						// but the touchend comes before mousedown on android
+						if (oEvent.button === 0) {
 							this._bDelayedEventFire = undefined;
 							this._btndown = false;
 							this._stopSpin();
@@ -1603,15 +1606,13 @@ function(
 						}
 					}.bind(this),
 					oncontextmenu: function (oEvent) {
-						if (!Device.os.android) {
-							// Context menu is shown on "long-touch"
-							// so prevent of showing it while "long-touching" on the button
-							oEvent.stopImmediatePropagation(true);
-							if (oEvent.originalEvent && oEvent.originalEvent.cancelable) {
-								oEvent.preventDefault();
-							}
-							oEvent.stopPropagation();
+						// Context menu is shown on "long-touch"
+						// so prevent of showing it while "long-touching" on the button
+						oEvent.stopImmediatePropagation(true);
+						if (oEvent.originalEvent && oEvent.originalEvent.cancelable) {
+							oEvent.preventDefault();
 						}
+						oEvent.stopPropagation();
 					},
 					ontouchend: function(oEvent) {
 						if (Device.system.phone || Device.system.tablet) {
@@ -1685,6 +1686,10 @@ function(
 			}
 		};
 
+		StepInput.prototype.getFocusDomRef = function() {
+			return this.getAggregation("_input").getFocusDomRef();
+		};
+
 		/*
 		 * Resets timeouts and speed to initial values.
 		 */

package/src/sap/m/Suggest.js

@@ -4,24 +4,29 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['jquery.sap.global',
-		'./Toolbar',
-		'./Button',
-		'./SuggestionsList',
-		'./SuggestionItem',
-		'sap/ui/Device',
-		'sap/m/library',
-		'sap/ui/core/Core',
-		'sap/ui/core/InvisibleText'],
-	function(jQuery,
-			 Toolbar,
-			 Button,
-			 SuggestionsList,
-			 SuggestionItem,
-			 Device,
-			 library,
-			 Core,
-			 InvisibleText) {
+sap.ui.define([
+	"./Toolbar",
+	"./Button",
+	"./Dialog",
+	"./Popover",
+	"./SuggestionsList",
+	"./SuggestionItem",
+	"sap/ui/Device",
+	"sap/m/library",
+	"sap/ui/core/Core",
+	"sap/ui/core/InvisibleText"
+], function (
+	Toolbar,
+	Button,
+	Dialog,
+	Popover,
+	SuggestionsList,
+	SuggestionItem,
+	Device,
+	library,
+	Core,
+	InvisibleText
+) {
 	"use strict";
 
 	// shortcut for sap.m.PlacementType
@@ -53,11 +58,6 @@ sap.ui.define(['jquery.sap.global',
 			bUseDialog = Device.system.phone,
 			self = this;
 
-		// 1. Conditional loading depending on the device type.
-		// 2. Resolve circular dependency Dialog -> OverflowToolbar -> SearchField:
-		//TODO: global jquery call found
-		jQuery.sap.require(bUseDialog ? "sap.m.Dialog" : "sap.m.Popover");
-
 		/* =========================================================== */
 		/* events processing                                           */
 		/* =========================================================== */
@@ -133,7 +133,7 @@ sap.ui.define(['jquery.sap.global',
 				}
 			});
 
-			dialog = new (sap.ui.require('sap/m/Dialog'))({
+			dialog = new Dialog({
 				stretch: true,
 				customHeader: customHeader,
 				content: getList(),
@@ -164,7 +164,7 @@ sap.ui.define(['jquery.sap.global',
 		}
 
 		function createPopover() {
-			var popover = self._oPopover =  new (sap.ui.require('sap/m/Popover'))({
+			var popover = self._oPopover = new Popover({
 				showArrow: false,
 				showHeader: false,
 				horizontalScrolling: false,

package/src/sap/m/SuggestionItem.js

@@ -22,7 +22,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @since 1.34
 	 *
 	 * @constructor
@@ -147,11 +147,5 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 		return this.getText();
 	};
 
-	// Suppress invalidate of the parent input field by property changes.
-	SuggestionItem.prototype.invalidate = function() {
-		return undefined;
-	};
-
 	return SuggestionItem;
-
 });