@openui5/sap.ui.layout 1.93.3 → 1.96.2

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

@@ -9,10 +9,10 @@ sap.ui.define([
 	"sap/ui/layout/cssgrid/GridLayoutBase",
 	"sap/ui/layout/cssgrid/GridBasicLayout",
 	"sap/ui/layout/cssgrid/GridLayoutDelegate",
+	"./CSSGridRenderer",
 	"sap/ui/base/ManagedObjectObserver",
-	"sap/ui/layout/library",
-	"./CSSGridRenderer"
-], function (Control, GridLayoutBase, GridBasicLayout, GridLayoutDelegate, ManagedObjectObserver) {
+	"sap/ui/layout/library"
+], function (Control, GridLayoutBase, GridBasicLayout, GridLayoutDelegate, CSSGridRenderer, ManagedObjectObserver) {
 	"use strict";
 
 	/**
@@ -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.93.3
+	 * @version 1.96.2
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.layout.cssgrid.IGridConfigurable
@@ -106,72 +106,75 @@ sap.ui.define([
 	 * @alias sap.ui.layout.cssgrid.CSSGrid
 	 * @ui5-metamodel This control/element will also be described in the UI5 (legacy) designtime metamodel
 	 */
-	var CSSGrid = Control.extend("sap.ui.layout.cssgrid.CSSGrid", { metadata: {
-		library: "sap.ui.layout",
-		defaultAggregation: "items",
-		interfaces: ["sap.ui.layout.cssgrid.IGridConfigurable"],
-		properties: {
-
-			/**
-			 * The width of the control
-			 */
-			width: { type: "sap.ui.core.CSSSize", defaultValue: "100%" },
-
-			/**
-			 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-columns MDN web docs: grid-template-columns}
-			 */
-			gridTemplateColumns: { type: "sap.ui.layout.cssgrid.CSSGridTrack", defaultValue: "" },
-
-			/**
-			 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-rows MDN web docs: grid-template-rows}
-			 */
-			gridTemplateRows: { type: "sap.ui.layout.cssgrid.CSSGridTrack", defaultValue: "" },
-
-			/**
-			 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row-gap MDN web docs: grid-row-gap}
-			 */
-			gridRowGap: { type: "sap.ui.core.CSSSize", defaultValue: "" },
-
-			/**
-			 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column-gap MDN web docs: grid-column-gap}
-			 */
-			gridColumnGap: { type: "sap.ui.core.CSSSize", defaultValue: "" },
-
-			/**
-			 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-gap MDN web docs: grid-gap}
-			 * It is a shorthand for gridRowGap and gridColumnGap. If some of them is set, the gridGap value will have less priority and will be overwritten.
-			 */
-			gridGap: { type: "sap.ui.layout.cssgrid.CSSGridGapShortHand", defaultValue: "" },
-
-			/**
-			 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-rows MDN web docs: grid-auto-rows}
-			 */
-			gridAutoRows: { type: "sap.ui.layout.cssgrid.CSSGridTrack", defaultValue: "" },
-
-			/**
-			 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-columns MDN web docs: grid-auto-columns}
-			 */
-			gridAutoColumns: { type: "sap.ui.layout.cssgrid.CSSGridTrack", defaultValue: "" },
-
-			/**
-			 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-flow MDN web docs: grid-auto-flow}
-			 */
-			gridAutoFlow: { type: "sap.ui.layout.cssgrid.CSSGridAutoFlow", defaultValue: "Row" }
+	var CSSGrid = Control.extend("sap.ui.layout.cssgrid.CSSGrid", {
+		metadata: {
+			library: "sap.ui.layout",
+			defaultAggregation: "items",
+			interfaces: ["sap.ui.layout.cssgrid.IGridConfigurable"],
+			properties: {
+
+				/**
+				 * The width of the control
+				 */
+				width: { type: "sap.ui.core.CSSSize", defaultValue: "100%" },
+
+				/**
+				 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-columns MDN web docs: grid-template-columns}
+				 */
+				gridTemplateColumns: { type: "sap.ui.layout.cssgrid.CSSGridTrack", defaultValue: "" },
+
+				/**
+				 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-rows MDN web docs: grid-template-rows}
+				 */
+				gridTemplateRows: { type: "sap.ui.layout.cssgrid.CSSGridTrack", defaultValue: "" },
+
+				/**
+				 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row-gap MDN web docs: grid-row-gap}
+				 */
+				gridRowGap: { type: "sap.ui.core.CSSSize", defaultValue: "" },
+
+				/**
+				 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column-gap MDN web docs: grid-column-gap}
+				 */
+				gridColumnGap: { type: "sap.ui.core.CSSSize", defaultValue: "" },
+
+				/**
+				 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-gap MDN web docs: grid-gap}
+				 * It is a shorthand for gridRowGap and gridColumnGap. If some of them is set, the gridGap value will have less priority and will be overwritten.
+				 */
+				gridGap: { type: "sap.ui.layout.cssgrid.CSSGridGapShortHand", defaultValue: "" },
+
+				/**
+				 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-rows MDN web docs: grid-auto-rows}
+				 */
+				gridAutoRows: { type: "sap.ui.layout.cssgrid.CSSGridTrack", defaultValue: "" },
+
+				/**
+				 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-columns MDN web docs: grid-auto-columns}
+				 */
+				gridAutoColumns: { type: "sap.ui.layout.cssgrid.CSSGridTrack", defaultValue: "" },
+
+				/**
+				 * Sets the value for the CSS display:grid property {@link https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-flow MDN web docs: grid-auto-flow}
+				 */
+				gridAutoFlow: { type: "sap.ui.layout.cssgrid.CSSGridAutoFlow", defaultValue: "Row" }
+			},
+			aggregations: {
+
+				/**
+				 * Defines a custom Grid layout for the control. If provided, it will override all of the grid properties.
+				 */
+				customLayout: { type: "sap.ui.layout.cssgrid.GridLayoutBase", multiple: false },
+
+				/**
+				 * The items contained by the control.
+				 */
+				items: { type: "sap.ui.core.Control", multiple: true, singularName: "item", dnd: true }
+			},
+			dnd: { draggable: false, droppable: true }
 		},
-		aggregations: {
-
-			/**
-			 * Defines a custom Grid layout for the control. If provided, it will override all of the grid properties.
-			 */
-			customLayout: { type: "sap.ui.layout.cssgrid.GridLayoutBase", multiple: false },
-
-			/**
-			 * The items contained by the control.
-			 */
-			items: { type: "sap.ui.core.Control", multiple: true, singularName: "item", dnd: true }
-		},
-		dnd: { draggable: false, droppable: true }
-	}});
+		renderer: CSSGridRenderer
+	});
 
 	/**
 	 * =================== START of IGridConfigurable interface implementation ===================

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *

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

@@ -7,13 +7,11 @@
 sap.ui.define([
 	"sap/ui/layout/cssgrid/GridLayoutBase",
 	"sap/ui/layout/cssgrid/GridSettings",
-	"sap/ui/layout/cssgrid/GridBoxLayoutStyleHelper",
 	"sap/ui/Device",
 	"sap/ui/thirdparty/jquery"
 ], function (
 	GridLayoutBase,
 	GridSettings,
-	GridBoxLayoutStyleHelper,
 	Device,
 	jQuery
 ) {
@@ -50,7 +48,7 @@ sap.ui.define([
 	 * Applies a sap.ui.layout.cssgrid.GridSettings to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *
@@ -126,6 +124,8 @@ sap.ui.define([
 	/**
 	 * Hook function for the Grid's onAfterRendering
 	 * @param {sap.ui.layout.cssgrid.IGridConfigurable} oGrid The grid
+	 * @override
+	 * @protected
 	 */
 	GridBoxLayout.prototype.onGridAfterRendering = function (oGrid) {
 		// Add a specific class to each grid item
@@ -171,7 +171,8 @@ sap.ui.define([
 	 * - Manually flatten the height of the boxes.
 	 *
 	 * @param {object} oEvent - The event from a resize
-	 * @private
+	 * @override
+	 * @protected
 	 */
 	GridBoxLayout.prototype.onGridResize = function (oEvent) {
 		if (oEvent.control && oEvent.control.isA("sap.f.GridList") && oEvent.control.isGrouped()) {
@@ -193,17 +194,28 @@ sap.ui.define([
 	 * @private
 	 */
 	GridBoxLayout.prototype._flattenHeight = function (oControl) {
-		var iMaxHeight = 0;
+		var iMaxHeight = 0,
+			sMaxHeight;
 
-		oControl.$().removeClass('sapUiLayoutCSSGridBoxLayoutFlattenHeight');
+		this._loopOverGridItems(oControl, function (oGridItem) {
+			if (!oGridItem.classList.contains("sapMGHLI")) {
+				oGridItem.style.height = "";
+			}
+		});
 
 		this._loopOverGridItems(oControl, function (oGridItem) {
-			iMaxHeight = Math.max(jQuery(oGridItem).outerHeight(), iMaxHeight);
+			if (!oGridItem.classList.contains("sapMGHLI")) {
+				iMaxHeight = Math.max(jQuery(oGridItem).outerHeight(), iMaxHeight);
+			}
 		});
 
-		GridBoxLayoutStyleHelper.setItemHeight(oControl.getId(), iMaxHeight);
+		sMaxHeight = iMaxHeight + "px";
 
-		oControl.$().addClass('sapUiLayoutCSSGridBoxLayoutFlattenHeight');
+		this._loopOverGridItems(oControl, function (oGridItem) {
+			if (!oGridItem.classList.contains("sapMGHLI")) {
+				oGridItem.style.height = sMaxHeight;
+			}
+		});
 	};
 
 	/**

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.93.3
+	 * @version 1.96.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.93.3
+	 * @version 1.96.2
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *
@@ -213,6 +213,7 @@ sap.ui.define([
 	/**
 	 * Hook function for the Grid's onAfterRendering
 	 * @virtual
+	 * @protected
 	 * @param {sap.ui.layout.cssgrid.IGridConfigurable} oGrid The grid
 	 */
 	GridLayoutBase.prototype.onGridAfterRendering = function (oGrid) { };
@@ -220,6 +221,7 @@ sap.ui.define([
 	/**
 	 * Hook function for the Grid's resize. Will be called if the grid layout is responsive.
 	 * @virtual
+	 * @protected
 	 * @param {jQuery.Event} oEvent The event passed by the resize handler
 	 */
 	GridLayoutBase.prototype.onGridResize = function (oEvent) { };

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 *
-	 * @version 1.93.3
+	 * @version 1.96.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.93.3
+	 * @version 1.96.2
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *
@@ -134,7 +134,8 @@ sap.ui.define([
 	/**
 	 * Handler for IGridConfigurable onAfterRendering
 	 *
-	 * @private
+	 * @override
+	 * @protected
 	 * @param {sap.ui.layout.cssgrid.IGridConfigurable} oGrid The grid
 	 */
 	GridResponsiveLayout.prototype.onGridAfterRendering = function (oGrid) {
@@ -144,7 +145,8 @@ sap.ui.define([
 	/**
 	 * Handler for IGridConfigurable resize
 	 *
-	 * @private
+	 * @override
+	 * @protected
 	 * @param {jQuery.Event} oEvent The event object from a grid resize
 	 */
 	GridResponsiveLayout.prototype.onGridResize = function (oEvent) {

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.93.3
+	 * @version 1.96.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.93.3
+	 * @version 1.96.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.93.3
+	 * @version 1.96.2
 	 *
 	 * @extends sap.ui.layout.cssgrid.GridLayoutBase
 	 *
@@ -85,7 +85,8 @@ sap.ui.define([
 	/**
 	 * Handler for IGridConfigurable onAfterRendering
 	 *
-	 * @private
+	 * @override
+	 * @protected
 	 * @param {sap.ui.layout.cssgrid.IGridConfigurable} oGrid The grid
 	 */
 	ResponsiveColumnLayout.prototype.onGridAfterRendering = function (oGrid) {
@@ -107,7 +108,8 @@ sap.ui.define([
 	 * Resize handler for the ResponsiveColumnLayout.
 	 *
 	 * @param {object} oEvent - The event from a resize
-	 * @private
+	 * @override
+	 * @protected
 	 */
 	ResponsiveColumnLayout.prototype.onGridResize = function (oEvent) {
 		if (!oEvent || oEvent.size.width === 0) {

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

@@ -13,7 +13,7 @@ sap.ui.define([
 	"use strict";
 
 	function isChildOfFormElement(oElement) {
-		return oElement.getParent().isA("sap.ui.layout.form.FormElement");
+		return oElement.getParent() && oElement.getParent().isA("sap.ui.layout.form.FormElement");
 	}
 
 	function fnIsLayoutSupported(oForm){

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

@@ -6,8 +6,12 @@
 
 // Provides the Design Time Metadata for the sap.ui.layout.form.SimpleForm control
 sap.ui.define([
+	"sap/m/Title",
+	"sap/ui/core/Title",
 	"sap/ui/fl/Utils"
 ], function(
+	MTitle,
+	CoreTitle,
 	FlexUtils
 ) {
 	"use strict";
@@ -193,11 +197,13 @@ sap.ui.define([
 							var aToolbarContent = oRemovedElement.getToolbar().getContent();
 							if (aToolbarContent.length > 1) {
 									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;
+							} else if (
+								aToolbarContent.length === 1
+								&& !aToolbarContent[0].getMetadata().isInstanceOf("sap.ui.core.Label")
+								&& !(aToolbarContent[0] instanceof CoreTitle)
+								&& !(aToolbarContent[0] instanceof MTitle)
+							) {
+								bContent = true;
 							}
 						}
 						if (bContent) {

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.93.3
+	 * @version 1.96.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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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 <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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

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

@@ -27,15 +27,16 @@ sap.ui.define([
 
 	ColumnLayoutRenderer.renderContainers = function(oRm, oLayout, oForm){
 
-		var iColumnsM = oLayout.getColumnsM();
-		var iColumnsL = oLayout.getColumnsL();
-		var iColumnsXL = oLayout.getColumnsXL();
 		var aContainers = oForm.getVisibleFormContainers();
 		var iContainers = aContainers.length;
 
 		if (iContainers > 0) {
-			// if more that one container render a DIV around containers
-			if (iContainers > 1 || oLayout.getLayoutDataForElement(aContainers[0], "sap.ui.layout.form.ColumnContainerData")) {
+			var bOneContainerFullSize = iContainers === 1 && !oLayout.getLayoutDataForElement(aContainers[0], "sap.ui.layout.form.ColumnContainerData");
+			if (!bOneContainerFullSize) {
+				// if more that one container or one container is not full size render a DIV around containers
+				var iColumnsM = oLayout.getColumnsM();
+				var iColumnsL = oLayout.getColumnsL();
+				var iColumnsXL = oLayout.getColumnsXL();
 				oRm.openStart("div");
 				oRm.class("sapUiFormCLContent");
 				oRm.class("sapUiFormCLColumnsM" + iColumnsM);
@@ -49,7 +50,7 @@ sap.ui.define([
 				this.renderContainer(oRm, oLayout, oContainer);
 			}
 
-			if (iContainers > 1) {
+			if (!bOneContainerFullSize) {
 				oRm.close("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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public
@@ -901,7 +901,7 @@ sap.ui.define([
 	FormLayout.prototype.getContainerRenderedDomRef = function(oContainer) {
 
 		if (this.getDomRef()) {
-			return (oContainer.getId() ? window.document.getElementById(oContainer.getId()) : null);
+			return oContainer.getDomRef();
 		} else  {
 			return null;
 		}
@@ -918,7 +918,7 @@ sap.ui.define([
 	FormLayout.prototype.getElementRenderedDomRef = function(oElement) {
 
 		if (this.getDomRef()) {
-			return (oElement.getId() ? window.document.getElementById(oElement.getId()) : null);
+			return oElement.getDomRef();
 		} else  {
 			return null;
 		}

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

@@ -7,8 +7,9 @@
 sap.ui.define([
 	'sap/ui/core/library',
 	'sap/ui/layout/library',
-	'sap/ui/layout/form/Form'
-	], function(coreLibrary, library, Form) {
+	'sap/ui/layout/form/Form',
+	'sap/ui/core/IconPool' // as RenderManager.icon needs it
+	], function(coreLibrary, library, Form, IconPool) {
 	"use strict";
 
 	// shortcut for sap.ui.core.TitleLevel

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public
@@ -227,7 +227,7 @@ sap.ui.define(['sap/ui/layout/library', './FormLayout', './GridLayoutRenderer'],
 			var oContainerData = this.getLayoutDataForElement(oContainer, "sap.ui.layout.form.GridContainerData");
 
 			if ((bSingleColumn || !oContainerData || !oContainerData.getHalfGrid()) && !this.getRenderer().checkFullSizeElement(this, oElement) ) {
-				return (oElement.getId() ? window.document.getElementById(oElement.getId()) : null);
+				return oElement.getDomRef();
 			}
 		}
 

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 <code>Form</code>, so it must be assigned to a <code>Form</code> using the <code>layout</code> aggregation.
 	 * @extends sap.ui.layout.form.FormLayout
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

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.93.3
+	 * @version 1.96.2
 	 *
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @public

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.layout
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 * @since 1.15
 	 * @public
 	 */
@@ -28,7 +28,7 @@ sap.ui.define([
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name : "sap.ui.layout",
-		version: "1.93.3",
+		version: "1.96.2",
 		dependencies: ["sap.ui.core"],
 		designtime: "sap/ui/layout/designtime/library.designtime",
 		types: [