@openui5/sap.ui.layout - npm Package Compare versions

Comparing version 1.58.1 to 1.58.2

package.json

 {
   "name": "@openui5/sap.ui.layout",
-  "version": "1.58.1",
+  "version": "1.58.2",
   "description": "OpenUI5 UI Library sap.ui.layout",
@@ -17,4 +17,4 @@ "author": "SAP SE (https://www.sap.com)",
   "dependencies": {
-    "@openui5/sap.ui.core": "1.58.1"
+    "@openui5/sap.ui.core": "1.58.2"
   }
 }

src/sap/ui/layout/AlignedFlowLayout.js

@@ -33,3 +33,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 *
@@ -36,0 +36,0 @@ * @constructor

src/sap/ui/layout/AssociativeSplitter.js

@@ -23,3 +23,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -26,0 +26,0 @@ * @constructor

src/sap/ui/layout/BlockLayout.js

@@ -66,3 +66,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 *
@@ -69,0 +69,0 @@ * @constructor

src/sap/ui/layout/BlockLayoutCell.js

@@ -29,3 +29,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 *
@@ -32,0 +32,0 @@ * @constructor

src/sap/ui/layout/BlockLayoutCellData.js

@@ -21,3 +21,3 @@ /*!
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 * @constructor
@@ -24,0 +24,0 @@ * @public

src/sap/ui/layout/BlockLayoutRow.js

@@ -39,3 +39,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 *
@@ -42,0 +42,0 @@ * @constructor

src/sap/ui/layout/changeHandler/AddFormContainer.js

@@ -19,3 +19,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 * @experimental Since 1.48.0
@@ -22,0 +22,0 @@ */

src/sap/ui/layout/changeHandler/AddFormField.js

@@ -23,3 +23,3 @@ /*!
 		 *
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 *
@@ -26,0 +26,0 @@ * @experimental Since 1.50.0 This class is experimental and provides only limited functionality. Also the API might be

src/sap/ui/layout/changeHandler/AddSimpleFormField.js

@@ -22,3 +22,3 @@ /*!
 	 *
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -25,0 +25,0 @@ * @experimental Since 1.49.0 This class is experimental and provides only limited functionality. Also the API might be

src/sap/ui/layout/changeHandler/AddSimpleFormGroup.js

@@ -16,3 +16,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 * @experimental Since 1.27.0
@@ -19,0 +19,0 @@ */

src/sap/ui/layout/changeHandler/HideSimpleForm.js

@@ -14,3 +14,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 * @experimental Since 1.27.0
@@ -17,0 +17,0 @@ */

src/sap/ui/layout/changeHandler/MoveSimpleForm.js

@@ -21,3 +21,3 @@ /*!
 			 * @author SAP SE
-			 * @version 1.58.1
+			 * @version 1.58.2
 			 * @experimental Since 1.34.0
@@ -24,0 +24,0 @@ */

src/sap/ui/layout/changeHandler/RenameFormContainer.js

@@ -19,3 +19,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 * @since 1.48
@@ -22,0 +22,0 @@ * @private

src/sap/ui/layout/changeHandler/RenameSimpleForm.js

@@ -24,3 +24,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 * @since 1.40
@@ -27,0 +27,0 @@ * @private

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

@@ -16,3 +16,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 * @experimental Since 1.27.0
@@ -19,0 +19,0 @@ */

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

