@openui5/sap.ui.layout 1.96.19 → 1.96.21
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/BlockLayoutRow.js +1 -1
- package/src/sap/ui/layout/DynamicSideContent.js +38 -19
- package/src/sap/ui/layout/FixFlex.js +1 -1
- 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 +6 -2
- package/src/sap/ui/layout/changeHandler/AddSimpleFormGroup.js +1 -1
- package/src/sap/ui/layout/changeHandler/HideSimpleForm.js +8 -3
- package/src/sap/ui/layout/changeHandler/MoveSimpleForm.js +19 -10
- 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 +1 -1
- 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 +1 -1
- package/src/sap/ui/layout/form/FormLayout.js +1 -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 +1 -1
- package/src/sap/ui/layout/form/SimpleForm.js +1 -1
- package/src/sap/ui/layout/library.js +2 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.layout",
|
|
3
|
-
"version": "1.96.
|
|
3
|
+
"version": "1.96.21",
|
|
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.96.
|
|
17
|
+
"@openui5/sap.ui.core": "1.96.21"
|
|
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.96.
|
|
9
|
+
<version>1.96.21</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAPUI5 library with layout controls.</documentation>
|
|
12
12
|
|
|
@@ -94,7 +94,7 @@ sap.ui.define([
|
|
|
94
94
|
* @extends sap.ui.core.Control
|
|
95
95
|
*
|
|
96
96
|
* @author SAP SE
|
|
97
|
-
* @version 1.96.
|
|
97
|
+
* @version 1.96.21
|
|
98
98
|
*
|
|
99
99
|
* @constructor
|
|
100
100
|
* @public
|
|
@@ -464,42 +464,61 @@ sap.ui.define([
|
|
|
464
464
|
* @since 1.78
|
|
465
465
|
*/
|
|
466
466
|
DynamicSideContent.prototype.getScrollDelegate = function (oControl) {
|
|
467
|
-
var
|
|
468
|
-
|
|
469
|
-
sBreakpoint = this._getBreakPointFromWidth(),
|
|
467
|
+
var oContainerOfDSC = this.getParent(),
|
|
468
|
+
sParentAggregation = oControl && oControl.sParentAggregationName,
|
|
470
469
|
bMCVisible = this.getShowMainContent() && this._MCVisible,
|
|
471
470
|
bSCVisible = this.getShowSideContent() && this._SCVisible;
|
|
472
471
|
|
|
473
|
-
//for cases with main and side content - one above the other - use the scroll delegate of the parent container
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
472
|
+
// for cases with main and side content - one above the other - use the scroll delegate of the parent container
|
|
473
|
+
// otherwise use the scroll delegate of the container where the control is placed
|
|
474
|
+
|
|
475
|
+
if (!oControl) {
|
|
476
|
+
return;
|
|
477
|
+
} else if ((sParentAggregation === "sideContent" && !bSCVisible) || (sParentAggregation === "mainContent" && !bMCVisible)) {
|
|
478
|
+
return;
|
|
479
|
+
} else if (!this._isContentOnFullHeight(sParentAggregation)) {
|
|
480
|
+
while (oContainerOfDSC && (!oContainerOfDSC.getScrollDelegate || !oContainerOfDSC.getScrollDelegate())) {
|
|
481
|
+
oContainerOfDSC = oContainerOfDSC.getParent();
|
|
482
|
+
}
|
|
483
|
+
if (oContainerOfDSC) {
|
|
484
484
|
return oContainerOfDSC.getScrollDelegate();
|
|
485
485
|
}
|
|
486
486
|
}
|
|
487
487
|
|
|
488
|
+
this._initScrolling();
|
|
489
|
+
|
|
488
490
|
if (this._oMCScroller && this._oSCScroller) {
|
|
489
|
-
while (
|
|
490
|
-
if (
|
|
491
|
+
while (oControl && oControl.getId() !== this.getId()) {
|
|
492
|
+
if (oControl.sParentAggregationName === "mainContent" && bMCVisible) {
|
|
491
493
|
return this._oMCScroller;
|
|
492
494
|
}
|
|
493
|
-
if (
|
|
495
|
+
if (oControl.sParentAggregationName === "sideContent" && bSCVisible) {
|
|
494
496
|
return this._oSCScroller;
|
|
495
497
|
}
|
|
496
|
-
|
|
498
|
+
oControl = oControl.getParent();
|
|
497
499
|
}
|
|
498
500
|
}
|
|
499
501
|
|
|
500
502
|
return;
|
|
501
503
|
};
|
|
502
504
|
|
|
505
|
+
/**
|
|
506
|
+
* Determines whether the provided content aggregation (main or side) takes full height of the DynamicSideContent.
|
|
507
|
+
* @private
|
|
508
|
+
* @param {string} sContentName The name of the content aggregation
|
|
509
|
+
* @returns {boolean} whether the content aggregation takes the full height
|
|
510
|
+
*/
|
|
511
|
+
DynamicSideContent.prototype._isContentOnFullHeight = function(sContentName) {
|
|
512
|
+
var bMCVisible = this.getShowMainContent() && this._MCVisible,
|
|
513
|
+
bSCVisible = this.getShowSideContent() && this._SCVisible,
|
|
514
|
+
mcSpan = this.getProperty("mcSpan"),
|
|
515
|
+
scSpan = this.getProperty("scSpan"),
|
|
516
|
+
bMainContentOnFullHeight = (sContentName === "mainContent" && bMCVisible && ((mcSpan === SPAN_SIZE_12 && !bSCVisible) || mcSpan !== SPAN_SIZE_12)),
|
|
517
|
+
bSideContentOnFullHeight = (sContentName === "sideContent" && bSCVisible && ((scSpan === SPAN_SIZE_12 && !bMCVisible) || scSpan !== SPAN_SIZE_12));
|
|
518
|
+
|
|
519
|
+
return bMainContentOnFullHeight || bSideContentOnFullHeight;
|
|
520
|
+
};
|
|
521
|
+
|
|
503
522
|
/**
|
|
504
523
|
* Re-renders only part of the control that is changed.
|
|
505
524
|
* @param {object} aControls Array containing the passed aggregation controls
|
|
@@ -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.96.
|
|
27
|
+
* @version 1.96.21
|
|
28
28
|
*
|
|
29
29
|
* @constructor
|
|
30
30
|
* @public
|
|
@@ -91,7 +91,7 @@ sap.ui.define([
|
|
|
91
91
|
*
|
|
92
92
|
* @author SAP SE
|
|
93
93
|
*
|
|
94
|
-
* @version 1.96.
|
|
94
|
+
* @version 1.96.21
|
|
95
95
|
*
|
|
96
96
|
* @experimental Since 1.49.0 This class is experimental and provides only limited functionality. Also the API might be
|
|
97
97
|
* changed in future.
|
|
@@ -118,7 +118,11 @@ sap.ui.define([
|
|
|
118
118
|
aContent = aAggregationContent;
|
|
119
119
|
iNewIndex = getIndex(aContent, mPropertyBag);
|
|
120
120
|
aContentClone = insertLabelAndField(aContent, iNewIndex, mInnerControls);
|
|
121
|
-
|
|
121
|
+
// Remove each control from the "content" aggregation without leaving them orphan (would reset bindings)
|
|
122
|
+
return aContent.reduce(function(oPreviousPromise, oContent) {
|
|
123
|
+
return oPreviousPromise
|
|
124
|
+
.then(oModifier.insertAggregation.bind(oModifier, oSimpleForm, "dependents", oContent, 0, mPropertyBag.view));
|
|
125
|
+
}, Promise.resolve());
|
|
122
126
|
})
|
|
123
127
|
.then(function() {
|
|
124
128
|
return recreateContentAggregation(oSimpleForm, aContentClone, oModifier, mPropertyBag);
|
|
@@ -19,7 +19,7 @@ sap.ui.define([
|
|
|
19
19
|
* Change handler for adding a simple form group.
|
|
20
20
|
* @alias sap.ui.layout.changeHandler.AddSimpleFormGroup
|
|
21
21
|
* @author SAP SE
|
|
22
|
-
* @version 1.96.
|
|
22
|
+
* @version 1.96.21
|
|
23
23
|
* @experimental Since 1.27.0
|
|
24
24
|
*/
|
|
25
25
|
var AddSimpleFormGroup = {};
|
|
@@ -17,7 +17,7 @@ sap.ui.define([
|
|
|
17
17
|
* Change handler for hiding of a control.
|
|
18
18
|
* @alias sap.ui.fl.changeHandler.HideControl
|
|
19
19
|
* @author SAP SE
|
|
20
|
-
* @version 1.96.
|
|
20
|
+
* @version 1.96.21
|
|
21
21
|
* @experimental Since 1.27.0
|
|
22
22
|
*/
|
|
23
23
|
var HideForm = { };
|
|
@@ -77,8 +77,13 @@ sap.ui.define([
|
|
|
77
77
|
})
|
|
78
78
|
.then(function(aAggregationContent) {
|
|
79
79
|
aContent = aAggregationContent;
|
|
80
|
-
|
|
81
|
-
|
|
80
|
+
}).then(function() {
|
|
81
|
+
// Remove each control from the "content" aggregation without leaving them orphan (would reset bindings).
|
|
82
|
+
// This is needed to trigger a refresh of a simpleform! Otherwise simpleForm content and visualization are not in sync
|
|
83
|
+
return aContent.reduce(function(oPreviousPromise, oContent) {
|
|
84
|
+
return oPreviousPromise
|
|
85
|
+
.then(oModifier.insertAggregation.bind(oModifier, oControl, "dependents", oContent, 0, oView));
|
|
86
|
+
}, Promise.resolve());
|
|
82
87
|
})
|
|
83
88
|
.then(function() {
|
|
84
89
|
return aContent.reduce(function(oPreviousPromise, oContent, i) {
|
|
@@ -20,7 +20,7 @@ sap.ui.define([
|
|
|
20
20
|
*
|
|
21
21
|
* @alias sap.ui.layout.changeHandler.MoveSimpleForm
|
|
22
22
|
* @author SAP SE
|
|
23
|
-
* @version 1.96.
|
|
23
|
+
* @version 1.96.21
|
|
24
24
|
* @experimental Since 1.34.0
|
|
25
25
|
*/
|
|
26
26
|
var MoveSimpleForm = {};
|
|
@@ -228,10 +228,17 @@ sap.ui.define([
|
|
|
228
228
|
};
|
|
229
229
|
}
|
|
230
230
|
|
|
231
|
-
function removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, oView) {
|
|
231
|
+
function removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, aContent, oView) {
|
|
232
232
|
return Promise.resolve()
|
|
233
|
-
.then(
|
|
233
|
+
.then(function() {
|
|
234
|
+
// Remove each control from the "content" aggregation without leaving them orphan (would reset bindings)
|
|
235
|
+
return aContent.reduce(function(oPreviousPromise, oContent) {
|
|
236
|
+
return oPreviousPromise
|
|
237
|
+
.then(oModifier.insertAggregation.bind(oModifier, oSimpleForm, "dependents", oContent, 0, oView));
|
|
238
|
+
}, Promise.resolve());
|
|
239
|
+
})
|
|
234
240
|
.then(function(){
|
|
241
|
+
// Add the removed controls one by one in the new order
|
|
235
242
|
return aContentClone.reduce(function(oPreviousPromise, oContentClone, iIndex) {
|
|
236
243
|
return oPreviousPromise
|
|
237
244
|
.then(oModifier.insertAggregation.bind(oModifier,
|
|
@@ -316,7 +323,7 @@ sap.ui.define([
|
|
|
316
323
|
}
|
|
317
324
|
|
|
318
325
|
if (iSourceFieldIndex != iTargetFieldIndex) {
|
|
319
|
-
return removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, oView);
|
|
326
|
+
return removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, aContent, oView);
|
|
320
327
|
}
|
|
321
328
|
|
|
322
329
|
} else if (oChange.getChangeType() === MoveSimpleForm.CHANGE_TYPE_MOVE_GROUP) {
|
|
@@ -359,7 +366,7 @@ sap.ui.define([
|
|
|
359
366
|
// and insert it at the target index
|
|
360
367
|
aContentClone = arrayRangeCopy(aContent, iMovedGroupIndex, aContentClone, iTargetIndex + iOffset, iMovedLength);
|
|
361
368
|
|
|
362
|
-
return removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, oView);
|
|
369
|
+
return removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContentClone, aContent, oView);
|
|
363
370
|
});
|
|
364
371
|
} else {
|
|
365
372
|
Log.warning("Unknown change type detected. Cannot apply to SimpleForm");
|
|
@@ -443,11 +450,12 @@ sap.ui.define([
|
|
|
443
450
|
var oView = mPropertyBag.view;
|
|
444
451
|
var oRevertData = oChange.getRevertData();
|
|
445
452
|
var aContentSelectors = oRevertData.content;
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
453
|
+
return oModifier.getAggregation(oSimpleForm, MoveSimpleForm.CONTENT_AGGREGATION)
|
|
454
|
+
.then(function(aCurrentContent) {
|
|
455
|
+
var aContent = aContentSelectors.map(function(oSelector) {
|
|
456
|
+
return oModifier.bySelector(oSelector, oAppComponent, oView);
|
|
457
|
+
});
|
|
458
|
+
return removeAndInsertAggregation(oModifier, oSimpleForm, MoveSimpleForm, aContent, aCurrentContent, oView)
|
|
451
459
|
.then(function(){
|
|
452
460
|
// destroy implicitly created title
|
|
453
461
|
var oCreatedTitleSelector = oRevertData.createdTitleSelector;
|
|
@@ -460,6 +468,7 @@ sap.ui.define([
|
|
|
460
468
|
|
|
461
469
|
return true;
|
|
462
470
|
});
|
|
471
|
+
});
|
|
463
472
|
};
|
|
464
473
|
|
|
465
474
|
MoveSimpleForm.getChangeVisualizationInfo = function(oChange, oAppComponent) {
|
|
@@ -18,7 +18,7 @@ sap.ui.define([
|
|
|
18
18
|
*
|
|
19
19
|
* @alias sap.ui.layout.changeHandler.RenameFormContainer
|
|
20
20
|
* @author SAP SE
|
|
21
|
-
* @version 1.96.
|
|
21
|
+
* @version 1.96.21
|
|
22
22
|
* @since 1.48
|
|
23
23
|
* @private
|
|
24
24
|
* @experimental Since 1.48. This class is experimental and provides only limited functionality. Also the API might be changed in future.
|
|
@@ -22,7 +22,7 @@ sap.ui.define([
|
|
|
22
22
|
*
|
|
23
23
|
* @alias sap.ui.layout.changeHandler.RenameForm
|
|
24
24
|
* @author SAP SE
|
|
25
|
-
* @version 1.96.
|
|
25
|
+
* @version 1.96.21
|
|
26
26
|
* @since 1.40
|
|
27
27
|
* @private
|
|
28
28
|
* @experimental Since 1.40. This class is experimental and provides only limited functionality. Also the API might be changed in future.
|
|
@@ -95,7 +95,7 @@ sap.ui.define([
|
|
|
95
95
|
* @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout MDN web docs: CSS Grid Layout}
|
|
96
96
|
*
|
|
97
97
|
* @author SAP SE
|
|
98
|
-
* @version 1.96.
|
|
98
|
+
* @version 1.96.21
|
|
99
99
|
*
|
|
100
100
|
* @extends sap.ui.core.Control
|
|
101
101
|
* @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.96.
|
|
24
|
+
* @version 1.96.21
|
|
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.96.
|
|
63
|
+
* @version 1.96.21
|
|
64
64
|
*
|
|
65
65
|
* @constructor
|
|
66
66
|
* @public
|
|
@@ -53,7 +53,7 @@ sap.ui.define([
|
|
|
53
53
|
*
|
|
54
54
|
* 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.
|
|
55
55
|
* @extends sap.ui.layout.form.FormLayout
|
|
56
|
-
* @version 1.96.
|
|
56
|
+
* @version 1.96.21
|
|
57
57
|
*
|
|
58
58
|
* @constructor
|
|
59
59
|
* @public
|
|
@@ -67,7 +67,7 @@ sap.ui.define([
|
|
|
67
67
|
* <b>Note:</b> If a more complex form is needed, use the <code>{@link sap.ui.layout.form.Form Form}</code> control instead.
|
|
68
68
|
*
|
|
69
69
|
* @extends sap.ui.core.Control
|
|
70
|
-
* @version 1.96.
|
|
70
|
+
* @version 1.96.21
|
|
71
71
|
*
|
|
72
72
|
* @constructor
|
|
73
73
|
* @public
|
|
@@ -20,7 +20,7 @@ sap.ui.define([
|
|
|
20
20
|
* @namespace
|
|
21
21
|
* @name sap.ui.layout
|
|
22
22
|
* @author SAP SE
|
|
23
|
-
* @version 1.96.
|
|
23
|
+
* @version 1.96.21
|
|
24
24
|
* @since 1.15
|
|
25
25
|
* @public
|
|
26
26
|
*/
|
|
@@ -28,7 +28,7 @@ sap.ui.define([
|
|
|
28
28
|
// delegate further initialization of this library to the Core
|
|
29
29
|
sap.ui.getCore().initLibrary({
|
|
30
30
|
name : "sap.ui.layout",
|
|
31
|
-
version: "1.96.
|
|
31
|
+
version: "1.96.21",
|
|
32
32
|
dependencies: ["sap.ui.core"],
|
|
33
33
|
designtime: "sap/ui/layout/designtime/library.designtime",
|
|
34
34
|
types: [
|