@openui5/sap.uxap 1.124.6 → 1.124.7

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.
Files changed (14) hide show
  1. package/package.json +5 -5
  2. package/src/sap/uxap/.library +1 -1
  3. package/src/sap/uxap/BlockBaseMetadata.js +1 -1
  4. package/src/sap/uxap/LazyLoading.js +4 -4
  5. package/src/sap/uxap/ObjectPageAccessibleLandmarkInfo.js +1 -1
  6. package/src/sap/uxap/ObjectPageDynamicHeaderContent.js +1 -1
  7. package/src/sap/uxap/ObjectPageDynamicHeaderTitle.js +1 -1
  8. package/src/sap/uxap/ObjectPageLayout.js +15 -6
  9. package/src/sap/uxap/ObjectPageLazyLoader.js +1 -1
  10. package/src/sap/uxap/changeHandler/AddIFrameObjectPageLayout.js +1 -1
  11. package/src/sap/uxap/changeHandler/MoveObjectPageSection.js +1 -1
  12. package/src/sap/uxap/changeHandler/RenameObjectPageSection.js +1 -1
  13. package/src/sap/uxap/changeHandler/UnstashObjectPageSection.js +1 -1
  14. package/src/sap/uxap/library.js +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openui5/sap.uxap",
3
- "version": "1.124.6",
3
+ "version": "1.124.7",
4
4
  "description": "OpenUI5 UI Library sap.uxap",
5
5
  "author": "SAP SE (https://www.sap.com)",
6
6
  "license": "Apache-2.0",
@@ -14,9 +14,9 @@
14
14
  "url": "https://github.com/SAP/openui5.git"
15
15
  },
16
16
  "dependencies": {
17
- "@openui5/sap.f": "1.124.6",
18
- "@openui5/sap.m": "1.124.6",
19
- "@openui5/sap.ui.core": "1.124.6",
20
- "@openui5/sap.ui.layout": "1.124.6"
17
+ "@openui5/sap.f": "1.124.7",
18
+ "@openui5/sap.m": "1.124.7",
19
+ "@openui5/sap.ui.core": "1.124.7",
20
+ "@openui5/sap.ui.layout": "1.124.7"
21
21
  }
22
22
  }
package/src/sap/uxap/.library CHANGED
@@ -3,7 +3,7 @@
3
3
 
4
4
  <name>sap.uxap</name>
5
5
  <vendor>SAP SE</vendor>
6
- <version>1.124.6</version>
6
+ <version>1.124.7</version>
7
7
  <copyright>OpenUI5
