@openui5/sap.ui.layout 1.119.1 → 1.120.0

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

@@ -0,0 +1,176 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/core/Lib",
+	"sap/ui/core/library",
+	"sap/base/util/merge"
+], function(
+	Library,
+	CoreLibrary,
+	merge
+) {
+	"use strict";
+
+	const _MHelper = {
+		Label: undefined,
+		Button: undefined,
+		Text: undefined,
+		Library: undefined,
+		init: function() {
+			// normally this basic controls should be always loaded
+			this.Label = sap.ui.require("sap/m/Label");
+			this.Text = sap.ui.require("sap/m/Text");
+			this.Button = sap.ui.require("sap/m/Button");
+			this.Library = sap.ui.require("sap/m/library");
+
+			if (!this.Label || !this.Text || !this.Button || !this.Library) {
+				if (!this.oInitPromise) {
+					this.oInitPromise = new Promise(function(fResolve, fReject) {
+						sap.ui.require(["sap/m/Label", "sap/m/Text", "sap/m/Button", "sap/m/library"], function(Label, Text, Button, Library) {
+							this.Label = Label;
+							this.Text = Text;
+							this.Button = Button;
+							this.Library = Library;
+							fResolve(true);
+						}.bind(this));
+					}.bind(this));
+				}
+				return this.oInitPromise;
+			} else if (this.oInitPromise) {
+				delete this.oInitPromise; // not longer needed
+			}
+			return null;
+		},
+		createLabel: function(sText, sId){
+			return new this.Label(sId, {text: sText});
+		},
+		createButton: function(sId, fnPressFunction, oListener){
+			const oButton = new this.Button(sId, {type: this.Library.ButtonType.Transparent});
+			oButton.attachEvent("press", fnPressFunction, oListener); // attach event this way to have the right this-reference in handler
+			return oButton;
+		},
+		setButtonContent: function(oButton, sText, sTooltip, sIcon, sIconHovered){
+			oButton.setText(sText);
+			oButton.setTooltip(sTooltip);
+			oButton.setIcon(sIcon);
+			oButton.setActiveIcon(sIconHovered);
+		},
+		addFormClass: function(){ return "sapUiFormM"; },
+		setToolbar: function(oToolbar, oOldToolbar){
+			if (oOldToolbar && oOldToolbar.setDesign) {
+				// check for setDesign because we don't know what kind of custom toolbars might be used.
+				oOldToolbar.setDesign(oOldToolbar.getDesign(), true);
+			}
+			if (oToolbar && oToolbar.setDesign) {
+				const oProperty = oToolbar.getMetadata().getManagedProperty("design");
+				if (oProperty && oProperty.type === "sap.m.ToolbarDesign") { // as custom toolbar could have different types
+					oToolbar.setDesign(this.Library.ToolbarDesign.Transparent, true);
+				}
+			}
+			return oToolbar;
+		},
+		getToolbarTitle: function(oToolbar) {
+			// determine Title to point aria-label on this. As Fallback use the whole Toolbar
+			if (oToolbar) {
+				const aContent = oToolbar.getContent ? oToolbar.getContent() : []; // check for getContent because we don't know what kind of custom toolbars might be used.
+				for (let i = 0; i < aContent.length; i++) {
+					const oContent = aContent[i];
+					if (oContent.isA("sap.m.Title")) {
+						return oContent.getId();
+					}
+				}
+				return oToolbar.getId(); // fallback
+			}
+		},
+		createDelimiter: function(sDelimiter, sId){
+			return new this.Text(sId, {text: sDelimiter, textAlign: CoreLibrary.TextAlign.Center});
+		},
+		createSemanticDisplayControl: function(sText, sId){
+			return new this.Text(sId, {text: sText});
+		},
+		updateDelimiter: function(oText, sDelimiter){
+			oText.setText(sDelimiter);
+		},
+		updateSemanticDisplayControl: function(oText, sText){
+			oText.setText(sText);
+		},
+		isArrowKeySupported: function() {
+			return false; /* disables the keyboard support for arrow keys */
+		}
+	};
+
+	/**
+	 * @deprecated as of version 1.38 sap.ui.commons is deprecated, so test should only be executed if still available
+	 */
+	const _CommonsHelper = {
+		init: function() {
+			return null;
+		},
+		createLabel: function(sText, sId){
+			return new sap.ui.commons.Label(sId, {text: sText});
+		},
+		createButton: function(sId, fPressFunction, oListener){
+			const oButton = new sap.ui.commons.Button(sId, {lite: true});
+			oButton.attachEvent('press', fPressFunction, oListener); // attach event this way to have the right this-reference in handler
+			return oButton;
+		},
+		setButtonContent: function(oButton, sText, sTooltip, sIcon, sIconHovered){
+			oButton.setText(sText);
+			oButton.setTooltip(sTooltip);
+			oButton.setIcon(sIcon);
+			oButton.setIconHovered(sIconHovered);
+		},
+		getToolbarTitle: function(oToolbar) {
+			// as no Title control as ToolbarItem exust just use Toolbar ID. (Let application point to the wanted control.)
+			return oToolbar && oToolbar.getId();
+		}
+	};
+
+	/**
+	 * Provides helper functions to create library dependen controls, like label, button, toolbar,
+	 * used in {@link sap.ui.layout.form.Form Form}, {@link sap.ui.layout.form.FormContainer FormContainer}, {@link sap.ui.layout.form.FormElement FormElement},
+	 * and {@link sap.ui.layout.form.SemanticFormElement SemanticFormElement}.
+	 *
+	 * @enum {string}
+	 * @private
+	 * @since 1.119
+	 * @alias sap.ui.layout.form.FormHelper
+	 */
+	const FormHelper = {
+		init: function() { /* must return a Promise if modules still needs to be loaded. The promise must be fulfilled if everything is loaded. */
+			// initially check the library. If found, overwrite functions
+			if (Library.isLoaded("sap.m")) {
+				merge(FormHelper, _MHelper);
+				return this.init();
+			}
+
+			/**
+			 * @deprecated as of version 1.38 sap.ui.commons is deprecated, so test should only be executed if still available
+			 */
+			if (Library.isLoaded("sap.ui.commons") && !Library.isLoaded("sap.m")) {
+				merge(FormHelper, _CommonsHelper);
+				return this.init();
+			}
+
+			return null;
+		},
+		createLabel: function(sText){ throw new Error("no Label control available!"); }, /* must return a Label control */
+		createButton: function(sId, fPressFunction, oListener){ throw new Error("no Button control available!"); }, /* must return a button control */
+		setButtonContent: function(oButton, sText, sTooltip, sIcon, sIconHovered){ throw new Error("no Button control available!"); },
+		addFormClass: function(){ return null; },
+		setToolbar: function(oToolbar, oOldToolbar){ return oToolbar; }, /* allow to overwrite toolbar settings */
+		getToolbarTitle: function(oToolbar) { return oToolbar && oToolbar.getId(); }, /* To determine title ID in toolbar for aria-label */
+		createDelimiter: function(sDelimiter, sId){ throw new Error("no delimiter control available!"); }, /* must return a kind of text control */
+		createSemanticDisplayControl: function(sText, sId){ throw new Error("no display control available!"); }, /* must return a kind of text control */
+		updateDelimiter: function(oDelimiter, sDelimiter){ throw new Error("no delimiter control available!"); },
+		updateSemanticDisplayControl: function(oControl, sText){ throw new Error("no display control available!"); },
+		isArrowKeySupported: function() { return true; } /* enables the keyboard support for arrow keys */
+	};
+
+	return FormHelper;
+
+}, /* bExport= */ false);

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

