@openui5/sap.ui.layout 1.91.0 → 1.93.2

package/src/sap/ui/layout/changeHandler/UnhideSimpleForm.js

@@ -13,11 +13,15 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 * @experimental Since 1.27.0
 	 */
 	var UnhideForm = { };
 
+	function _isXmlModifier(mPropertyBag) {
+		return mPropertyBag.modifier.targets === "xmlTree";
+	}
+
 	/**
 	 * Unhides a control
 	 *
@@ -25,7 +29,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} oControl - control that matches the change selector for applying the change
 	 * @param {object} mPropertyBag - map containing the control modifier object (either sap.ui.core.util.reflection.JsControlTreeModifier or
 	 *                                sap.ui.core.util.reflection.XmlTreeModifier), the view object where the controls are embedded and the application component
-	 * @returns {boolean} True if successful
+	 * @returns {Promise} Promise resolving when change is successfully applied
 	 * @public
 	 */
 	UnhideForm.applyChange = function(oChangeWrapper, oControl, mPropertyBag) {
@@ -35,34 +39,42 @@ sap.ui.define([
 
 		var oChangeDefinition = oChangeWrapper.getDefinition();
 
+		// in case of custom fields the application needs to be on JS.
+		// In the other case the visuality of the control will be overriden by the custom field binding afterwards
+		if (_isXmlModifier(mPropertyBag)) {
+			return Promise.reject(Error("Change cannot be applied in XML. Retrying in JS."));
+		}
+
 		// !important : sUnhideId was used in 1.40, do not remove for compatibility reasons!
 		var oControlToUnhide = oModifier.bySelector(oChangeDefinition.content.elementSelector || oChangeDefinition.content.sUnhideId, oAppComponent, oView);
-		var aContent = oModifier.getAggregation(oControl, "content");
-		var iStart = -1;
+		return Promise.resolve()
+			.then(function() {
+				return oModifier.getAggregation(oControl, "content");
+			})
+			.then(function(aContent) {
+				var iStart = -1;
 
-		if (oChangeDefinition.changeType === "unhideSimpleFormField") {
-			oChangeWrapper.setRevertData(true);
-			aContent.some(function (oField, index) {
-				if (oField === oControlToUnhide) {
-					iStart = index;
-					oModifier.setVisible(oField, true);
-				}
-				if (iStart >= 0 && index > iStart) {
-					if ((oModifier.getControlType(oField) === "sap.m.Label")
-						|| (oModifier.getControlType(oField) === "sap.ui.comp.smartfield.SmartLabel")
-						|| (oModifier.getControlType(oField) === "sap.ui.core.Title")
-						|| (oModifier.getControlType(oField) === "sap.m.Title")
-						|| (oModifier.getControlType(oField) === "sap.m.Toolbar")
-						|| (oModifier.getControlType(oField) === "sap.m.OverflowToolbar")) {
-						return true;
-					} else {
-						oModifier.setVisible(oField, true);
-					}
+				if (oChangeDefinition.changeType === "unhideSimpleFormField") {
+					oChangeWrapper.setRevertData(true);
+					aContent.some(function (oField, index) {
+						if (oField === oControlToUnhide) {
+							iStart = index;
+							oModifier.setVisible(oField, true);
+						}
+						if (iStart >= 0 && index > iStart) {
+							if ((oModifier.getControlType(oField) === "sap.m.Label")
+								|| (oModifier.getControlType(oField) === "sap.ui.comp.smartfield.SmartLabel")
+								|| (oModifier.getControlType(oField) === "sap.ui.core.Title")
+								|| (oModifier.getControlType(oField) === "sap.m.Title")
+								|| (oModifier.getControlType(oField) === "sap.m.Toolbar")
+								|| (oModifier.getControlType(oField) === "sap.m.OverflowToolbar")) {
+								return true;
+							}
+							oModifier.setVisible(oField, true);
+						}
+					});
 				}
 			});
-		}
-
-		return true;
 	};
 
 	/**
@@ -100,7 +112,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.modifier Modifier for the controls
 	 * @param {object} mPropertyBag.appComponent Component in which the change should be applied
 	 * @param {object} mPropertyBag.view Application view
-	 * @returns {boolean} True if successful
+	 * @returns {Promise} Promise resolving when change is successfully reverted
 	 * @public
 	 */
 	UnhideForm.revertChange = function(oChangeWrapper, oControl, mPropertyBag) {
@@ -112,32 +124,35 @@ sap.ui.define([
 
 		// !important : sUnhideId was used in 1.40, do not remove for compatibility reasons!
 		var oControlToRevertUnhide = oModifier.bySelector(oChangeDefinition.content.elementSelector || oChangeDefinition.content.sUnhideId, oAppComponent, oView);
-		var aContent = oModifier.getAggregation(oControl, "content");
-		var iStart = -1;
+		return Promise.resolve()
+			.then(function() {
+				return oModifier.getAggregation(oControl, "content");
+			})
+			.then(function(aContent) {
+				var iStart = -1;
 
-		if (oChangeDefinition.changeType === "unhideSimpleFormField") {
-			aContent.some(function (oField, index) {
-				if (oField === oControlToRevertUnhide) {
-					iStart = index;
-					oModifier.setVisible(oField, false);
-				}
-				if (iStart >= 0 && index > iStart) {
-					if ((oModifier.getControlType(oField) === "sap.m.Label")
-						|| (oModifier.getControlType(oField) === "sap.ui.comp.smartfield.SmartLabel")
-						|| (oModifier.getControlType(oField) === "sap.ui.core.Title")
-						|| (oModifier.getControlType(oField) === "sap.m.Title")
-						|| (oModifier.getControlType(oField) === "sap.m.Toolbar")
-						|| (oModifier.getControlType(oField) === "sap.m.OverflowToolbar")) {
-						return true;
-					} else {
-						oModifier.setVisible(oField, false);
-					}
+				if (oChangeDefinition.changeType === "unhideSimpleFormField") {
+					aContent.some(function (oField, index) {
+						if (oField === oControlToRevertUnhide) {
+							iStart = index;
+							oModifier.setVisible(oField, false);
+						}
+						if (iStart >= 0 && index > iStart) {
+							if ((oModifier.getControlType(oField) === "sap.m.Label")
+								|| (oModifier.getControlType(oField) === "sap.ui.comp.smartfield.SmartLabel")
+								|| (oModifier.getControlType(oField) === "sap.ui.core.Title")
+								|| (oModifier.getControlType(oField) === "sap.m.Title")
+								|| (oModifier.getControlType(oField) === "sap.m.Toolbar")
+								|| (oModifier.getControlType(oField) === "sap.m.OverflowToolbar")) {
+								return undefined;
+							}
+							oModifier.setVisible(oField, false);
+						}
+					});
+					oChangeWrapper.resetRevertData();
 				}
+				return Promise.resolve();
 			});
-			oChangeWrapper.resetRevertData();
-		}
-
-		return true;
 	};
 
 	UnhideForm.getChangeVisualizationInfo = function(oChange) {

package/src/sap/ui/layout/cssgrid/CSSGrid.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout MDN web docs: CSS Grid Layout}
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.layout.cssgrid.IGridConfigurable

package/src/sap/ui/layout/cssgrid/GridBasicLayout.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Applies a sap.ui.layout.cssgrid.GridSettings to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

package/src/sap/ui/layout/cssgrid/GridBoxLayout.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * Applies a sap.ui.layout.cssgrid.GridSettings to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

package/src/sap/ui/layout/cssgrid/GridBoxLayoutStyleHelper.js

@@ -11,7 +11,7 @@ sap.ui.define([], function() {
 	 * Handles dynamic style changes of items when sap.ui.layout.cssgrid.GridBoxLayout is used.
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @private
 	 * @constructor

package/src/sap/ui/layout/cssgrid/GridItemLayoutData.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * Holds layout data for a grid item.
 	 *
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/cssgrid/GridLayoutBase.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * Applies a sap.ui.layout.cssgrid.GridSettings to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/ui/layout/cssgrid/GridLayoutDelegate.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 *
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 * @alias sap.ui.layout.cssgrid.GridLayoutDelegate
 	 * @public
 	 */

package/src/sap/ui/layout/cssgrid/GridResponsiveLayout.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Have to possibility to hold multiple sap.ui.layout.cssgrid.GridSettings and apply the currently active GridSettings.
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

package/src/sap/ui/layout/cssgrid/GridSettings.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * Holds a set of CSS display:grid properties
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/ui/layout/cssgrid/ResponsiveColumnItemLayoutData.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * Holds layout data for an item inside a responsive column layout.
 	 *
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @since 1.72
 	 * @constructor

package/src/sap/ui/layout/cssgrid/ResponsiveColumnLayout.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * Grid row's height is dynamically determined by the height of the highest grid element on this row.
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

package/src/sap/ui/layout/designtime/form/SimpleForm.designtime.js

@@ -195,6 +195,7 @@ sap.ui.define([
 									bContent = true;
 							} else if ((aToolbarContent.length === 1) &&
 												(!aToolbarContent[0].getMetadata().isInstanceOf("sap.ui.core.Label") &&
+												// eslint-disable-next-line no-unsafe-negation
 												!aToolbarContent[0] instanceof sap.ui.core.Title && !aToolbarContent[0] instanceof sap.m.Title)) {
 									bContent = true;
 							}
@@ -225,11 +226,15 @@ sap.ui.define([
 			},
 			remove: {
 				changeType: "hideSimpleFormField",
-				changeOnRelevantContainer: true
+				changeOnRelevantContainer: true,
+				 // SimpleForm field visibility changes could be invalidated by custom field visibility settings
+				jsOnly: true
 			},
 			reveal: {
 				changeType: "unhideSimpleFormField",
-				changeOnRelevantContainer: true
+				changeOnRelevantContainer: true,
+				 // SimpleForm field visibility changes could be invalidated by custom field visibility settings
+				jsOnly: true
 			}
 		},
 		getStableElements: getStableElements

package/src/sap/ui/layout/form/ColumnContainerData.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/form/ColumnElementData.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/form/ColumnLayout.js

@@ -11,10 +11,9 @@ sap.ui.define([
 	'sap/ui/layout/library',
 	'./FormLayout',
 	'./ColumnLayoutRenderer',
-	"sap/ui/thirdparty/jquery",
-	'sap/base/Log'
+	"sap/ui/thirdparty/jquery"
 ],
-	function(Device, ResizeHandler, library, FormLayout, ColumnLayoutRenderer, jQuery, Log) {
+	function(Device, ResizeHandler, library, FormLayout, ColumnLayoutRenderer, jQuery) {
 	"use strict";
 
 	/* global ResizeObserver */
@@ -61,7 +60,7 @@ sap.ui.define([
 	 * This control cannot be used stand-alone, it just renders a <code>Form</code> control,
 	 * so it must be assigned to a <code>Form</code> control using the <code>layout</code> aggregation.
 	 * @extends sap.ui.layout.form.FormLayout
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -110,6 +109,8 @@ sap.ui.define([
 
 	ColumnLayout.prototype.init = function(){
 
+		FormLayout.prototype.init.apply(this, arguments);
+
 		this._iBreakPointTablet = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[0];
 		this._iBreakPointDesktop = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[1];
 		this._iBreakPointLargeDesktop = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[2];
@@ -131,6 +132,8 @@ sap.ui.define([
 
 	ColumnLayout.prototype.onBeforeRendering = function( oEvent ){
 
+		FormLayout.prototype.onBeforeRendering.apply(this, arguments);
+
 		if (this.getColumnsM() > this.getColumnsL() || this.getColumnsL() > this.getColumnsXL() ) {
 			throw new Error("Column size not correct defined for " + this);
 		}
@@ -249,7 +252,7 @@ sap.ui.define([
 			oOptions.XL.Size = oLD.getColumnsXL();
 
 			if (oOptions.M.Size > iColumnsM || oOptions.L.Size > iColumnsL || oOptions.XL.Size > iColumnsXL) {
-				Log.error("More cells defined for FormContainer " + oContainer.getId() + " than columns on " + this);
+				throw new Error("More cells defined for FormContainer " + oContainer.getId() + " than columns on " + this);
 			}
 		}
 

package/src/sap/ui/layout/form/ColumnLayoutRenderer.js

@@ -7,9 +7,8 @@
 sap.ui.define([
 	'sap/ui/core/Renderer',
 	'sap/ui/Device',
-	'./FormLayoutRenderer',
-	'sap/base/Log'
-	], function(Renderer, Device, FormLayoutRenderer, Log) {
+	'./FormLayoutRenderer'
+	], function(Renderer, Device, FormLayoutRenderer) {
 	"use strict";
 
 	/**
@@ -113,7 +112,7 @@ sap.ui.define([
 
 		oRm.openEnd();
 
-		this.renderHeader(oRm, oToolbar, oTitle, oContainer._oExpandButton, bExpandable, false, oContainer.getId());
+		this.renderHeader(oRm, oToolbar, oTitle, oContainer._oExpandButton, bExpandable, oLayout._sFormSubTitleSize, oContainer.getId());
 
 		oRm.openStart("div", oContainer.getId() + "-content")
 			.class("sapUiFormCLContainerCont")
@@ -167,7 +166,7 @@ sap.ui.define([
 			for (var k = 0, kl = aFields.length; k < kl; k++) {
 				var oField = aFields[k];
 				if (!oField.isA("sap.ui.core.IFormContent")) {
-					Log.error(oField + " is not a valid Form content! Only use valid content in " + oLayout);
+					throw new Error(oField + " is not a valid Form content! Only use valid content in " + oLayout);
 				}
 				oOptions = oLayout._getFieldSize(oField);
 				oRm.openStart("div");

package/src/sap/ui/layout/form/Form.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -254,7 +254,7 @@ sap.ui.define([
 		var oLayout = this.getLayout();
 		if (oLayout && oLayout.getContainerRenderedDomRef) {
 			return oLayout.getContainerRenderedDomRef(oContainer);
-		}else {
+		} else  {
 			return null;
 		}
 
@@ -273,7 +273,7 @@ sap.ui.define([
 		var oLayout = this.getLayout();
 		if (oLayout && oLayout.getElementRenderedDomRef) {
 			return oLayout.getElementRenderedDomRef(oElement);
-		}else {
+		} else  {
 			return null;
 		}
 

package/src/sap/ui/layout/form/FormContainer.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -251,7 +251,7 @@ sap.ui.define([
 
 		if (oForm && oForm.getContainerRenderedDomRef) {
 			return oForm.getContainerRenderedDomRef(that);
-		}else {
+		} else  {
 			return null;
 		}
 
@@ -271,7 +271,7 @@ sap.ui.define([
 
 		if (oForm && oForm.getElementRenderedDomRef) {
 			return oForm.getElementRenderedDomRef(oElement);
-		}else {
+		} else  {
 			return null;
 		}
 

package/src/sap/ui/layout/form/FormElement.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -271,8 +271,6 @@ sap.ui.define([
 
 		}
 
-		return mAriaProps;
-
 	};
 
 	/*
@@ -302,7 +300,7 @@ sap.ui.define([
 
 		if (oContainer && oContainer.getElementRenderedDomRef) {
 			return oContainer.getElementRenderedDomRef(that);
-		}else {
+		} else  {
 			return null;
 		}
 

package/src/sap/ui/layout/form/FormLayout.js

@@ -9,12 +9,13 @@ sap.ui.define([
 	'sap/ui/core/Control',
 	'sap/ui/layout/library',
 	'./FormLayoutRenderer',
-	"sap/ui/thirdparty/jquery",
+	'sap/ui/core/theming/Parameters',
+	'sap/ui/thirdparty/jquery',
 	// jQuery custom selectors ":sapFocusable"
 	'sap/ui/dom/jquery/Selectors',
 	// jQuery Plugin "control"
 	'sap/ui/dom/jquery/control'
-], function(Control, library, FormLayoutRenderer, jQuery) {
+], function(Control, library, FormLayoutRenderer, Parameters, jQuery) {
 	"use strict";
 
 	// shortcut for sap.ui.layout.BackgroundDesign
@@ -35,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -60,6 +61,20 @@ sap.ui.define([
 
 	/* eslint-disable no-lonely-if */
 
+	FormLayout.prototype.init = function(){
+
+		this._sFormTitleSize = "H4"; // to have default as Theme parameter could be loaded async.
+		this._sFormSubTitleSize = "H5";
+
+	};
+
+	FormLayout.prototype.onBeforeRendering = function( oEvent ){
+
+		// get title sizes from theme
+		this.loadTitleSizes();
+
+	};
+
 	FormLayout.prototype.contentOnAfterRendering = function(oFormElement, oControl){
 
 		if (library.form.FormHelper.bArrowKeySupport) {
@@ -887,7 +902,7 @@ sap.ui.define([
 
 		if (this.getDomRef()) {
 			return (oContainer.getId() ? window.document.getElementById(oContainer.getId()) : null);
-		}else {
+		} else  {
 			return null;
 		}
 
@@ -904,7 +919,7 @@ sap.ui.define([
 
 		if (this.getDomRef()) {
 			return (oElement.getId() ? window.document.getElementById(oElement.getId()) : null);
-		}else {
+		} else  {
 			return null;
 		}
 
@@ -941,6 +956,47 @@ sap.ui.define([
 	FormLayout.prototype.getLayoutDataForSemanticField = function(iFields, iIndex, oLayoutData) {
 	};
 
+	/**
+	 * Determines the sizes for <code>Form</code> and <code>FormContainer</code> from the theme
+	 *
+	 * @private
+	 * @since: 1.92.0
+	 */
+	FormLayout.prototype.loadTitleSizes = function() {
+
+		// read theme parameters to get current header sizes
+		var oSizes = Parameters.get({
+			name: ['sap.ui.layout.FormLayout:_sap_ui_layout_FormLayout_FormTitleSize', 'sap.ui.layout.FormLayout:_sap_ui_layout_FormLayout_FormSubTitleSize'],
+			callback: this.applyTitleSizes.bind(this)
+		});
+		if (oSizes && oSizes.hasOwnProperty('sap.ui.layout.FormLayout:_sap_ui_layout_FormLayout_FormTitleSize')) { // sync case
+			this.applyTitleSizes(oSizes, true);
+		}
+
+	};
+
+	/**
+	 * Applies the sizes for <code>Form</code> and <code>FormContainer</code> from the theme
+	 *
+	 * @param {object} oSizes Sizes from theme parameters
+	 * @param {boolean} bSync If set, the paramters are determines synchronously. (No re-rendering needed.)
+	 * @private
+	 * @since: 1.92.0
+	 */
+	FormLayout.prototype.applyTitleSizes = function(oSizes, bSync) {
+
+		if (oSizes && (this._sFormTitleSize !== oSizes["sap.ui.layout.FormLayout:_sap_ui_layout_FormLayout_FormTitleSize"] ||
+				this._sFormSubTitleSize !== oSizes["sap.ui.layout.FormLayout:_sap_ui_layout_FormLayout_FormSubTitleSize"])) {
+			this._sFormTitleSize = oSizes["sap.ui.layout.FormLayout:_sap_ui_layout_FormLayout_FormTitleSize"];
+			this._sFormSubTitleSize = oSizes["sap.ui.layout.FormLayout:_sap_ui_layout_FormLayout_FormSubTitleSize"];
+
+			if (!bSync) {
+				this.invalidate(); // re-render
+			}
+		}
+
+	};
+
 	return FormLayout;
 
 });