@openui5/sap.uxap 1.92.0 → 1.95.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.12
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -376,7 +370,7 @@ License: Unicode-DFS-2015
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
 
-Component: Adaptive Cards, version: 1.2.3
+Component: Adaptive Cards, version: 2.9.0
 Copyright: 2017 Microsoft
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.uxap",
-  "version": "1.92.0",
+  "version": "1.95.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.92.0",
-    "@openui5/sap.m": "1.92.0",
-    "@openui5/sap.ui.core": "1.92.0",
-    "@openui5/sap.ui.layout": "1.92.0"
+    "@openui5/sap.f": "1.95.0",
+    "@openui5/sap.m": "1.95.0",
+    "@openui5/sap.ui.core": "1.95.0",
+    "@openui5/sap.ui.layout": "1.95.0"
   }
 }

package/src/sap/uxap/.library

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

package/src/sap/uxap/AnchorBar.js

@@ -624,7 +624,7 @@ sap.ui.define([
 
 					if (this._iCurrentScrollTimeout) {
 						clearTimeout(this._iCurrentScrollTimeout);
-						jQuery(document.getElementById(this.getId() + "-scroll")).parent().stop(true, false);
+						this.$("scroll").parent().stop(true, false);
 					}
 
 					this._iCurrentScrollTimeout = setTimeout(function () {

package/src/sap/uxap/BlockBase.js

@@ -829,7 +829,7 @@ sap.ui.define([
 		 * Determines whether the <code>sap.uxap.BlockBase</code> should be loaded lazily.
 		 * There are 3 prerequisites - lazy loading sould be enabled, the block should not be connected
 		 * and the block is used whithin <code>sap.uxap.ObjectPageSubSection</code>
-		 * @returns {Boolean}
+		 * @returns {boolean}
 		 * @private
 		 */
 		BlockBase.prototype._shouldLazyLoad = function () {

package/src/sap/uxap/BlockBaseMetadata.js

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

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.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/uxap/ObjectPageDynamicHeaderContent.js

@@ -41,7 +41,7 @@ sap.ui.define([
 		 * @implements sap.uxap.IHeaderContent
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.95.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.92.0
+		 * @version 1.95.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/uxap/ObjectPageLayout.js

@@ -289,6 +289,29 @@ sap.ui.define([
 				 */
 				headerContentPinnable: {type: "boolean", group: "Behavior", defaultValue: true},
 
+				/**
+				 * Determines whether the <code>sap.uxap.ObjectPageDynamicHeaderContent</code> is pinned.
+				 *
+				 * The property can be changed explicitly with its setter or in the occurrence of
+				 * the following user interactions:
+				 * <ul>
+				 * <li>Toggling the pin/unpin button of <code>sap.uxap.ObjectPageDynamicHeaderContent</code></li>
+				 * <li>Snapping the <code>sap.uxap.ObjectPageDynamicHeaderContent</code> by explicitly clicking on
+				 * the <code>sap.uxap.ObjectPageDynamicHeaderTitle</code></li>
+				 * </ul>
+				 *
+				 * <b>Note: </b> The property will only apply if the following rules are currently in use:
+				 * <ul>
+				 * <li>An instance of <code>sap.uxap.ObjectPageDynamicHeaderTitle</code> is used for the <code>headerTitle</code> aggregation.</li>
+				 * <li>The <code>headerContentPinnable</code> property is <code>true</code></li>
+				 * <li>The <code>sap.uxap.ObjectPageDynamicHeaderContent</code> is expanded</li>
+				 * <li>The <code>preserveHeaderStateOnScroll</code> property or the rules for it to work are <code>false</code></li>
+				 * </ul>
+				 *
+				 * @since 1.93
+				 */
+				 headerContentPinned: {type: "boolean", group: "Behavior", defaultValue: false},
+
 				/**
 				 * Determines whether the user can switch between the expanded/collapsed states of the
 				 * <code>sap.uxap.ObjectPageDynamicHeaderContent</code> by clicking on the <code>sap.uxap.ObjectPageDynamicHeaderTitle</code>.
@@ -396,6 +419,21 @@ sap.ui.define([
 			},
 			events: {
 
+				/**
+				 * The event is fired when the <code>headerContentPinned</code> property is changed via user interaction.
+				 *
+				 * @since 1.93
+				 */
+				 headerContentPinnedStateChange: {
+					parameters: {
+
+						/**
+						 * False or True values indicate the new pinned property value.
+						 */
+						pinned: {type: "boolean"}
+					}
+				},
+
 				/**
 				 * The event is fired when the Anchor bar is switched from moving to fixed or the other way round.
 				 */
@@ -796,16 +834,16 @@ sap.ui.define([
 	 *
 	 * (2) If the <code>bAppendHeaderToContent</code> is <code>false</code>, then the
 	 * snapping is done by ensuring the header content is not visible using <code>display:none</code>
-	 *
+	 * @param {boolean} bUserInteraction - indicates if snapping was caused by user interaction (scroll, collapse button press, etc.)
 	 * @private
 	 */
-	ObjectPageLayout.prototype._snapHeader = function (bAppendHeaderToContent) {
+	ObjectPageLayout.prototype._snapHeader = function (bAppendHeaderToContent, bUserInteraction) {
 
 		var bIsPageTop,
 			oHeaderContent = this._getHeaderContent();
 
 		if (oHeaderContent && oHeaderContent.supportsPinUnpin() && this._bPinned) {
-			this._unPin();
+			this._unPin(bUserInteraction);
 			oHeaderContent.getAggregation("_pinButton").setPressed(false);
 			bAppendHeaderToContent = true;
 		}
@@ -895,7 +933,7 @@ sap.ui.define([
 			bAppendHeaderToContent = !this._shouldPreserveHeaderInTitleArea() &&
 			(!this._bAllContentFitsContainer || this._headerBiggerThanAllowedToBeExpandedInTitleArea());
 			// the <code>bAppendHeaderToContent</code> parameter determines if the header should snap *with* or *without* scroll
-			this._snapHeader(bAppendHeaderToContent);
+			this._snapHeader(bAppendHeaderToContent, true);
 		}
 
 		this.getHeaderTitle()._getFocusSpan().trigger("focus");
@@ -1136,6 +1174,7 @@ sap.ui.define([
 
 		if (oHeaderContent && oHeaderContent.supportsPinUnpin()) {
 			this.$().toggleClass("sapUxAPObjectPageLayoutHeaderPinnable", oHeaderContent.getPinnable());
+			this._updatePinButtonState();
 		}
 
 		if (oFooter) {
@@ -1193,7 +1232,7 @@ sap.ui.define([
 
 		this._setSectionsFocusValues();
 
-		if (this._preserveHeaderStateOnScroll()) {
+		if (this.getPreserveHeaderStateOnScroll()) {
 			this._overridePreserveHeaderStateOnScroll();
 		}
 
@@ -1225,7 +1264,7 @@ sap.ui.define([
 	 * (to avoid a problem with scrollbar appearing for a small instance
 	 * while we snap/unsnap header)
 	 * @private
-	 * @param {Boolean} bEnable used to supress scrolling
+	 * @param {boolean} bEnable used to supress scrolling
 	 */
 	ObjectPageLayout.prototype._toggleScrolling = function (bEnable) {
 		if (this._$opWrapper.length) {
@@ -1526,17 +1565,17 @@ sap.ui.define([
 	};
 
 	ObjectPageLayout.prototype._cacheDomElements = function () {
-		this._$footerWrapper = jQuery(document.getElementById(this.getId() + "-footerWrapper"));
-		this._$titleArea = jQuery(document.getElementById(this.getId() + "-headerTitle"));
-		this._$anchorBar = jQuery(document.getElementById(this.getId() + "-anchorBar"));
-		this._$stickyAnchorBar = jQuery(document.getElementById(this.getId() + "-stickyAnchorBar"));
-		this._$opWrapper = jQuery(document.getElementById(this.getId() + "-opwrapper"));
-		this._$spacer = jQuery(document.getElementById(this.getId() + "-spacer"));
-		this._$headerContent = jQuery(document.getElementById(this.getId() + "-headerContent"));
-		this._$stickyHeaderContent = jQuery(document.getElementById(this.getId() + "-stickyHeaderContent"));
-		this._$contentContainer = jQuery(document.getElementById(this.getId() + "-scroll"));
-		this._$sectionsContainer = jQuery(document.getElementById(this.getId() + "-sectionsContainer"));
-		this._$skipFastGroupAnchor = jQuery(document.getElementById(this.getId() + "-skipFastGroupAnchor"));
+		this._$footerWrapper = this.$("footerWrapper");
+		this._$titleArea = this.$("headerTitle");
+		this._$anchorBar = this.$("anchorBar");
+		this._$stickyAnchorBar = this.$("stickyAnchorBar");
+		this._$opWrapper = this.$("opwrapper");
+		this._$spacer = this.$("spacer");
+		this._$headerContent = this.$("headerContent");
+		this._$stickyHeaderContent = this.$("stickyHeaderContent");
+		this._$contentContainer = this.$("scroll");
+		this._$sectionsContainer = this.$("sectionsContainer");
+		this._$skipFastGroupAnchor = this.$("skipFastGroupAnchor");
 
 		// BCP 1870201875: explicitly set the latest scrollContainer dom ref
 		// (as the scroller obtains the latest scrollContainer dom ref in a LATER hook, which fails in conditions detailed in BCP 1870201875)
@@ -1919,7 +1958,7 @@ sap.ui.define([
 	/**
 	 * Schedules for execution a layout adjustment task.
 	 * This task is throttled by default (unless the bImmediate parameter is specified).
-	 * @param {Boolean} bImmediate - whether the task should be executed immediately, rather than throttled
+	 * @param {boolean} bImmediate - whether the task should be executed immediately, rather than throttled
 	 * @returns {Promise} - promise that will be resolved upon the task execution
 	 * @since 1.44
 	 * @private
@@ -2058,7 +2097,6 @@ sap.ui.define([
 		this._oSectionInfo[oSectionBase.getId()] = {
 			$dom: [],
 			positionTop: 0,
-			positionTopMobile: 0,
 			buttonId: "",
 			isSection: (oSectionBase instanceof ObjectPageSection),
 			sectionReference: oSectionBase
@@ -2263,9 +2301,7 @@ sap.ui.define([
 
 	ObjectPageLayout.prototype._computeScrollPosition = function (oTargetSection) {
 
-		var bFirstLevel = oTargetSection && (oTargetSection instanceof ObjectPageSection),
-			sId = oTargetSection.getId(),
-			iScrollTo = this._bMobileScenario || bFirstLevel ? this._oSectionInfo[sId].positionTopMobile : this._oSectionInfo[sId].positionTop,
+		var iScrollTo = this._oSectionInfo[oTargetSection.getId()].positionTop,
 			bExpandedMode = !this._bStickyAnchorBar;
 
 		if (bExpandedMode && this._isFirstVisibleSectionBase(oTargetSection)) { // preserve expanded header if no need to stick
@@ -2467,7 +2503,7 @@ sap.ui.define([
 			sPreviousSubSectionId,
 			sPreviousSectionId,
 			bAllowScrollSectionToTop,
-			bStickyTitleMode = !this._bHeaderExpanded,
+			bStickyTitleMode = this._bHeaderInTitleArea || !this._bHeaderExpanded,
 			bIsFirstVisibleSubSection,
 			bParentIsFirstVisibleSection,
 			bIsFullscreenSection,
@@ -2488,12 +2524,13 @@ sap.ui.define([
 
 		this.iFooterHeight = this._getFooterHeight();
 
-		var iSubSectionIndex = -1;
+		var iSubSectionIndex = -1,
+			iSectionsContainerOffsetTop = this._$sectionsContainer.position().top;
 
 		this._aSectionBases.forEach(function (oSectionBase) {
 			var oInfo = this._oSectionInfo[oSectionBase.getId()],
 				$this = oSectionBase.$(),
-				$mobileAnchor,
+				oSection,
 				bPromoted = false;
 
 			if (!oInfo /* sectionBase is visible */ || !$this.length) {
@@ -2513,29 +2550,18 @@ sap.ui.define([
 			//the amount of scrolling required is the distance between their position().top and the bottom of the anchorBar
 			oInfo.positionTop = Math.ceil(realTop);
 
-			//the amount of scrolling required for the mobile scenario
-			//we want to navigate just below its title
-			//as of UX specs Oct 7, 2014
-			if (oInfo.isSection) {
-				$mobileAnchor = oSectionBase.$("header");
-			} else {
-				$mobileAnchor = oSectionBase.$("headerTitle");
-			}
-
-			bPromoted = $mobileAnchor.length === 0;
-
-			//calculate the mobile position
-			if (!bPromoted) {
-				oInfo.positionTopMobile =
-					Math.ceil(library.Utilities.getChildPosition($mobileAnchor, this._$contentContainer).top)
-					+ $mobileAnchor.outerHeight();
-			} else {
-				//title wasn't found (=first section, hidden title, promoted subsection), scroll to the same position as desktop
-				oInfo.positionTopMobile = oInfo.positionTop;
+			if (!oInfo.isSection && (oSection = oSectionBase.getParent())) {
+				// a promoted subSection borrows the title of its parent section
+				bPromoted = oSectionBase._getTitleDomId() === oSection.getId() + "-title";
+				if (bPromoted) {
+					// the scrollTop required to scroll to a promoted subsection
+					// is the top of the parent section (UX rule)
+					var parentRealTop = oSection.$().position().top;
+					oInfo.positionTop = Math.ceil(parentRealTop);
+				}
 			}
 
 			if (!this._bStickyAnchorBar && !this._bHeaderInTitleArea) { // in sticky mode the anchor bar is not part of the content
-				oInfo.positionTopMobile -= this.iAnchorBarHeight;
 				oInfo.positionTop -= this.iAnchorBarHeight;
 			}
 
@@ -2583,7 +2609,7 @@ sap.ui.define([
 				bIsFirstVisibleSubSection = bParentIsFirstVisibleSection && (iSubSectionIndex === 0); /* index of *visible* subSections is first */
 				bIsFullscreenSection = oSectionBase.hasStyleClass(ObjectPageSubSection.FIT_CONTAINER_CLASS);
 
-				oSectionBase._setHeight(this._computeSubSectionHeight(bIsFirstVisibleSubSection, bIsFullscreenSection, oInfo.positionTop));
+				oSectionBase._setHeight(this._computeSubSectionHeight(bIsFirstVisibleSubSection, bIsFullscreenSection, Math.ceil(realTop), iSectionsContainerOffsetTop));
 			}
 
 		}, this);
@@ -2643,7 +2669,7 @@ sap.ui.define([
 		return true; // return success flag
 	};
 
-	ObjectPageLayout.prototype._computeSubSectionHeight = function(bFirstVisibleSubSection, bFullscreenSection, iSubSectionOffsetTop) {
+	ObjectPageLayout.prototype._computeSubSectionHeight = function(bFirstVisibleSubSection, bFullscreenSection, iSubSectionOffsetTop, iSectionsContainerOffsetTop) {
 
 		var iSectionsContainerHeight,
 			iRemainingSectionContentHeight;
@@ -2656,22 +2682,20 @@ sap.ui.define([
 		// depends on the position of the section in the sections list
 		// 1) first visible is initially displayed in container with *expanded* header
 		// => obtain container height when *expanded* header
-		// 2) non-first visible is displayed in container with *snapped* header
+		// 2) non-first visible is always displayed in container with *snapped* header
 		// (because by the time we scroll to show the section, the header is already snapped)
 		// => obtain container height when *snapped* header
 		var bIsHeaderExpanded = (this._bAllContentFitsContainer) ? this._bHeaderExpanded : bFirstVisibleSubSection;
 
 
 		// size the section to have the full height of its container
-		iSectionsContainerHeight = this._getSectionsContainerHeight(!bIsHeaderExpanded);
+		iSectionsContainerHeight = this._getSectionsContainerHeight(bIsHeaderExpanded);
 
 
 		if (this._bAllContentFitsContainer) {
-			// if we have a single fullscreen subsection [that takes the entire height of the sections container]
-			// => then the only *other* content in the sections container [besides the subSection]
-			// is the title of its parent section and the footer space
-			// => subtract the above heights from the subSection height to *avoid having a scrollbar*
-			iRemainingSectionContentHeight = (iSubSectionOffsetTop - this.iHeaderContentHeight /*- this.iAnchorBarHeight*/) + this.iFooterHeight;
+			// 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*
+			iRemainingSectionContentHeight = (iSubSectionOffsetTop - iSectionsContainerOffsetTop) + this.iFooterHeight;
 			iSectionsContainerHeight -= iRemainingSectionContentHeight;
 		}
 
@@ -2743,10 +2767,11 @@ sap.ui.define([
 		return this.getDomRef().getBoundingClientRect().height - this._getStickyAreaHeight(bIsStickyMode);
 	};
 
-	ObjectPageLayout.prototype._getSectionsContainerHeight = function(bIsStickyMode) {
+	ObjectPageLayout.prototype._getSectionsContainerHeight = function(bIsHeaderExpanded) {
 
-		var iScrollContainerHeight = this._getScrollableViewportHeight(bIsStickyMode);
-		if (!bIsStickyMode) {
+		var bIsStickyMode = !bIsHeaderExpanded,
+			iScrollContainerHeight = this._getScrollableViewportHeight(bIsStickyMode);
+		if (!bIsStickyMode && !this._bHeaderInTitleArea) {
 			// for expanded mode, subtract the heights of headerContent and anchorBar
 			// as they are also part of the scrollable content when *expanded* header,
 			// but we need the height of the *sections area bellow* them
@@ -2756,13 +2781,14 @@ sap.ui.define([
 	};
 
 	ObjectPageLayout.prototype._getSectionPositionTop = function(oSectionBase, bShouldStick) {
-		var iPosition = Math.ceil(library.Utilities.getChildPosition(oSectionBase.$(), this._$contentContainer).top);
+		var iCachedPosition = this._oSectionInfo[oSectionBase.getId()].positionTop;
 
-		if (!this._bStickyAnchorBar && !this._bHeaderInTitleArea && bShouldStick) { // in sticky mode the anchor bar is not part of the content
-			iPosition -= this.iAnchorBarHeight;
+		// in expanded mode the anchorBar is still part of the content
+		if (!this._bStickyAnchorBar && !this._bHeaderInTitleArea) {
+			iCachedPosition += this.iAnchorBarHeight;
 		}
 
-		return iPosition;
+		return iCachedPosition;
 	};
 
 	ObjectPageLayout.prototype._getSectionPositionBottom = function(oSectionBase, bShouldStick) {
@@ -2798,8 +2824,8 @@ sap.ui.define([
 
 	/**
 	 * Determines if the <code>ObjectPageLayout</code> should set <code>ObjectPageSectionBase</code> internal <code>titleLevel</code>.
-	 * @param {Object} oSectionBase <code>ObjectPageSectionBase</code> instance
-	 * @returns {Boolean}
+	 * @param {sap.uxap.ObjectPageSectionBase} oSectionBase <code>ObjectPageSectionBase</code> instance
+	 * @returns {boolean}
 	 * @since 1.44
 	 * @private
 	 */
@@ -2839,11 +2865,6 @@ sap.ui.define([
 				//therefore we need to create enough space below the last subsection to get it displayed on top = the spacer
 				//the "top" is just below the sticky header + anchorBar, therefore we just need enough space to get the last subsection below these elements
 				iSpacerHeight = iScrollableViewportHeight - iLastVisibleHeight;
-
-				//take into account that we may need to scroll down to the positionMobile, thus we need to make sure we have enough space at the bottom
-				if (this._bMobileScenario) {
-					iSpacerHeight += (this._oSectionInfo[oLastVisibleSubSection.getId()].positionTopMobile - this._oSectionInfo[oLastVisibleSubSection.getId()].positionTop);
-				}
 			} else {
 				iSpacerHeight = 0;
 			}
@@ -2987,7 +3008,7 @@ sap.ui.define([
 			return;
 		}
 
-		if (this._preserveHeaderStateOnScroll()) {
+		if (this.getPreserveHeaderStateOnScroll()) {
 			this._overridePreserveHeaderStateOnScroll();
 		}
 
@@ -3272,12 +3293,12 @@ sap.ui.define([
 			if (iScrollTop === 0) {
 				// if we have arrow from the title inside the ContentHeader and the ContentHeader isn't scrolled we have to put higher z-index to the ContentHeader
 				// otherwise part of the arrow is cut off
-				jQuery(document.getElementById(this.getId() + "-scroll")).css("z-index", "1000");
+				this.$("scroll").css("z-index", "1000");
 				bScrolled = false;
 			} else if (!bScrolled) {
 				bScrolled = true;
 				// and we have to "reset" the z-index it when we start scrolling
-				jQuery(document.getElementById(this.getId() + "-scroll")).css("z-index", "0");
+				this.$("scroll").css("z-index", "0");
 			}
 		}
 	};
@@ -4339,10 +4360,6 @@ sap.ui.define([
 				&& this.getAlwaysShowContentHeader();
 	};
 
-	ObjectPageLayout.prototype._shouldOverridePreserveHeaderStateOnScroll = function () {
-		return !Device.system.desktop && this._headerBiggerThanAllowedToBeFixed();
-	};
-
 	ObjectPageLayout.prototype._headerBiggerThanAllowedToBeFixed = function () {
 		var iControlHeight = this._getOwnHeight();
 
@@ -4380,9 +4397,9 @@ sap.ui.define([
 
 	ObjectPageLayout.prototype._onPinUnpinButtonPress = function () {
 		if (this._bPinned) {
-			this._unPin();
+			this._unPin(true);
 		} else {
-			this._pin();
+			this._pin(true);
 			this._restorePinButtonFocus();
 		}
 	};
@@ -4399,14 +4416,16 @@ sap.ui.define([
 		}
 	};
 
-	ObjectPageLayout.prototype._pin = function () {
-		var $oObjectPage = this.$();
-
+	ObjectPageLayout.prototype._pin = function (bUserInteraction) {
 		if (this._bPinned) {
 			return;
 		}
 
 		this._bPinned = true;
+		if (bUserInteraction) {
+			this.setProperty("headerContentPinned", true, true);
+			this.fireEvent("headerContentPinnedStateChange", {pinned: true});
+		}
 		this._toggleHeaderTitle(true /* expand */);
 		this._moveAnchorBarToTitleArea();
 		this._moveHeaderToTitleArea();
@@ -4414,23 +4433,38 @@ sap.ui.define([
 		this._requestAdjustLayout();
 		this._updateToggleHeaderVisualIndicators();
 
-		if (exists($oObjectPage)) {
-			$oObjectPage.addClass("sapUxAPObjectPageLayoutHeaderPinned");
-		}
+		this.addStyleClass("sapUxAPObjectPageLayoutHeaderPinned");
 	};
 
-	ObjectPageLayout.prototype._unPin = function () {
-		var $oObjectPage = this.$();
-
+	ObjectPageLayout.prototype._unPin = function (bUserInteraction) {
 		if (!this._bPinned) {
 			return;
 		}
 
 		this._bPinned = false;
+		if (bUserInteraction) {
+			this.setProperty("headerContentPinned", false, true);
+			this.fireEvent("headerContentPinnedStateChange", {pinned: false});
+		}
 		this._updateToggleHeaderVisualIndicators();
 
-		if (exists($oObjectPage)) {
-			$oObjectPage.removeClass("sapUxAPObjectPageLayoutHeaderPinned");
+		this.removeStyleClass("sapUxAPObjectPageLayoutHeaderPinned");
+	};
+
+	ObjectPageLayout.prototype._isHeaderPinnable = function () {
+		var oHeader = this._getHeaderContent();
+		return oHeader && oHeader.getPinnable()
+			&& this._bHeaderExpanded
+			&& !this.getPreserveHeaderStateOnScroll();
+	};
+
+	ObjectPageLayout.prototype._updatePinButtonState = function() {
+		var bShouldPin = this.getHeaderContentPinned() && this._isHeaderPinnable();
+		this._getHeaderContent()._togglePinButton(bShouldPin);
+		if (bShouldPin) {
+			this._pin();
+		} else {
+			this._unPin();
 		}
 	};
 
@@ -4451,13 +4485,15 @@ sap.ui.define([
 	 * @private
 	 */
 	ObjectPageLayout.prototype._overridePreserveHeaderStateOnScroll = function () {
-		if (!this._shouldOverridePreserveHeaderStateOnScroll()) {
-			this._bHeaderBiggerThanAllowedHeight = false;
+		var bOldValue = this._bHeaderBiggerThanAllowedHeight, bChange;
+
+		this._bHeaderBiggerThanAllowedHeight = this._headerBiggerThanAllowedToBeFixed();
+		bChange = bOldValue !== this._bHeaderBiggerThanAllowedHeight;
+
+		if (!this._bHeaderBiggerThanAllowedHeight || !bChange) {
 			return;
 		}
 
-		this._bHeaderBiggerThanAllowedHeight = true;
-
 		//move the header to content
 		if (this._bHeaderExpanded) {
 			this._moveAnchorBarToContentArea();
@@ -4883,4 +4919,4 @@ sap.ui.define([
 	}
 
 	return ObjectPageLayout;
-});
+});

package/src/sap/uxap/ObjectPageLayoutABHelper.js

@@ -16,8 +16,9 @@ sap.ui.define([
 	"sap/m/MenuButton",
 	"sap/m/Menu",
 	"sap/m/MenuItem",
-	"sap/ui/core/IconPool"
-], function (jQuery, BaseObject, Core, CustomData, Configuration, ManagedObjectObserver, AnchorBar, Button, MenuButton, Menu, MenuItem, IconPool) {
+	"sap/ui/core/IconPool",
+	"sap/ui/core/InvisibleText"
+], function (jQuery, BaseObject, Core, CustomData, Configuration, ManagedObjectObserver, AnchorBar, Button, MenuButton, Menu, MenuItem, IconPool, InvisibleText) {
 	"use strict";
 
 	var ABHelper = BaseObject.extend("sap.uxap._helpers.AB", {
@@ -145,7 +146,8 @@ sap.ui.define([
 			sButtonTitle,
 			sButtonIcon,
 			oMenuItem,
-			oCustomButton;
+			oCustomButton,
+			sSplitButtonDescInvsibleTextId = InvisibleText.getStaticId("sap.m", "SPLIT_BUTTON_DESCRIPTION");
 
 		//tablet & desktop mechanism
 		if (oAnchorBar && this.getObjectPageLayout().getShowAnchorBar()) {
@@ -180,6 +182,13 @@ sap.ui.define([
 								mAriaProps.role = "option";
 								mAriaProps.setsize = oContent.length;
 								mAriaProps.posinset = iIndex + 1;
+
+								mAriaProps.labelledby = mAriaProps.labelledby
+									.split(" ")
+									.filter(function (sId) {
+										return sId !== sSplitButtonDescInvsibleTextId;
+									})
+									.join(" ");
 							}
 						};
 

package/src/sap/uxap/ObjectPageLazyLoader.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/uxap/ObjectPageSection.js

@@ -147,7 +147,7 @@ sap.ui.define([
 	ObjectPageSection.prototype._updateImportance = function (oCurrentMedia) {
 		var oObjectPage = this._getObjectPageLayout(),
 			sImportanceLevelToHide = this._getImportanceLevelToHide(oCurrentMedia),
-			oHeaderDOM = this.bOutput && document.getElementById(this.getId() + "-header");
+			oHeaderDOM = this.bOutput && this.getDomRef("header");
 
 		this.getSubSections().forEach(function (oSubSection) {
 			oSubSection._applyImportanceRules(sImportanceLevelToHide);
@@ -201,7 +201,7 @@ sap.ui.define([
 	/**
 	 * Determines if the <code>ObjectPageSection</code> title is visible.
 	 * @private
-	 * @returns {Boolean}
+	 * @returns {boolean}
 	 */
 	ObjectPageSection.prototype._isTitleVisible = function () {
 		return (this.getShowTitle() && this._getInternalTitleVisible())

package/src/sap/uxap/ObjectPageSectionBase.js

@@ -437,7 +437,7 @@ sap.ui.define([
 	 * for the current screen size.
 	 *
 	 * @private
-	 * @returns {Boolean}
+	 * @returns {boolean}
 	 */
 	ObjectPageSectionBase.prototype._getIsHidden = function () {
 		return this._isHidden;

package/src/sap/uxap/ObjectPageSubSection.js

@@ -361,7 +361,6 @@ sap.ui.define([
 			return;
 		}
 
-		this._getGrid().removeAllContent();
 		this._applyLayout(oObjectPageLayout);
 	};
 
@@ -513,7 +512,7 @@ sap.ui.define([
 			return;
 		}
 
-		this._$spacer = jQuery(document.getElementById(oObjectPageLayout.getId() + "-spacer"));
+		this._$spacer = oObjectPageLayout.$("spacer");
 
 		if (this._bShouldFocusSeeMoreLessButton) {
 			this._bShouldFocusSeeMoreLessButton = false;
@@ -541,6 +540,7 @@ sap.ui.define([
 	ObjectPageSubSection.prototype._applyLayout = function (oLayoutProvider) {
 		var aVisibleBlocks,
 			oGrid = this._getGrid(),
+			oGridContent = oGrid.getAggregation("content"),
 			sCurrentMode = this.getMode(),
 			sLayout = oLayoutProvider.getSubSectionLayout(),
 			oLayoutConfig = this._calculateLayoutConfiguration(sLayout, oLayoutProvider),
@@ -562,7 +562,11 @@ sap.ui.define([
 		try {
 			aVisibleBlocks.forEach(function (oBlock) {
 				this._setBlockMode(oBlock, sCurrentMode);
-				oGrid.addAggregation("content", oBlock, true); // this is always called onBeforeRendering so suppress invalidate
+
+				// Add Block to Grid content only if it's not already added
+				if (!oGridContent || (oGridContent && oGridContent.indexOf(oBlock) < 0)) {
+				    oGrid.addAggregation("content", oBlock, true); // this is always called onBeforeRendering so suppress invalidate
+				}
 			}, this);
 		} catch (sError) {
 			Log.error("ObjectPageSubSection :: error while building layout " + sLayout + ": " + sError);

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.uxap.changeHandler.AddIFrameObjectPageLayout
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @since 1.75
 	 * @experimental Since 1.75
 	 */
@@ -38,6 +38,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} oControl - Control that matches the change selector for applying the change
 	 * @param {object} mPropertyBag - Map of properties
 	 * @param {object} mPropertyBag.modifier - Modifier for the controls
+	 * @returns {Promise} Promise resolving when the change is successfully applied
 	 * @ui5-restricted sap.uxap
 	 */
 	AddIFrameObjectPageLayout.applyChange = function(oChange, oControl, mPropertyBag) {
@@ -45,7 +46,8 @@ sap.ui.define([
 		var oChangeDefinition = oChange.getDefinition();
 		var sAggregationName = oChangeDefinition.content.targetAggregation;
 		if (sAggregationName !== "sections") {
-			return BaseAddIFrame.applyChange(oChange, oControl, mPropertyBag);
+			return Promise.resolve()
+				.then(BaseAddIFrame.applyChange.bind(BaseAddIFrame, oChange, oControl, mPropertyBag));
 		}
 		// Create a section, sub section and insert the IFrame
 		var oView = mPropertyBag.view;
@@ -53,26 +55,40 @@ sap.ui.define([
 		var oBaseSelector = oChangeDefinition.content.selector;
 		var sDefaultTitle = sap.ui.getCore().getLibraryResourceBundle("sap.uxap").getText("SECTION_TITLE_FOR_IFRAME");
 
-		var oOPSection = oModifier.createControl("sap.uxap.ObjectPageSection", oComponent, oView, oBaseSelector, {
-			title: sDefaultTitle
-		}, false);
-
-		var oOPSubSectionSelector = Object.create(oBaseSelector);
-		oOPSubSectionSelector.id += "-subSection";
-		var oOPSubSection = oModifier.createControl("sap.uxap.ObjectPageSubSection", oComponent, oView, oOPSubSectionSelector, {
-			title: sDefaultTitle
-		}, false);
-		oModifier.insertAggregation(oOPSection, "subSections", oOPSubSection, 0, oView);
-
-		var oIFrameSelector = Object.create(oBaseSelector);
-		oIFrameSelector.id += "-iframe";
-		var oIFrame = createIFrame(oChange, mPropertyBag, oIFrameSelector);
-		oModifier.insertAggregation(oOPSubSection, "blocks", oIFrame, 0, oView);
-
-		var iIndex = getTargetAggregationIndex(oChange, oControl, mPropertyBag);
-		oModifier.insertAggregation(oControl, "sections", oOPSection, iIndex, oView);
-
-		oChange.setRevertData([oModifier.getId(oOPSection)]);
+		var oOPSection;
+		var oOPSubSection;
+		return Promise.resolve()
+			.then(oModifier.createControl.bind(oModifier, "sap.uxap.ObjectPageSection", oComponent, oView, oBaseSelector, {
+					title: sDefaultTitle
+				}, false)
+			)
+			.then(function(oOPSectionLocal) {
+				oOPSection = oOPSectionLocal;
+				var oOPSubSectionSelector = Object.create(oBaseSelector);
+				oOPSubSectionSelector.id += "-subSection";
+				return oModifier.createControl("sap.uxap.ObjectPageSubSection", oComponent, oView, oOPSubSectionSelector, {
+					title: sDefaultTitle
+				}, false);
+			})
+			.then(function(oOPSubSectionLocal) {
+				oOPSubSection = oOPSubSectionLocal;
+				return oModifier.insertAggregation(oOPSection, "subSections", oOPSubSection, 0, oView);
+			})
+			.then(function () {
+				var oIFrameSelector = Object.create(oBaseSelector);
+				oIFrameSelector.id += "-iframe";
+				return createIFrame(oChange, mPropertyBag, oIFrameSelector);
+			})
+			.then(function(oIFrame) {
+				return oModifier.insertAggregation(oOPSubSection, "blocks", oIFrame, 0, oView);
+			})
+			.then(getTargetAggregationIndex.bind(null, oChange, oControl, mPropertyBag))
+			.then(function(iIndex) {
+				return oModifier.insertAggregation(oControl, "sections", oOPSection, iIndex, oView);
+			})
+			.then(function () {
+				oChange.setRevertData([oModifier.getId(oOPSection)]);
+			});
 	};
 
 	return AddIFrameObjectPageLayout;

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

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "sap/ui/core/Core", "sap/
 	 * @constructor
 	 * @alias sap.uxap.changeHandler.MoveObjectPageSection
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @experimental Since 1.54
 	 */
 
@@ -59,14 +59,16 @@ sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "sap/ui/core/Core", "sap/
 	MoveObjectPageSection.completeChangeContent = function (oChange, mSpecificChangeInfo, mPropertyBag) {
 		var oSourceControl = Core.byId(mSpecificChangeInfo.source.id),
 			oTargetControl = Core.byId(mSpecificChangeInfo.target.id);
-
+		var oPromise = Promise.resolve();
 		if (oSourceControl.isA("sap.uxap.AnchorBar")
 			&& oTargetControl.isA("sap.uxap.AnchorBar")
 		) {
-			this._mapAnchorsToSections(mSpecificChangeInfo, mPropertyBag);
+			oPromise = oPromise.then(this._mapAnchorsToSections.bind(this, mSpecificChangeInfo, mPropertyBag));
 		}
 
-		return MoveControls.completeChangeContent.apply(this, arguments);
+		return oPromise.then(function(){
+			return MoveControls.completeChangeContent.apply(this, arguments[0]);
+		}.bind(this, arguments));
 	};
 
 	/**
@@ -78,36 +80,47 @@ sap.ui.define(["sap/ui/fl/changeHandler/MoveControls", "sap/ui/core/Core", "sap/
 	 * @private
 	 */
 	MoveObjectPageSection._mapAnchorsToSections = function (mSpecificChangeInfo, mPropertyBag) {
-		var oSection, oSectionParentInfo,
-			oModifier = mPropertyBag.modifier,
-			oLayout = oModifier.bySelector(mSpecificChangeInfo.selector, mPropertyBag.appComponent, mPropertyBag.view),
-			aAnchoredSections = oLayout._getVisibleSections(); // sections that have anchors
-
-		function getSectionForAnchor(sAnchorId) {
-			var oAnchor = Core.byId(sAnchorId),
-				sSectionId = oAnchor.data("sectionId");
-			return Core.byId(sSectionId);
-		}
-
-		mSpecificChangeInfo.movedElements.forEach(function(oElement) {
-			// adjust target index as invisible sections are not part of the anchor bar;
-			var oSectionAtTargetIndex = aAnchoredSections[oElement.targetIndex];
-			oElement.targetIndex = oModifier.findIndexInParentAggregation(oSectionAtTargetIndex);
-
-			// replace the anchorBar with the section
-			oSection = getSectionForAnchor(oElement.id);
-			if (!oSection || !oSection.getParent()) {
-				throw new Error("Cannot map anchor to section");
-			}
-			oSectionParentInfo = {
-				id: oSection.getParent().getId(),
-				aggregation: oSection.sParentAggregationName
-			};
-			oElement.id = oSection.getId();
-		});
-
-		merge(mSpecificChangeInfo.source, oSectionParentInfo);
-		merge(mSpecificChangeInfo.target, oSectionParentInfo);
+		return Promise.resolve()
+			.then(function() {
+				var oSection, oSectionParentInfo;
+				var oModifier = mPropertyBag.modifier;
+				var oLayout = oModifier.bySelector(mSpecificChangeInfo.selector, mPropertyBag.appComponent, mPropertyBag.view);
+				var aAnchoredSections = oLayout._getVisibleSections(); // sections that have anchors
+
+				function getSectionForAnchor(sAnchorId) {
+					var oAnchor = Core.byId(sAnchorId),
+						sSectionId = oAnchor.data("sectionId");
+					return Core.byId(sSectionId);
+				}
+				var aPromiseArray = [];
+				mSpecificChangeInfo.movedElements.forEach(function(oElement) {
+					// adjust target index as invisible sections are not part of the anchor bar;
+					var oSectionAtTargetIndex = aAnchoredSections[oElement.targetIndex];
+					var oPromise = Promise.resolve()
+						.then(function(){
+							return oModifier.findIndexInParentAggregation(oSectionAtTargetIndex);
+						})
+						.then(function(iTargetIndex){
+							oElement.targetIndex = iTargetIndex;
+							// replace the anchorBar with the section
+							oSection = getSectionForAnchor(oElement.id);
+							if (!oSection || !oSection.getParent()) {
+								throw new Error("Cannot map anchor to section");
+							}
+							oSectionParentInfo = {
+								id: oSection.getParent().getId(),
+								aggregation: oSection.sParentAggregationName
+							};
+							oElement.id = oSection.getId();
+						});
+					aPromiseArray.push(oPromise);
+				});
+				return Promise.all(aPromiseArray)
+					.then(function(){
+						merge(mSpecificChangeInfo.source, oSectionParentInfo);
+						merge(mSpecificChangeInfo.target, oSectionParentInfo);
+					});
+			});
 	};
 
 	return MoveObjectPageSection;

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.uxap.changeHandler.RenameObjectPageSection
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @experimental Since 1.50
 	 */
 
@@ -34,57 +34,75 @@ sap.ui.define([
 	var RenameObjectPageSection = BaseRename.createRenameChangeHandler(mRenameSettings);
 
 	RenameObjectPageSection._getControlForRename = function (oControl, oModifier) {
-		var aSubSections = oModifier.getAggregation(oControl, "subSections");
-		// due to specific logic in the Object Page Layout, the title of the Section is
-		// taken from its SubSection in case it is only one no matter if the Section has title itself.
-		if (aSubSections
-			&& aSubSections.length === 1
-			&& (oModifier.getPropertyBindingOrProperty(aSubSections[0], "title"))
-			&& oModifier.getProperty(oModifier.getParent(oControl), "subSectionLayout") === "TitleOnTop"
-		) {
-			return aSubSections[0];
-		}
-		return oControl;
+		var aSubSections;
+		return Promise.resolve()
+			.then(function() {
+				return oModifier.getAggregation(oControl, "subSections");
+			})
+			.then(function(aSubSectionsLocal) {
+				aSubSections = aSubSectionsLocal;
+				return Promise.all([oModifier.getPropertyBindingOrProperty(aSubSections[0], "title"),
+					oModifier.getProperty(oModifier.getParent(oControl), "subSectionLayout")]);
+			})
+			.then(function(aProperties) {
+				// due to specific logic in the Object Page Layout, the title of the Section is
+				// taken from its SubSection in case it is only one no matter if the Section has title itself.
+
+				if (aSubSections
+					&& aSubSections.length === 1
+					&& aProperties[0]
+					&& aProperties[1] === "TitleOnTop"
+				) {
+					return aSubSections[0];
+				}
+				return oControl;
+			});
 	};
 
 	RenameObjectPageSection.applyChange = function (oChange, oControl, mPropertyBag) {
-		var oModifier = mPropertyBag.modifier,
-			sPropertyName = mRenameSettings.propertyName,
-			oChangeDefinition = oChange.getDefinition(),
-			sText = oChangeDefinition.texts[mRenameSettings.changePropertyName],
-			sValue = sText.value,
-			oControlToBeRenamed = RenameObjectPageSection._getControlForRename(oControl, oModifier);
-
-		if (typeof sValue === "string" && sValue.trim() === "") {
-			throw new Error("Change cannot be applied as ObjectPageSubSection's title cannot be empty: ["
-				+ oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
-		}
-
-		if (oChangeDefinition.texts && sText && typeof (sValue) === "string") {
-			oChange.setRevertData(oModifier.getPropertyBindingOrProperty(oControlToBeRenamed, sPropertyName));
-			oModifier.setPropertyBindingOrProperty(oControlToBeRenamed, sPropertyName, sValue);
+		var oModifier = mPropertyBag.modifier;
+		var sPropertyName = mRenameSettings.propertyName;
+		var oChangeDefinition = oChange.getDefinition();
+		var sText = oChangeDefinition.texts[mRenameSettings.changePropertyName];
+		var sValue = sText.value;
+		return RenameObjectPageSection._getControlForRename(oControl, oModifier)
+			.then(function(oControlToBeRenamed) {
+				if (typeof sValue === "string" && sValue.trim() === "") {
+					throw new Error("Change cannot be applied as ObjectPageSubSection's title cannot be empty: ["
+						+ oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
+				}
 
-			return true;
-		} else {
-			Log.error("Change does not contain sufficient information to be applied: [" + oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
-			//however subsequent changes should be applied
-		}
+				if (oChangeDefinition.texts && sText && typeof (sValue) === "string") {
+					return Promise.resolve()
+						.then(function(){
+							return oModifier.getPropertyBindingOrProperty(oControlToBeRenamed, sPropertyName);
+						})
+						.then(function(oBindingOrProperty) {
+							oChange.setRevertData(oBindingOrProperty);
+							oModifier.setPropertyBindingOrProperty(oControlToBeRenamed, sPropertyName, sValue);
+							return true;
+						});
+				} else {
+					Log.error("Change does not contain sufficient information to be applied: [" + oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
+					//however subsequent changes should be applied
+				}
+			});
 	};
 
 	RenameObjectPageSection.revertChange = function (oChange, oControl, mPropertyBag) {
 		var vOldText = oChange.getRevertData(),
 			oModifier = mPropertyBag.modifier,
-			oControlToBeReverted = RenameObjectPageSection._getControlForRename(oControl, oModifier),
 			sPropertyName = mRenameSettings.propertyName;
-
-		if (vOldText || vOldText === "") {
-			oModifier.setPropertyBindingOrProperty(oControlToBeReverted, sPropertyName, vOldText);
-			oChange.resetRevertData();
-
-			return true;
-		} else {
-			Log.error("Change doesn't contain sufficient information to be reverted. Most Likely the Change didn't go through applyChange.");
-		}
+		return RenameObjectPageSection._getControlForRename(oControl, oModifier)
+			.then(function(oControlToBeReverted){
+				if (vOldText || vOldText === "") {
+					oModifier.setPropertyBindingOrProperty(oControlToBeReverted, sPropertyName, vOldText);
+					oChange.resetRevertData();
+					return true;
+				} else {
+					Log.error("Change doesn't contain sufficient information to be reverted. Most Likely the Change didn't go through applyChange.");
+				}
+			});
 	};
 
 

package/src/sap/uxap/library.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.uxap
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @since 1.36
 	 * @public
 	 */
@@ -69,7 +69,7 @@ sap.ui.define([
 			"sap.uxap.ObjectPageHeaderLayoutData",
 			"sap.uxap.ObjectPageLazyLoader"
 		],
-		version: "1.92.0",
+		version: "1.95.0",
 		extensions: {
 			flChangeHandlers: {
 				"sap.uxap.ObjectPageHeader": "sap/uxap/flexibility/ObjectPageHeader",

package/src/sap/uxap/messagebundle_de.properties

@@ -5,7 +5,7 @@ SHOW_LESS=Weniger anzeigen
 
 ANCHOR_BAR_ARIA_LABEL=Anker
 
-ANCHOR_BAR_ARIA_LABEL_DESC=Position aktivieren, um zum Abschnitt auf der Seite zu springen
+ANCHOR_BAR_ARIA_LABEL_DESC=Element aktivieren, um zum Abschnitt auf der Seite zu springen
 
 ANCHOR_BAR_OVERFLOW=Mehr