@@ -8,6 +8,18 @@ /*!
 // Provides the Design Time Metadata for the sap.ui.layout.form.Form control
-sap.ui.define([],
-	function() {
+sap.ui.define([
+	'sap/ui/layout/form/Form'
+], function(
+	Form
+) {
 	"use strict";
 
+	function fnIsLayoutSupported(oForm){
+		if ((oForm instanceof Form) &&
+			oForm.getLayout() &&
+			oForm.getLayout().getMetadata().getName() === "sap.ui.layout.form.GridLayout"){
+			return false;
+		}
+		return true;
+	}
+
 	return {
@@ -39,9 +51,21 @@ palette: {
 				actions: {
-					move: "moveControls",
-					createContainer :  {
-						changeType : "addGroup",
-						isEnabled : true,
-						getCreatedContainerId : function(sNewControlID) {
-							return sNewControlID;
+					move: function(oForm) {
+						if (fnIsLayoutSupported(oForm)){
+							return "moveControls";
+						} else {
+							return null;
 						}
+					},
+					createContainer :  function(oForm){
+						if (fnIsLayoutSupported(oForm)){
+							return {
+								changeType : "addGroup",
+								isEnabled : true,
+								getCreatedContainerId : function(sNewControlID) {
+									return sNewControlID;
+								}
+							};
+						} else {
+							return null;
+						}
 					}
@@ -48,0 +72,0 @@ }

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

@@ -8,8 +8,14 @@ /*!
 // Provides the Design Time Metadata for the sap.ui.layout.form.FormContainer control
-sap.ui.define(['sap/ui/fl/changeHandler/ChangeHandlerMediator', "sap/ui/thirdparty/jquery"],
-	function(ChangeHandlerMediator, jQuery) {
+sap.ui.define([
+	'sap/ui/fl/changeHandler/ChangeHandlerMediator',
+	"sap/ui/thirdparty/jquery",
+	'sap/ui/layout/form/Form'
+], function(
+	ChangeHandlerMediator,
+	jQuery,
+	Form
+) {
 	"use strict";
 
 	function _allFormElementsInvisible(oFormContainer){
-
 		return oFormContainer.getFormElements().every(function(oFormElement){
@@ -20,2 +26,19 @@ return oFormElement.getVisible() === false;
 
+	function fnFindForm(oElement){
+		if (oElement && !(oElement instanceof Form)){
+			 return fnFindForm(oElement.getParent());
+		}
+		return oElement;
+	}
+
+	function fnIsLayoutSupported(oFormContainer){
+		var oForm = fnFindForm(oFormContainer);
+		if (oForm &&
+			oForm.getLayout() &&
+			oForm.getLayout().getMetadata().getName() === "sap.ui.layout.form.GridLayout"){
+			return false;
+		}
+		return true;
+	}
+
 	return {
@@ -32,12 +55,28 @@ palette: {
 		actions: {
-			remove: {
-				changeType: "hideControl"
+			remove: function(oFormContainer){
+				if (fnIsLayoutSupported(oFormContainer)){
+					return {
+						changeType: "hideControl"
+					};
+				} else {
+					return null;
+				}
 			},
-			rename: {
-				changeType: "renameGroup",
-				domRef: function (oFormContainer) {
-					return jQuery(oFormContainer.getRenderedDomRef()).find(".sapUiFormTitle")[0];
-				},
-				isEnabled : function (oFormContainer) {
-					return !(oFormContainer.getToolbar() || !oFormContainer.getTitle());
+			rename: function(oFormContainer) {
+				if (fnIsLayoutSupported(oFormContainer)){
+					return {
+						changeType: "renameGroup",
+						domRef: function (oFormContainer) {
+							if (!oFormContainer.getRenderedDomRef()){
+								var oTitleOrToolbar = oFormContainer.getTitle() || oFormContainer.getToolbar();
+								return oTitleOrToolbar.getDomRef();
+							}
+							return jQuery(oFormContainer.getRenderedDomRef()).find(".sapUiFormTitle")[0];
+						},
+						isEnabled : function (oFormContainer) {
+							return !(oFormContainer.getToolbar() || !oFormContainer.getTitle());
+						}
+					};
+				} else {
+					return null;
 				}
@@ -69,15 +108,26 @@ }
 				actions: {
-					move: "moveControls",
-					addODataProperty : function (oFormContainer) {
-						var mChangeHandlerSettings = ChangeHandlerMediator.getAddODataFieldWithLabelSettings(oFormContainer);
-
-						if (mChangeHandlerSettings){
+					move: function(oFormContainer){
+						if (fnIsLayoutSupported(oFormContainer)){
 							return {
-								changeType: "addFormField",
-								changeOnRelevantContainer : true,
-								changeHandlerSettings : mChangeHandlerSettings
+								changeType : "moveControls"
 							};
+						} else {
+							return null;
 						}
+					},
+					addODataProperty : function(oFormContainer){
+						if (fnIsLayoutSupported(oFormContainer)){
+							var mChangeHandlerSettings = ChangeHandlerMediator.getAddODataFieldWithLabelSettings(oFormContainer);
+
+							if (mChangeHandlerSettings){
+								return {
+									changeType: "addFormField",
+									changeOnRelevantContainer : true,
+									changeHandlerSettings : mChangeHandlerSettings
+								};
+							}
+						} else {
+							return null;
+						}
 					}
-
 				}
@@ -84,0 +134,0 @@ },

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

@@ -8,6 +8,30 @@ /*!
 // Provides the Design Time Metadata for the sap.ui.layout.form.FormElement
-sap.ui.define(['sap/ui/layout/form/Form', 'sap/ui/layout/form/FormContainer', 'sap/ui/layout/form/ResponsiveGridLayout'],
-	function(Form, FormContainer, ResponsiveGridLayout) {
+sap.ui.define([
+	'sap/ui/layout/form/Form',
+	'sap/ui/layout/form/FormContainer',
+	'sap/ui/layout/form/ResponsiveGridLayout'
+], function(
+	Form,
+	FormContainer,
+	ResponsiveGridLayout
+) {
 	"use strict";
 
+	function fnFindForm(oElement){
+		if (oElement && !(oElement instanceof Form)){
+			 return fnFindForm(oElement.getParent());
+		}
+		return oElement;
+	}
+
+	function fnIsLayoutSupported(oFormElement){
+		var oForm = fnFindForm(oFormElement);
+		if (oForm &&
+			oForm.getLayout() &&
+			oForm.getLayout().getMetadata().getName() === "sap.ui.layout.form.GridLayout"){
+			return false;
+		}
+		return true;
+	}
+
 	return {
@@ -49,13 +73,31 @@ palette: {
 		actions: {
-			remove: {
-				changeType: "hideControl"
+			remove: function(oFormElement){
+				if (fnIsLayoutSupported(oFormElement)){
+					return {
+						changeType: "hideControl"
+					};
+				} else {
+					return null;
+				}
 			},
-			rename: {
-				changeType: "renameField",
-				domRef: function (oControl) {
-					return oControl.getLabelControl().getDomRef();
+			rename: function(oFormElement){
+				if (fnIsLayoutSupported(oFormElement)){
+					return {
+						changeType: "renameField",
+						domRef: function (oControl) {
+							return oControl.getLabelControl().getDomRef();
+						}
+					};
+				} else {
+					return null;
 				}
 			},
-			reveal: {
-				changeType: "unhideControl"
+			reveal: function(oFormElement){
+				if (fnIsLayoutSupported(oFormElement)){
+					return {
+						changeType: "unhideControl"
+					};
+				} else {
+					return null;
+				}
 			}
@@ -62,0 +104,0 @@ },

src/sap/ui/layout/DynamicSideContent.js

@@ -92,3 +92,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 *
@@ -95,0 +95,0 @@ * @constructor

src/sap/ui/layout/FixFlex.js

@@ -60,3 +60,3 @@ /*!
 		 * @author SAP SE
-		 * @version 1.58.1
+		 * @version 1.58.2
 		 *
@@ -63,0 +63,0 @@ * @constructor

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

@@ -29,3 +29,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -32,0 +32,0 @@ * @constructor

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

@@ -29,3 +29,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -32,0 +32,0 @@ * @constructor

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

@@ -61,3 +61,3 @@ /*!
 	 * @extends sap.ui.layout.form.FormLayout
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -64,0 +64,0 @@ * @constructor

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

@@ -46,3 +46,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -49,0 +49,0 @@ * @constructor

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

@@ -30,3 +30,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -33,0 +33,0 @@ * @constructor

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

@@ -29,3 +29,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -32,0 +32,0 @@ * @constructor

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

@@ -38,3 +38,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -41,0 +41,0 @@ * @constructor

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

@@ -25,3 +25,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -28,0 +28,0 @@ * @constructor

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

@@ -25,3 +25,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -28,0 +28,0 @@ * @constructor

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

@@ -31,3 +31,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -34,0 +34,0 @@ * @constructor

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

@@ -56,3 +56,3 @@ /*!
 	 * @extends sap.ui.layout.form.FormLayout
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -81,3 +81,3 @@ * @constructor
 			 *
-			 * <b>Note:</b> If <code>adjustLabelSpanThis</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 <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.
 			 * @since 1.16.3
@@ -90,3 +90,3 @@ */
 			 *
