@openui5/sap.uxap 1.93.1 → 1.96.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
@@ -405,6 +400,11 @@ Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
@@ -464,3 +459,8 @@ Copyright:
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

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.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.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
@@ -395,6 +389,12 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
+Component: ajv, version: 6.12.3
+Copyright: 2015-2017 Evgeny Poberezkin
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+
 
 Library: sap.ui.mdc:
 
@@ -450,18 +450,21 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 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.1.34
+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
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.uxap",
-  "version": "1.93.1",
+  "version": "1.96.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.93.1",
-    "@openui5/sap.m": "1.93.1",
-    "@openui5/sap.ui.core": "1.93.1",
-    "@openui5/sap.ui.layout": "1.93.1"
+    "@openui5/sap.f": "1.96.0",
+    "@openui5/sap.m": "1.96.0",
+    "@openui5/sap.ui.core": "1.96.0",
+    "@openui5/sap.ui.layout": "1.96.0"
   }
 }

package/src/sap/uxap/.library

@@ -3,7 +3,7 @@
 
 	<name>sap.uxap</name>
 	<vendor>SAP SE</vendor>
-	<version>1.93.1</version>
+	<version>1.96.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/BlockBaseMetadata.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.93.1
+	 * @version 1.96.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.93.1
+	 * @version 1.96.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.93.1
+		 * @version 1.96.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.93.1
+		 * @version 1.96.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/uxap/ObjectPageLayout.js

