@openui5/sap.ui.layout 1.120.27 → 1.120.29

package/src/sap/ui/layout/designtime/messagebundle_pl.properties

@@ -1,7 +1,7 @@
 
 MSG_REMOVING_TOOLBAR=Obszar nag\u0142\u00F3wka tej grupy zawiera dodatkowe elementy. Usuni\u0119cie tej grupy spowoduje ich utrat\u0119. Czy mimo to usun\u0105\u0107 t\u0119 grup\u0119?
 
-GROUP_CONTROL_NAME=Grupa
+GROUP_CONTROL_NAME=Grupowanie
 GROUP_CONTROL_NAME_PLURAL=Grupy
 FIELD_CONTROL_NAME=Pole
 FIELD_CONTROL_NAME_PLURAL=Pola

package/src/sap/ui/layout/designtime/messagebundle_pt.properties

@@ -8,11 +8,11 @@ FIELD_CONTROL_NAME_PLURAL=Campos
 
 HORIZONTAL_LAYOUT_CONTROL_NAME=Container horizontal
 
-HORIZONTAL_LAYOUT_CONTROL_NAME_PLURAL=Container horizontal
+HORIZONTAL_LAYOUT_CONTROL_NAME_PLURAL=Containers horizontais
 
 VERTICAL_LAYOUT_CONTROL_NAME=Container vertical
 
-VERTICAL_LAYOUT_NAME_PLURAL=Container vertical
+VERTICAL_LAYOUT_NAME_PLURAL=Containers verticais
 
 GRID_CONTROL_NAME=Grade
 

package/src/sap/ui/layout/designtime/messagebundle_pt_PT.properties

@@ -1,5 +1,5 @@
 
-MSG_REMOVING_TOOLBAR=A \u00E1rea do cabe\u00E7alho deste grupo cont\u00E9m elementos adicionais. Se remover o grupo, eles ser\u00E3o perdidos. Pretende remover o grupo mesmo assim?
+MSG_REMOVING_TOOLBAR=A \u00E1rea do cabe\u00E7alho deste grupo cont\u00E9m elementos adicionais. Se remover o grupo, esses elementos ser\u00E3o perdidos. Pretende remover o grupo mesmo assim?
 
 GROUP_CONTROL_NAME=Grupo
 GROUP_CONTROL_NAME_PLURAL=Grupos

package/src/sap/ui/layout/designtime/messagebundle_sv.properties

@@ -14,6 +14,6 @@ VERTICAL_LAYOUT_CONTROL_NAME=Vertikal container
 
 VERTICAL_LAYOUT_NAME_PLURAL=Vertikala containrar
 
-GRID_CONTROL_NAME=Raster
+GRID_CONTROL_NAME=Rutn\u00E4t
 
-GRID_CONTROL_NAME_PLURAL=Raster
+GRID_CONTROL_NAME_PLURAL=Rutn\u00E4t

package/src/sap/ui/layout/designtime/messagebundle_vi.properties

@@ -4,7 +4,7 @@ MSG_REMOVING_TOOLBAR=Vu\u0300ng ti\u00EAu \u0111\u00EA\u0300 cu\u0309a nho\u0301
 GROUP_CONTROL_NAME=Nho\u0301m
 GROUP_CONTROL_NAME_PLURAL=Nho\u0301m
 FIELD_CONTROL_NAME=Tr\u01B0\u01A1\u0300ng
-FIELD_CONTROL_NAME_PLURAL=Ca\u0301c tr\u01B0\u01A1\u0300ng
+FIELD_CONTROL_NAME_PLURAL=Tr\u01B0\u01A1\u0300ng
 
 HORIZONTAL_LAYOUT_CONTROL_NAME=Vu\u0300ng ch\u01B0\u0301a ngang
 

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.120.27
+	 * @version 1.120.29
 	 *
 	 * @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.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public

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

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * This control cannot be used stand-alone, it just renders a {@link sap.ui.layout.form.Form Form} control,
 	 * so it must be assigned to a {@link sap.ui.layout.form.Form Form} control using the <code>layout</code> aggregation.
 	 * @extends sap.ui.layout.form.FormLayout
