@openui5/sap.ui.layout 1.116.0 → 1.117.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/sap/ui/layout/.library +1 -1
- package/src/sap/ui/layout/AlignedFlowLayout.js +1 -1
- package/src/sap/ui/layout/AssociativeSplitter.js +1 -1
- package/src/sap/ui/layout/BlockLayout.js +1 -1
- package/src/sap/ui/layout/BlockLayoutCell.js +1 -1
- package/src/sap/ui/layout/BlockLayoutCellData.js +1 -1
- package/src/sap/ui/layout/BlockLayoutCellRenderer.js +0 -4
- package/src/sap/ui/layout/BlockLayoutRow.js +2 -1
- package/src/sap/ui/layout/BlockLayoutRowRenderer.js +3 -0
- package/src/sap/ui/layout/DynamicSideContent.js +9 -2
- package/src/sap/ui/layout/FixFlex.js +3 -3
- package/src/sap/ui/layout/Grid.js +1 -1
- package/src/sap/ui/layout/GridData.js +1 -1
- package/src/sap/ui/layout/GridRenderer.js +1 -1
- package/src/sap/ui/layout/HorizontalLayout.js +1 -1
- package/src/sap/ui/layout/PaneContainer.js +1 -1
- package/src/sap/ui/layout/ResponsiveFlowLayout.js +1 -1
- package/src/sap/ui/layout/ResponsiveFlowLayoutData.js +1 -1
- package/src/sap/ui/layout/ResponsiveSplitter.js +1 -1
- package/src/sap/ui/layout/ResponsiveSplitterPage.js +1 -1
- package/src/sap/ui/layout/SplitPane.js +1 -1
- package/src/sap/ui/layout/Splitter.js +1 -1
- package/src/sap/ui/layout/SplitterLayoutData.js +1 -1
- package/src/sap/ui/layout/VerticalLayout.js +1 -1
- package/src/sap/ui/layout/changeHandler/AddFormContainer.js +1 -1
- package/src/sap/ui/layout/changeHandler/AddFormField.js +1 -1
- package/src/sap/ui/layout/changeHandler/AddSimpleFormField.js +1 -1
- package/src/sap/ui/layout/changeHandler/AddSimpleFormGroup.js +1 -1
- package/src/sap/ui/layout/changeHandler/HideSimpleForm.js +1 -1
- package/src/sap/ui/layout/changeHandler/MoveSimpleForm.js +1 -1
- package/src/sap/ui/layout/changeHandler/RenameFormContainer.js +1 -1
- package/src/sap/ui/layout/changeHandler/RenameSimpleForm.js +1 -1
- package/src/sap/ui/layout/changeHandler/UnhideSimpleForm.js +1 -1
- package/src/sap/ui/layout/cssgrid/CSSGrid.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridBasicLayout.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridBoxLayout.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridItemLayoutData.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridLayoutBase.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridLayoutDelegate.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridResponsiveLayout.js +1 -1
- package/src/sap/ui/layout/cssgrid/GridSettings.js +1 -1
- package/src/sap/ui/layout/cssgrid/ResponsiveColumnItemLayoutData.js +1 -1
- package/src/sap/ui/layout/cssgrid/ResponsiveColumnLayout.js +1 -1
- package/src/sap/ui/layout/form/ColumnContainerData.js +1 -1
- package/src/sap/ui/layout/form/ColumnElementData.js +1 -1
- package/src/sap/ui/layout/form/ColumnLayout.js +7 -1
- package/src/sap/ui/layout/form/ColumnLayoutRenderer.js +67 -10
- package/src/sap/ui/layout/form/Form.js +1 -1
- package/src/sap/ui/layout/form/FormContainer.js +1 -1
- package/src/sap/ui/layout/form/FormElement.js +20 -4
- package/src/sap/ui/layout/form/FormLayout.js +32 -11
- package/src/sap/ui/layout/form/FormLayoutRenderer.js +12 -1
- package/src/sap/ui/layout/form/GridContainerData.js +1 -1
- package/src/sap/ui/layout/form/GridElementData.js +1 -1
- package/src/sap/ui/layout/form/GridLayout.js +1 -1
- package/src/sap/ui/layout/form/ResponsiveGridLayout.js +1 -1
- package/src/sap/ui/layout/form/ResponsiveLayout.js +1 -1
- package/src/sap/ui/layout/form/SemanticFormElement.js +117 -20
- package/src/sap/ui/layout/form/SimpleForm.js +28 -15
- package/src/sap/ui/layout/library.js +2 -2
- package/src/sap/ui/layout/themes/base/FormLayout.less +5 -0
- package/ui5.yaml +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.layout",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.117.0",
|
|
4
4
|
"description": "OpenUI5 UI Library sap.ui.layout",
|
|
5
5
|
"author": "SAP SE (https://www.sap.com)",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -14,6 +14,6 @@
|
|
|
14
14
|
"url": "https://github.com/SAP/openui5.git"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@openui5/sap.ui.core": "1.
|
|
17
|
+
"@openui5/sap.ui.core": "1.117.0"
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<copyright>OpenUI5
|
|
7
7
|
* (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
|
|
8
8
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
|
|
9
|
-
<version>1.
|
|
9
|
+
<version>1.117.0</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAPUI5 library with layout controls.</documentation>
|
|
12
12
|
|
|
@@ -125,10 +125,6 @@ sap.ui.define(['./library', 'sap/ui/core/library', "sap/base/Log"],
|
|
|
125
125
|
rm.class("sapUiBlockCellCenteredContent");
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
if (bHasTitle) {
|
|
129
|
-
rm.attr("aria-labelledby", this.getTitleId(blockLayoutCell));
|
|
130
|
-
}
|
|
131
|
-
|
|
132
128
|
rm.openEnd();
|
|
133
129
|
|
|
134
130
|
if (bHasTitle) {
|
|
@@ -32,7 +32,7 @@ sap.ui.define([
|
|
|
32
32
|
* @extends sap.ui.core.Control
|
|
33
33
|
*
|
|
34
34
|
* @author SAP SE
|
|
35
|
-
* @version 1.
|
|
35
|
+
* @version 1.117.0
|
|
36
36
|
*
|
|
37
37
|
* @constructor
|
|
38
38
|
* @public
|
|
@@ -300,6 +300,7 @@ sap.ui.define([
|
|
|
300
300
|
* @param {string} sId The ID of the row that will be processed
|
|
301
301
|
* @param {Array} aCells Cells in the current row
|
|
302
302
|
* @returns {this}
|
|
303
|
+
* @deprecated since 1.50, together with BlockBackgroundType.Mixed
|
|
303
304
|
*/
|
|
304
305
|
BlockLayoutRow.prototype._processMixedCellStyles = function (sId, aCells) {
|
|
305
306
|
var oBlockLayout, bProcessAccentCells;
|
|
@@ -57,6 +57,9 @@ sap.ui.define(['./library'],
|
|
|
57
57
|
});
|
|
58
58
|
|
|
59
59
|
switch (sLayoutBackground) {
|
|
60
|
+
/**
|
|
61
|
+
* @deprecated since 1.50
|
|
62
|
+
*/
|
|
60
63
|
case BlockBackgroundType.Mixed:
|
|
61
64
|
if (aAccentedCells.length > 0) {
|
|
62
65
|
oBlockLayoutRow._processMixedCellStyles(aAccentedCells[aAccentedCells.length - 1], aContent);
|
|
@@ -94,7 +94,7 @@ sap.ui.define([
|
|
|
94
94
|
* @extends sap.ui.core.Control
|
|
95
95
|
*
|
|
96
96
|
* @author SAP SE
|
|
97
|
-
* @version 1.
|
|
97
|
+
* @version 1.117.0
|
|
98
98
|
*
|
|
99
99
|
* @constructor
|
|
100
100
|
* @public
|
|
@@ -469,10 +469,17 @@ sap.ui.define([
|
|
|
469
469
|
*/
|
|
470
470
|
DynamicSideContent.prototype.getScrollDelegate = function (oControl) {
|
|
471
471
|
var oContainerOfDSC = this.getParent(),
|
|
472
|
-
|
|
472
|
+
oControlParent = oControl.getParent(),
|
|
473
|
+
sParentAggregation = oControl.sParentAggregationName,
|
|
473
474
|
bMCVisible = this.getShowMainContent() && this._MCVisible,
|
|
474
475
|
bSCVisible = this.getShowSideContent() && this._SCVisible;
|
|
475
476
|
|
|
477
|
+
// Find aggregation in which effectively is placed the oControl even if it is not directly placed in main or side content
|
|
478
|
+
while (oControlParent && oControlParent.getId() !== this.getId()) {
|
|
479
|
+
sParentAggregation = oControlParent.sParentAggregationName;
|
|
480
|
+
oControlParent = oControlParent.getParent();
|
|
481
|
+
}
|
|
482
|
+
|
|
476
483
|
// for cases with main and side content - one above the other - use the scroll delegate of the parent container
|
|
477
484
|
// otherwise use the scroll delegate of the container where the control is placed
|
|
478
485
|
|
|
@@ -53,7 +53,7 @@ sap.ui.define([
|
|
|
53
53
|
* @extends sap.ui.core.Control
|
|
54
54
|
*
|
|
55
55
|
* @author SAP SE
|
|
56
|
-
* @version 1.
|
|
56
|
+
* @version 1.117.0
|
|
57
57
|
*
|
|
58
58
|
* @constructor
|
|
59
59
|
* @public
|
|
@@ -176,8 +176,8 @@ sap.ui.define([
|
|
|
176
176
|
};
|
|
177
177
|
|
|
178
178
|
/**
|
|
179
|
-
* Returns the sap.ui.core.ScrollEnablement delegate which is used with this control.
|
|
180
|
-
* @returns {sap.ui.core.ScrollEnablement}
|
|
179
|
+
* Returns the sap.ui.core.delegate.ScrollEnablement delegate which is used with this control.
|
|
180
|
+
* @returns {sap.ui.core.delegate.ScrollEnablement}
|
|
181
181
|
* @private
|
|
182
182
|
*/
|
|
183
183
|
FixFlex.prototype.getScrollDelegate = function () {
|
|
@@ -24,7 +24,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
|
|
|
24
24
|
* (The CSS value "auto" is used internally to recalculate the size of the content
|
|
25
25
|
* dynamically and is not directly set as style property.)
|
|
26
26
|
* @extends sap.ui.core.LayoutData
|
|
27
|
-
* @version 1.
|
|
27
|
+
* @version 1.117.0
|
|
28
28
|
*
|
|
29
29
|
* @constructor
|
|
30
30
|
* @public
|
|
@@ -17,7 +17,7 @@ sap.ui.define([
|
|
|
17
17
|
* Change handler for adding a simple form group.
|
|
18
18
|
* @alias sap.ui.layout.changeHandler.AddSimpleFormGroup
|
|
19
19
|
* @author SAP SE
|
|
20
|
-
* @version 1.
|
|
20
|
+
* @version 1.117.0
|
|
21
21
|
* @experimental Since 1.27.0
|
|
22
22
|
*/
|
|
23
23
|
var AddSimpleFormGroup = {};
|
|
@@ -14,7 +14,7 @@ sap.ui.define([
|
|
|
14
14
|
*
|
|
15
15
|
* @alias sap.ui.layout.changeHandler.RenameFormContainer
|
|
16
16
|
* @author SAP SE
|
|
17
|
-
* @version 1.
|
|
17
|
+
* @version 1.117.0
|
|
18
18
|
* @since 1.48
|
|
19
19
|
* @private
|
|
20
20
|
* @experimental Since 1.48. This class is experimental and provides only limited functionality. Also the API might be changed in future.
|
|
@@ -18,7 +18,7 @@ sap.ui.define([
|
|
|
18
18
|
*
|
|
19
19
|
* @alias sap.ui.layout.changeHandler.RenameForm
|
|
20
20
|
* @author SAP SE
|
|
21
|
-
* @version 1.
|
|
21
|
+
* @version 1.117.0
|
|
22
22
|
* @since 1.40
|
|
23
23
|
* @private
|
|
24
24
|
* @experimental Since 1.40. This class is experimental and provides only limited functionality. Also the API might be changed in future.
|
|
@@ -96,7 +96,7 @@ sap.ui.define([
|
|
|
96
96
|
* @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout MDN web docs: CSS Grid Layout}
|
|
97
97
|
*
|
|
98
98
|
* @author SAP SE
|
|
99
|
-
* @version 1.
|
|
99
|
+
* @version 1.117.0
|
|
100
100
|
*
|
|
101
101
|
* @extends sap.ui.core.Control
|
|
102
102
|
* @implements sap.ui.layout.cssgrid.IGridConfigurable
|
|
@@ -21,7 +21,7 @@ sap.ui.define([
|
|
|
21
21
|
* Have to possibility to hold multiple sap.ui.layout.cssgrid.GridSettings and apply the currently active GridSettings.
|
|
22
22
|
*
|
|
23
23
|
* @author SAP SE
|
|
24
|
-
* @version 1.
|
|
24
|
+
* @version 1.117.0
|
|
25
25
|
*
|
|
26
26
|
* @extends sap.ui.layout.cssgrid.GridLayoutBase
|
|
27
27
|
*
|
|
@@ -60,7 +60,7 @@ sap.ui.define([
|
|
|
60
60
|
* This control cannot be used stand-alone, it just renders a <code>Form</code> control,
|
|
61
61
|
* so it must be assigned to a <code>Form</code> control using the <code>layout</code> aggregation.
|
|
62
62
|
* @extends sap.ui.layout.form.FormLayout
|
|
63
|
-
* @version 1.
|
|
63
|
+
* @version 1.117.0
|
|
64
64
|
*
|
|
65
65
|
* @constructor
|
|
66
66
|
* @public
|
|
@@ -681,6 +681,12 @@ sap.ui.define([
|
|
|
681
681
|
|
|
682
682
|
};
|
|
683
683
|
|
|
684
|
+
ColumnLayout.prototype.renderControlsForSemanticElement = function() {
|
|
685
|
+
|
|
686
|
+
return true;
|
|
687
|
+
|
|
688
|
+
};
|
|
689
|
+
|
|
684
690
|
return ColumnLayout;
|
|
685
691
|
|
|
686
692
|
});
|
|
@@ -122,7 +122,11 @@ sap.ui.define([
|
|
|
122
122
|
var aElements = oContainer.getVisibleFormElements();
|
|
123
123
|
for (var i = 0; i < aElements.length; i++) {
|
|
124
124
|
var oElement = aElements[i];
|
|
125
|
-
|
|
125
|
+
if (oElement.isA("sap.ui.layout.form.SemanticFormElement") && !oElement._getEditable()) {
|
|
126
|
+
this.renderSemanticElement(oRm, oLayout, oElement);
|
|
127
|
+
} else {
|
|
128
|
+
this.renderElement(oRm, oLayout, oElement);
|
|
129
|
+
}
|
|
126
130
|
|
|
127
131
|
if (Device.browser.chrome && i < oOptions.XL.Size - 1 && aElements.length > 1 && aElements.length <= oOptions.XL.Size) {
|
|
128
132
|
// in Chrome columns are not filled properly for less elements -> an invisible dummy DIV helps
|
|
@@ -151,15 +155,7 @@ sap.ui.define([
|
|
|
151
155
|
|
|
152
156
|
if (oLabel) {
|
|
153
157
|
oOptions = oLayout._getFieldSize(oLabel);
|
|
154
|
-
oRm
|
|
155
|
-
.class("sapUiFormElementLbl")
|
|
156
|
-
.class("sapUiFormCLCellsS" + oOptions.S.Size)
|
|
157
|
-
.class("sapUiFormCLCellsL" + oOptions.L.Size)
|
|
158
|
-
.openEnd();
|
|
159
|
-
|
|
160
|
-
oRm.renderControl(oLabel);
|
|
161
|
-
|
|
162
|
-
oRm.close("div");
|
|
158
|
+
_renderLabel(oRm, oLabel, oOptions);
|
|
163
159
|
}
|
|
164
160
|
|
|
165
161
|
var aFields = oElement.getFieldsForRendering();
|
|
@@ -196,6 +192,67 @@ sap.ui.define([
|
|
|
196
192
|
|
|
197
193
|
};
|
|
198
194
|
|
|
195
|
+
ColumnLayoutRenderer.renderSemanticElement = function(oRm, oLayout, oElement){
|
|
196
|
+
|
|
197
|
+
var oLabel = oElement.getLabelControl();
|
|
198
|
+
var oOptions;
|
|
199
|
+
var iColumns = 12;
|
|
200
|
+
var iSizeS = iColumns;
|
|
201
|
+
var iSizeL = iColumns;
|
|
202
|
+
|
|
203
|
+
oRm.openStart("div", oElement);
|
|
204
|
+
oRm.class("sapUiFormCLElement").class("sapUiFormCLSemanticElement");
|
|
205
|
+
if (oElement.getTooltip_AsString()) {
|
|
206
|
+
oRm.attr('title', oElement.getTooltip_AsString());
|
|
207
|
+
}
|
|
208
|
+
oRm.openEnd();
|
|
209
|
+
|
|
210
|
+
if (oLabel) {
|
|
211
|
+
oOptions = oLayout._getFieldSize(oLabel);
|
|
212
|
+
_renderLabel(oRm, oLabel, oOptions);
|
|
213
|
+
if (oOptions.S.Size < iSizeS) {
|
|
214
|
+
iSizeS = iSizeS - oOptions.S.Size;
|
|
215
|
+
}
|
|
216
|
+
if (oOptions.L.Size < iSizeL) {
|
|
217
|
+
iSizeL = iSizeL - oOptions.L.Size;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
oRm.openStart("div");
|
|
222
|
+
oRm.class("sapUiFormCLCellsS" + iSizeS);
|
|
223
|
+
oRm.class("sapUiFormCLCellsL" + iSizeL);
|
|
224
|
+
oRm.openEnd();
|
|
225
|
+
|
|
226
|
+
var aFields = oElement.getFieldsForRendering();
|
|
227
|
+
if (aFields && aFields.length > 0) {
|
|
228
|
+
for (var k = 0, kl = aFields.length; k < kl; k++) {
|
|
229
|
+
var oField = aFields[k];
|
|
230
|
+
if (!oField.isA("sap.ui.core.IFormContent") || !oField.isA("sap.ui.core.ISemanticFormContent")) {
|
|
231
|
+
throw new Error(oField + " is not a valid Form content! Only use valid content in " + oLayout);
|
|
232
|
+
}
|
|
233
|
+
oRm.renderControl(oField);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
oRm.close("div");
|
|
238
|
+
oRm.close("div");
|
|
239
|
+
|
|
240
|
+
};
|
|
241
|
+
|
|
242
|
+
function _renderLabel(oRm, oLabel, oOptions) {
|
|
243
|
+
|
|
244
|
+
oRm.openStart("div")
|
|
245
|
+
.class("sapUiFormElementLbl")
|
|
246
|
+
.class("sapUiFormCLCellsS" + oOptions.S.Size)
|
|
247
|
+
.class("sapUiFormCLCellsL" + oOptions.L.Size)
|
|
248
|
+
.openEnd();
|
|
249
|
+
|
|
250
|
+
oRm.renderControl(oLabel);
|
|
251
|
+
|
|
252
|
+
oRm.close("div");
|
|
253
|
+
|
|
254
|
+
}
|
|
255
|
+
|
|
199
256
|
return ColumnLayoutRenderer;
|
|
200
257
|
|
|
201
258
|
}, /* bExport= */ true);
|