8
8
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
9
9
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
package/src/sap/uxap/BlockBaseMetadata.js CHANGED
@@ -21,7 +21,7 @@ sap.ui.define([
21
21
  *
22
22
  * @class
23
23
  * @author SAP SE
24
- * @version 1.124.6
24
+ * @version 1.124.7
25
25
  * @since 1.26
26
26
  * @alias sap.uxap.BlockBaseMetadata
27
27
  * @extends sap.ui.core.ElementMetadata
package/src/sap/uxap/LazyLoading.js CHANGED
@@ -108,7 +108,7 @@ sap.ui.define([
108
108
  clearTimeout(this._sLazyLoadingTimer);
109
109
  }
110
110
  this._sLazyLoadingTimer = null;
111
- this.doLazyLoading();
111
+ this.doLazyLoading(iScrollTop);
112
112
  return;
113
113
  }
114
114
 
@@ -132,11 +132,11 @@ sap.ui.define([
132
132
 
133
133
  //If there's no delayed lazy loading call, create a new one.
134
134
  if (!this._sLazyLoadingTimer) {
135
- this._sLazyLoadingTimer = setTimeout(this.doLazyLoading.bind(this), iDelay);
135
+ this._sLazyLoadingTimer = setTimeout(this.doLazyLoading.bind(this, iScrollTop), iDelay);
136
136
  }
137
137
  };
138
138
 
139
- LazyLoading.prototype.doLazyLoading = function () {
139
+ LazyLoading.prototype.doLazyLoading = function (iScrollTopPosition) {
140
140
  var oHeightParams = this._oObjectPageLayout._getHeightRelatedParameters(),
141
141
  bIconTabBar = this._oObjectPageLayout.getUseIconTabBar(),
142
142
  oSelectedSection = Element.getElementById(this._oObjectPageLayout.getSelectedSection()),
@@ -160,7 +160,7 @@ sap.ui.define([
160
160
  - oHeightParams.iAnchorBarHeight /* minus the part taken by the anchor bar */
161
161
  - oHeightParams.iHeaderTitleHeightStickied /* minus the part taken by the header title (mandatory) */
162
162
  );
163
- iScrollTop = oHeightParams.iScrollTop;
163
+ iScrollTop = iScrollTopPosition || oHeightParams.iScrollTop;
164
164
 
165
165
  //we consider that the scroll is still ongoing if:
166
166
  // - a scroll event has been received for less than half of the LAZY_LOADING_DELAY (100 ms)
package/src/sap/uxap/ObjectPageAccessibleLandmarkInfo.js CHANGED
@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
22
22
  * @extends sap.ui.core.Element
23
23
  *
24
24
  * @author SAP SE
25
- * @version 1.124.6
25
+ * @version 1.124.7
26
26
  *
27
27
  * @constructor
28
28
  * @public
package/src/sap/uxap/ObjectPageDynamicHeaderContent.js CHANGED
@@ -40,7 +40,7 @@ sap.ui.define([
40
40
  * @implements sap.uxap.IHeaderContent
41
41
  *
42
42
  * @author SAP SE
43
- * @version 1.124.6
43
+ * @version 1.124.7
44
44
  *
45
45
  * @constructor
46
46
  * @public
package/src/sap/uxap/ObjectPageDynamicHeaderTitle.js CHANGED
@@ -42,7 +42,7 @@ sap.ui.define([
42
42
  * @implements sap.uxap.IHeaderTitle
43
43
  *
44
44
  * @author SAP SE
45
- * @version 1.124.6
45
+ * @version 1.124.7
46
46
  *
47
47
  * @constructor
48
48
  * @public
package/src/sap/uxap/ObjectPageLayout.js CHANGED
@@ -1258,7 +1258,7 @@ sap.ui.define([
1258
1258
  };
1259
1259
 
1260
1260
  ObjectPageLayout.prototype._onAfterRenderingDomReady = function () {
1261
- var sSectionToSelectID, oSectionToSelect, bAppendHeaderToContent,
1261
+ var sSectionToSelectID, oSectionToSelect, bAppendHeaderToContent, sSubSectionToSelectId,
1262
1262
  iWidth = this._getWidth(this);
1263
1263
 
1264
1264
  if (this._bIsBeingDestroyed) {
@@ -1285,7 +1285,8 @@ sap.ui.define([
1285
1285
  this._bAllContentFitsContainer = this._hasSingleVisibleFullscreenSubSection(oSectionToSelect);
1286
1286
  this._checkSubSectionVisibilityChange();
1287
1287
  } else {
1288
- this.scrollToSection(sSectionToSelectID, 0);
1288
+ sSubSectionToSelectId = oSectionToSelect?.getSelectedSubSection();
1289
+ this.scrollToSection(sSubSectionToSelectId || sSectionToSelectID, 0);
1289
1290
  }
1290
1291
  }
1291
1292
  // enable scrolling in non-fullscreen-mode only
@@ -2054,6 +2055,7 @@ sap.ui.define([
2054
2055
  ObjectPageLayout.prototype._adjustLayoutAndUxRules = function () {
2055
2056
 
2056
2057
  var sSelectedSectionId,
2058
+ sSelectedSubSectionId,
2057
2059
  oSelectedSection,
2058
2060
  sSectionBaseIdToScrollTo;
2059
2061
 
@@ -2068,6 +2070,7 @@ sap.ui.define([
2068
2070
  this._adjustSelectedSectionByUXRules();
2069
2071
  sSelectedSectionId = this.getSelectedSection();
2070
2072
  oSelectedSection = Element.getElementById(sSelectedSectionId);
2073
+ sSelectedSubSectionId = oSelectedSection?.getSelectedSubSection();
2071
2074
 
2072
2075
  if (oSelectedSection) {
2073
2076
  this._setSelectedSectionId(sSelectedSectionId); //reselect the current section in the navBar (because the anchorBar was freshly rebuilt from scratch)
@@ -2088,6 +2091,8 @@ sap.ui.define([
2088
2091
  if (oSelectedSection.indexOfSubSection(Element.getElementById(this.getOngoingScrollToSectionBaseId())) > -1) {
2089
2092
  // keep the target section of the ongoing scroll only if it is within the selectedSection
2090
2093
  sSectionBaseIdToScrollTo = this.getOngoingScrollToSectionBaseId();
2094
+ } else if (sSelectedSubSectionId) {
2095
+ sSectionBaseIdToScrollTo = sSelectedSubSectionId;
2091
2096
  }
2092
2097
  // then change the selection to match the correct section
2093
2098
  this.scrollToSection(sSectionBaseIdToScrollTo, null, 0, false, true /* redirect scroll */);
@@ -2339,7 +2344,7 @@ sap.ui.define([
2339
2344
  }
2340
2345
 
2341
2346
  oSection = bIsSubSection ? oSectionBase.getParent() : oSectionBase;
2342
- oSubSection = bIsSubSection ? oSectionBase : this._getFirstVisibleSubSection(oSectionBase);
2347
+ oSubSection = bIsSubSection ? oSectionBase : null;
2343
2348
 
2344
2349
  var bExecuteDefault = this.fireBeforeNavigate({
2345
2350
  section: oSection,
@@ -3044,11 +3049,13 @@ sap.ui.define([
3044
3049
  ObjectPageLayout.prototype._initAnchorBarScroll = function () {
3045
3050
 
3046
3051
  var oSelectedSection = Element.getElementById(this.getSelectedSection()),
3052
+ sSelectedSubSectionId = oSelectedSection?.getSelectedSubSection(),
3053
+ oSelectedSubSection = Element.getElementById(sSelectedSubSectionId),
3047
3054
  iScrollTop;
3048
3055
 
3049
3056
  this._requestAdjustLayout(true);
3050
3057
 
3051
- iScrollTop = oSelectedSection ? this._computeScrollPosition(oSelectedSection) : 0;
3058
+ iScrollTop = oSelectedSection ? this._computeScrollPosition(oSelectedSubSection || oSelectedSection) : 0;
3052
3059
 
3053
3060
  //reset the scroll for anchorbar & scrolling management
3054
3061
  this._sScrolledSectionId = "";
@@ -4467,7 +4474,9 @@ sap.ui.define([
4467
4474
  ObjectPageLayout.prototype._restoreScrollPosition = function () {
4468
4475
 
4469
4476
  var bValidStoredSubSection = this._isValidStoredSubSectionInfo(),
4470
- iRestoredScrollPosition;
4477
+ iRestoredScrollPosition,
4478
+ oSelectedSection = Element.getElementById(this.getSelectedSection()),
4479
+ sSelectedSubSectionId = oSelectedSection?.getSelectedSubSection();
4471
4480
 
4472
4481
  if (bValidStoredSubSection) {
4473
4482
  iRestoredScrollPosition =
@@ -4475,7 +4484,7 @@ sap.ui.define([
4475
4484
  this._oStoredScrolledSubSectionInfo.iOffset;
4476
4485
  this._scrollTo(iRestoredScrollPosition, 0);
4477
4486
  } else {
4478
- this.scrollToSection(this.getSelectedSection(), 0);
4487
+ this.scrollToSection(sSelectedSubSectionId || oSelectedSection?.getId(), 0);
4479
4488
  }
4480
4489
  };
4481
4490
 
package/src/sap/uxap/ObjectPageLazyLoader.js CHANGED
@@ -38,7 +38,7 @@ sap.ui.define([
38
38
  * @extends sap.ui.core.Element
39
39
  *
40
40
  * @author SAP SE
41
- * @version 1.124.6
41
+ * @version 1.124.7
42
42
  *
43
43
  * @constructor
44
44
  * @public
package/src/sap/uxap/changeHandler/AddIFrameObjectPageLayout.js CHANGED
@@ -25,7 +25,7 @@ sap.ui.define([
25
25
  * @constructor
26
26
  * @alias sap.uxap.changeHandler.AddIFrameObjectPageLayout
27
27
  * @author SAP SE
28
- * @version 1.124.6
28
+ * @version 1.124.7
29
29
  * @since 1.75
30
30
  * @experimental Since 1.75
31
31
  */
package/src/sap/uxap/changeHandler/MoveObjectPageSection.js CHANGED
@@ -23,7 +23,7 @@ sap.ui.define([
23
23
  * @constructor
24
24
  * @alias sap.uxap.changeHandler.MoveObjectPageSection
25
25
  * @author SAP SE
26
- * @version 1.124.6
26
+ * @version 1.124.7
27
27
  * @experimental Since 1.54
28
28
  */
29
29
 
package/src/sap/uxap/changeHandler/RenameObjectPageSection.js CHANGED
@@ -21,7 +21,7 @@ sap.ui.define([
21
21
  * @constructor
22
22
  * @alias sap.uxap.changeHandler.RenameObjectPageSection
23
23
  * @author SAP SE
24
- * @version 1.124.6
24
+ * @version 1.124.7
25
25
  * @experimental Since 1.50
26
26
  */
27
27
 
package/src/sap/uxap/changeHandler/UnstashObjectPageSection.js CHANGED
@@ -19,7 +19,7 @@ sap.ui.define([
19
19
  * @constructor
20
20
  * @alias sap.uxap.changeHandler.UnstashObjectPageSection
21
21
  * @author SAP SE
22
- * @version 1.124.6
22
+ * @version 1.124.7
23
23
  * @experimental Since 1.115
24
24
  */
25
25
 
package/src/sap/uxap/library.js CHANGED
@@ -30,7 +30,7 @@ sap.ui.define([
30
30
  * @namespace
31
31
  * @alias sap.uxap
32
32
  * @author SAP SE
33
- * @version 1.124.6
33
+ * @version 1.124.7
34
34
  * @since 1.36
35
35
  * @public
36
36
  */
@@ -74,7 +74,7 @@ sap.ui.define([
74
74
  "sap.uxap.ObjectPageHeaderLayoutData",
75
75
  "sap.uxap.ObjectPageLazyLoader"
76
76
  ],
77
- version: "1.124.6",
77
+ version: "1.124.7",
78
78
  extensions: {
79
79
  flChangeHandlers: {
80
80
  "sap.uxap.ObjectPageHeader": "sap/uxap/flexibility/ObjectPageHeader",