@openui5/sap.m 1.97.1 → 1.98.0

package/src/sap/m/ViewSettingsDialog.js

@@ -142,7 +142,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsFilterItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsItem.js

@@ -25,7 +25,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/VisibleItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', "sap/ui/thirdparty/jquery"],
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/WheelSlider.js

@@ -28,7 +28,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/WheelSliderContainer.js

@@ -31,7 +31,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/Wizard.js

@@ -48,10 +48,12 @@ sap.ui.define([
 		 * Enables users to accomplish a single goal which consists of multiple dependable sub-tasks.
 		 * <h3>Overview</h3>
 		 * The sap.m.Wizard helps users complete a complex and unfamiliar task by dividing it into sections and guiding the user through it.
-		 * The wizard has two main areas - a navigation area at the top showing the step sequence and a content area below it.
+		 * The wizard has a mandatory title and two main areas - a navigation area at the top showing the step sequence, and a content area below.
 		 * <h3>Structure</h3>
+		 * <h4>Title</h4>
+		 * The wizard's title defines its purpose.
 		 * <h4>Navigation Area</h4>
-		 * The top most area of the wizard is occupied by the navigation area. It shows the sequence of {@link sap.m.WizardStep wizard steps}.
+		 * The navigation area shows the sequence of {@link sap.m.WizardStep wizard steps}.
 		 * <ul>
 		 * <li>The minimum number of steps is 3 and the maximum is 8 and are stored in the <code>steps</code> aggregation.</li>
 		 * <li>Steps can be branching depending on choices the user made in their input - this is set by the <code>enableBranching</code> property. </li>
@@ -84,7 +86,7 @@ sap.ui.define([
 		 *
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public
@@ -219,6 +221,7 @@ sap.ui.define([
 			this._oResourceBundle = Core.getLibraryResourceBundle("sap.m");
 			this._initProgressNavigator();
 			this._initResponsivePaddingsEnablement();
+			this._iNextButtonHeight = 0;
 		};
 
 		Wizard.prototype.onBeforeRendering = function () {
@@ -317,7 +320,7 @@ sap.ui.define([
 			this._iStepCount = null;
 			this._bScrollLocked = null;
 			this._oResourceBundle = null;
-			this._bNextButtonPressed = null;
+			this._iNextButtonHeight = null;
 		};
 
 		/**************************************** PUBLIC METHODS ***************************************/
@@ -782,8 +785,6 @@ sap.ui.define([
 					throw new Error("The wizard is in branching mode, and the nextStep association is not set.");
 				}
 
-				this._bNextButtonPressed = true;
-
 				oProgressNavigator.incrementProgress();
 
 				this._handleStepActivated(oProgressNavigator.getProgress());
@@ -800,12 +801,11 @@ sap.ui.define([
 		Wizard.prototype._getStepScrollOffset = function (oStep) {
 			var oStepContainer = this.getDomRef("step-container"),
 				iScrollerTop = oStepContainer ? oStepContainer.scrollTop : 0,
-				oNextButton = this._getNextButton(),
-				oProgressStep = this._getCurrentStepInstance(),
-				iStepTop = 0, iAdditionalOffset = 0,
+				iStepTop = 0,
+				iAdditionalOffset = 0,
+				iNextButtonHeight = this._getNextButtonHeight(),
 				iStepScrollHeight = oStep.getDomRef() ? oStep.getDomRef().scrollHeight : 0,
-				iStepContainerClientHeight = oStepContainer ? oStepContainer.clientHeight : 0,
-				bStepContainsButton = !!oNextButton && containsOrEquals(oProgressStep.getDomRef(), oNextButton.getDomRef());
+				iStepContainerClientHeight = oStepContainer ? oStepContainer.clientHeight : 0;
 
 			if (oStep && oStep.$() && oStep.$().position()) {
 				iStepTop = oStep.$().position().top || 0;
@@ -814,17 +814,16 @@ sap.ui.define([
 			/**
 			 * Additional Offset is added in case of new step activation.
 			 * Because the rendering from step.addContent(button) happens with delay,
-			 * we can't properly detect the offset of the step, that's why
-			 * additionalOffset is added like this.
+			 * we can't properly detect the offset of the step.
 			 *
-			 * Additional Offset is also added if a 'next' button has been pressed
-			 * and the oStep is taller than the viewport. - BCP: 2180339806
+			 * This offset will only be added if the step is taller than the
+			 * step container's client height. - BCP: 2180339806
 			 */
-			if ((!Device.system.phone && oProgressStep && !bStepContainsButton) || (iStepScrollHeight > iStepContainerClientHeight && this._bNextButtonPressed)) {
-				iAdditionalOffset = oNextButton.$().outerHeight();
+			if (iNextButtonHeight > 0 && iStepScrollHeight > iStepContainerClientHeight) {
+				iAdditionalOffset = iNextButtonHeight;
 			}
 
-			this._bNextButtonPressed = false;
+			this._setNextButtonHeight(0);
 
 			return (iScrollerTop + iStepTop) - (Wizard.CONSTANTS.SCROLL_OFFSET + iAdditionalOffset);
 		};
@@ -863,7 +862,10 @@ sap.ui.define([
 		Wizard.prototype._handleStepActivated = function (iIndex) {
 			var iPreviousStepIndex = iIndex - 2,
 				oPreviousStep = this._aStepPath[iPreviousStepIndex],
-				oNextStep = this._getNextStep(oPreviousStep, iPreviousStepIndex);
+				oNextStep = this._getNextStep(oPreviousStep, iPreviousStepIndex),
+				oNextButtonDomRef = this._getNextButton().getDomRef();
+
+			this._setNextButtonHeight(oNextButtonDomRef ? oNextButtonDomRef.offsetHeight : 0);
 
 			this._activateStep(oNextStep);
 			this._updateProgressNavigator();
@@ -1209,5 +1211,23 @@ sap.ui.define([
 			oStep._activate();
 		};
 
+		/**
+		 * Gets the value of the _iNextButtonHeight property.
+		 * @returns {number} The height of the "next" button.
+		 * @private
+		 */
+		Wizard.prototype._getNextButtonHeight = function () {
+			return this._iNextButtonHeight;
+		};
+
+		/**
+		 * Sets the value of the _iNextButtonHeight property.
+		 * @param {number} iHeight The height of the "next" button.
+		 * @private
+		 */
+		Wizard.prototype._setNextButtonHeight = function (iHeight) {
+			this._iNextButtonHeight = iHeight;
+		};
+
 		return Wizard;
 	});

package/src/sap/m/WizardProgressNavigator.js

@@ -43,7 +43,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/WizardStep.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * <li>If the execution needs to branch after a given step, you should set all possible next steps in the <code>subsequentSteps</code> aggregation.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/changeHandler/AddTableColumn.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 *
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @experimental Since 1.51.0 This class is experimental and provides only limited functionality.
 	 * Also the API might be changed in future.

package/src/sap/m/changeHandler/ChangeLinkTarget.js

@@ -12,7 +12,7 @@ sap.ui.define(function () {
 	 *
 	 * @alias sap.m.changeHandler.ChangeLinkTarget
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @experimental Since 1.71
 	 */
 	var ChangeLinkTarget = {};

package/src/sap/m/changeHandler/CombineButtons.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.CombineButtons
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @experimental Since 1.48
 	 */
 	var CombineButtons = {};

package/src/sap/m/changeHandler/MoveTableColumns.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/base/Log", "sap/ui/thirdparty/jquery"], function(Log, jQuery
 	 *
 	 * @alias sap.m.changeHandler.MoveTableColumns
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @experimental Since 1.48
 	 */
 	var MoveTableColumns = {};

package/src/sap/m/changeHandler/SelectIconTabBarFilter.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.SelectIconTabBarFilter
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @experimental Since 1.96
 	 */
 	var SelectIconTabBarFilter = {};

package/src/sap/m/changeHandler/SplitMenuButton.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.m.changeHandler.SplitMenuButton
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @experimental Since 1.48
 	 */
 	var SplitMenuButton = {};

package/src/sap/m/delegate/ValueStateMessage.js

@@ -264,7 +264,7 @@ sap.ui.define([
 				oTextDomRef.appendChild(document.createTextNode(vValueStateMessageText));
 				oMessageDomRef.appendChild(oTextDomRef);
 			} else {
-				Core.getRenderManager().render(vValueStateMessageText, oMessageDomRef);
+				Core.createRenderManager().render(vValueStateMessageText, oMessageDomRef);
 				oMessageDomRef.lastElementChild.setAttribute("id", sID + "-text");
 			}
 

package/src/sap/m/designtime/Button.designtime.js

@@ -28,7 +28,7 @@ sap.ui.define([],
 				rename: {
 					changeType: "rename",
 					domRef: function (oControl) {
-						return oControl.$().find(".sapMBtnContent")[0];
+						return oControl.$().find(".sapMBtnContent, .sapMSegBBtnInner")[0];
 					}
 				},
 				reveal: {

package/src/sap/m/designtime/StandardListItem.designtime.js

@@ -17,7 +17,11 @@ sap.ui.define([],
 						return oControl.$().find(".sapMLIBContent > .sapMSLIDiv > .sapMSLITitleOnly")[0] || oControl.$().find(".sapMLIBContent > .sapMSLIDiv > .sapMSLITitle")[0];
 					}
 				}
+			},
+			aggregations: {
+				avatar: {
+					ignore: true
+				}
 			}
 		};
-
 	});