@sapui5/sap.fe.templates 1.97.0 → 1.100.0

package/src/sap/fe/templates/ObjectPage/overrides/Share.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -229,25 +230,29 @@ sap.ui.define(
 			}
 		}
 
-		/**
-		 * Get share URL.
-		 * @param sEditMode
-		 * @param bIsStickySupported
-		 * @param aActiveContextPaths
-		 * @returns {string} The share URL
-		 * @protected
-		 * @static
-		 */
-		function getShareUrl(sEditMode, bIsStickySupported, aActiveContextPaths) {
-			var sShareUrl;
-			var sHash = HashChanger.getInstance().getHash();
-			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
-			if (sEditMode === "Editable" && !bIsStickySupported && aActiveContextPaths) {
-				sShareUrl = sBasePath + aActiveContextPaths.join("/");
+		// /**
+		//  * Get share URL.
+		//  * @param sEditMode
+		//  * @param bIsStickySupported
+		//  * @param aActiveContextPaths
+		//  * @returns {string} The share URL
+		//  * @protected
+		//  * @static
+		//  */
+		function getShareUrl() {
+			var oUShellContainer = sap.ushell && sap.ushell.Container;
+			if (oUShellContainer) {
+				return oUShellContainer
+					.getFLPUrlAsync(true)
+					.then(function(sFLPUrl) {
+						return sFLPUrl;
+					})
+					.catch(function(sError) {
+						Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+					});
 			} else {
-				sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
+				return Promise.resolve(document.URL);
 			}
-			return sShareUrl;
 		}
 
 		function getJamUrl(sEditMode, bIsStickySupported, aActiveContextPaths) {
@@ -282,32 +287,32 @@ sap.ui.define(
 				oUIModel = this.base.getView().getModel("ui");
 				sEditMode = oUIModel.getProperty("/editMode");
 				return fetchActiveContextPaths(oContext, that.base.getView().getController()).then(function(aActiveContextPaths) {
-					var aPromises = [];
-					aPromises.push(
-						that.base
-							.getView()
-							.getController()
-							._getPageTitleInformation()
-					);
-					aPromises.push(getJamUrl(sEditMode, bIsStickySupported, aActiveContextPaths));
-					return Promise.all(aPromises).then(function(oData) {
-						var oPageTitleInfo = oData[0];
-						var sJamUrl = oData[1];
-						var sTitle = oPageTitleInfo.title;
-						var sObjectSubtitle = oPageTitleInfo.subtitle.toString();
-						if (sObjectSubtitle) {
-							sTitle = sTitle + " - " + sObjectSubtitle;
-						}
-						oShareMetadata.tile = {
-							title: oPageTitleInfo.title,
-							subtitle: oPageTitleInfo.subtitle.toString()
-						};
-						oShareMetadata.email.title = sTitle;
-						oShareMetadata.title = sTitle;
-						oShareMetadata.url = getShareUrl(sEditMode, bIsStickySupported, aActiveContextPaths);
-						oShareMetadata.jam.url = sJamUrl;
-						return oShareMetadata;
-					});
+					var oPageTitleInfo = that.base
+						.getView()
+						.getController()
+						._getPageTitleInformation();
+
+					return Promise.all([getJamUrl(sEditMode, bIsStickySupported, aActiveContextPaths), getShareUrl()])
+						.then(function(oData) {
+							var sTitle = oPageTitleInfo.title;
+							var sObjectSubtitle = oPageTitleInfo.subtitle.toString();
+							if (sObjectSubtitle) {
+								sTitle = sTitle + " - " + sObjectSubtitle;
+							}
+							oShareMetadata.tile = {
+								title: oPageTitleInfo.title,
+								subtitle: oPageTitleInfo.subtitle.toString()
+							};
+							oShareMetadata.email.title = sTitle;
+							oShareMetadata.title = sTitle;
+							oShareMetadata.jam.url = oData[0];
+							oShareMetadata.url = oData[1];
+
+							return oShareMetadata;
+						})
+						.catch(function(error) {
+							Log.error(error);
+						});
 				});
 			}
 		};

package/src/sap/fe/templates/ObjectPage/overrides/ViewState.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["sap/fe/core/library", "sap/fe/core/helpers/KeepAliveHelper"], function(CoreLibrary, KeepAliveHelper) {
 	"use strict";
@@ -40,26 +41,6 @@ sap.ui.define(["sap/fe/core/library", "sap/fe/core/helpers/KeepAliveHelper"], fu
 
 			aStateControls.push(oView.byId("fe::ObjectPage"));
 		},
-		adaptControlStateHandler: function(oControl, aControlHandler) {
-			if (oControl.isA("sap.ui.fl.variants.VariantManagement")) {
-				aControlHandler.push({
-					retrieve: function(oVM) {
-						return {
-							"variantId": oVM.getCurrentVariantKey()
-						};
-					},
-					apply: function(oVM, oControlState) {
-						if (
-							oControlState &&
-							oControlState.variantId !== undefined &&
-							!(oControlState.variantId === oVM.getId() && oVM.getModified() === false)
-						) {
-							oVM.setModified(true);
-						}
-					}
-				});
-			}
-		},
 		adaptBindingRefreshControls: function(aControls) {
 			var oView = this.getView(),
 				sRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),

package/src/sap/fe/templates/ObjectPage/templating/ObjectPageTemplating.js

@@ -117,4 +117,4 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression", "sap/fe/core/converters/
   _exports.getExpressionForSaveButton = getExpressionForSaveButton;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ObjectPageTemplating.ts"],"names":["getExpressionForTitle","oHeaderInfo","oViewData","fullContextPath","oDraftRoot","titleNoHeaderInfo","CommonUtils","getTranslatedText","resourceBundle","undefined","entitySet","titleWithHeaderInfo","oEmptyHeaderInfoTitle","Title","Value","titleForActiveHeaderNoHeaderInfo","titleValueExpression","annotationExpression","$target","annotations","Common","Text","UI","TextArrangement","addTextArrangementToBindingExpression","formatValueRecursively","createModeTitle","TypeName","concat","toString","activeExpression","Entity","IsActive","compileBinding","ifElse","and","IsCreateMode","isEmpty","getExpressionForDescription","bindingExpression","Description","getExpressionForSaveButton","saveButtonText","createButtonText","saveExpression","isStickySessionSupported","startingEntitySet","IsCreateModeSticky","Draft","IsNewObject"],"mappings":"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","sourceRoot":".","sourcesContent":["// Formatters for the Object Page\nimport {\n\tand,\n\tifElse,\n\tisEmpty,\n\tconcat,\n\tannotationExpression,\n\tcompileBinding,\n\tBindingExpression\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { UI, Draft, Entity } from \"sap/fe/core/converters/helpers/BindingHelper\";\nimport { CommonUtils } from \"sap/fe/core\";\nimport { HeaderInfoType } from \"@sap-ux/vocabularies-types\";\nimport { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { addTextArrangementToBindingExpression, formatValueRecursively } from \"sap/fe/macros/field/FieldTemplating\";\nimport { DataFieldTypes } from \"@sap-ux/vocabularies-types/dist/generated/UI\";\nimport { isStickySessionSupported } from \"sap/fe/core/templating/EntitySetHelper\";\nimport { ResourceBundle } from \"sap/base/i18n\";\n\ntype ViewData = {\n\tresourceBundle: ResourceBundle;\n\tentitySet: string;\n};\n\n//```mermaid\n// graph TD\n// A[Object Page Title] -->|Get DataField Value| C{Evaluate Create Mode}\n// C -->|In Create Mode| D{Is DataField Value empty}\n// D -->|Yes| F{Is there a TypeName}\n// F -->|Yes| G[Is there an custom title]\n// G -->|Yes| G1[Show the custom title + 'TypeName']\n// G -->|No| G2[Display the default title 'New + TypeName']\n// F -->|No| H[Is there a custom title]\n// H -->|Yes| I[Show the custom title]\n// H -->|No| J[Show the default 'Unamned Object']\n// D -->|No| E\n// C -->|Not in create mode| E[Show DataField Value]\n// ```\n/**\n * Compute the title for the object page.\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param oViewData The view data object we're currently on\n * @param fullContextPath The full context path used to reach that object page\n * @param oDraftRoot\n * @returns The binding expression for the object page title\n */\nexport const getExpressionForTitle = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\toViewData: ViewData,\n\tfullContextPath: DataModelObjectPath,\n\toDraftRoot: Object | undefined\n): BindingExpression<string> {\n\tconst titleNoHeaderInfo = CommonUtils.getTranslatedText(\"T_NEW_OBJECT\", oViewData.resourceBundle, undefined, oViewData.entitySet);\n\n\tconst titleWithHeaderInfo = CommonUtils.getTranslatedText(\n\t\t\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE\",\n\t\toViewData.resourceBundle,\n\t\tundefined,\n\t\toViewData.entitySet\n\t);\n\n\tconst oEmptyHeaderInfoTitle =\n\t\toHeaderInfo?.Title === undefined || oHeaderInfo?.Title === \"\" || (oHeaderInfo?.Title as DataFieldTypes)?.Value === \"\";\n\n\tconst titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle\n\t\t? CommonUtils.getTranslatedText(\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO\", oViewData.resourceBundle)\n\t\t: \"\";\n\n\tlet titleValueExpression = annotationExpression((oHeaderInfo?.Title as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Title as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\ttitleValueExpression = addTextArrangementToBindingExpression(titleValueExpression, fullContextPath);\n\t}\n\n\ttitleValueExpression = formatValueRecursively(titleValueExpression, fullContextPath);\n\n\t// If there is a TypeName defined, show the default title 'New + TypeName', otherwise show the custom title or the default 'New object'\n\tconst createModeTitle = oHeaderInfo?.TypeName\n\t\t? concat(titleWithHeaderInfo, \": \", annotationExpression(oHeaderInfo.TypeName.toString()))\n\t\t: titleNoHeaderInfo;\n\tconst activeExpression = oDraftRoot ? Entity.IsActive : true;\n\n\treturn compileBinding(\n\t\tifElse(\n\t\t\t// If Create Mode && Empty expression\n\t\t\tand(UI.IsCreateMode, titleValueExpression && isEmpty(titleValueExpression)),\n\n\t\t\tcreateModeTitle,\n\t\t\t// Otherwise show the default expression\n\t\t\tifElse(\n\t\t\t\tand(activeExpression, titleValueExpression && isEmpty(titleValueExpression)),\n\t\t\t\ttitleForActiveHeaderNoHeaderInfo,\n\t\t\t\ttitleValueExpression\n\t\t\t)\n\t\t)\n\t);\n};\n\n/**\n * Retrieves the expression for the description of an object page.\n *\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param fullContextPath The full context path used to reach that object page\n * @returns The binding expression for the object page description\n */\nexport const getExpressionForDescription = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\tfullContextPath: DataModelObjectPath\n): BindingExpression<string> {\n\tlet bindingExpression = annotationExpression((oHeaderInfo?.Description as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Description as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\tbindingExpression = addTextArrangementToBindingExpression(bindingExpression, fullContextPath);\n\t}\n\n\treturn compileBinding(formatValueRecursively(bindingExpression, fullContextPath));\n};\n\n/**\n * Return the expression for the save button.\n *\n * @param oViewData The current view data\n * @param fullContextPath The path used up until here\n * @returns The binding expression that shows the right save button text\n */\nexport const getExpressionForSaveButton = function(oViewData: ViewData, fullContextPath: DataModelObjectPath): BindingExpression<string> {\n\tconst saveButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_SAVE\", oViewData.resourceBundle);\n\tconst createButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_CREATE\", oViewData.resourceBundle);\n\tlet saveExpression;\n\tif (isStickySessionSupported(fullContextPath.startingEntitySet)) {\n\t\t// If we're in sticky mode AND the ui is in create mode, show Create, else show Save\n\t\tsaveExpression = ifElse(UI.IsCreateModeSticky, createButtonText, saveButtonText);\n\t} else {\n\t\t// If we're in draft AND the draft is a new object (!IsActiveEntity && !HasActiveEntity), show create, else show save\n\t\tsaveExpression = ifElse(Draft.IsNewObject, createButtonText, saveButtonText);\n\t}\n\treturn compileBinding(saveExpression);\n};\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ObjectPageTemplating.ts"],"names":["getExpressionForTitle","oHeaderInfo","oViewData","fullContextPath","oDraftRoot","titleNoHeaderInfo","CommonUtils","getTranslatedText","resourceBundle","undefined","entitySet","titleWithHeaderInfo","oEmptyHeaderInfoTitle","Title","Value","titleForActiveHeaderNoHeaderInfo","titleValueExpression","annotationExpression","$target","annotations","Common","Text","UI","TextArrangement","addTextArrangementToBindingExpression","formatValueRecursively","createModeTitle","TypeName","concat","toString","activeExpression","Entity","IsActive","compileBinding","ifElse","and","IsCreateMode","isEmpty","getExpressionForDescription","bindingExpression","Description","getExpressionForSaveButton","saveButtonText","createButtonText","saveExpression","isStickySessionSupported","startingEntitySet","IsCreateModeSticky","Draft","IsNewObject"],"mappings":"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","sourceRoot":".","sourcesContent":["// Formatters for the Object Page\nimport {\n\tand,\n\tifElse,\n\tisEmpty,\n\tconcat,\n\tannotationExpression,\n\tcompileBinding,\n\tBindingExpression\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { UI, Draft, Entity } from \"sap/fe/core/converters/helpers/BindingHelper\";\nimport CommonUtils from \"sap/fe/core/CommonUtils\";\nimport { HeaderInfoType } from \"@sap-ux/vocabularies-types\";\nimport { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { addTextArrangementToBindingExpression, formatValueRecursively } from \"sap/fe/macros/field/FieldTemplating\";\nimport { DataFieldTypes } from \"@sap-ux/vocabularies-types/dist/generated/UI\";\nimport { isStickySessionSupported } from \"sap/fe/core/templating/EntitySetHelper\";\nimport ResourceBundle from \"sap/base/i18n/ResourceBundle\";\n\ntype ViewData = {\n\tresourceBundle: ResourceBundle;\n\tentitySet: string;\n};\n\n//```mermaid\n// graph TD\n// A[Object Page Title] -->|Get DataField Value| C{Evaluate Create Mode}\n// C -->|In Create Mode| D{Is DataField Value empty}\n// D -->|Yes| F{Is there a TypeName}\n// F -->|Yes| G[Is there an custom title]\n// G -->|Yes| G1[Show the custom title + 'TypeName']\n// G -->|No| G2[Display the default title 'New + TypeName']\n// F -->|No| H[Is there a custom title]\n// H -->|Yes| I[Show the custom title]\n// H -->|No| J[Show the default 'Unamned Object']\n// D -->|No| E\n// C -->|Not in create mode| E[Show DataField Value]\n// ```\n/**\n * Compute the title for the object page.\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param oViewData The view data object we're currently on\n * @param fullContextPath The full context path used to reach that object page\n * @param oDraftRoot\n * @returns The binding expression for the object page title\n */\nexport const getExpressionForTitle = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\toViewData: ViewData,\n\tfullContextPath: DataModelObjectPath,\n\toDraftRoot: Object | undefined\n): BindingExpression<string> {\n\tconst titleNoHeaderInfo = CommonUtils.getTranslatedText(\"T_NEW_OBJECT\", oViewData.resourceBundle, undefined, oViewData.entitySet);\n\n\tconst titleWithHeaderInfo = CommonUtils.getTranslatedText(\n\t\t\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE\",\n\t\toViewData.resourceBundle,\n\t\tundefined,\n\t\toViewData.entitySet\n\t);\n\n\tconst oEmptyHeaderInfoTitle =\n\t\toHeaderInfo?.Title === undefined || oHeaderInfo?.Title === \"\" || (oHeaderInfo?.Title as DataFieldTypes)?.Value === \"\";\n\n\tconst titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle\n\t\t? CommonUtils.getTranslatedText(\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO\", oViewData.resourceBundle)\n\t\t: \"\";\n\n\tlet titleValueExpression = annotationExpression((oHeaderInfo?.Title as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Title as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\ttitleValueExpression = addTextArrangementToBindingExpression(titleValueExpression, fullContextPath);\n\t}\n\n\ttitleValueExpression = formatValueRecursively(titleValueExpression, fullContextPath);\n\n\t// If there is a TypeName defined, show the default title 'New + TypeName', otherwise show the custom title or the default 'New object'\n\tconst createModeTitle = oHeaderInfo?.TypeName\n\t\t? concat(titleWithHeaderInfo, \": \", annotationExpression(oHeaderInfo.TypeName.toString()))\n\t\t: titleNoHeaderInfo;\n\tconst activeExpression = oDraftRoot ? Entity.IsActive : true;\n\n\treturn compileBinding(\n\t\tifElse(\n\t\t\t// If Create Mode && Empty expression\n\t\t\tand(UI.IsCreateMode, titleValueExpression && isEmpty(titleValueExpression)),\n\n\t\t\tcreateModeTitle,\n\t\t\t// Otherwise show the default expression\n\t\t\tifElse(\n\t\t\t\tand(activeExpression, titleValueExpression && isEmpty(titleValueExpression)),\n\t\t\t\ttitleForActiveHeaderNoHeaderInfo,\n\t\t\t\ttitleValueExpression\n\t\t\t)\n\t\t)\n\t);\n};\n\n/**\n * Retrieves the expression for the description of an object page.\n *\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param fullContextPath The full context path used to reach that object page\n * @returns The binding expression for the object page description\n */\nexport const getExpressionForDescription = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\tfullContextPath: DataModelObjectPath\n): BindingExpression<string> {\n\tlet bindingExpression = annotationExpression((oHeaderInfo?.Description as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Description as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\tbindingExpression = addTextArrangementToBindingExpression(bindingExpression, fullContextPath);\n\t}\n\n\treturn compileBinding(formatValueRecursively(bindingExpression, fullContextPath));\n};\n\n/**\n * Return the expression for the save button.\n *\n * @param oViewData The current view data\n * @param fullContextPath The path used up until here\n * @returns The binding expression that shows the right save button text\n */\nexport const getExpressionForSaveButton = function(oViewData: ViewData, fullContextPath: DataModelObjectPath): BindingExpression<string> {\n\tconst saveButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_SAVE\", oViewData.resourceBundle);\n\tconst createButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_CREATE\", oViewData.resourceBundle);\n\tlet saveExpression;\n\tif (isStickySessionSupported(fullContextPath.startingEntitySet)) {\n\t\t// If we're in sticky mode AND the ui is in create mode, show Create, else show Save\n\t\tsaveExpression = ifElse(UI.IsCreateModeSticky, createButtonText, saveButtonText);\n\t} else {\n\t\t// If we're in draft AND the draft is a new object (!IsActiveEntity && !HasActiveEntity), show create, else show save\n\t\tsaveExpression = ifElse(Draft.IsNewObject, createButtonText, saveButtonText);\n\t}\n\treturn compileBinding(saveExpression);\n};\n"]}

package/src/sap/fe/templates/ObjectPage/templating/ObjectPageTemplating.ts

@@ -9,13 +9,13 @@ import {
 	BindingExpression
 } from "sap/fe/core/helpers/BindingExpression";
 import { UI, Draft, Entity } from "sap/fe/core/converters/helpers/BindingHelper";
-import { CommonUtils } from "sap/fe/core";
+import CommonUtils from "sap/fe/core/CommonUtils";
 import { HeaderInfoType } from "@sap-ux/vocabularies-types";
 import { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
 import { addTextArrangementToBindingExpression, formatValueRecursively } from "sap/fe/macros/field/FieldTemplating";
 import { DataFieldTypes } from "@sap-ux/vocabularies-types/dist/generated/UI";
 import { isStickySessionSupported } from "sap/fe/core/templating/EntitySetHelper";
-import { ResourceBundle } from "sap/base/i18n";
+import ResourceBundle from "sap/base/i18n/ResourceBundle";
 
 type ViewData = {
 	resourceBundle: ResourceBundle;

package/src/sap/fe/templates/ObjectPage/view/fragments/Actions.fragment.xml

@@ -179,5 +179,5 @@
 		</template:repeat>
 	</template:if>
 	<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.RelatedApps" type="XML" />
-	<macro:Share id="fe::Share" shortCutExists="true" visible="{= OP.getShareButtonVisibility(${viewData>/}) }" />
+	<macro:Share id="fe::Share" visible="{= OP.getShareButtonVisibility(${viewData>/}) }" />
 </core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/CollaborationDraft.fragment.xml

@@ -0,0 +1,36 @@
+<core:FragmentDefinition
+	xmlns:f="sap.f"
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{
+		FE_MODEL: 'sap/fe/core/helpers/ModelHelper'
+	}"
+>
+	<template:if test="{entitySet>@@FE_MODEL.isCollaborationDraftSupported}">
+		<!-- issues with rendering therefore using HBox for now
+		<AvatarGroup avatarDisplaySize="XS" groupType="Individual" visible="{ui>/isEditable}" items="{ui>/collaboration/activeUsers}">
+			<AvatarGroupItem initials="{ui>initials}" />
+		</AvatarGroup>
+	-->
+		<HBox
+			class="sapUiTinyMarginBegin"
+			items="{internal>/collaboration/activeUsers}"
+			visible="{= ${ui>/isEditable} &amp;&amp; ${internal>/collaboration/connected} }"
+		>
+			<f:Avatar initials="{internal>initials}" backgroundColor="Accent{internal>color}" displaySize="XS" press="._showCollaborationUserDetails" />
+		</HBox>
+
+		<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot/ShareAction}">
+			<!-- For now the invite action is only shown on the root. we might provide it on all levels later as well -->
+			<!-- Button class="sapUiTinyMarginBegin" visible="{ui>/isEditable}" text="Invite" press="._manageCollaboration" / -->
+			<Avatar
+				visible="{ui>/isEditable}"
+				backgroundColor="TileIcon"
+				src="sap-icon://add-employee"
+				displaySize="XS"
+				press="._manageCollaboration"
+			/>
+		</template:if>
+	</template:if>
+</core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/EditableHeaderFacet.fragment.xml

@@ -38,7 +38,7 @@
 				unittest:id="HeaderInfoFormContainerTest"
 				id="fe::EditableHeaderForm::EditableHeaderInfo"
 				title="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}"
-				visible="{= OP.getVisiblityOfHeaderFacet(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@@FIELD.fieldControl}) }"
+				visible="{= OP.getVisiblityOfHeaderFacet(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@@FIELD.fieldControl},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/Value/$Path@@FIELD.fieldControl}) }"
 			>
 				<f:dependents>
 					<macro:ValueHelp

package/src/sap/fe/templates/ObjectPage/view/fragments/FooterContent.fragment.xml

@@ -96,7 +96,11 @@
 							visible="{= ${ui>/editMode} === 'Editable' }"
 							ariaHasPopup="Dialog"
 							enabled="true"
-						/>
+						>
+							<layoutData>
+								<OverflowToolbarLayoutData priority="NeverOverflow" />
+							</layoutData>
+						</Button>
 					</template:elseif>
 					<template:elseif test="{= CORE.isManifestAction(${footerAction>}) }">
 						<Button

package/src/sap/fe/templates/ObjectPage/view/fragments/HeaderFacet.fragment.xml

@@ -23,6 +23,7 @@
 		unittest:id="headerFacetContent"
 		class="sapUiMediumMarginEnd sapUiSmallMarginBottom"
 		visible="{converterHeaderFacet>visible}"
+		fallbackTitle="{headerFacet>@@MODEL.label}"
 		binding="{= OP.getStashableHBoxBinding(${viewData>/controlConfiguration}, { Facet: ${converterHeaderFacet>} })}"
 		stashed="{converterHeaderFacet>stashed}"
 	>

package/src/sap/fe/templates/ObjectPage/view/fragments/HeaderFacetCustomContainer.fragment.xml

@@ -20,6 +20,7 @@
 		unittest:id="headerFacetContent"
 		class="sapUiMediumMarginEnd sapUiSmallMarginBottom"
 		visible="{converterHeaderFacet>visible}"
+		fallbackTitle="{converterHeaderFacet>title}"
 		binding="{converterHeaderFacet>binding}"
 		stashed="{converterHeaderFacet>stashed}"
 	>

package/src/sap/fe/templates/ObjectPage/view/fragments/Heading.fragment.xml

@@ -0,0 +1,33 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:uxap="sap.uxap"
+	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{
+		OPTemplating: 'sap/fe/templates/ObjectPage/templating/ObjectPageTemplating',
+		UI: 'sap/fe/core/templating/UIFormatters'
+	}"
+>
+	<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
+	<template:with path="header>avatar" var="avatar">
+		<uxap:expandedHeading>
+			<FlexBox>
+				<FlexBox visible="{header>title/expandedImageVisible}">
+					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingAvatar" type="XML" />
+				</FlexBox>
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingTitle" type="XML" />
+			</FlexBox>
+		</uxap:expandedHeading>
+		<uxap:snappedHeading>
+			<FlexBox>
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingAvatar" type="XML" />
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingTitle" type="XML" />
+			</FlexBox>
+		</uxap:snappedHeading>
+		<uxap:snappedTitleOnMobile>
+			<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeadingTitle" type="XML" />
+		</uxap:snappedTitleOnMobile>
+	</template:with>
+	</template:with>
+</core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/HeadingAvatar.fragment.xml

@@ -0,0 +1,17 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+>
+	<template:if test="{avatar>}">
+        <Avatar
+			class="sapUiSmallMarginEnd"
+			src="{avatar>src}"
+			initials="{avatar>initials}"
+			fallbackIcon="{avatar>fallbackIcon}"
+			displayShape="{avatar>displayShape}"
+			displaySize="S"
+		/>
+	</template:if>
+</core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/HeadingTitle.fragment.xml

@@ -0,0 +1,18 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:uxap="sap.uxap"
+	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{
+		OPTemplating: 'sap/fe/templates/ObjectPage/templating/ObjectPageTemplating',
+		UI: 'sap/fe/core/templating/UIFormatters'
+	}"
+>
+	<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
+        <Title
+			text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
+			wrapping="true"
+		/>
+	</template:with>
+</core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/Section.fragment.xml

@@ -55,17 +55,36 @@
 							showTitle="{subSection>showTitle}"
 							visible="{subSection>visible}"
 						>
-							<uxap:customData>
+							<!--uxap:customData>
 								<core:CustomData key="strategyForVisibilityChange" value="lazyLoading" />
+							</uxap:customData-->
+							<uxap:customData>
+								<core:CustomData key="isVisibilityDynamic" value="{subSection>isVisibilityDynamic}" />
 							</uxap:customData>
 							<template:if test="{= ${subSection>type} === 'Mixed'}">
 								<template:then>
-									<template:repeat list="{subSection>content}" var="subSection">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
-									</template:repeat>
+									<template:if test="{viewData>/useNewLazyLoading}">
+										<template:then>
+											<template:repeat list="{subSection>content}" var="subSection">
+												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+											</template:repeat>
+										</template:then>
+										<template:else>
+											<template:repeat list="{subSection>content}" var="subSection">
+												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+											</template:repeat>
+										</template:else>
+									</template:if>
 								</template:then>
 								<template:else>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+									<template:if test="{viewData>/useNewLazyLoading}">
+										<template:then>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+										</template:then>
+										<template:else>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+										</template:else>
+									</template:if>
 								</template:else>
 							</template:if>
 						</uxap:ObjectPageSubSection>

package/src/sap/fe/templates/ObjectPage/view/fragments/SectionContent.fragment.xml

@@ -131,10 +131,7 @@
                 <template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
                     <uxap:blocks>
                         <template:if test="{= ${subSection>level} === 2}">
-                            <Title
-							text="{subSection>title}"
-							visible="{= ${subSection>visible} &amp;&amp; ${subSection>title} !=='undefined' &amp;&amp; ${subSection>showTitle} ? true : false}"
-						/>
+                            <Title text="{subSection>title}" visible="{subSection>titleVisible}" />
                         </template:if>
                          <opcontrol:SubSectionBlock visible="{subSection>visible}">
                             <opcontrol:content>

package/src/sap/fe/templates/ObjectPage/view/fragments/SectionContentLazyLoader.fragment.xml

@@ -0,0 +1,181 @@
+<core:FragmentDefinition
+	xmlns:uxap="sap.uxap"
+	xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	xmlns:fpm="sap.fe.macros.fpm"
+	xmlns:macro="sap.fe.macros"
+	xmlns:layout="sap.ui.layout"
+	xmlns:dt="sap.ui.dt"
+	xmlns="sap.m"
+	xmlns:opcontrol="sap.fe.templates.ObjectPage.controls"
+	template:require="{
+		fpm: 'sap/fe/macros/fpm/fpm',
+		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		COMMON: 'sap/fe/macros/CommonHelper',
+		ID: 'sap/fe/core/helpers/StableIdHelper'
+	}"
+>
+		<!-- We want to ensure that statically non visible sections are non visible-->
+         <template:if test="{subSection>visible}">
+            <template:if test="{= ${subSection>type} === 'XMLFragment'}">
+                <template:then>
+                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+                    <uxap:blocks>
+						<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                        <opcontrol:SubSectionBlock>
+                            <opcontrol:content>
+                                <template:if test="{= ${subSection>sideContent} !== undefined}">
+                                    <template:then>
+                                        <layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+                                            <layout:mainContent>
+                                                <core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
+													type="XML"
+												/>
+                                            </layout:mainContent>
+                                            <layout:sideContent>
+                                                <core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer"
+													type="XML"
+												/>
+                                            </layout:sideContent>
+                                        </layout:DynamicSideContent>
+                                    </template:then>
+                                    <template:else>
+                                        <core:Fragment
+											fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
+											type="XML"
+										/>
+                                    </template:else>
+                                </template:if>
+                            </opcontrol:content>
+                        </opcontrol:SubSectionBlock>
+						</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+
+                </template:then>
+                <template:elseif test="{= ${subSection>type} === 'Form'}">
+                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+                    <uxap:blocks>
+					<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                    <opcontrol:SubSectionBlock>
+                        <opcontrol:content>
+							<template:if test="{= ${subSection>sideContent} !== undefined}">
+							<template:then>
+								<layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+									<layout:mainContent>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
+									</layout:mainContent>
+									<layout:sideContent>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+									</layout:sideContent>
+								</layout:DynamicSideContent>
+
+							</template:then>
+							<template:else>
+								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
+							</template:else>
+							</template:if>
+                        </opcontrol:content>
+                    </opcontrol:SubSectionBlock>
+					</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+                    <template:if test="{subSection>formDefinition/hasFacetsNotPartOfPreview}">
+                        <template:then>
+                            <!-- Button "Show More / Less" is displayed for a collection facets that contains at least one reference facets with annotation "PartOfPreview === TRUE" -->
+                            <uxap:moreBlocks>
+                                <template:if test="{= ${subSection>level} === 2}">
+                                    <Title text="{subSection>title}" />
+                                </template:if>
+                                <opcontrol:SubSectionBlock>
+                                    <opcontrol:content>
+										<template:if test="{= ${subSection>sideContent} !== undefined}">
+										<template:then>
+											<layout:DynamicSideContent
+												id="{= ID.generate(['fe', ${subSection>key}, 'MoreSideContentLayout'])}"
+												showMainContent="true"
+												showSideContent="{subSection>sideContent/visible}"
+												sideContentFallDown="BelowM"
+												containerQuery="true"
+												equalSplit="{subSection>sideContent/equalSplit}"
+											>
+												<layout:mainContent>
+													<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+												</layout:mainContent>
+												<layout:sideContent>
+													<!--No Side Content for MoreBlocks so far-->
+												</layout:sideContent>
+											</layout:DynamicSideContent>
+										</template:then>
+										<template:else>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+										</template:else>
+										</template:if>
+                                    </opcontrol:content>
+                                </opcontrol:SubSectionBlock>
+                            </uxap:moreBlocks>
+                        </template:then>
+                    </template:if>
+                </template:elseif>
+                <template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
+                    <uxap:blocks>
+						<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                        <template:if test="{= ${subSection>level} === 2}">
+                            <Title
+								text="{subSection>title}"
+								visible="{= ${subSection>visible} &amp;&amp; ${subSection>title} !=='undefined' &amp;&amp; ${subSection>showTitle} ? true : false}"
+							/>
+                        </template:if>
+                         <opcontrol:SubSectionBlock visible="{subSection>visible}">
+                            <opcontrol:content>
+								<template:if test="{= ${subSection>sideContent} !== undefined}">
+								<template:then>
+									<layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+										<layout:mainContent>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+										</layout:mainContent>
+										<layout:sideContent>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+										</layout:sideContent>
+									</layout:DynamicSideContent>
+								</template:then>
+								<template:else>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+								</template:else>
+								</template:if>
+                            </opcontrol:content>
+                        </opcontrol:SubSectionBlock>
+					</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+                </template:elseif>
+                <template:elseif test="{= ${subSection>type} === 'Unknown'}">
+                    <Text text="{subSection>text}" />
+                </template:elseif>
+                <template:else>
+
+                </template:else>
+            </template:if>
+        </template:if>
+</core:FragmentDefinition>