@openui5/sap.uxap 1.113.0 → 1.115.0

package/.reuse/dep5

@@ -192,11 +192,6 @@ Copyright: 2012 Matteo Spinelli
 License: MIT
 Comment: these files belong to: cubiq.org - swipeview
 
-Files: src/sap.ui.core/src/sap/ui/thirdparty/mobify-carousel.js
-Copyright: Mobify R&D Inc.
-License: MIT
-Comment: these files belong to: Mobify.js
-
 Files: src/sap.ui.core/src/sap/ui/thirdparty/zyngascroll.js
 Copyright: 2011 Zynga Inc.
 License: MIT

package/THIRDPARTY.txt

@@ -143,12 +143,6 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/swipe-view.js
 
-Component: Mobify.js, version: 1.1
-Copyright: Mobify R&D Inc.
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/mobify-carousel.js
-
 Component: Zynga Scroller, version: 1.2.1-0-g5d43806
 Copyright: 2011 Zynga Inc.
 License: MIT
@@ -478,7 +472,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.2.1
+Component: SAP Theming Base Content, version: 11.3.0
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.uxap",
-  "version": "1.113.0",
+  "version": "1.115.0",
   "description": "OpenUI5 UI Library sap.uxap",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,9 +14,9 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.f": "1.113.0",
-    "@openui5/sap.m": "1.113.0",
-    "@openui5/sap.ui.core": "1.113.0",
-    "@openui5/sap.ui.layout": "1.113.0"
+    "@openui5/sap.f": "1.115.0",
+    "@openui5/sap.m": "1.115.0",
+    "@openui5/sap.ui.core": "1.115.0",
+    "@openui5/sap.ui.layout": "1.115.0"
   }
 }

package/src/sap/uxap/.library

@@ -3,7 +3,7 @@
 
 	<name>sap.uxap</name>
 	<vendor>SAP SE</vendor>
-	<version>1.113.0</version>
+	<version>1.115.0</version>
 	<copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>

package/src/sap/uxap/BlockBase.js