@@ -910,6 +910,10 @@ sap.ui.define([
 		this._scrollTo(0, 0, 0);
 		this._bHeaderExpanded = true;
 		this._updateToggleHeaderVisualIndicators();
+
+		if (this._isHeaderPinnable()) {
+			this._getHeaderContent()._getPinButton().setVisible(!this._headerBiggerThanAllowedToBeExpandedInTitleArea());
+		}
 	};
 
 	ObjectPageLayout.prototype._handleDynamicTitlePress = function () {
@@ -1173,7 +1177,6 @@ sap.ui.define([
 		}
 
 		if (oHeaderContent && oHeaderContent.supportsPinUnpin()) {
-			this.$().toggleClass("sapUxAPObjectPageLayoutHeaderPinnable", oHeaderContent.getPinnable());
 			this._updatePinButtonState();
 		}
 
@@ -1232,7 +1235,7 @@ sap.ui.define([
 
 		this._setSectionsFocusValues();
 
-		if (this._preserveHeaderStateOnScroll()) {
+		if (this.getPreserveHeaderStateOnScroll()) {
 			this._overridePreserveHeaderStateOnScroll();
 		}
 
@@ -1565,17 +1568,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)
@@ -2503,7 +2506,7 @@ sap.ui.define([
 			sPreviousSubSectionId,
 			sPreviousSectionId,
 			bAllowScrollSectionToTop,
-			bStickyTitleMode = !this._bHeaderExpanded,
+			bStickyTitleMode = this._bHeaderInTitleArea || !this._bHeaderExpanded,
 			bIsFirstVisibleSubSection,
 			bParentIsFirstVisibleSection,
 			bIsFullscreenSection,
@@ -2524,13 +2527,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.$(),
 				oSection,
-				$title,
 				bPromoted = false;
 
 			if (!oInfo /* sectionBase is visible */ || !$this.length) {
@@ -2550,19 +2553,15 @@ 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);
 
-			if (oInfo.isSection) {
-				$title = oSectionBase.$("header");
-			} else {
-				$title = oSectionBase.$("headerTitle");
-			}
-
-			bPromoted = $title.length === 0;
-
-			if (bPromoted && !oInfo.isSection && (oSection = oSectionBase.getParent())) {
-				// 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 (!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
@@ -2613,7 +2612,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, Math.ceil(realTop)));
+				oSectionBase._setHeight(this._computeSubSectionHeight(bIsFirstVisibleSubSection, bIsFullscreenSection, Math.ceil(realTop), iSectionsContainerOffsetTop));
 			}
 
 		}, this);
@@ -2673,7 +2672,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;
@@ -2686,22 +2685,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;
 		}
 
@@ -2773,10 +2770,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
@@ -3013,23 +3011,23 @@ sap.ui.define([
 			return;
 		}
 
-		if (this._preserveHeaderStateOnScroll()) {
+		if (this.getPreserveHeaderStateOnScroll()) {
 			this._overridePreserveHeaderStateOnScroll();
 		}
 
 		this._adjustHeaderHeights();
-		this._requestAdjustLayout() // call adjust layout to calculate the new section sizes
-			.then(function () {
-				if (oOldSize.height > 0 || oOldSize.width > 0) {
-					// if the content that changed its height was *above* the current scroll position =>
-					// then the current scroll position updated respectively and => triggered a scroll event =>
-					// a new section may become selected during that scroll;
-					// problem if this happened BEFORE _requestAdjustLayout executed => wrong section may have been selected
-					// solution implemented bellow is to ensure that scroll handler is called with the latest scrollTop => we ensure the correct section is selected
-					iScrollTop = this._$opWrapper.scrollTop();
-					this._updateSelectionOnScroll(iScrollTop);
-				}
-			}.bind(this));
+		this._requestAdjustLayout(true); // call adjust layout to calculate the new section sizes
+
+		if (oOldSize.height > 0 || oOldSize.width > 0) {
+			// if the content that changed its height was *above* the current scroll position =>
+			// then the current scroll position updated respectively and => triggered a scroll event =>
+			// a new section may become selected during that scroll;
+			// problem if this happened BEFORE _requestAdjustLayout executed => wrong section may have been selected
+			// solution implemented bellow is to ensure that scroll handler is called with the latest scrollTop => we ensure the correct section is selected
+			iScrollTop = this._$opWrapper.scrollTop();
+			this._updateSelectionOnScroll(iScrollTop);
+		}
+
 	};
 
 	/**
@@ -3069,8 +3067,14 @@ sap.ui.define([
 			}
 
 			if (this._bHeaderInTitleArea && this._headerBiggerThanAllowedToBeExpandedInTitleArea()) {
+				if (this._isHeaderPinnable()) {
+					this._updatePinButtonState();
+				}
+
 				this._expandHeader(false);
 				this._scrollTo(0, 0);
+			} else if (this._isHeaderPinnable() && !this._headerBiggerThanAllowedToBeExpandedInTitleArea()) {
+				this._updatePinButtonState();
 			}
 
 			// Let the dynamic header know size changed first, because this might lead to header dimensions changes
@@ -3298,12 +3302,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");
 			}
 		}
 	};
@@ -3511,6 +3515,10 @@ sap.ui.define([
 			this._bHeaderExpanded = true;
 			this._adjustHeaderHeights();
 			this._updateToggleHeaderVisualIndicators();
+
+			if (this._isHeaderPinnable()) {
+				this._getHeaderContent()._getPinButton().setVisible(!this._headerBiggerThanAllowedToBeExpandedInTitleArea());
+			}
 		}
 	};
 
@@ -4365,10 +4373,6 @@ sap.ui.define([
 				&& this.getAlwaysShowContentHeader();
 	};
 
-	ObjectPageLayout.prototype._shouldOverridePreserveHeaderStateOnScroll = function () {
-		return !Device.system.desktop && this._headerBiggerThanAllowedToBeFixed();
-	};
-
 	ObjectPageLayout.prototype._headerBiggerThanAllowedToBeFixed = function () {
 		var iControlHeight = this._getOwnHeight();
 
@@ -4462,14 +4466,25 @@ sap.ui.define([
 
 	ObjectPageLayout.prototype._isHeaderPinnable = function () {
 		var oHeader = this._getHeaderContent();
-		return oHeader && oHeader.getPinnable()
-			&& this._bHeaderExpanded
-			&& !this.getPreserveHeaderStateOnScroll();
+
+		return oHeader && oHeader.supportsPinUnpin() && oHeader.getPinnable();
+	};
+
+	ObjectPageLayout.prototype._shouldPinUnpinHeader = function () {
+		return this._bHeaderExpanded
+			&& !this.getPreserveHeaderStateOnScroll()
+			&& !this._headerBiggerThanAllowedToBeExpandedInTitleArea();
 	};
 
 	ObjectPageLayout.prototype._updatePinButtonState = function() {
-		var bShouldPin = this.getHeaderContentPinned() && this._isHeaderPinnable();
-		this._getHeaderContent()._togglePinButton(bShouldPin);
+		var bIsHeaderPinnable = this._isHeaderPinnable(),
+			bShouldPin = bIsHeaderPinnable && this.getHeaderContentPinned() && this._shouldPinUnpinHeader(),
+			oHeaderContent = this._getHeaderContent();
+
+		oHeaderContent._togglePinButton(bShouldPin);
+		this.$().toggleClass("sapUxAPObjectPageLayoutHeaderPinnable", bIsHeaderPinnable);
+		oHeaderContent._getPinButton().setVisible(!this._headerBiggerThanAllowedToBeExpandedInTitleArea());
+
 		if (bShouldPin) {
 			this._pin();
 		} else {
@@ -4494,13 +4509,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();

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.93.1
+	 * @version 1.96.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);

package/src/sap/uxap/ObjectPageSubSection.js

@@ -512,12 +512,13 @@ sap.ui.define([
 			return;
 		}
 
-		this._$spacer = jQuery(document.getElementById(oObjectPageLayout.getId() + "-spacer"));
+		this._$spacer = oObjectPageLayout.$("spacer");
 
-		if (this._bShouldFocusSeeMoreLessButton) {
-			this._bShouldFocusSeeMoreLessButton = false;
+		if (this._bShouldFocusSeeMoreLessButton && document.activeElement === document.body) {
 			this._oCurrentlyVisibleSeeMoreLessButton.focus();
 		}
+
+		this._bShouldFocusSeeMoreLessButton = false;
 	};
 
 	ObjectPageSubSection.prototype.onBeforeRendering = function () {

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.93.1
+	 * @version 1.96.0
 	 * @since 1.75
 	 * @experimental Since 1.75
 	 */

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.93.1
+	 * @version 1.96.0
 	 * @experimental Since 1.54
 	 */
 

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.93.1
+	 * @version 1.96.0
 	 * @experimental Since 1.50
 	 */
 

package/src/sap/uxap/library.js

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

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

@@ -110,7 +110,7 @@
 		}
 
 		.sapUiVltCell > .sapMObjectAttributeDiv, .sapUiVltCell > .sapMObjStatus {
-			line-height: 1.5rem;
+			line-height: 1rem;
 		}
 
 		/* ProgressIndicator has display flex, but OPHeaderContent override it by setting display inline-block
@@ -134,20 +134,6 @@
 				width: 100% !important;
 			}
 		}
-		.sapMSlt {
-			height: 1.625rem;
-			margin-top: 0.1875rem;
-			margin-bottom: 0.1875rem;
-			.sapMSltLabel {
-				line-height: 1.5rem;
-				padding-right: 2.5rem;
-				padding-left: 0.5rem;
-			}
-			.sapMSltArrow {
-				width: 2rem;
-				line-height: 1.625rem;
-			}
-		}
 	}
 
 	.sapUxAPObjectPageHeaderLayoutHiddenL,

package/ui5.yaml

@@ -1,5 +1,5 @@
 ---
-specVersion: "1.1"
+specVersion: "2.0"
 type: library
 metadata:
   name: sap.uxap
@@ -7,3 +7,6 @@ metadata:
    OpenUI5
     * (c) Copyright 2009-${currentYear} SAP SE or an SAP affiliate company.
     * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+resources:
+  configuration:
+    propertiesFileSourceEncoding: ISO-8859-1