-	 * @version 1.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public
@@ -687,6 +687,22 @@ sap.ui.define([
 
 	};
 
+	ColumnLayout.prototype.hasLabelledContainers = function(oForm) {
+
+		const aContainers = oForm.getFormContainers();
+
+		// Let Form render role="region" also if FormContainer has no title.
+		// If only one FormContainer exist and it has no title let Form render role "form".
+		return aContainers.length !== 1 || this.isContainerLabelled(aContainers[0]);
+
+	};
+
+	ColumnLayout.prototype.invalidateEditableChange = function() {
+
+		return true; // display-mode renders <dl>
+
+	};
+
 	return ColumnLayout;
 
 });

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

@@ -63,10 +63,12 @@ sap.ui.define([
 		var oToolbar = oContainer.getToolbar();
 		var oTitle = oContainer.getTitle();
 		var oOptions = oLayout._getContainerSize(oContainer);
+		const bEditable = oContainer.getProperty("_editable");
+		const sContentNode = bEditable ? "div" : "dl";
 
 		oContainer._checkProperties();
 
-		oRm.openStart("section", oContainer);
+		oRm.openStart("div", oContainer);
 		oRm.class("sapUiFormCLContainer");
 		oRm.class("sapUiFormCLContainerS" + oOptions.S.Size);
 		oRm.class("sapUiFormCLContainerM" + oOptions.M.Size);
@@ -109,15 +111,31 @@ sap.ui.define([
 			oRm.attr('title', oContainer.getTooltip_AsString());
 		}
 
-		this.writeAccessibilityStateContainer(oRm, oContainer);
+		if (bEditable || bExpandable || oToolbar) {
+			// in display mode render accessibility attributes on content-node. If expandable or toolbar in disply mode, role "region" is needed to annonce region if focus goes to button or inside toolbar
+			const oForm = oContainer.getParent();
+			let sRole = "form";
+
+			if (bEditable && !oLayout.isContainerLabelled(oContainer) && oForm.getFormContainers().length === 1) {
+				sRole = ""; // Container has no title and is only one container, no role needed as set on Form-level
+			} else if (!bEditable && (bExpandable || oToolbar)) {
+				sRole = "region"; // to announce region if Expander is focused or focus moves inside Toolbar
+			}
+
+			// In edit mode let every container render role, even without title (expect there is only one container). So screenreader also announces forms structure. (Was not possible for some older layouts.)
+			this.writeAccessibilityStateContainer(oRm, oContainer, sRole);
+		}
 
 		oRm.openEnd();
 
 		this.renderHeader(oRm, oToolbar, oTitle, oContainer._oExpandButton, bExpandable, oLayout._sFormSubTitleSize, oContainer.getId());
 
-		oRm.openStart("div", oContainer.getId() + "-content")
-			.class("sapUiFormCLContainerCont")
-			.openEnd();
+		oRm.openStart(sContentNode, oContainer.getId() + "-content")
+			.class("sapUiFormCLContainerCont");
+		if (!bEditable && !bExpandable && !oToolbar) {
+			this.writeAccessibilityStateContainer(oRm, oContainer, ""); // no role needed on <dl>
+		}
+		oRm.openEnd();
 
 		var aElements = oContainer.getVisibleFormElements();
 		for (var i = 0; i < aElements.length; i++) {
@@ -136,8 +154,8 @@ sap.ui.define([
 			}
 		}
 
-		oRm.close("div");
-		oRm.close("section");
+		oRm.close(sContentNode); // Container content
+		oRm.close("div"); // Container
 
 	};
 
@@ -145,6 +163,8 @@ sap.ui.define([
 
 		var oLabel = oElement.getLabelControl();
 		var oOptions;
+		const bEditable = oElement.getProperty("_editable");
+		const sFieldsNode = bEditable ? "div" : "dd";
 
 		oRm.openStart("div", oElement);
 		oRm.class("sapUiFormCLElement");
@@ -155,7 +175,7 @@ sap.ui.define([
 
 		if (oLabel) {
 			oOptions = oLayout._getFieldSize(oLabel);
-			_renderLabel(oRm, oLabel, oOptions);
+			_renderLabel(oRm, oElement, oLabel, oOptions);
 		}
 
 		var aFields = oElement.getFieldsForRendering();
@@ -166,7 +186,7 @@ sap.ui.define([
 					throw new Error(oField + " is not a valid Form content! Only use valid content in " + oLayout);
 				}
 				oOptions = oLayout._getFieldSize(oField);
-				oRm.openStart("div");
+				oRm.openStart(sFieldsNode);
 				oRm.class("sapUiFormCLCellsS" + oOptions.S.Size);
 				oRm.class("sapUiFormCLCellsL" + oOptions.L.Size);
 				if (oOptions.S.Break) {
@@ -185,7 +205,7 @@ sap.ui.define([
 
 				oRm.renderControl(oField);
 
-				oRm.close("div");
+				oRm.close(sFieldsNode);
 			}
 		}
 		oRm.close("div");
@@ -199,6 +219,8 @@ sap.ui.define([
 		var iColumns = 12;
 		var iSizeS = iColumns;
 		var iSizeL = iColumns;
+		const bEditable = oElement.getProperty("_editable");
+		const sFieldsNode = bEditable ? "div" : "dd";
 
 		oRm.openStart("div", oElement);
 		oRm.class("sapUiFormCLElement").class("sapUiFormCLSemanticElement");
@@ -209,7 +231,7 @@ sap.ui.define([
 
 		if (oLabel) {
 			oOptions = oLayout._getFieldSize(oLabel);
-			_renderLabel(oRm, oLabel, oOptions);
+			_renderLabel(oRm, oElement, oLabel, oOptions);
 			if (oOptions.S.Size < iSizeS) {
 				iSizeS = iSizeS - oOptions.S.Size;
 			}
@@ -218,7 +240,7 @@ sap.ui.define([
 			}
 		}
 
-		oRm.openStart("div");
+		oRm.openStart(sFieldsNode);
 		oRm.class("sapUiFormCLCellsS" + iSizeS);
 		oRm.class("sapUiFormCLCellsL" + iSizeL);
 		oRm.openEnd();
@@ -234,14 +256,17 @@ sap.ui.define([
 			}
 		}
 
-		oRm.close("div");
+		oRm.close(sFieldsNode);
 		oRm.close("div");
 
 	};
 
-	function _renderLabel(oRm, oLabel, oOptions) {
+	function _renderLabel(oRm, oElement, oLabel, oOptions) {
+
+		const bEditable = oElement.getProperty("_editable");
+		const sLabelNode = bEditable ? "div" : "dt";
 
-		oRm.openStart("div")
+		oRm.openStart(sLabelNode)
 			.class("sapUiFormElementLbl")
 			.class("sapUiFormCLCellsS" + oOptions.S.Size)
 			.class("sapUiFormCLCellsL" + oOptions.L.Size)
@@ -249,7 +274,7 @@ sap.ui.define([
 
 		oRm.renderControl(oLabel);
 
-		oRm.close("div");
+		oRm.close(sLabelNode);
 
 	}
 

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.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public
@@ -195,7 +195,9 @@ sap.ui.define([
 
 	Form.prototype.setEditable = function(bEditable) {
 
-		this.setProperty("editable", bEditable, true);
+		const oLayout = this.getLayout();
+		const bSuppressInvalidate = !oLayout?.invalidateEditableChange();
+		this.setProperty("editable", bEditable, bSuppressInvalidate);
 
 		return this;
 

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.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public

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.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public
@@ -1024,6 +1024,61 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Checks if the <code>Form</code> contains <code>FormContainers</code> that have a <code>Title</code>, <code>Toolbar</code> or <code>AriaLabelledBy</code>.
+	 *
+	 * This is used to determine the role for screenreader support
+	 *
+	 * @param {sap.ui.layout.form.Form} oForm Form
+	 * @return {boolean} <code>true</code> if there is a container with own label
+	 * @private
+	 * @since 1.120.28
+	 */
+	FormLayout.prototype.hasLabelledContainers = function(oForm) {
+
+		const aContainers = oForm.getFormContainers();
+		let bResult = false;
+
+		for (let i = 0; i < aContainers.length; i++) {
+			if (this.isContainerLabelled(aContainers[i])) {
+				bResult = true;
+				break;
+			}
+		}
+
+		return bResult;
+
+	};
+
+	/**
+	 * Checks if the <code>FormContainer</code> has a <code>Title</code>, <code>Toolbar</code> or <code>AriaLabelledBy</code>.
+	 *
+	 * This is used to determine the role for screenreader support
+	 *
+	 * @param {sap.ui.layout.form.FormContainer} oContainer FormContainer
+	 * @return {boolean} <code>true</code> if the <code>FormContainer</code> is labelled
+	 * @private
+	 * @since 1.120.28
+	 */
+	FormLayout.prototype.isContainerLabelled = function(oContainer) {
+
+		return !!oContainer.getTitle() || !!oContainer.getToolbar() || oContainer.getAriaLabelledBy().length > 0 || oContainer.getExpandable();
+
+	};
+
+	/**
+	 * Defines if the rendering of the layout depends on the <code>editable</code> property.
+	 *
+	 * @return {boolean} <code>true</code> if the switching <code>editable</code> must trigger re-rendering
+	 * @private
+	 * @since 1.120.28
+	 */
+	FormLayout.prototype.invalidateEditableChange = function() {
+
+		return false;
+
+	};
+
 	return FormLayout;
 
 });

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

@@ -97,7 +97,7 @@ sap.ui.define([
 		var oToolbar = oContainer.getToolbar();
 		var oTitle = oContainer.getTitle();
 
-		rm.openStart("section", oContainer);
+		rm.openStart("div", oContainer);
 		rm.class("sapUiFormContainer");
 
 		if (oToolbar) {
@@ -110,7 +110,7 @@ sap.ui.define([
 			rm.attr('title', oContainer.getTooltip_AsString());
 		}
 
-		this.writeAccessibilityStateContainer(rm, oContainer);
+		this.writeAccessibilityStateContainer(rm, oContainer, oLayout.isContainerLabelled(oContainer) ? "form" : "");
 
 		rm.openEnd();
 
@@ -276,38 +276,52 @@ sap.ui.define([
 
 	};
 
-	/*
+	/**
 	 * Writes the accessibility attributes for FormContainers.
-	 * @param {sap.ui.core.RenderManager} rm
-	 * @param {sap.ui.layout.form.FormContainer} oContainer
+	 * @param {sap.ui.core.RenderManager} rm the RenderManager that can be used for writing to the Render-Output-Buffer
+	 * @param {sap.ui.layout.form.FormContainer} oContainer <code>FormContainer</code> to write accessibility attributes
+	 * @param {string} sRole if set the given role is rendered, if no role given the DOM node needs no role (e.g. Container has no title)
 	 */
-	FormLayoutRenderer.writeAccessibilityStateContainer = function(rm, oContainer){
+	FormLayoutRenderer.writeAccessibilityStateContainer = function(rm, oContainer, sRole){
 
-		var mAriaProps = {};
-		var oTitle = oContainer.getTitle();
-		var oToolbar = oContainer.getToolbar();
+		const mAriaProps = {};
+		const sTitleID = this.getTitleId(oContainer);
+		if (sTitleID) {
+			mAriaProps["labelledby"] = {value: sTitleID, append: true};
+		}
+
+		if (sRole) {
+			mAriaProps["role"] = sRole;
+		}
+
+		rm.accessibilityState(oContainer, mAriaProps);
+
+	};
+
+	/**
+	 * Determines the ID if the title of Form or Container used for aria-labelledby
+	 * @param {sap.ui.layout.form.Form|sap.ui.layout.form.FormContainer} oContainer <code>Form</code> or <code>FormContainer</code> to determine the ID of it's title
+	 * @returns {string} title ID
+	 */
+	FormLayoutRenderer.getTitleId = function(oContainer){
+
+		const oTitle = oContainer.getTitle();
+		const oToolbar = oContainer.getToolbar();
+		let sID = "";
 		if (oToolbar) {
 			if (!oContainer.getAriaLabelledBy() || oContainer.getAriaLabelledBy().length == 0) {
 				// no aria-label -> use Title of Toolbar
-				var sToolbarTitleID = FormHelper.getToolbarTitle(oToolbar); // FormHelper must already be initialized by FormLayout
-				mAriaProps["labelledby"] = {value: sToolbarTitleID, append: true};
+				sID = FormHelper.getToolbarTitle(oToolbar); // FormHelper must already be initialized by FormLayout
 			}
 		} else if (oTitle) {
-			var sId = "";
 			if (typeof oTitle == "string") {
-				sId = oContainer.getId() + "--title";
+				sID = oContainer.getId() + "--title";
 			} else {
-				sId = oTitle.getId();
+				sID = oTitle.getId();
 			}
-			mAriaProps["labelledby"] = {value: sId, append: true};
-		}
-
-		if (mAriaProps["labelledby"] || oContainer.getAriaLabelledBy().length > 0) {
-			// if no title or label do not set role because of JAWS 18 issues
-			mAriaProps["role"] = "form";
 		}
 
-		rm.accessibilityState(oContainer, mAriaProps);
+		return sID;
 
 	};
 

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

@@ -19,6 +19,17 @@ sap.ui.define([
 		apiVersion: 2
 	};
 
+
+	/*
+	 * Form ARIA-Rendering:
+	 * The Form itself should be rendered as role "region" and the fingle FormContainers (that will at the end have the labels and fields)
+	 * should be rendered with role "form".
+	 * Only if there is only one FormContainer without title (or other label) the Form itself renders with role "form" and the FormContainer
+	 * renders without any role.
+	 * For FormLayouts what renders FormContainers without any role (other Layout-controls) used. The Form needs to render role "form".
+	 * At the end role "form" needs to be somewhere araund the labels and fields.
+	 */
+
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
@@ -26,8 +37,8 @@ sap.ui.define([
 	 * @param {sap.ui.layout.form.Form} oForm an object representation of the control that should be rendered
 	 */
 	FormRenderer.render = function(rm, oForm){
-		var oLayout = oForm.getLayout();
-		var mAriaProps = {role: "form"};
+		const oLayout = oForm.getLayout();
+		const mAriaProps = {role: oLayout && oLayout.hasLabelledContainers(oForm) ? "region" : "form"};
 
 		// write only a DIV for the form and let the layout render the rest
 		rm.openStart("div", oForm)
@@ -54,24 +65,9 @@ sap.ui.define([
 			rm.attr('title', oForm.getTooltip_AsString());
 		}
 
-		var oTitle = oForm.getTitle();
-		var oToolbar = oForm.getToolbar();
-		if (oToolbar) {
-			if (!oForm.getAriaLabelledBy() || oForm.getAriaLabelledBy().length == 0) {
-				// no aria-label -> use Title of Toolbar
-				var sToolbarTitleID = FormHelper.getToolbarTitle(oToolbar); // FormHelper must already be initialized by Form
-				mAriaProps["labelledby"] = sToolbarTitleID;
-			}
-		} else if (oTitle) {
-			var sId = "";
-			if (typeof oTitle == "string") {
-				sId = oForm.getId() + "--title";
-			} else {
-				sId = oTitle.getId();
-			}
-			mAriaProps["labelledby"] = {value: sId, append: true};
-		} else if (oForm._sSuggestedTitleId) {
-			mAriaProps["labelledby"] = {value: oForm._sSuggestedTitleId, append: true};
+		const sTitleID = oLayout?.getRenderer().getTitleId(oForm) || oForm._sSuggestedTitleId;
+		if (sTitleID) {
+			mAriaProps["labelledby"] = {value: sTitleID, append: true};
 		}
 
 		rm.accessibilityState(oForm, mAriaProps);

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public

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.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 *
 	 * 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.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public
@@ -287,7 +287,7 @@ sap.ui.define([
 					oRm.attr('title', sTooltip);
 				}
 
-				oLayout.getRenderer().writeAccessibilityStateContainer(oRm, oContainer);
+				oLayout.getRenderer().writeAccessibilityStateContainer(oRm, oContainer, "form"); // if Container-Panel used render always a role
 
 				oRm.openEnd();
 

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.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public
@@ -184,7 +184,7 @@ sap.ui.define([
 					oRm.attr('title', sTooltip);
 				}
 
-				oLayout.getRenderer().writeAccessibilityStateContainer(oRm, oContainer);
+				oLayout.getRenderer().writeAccessibilityStateContainer(oRm, oContainer, "form"); // if Container-Panel used render always a role
 
 				oRm.openEnd();
 

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.layout.form.FormElement
 	 *
 	 * @author SAP SE
-	 * @version 1.120.27
+	 * @version 1.120.29
 	 *
 	 * @constructor
 	 * @public

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.120.27
+	 * @version 1.120.29
 	 *
 	 * @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.120.27
+	 * @version 1.120.29
 	 * @since 1.15
 	 * @public
 	 */
 	var thisLib = sap.ui.getCore().initLibrary({
 		name : "sap.ui.layout",
-		version: "1.120.27",
+		version: "1.120.29",
 		dependencies: ["sap.ui.core"],
 		designtime: "sap/ui/layout/designtime/library.designtime",
 		types: [

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

@@ -6,7 +6,7 @@ SPLITTER_MOVE=\u041A\u043E\u0440\u0438\u0441\u0442\u0435\u0442\u0435 \u0433\u043
 
 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_RESIZE=\u041F\u0440\u043E\u043C\u0435\u043D\u0438 \u0458\u0430 \u0433\u043E\u043B\u0435\u043C\u0438\u043D\u0430\u0442\u0430 \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
 

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

@@ -161,7 +161,7 @@ html.sap-phone .sapUiFormCL > .sapUiFormCLContent > .sapUiFormCLContainer:not(:l
 	visibility: hidden;
 }
 
-.sapUiFormCLElement > div {
+.sapUiFormCLElement > * {
 	float: left;
 	padding: 0 0.25rem;
 	box-sizing: border-box;
@@ -241,14 +241,15 @@ html[data-sap-ui-browser^="sf"] .sapUiFormEdit .sapUiFormCLElement {
 
 /* display mode */
 /* in display only mode add padding to controls as they don't have one */
-.sapUiForm:not(.sapUiFormEdit) .sapUiFormCLElement > div{
+.sapUiForm:not(.sapUiFormEdit) .sapUiFormCLElement > *{
 	padding-top: 0.25rem;
 	padding-bottom: 0.25rem;
 	font-size: 1px; /* as browser adds some px to text to meet font-size */
+	margin: 0; /* As <dd> would add a margin */
 }
 
-.sapUiForm:not(.sapUiFormEdit) .sapUiFormCLElement > div .sapUiIcon:not(.sapMBtnIcon),
-.sapUiForm:not(.sapUiFormEdit) .sapUiFormCLElement > div .sapMCbBg{
+.sapUiForm:not(.sapUiFormEdit) .sapUiFormCLElement > * .sapUiIcon:not(.sapMBtnIcon),
+.sapUiForm:not(.sapUiFormEdit) .sapUiFormCLElement > * .sapMCbBg{
 	font-size: @sapUiFontSize; /* to set default font size on icons */
 }