@@ -245,11 +245,11 @@ sap.ui.define([
 		 * @param {*} bSuppressInvalidate invalidate
 		 */
 		BlockBase.prototype.setParent = function (oParent, sAggregationName, bSuppressInvalidate) {
+			Control.prototype.setParent.call(this, oParent, sAggregationName, bSuppressInvalidate);
+
 			if (oParent instanceof library.ObjectPageSubSection) {
 				this._bLazyLoading = true; //we activate the block lazy loading since we are within an objectPageLayout
 				this._oParentObjectPageSubSection = oParent;
-			} else {
-				Control.prototype.setParent.call(this, oParent, sAggregationName, bSuppressInvalidate);
 			}
 		};
 

package/src/sap/uxap/BlockBaseMetadata.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @since 1.26
 	 * @alias sap.uxap.BlockBaseMetadata
 	 * @extends sap.ui.core.ElementMetadata

package/src/sap/uxap/HierarchicalSelect.js

@@ -9,10 +9,8 @@ sap.ui.define([
 	"sap/m/Select",
 	"sap/ui/Device",
 	"sap/ui/thirdparty/jquery",
-	"./library",
-	"./HierarchicalSelectRenderer",
-	"sap/ui/thirdparty/jqueryui/jquery-ui-position"
-], function(Select, Device, jQuery, library, HierarchicalSelectRenderer /*jqueryUiPosition,*/) {
+	"./HierarchicalSelectRenderer"
+], function(Select, Device, jQuery, HierarchicalSelectRenderer) {
 	"use strict";
 
 	/**

package/src/sap/uxap/ObjectPageAccessibleLandmarkInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/uxap/ObjectPageDynamicHeaderContent.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		 * @implements sap.uxap.IHeaderContent
 		 *
 		 * @author SAP SE
-		 * @version 1.113.0
+		 * @version 1.115.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/uxap/ObjectPageDynamicHeaderTitle.js

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @implements sap.uxap.IHeaderTitle
 		 *
 		 * @author SAP SE
-		 * @version 1.113.0
+		 * @version 1.115.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/uxap/ObjectPageLayout.js

@@ -33,7 +33,8 @@ sap.ui.define([
 	"sap/base/util/merge",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/dom/getFirstEditableInput",
-	'sap/ui/dom/units/Rem'
+	'sap/ui/dom/units/Rem',
+	"sap/ui/base/Object"
 ], function(
 	jQuery,
 	ManagedObjectObserver,
@@ -62,7 +63,8 @@ sap.ui.define([
 	merge,
 	KeyCodes,
 	getFirstEditableInput,
-	DomUnitsRem
+	DomUnitsRem,
+	BaseObject
 ) {
 	"use strict";
 
@@ -1193,6 +1195,7 @@ sap.ui.define([
 				clearTimeout(this._iAfterRenderingDomReadyTimeout);
 			}
 			this._iAfterRenderingDomReadyTimeout = setTimeout(this._onAfterRenderingDomReady.bind(this), this._getDOMCalculationDelay());
+			this._adjustTitlePositioning(); // adjust early to prevent visual offset/flickering of content
 		}
 
 		if (oHeaderContent && oHeaderContent.supportsPinUnpin()) {
@@ -1236,7 +1239,7 @@ sap.ui.define([
 		}
 		// enable scrolling in non-fullscreen-mode only
 		// (to avoid any scrollbar appearing even for an instance while we snap/unsnap header)
-		this._toggleScrolling(!this._bAllContentFitsContainer || this._headerBiggerThanAllowedToBeFixed());
+		this._toggleScrolling(!this._bAllContentFitsContainer || !this._getFirstVisibleSubSection()._hasRestrictedHeight());
 
 		this._registerOnContentResize();
 
@@ -1834,7 +1837,7 @@ sap.ui.define([
 
 		var oSubsection;
 
-		if (oSection instanceof sap.uxap.ObjectPageSubSection) {
+		if (BaseObject.isA(oSection, "sap.uxap.ObjectPageSubSection")) {
 			oSubsection = oSection;
 			oSection = oSection.getParent();
 		} else {
@@ -2142,8 +2145,6 @@ sap.ui.define([
 
 			// the current tab changed => update the <code>this._bAllContentFitsContainer</code> accordingly
 			this._bAllContentFitsContainer = this._hasSingleVisibleFullscreenSubSection(oToSelect);
-			this._toggleScrolling(!this._bAllContentFitsContainer || this._headerBiggerThanAllowedToBeFixed());
-
 			bFullscreenModeChanged = this._bAllContentFitsContainer !== bWasFullscreenMode;
 			if (bFullscreenModeChanged && !this._bHeaderExpanded) {
 				// call the snapping function again with the *latest* parameter value
@@ -2540,15 +2541,13 @@ sap.ui.define([
 
 		this.iFooterHeight = this._getFooterHeight();
 
-		var iSubSectionIndex = -1,
-			iSectionsContainerOffsetTop = this._$sectionsContainer.position().top;
+		var iSubSectionIndex = -1;
 
 		this._aSectionBases.forEach(function (oSectionBase) {
 			var oInfo = this._oSectionInfo[oSectionBase.getId()],
 				$this = oSectionBase.$(),
 				bPromoted = false,
-				oSection,
-				iSectionsTopMargin;
+				oSection;
 
 			if (!oInfo /* sectionBase is visible */ || !$this.length) {
 				return;
@@ -2625,9 +2624,8 @@ sap.ui.define([
 				bParentIsFirstVisibleSection = bUseIconTabBar /* there is only single section per tab */ || (oSectionBase.getParent() === this._oFirstVisibleSection);
 				bIsFirstVisibleSubSection = bParentIsFirstVisibleSection && (iSubSectionIndex === 0); /* index of *visible* subSections is first */
 				bIsFullscreenSection = oSectionBase.hasStyleClass(ObjectPageSubSection.FIT_CONTAINER_CLASS);
-				iSectionsTopMargin = oSection && oSection.$().length ? parseInt(oSection.$().css("marginTop")) : 0;
 
-				oSectionBase._setHeight(this._computeSubSectionHeight(bIsFirstVisibleSubSection, bIsFullscreenSection, Math.ceil(realTop), iSectionsContainerOffsetTop, iSectionsTopMargin));
+				oSectionBase._setHeight(this._computeSubSectionHeight(bIsFirstVisibleSubSection, bIsFullscreenSection, oSectionBase));
 			}
 
 		}, this);
@@ -2688,14 +2686,18 @@ sap.ui.define([
 		// => wrong section may have been selected in <code>_updateSelectionOnScroll</code>
 		// => update the selection using the newly updated DOM positions and the current scrollTop
 		this._updateSelectionOnScroll(this._$opWrapper.scrollTop());
+		this._toggleScrolling(!this._bAllContentFitsContainer || !this._getFirstVisibleSubSection()._hasRestrictedHeight());
 
 		return true; // return success flag
 	};
 
-	ObjectPageLayout.prototype._computeSubSectionHeight = function(bFirstVisibleSubSection, bFullscreenSection,
-		iSubSectionOffsetTop, iSectionsContainerOffsetTop, iSectionsTopMargin) {
+	ObjectPageLayout.prototype._computeSubSectionHeight = function(bFirstVisibleSubSection, bFullscreenSection, oSectionBase) {
 
 		var iSectionsContainerHeight,
+			oContainerDimentions,
+			oSubSectionDimentons,
+			iOffsetTop,
+			iOffsetBottom,
 			iRemainingSectionContentHeight;
 
 		if (!bFullscreenSection) {
@@ -2719,7 +2721,11 @@ sap.ui.define([
 		if (this._bAllContentFitsContainer) {
 			// if we have a single fullscreen subsection [that takes the entire available height within the sections container]
 			// => subtract the heights above and bellow the subSection to *avoid having a scrollbar*, having in mind the top margin of the Section
-			iRemainingSectionContentHeight = (iSubSectionOffsetTop - iSectionsContainerOffsetTop) + iSectionsTopMargin + this.iFooterHeight;
+			oContainerDimentions = this._$sectionsContainer[0].getBoundingClientRect();
+			oSubSectionDimentons = oSectionBase.getDomRef().getBoundingClientRect();
+			iOffsetTop = oSubSectionDimentons.top - oContainerDimentions.top;
+			iOffsetBottom = this.iFooterHeight + this._iREMSize /* footer-height + space between footer and content */;
+			iRemainingSectionContentHeight = iOffsetTop + iOffsetBottom;
 			iSectionsContainerHeight -= iRemainingSectionContentHeight;
 		}
 
@@ -2923,7 +2929,10 @@ sap.ui.define([
 
 	ObjectPageLayout.prototype._getFirstVisibleSubSection = function (oSection) {
 		if (!oSection) {
-			return;
+			oSection = this.getUseIconTabBar() ? this._oCurrentTabSection : this._oFirstVisibleSection;
+			if (!oSection) {
+				return;
+			}
 		}
 		var oFirstSubSection;
 		this._aSectionBases.every(function (oSectionBase) {
@@ -3045,7 +3054,9 @@ sap.ui.define([
 		var oWrapperElement = this._$opWrapper.get(0),
 			oTitleElement = this._$titleArea.get(0),
 			iTitleHeight = oTitleElement.getBoundingClientRect().height,
-			iTitleWidth = oTitleElement.getBoundingClientRect().width;
+			iTitleWidth = oTitleElement.getBoundingClientRect().width,
+			iScrollbarWidth = getScrollbarSize().width,
+			sClipPath;
 
 		// the top area of the scroll container is reserved for showing the title element,
 		// (where the title element is positioned absolutely on top of the scroll container),
@@ -3062,10 +3073,17 @@ sap.ui.define([
 		// (2) also make the area underneath the title invisible (using clip-path)
 		// to allow usage of *transparent background* of the title element
 		// (otherwise content from the scroll *overflow* will show underneath the transparent title element)
-		oWrapperElement.style.clipPath = 'polygon(0px ' + iTitleHeight + 'px, '
+		sClipPath = 'polygon(0px ' + iTitleHeight + 'px, '
 			+ Math.floor(iTitleWidth) + 'px ' 	+ iTitleHeight + 'px, '
 			+ Math.floor(iTitleWidth) + 'px 0, 100% 0, 100% 100%, 0 100%)';
 
+		if (this.oCore.getConfiguration().getRTL()) {
+			sClipPath = 'polygon(0px 0px, ' + iScrollbarWidth + 'px 0px, '
+			+ iScrollbarWidth + 'px ' + iTitleHeight + 'px, 100% '
+			+ iTitleHeight + 'px, 100% 100%, 0 100%)';
+		}
+		oWrapperElement.style.clipPath = sClipPath;
+
 		this.getHeaderTitle() && this._shiftHeaderTitle();
 	};
 

package/src/sap/uxap/ObjectPageLazyLoader.js

@@ -9,8 +9,9 @@ sap.ui.define([
 	'./library',
 	'sap/ui/core/Element',
 	'sap/ui/core/StashedControlSupport',
-	"sap/base/assert"
-], function (library, Element, StashedControlSupport, assert) {
+	"sap/base/assert",
+	"sap/ui/base/Object"
+], function (library, Element, StashedControlSupport, assert, BaseObject) {
 	"use strict";
 
 	/**
@@ -37,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public
@@ -61,7 +62,7 @@ sap.ui.define([
 	StashedControlSupport.mixInto(LazyLoader);
 
 	LazyLoader.prototype.setParent = function (oParent) {
-		if (!(oParent === null || oParent instanceof sap.uxap.ObjectPageSubSection)) {
+		if (!(oParent === null || BaseObject.isA(oParent, "sap.uxap.ObjectPageSubSection"))) {
 			assert(false, "setParent(): oParent must be an instance of sap.uxap.ObjectPageSubSection or null");
 		}
 

package/src/sap/uxap/ObjectPageSection.js

@@ -190,7 +190,7 @@ sap.ui.define([
 		this._updateShowHideAllButton(false);
 
 		oHeaderDOM && oHeaderDOM.classList.toggle("sapUxAPObjectPageSectionHeaderHidden", !this._isTitleVisible());
-		oHeaderDOM && oHeaderDOM.setAttribute("aria-hidden", !this._isTitleVisible());
+		oHeaderDOM && oHeaderDOM.setAttribute("aria-hidden", !this._isTitleAriaVisible());
 
 		if (oObjectPage && this.getDomRef()) {
 			oObjectPage._requestAdjustLayout();
@@ -324,9 +324,26 @@ sap.ui.define([
 	 * @returns {boolean}
 	 */
 	ObjectPageSection.prototype._isTitleVisible = function () {
-		return (this.getShowTitle() && this._getInternalTitleVisible())
-		|| this._getShouldDisplayExpandCollapseButton()
-		|| this._getShouldDisplayShowHideAllButton();
+		return (this.getShowTitle() && this._getInternalTitleVisible()) || this._getInternalTitleForceVisible();
+	};
+
+	/**
+	 * Determines if the <code>ObjectPageSection</code> title is visible for the aria.
+	 * @private
+	 * @returns {boolean}
+	 */
+	ObjectPageSection.prototype._isTitleAriaVisible = function () {
+		return this.getShowTitle() || this._getInternalTitleForceVisible();
+	};
+
+	/**
+	 * Determines if the <code>ObjectPageSection</code> title is forced to be visible.
+	 * This is the case when the <code>ObjectPageSection</code> displays the expand/collapse button or the show/hide all button.
+	 * @private
+	 * @returns {boolean}
+	 */
+	ObjectPageSection.prototype._getInternalTitleForceVisible = function () {
+		return this._getShouldDisplayExpandCollapseButton() || this._getShouldDisplayShowHideAllButton();
 	};
 
 	/**

package/src/sap/uxap/ObjectPageSectionRenderer.js

@@ -16,7 +16,7 @@ sap.ui.define(["sap/ui/core/Configuration"], function (Configuration) {
 	};
 
 	ObjectPageSectionRenderer.render = function (oRm, oControl) {
-		var sTitle, bTitleVisible,
+		var sTitle, bTitleVisible, bTitleAriaHidden,
 			bAccessibilityOn = Configuration.getAccessibility(),
 			oLabelledBy = oControl.getAggregation("ariaLabelledBy"),
 			oHeading = oControl.getHeading(),
@@ -28,6 +28,7 @@ sap.ui.define(["sap/ui/core/Configuration"], function (Configuration) {
 
 		sTitle = oControl._getTitle();
 		bTitleVisible = oControl._isTitleVisible();
+		bTitleAriaHidden = !oControl._isTitleAriaVisible();
 
 		oRm.openStart("section", oControl)
 			.class("sapUxAPObjectPageSection");
@@ -61,10 +62,14 @@ sap.ui.define(["sap/ui/core/Configuration"], function (Configuration) {
 		oRm.openStart("div", oControl.getId() + "-header")
 			.attr("role", "heading")
 			.attr("aria-level", oControl._getARIALevel())
-			.attr("aria-hidden", !bTitleVisible)
 			.class("sapUxAPObjectPageSectionHeader")
-			.class(bTitleVisible ? "" : "sapUxAPObjectPageSectionHeaderHidden")
-			.openEnd();
+			.class(bTitleVisible ? "" : "sapUxAPObjectPageSectionHeaderHidden");
+
+		if (bTitleAriaHidden) {
+			oRm.attr("aria-hidden", "true");
+		}
+
+		oRm.openEnd();
 
 		oRm.openStart("div", oControl.getId() + "-title")
 			.class("sapUxAPObjectPageSectionTitle");

package/src/sap/uxap/ObjectPageSubSection.js

@@ -8,6 +8,7 @@
 sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/Core",
+	"sap/ui/core/ResizeHandler",
 	"./ObjectPageSectionBase",
 	"./ObjectPageLazyLoader",
 	"./BlockBase",
@@ -26,6 +27,7 @@ sap.ui.define([
 ], function(
 	jQuery,
 	Core,
+	ResizeHandler,
 	ObjectPageSectionBase,
 	ObjectPageLazyLoader,
 	BlockBase,
@@ -314,10 +316,26 @@ sap.ui.define([
 
 		oDom = this.getDomRef();
 		if (oDom) {
-			oDom.style.height = oValue;
+			oDom.style.height = this._height;
+			this._adaptDomHeight();
 		}
 	};
 
+	ObjectPageSubSection.prototype._toggleContentResizeListener = function(bEnable) {
+		if (bEnable && !this._iResizeId) {
+			this._iResizeId = ResizeHandler.register(this._getContentWrapper(), this._adaptDomHeight.bind(this));
+		}
+		if (!bEnable && this._iResizeId) {
+			ResizeHandler.deregister(this._iResizeId);
+			this._iResizeId = null;
+		}
+	};
+
+	ObjectPageSubSection.prototype._getContentWrapper = function() {
+		return this.getAggregation("_grid");
+	};
+
+
 	/**
 	 * Returns the control name text.
 	 *
@@ -589,6 +607,10 @@ sap.ui.define([
 			return;
 		}
 
+		if (this.hasStyleClass(ObjectPageSubSection.FIT_CONTAINER_CLASS)) {
+			this._toggleContentResizeListener(true);
+		}
+
 		this._$spacer = oObjectPageLayout.$("spacer");
 
 		if (this._bShouldFocusSeeMoreLessButton && document.activeElement === document.body) {
@@ -609,10 +631,32 @@ sap.ui.define([
 			ObjectPageSectionBase.prototype.onBeforeRendering.call(this);
 		}
 
+		this._toggleContentResizeListener(false);
+
 		this._setAggregationProxy();
 		this._getGrid().removeAllContent();
 		this._applyLayout(oObjectPageLayout);
 		this.refreshSeeMoreVisibility();
+
+		this.toggleStyleClass("sapUxAPObjectPageSubSectionStashed", this._aStashedControls.length ? true : false);
+	};
+
+	ObjectPageSubSection.prototype._adaptDomHeight = function() {
+		var oDom = this.getDomRef();
+		if (!oDom) {
+			return;
+		}
+		if (this.hasStyleClass(ObjectPageSubSection.FIT_CONTAINER_CLASS) && this._height) {
+			oDom.style.height = (oDom.scrollHeight > Math.ceil(parseFloat(this._height))) ? "" : this._height;
+		}
+	};
+
+	ObjectPageSubSection.prototype._hasRestrictedHeight = function() {
+		var oDom = this.getDomRef();
+		if (!oDom) {
+			return;
+		}
+		return parseInt(oDom.style.height) > 0;
 	};
 
 	ObjectPageSubSection.prototype._applyLayout = function (oLayoutProvider) {
@@ -886,7 +930,7 @@ sap.ui.define([
 			this._setAggregation(sAggregationName, aAggregation, bSuppressInvalidate);
 
 			if (oObject instanceof BlockBase || oObject instanceof ObjectPageLazyLoader) {
-				oObject.setParent(this); //let the block know of its parent subsection
+				oObject.setParent(this, "blocks"); //let the block know of its parent subsection
 			}
 
 		} else {
@@ -953,22 +997,23 @@ sap.ui.define([
 		return ObjectPageSectionBase.prototype.removeAllAggregation.apply(this, arguments);
 	};
 
-	ObjectPageSubSection.prototype.removeAggregation = function (sAggregationName, oObject) {
-		var bRemoved = false, aInternalAggregation;
+	ObjectPageSubSection.prototype.removeAggregation = function (sAggregationName, vObject) {
+		var bRemoved = false,
+			aInternalAggregation;
 
-		if (this.hasProxy(sAggregationName)) {
+		if (this.hasProxy(sAggregationName) && typeof vObject === "object") {
 			aInternalAggregation = this._getAggregation(sAggregationName);
-			aInternalAggregation.forEach(function (oObjectCandidate, iIndex) {
-				if (oObjectCandidate.getId() === oObject.getId()) {
-					aInternalAggregation.splice(iIndex, 1);
-					this._onRemoveBlock(oObject);
-					this._setAggregation(sAggregationName, aInternalAggregation);
-					bRemoved = true;
-				}
-				return !bRemoved;
-			}, this);
+				aInternalAggregation.forEach(function (oObjectCandidate, iIndex) {
+					if (oObjectCandidate.getId() === vObject.getId()) {
+						aInternalAggregation.splice(iIndex, 1);
+						this._onRemoveBlock(vObject);
+						this._setAggregation(sAggregationName, aInternalAggregation);
+						bRemoved = true;
+					}
+					return !bRemoved;
+				}, this);
 
-			return (bRemoved ? oObject : null);
+			return (bRemoved ? vObject : null);
 		}
 
 		return ObjectPageSectionBase.prototype.removeAggregation.apply(this, arguments);

package/src/sap/uxap/changeHandler/AddIFrameObjectPageLayout.js

@@ -5,10 +5,12 @@
  */
 
 sap.ui.define([
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/changeHandler/AddIFrame",
 	"sap/ui/fl/changeHandler/common/getTargetAggregationIndex",
 	"sap/ui/fl/changeHandler/common/createIFrame"
 ], function (
+	JsControlTreeModifier,
 	BaseAddIFrame,
 	getTargetAggregationIndex,
 	createIFrame
@@ -21,7 +23,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.uxap.changeHandler.AddIFrameObjectPageLayout
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @since 1.75
 	 * @experimental Since 1.75
 	 */
@@ -106,5 +108,29 @@ sap.ui.define([
 		return oCondenserInfo;
 	};
 
+	AddIFrameObjectPageLayout.getChangeVisualizationInfo = function(oChange, oAppComponent) {
+		var oSelector = oChange.getContent().selector;
+		var oElement = JsControlTreeModifier.bySelector(oSelector, oAppComponent);
+		var oAnchorBar = oElement.getParent().getAggregation("_anchorBar");
+		var aAffectedControls = [oSelector];
+		var aDisplayControls = [oSelector];
+
+		oAnchorBar.getAggregation("content").forEach(function(oAnchorBarItem) {
+			oAnchorBarItem.getAggregation("customData").some(function(oCustomData) {
+				if (
+					oCustomData.getKey() === "sectionId" &&
+					oElement.getId() === oCustomData.getProperty("value")
+				) {
+					aDisplayControls.push(oAnchorBarItem.getId());
+				}
+			});
+		});
+
+		return {
+			affectedControls: aAffectedControls,
+			displayControls: aDisplayControls
+		};
+	};
+
 	return AddIFrameObjectPageLayout;
 }, /* bExport= */true);

package/src/sap/uxap/changeHandler/MoveObjectPageSection.js

@@ -4,7 +4,17 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 	*/
 
-sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "sap/ui/core/Core", "sap/base/util/merge", "sap/ui/thirdparty/jquery"], function(MoveControls, Core, merge, jQuery) {
+sap.ui.define([
+	"sap/base/util/merge",
+	"sap/ui/core/Core",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/changeHandler/MoveControls"
+], function(
+	merge,
+	Core,
+	JsControlTreeModifier,
+	MoveControls
+) {
 	"use strict";
 
 	/**
@@ -13,11 +23,11 @@ sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "sap/ui/core/Core", "sap/
 	 * @constructor
 	 * @alias sap.uxap.changeHandler.MoveObjectPageSection
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @experimental Since 1.54
 	 */
 
-	var MoveObjectPageSection = jQuery.extend({}, MoveControls);
+	var MoveObjectPageSection = Object.assign({}, MoveControls);
 
 	MoveObjectPageSection.applyChange = function (oChange, oControl, mPropertyBag) {
 		var bJsControllTree = mPropertyBag.modifier.targets === "jsControlTree";
@@ -77,6 +87,7 @@ sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "sap/ui/core/Core", "sap/
 	 *
 	 * @param {object} mSpecificChangeInfo - Information needed to create the change
 	 * @param {object} mPropertyBag - Object additional properties like modifier or appComponent
+	 * @returns {Promise} resolves if change could be applied
 	 * @private
 	 */
 	MoveObjectPageSection._mapAnchorsToSections = function (mSpecificChangeInfo, mPropertyBag) {
@@ -123,6 +134,45 @@ sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "sap/ui/core/Core", "sap/
 			});
 	};
 
+	/**
+	 * Retrieves the information required for the change visualization.
+	 *
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Object with change data
+	 * @param {sap.ui.core.UIComponent} oAppComponent Component in which the change is applied
+	 * @returns {object} Object with a description payload containing the information required for the change visualization
+	 * @public
+	 */
+	MoveObjectPageSection.getChangeVisualizationInfo = function(oChange, oAppComponent) {
+		var oChangeContent = oChange.getContent();
+		var oRevertData = oChange.getRevertData()[0];
+		var oMovedElementSelector = oChangeContent.movedElements[0].selector;
+		var oMovedElement = JsControlTreeModifier.bySelector(oMovedElementSelector, oAppComponent);
+		var oAnchorBar = oMovedElement.getParent().getAggregation("_anchorBar");
+		var aAffectedControls = [oMovedElementSelector];
+		var aDisplayControls = [oMovedElementSelector];
+
+		oAnchorBar.getAggregation("content").forEach(function(oAnchorBarItem) {
+			oAnchorBarItem.getAggregation("customData").some(function(oCustomData) {
+				if (
+					oCustomData.getKey() === "sectionId" &&
+					oMovedElement.getId() === oCustomData.getProperty("value")
+				) {
+					aDisplayControls.push(oAnchorBarItem.getId());
+				}
+			});
+		});
+
+		return {
+			affectedControls: aAffectedControls,
+			displayControls: aDisplayControls,
+			dependentControls: [oChangeContent.source.selector],
+			descriptionPayload: {
+				sourceContainer: oRevertData.sourceParent,
+				targetContainer: oChangeContent.target.selector
+			}
+		};
+	};
+
 	return MoveObjectPageSection;
 },
 /* bExport= */true);

package/src/sap/uxap/changeHandler/RenameObjectPageSection.js

@@ -6,9 +6,11 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/changeHandler/BaseRename"
 ], function (
 	Log,
+	JsControlTreeModifier,
 	BaseRename
 ) {
 	"use strict";
@@ -19,7 +21,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.uxap.changeHandler.RenameObjectPageSection
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @experimental Since 1.50
 	 */
 
@@ -106,6 +108,43 @@ sap.ui.define([
 			});
 	};
 
+	/**
+	 * Retrieves the information required for the change visualization.
+	 *
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Object with change data
+	 * @param {sap.ui.core.UIComponent} oAppComponent Component in which the change is applied
+	 * @returns {object} Object with a description payload containing the information required for the change visualization
+	 * @public
+	 */
+	RenameObjectPageSection.getChangeVisualizationInfo = function(oChange, oAppComponent) {
+		var oNewLabel = (
+			oChange.getTexts()
+			&& oChange.getTexts()[mRenameSettings.changePropertyName]
+		);
+		var oSelector = oChange.getSelector();
+		var oElement = JsControlTreeModifier.bySelector(oSelector, oAppComponent);
+		var oAnchorBar = oElement.getParent().getAggregation("_anchorBar");
+		var aAffectedControls = [oElement.getId()];
+		var aDisplayControls = [oElement.getId()];
+		oAnchorBar.getAggregation("content").forEach(function(oAnchorBarItem) {
+			oAnchorBarItem.getAggregation("customData").some(function(oCustomData) {
+				if (
+					oCustomData.getKey() === "sectionId" &&
+					oElement.getId() === oCustomData.getProperty("value")
+				) {
+					aDisplayControls.push(oAnchorBarItem.getId());
+				}
+			});
+		});
+		return {
+			descriptionPayload: {
+				originalLabel: oChange.getRevertData(),
+				newLabel: oNewLabel && oNewLabel.value
+			},
+			affectedControls: aAffectedControls,
+			displayControls: aDisplayControls
+		};
+	};
 
 	return RenameObjectPageSection;
 },

package/src/sap/uxap/changeHandler/UnstashObjectPageSection.js

@@ -0,0 +1,62 @@
+/*!
+	* OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+	*/
+
+sap.ui.define([
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/changeHandler/UnstashControl"
+], function(
+	JsControlTreeModifier,
+	UnstashControl
+) {
+	"use strict";
+
+	/**
+	 * ObjectPageSection Change Handler for Unstash
+	 *
+	 * @constructor
+	 * @alias sap.uxap.changeHandler.UnstashObjectPageSection
+	 * @author SAP SE
+	 * @version 1.115.0
+	 * @experimental Since 1.115
+	 */
+
+	var UnstashObjectPageSection = Object.assign({}, UnstashControl);
+
+	/**
+	 * Retrieves the information required for the change visualization.
+	 *
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Object with change data
+	 * @param {sap.ui.core.UIComponent} oAppComponent Component in which the change is applied
+	 * @returns {object} Object with a description payload containing the information required for the change visualization
+	 * @public
+	 */
+	UnstashObjectPageSection.getChangeVisualizationInfo = function(oChange, oAppComponent) {
+		var oStashedElementSelector = oChange.getSelector();
+		var oStashedElement = JsControlTreeModifier.bySelector(oStashedElementSelector, oAppComponent);
+		var oAnchorBar = oStashedElement.getParent().getAggregation("_anchorBar");
+		var aAffectedControls = [oStashedElementSelector];
+		var aDisplayControls = [oStashedElementSelector];
+
+		oAnchorBar.getAggregation("content").forEach(function(oAnchorBarItem) {
+			oAnchorBarItem.getAggregation("customData").some(function(oCustomData) {
+				if (
+					oCustomData.getKey() === "sectionId" &&
+					oStashedElement.getId() === oCustomData.getProperty("value")
+				) {
+					aDisplayControls.push(oAnchorBarItem.getId());
+				}
+			});
+		});
+
+		return {
+			affectedControls: aAffectedControls,
+			displayControls: aDisplayControls
+		};
+	};
+
+	return UnstashObjectPageSection;
+},
+/* bExport= */true);

package/src/sap/uxap/designtime/ObjectPageSection.designtime.js

@@ -9,6 +9,17 @@ sap.ui.define(["sap/uxap/library"],
 	function(library) {
 	"use strict";
 
+	function fnGetLabel(oObjectPageSection) {
+		var sTitle = oObjectPageSection.getTitle();
+		var aSubSection = oObjectPageSection.getSubSections();
+		// If there is only one SubSection, its title is shown,
+		// instead of the title of the Section (if it is available).
+		if (aSubSection.length === 1 && aSubSection[0].getTitle().trim() !== "") {
+			sTitle = aSubSection[0].getTitle();
+		}
+		return sTitle || oObjectPageSection.getId();
+	}
+
 	return {
 		name : {
 			singular : function(){
@@ -28,29 +39,21 @@ sap.ui.define(["sap/uxap/library"],
 				svg: "sap/uxap/designtime/ObjectPageSection.icon.svg"
 			}
 		},
+		getLabel: fnGetLabel,
 		actions : {
 			remove : {
 				changeType : "stashControl"
 			},
 			reveal : {
 				changeType : "unstashControl",
-				getLabel: function(oControl) {
-					var sTitle = oControl.getTitle();
-					var aSubSection = oControl.getSubSections();
-					// If there is only one SubSection, its title is shown in the AnchorBar,
-					// instead of the title of the Section (if it is available).
-					if (aSubSection.length === 1 && aSubSection[0].getTitle().trim() !== "") {
-						sTitle = aSubSection[0].getTitle();
-					}
-					return sTitle || oControl.getId();
-				}
+				getLabel: fnGetLabel
 			},
 			rename: function () {
 				return {
 					changeType: "rename",
 					domRef: ".sapUxAPObjectPageSectionTitle",
 					isEnabled: function (oElement) {
-						return oElement.getShowTitle();
+						return oElement._getInternalTitleVisible();
 					},
 					validators: [
 						"noEmptyText"

package/src/sap/uxap/flexibility/ObjectPageSection.flexibility.js

@@ -5,8 +5,12 @@
  */
 
 sap.ui.define([
-	'sap/uxap/changeHandler/RenameObjectPageSection'
-], function (RenameObjectPageSection) {
+	'sap/uxap/changeHandler/RenameObjectPageSection',
+	'sap/uxap/changeHandler/UnstashObjectPageSection'
+], function (
+	RenameObjectPageSection,
+	UnstashObjectPageSection
+) {
 	"use strict";
 
 	return {
@@ -31,7 +35,7 @@ sap.ui.define([
 			}
 		},
 		"unstashControl": {
-			"changeHandler": "default",
+			"changeHandler": UnstashObjectPageSection,
 			"layers": {
 				"USER": true
 			}

package/src/sap/uxap/library.js

@@ -12,11 +12,16 @@ sap.ui.define([
 	"sap/ui/base/DataType",
 	"sap/ui/Device",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/library", // library dependency
-	"sap/f/library", // library dependency
-	"sap/m/library", // library dependency
-	"sap/ui/layout/library" // library dependency
-], function(Core, DataType, Device, jQuery) {
+	"sap/ui/base/Object",
+	// library dependency
+	"sap/ui/core/library",
+	// library dependency
+	"sap/f/library",
+	// library dependency
+	"sap/m/library",
+	// library dependency
+	"sap/ui/layout/library"
+], function(Core, DataType, Device, jQuery, BaseObject) {
 	"use strict";
 
 	/**
@@ -25,7 +30,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.uxap
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @since 1.36
 	 * @public
 	 */
@@ -68,7 +73,7 @@ sap.ui.define([
 			"sap.uxap.ObjectPageHeaderLayoutData",
 			"sap.uxap.ObjectPageLazyLoader"
 		],
-		version: "1.113.0",
+		version: "1.115.0",
 		extensions: {
 			flChangeHandlers: {
 				"sap.uxap.ObjectPageHeader": "sap/uxap/flexibility/ObjectPageHeader",
@@ -299,7 +304,7 @@ sap.ui.define([
 		 */
 		getClosestOPL: function (oControl) {
 
-			while (oControl && !(oControl instanceof sap.uxap.ObjectPageLayout)) {
+			while (oControl && !(BaseObject.isA(oControl, "sap.uxap.ObjectPageLayout"))) {
 				oControl = oControl.getParent();
 			}
 

package/src/sap/uxap/rules/ObjectPageLayout.support.js

@@ -6,8 +6,8 @@
 /**
  * Defines support rules of the ObjectPageHeader control of sap.uxap library.
  */
-sap.ui.define(["sap/ui/support/library"],
-	function (SupportLib) {
+sap.ui.define(["sap/ui/support/library", "sap/ui/base/Object"],
+	function (SupportLib, BaseObject) {
 		"use strict";
 
 		// shortcuts
@@ -44,7 +44,7 @@ sap.ui.define(["sap/ui/support/library"],
 
 						var parent = oControl.getParent();
 						while (parent) {
-							if (parent instanceof sap.ui.core.Component) {
+							if (BaseObject.isA(parent, "sap.ui.core.Component")) {
 								return parent;
 							} else {
 								parent = parent.getParent();

package/src/sap/uxap/themes/base/ObjectPageSubSection.less

@@ -8,9 +8,9 @@
 	box-sizing: border-box;
 }
 
-.sapUxAPObjectPageSubSection .sapUxAPBlockContainer > .sapUiRespGrid:empty,
+.sapUxAPObjectPageSubSection.sapUxAPObjectPageSubSectionStashed .sapUxAPBlockContainer > .sapUiRespGrid:empty,
 /* Blockbase is used */
-.sapUxAPObjectPageSubSection .sapUxAPBlockContainer > .sapUiRespGrid > div > div:empty {
+.sapUxAPObjectPageSubSection.sapUxAPObjectPageSubSectionStashed .sapUxAPBlockContainer > .sapUiRespGrid > div > div:empty {
 	height: 20vh;
 }
 
@@ -177,9 +177,11 @@ Doing so will result in less generated CSS, as well as less future maintanance i
 	}
 }
 
-.sapUxAPObjectPageSubSectionFitContainer {
-	overflow-y: hidden; // hide content that does not fit the available height to avoid overlap with the next section content
+.sapUxAPObjectPageSubSectionFitContainer .sapUxAPBlockContainer .sapUxAPBlockBase {
+	overflow-y: hidden;
+}
 
+.sapUxAPObjectPageSubSectionFitContainer {
 	.sapUxAPBlockContainer,
 	.sapUxAPBlockContainer > .sapUiRespGrid,
 	.sapUxAPBlockContainer > .sapUiRespGrid > *,