@openui5/sap.uxap 1.99.1 → 1.102.0

package/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+	"overrides": [
+		/*
+		 * Productive code, sample and unit test code of sap.uxap has been cleaned up.
+		 * No more references to the global jQuery allowed
+		 */
+		{
+			"files": [
+				"src/**/*.js",
+				"test/sap/uxap/demokit/**/*.js",
+				"test/sap/uxap/qunit/**/*.js"
+			],
+			"globals": {
+				"jQuery": "off"
+			}
+		}
+	]
+}

package/THIRDPARTY.txt

@@ -400,7 +400,7 @@ Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperato
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -411,7 +411,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 1.4.1
+Component: lit-html, version: 2.0.1
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -420,7 +420,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +429,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -450,7 +450,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.1.34
+Component: SAP Theming Base Content, version: 11.1.39
 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.99.1",
+  "version": "1.102.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.99.1",
-    "@openui5/sap.m": "1.99.1",
-    "@openui5/sap.ui.core": "1.99.1",
-    "@openui5/sap.ui.layout": "1.99.1"
+    "@openui5/sap.f": "1.102.0",
+    "@openui5/sap.m": "1.102.0",
+    "@openui5/sap.ui.core": "1.102.0",
+    "@openui5/sap.ui.layout": "1.102.0"
   }
 }

package/src/sap/uxap/.library

@@ -3,7 +3,7 @@
 
 	<name>sap.uxap</name>
 	<vendor>SAP SE</vendor>
-	<version>1.99.1</version>
+	<version>1.102.0</version>
 	<copyright>OpenUI5
  * (c) Copyright 2009-2022 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

@@ -640,6 +640,22 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Scrolls to the currently selected Section tab, when the header titles is snapped/unsnapped
+	 *
+	 * @public
+	 */
+	AnchorBar.prototype.scrollToCurrentlySelectedSection = function () {
+		var sSelectedButton = this.getSelectedButton(),
+			oSelectedButton = sap.ui.getCore().byId(sSelectedButton),
+			sSelectedSectionId;
+
+		if (oSelectedButton) {
+			sSelectedSectionId = oSelectedButton.data("sectionId");
+			this.scrollToSection(sSelectedSectionId, 0);
+		}
+	};
+
 	// use type 'object' because Metamodel doesn't know ScrollEnablement
 	/**
 	 * Returns an sap.ui.core.delegate.ScrollEnablement object used to handle scrolling.

package/src/sap/uxap/AnchorBarRenderer.js

@@ -9,8 +9,8 @@ sap.ui.define(["sap/m/ToolbarRenderer", "sap/ui/core/Renderer", "sap/m/BarInPage
 		"use strict";
 
 		/**
-		 * @class ObjectPageRenderer renderer.
-		 * @static
+		 * ObjectPageRenderer renderer.
+		 * @namespace
 		 */
 		var AnchorBarRenderer = Renderer.extend(ToolbarRenderer);
 

package/src/sap/uxap/BlockBase.js