@@ -10,12 +10,13 @@ sap.ui.define([
 	'sap/ui/core/Element',
 	'sap/ui/layout/library',
 	'./FormLayoutRenderer',
+	'./FormHelper',
 	'sap/ui/core/theming/Parameters',
 	'sap/ui/thirdparty/jquery',
 	"sap/ui/core/Configuration",
 	// jQuery custom selectors ":sapFocusable"
 	'sap/ui/dom/jquery/Selectors'
-], function(Control, Element, library, FormLayoutRenderer, Parameters, jQuery, Configuration) {
+], function(Control, Element, library, FormLayoutRenderer, FormHelper, Parameters, jQuery, Configuration) {
 	"use strict";
 
 	// shortcut for sap.ui.layout.BackgroundDesign
@@ -36,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -66,6 +67,8 @@ sap.ui.define([
 
 	FormLayout.prototype.init = function(){
 
+		this._oInitPromise = FormHelper.init();
+
 		this._sFormTitleSize = "H4"; // to have default as Theme parameter could be loaded async.
 		this._sFormSubTitleSize = "H5";
 
@@ -80,7 +83,7 @@ sap.ui.define([
 
 	FormLayout.prototype.contentOnAfterRendering = function(oFormElement, oControl){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			jQuery(oControl.getFocusDomRef()).data("sap.InNavArea", true);
 		}
 
@@ -149,7 +152,7 @@ sap.ui.define([
 
 	FormLayout.prototype.onsapright = function(oEvent){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			var bRtl = Configuration.getRTL();
 
 			if (!bRtl) {
@@ -163,7 +166,7 @@ sap.ui.define([
 
 	FormLayout.prototype.onsapleft = function(oEvent){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			var bRtl = Configuration.getRTL();
 
 			if (!bRtl) {
@@ -177,7 +180,7 @@ sap.ui.define([
 
 	FormLayout.prototype.onsapdown = function(oEvent){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			var oControl = oEvent.srcControl;
 			var oNewDomRef;
 			var oRoot = this.findElement(oControl);
@@ -200,7 +203,7 @@ sap.ui.define([
 
 	FormLayout.prototype.onsapup = function(oEvent){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			var oControl = oEvent.srcControl;
 			var iCurrentIndex = 0;
 			var oNewDomRef;
@@ -226,7 +229,7 @@ sap.ui.define([
 
 	FormLayout.prototype.onsaphome = function(oEvent){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			var oControl = oEvent.srcControl;
 			var iCurrentIndex = 0;
 			var oNewDomRef;
@@ -249,7 +252,7 @@ sap.ui.define([
 
 	FormLayout.prototype.onsaptop = function(oEvent){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			var oControl = oEvent.srcControl;
 			var oRoot = this.findElement(oControl);
 			var oElement = oRoot.element;
@@ -276,7 +279,7 @@ sap.ui.define([
 
 	FormLayout.prototype.onsapend = function(oEvent){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			var oControl = oEvent.srcControl;
 			var iCurrentIndex = 0;
 			var oNewDomRef;
@@ -298,7 +301,7 @@ sap.ui.define([
 
 	FormLayout.prototype.onsapbottom = function(oEvent){
 
-		if (library.form.FormHelper.bArrowKeySupport) {
+		if (FormHelper.isArrowKeySupported()) { // no async call needed here
 			var oControl = oEvent.srcControl;
 			var oRoot = this.findElement(oControl);
 			var oElement = oRoot.element;

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

@@ -8,8 +8,9 @@ sap.ui.define([
 	'sap/ui/core/library',
 	'sap/ui/layout/library',
 	'sap/ui/layout/form/Form',
+	'./FormHelper',
 	'sap/ui/core/IconPool' // as RenderManager.icon needs it
-	], function(coreLibrary, library, Form) {
+	], function(coreLibrary, library, Form, FormHelper, IconPool) {
 	"use strict";
 
 	// shortcut for sap.ui.core.TitleLevel
@@ -288,7 +289,7 @@ sap.ui.define([
 		if (oToolbar) {
 			if (!oContainer.getAriaLabelledBy() || oContainer.getAriaLabelledBy().length == 0) {
 				// no aria-label -> use Title of Toolbar
-				var sToolbarTitleID = library.form.FormHelper.getToolbarTitle(oToolbar);
+				var sToolbarTitleID = FormHelper.getToolbarTitle(oToolbar); // FormHelper must already be initialized by FormLayout
 				mAriaProps["labelledby"] = {value: sToolbarTitleID, append: true};
 			}
 		} else if (oTitle) {

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

@@ -5,9 +5,9 @@
  */
 
 sap.ui.define([
-	'sap/ui/layout/library',
-	"sap/base/Log"
-	], function(library, Log) {
+	'./FormHelper',
+	'sap/base/Log'
+	], function(FormHelper, Log) {
 	"use strict";
 
 
@@ -35,7 +35,7 @@ sap.ui.define([
 			.class("sapUiFormLblColon") // to always have the ":" at the Labels
 			.attr("data-sap-ui-customfastnavgroup", "true");
 
-		var sClass = library.form.FormHelper.addFormClass();
+		var sClass = FormHelper.addFormClass(); // FormHelper must already be initialized by Form
 		if (sClass) {
 			rm.class(sClass);
 		}
@@ -59,7 +59,7 @@ sap.ui.define([
 		if (oToolbar) {
 			if (!oForm.getAriaLabelledBy() || oForm.getAriaLabelledBy().length == 0) {
 				// no aria-label -> use Title of Toolbar
-				var sToolbarTitleID = library.form.FormHelper.getToolbarTitle(oToolbar);
+				var sToolbarTitleID = FormHelper.getToolbarTitle(oToolbar); // FormHelper must already be initialized by Form
 				mAriaProps["labelledby"] = sToolbarTitleID;
 			}
 		} else if (oTitle) {

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

@@ -22,12 +22,15 @@ sap.ui.define([
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
 	 * @since 1.16.0
 	 * @alias sap.ui.layout.form.GridContainerData
+	 * @deprecated Since version 1.67.0.
+	 * as <code>sap.ui.commons</code> library is deprecated and the <code>GridLayout</code> must not be used in responsive applications.
+	 * Please use <code>ResponsiveGridLayout</code> or <code>ColumnLayout</code> instead.
 	 */
 	var GridContainerData = LayoutData.extend("sap.ui.layout.form.GridContainerData", /** @lends sap.ui.layout.form.GridContainerData.prototype */ { metadata : {
 

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

@@ -22,12 +22,15 @@ sap.ui.define([
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
 	 * @since 1.16.0
 	 * @alias sap.ui.layout.form.GridElementData
+	 * @deprecated Since version 1.67.0.
+	 * as <code>sap.ui.commons</code> library is deprecated and the <code>GridLayout</code> must not be used in responsive applications.
+	 * Please use <code>ResponsiveGridLayout</code> or <code>ColumnLayout</code> instead.
 	 */
 	var GridElementData = LayoutData.extend("sap.ui.layout.form.GridElementData", /** @lends sap.ui.layout.form.GridElementData.prototype */ { metadata : {
 

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

@@ -28,7 +28,7 @@ sap.ui.define(['sap/ui/layout/library', './FormLayout', './GridLayoutRenderer'],
 	 * @extends sap.ui.layout.form.FormLayout
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -39,21 +39,21 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 *
 	 * @class
-	 * The <code>ResponsiveGridLayout</code> control renders a <code>Form</code> using a responsive grid. Internally the <code>Grid</code> control is used for rendering.
-	 * Using this layout, the <code>Form</code> is rendered in a responsive way.
-	 * Depending on the available space, the <code>FormContainers</code> are rendered in one or different columns and the labels are rendered in the same row as the fields or above the fields.
+	 * The <code>ResponsiveGridLayout</code> control renders a {@link sap.ui.layout.form.Form Form} using a responsive grid. Internally the {@link sap.ui.layout.Grid Grid} control is used for rendering.
+	 * Using this layout, the {@link sap.ui.layout.form.Form Form} is rendered in a responsive way.
+	 * Depending on the available space, the {@link sap.ui.layout.form.FormContainer FormContainers} are rendered in one or different columns and the labels are rendered in the same row as the fields or above the fields.
 	 * This behavior can be influenced by the properties of this layout control.
 	 *
-	 * On the <code>FormContainers</code>, labels and content fields, <code>GridData</code> can be used to change the default rendering.
-	 * <code>GridData</code> is not supported for <code>FormElements</code>.
+	 * On the {@link sap.ui.layout.form.FormContainer FormContainers}, labels and content fields, {@link sap.ui.layout.GridGata GridData} can be used to change the default rendering.
+	 * {@link sap.ui.layout.GridGata GridData} is not supported for {@link sap.ui.layout.form.FormElement FormElements}.
 	 *
-	 * <b>Note:</b> If <code>GridData</code> is used, this may result in a much more complex layout than the default one.
+	 * <b>Note:</b> If {@link sap.ui.layout.GridGata GridData} is used, this may result in a much more complex layout than the default one.
 	 * This means that in some cases, the calculation for the other content may not bring the expected result.
-	 * In such cases, <code>GridData</code> should be used for all content controls to disable the default behavior.
+	 * In such cases, {@link sap.ui.layout.GridGata GridData} should be used for all content controls to disable the default behavior.
 	 *
-	 * This control cannot be used stand-alone, it just renders a <code>Form</code>, so it must be assigned to a <code>Form</code> using the <code>layout</code> aggregation.
+	 * This control cannot be used stand-alone, it just renders a {@link sap.ui.layout.form.Form Form}, so it must be assigned to a {@link sap.ui.layout.form.Form Form} using the <code>layout</code> aggregation.
 	 * @extends sap.ui.layout.form.FormLayout
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -77,7 +77,7 @@ sap.ui.define([
 				/**
 				 * Default span for labels in large size.
 				 *
-				 * <b>Note:</b> If <code>adjustLabelSpan</code> is set, this property is only used if more than 1 <code>FormContainer</code> is in one line. If only 1 <code>FormContainer</code> is in the line, then the <code>labelSpanM</code> value is used.
+				 * <b>Note:</b> If <code>adjustLabelSpan</code> is set, this property is only used if more than 1 {@link sap.ui.layout.form.FormContainer FormContainer} is in one line. If only 1 {@link sap.ui.layout.form.FormContainer FormContainer} is in the line, then the <code>labelSpanM</code> value is used.
 				 * @since 1.16.3
 				 */
 				labelSpanL : {type : "int", group : "Misc", defaultValue : 4},
@@ -85,7 +85,7 @@ sap.ui.define([
 				/**
 				 * Default span for labels in medium size.
 				 *
-				 * <b>Note:</b> If <code>adjustLabelSpan</code> is set this property is used for full-size <code>FormContainers</code>. If more than one <code>FormContainer</code> is in one line, <code>labelSpanL</code> is used.
+				 * <b>Note:</b> If <code>adjustLabelSpan</code> is set this property is used for full-size {@link sap.ui.layout.form.FormContainer FormContainers}. If more than one {@link sap.ui.layout.form.FormContainer FormContainer} is in one line, <code>labelSpanL</code> is used.
 				 * @since 1.16.3
 				 */
 				labelSpanM : {type : "int", group : "Misc", defaultValue : 2},
@@ -97,14 +97,14 @@ sap.ui.define([
 				labelSpanS : {type : "int", group : "Misc", defaultValue : 12},
 
 				/**
-				 * If set, the usage of <code>labelSpanL</code> and <code>labelSpanM</code> are dependent on the number of <code>FormContainers</code> in one row.
-				 * If only one <code>FormContainer</code> is displayed in one row, <code>labelSpanM</code> is used to define the size of the label.
+				 * If set, the usage of <code>labelSpanL</code> and <code>labelSpanM</code> are dependent on the number of {@link sap.ui.layout.form.FormContainer FormContainers} in one row.
+				 * If only one {@link sap.ui.layout.form.FormContainer FormContainer} is displayed in one row, <code>labelSpanM</code> is used to define the size of the label.
 				 * This is the same for medium and large <code>Forms</code>.
-				 * This is done to align the labels on forms where full-size <code>FormContainers</code> and multiple-column rows are used in the same <code>Form</code>
-				 * (because every <code>FormContainer</code> has its own <code>Grid</code> inside).
+				 * This is done to align the labels on forms where full-size {@link sap.ui.layout.form.FormContainer FormContainers} and multiple-column rows are used in the same {@link sap.ui.layout.form.Form Form}
+				 * (because every {@link sap.ui.layout.form.FormContainer FormContainer} has its own {@link sap.ui.layout.Grid Grid} inside).
 				 *
-				 * If not set, the usage of <code>labelSpanL</code> and <code>labelSpanM</code> are dependent on the <code>Form</code> size.
-				 * The number of <code>FormContainers</code> doesn't matter in this case.
+				 * If not set, the usage of <code>labelSpanL</code> and <code>labelSpanM</code> are dependent on the {@link sap.ui.layout.form.Form Form} size.
+				 * The number of {@link sap.ui.layout.form.FormContainer FormContainers} doesn't matter in this case.
 				 * @since 1.34.0
 				 */
 				adjustLabelSpan : {type : "boolean", group : "Misc", defaultValue : true},
@@ -159,11 +159,11 @@ sap.ui.define([
 				columnsM : {type : "int", group : "Misc", defaultValue : 1},
 
 				/**
-				 * If the <code>Form</code> contains only one single <code>FormContainer</code> and this property is set,
-				 * the <code>FormContainer</code> is displayed using the full size of the <code>Form</code>.
+				 * If the {@link sap.ui.layout.form.Form Form} contains only one single {@link sap.ui.layout.form.FormContainer FormContainer} and this property is set,
+				 * the {@link sap.ui.layout.form.FormContainer FormContainer} is displayed using the full size of the {@link sap.ui.layout.form.Form Form}.
 				 * In this case the properties <code>columnsXL</code>, <code>columnsL</code> and <code>columnsM</code> are ignored.
 				 *
-				 * In all other cases the <code>FormContainer</code> is displayed in the size of one column.
+				 * In all other cases the {@link sap.ui.layout.form.FormContainer FormContainer} is displayed in the size of one column.
 				 * @since 1.34.0
 				 */
 				singleContainerFullSize : {type : "boolean", group : "Misc", defaultValue : true},

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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.ui.layout.form.FormLayout
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -7,10 +7,10 @@
 // Provides control sap.ui.layout.form.FormElement.
 sap.ui.define([
 	'./FormElement',
-	'sap/ui/layout/library'
+	'./FormHelper'
 	], function(
 		FormElement,
-		library
+		FormHelper
 	) {
 	"use strict";
 
@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.layout.form.FormElement
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -398,9 +398,9 @@ sap.ui.define([
 		for (i = 0; i < aFields.length; i++) {
 			if (i < aFields.length - 1) {
 				if (aDelimiters.length > i) {
-					library.form.FormHelper.updateDelimiter(aDelimiters[i], sDelimiter);
+					FormHelper.updateDelimiter(aDelimiters[i], sDelimiter);
 				} else {
-					var oDelimiter = library.form.FormHelper.createDelimiter(sDelimiter, sId + i);
+					var oDelimiter = FormHelper.createDelimiter(sDelimiter, sId + i);
 					oDelimiter.addStyleClass("sapUiFormDelimiter");
 					this.addAggregation("_delimiters", oDelimiter);
 				}
@@ -443,7 +443,7 @@ sap.ui.define([
 			_updateDisplayText.call(this, false); // if already rendered update text
 		} else {
 			var sId = this.getId() + "-display";
-			oDisplay = library.form.FormHelper.createSemanticDisplayControl("", sId);
+			oDisplay = FormHelper.createSemanticDisplayControl("", sId);
 			oDisplay.addDelegate(oRenderingDelegate, true, this);
 			this.setAggregation("_displayField", oDisplay);
 		}
@@ -492,11 +492,11 @@ sap.ui.define([
 					var oDisplay = this.getAggregation("_displayField");
 					var sText = _concatenateTexts.call(this, aTexts);
 					oDisplay._bNoForceUpdate = true; // prevent double update, as setText might trigger re-rendering (again as a re-rendeing could happen until promise resolved)
-					library.form.FormHelper.updateSemanticDisplayControl(oDisplay, sText);
+					FormHelper.updateSemanticDisplayControl(oDisplay, sText);
 				}.bind(this));
 			} else {
 				var sText = _concatenateTexts.call(this, aTexts);
-				library.form.FormHelper.updateSemanticDisplayControl(oDisplay, sText);
+				FormHelper.updateSemanticDisplayControl(oDisplay, sText);
 			}
 		} else if (oDisplay && oDisplay._bNoForceUpdate) { // execute update on next rendering
 			oDisplay._bNoForceUpdate = false;

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

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * <b>Note:</b> If a more complex form is needed, use the <code>{@link sap.ui.layout.form.Form Form}</code> control instead.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/library.js

@@ -20,13 +20,13 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.layout
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.0
 	 * @since 1.15
 	 * @public
 	 */
 	var thisLib = sap.ui.getCore().initLibrary({
 		name : "sap.ui.layout",
-		version: "1.119.1",
+		version: "1.120.0",
 		dependencies: ["sap.ui.core"],
 		designtime: "sap/ui/layout/designtime/library.designtime",
 		types: [
@@ -509,6 +509,9 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @public
+	 * @deprecated Since version 1.67.0.
+	 * as <code>sap.ui.commons</code> library is deprecated and the <code>GridLayout</code> must not be used in responsive applications.
+	 * Please use <code>ResponsiveGridLayout</code> or <code>ColumnLayout</code> instead.
 	 */
 	thisLib.form.GridElementCells = DataType.createType('sap.ui.layout.form.GridElementCells', {
 		isValid : function(vValue) {
@@ -770,25 +773,9 @@ sap.ui.define([
 	DataType.getType('int')
 	);
 
-	// factory for Form to create labels and buttons to be overwritten by commons and mobile library
-	if (!thisLib.form.FormHelper) {
-		thisLib.form.FormHelper = {
-			init: function() {return null;}, /* must return a Promise if modules still needs to be loaded. The promise must be fulfilled if everything is loaded. */
-			createLabel: function(sText){ throw new Error("no Label control available!"); }, /* must return a Label control */
-			createButton: function(sId, fPressFunction, oListener){ throw new Error("no Button control available!"); }, /* must return a button control */
-			setButtonContent: function(oButton, sText, sTooltip, sIcon, sIconHovered){ throw new Error("no Button control available!"); },
-			addFormClass: function(){ return null; },
-			setToolbar: function(oToolbar){ return oToolbar; }, /* allow to overwrite toolbar settings */
-			getToolbarTitle: function(oToolbar) { return oToolbar && oToolbar.getId(); }, /* To determine title ID in toolbar for aria-label */
-			createDelimiter: function(sDelimiter, sId){ throw new Error("no delimiter control available!"); }, /* must return a kind of text control */
-			createSemanticDisplayControl: function(sText, sId){ throw new Error("no display control available!"); }, /* must return a kind of text control */
-			updateDelimiter: function(oDelimiter, sDelimiter){ throw new Error("no delimiter control available!"); },
-			updateSemanticDisplayControl: function(oControl, sText){ throw new Error("no display control available!"); },
-			bArrowKeySupport: true, /* enables the keyboard support for arrow keys */
-			bFinal: false /* if true, the helper must not be overwritten by an other library */
-		};
-	}
-
+	/**
+	 * @deprecated As of version 1.120
+	 */
 	if (!thisLib.GridHelper) {
 		thisLib.GridHelper = {
 			getLibrarySpecificClass: function () {

package/src/sap/ui/layout/messagebundle_mk.properties

@@ -0,0 +1,17 @@
+
+FORM_EXPAND=\u041F\u0440\u043E\u0448\u0438\u0440\u0438
+FORM_COLLAPSE=\u0421\u043A\u0440\u0438\u0458
+
+SPLITTER_MOVE=\u041A\u043E\u0440\u0438\u0441\u0442\u0435\u0442\u0435 \u0433\u0438 \u0441\u0442\u0440\u0435\u043B\u043A\u0438\u0442\u0435 \u0437\u0430 \u0434\u0432\u0438\u0436\u0435\u045A\u0435
+
+SIDE_CONTENT_LABEL=\u0421\u043F\u043E\u0440\u0435\u0434\u043D\u0430 \u0441\u043E\u0434\u0440\u0436\u0438\u043D\u0430
+
+RESPONSIVE_SPLITTER_RESIZE=\u041F\u0440\u043E\u043C\u0435\u043D\u0438 \u0458\u0430 \u0433\u043E\u043B\u0435\u043C\u0438\u043D\u0430\u0442\u0430 \u043F\u043E\u043C\u0435\u0453\u0443 \u043E\u043A\u043D\u043E {0} \u0438 \u043E\u043A\u043D\u043E {1}
+
+RESPONSIVE_SPLITTER_HOME=\u041E\u0434\u0438 \u043D\u0430 \u043F\u043E\u0434\u0435\u043B\u0435\u043D \u0435\u043A\u0440\u0430\u043D
+
+RESPONSIVE_SPLITTER_AND=\u0438
+
+RESPONSIVE_SPLITTER_GOTO=\u041E\u0434\u0438 \u043D\u0430 \u0435\u043A\u0440\u0430\u043D\u043E\u0442
+
+RESPONSIVE_SPLITTER_ARIA_PAGINATOR_LABEL=\u041C\u0435\u043D\u0443\u0432\u0430\u0447 \u043D\u0430 \u043E\u043A\u043D\u0430

package/src/sap/ui/layout/themes/base/ResponsiveGridLayout.less

@@ -24,7 +24,7 @@
 .sapUiFormResGrid.sapUiFormToolbar > div:first-child {
 	height: 3rem; /* to have in compact mode and in commons always 3rem on Form header */
 	line-height: 3rem;
-	padding: 0 0.75rem;
+	padding: 0 0.75rem 0 1rem;
 }
 
 /* Grid */

package/ui5.yaml

@@ -20,10 +20,10 @@ builder:
             filters:
               - sap/ui/layout/
               - sap/ui/layout/manifest.json
-              - '!sap/ui/layout/*-preload.js'
-              - '!sap/ui/layout/**/*.designtime.js'
-              - '!sap/ui/layout/**/designtime/'
-              - '!sap/ui/layout/**/*.support.js'
+              - "!sap/ui/layout/*-preload.js"
+              - "!sap/ui/layout/**/*.designtime.js"
+              - "!sap/ui/layout/**/designtime/"
+              - "!sap/ui/layout/**/*.support.js"
             resolve: false
       bundleOptions:
         optimize: true