@openui5/sap.ui.layout 1.84.36 → 1.84.38
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 +45 -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 +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/GridBoxLayoutStyleHelper.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/cssgrid/VirtualGrid.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/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.84.
|
|
3
|
+
"version": "1.84.38",
|
|
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.84.
|
|
17
|
+
"@openui5/sap.ui.core": "1.84.38"
|
|
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.84.
|
|
9
|
+
<version>1.84.38</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.84.
|
|
97
|
+
* @version 1.84.38
|
|
98
98
|
*
|
|
99
99
|
* @constructor
|
|
100
100
|
* @public
|
|
@@ -463,42 +463,68 @@ sap.ui.define([
|
|
|
463
463
|
* @since 1.78
|
|
464
464
|
*/
|
|
465
465
|
DynamicSideContent.prototype.getScrollDelegate = function (oControl) {
|
|
466
|
-
var
|
|
467
|
-
|
|
468
|
-
|
|
466
|
+
var oContainerOfDSC = this.getParent(),
|
|
467
|
+
oControlParent = oControl.getParent(),
|
|
468
|
+
sParentAggregation = oControl.sParentAggregationName,
|
|
469
469
|
bMCVisible = this.getShowMainContent() && this._MCVisible,
|
|
470
470
|
bSCVisible = this.getShowSideContent() && this._SCVisible;
|
|
471
471
|
|
|
472
|
-
//
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
472
|
+
// Find aggregation in which effectively is placed the oControl even if it is not directly placed in main or side content
|
|
473
|
+
while (oControlParent && oControlParent.getId() !== this.getId()) {
|
|
474
|
+
sParentAggregation = oControlParent.sParentAggregationName;
|
|
475
|
+
oControlParent = oControlParent.getParent();
|
|
476
|
+
}
|
|
477
|
+
|
|
478
|
+
// for cases with main and side content - one above the other - use the scroll delegate of the parent container
|
|
479
|
+
// otherwise use the scroll delegate of the container where the control is placed
|
|
480
|
+
|
|
481
|
+
if (!oControl) {
|
|
482
|
+
return;
|
|
483
|
+
} else if ((sParentAggregation === "sideContent" && !bSCVisible) || (sParentAggregation === "mainContent" && !bMCVisible)) {
|
|
484
|
+
return;
|
|
485
|
+
} else if (!this._isContentOnFullHeight(sParentAggregation)) {
|
|
486
|
+
while (oContainerOfDSC && (!oContainerOfDSC.getScrollDelegate || !oContainerOfDSC.getScrollDelegate())) {
|
|
487
|
+
oContainerOfDSC = oContainerOfDSC.getParent();
|
|
488
|
+
}
|
|
489
|
+
if (oContainerOfDSC) {
|
|
483
490
|
return oContainerOfDSC.getScrollDelegate();
|
|
484
491
|
}
|
|
485
492
|
}
|
|
486
493
|
|
|
494
|
+
this._initScrolling();
|
|
495
|
+
|
|
487
496
|
if (this._oMCScroller && this._oSCScroller) {
|
|
488
|
-
while (
|
|
489
|
-
if (
|
|
497
|
+
while (oControl && oControl.getId() !== this.getId()) {
|
|
498
|
+
if (oControl.sParentAggregationName === "mainContent" && bMCVisible) {
|
|
490
499
|
return this._oMCScroller;
|
|
491
500
|
}
|
|
492
|
-
if (
|
|
501
|
+
if (oControl.sParentAggregationName === "sideContent" && bSCVisible) {
|
|
493
502
|
return this._oSCScroller;
|
|
494
503
|
}
|
|
495
|
-
|
|
504
|
+
oControl = oControl.getParent();
|
|
496
505
|
}
|
|
497
506
|
}
|
|
498
507
|
|
|
499
508
|
return;
|
|
500
509
|
};
|
|
501
510
|
|
|
511
|
+
/**
|
|
512
|
+
* Determines whether the provided content aggregation (main or side) takes full height of the DynamicSideContent.
|
|
513
|
+
* @private
|
|
514
|
+
* @param {string} sContentName The name of the content aggregation
|
|
515
|
+
* @returns {boolean} whether the content aggregation takes the full height
|
|
516
|
+
*/
|
|
517
|
+
DynamicSideContent.prototype._isContentOnFullHeight = function(sContentName) {
|
|
518
|
+
var bMCVisible = this.getShowMainContent() && this._MCVisible,
|
|
519
|
+
bSCVisible = this.getShowSideContent() && this._SCVisible,
|
|
520
|
+
mcSpan = this.getProperty("mcSpan"),
|
|
521
|
+
scSpan = this.getProperty("scSpan"),
|
|
522
|
+
bMainContentOnFullHeight = (sContentName === "mainContent" && bMCVisible && ((mcSpan === SPAN_SIZE_12 && !bSCVisible) || mcSpan !== SPAN_SIZE_12)),
|
|
523
|
+
bSideContentOnFullHeight = (sContentName === "sideContent" && bSCVisible && ((scSpan === SPAN_SIZE_12 && !bMCVisible) || scSpan !== SPAN_SIZE_12));
|
|
524
|
+
|
|
525
|
+
return bMainContentOnFullHeight || bSideContentOnFullHeight;
|
|
526
|
+
};
|
|
527
|
+
|
|
502
528
|
/**
|
|
503
529
|
* Re-renders only part of the control that is changed.
|
|
504
530
|
* @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.84.
|
|
27
|
+
* @version 1.84.38
|
|
28
28
|
*
|
|
29
29
|
* @constructor
|
|
30
30
|
* @public
|
|
@@ -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.84.
|
|
22
|
+
* @version 1.84.38
|
|
23
23
|
* @experimental Since 1.27.0
|
|
24
24
|
*/
|
|
25
25
|
var AddSimpleFormGroup = {};
|
|
@@ -11,7 +11,7 @@ sap.ui.define(['sap/ui/fl/changeHandler/JsControlTreeModifier', "sap/base/Log"],
|
|
|
11
11
|
* Change handler for hiding of a control.
|
|
12
12
|
* @alias sap.ui.fl.changeHandler.HideControl
|
|
13
13
|
* @author SAP SE
|
|
14
|
-
* @version 1.84.
|
|
14
|
+
* @version 1.84.38
|
|
15
15
|
* @experimental Since 1.27.0
|
|
16
16
|
*/
|
|
17
17
|
var HideForm = { };
|
|
@@ -20,7 +20,7 @@ sap.ui.define([
|
|
|
20
20
|
*
|
|
21
21
|
* @alias sap.ui.layout.changeHandler.RenameFormContainer
|
|
22
22
|
* @author SAP SE
|
|
23
|
-
* @version 1.84.
|
|
23
|
+
* @version 1.84.38
|
|
24
24
|
* @since 1.48
|
|
25
25
|
* @private
|
|
26
26
|
* @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.84.
|
|
25
|
+
* @version 1.84.38
|
|
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.
|
|
@@ -97,7 +97,7 @@ sap.ui.define([
|
|
|
97
97
|
* @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Grid_Layout MDN web docs: CSS Grid Layout}
|
|
98
98
|
*
|
|
99
99
|
* @author SAP SE
|
|
100
|
-
* @version 1.84.
|
|
100
|
+
* @version 1.84.38
|
|
101
101
|
*
|
|
102
102
|
* @extends sap.ui.core.Control
|
|
103
103
|
* @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.84.
|
|
24
|
+
* @version 1.84.38
|
|
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.84.
|
|
63
|
+
* @version 1.84.38
|
|
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.84.
|
|
56
|
+
* @version 1.84.38
|
|
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.84.
|
|
70
|
+
* @version 1.84.38
|
|
71
71
|
*
|
|
72
72
|
* @constructor
|
|
73
73
|
* @public
|
|
@@ -20,14 +20,14 @@ sap.ui.define([
|
|
|
20
20
|
* @namespace
|
|
21
21
|
* @name sap.ui.layout
|
|
22
22
|
* @author SAP SE
|
|
23
|
-
* @version 1.84.
|
|
23
|
+
* @version 1.84.38
|
|
24
24
|
* @public
|
|
25
25
|
*/
|
|
26
26
|
|
|
27
27
|
// delegate further initialization of this library to the Core
|
|
28
28
|
sap.ui.getCore().initLibrary({
|
|
29
29
|
name : "sap.ui.layout",
|
|
30
|
-
version: "1.84.
|
|
30
|
+
version: "1.84.38",
|
|
31
31
|
dependencies: ["sap.ui.core"],
|
|
32
32
|
designtime: "sap/ui/layout/designtime/library.designtime",
|
|
33
33
|
types: [
|