@@ -378,6 +378,7 @@ sap.ui.define([
 		/**
 		 * Set the column layout for this particular block.
 		 * @param {string} sLayout The column layout to apply to the control
+		 * @returns {*} this
 		 * @public
 		 */
 		BlockBase.prototype.setColumnLayout = function (sLayout) {
@@ -386,7 +387,7 @@ sap.ui.define([
 				/*the parent subsection needs to recalculate block layout data
 				 based on the changed block column layout */
 			}
-			this.setProperty("columnLayout", sLayout);
+			return this.setProperty("columnLayout", sLayout);
 		};
 
 		/**

package/src/sap/uxap/BlockBaseMetadata.js

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

package/src/sap/uxap/BreadCrumbsRenderer.js

@@ -8,8 +8,8 @@ sap.ui.define(function () {
 	"use strict";
 
 	/**
-	 * @class BreadCrumbs renderer.
-	 * @static
+	 * BreadCrumbs renderer.
+	 * @namespace
 	 */
 	var BreadCrumbsRenderer = {
 		apiVersion: 2

package/src/sap/uxap/HierarchicalSelectRenderer.js

@@ -9,8 +9,8 @@ sap.ui.define(["sap/m/SelectRenderer", "sap/ui/core/Renderer"
 	"use strict";
 
 	/**
-	 * @class ObjectPageRenderer renderer.
-	 * @static
+	 * ObjectPageRenderer renderer.
+	 * @namespace
 	 */
 	var HierarchicalSelectRenderer = Renderer.extend(SelectRenderer);
 	HierarchicalSelectRenderer.apiVersion = 2;

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.99.1
+	 * @version 1.102.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.99.1
+		 * @version 1.102.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.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @public
@@ -148,8 +148,8 @@ sap.ui.define([
 
 		/**
 		 * Required by the {@link sap.uxap.IHeaderTitle} interface.
-		 * @param {object} jQuery reference to the header dom element
-		 * @param {object} change event of child-element that brought the need to adapt the headerTitle layout
+		 * @param {jQuery} $headerDomRef reference to the header dom element
+		 * @param {object} oEvent change event of child-element that brought the need to adapt the headerTitle layout
 		 * @private
 		 */
 		ObjectPageDynamicHeaderTitle.prototype._adaptObjectPageHeaderIndentifierLine = function ($headerDomRef, oEvent) {

package/src/sap/uxap/ObjectPageHeader.js

@@ -1045,8 +1045,8 @@ sap.ui.define([
 	 * Finds the sub-element with the given <code>sId</code> contained
 	 * within <code>$headerDomRef</code>
 	 *
-	 * @param {object} jQuery reference to the header dom element
-	 * @param {string} the id of the element to be found
+	 * @param {jQuery} $headerDomRef reference to the header dom element
+	 * @param {string} sId the id of the element to be found
 	 *
 	 * Returns the jQuery reference to the dom element with the given sId
 	 * @private

package/src/sap/uxap/ObjectPageHeaderActionButtonRenderer.js

@@ -9,8 +9,8 @@ sap.ui.define(["sap/m/ButtonRenderer", "sap/ui/core/Renderer"],
 		"use strict";
 
 		/**
-		 * @class ObjectPageRenderer renderer.
-		 * @static
+		 * ObjectPageRenderer renderer.
+		 * @namespace
 		 */
 		var ObjectPageHeaderActionButtonRenderer = Renderer.extend(ButtonRenderer);
 

package/src/sap/uxap/ObjectPageHeaderContentRenderer.js

@@ -10,8 +10,8 @@ sap.ui.define([
 	"use strict";
 
 	/**
-	 * @class HeaderContent renderer.
-	 * @static
+	 * HeaderContent renderer.
+	 * @namespace
 	 */
 	var ObjectPageHeaderContentRenderer = {
 		apiVersion: 2

package/src/sap/uxap/ObjectPageHeaderRenderer.js

@@ -8,8 +8,8 @@ sap.ui.define(["./ObjectImageHelper", "sap/ui/Device"], function (ObjectImageHel
 	"use strict";
 
 	/**
-	 * @class HeaderBase renderer.
-	 * @static
+	 * Header renderer.
+	 * @namespace
 	 */
 	var ObjectPageHeaderRenderer = {
 		apiVersion: 2

package/src/sap/uxap/ObjectPageLayout.js

@@ -32,7 +32,6 @@ sap.ui.define([
 	"sap/base/util/isEmptyObject",
 	"sap/base/util/merge",
 	"sap/ui/events/KeyCodes",
-	"sap/ui/events/F6Navigation",
 	"sap/ui/dom/getFirstEditableInput",
 	"sap/ui/core/theming/Parameters",
 	'sap/ui/dom/units/Rem'
@@ -63,7 +62,6 @@ sap.ui.define([
 	isEmptyObject,
 	merge,
 	KeyCodes,
-	F6Navigation,
 	getFirstEditableInput,
 	Parameters,
 	DomUnitsRem
@@ -826,7 +824,7 @@ sap.ui.define([
 	 * Snaps the header
 	 * and toggles the state of the title and the anchorBar accordingly
 	 *
-	 * @param bAppendHeaderToContent, determines if the header should be snapped
+	 * @param {boolean} bAppendHeaderToContent - determines if the header should be snapped
 	 * with or without scroll:
 	 *
 	 * (1) If the <code>bAppendHeaderToContent</code> is <code>true</code>, then the
@@ -882,7 +880,7 @@ sap.ui.define([
 	 * Expands the header
 	 * and toggles the state of the title and the anchorBar accordingly
 	 *
-	 * @param bAppendHeaderToTitle, determines if the header should be in the
+	 * @param {boolean} bAppendHeaderToTitle - determines if the header should be in the
 	 * scrollable content-area or in the non-scrollable title-area
 	 *
 	 * @private
@@ -1137,23 +1135,8 @@ sap.ui.define([
 
 		this._ensureCorrectParentHeight();
 
-		if (this._$sectionsContainer) {
-			this._$sectionsContainer.off("focusout");
-			this._$sectionsContainer.off("focusin");
-		}
-
 		this._cacheDomElements();
 
-		if (this._$sectionsContainer) {
-			this._$sectionsContainer.on("focusin", function () {
-				this._skipToNextFastGroup = true;
-			}.bind(this));
-
-			this._$sectionsContainer.on("focusout", function () {
-				this._skipToNextFastGroup = false;
-			}.bind(this));
-		}
-
 		if (this._hasDynamicTitle()) {
 			this.addStyleClass("sapUxAPObjectPageHasDynamicTitle");
 		}
@@ -1481,12 +1464,17 @@ sap.ui.define([
 	 *
 	 * The section can either be given by itself or by its id.
 	 *
-	 * Note that an argument of <code>null</code> will cause the first visible section be set as <code>selectedSection</code>.
-	 * This is because the <code>sap.uxap.ObjectPageLayout</code> should always have one of its sections selected (unless it has 0 visible sections).
+	 * If left unspecified, then the page automatically sets
+	 * the value to the first visible section before rendering.
+	 * The value never remains empty because <code>sap.uxap.ObjectPageLayout</code> should
+	 * always have one of its sections selected (unless it has 0 visible sections).
+	 *
+	 * <b>Note:</b> Updating the <code>selectedSection</code> with a value of <code>null</code>
+	 * resets the <code>selectedSection</code> to the first visible section and scrolls the page to the top.
 	 *
 	 * @param {string | sap.uxap.ObjectPageSection} sId
 	 *            The ID or the section instance that should be selected
-	 *            Note that <code>null</code> or <code>undefined</code> are not valid arguments
+	 *            Note that <code>undefined</code> is not a valid argument
 	 * @return {this} Returns <code>this</code> to allow method chaining
 	 * @public
 	 */
@@ -1519,6 +1507,7 @@ sap.ui.define([
 		//but we still need to save the selectedSection value
 		vClosestSection = ObjectPageSection._getClosestSection(sId);
 		sSectionIdToSet = (vClosestSection instanceof ObjectPageSection) ? vClosestSection.getId() : vClosestSection;
+		this.setDirectScrollingToSection(sSectionIdToSet);
 		return this.setAssociation("selectedSection", sSectionIdToSet, true);
 	};
 
@@ -1578,7 +1567,6 @@ sap.ui.define([
 		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)
@@ -1600,7 +1588,8 @@ sap.ui.define([
 	 * @private
 	 */
 	ObjectPageLayout.prototype._toggleHeaderTitle = function (bExpand, bUserInteraction) {
-		var oHeaderTitle = this.getHeaderTitle();
+		var oHeaderTitle = this.getHeaderTitle(),
+			oAnchorBar = this._oABHelper._getAnchorBar();
 
 		// note that <code>this._$titleArea</code> is the placeholder [of the sticky area] where both the header title and header content are placed
 		if (this._$titleArea.length) {
@@ -1614,6 +1603,8 @@ sap.ui.define([
 		} else {
 			oHeaderTitle && oHeaderTitle.snap(bUserInteraction);
 		}
+
+		oAnchorBar.scrollToCurrentlySelectedSection();
 	};
 
 	/**
@@ -1714,6 +1705,12 @@ sap.ui.define([
 
 			}, this);
 
+			if (iVisibleSubSections > 1) {
+				aSubSections.forEach(function(oSubSection) {
+					oSubSection._setBorrowedTitleDomId("");
+				});
+			}
+
 			//rule noVisibleSubSection: If a section has no content (or only empty subsections) the section will be hidden.
 			if (iVisibleSubSections == 0) {
 				oSection._setInternalVisible(false, bInvalidate);
@@ -1833,37 +1830,6 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
-	 * Handler for F6
-	 *
-	 * @param {Object} oEvent - The event object
-	 */
-	ObjectPageLayout.prototype.onsapskipforward = function(oEvent) {
-		if (this._skipToNextFastGroup) {
-			this._handleGroupNavigation(oEvent, true);
-		}
-	};
-
-	/**
-	 * Handler for Shift + F6
-	 *
-	 * @param {Object} oEvent - The event object
-	 */
-	ObjectPageLayout.prototype.onsapskipback = function(oEvent) {
-		if (this._skipToNextFastGroup) {
-			this._handleGroupNavigation(oEvent, false);
-		}
-	};
-
-	ObjectPageLayout.prototype._handleGroupNavigation = function (oEvent, bForward) {
-		var oSettings = {
-			target: bForward ? this._$skipFastGroupAnchor[0] : this._$sectionsContainer[0]
-		};
-
-		oEvent.type = "keydown";
-		F6Navigation.handleF6GroupNavigation(oEvent, oSettings);
-	};
-
 	/**
 	 * Sets a new section to be displayed as currently selected tab
 	 * @param oSection
@@ -2017,6 +1983,8 @@ sap.ui.define([
 
 		this._applyUxRules(true);
 
+		this._requestAdjustLayout(true);
+
 		/* reset the selected section,
 		 as the previously selected section may not be available anymore,
 		 as it might have been deleted, or emptied, or set to hidden in the previous step */
@@ -2030,19 +1998,14 @@ sap.ui.define([
 				this._setCurrentTabSection(oSelectedSection);
 				this._bAllContentFitsContainer = this._hasSingleVisibleFullscreenSubSection(oSelectedSection);
 			}
-			this._requestAdjustLayout(true)
-				.then(function (bSuccess) { // scrolling must be done after the layout adjustment is done (so the latest section positions are determined)
-					if (bSuccess) {
-						this._oLazyLoading.doLazyLoading();
-					}
-					this._adjustSelectedSectionByUXRules(); //section may have changed again from the app before the promise completed => ensure adjustment
-					sSelectedSectionId = this.getSelectedSection();
-					// if the current scroll position is not at the selected section OR the ScrollEnablement is still scrolling due to an animation
-					if (!this._isClosestScrolledSection(sSelectedSectionId) || this._oScroller._$Container.is(":animated")) {
-						// then change the selection to match the correct section
-						this.scrollToSection(sSelectedSectionId, null, 0, false, true /* redirect scroll */);
-					}
-				}.bind(this));
+			if (this.getEnableLazyLoading() && this._oLazyLoading) {
+				this._oLazyLoading.doLazyLoading();
+			}
+			// if the current scroll position is not at the selected section OR the ScrollEnablement is still scrolling due to an animation
+			if (!this._isClosestScrolledSection(sSelectedSectionId) || (this._oScroller._$Container && this._oScroller._$Container.is(":animated"))) {
+				// then change the selection to match the correct section
+				this.scrollToSection(sSelectedSectionId, null, 0, false, true /* redirect scroll */);
+			}
 		}
 	};
 
@@ -2535,8 +2498,9 @@ sap.ui.define([
 		this._aSectionBases.forEach(function (oSectionBase) {
 			var oInfo = this._oSectionInfo[oSectionBase.getId()],
 				$this = oSectionBase.$(),
+				bPromoted = false,
 				oSection,
-				bPromoted = false;
+				iSectionsTopMargin;
 
 			if (!oInfo /* sectionBase is visible */ || !$this.length) {
 				return;
@@ -2550,7 +2514,7 @@ sap.ui.define([
 
 			//calculate the scrollTop value to get the section title at the bottom of the header
 			//performance improvements possible here as .position() is costly
-			var realTop = $this.position().top; //first get the dom position = scrollTop to get the section at the window top
+			var realTop = library.Utilities.getChildPosition($this, this._$contentContainer).top;
 
 			//the amount of scrolling required is the distance between their position().top and the bottom of the anchorBar
 			oInfo.positionTop = Math.ceil(realTop);
@@ -2613,8 +2577,9 @@ 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));
+				oSectionBase._setHeight(this._computeSubSectionHeight(bIsFirstVisibleSubSection, bIsFullscreenSection, Math.ceil(realTop), iSectionsContainerOffsetTop, iSectionsTopMargin));
 			}
 
 		}, this);
@@ -2671,10 +2636,16 @@ sap.ui.define([
 
 		this._setSectionInfoIsDirty(false);
 
+		// if a scroll event was fired *before* the delayed execution of <code>_updateScreenHeightSectionBasesAndSpacer</code>
+		// => 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());
+
 		return true; // return success flag
 	};
 
-	ObjectPageLayout.prototype._computeSubSectionHeight = function(bFirstVisibleSubSection, bFullscreenSection, iSubSectionOffsetTop, iSectionsContainerOffsetTop) {
+	ObjectPageLayout.prototype._computeSubSectionHeight = function(bFirstVisibleSubSection, bFullscreenSection,
+		iSubSectionOffsetTop, iSectionsContainerOffsetTop, iSectionsTopMargin) {
 
 		var iSectionsContainerHeight,
 			iRemainingSectionContentHeight;
@@ -2699,8 +2670,8 @@ 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*
-			iRemainingSectionContentHeight = (iSubSectionOffsetTop - iSectionsContainerOffsetTop) + this.iFooterHeight;
+			// => 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;
 			iSectionsContainerHeight -= iRemainingSectionContentHeight;
 		}
 
@@ -2753,7 +2724,7 @@ sap.ui.define([
 		var bIsStickyMode = this._bStickyAnchorBar || this._bHeaderInTitleArea; // get current mode
 		var iLastSectionPositionTop = this._getSectionPositionTop(oLastVisibleSubSection, bIsStickyMode); /* we need to get the position in the current mode */
 
-		return this._$spacer.position().top - iLastSectionPositionTop;
+		return Math.ceil(this._$spacer.position().top) - iLastSectionPositionTop;
 	};
 
 	ObjectPageLayout.prototype._getStickyAreaHeight = function(bIsStickyMode) {
@@ -3004,9 +2975,9 @@ sap.ui.define([
 	};
 
 	ObjectPageLayout.prototype._onUpdateContentSize = function (oEvent) {
-		var iScrollTop,
-			oSize = oEvent.size,
-			oOldSize = oEvent.oldSize;
+		var oSize = oEvent.size;
+
+		this.iContentHeight = oSize.height;
 
 		if (oSize.height === 0 || oSize.width === 0) {
 			Log.info("ObjectPageLayout :: not triggering calculations if height or width is 0");
@@ -3019,17 +2990,18 @@ sap.ui.define([
 
 		this._adjustHeaderHeights();
 		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);
+	ObjectPageLayout.prototype.triggerPendingLayoutUpdates = function () {
+		if (this._hasPendingLayoutUpdate()) {
+			this._requestAdjustLayout(true);
 		}
+	};
 
+	ObjectPageLayout.prototype._hasPendingLayoutUpdate = function () {
+		return this._oLayoutTask && this._oLayoutTask.isPending()
+		// pending resize notification that will trigger the due layout update on resize
+		|| (this._$contentContainer.length && this._$contentContainer.get(0).offsetHeight !== this.iContentHeight);
 	};
 
 	/**
@@ -3209,7 +3181,7 @@ sap.ui.define([
 		var iScrollTop = Math.max(Math.ceil(oEvent.target.scrollTop), 0), // top of the visible page
 			$wrapper = this._$opWrapper.length && this._$opWrapper[0],
 			$spacer = this._$spacer.length && this._$spacer[0],
-			iSpacerHeight = $spacer.offsetHeight,
+			iSpacerHeight = this._$spacer.height(),
 			iPageHeight,
 			oHeader = this.getHeaderTitle(),
 			bShouldStick = this._shouldSnapHeaderOnScroll(iScrollTop),
@@ -3319,10 +3291,12 @@ sap.ui.define([
 	 * @param iScrollTop
 	 * @private
 	 */
-	ObjectPageLayout.prototype._updateSelectionOnScroll = function(iScrollTop) {
+	 ObjectPageLayout.prototype._updateSelectionOnScroll = function(iScrollTop) {
 
 		var iPageHeight = this.iScreenHeight,
 			sClosestId,
+			oClosestSection,
+			sClosestSectionId,
 			sClosestSubSectionId;
 
 		if (iPageHeight === 0) {
@@ -3331,6 +3305,8 @@ sap.ui.define([
 
 		//find the currently scrolled section = where position - iScrollTop is closest to 0
 		sClosestId = this._getClosestScrolledSectionBaseId(iScrollTop, iPageHeight);
+		oClosestSection = ObjectPageSection._getClosestSection(sClosestId);
+		sClosestSectionId = oClosestSection ? oClosestSection.getId() : null;
 		sClosestSubSectionId = this._getClosestScrolledSectionBaseId(iScrollTop, iPageHeight, true /* subSections only */);
 
 		if (sClosestId) {
@@ -3350,13 +3326,13 @@ sap.ui.define([
 				// then we do not want to process intermediate sections (i.e. sections between scroll-start section and scroll-destination sections)
 				// so if current section is not destination section
 				// then no need to proceed further
-				if (sDestinationSectionId && sDestinationSectionId !== sClosestId) {
+				if (sDestinationSectionId && sDestinationSectionId !== sClosestSectionId) {
 					return;
 				}
 				this.clearDirectScrollingToSection();
 
 				this._setAsCurrentSection(sClosestId);
-			} else if (sClosestId === this.getDirectScrollingToSection()) { //we are already in the destination section
+			} else if (sClosestSectionId === this.getDirectScrollingToSection()) { //we are already in the destination section
 				this.clearDirectScrollingToSection();
 			}
 
@@ -3433,10 +3409,7 @@ sap.ui.define([
 
 			// on desktop/tablet, skip subsections
 			// BCP 1680331690. Should skip subsections that are in a section with lower importance, which makes them hidden.
-			section = this.oCore.byId(sId);
-			if (!section) {
-				return;
-			}
+			section = oInfo.sectionReference;
 			sectionParent = section.getParent();
 			isParentHiddenSection = sectionParent instanceof ObjectPageSection && sectionParent._getIsHidden();
 
@@ -3473,16 +3446,15 @@ sap.ui.define([
 				// current section/subsection is inside the view port
 				if (oInfo.positionTop <= iScrollPageBottom && iScrollTop <= oInfo.positionBottom) {
 					// scrolling position is over current section/subsection
-					if (oInfo.positionTop <= iScrollTop && oInfo.positionBottom > iScrollTop) {
+					if (oInfo.positionTop <= iScrollTop + 1 && oInfo.positionBottom > iScrollTop) {
 						sClosestId = sId;
-						return false;
 					}
 				}
 			}
 
 		}.bind(this));
 
-		return sClosestId;
+		return this.oCore.byId(sClosestId) ? sClosestId : null;
 	};
 
 
@@ -4221,7 +4193,9 @@ sap.ui.define([
 			return;
 		}
 
-		var iScrollTop = this._oScroller.getScrollTop(),
+		this.triggerPendingLayoutUpdates();
+
+		var iScrollTop = this._$opWrapper.scrollTop(),
 			sScrolledSubSectionId = this._getClosestScrolledSectionBaseId(
 				this._oScroller.getScrollTop(), this.iScreenHeight, true /* subSections only */),
 			iScrollTopWithinScrolledSubSection;

package/src/sap/uxap/ObjectPageLayoutABHelper.js

@@ -246,7 +246,7 @@ sap.ui.define([
 
 	/**
 	 * Moves focus on the corresponding subsection when MenuItem is selected
-	 * @param {sap.ui.core.Control} oSourceControl: selected Item
+	 * @param {sap.ui.core.Control} oSourceControl selected Item
 	 * @private
 	 */
 	ABHelper.prototype._moveFocusOnSection = function (oSourceControl) {

package/src/sap/uxap/ObjectPageLayoutRenderer.js

@@ -9,8 +9,8 @@ sap.ui.define(["sap/ui/Device"],
 		"use strict";
 
 		/**
-		 * @class ObjectPageRenderer renderer.
-		 * @static
+		 * ObjectPageLayout renderer.
+		 * @namespace
 		 */
 		var ObjectPageLayoutRenderer = {
 			apiVersion: 2
@@ -199,11 +199,6 @@ sap.ui.define(["sap/ui/Device"],
 				.openEnd()
 				.close("div");
 
-			oRm.openStart("span", oControl.getId() + "-skipFastGroupAnchor")
-				.class("sapUiPseudoInvisibleText")
-				.openEnd()
-				.close("span");
-
 			oRm.close("div"); // END scroll
 
 			oRm.close("div"); // END wrapper
@@ -246,7 +241,7 @@ sap.ui.define(["sap/ui/Device"],
 		 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
 		 * @param {boolean} bRender - shows if the control should be rendered
 		 * @param {string} sId - the id of the div that should be rendered
-		 * @param {boolean} bRenderAlways - shows if the DOM of the control should be rendered no matter if the control is rendered inside or not
+		 * @param {boolean} bApplyBelizePlusClass - shows if the DOM of the control should be rendered no matter if the control is rendered inside or not
 		 */
 		ObjectPageLayoutRenderer._renderHeaderContentDOM = function (oRm, oControl, bRender, sId, bApplyBelizePlusClass) {
 			oRm.openStart("header", oControl.getId() + sId)

package/src/sap/uxap/ObjectPageLazyLoader.js

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

package/src/sap/uxap/ObjectPageSection.js

@@ -9,6 +9,7 @@ sap.ui.define([
     "./ObjectPageSectionBase",
     "sap/ui/Device",
     "sap/m/Button",
+	"sap/ui/core/ResizeHandler",
     "sap/ui/core/StashedControlSupport",
     "./ObjectPageSubSection",
     "./library",
@@ -18,6 +19,7 @@ sap.ui.define([
 	ObjectPageSectionBase,
 	Device,
 	Button,
+	ResizeHandler,
 	StashedControlSupport,
 	ObjectPageSubSection,
 	library,
@@ -92,7 +94,7 @@ sap.ui.define([
 
 	/**
 	 * Returns the closest ObjectPageSection.
-	 * @param  {sap.uxap.ObjectPageSectionBase} oSectionBase
+	 * @param  {sap.uxap.ObjectPageSectionBase} vSectionBase
 	 * @returns {sap.uxap.ObjectPageSection} The closest ObjectPageSection
 	 * @private
 	 */
@@ -130,10 +132,20 @@ sap.ui.define([
 	ObjectPageSection.prototype.init = function () {
 		ObjectPageSectionBase.prototype.init.call(this);
 		this._sContainerSelector = ".sapUxAPObjectPageSectionContainer";
+		this._onResizeRef = this._onResize.bind(this);
 	};
 
 	ObjectPageSection.prototype.exit = function () {
 		this._detachMediaContainerWidthChange(this._updateImportance, this);
+
+		if (this._iResizeHandlerId) {
+			ResizeHandler.deregister(this._iResizeHandlerId);
+			this._iResizeHandlerId = null;
+		}
+	};
+
+	ObjectPageSection.prototype._onResize = function () {
+		this._updateMultilineContent();
 	};
 
 	ObjectPageSection.prototype._getImportanceLevelToHide = function (oCurrentMedia) {
@@ -164,6 +176,37 @@ sap.ui.define([
 		}
 	};
 
+	ObjectPageSection.prototype._updateMultilineContent = function () {
+		var aSubSections = this.getSubSections(),
+			oFirstSubSection = aSubSections.find(function(oSubSection) {
+				return oSubSection.getVisible();
+			});
+
+		if (oFirstSubSection && oFirstSubSection.getDomRef()) {
+			var sTitleDomId = oFirstSubSection._getTitleDomId(),
+				iTitleWidth,
+				iActionsWidth,
+				iHeaderWidth,
+				bMultiLine,
+				oFirstSubSectionTitle;
+
+				// When there are more than one SubSections with no title, sTitleDomId=false.
+				// However, we are not interested in this case anyway, as there is no promoted SubSection
+				if (!sTitleDomId) {
+					return;
+				}
+
+				oFirstSubSectionTitle = document.getElementById(oFirstSubSection._getTitleDomId());
+				// Title is hidden for the first SubSection of the first Section
+				iTitleWidth = oFirstSubSectionTitle ? oFirstSubSectionTitle.offsetWidth : 0;
+				iActionsWidth = this.$().find(".sapUxAPObjectPageSubSectionHeaderActions").width();
+				iHeaderWidth = this.$("header").width();
+				bMultiLine = (iTitleWidth + iActionsWidth) > iHeaderWidth;
+
+			oFirstSubSection._toggleMultiLineSectionContent(bMultiLine);
+		}
+	};
+
 	ObjectPageSection.prototype._determineTheLowestLevelOfImportanceToShow = function (sMedia, bShowOnlyHighImportance) {
 		if (bShowOnlyHighImportance || sMedia === "Phone") {
 			return library.Importance.High;
@@ -196,7 +239,9 @@ sap.ui.define([
 	};
 
 	ObjectPageSection.prototype.onAfterRendering = function () {
+		this._updateMultilineContent();
 		this._attachMediaContainerWidthChange(this._updateImportance, this);
+		this._iResizeHandlerId = ResizeHandler.register(this, this._onResizeRef);
 	};
 
 	/**

package/src/sap/uxap/ObjectPageSectionRenderer.js

@@ -8,8 +8,8 @@ sap.ui.define(function () {
 	"use strict";
 
 	/**
-	 * @class Section renderer.
-	 * @static
+	 * Section renderer.
+	 * @namespace
 	 */
 	var ObjectPageSectionRenderer = {
 		apiVersion: 2
@@ -40,6 +40,8 @@ sap.ui.define(function () {
 			oRm.attr("aria-labelledby", oLabelledBy.getId());
 		}
 
+		oRm.attr("data-sap-ui-customfastnavgroup", true);
+
 		oRm.openEnd();
 
 		oRm.openStart("div", oControl.getId() + "-header")

package/src/sap/uxap/ObjectPageSubSection.js

@@ -291,6 +291,11 @@ sap.ui.define([
 		this._sBorrowedTitleDomId = sId;
 	};
 
+	ObjectPageSubSection.prototype._toggleMultiLineSectionContent = function (bMultiLine) {
+		this.toggleStyleClass("sapUxAPObjectPageSectionMultilineContent", bMultiLine);
+		this._bMultiLine = bMultiLine;
+	};
+
 	ObjectPageSubSection.prototype._expandSection = function () {
 		ObjectPageSectionBase.prototype._expandSection.call(this);
 		var oParent = this.getParent();

package/src/sap/uxap/ObjectPageSubSectionRenderer.js

@@ -8,8 +8,8 @@ sap.ui.define(function () {
 	"use strict";
 
 	/**
-	 * @class Section renderer.
-	 * @static
+	 * SubSection renderer.
+	 * @namespace
 	 */
 	var ObjectPageSubSectionRenderer = {
 		apiVersion: 2
@@ -39,6 +39,10 @@ sap.ui.define(function () {
 			oRm.class("sapUxAPObjectPageSubSectionWithSeeMore");
 		}
 
+		if (oControl._bMultiLine) {
+			oRm.class("sapUxAPObjectPageSectionMultilineContent");
+		}
+
 		oRm.class("sapUxAPObjectPageSubSection")
 			.class("ui-helper-clearfix");
 

package/src/sap/uxap/ThrottledTaskHelper.js

@@ -64,6 +64,10 @@ sap.ui.define([
 			return oReturnPromise;
 		},
 
+		isPending: function() {
+			return this._iTimer != null;
+		},
+
 		_getPromise: function () {
 
 			if (!this._oPromise) {

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.99.1
+	 * @version 1.102.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.99.1
+	 * @version 1.102.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.99.1
+	 * @version 1.102.0
 	 * @experimental Since 1.50
 	 */
 
@@ -34,23 +34,34 @@ sap.ui.define([
 	var RenameObjectPageSection = BaseRename.createRenameChangeHandler(mRenameSettings);
 
 	RenameObjectPageSection._getControlForRename = function (oControl, oModifier) {
-		var aSubSections;
+		var aSubSections,
+			vTitle;
+
 		return Promise.resolve()
 			.then(function() {
 				return oModifier.getAggregation(oControl, "subSections");
 			})
 			.then(function(aSubSectionsLocal) {
 				aSubSections = aSubSectionsLocal;
+
+				if (aSubSections.length !== 1) {
+					// if there are no or more than one sub sections, the following
+					// code should not execute and oControl should be returned
+					return [];
+				}
+
 				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.
+				vTitle = aProperties[0];
 
 				if (aSubSections
 					&& aSubSections.length === 1
-					&& aProperties[0]
+					&& vTitle
+					&& (typeof vTitle === "object") || (typeof vTitle === "string" && vTitle.trim() !== "")
 					&& aProperties[1] === "TitleOnTop"
 				) {
 					return aSubSections[0];

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

@@ -159,6 +159,9 @@ function(
 					addIFrame: {
 						text: sap.ui.getCore().getLibraryResourceBundle("sap.uxap").getText("ADD_IFRAME_IN_HEADER"),
 						changeType: "addIFrame"
+					},
+					remove : {
+						removeLastElement: true
 					}
 				}
 			},
@@ -202,4 +205,4 @@ function(
 		}
 	};
 
-});
+});

package/src/sap/uxap/library.js

@@ -11,26 +11,25 @@ sap.ui.define([
 	"sap/ui/core/Core",
 	"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) {
+], function(Core, DataType, Device, jQuery) {
 	"use strict";
 
 	/**
 	 * SAP UxAP
 	 *
 	 * @namespace
-	 * @name sap.uxap
+	 * @alias sap.uxap
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @since 1.36
 	 * @public
 	 */
-		// library dependencies
-		// delegate further initialization of this library to the Core
-	sap.ui.getCore().initLibrary({
+	var thisLib = sap.ui.getCore().initLibrary({
 		name: "sap.uxap",
 		dependencies: ["sap.ui.core", "sap.f", "sap.m", "sap.ui.layout"],
 		designtime: "sap/uxap/designtime/library.designtime",
@@ -69,7 +68,7 @@ sap.ui.define([
 			"sap.uxap.ObjectPageHeaderLayoutData",
 			"sap.uxap.ObjectPageLazyLoader"
 		],
-		version: "1.99.1",
+		version: "1.102.0",
 		extensions: {
 			flChangeHandlers: {
 				"sap.uxap.ObjectPageHeader": "sap/uxap/flexibility/ObjectPageHeader",
@@ -101,15 +100,15 @@ sap.ui.define([
 	});
 
 	/**
-	 * @class Used by the <code>BlockBase</code> control to define how many columns should it be assigned by the <code>objectPageSubSection</code>.
+	 * Used by the <code>BlockBase</code> control to define how many columns should it be assigned by the <code>objectPageSubSection</code>.
 	 *     The allowed values can be auto (subsection assigned a number of columns based on the parent objectPageLayout subsectionLayout property), 1, 2, 3 or 4
 	 *     (This may not be a valid value for some <code>subSectionLayout</code>, for example, asking for 3 columns in a 2 column layout would raise warnings).
 	 *
-	 * @static
+	 * @namespace
 	 * @public
 	 * @ui5-metamodel This simple type also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	sap.uxap.BlockBaseColumnLayout = DataType.createType('sap.uxap.BlockBaseColumnLayout', {
+	thisLib.BlockBaseColumnLayout = DataType.createType('sap.uxap.BlockBaseColumnLayout', {
 			isValid: function (vValue) {
 				return /^(auto|[1-4]{1})$/.test(vValue);
 			}
@@ -127,7 +126,7 @@ sap.ui.define([
 	 * @public
 	 * @ui5-metamodel This simple type also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	sap.uxap.BlockBaseFormAdjustment = {
+	thisLib.BlockBaseFormAdjustment = {
 
 		/**
 		 * Any form within the block will be automatically adjusted to have as many columns as the colspan of its parent block.
@@ -154,7 +153,7 @@ sap.ui.define([
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	sap.uxap.ObjectPageConfigurationMode = {
+	thisLib.ObjectPageConfigurationMode = {
 
 		/**
 		 * Determines the JSON URL.
@@ -177,7 +176,7 @@ sap.ui.define([
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	sap.uxap.ObjectPageHeaderDesign = {
+	thisLib.ObjectPageHeaderDesign = {
 
 		/**
 		 * Light theme for the <code>ObjectPageHeader</code>.
@@ -200,7 +199,7 @@ sap.ui.define([
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	sap.uxap.ObjectPageHeaderPictureShape = {
+	thisLib.ObjectPageHeaderPictureShape = {
 
 		/**
 		 * Circle shape for the images in the <code>ObjectPageHeader</code>.
@@ -223,7 +222,7 @@ sap.ui.define([
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	sap.uxap.ObjectPageSubSectionLayout = {
+	thisLib.ObjectPageSubSectionLayout = {
 
 		/**
 		 * Title and actions on top of the block area.
@@ -246,7 +245,7 @@ sap.ui.define([
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	sap.uxap.ObjectPageSubSectionMode = {
+	thisLib.ObjectPageSubSectionMode = {
 
 		/**
 		 * Collapsed mode of display of the <code>ObjectPageLayout</code>.
@@ -271,7 +270,7 @@ sap.ui.define([
 	 * @since 1.32.0
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	sap.uxap.Importance = {
+	thisLib.Importance = {
 
 		/**
 		 * Low importance of the content.
@@ -296,7 +295,7 @@ sap.ui.define([
 	 *
 	 * @type {{getClosestOPL: Function}}
 	 */
-	sap.uxap.Utilities = {
+	thisLib.Utilities = {
 
 		/**
 		 * Returns the reference to the <code>ObjectPageLayout</code> for a given control.
@@ -318,10 +317,10 @@ sap.ui.define([
 				return true;
 			}
 
-			return sap.uxap.Utilities._isCurrentMediaSize("Phone", oRange);
+			return thisLib.Utilities._isCurrentMediaSize("Phone", oRange);
 		},
 		isTabletScenario: function (oRange) {
-			return sap.uxap.Utilities._isCurrentMediaSize("Tablet", oRange);
+			return thisLib.Utilities._isCurrentMediaSize("Tablet", oRange);
 		},
 		_isCurrentMediaSize: function (sMedia, oRange) {
 			return oRange && oRange.name === sMedia;
@@ -403,6 +402,6 @@ sap.ui.define([
 	 * @see {@link topic:d2ef0099542d44dc868719d908e576d0 Object Page Headers}
 	 */
 
-	return sap.uxap;
+	return thisLib;
 
 });

package/src/sap/uxap/messagebundle_ja.properties

@@ -1,7 +1,7 @@
 
-SHOW_MORE=\u8868\u793A\u8FFD\u52A0
+SHOW_MORE=\u3055\u3089\u306B\u8868\u793A
 
-SHOW_LESS=\u8868\u793A\u5727\u7E2E
+SHOW_LESS=\u8868\u793A\u3092\u6E1B\u3089\u3059
 
 ANCHOR_BAR_ARIA_LABEL=\u30A2\u30F3\u30AB\u30FC
 
@@ -13,7 +13,7 @@ BREADCRUMB_TRAIL_LABEL=\u8A73\u7D30\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
 
 SHOW_ALL=\u3059\u3079\u3066\u8868\u793A
 
-HIDE_ALL=\u8868\u793A\u5727\u7E2E
+HIDE_ALL=\u8868\u793A\u3092\u6E1B\u3089\u3059
 
 SHOW=\u5C55\u958B
 

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

@@ -28,6 +28,16 @@
 	}
 }
 
+.sapUxAPObjectPageLayout:not(.sapUxAPObjectPageLayout-Std-Phone) .sapUxAPObjectPageSubSectionPromoted:not(.sapUxAPObjectPageSectionMultilineContent) .sapUxAPObjectPageSubSectionHeaderActions {
+	position: absolute;
+	top: 0;
+	right: 1rem;
+}
+.sapUxAPObjectPageLayout:not(.sapUxAPObjectPageLayout-Std-Phone) .sapUxAPObjectPageSubSectionPromoted:not(.sapUxAPObjectPageSectionMultilineContent) .sapUxAPObjectPageSubSectionHeader {
+	height: 0;
+	padding: 0;
+}
+
 body > .sapUxAPObjectPageLayout,
 .sapUiVltCell .sapUxAPObjectPageLayout {
 	position: fixed;

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

@@ -6,6 +6,7 @@
 .sapUxAPObjectPageSection {
 	margin-left: 0;
 	margin-bottom: 0;
+	position: relative;
 }
 
 .sapUxAPObjectPageSectionTitleUppercase {

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

@@ -4,7 +4,7 @@
 /* ============================================== */
 
 .sapUxAPObjectPageSubSection {
-	padding-bottom: 0;
+	padding-top: 1rem;
 	box-sizing: border-box;
 }
 
@@ -16,7 +16,7 @@
 	height: auto;
 	overflow: auto;
 	word-wrap: break-word;
-	padding: 1rem 2.25rem 0 3rem
+	padding: 0 2.25rem 0 3rem
 }
 
 .sapUxAPObjectPageSubSectionHeaderTitle {
@@ -50,7 +50,7 @@
 /* phone display */
 .sapUxAPObjectPageLayout-Std-Phone .sapUxAPObjectPageSubSectionHeader,
 html .sapUiContainer-Narrow .sapUxAPObjectPageSubSectionHeader {
-	padding: 1rem;
+	padding: 0 1rem;
 }
 
 .sapUxAPObjectPageLayout-Std-Phone .sapUxAPObjectPageSubSectionHeaderTitle,
@@ -67,7 +67,7 @@ html .sapUiContainer-Narrow .sapUxAPObjectPageSubSectionHeaderTitle {
 
 .sapUxAPObjectPageLayout-Std-Tablet .sapUxAPObjectPageSubSectionHeader,
 html .sapUiContainer-Medium .sapUxAPObjectPageSubSectionHeader {
-	padding: 1rem 1.25rem 0 2rem;
+	padding: 0 1.25rem 0 2rem;
 }
 
 /* Those styles apply Desktop and Desktop-XL.
@@ -101,7 +101,6 @@ Doing so will result in less generated CSS, as well as less future maintanance i
 		white-space: normal;
 		word-wrap: break-word;
 		line-height: normal;
-		padding-top: 1rem;
 	}
 
 	.sapUxAPObjectPageSubSectionHeader.titleOnLeftLayout .sapUxAPObjectPageSubSectionHeaderActions {
@@ -141,10 +140,10 @@ Doing so will result in less generated CSS, as well as less future maintanance i
 }
 
 .sapUxAPBlockContainer {
-	padding: 1rem 2rem 3rem 2rem;
+	padding: 0 2rem;
 }
 .sapUxAPObjectPageLayout-Std-Tablet .sapUxAPBlockContainer {
-	padding: 1rem 1rem 3rem 1rem;
+	padding: 0 1rem;
 }
 .sapUxAPObjectPageLayout-Std-Phone .sapUxAPBlockContainer {
 	padding: 0 1rem;
@@ -154,20 +153,6 @@ Doing so will result in less generated CSS, as well as less future maintanance i
 	}
 }
 
-.sapUxAPObjectPageLayout-Std-Tablet .sapUxAPObjectPageSubSectionWithSeeMore {
-	.sapUxAPBlockContainer {
-		padding-bottom: 0;
-	}
-
-	.sapUxAPSubSectionSeeMoreContainer {
-		padding-bottom: 2rem;
-	}
-}
-
-
-.sapUxAPObjectPageLayout-Std-Phone .sapUxAPObjectPageSubSectionPromoted .sapUxAPBlockContainer {
-	padding-top: 1rem;
-}
 
 .sapUxAPObjectPageLayout-Std-Phone .sapUxAPObjectPageSubSection {
 	.sapUiRespGrid.sapUiRespGridHSpace1 {
@@ -200,35 +185,15 @@ Doing so will result in less generated CSS, as well as less future maintanance i
 	}
 }
 
-.sapUxAPObjectPageSection .sapUxAPObjectPageSectionContainer .sapUxAPObjectPageSubSection .sapUxAPBlockContainer {
-    padding-bottom: 0;
-}
 /* compact size */
 .sapUiSizeCompact {
 	.sapUxAPObjectPageSubSectionHeaderTitle {
 		height: 2rem;
 		line-height: 2rem;
 	}
-	.sapUxAPBlockContainer {
-		padding: 1rem 2rem 2rem 2rem;
-	}
-	.sapUxAPObjectPageLayout-Std-Tablet .sapUxAPBlockContainer,
-	.sapUxAPObjectPageLayout-Std-Phone .sapUxAPBlockContainer {
-		padding: 1rem 1rem 2rem 1rem;
-	}
 	.sapUxAPObjectPageLayout-Std-Phone .sapUxAPBlockContainer .sapUiFormResGrid > div{
 		padding: 1rem 0;
 	}
-
-	.sapUxAPObjectPageSubSectionWithSeeMore {
-		.sapUxAPBlockContainer {
-			padding-bottom: 0;
-		}
-
-		.sapUxAPSubSectionSeeMoreContainer {
-			padding-bottom: 2rem;
-		}
-	}
 }
 
 html[data-sap-ui-browser^="ed"].sap-desktop .sapUxAPObjectPageSubSection:focus {