-			 * <b>Note:</b> If <code>adjustLabelSpanThis</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 <code>FormContainers</code>. If more than one <code>FormContainer</code> is in one line, <code>labelSpanL</code> is used.
 			 * @since 1.16.3
@@ -93,0 +93,0 @@ */

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

@@ -53,3 +53,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -56,0 +56,0 @@ * @constructor

src/sap/ui/layout/Grid.js

@@ -49,3 +49,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -52,0 +52,0 @@ * @constructor

src/sap/ui/layout/GridData.js

@@ -29,3 +29,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -32,0 +32,0 @@ * @constructor

src/sap/ui/layout/GridRenderer.js

@@ -18,3 +18,3 @@ /*!
 	 * @version
-	 * 1.58.1
+	 * 1.58.2
 	 * @namespace
@@ -21,0 +21,0 @@ */

src/sap/ui/layout/HorizontalLayout.js

@@ -25,3 +25,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -28,0 +28,0 @@ * @constructor

src/sap/ui/layout/library.js

@@ -23,3 +23,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 * @public
@@ -31,3 +31,3 @@ */
 		name : "sap.ui.layout",
-		version: "1.58.1",
+		version: "1.58.2",
 		dependencies: ["sap.ui.core"],
@@ -34,0 +34,0 @@ designtime: "sap/ui/layout/designtime/library.designtime",

src/sap/ui/layout/PaneContainer.js

@@ -28,3 +28,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -31,0 +31,0 @@ * @constructor

src/sap/ui/layout/ResponsiveFlowLayout.js

@@ -42,3 +42,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -45,0 +45,0 @@ * @constructor

src/sap/ui/layout/ResponsiveFlowLayoutData.js

@@ -25,3 +25,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -28,0 +28,0 @@ * @constructor

src/sap/ui/layout/ResponsiveSplitter.js

@@ -69,3 +69,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -72,0 +72,0 @@ * @constructor

src/sap/ui/layout/ResponsiveSplitterPage.js

@@ -24,3 +24,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -27,0 +27,0 @@ * @constructor

src/sap/ui/layout/SplitPane.js

@@ -30,3 +30,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -33,0 +33,0 @@ * @constructor

src/sap/ui/layout/Splitter.js

@@ -53,3 +53,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -56,0 +56,0 @@ * @constructor

src/sap/ui/layout/SplitterLayoutData.js

@@ -27,3 +27,3 @@ /*!
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -30,0 +30,0 @@ * @constructor

src/sap/ui/layout/VerticalLayout.js

@@ -28,3 +28,3 @@ /*!
 	 * @author SAP SE
-	 * @version 1.58.1
+	 * @version 1.58.2
 	 *
@@ -31,0 +31,0 @@ * @constructor

No alert changes

Improved metrics

Total package byte prevSize

986563

increased by0.59%

Lines of code

18381

increased by0.62%

Dependency changes

• + Added@openui5/sap.ui.core@1.58.2(transitive)

• - Removed@openui5/sap.ui.core@1.58.1(transitive)

• Updated@openui5/sap.ui.core@1.58.2