@sapui5/sap.fe.templates 1.97.0 → 1.98.0

package/src/sap/fe/templates/ObjectPage/ObjectPageController.controller.js

@@ -1,13 +1,12 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
 		"sap/fe/core/PageController",
 		"sap/fe/core/controllerextensions/InternalRouting",
 		"./overrides/InternalRouting",
-		"sap/fe/core/controllerextensions/SideEffects",
 		"sap/fe/core/controllerextensions/EditFlow",
 		"sap/fe/core/controllerextensions/InternalEditFlow",
 		"sap/fe/core/controllerextensions/PageReady",
@@ -41,13 +40,14 @@ sap.ui.define(
 		"sap/ui/model/json/JSONModel",
 		"sap/fe/core/controllerextensions/Paginator",
 		"./overrides/Paginator",
-		"sap/fe/core/controllerextensions/Placeholder"
+		"sap/fe/core/controllerextensions/Placeholder",
+		"sap/base/util/UriParameters",
+		"sap/fe/core/controllerextensions/MassEdit"
 	],
 	function(
 		PageController,
 		InternalRouting,
 		InternalRoutingOverride,
-		SideEffects,
 		EditFlow,
 		InternalEditFlow,
 		PageReady,
@@ -81,7 +81,9 @@ sap.ui.define(
 		JSONModel,
 		Paginator,
 		PaginatorOverride,
-		Placeholder
+		Placeholder,
+		UriParameters,
+		MassEdit
 	) {
 		"use strict";
 
@@ -100,7 +102,6 @@ sap.ui.define(
 				}
 			},
 			placeholder: Placeholder,
-			sideEffects: SideEffects,
 			editFlow: EditFlow,
 			share: Share.override(ShareOverrides),
 			_editFlow: InternalEditFlow.override(EditFlowOverrides),
@@ -112,7 +113,7 @@ sap.ui.define(
 				getNavigationMode: function() {
 					var bIsStickyEditMode =
 						this._oView.getController().getStickyEditMode && this._oView.getController().getStickyEditMode();
-					return bIsStickyEditMode ? "explace" : "inplace";
+					return bIsStickyEditMode ? "explace" : undefined;
 				}
 			}),
 			viewState: ViewState.override(ViewStateOverrides),
@@ -121,6 +122,7 @@ sap.ui.define(
 					return true;
 				}
 			}),
+			massEdit: MassEdit,
 
 			getExtensionAPI: function(sId) {
 				if (sId) {
@@ -152,7 +154,7 @@ sap.ui.define(
 				});
 				oInternalModelContext.setProperty("batchGroups", this._getBatchGroupsForView());
 				oInternalModelContext.setProperty("errorNavigationSectionFlag", false);
-				if (oObjectPage.getEnableLazyLoading()) {
+				if (!this.getView().getViewData().useNewLazyLoading && oObjectPage.getEnableLazyLoading()) {
 					//Attaching the event to make the subsection context binding active when it is visible.
 					oObjectPage.attachEvent("subSectionEnteredViewPort", this._handleSubSectionEnteredViewPort.bind(this));
 				}
@@ -203,8 +205,8 @@ sap.ui.define(
 					aTables = this._findTables(),
 					oFastCreationRow,
 					oObjectPage = this.byId("fe::ObjectPage"),
-					oBinding = mParameters.listBinding,
 					oInternalModelContext = that.getView().getBindingContext("internal"),
+					oInternalModel = that.getView().getModel("internal"),
 					aBatchGroups = oInternalModelContext.getProperty("batchGroups"),
 					iViewLevel = this.getView().getViewData().viewLevel;
 
@@ -260,29 +262,37 @@ sap.ui.define(
 				});
 
 				//Set the Binding for Paginators using ListBinding ID
-				if (oBinding && iViewLevel > 1) {
-					if (oBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
-						this.paginator.initialize(oBinding, oContext);
-					} else {
-						//if the binding type is not ODataListBinding because of a deeplink navigation or a refresh of the page
-						// we need to create it
-						var sContextPath = oBinding.getPath().replace(/\([^\)]*\)*$/, ""); //removing the last tuple
-						var oBinding = new sap.ui.model.odata.v4.ODataListBinding(
-							oBinding.oModel,
-							"",
-							oBinding.oModel.createBindingContext(sContextPath)
-						);
-
-						oBinding.getContexts(0);
-						oBinding.attachEvent("change", function _setListBindingAsync() {
-							if (oBinding.getContexts().length > 0) {
-								that.paginator.initialize(oBinding, oContext);
-								oBinding.detachEvent("change", _setListBindingAsync);
-							}
-						});
+				if (iViewLevel > 1) {
+					var oBinding = mParameters && mParameters.listBinding,
+						oPaginatorCurrentContext = oInternalModel.getProperty("/paginatorCurrentContext");
+					if (oPaginatorCurrentContext) {
+						var oBindingToUse = oPaginatorCurrentContext.getBinding();
+						this.paginator.initialize(oBindingToUse, oPaginatorCurrentContext);
+						oInternalModel.setProperty("/paginatorCurrentContext", null);
+					} else if (oBinding) {
+						if (oBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
+							this.paginator.initialize(oBinding, oContext);
+						} else {
+							//if the binding type is not ODataListBinding because of a deeplink navigation or a refresh of the page
+							// we need to create it
+							var sContextPath = oBinding.getPath().replace(/\([^\)]*\)*$/, ""); //removing the last tuple
+							oBinding = new sap.ui.model.odata.v4.ODataListBinding(
+								oBinding.oModel,
+								"",
+								oBinding.oModel.createBindingContext(sContextPath)
+							);
+
+							oBinding.getContexts(0);
+							oBinding.attachEvent("change", function _setListBindingAsync() {
+								if (oBinding.getContexts().length > 0) {
+									that.paginator.initialize(oBinding, oContext);
+									oBinding.detachEvent("change", _setListBindingAsync);
+								}
+							});
+						}
 					}
 				}
-				if (oObjectPage.getEnableLazyLoading()) {
+				if (!this.getView().getViewData().useNewLazyLoading && oObjectPage.getEnableLazyLoading()) {
 					var aSections = oObjectPage.getSections(),
 						bUseIconTabBar = oObjectPage.getUseIconTabBar(),
 						iSkip = 2,
@@ -295,7 +305,9 @@ sap.ui.define(
 							// In IconTabBar mode keep the second section bound if there is an editable header and we are switching to display mode
 							if (iSkip < 1 || (bUseIconTabBar && (iSection > 1 || (iSection === 1 && !bEditableHeader && !bIsInEditMode)))) {
 								var oSubSection = aSubSections[iSubSection];
-								oSubSection.setBindingContext(null);
+								if (oSubSection.data().isVisibilityDynamic !== "true") {
+									oSubSection.setBindingContext(null);
+								}
 							}
 						}
 					}
@@ -322,30 +334,37 @@ sap.ui.define(
 			},
 
 			_getFirstEmptyMandatoryFieldFromSubSection: function(aSubSections) {
-				for (var subSection = 0; aSubSections && subSection < aSubSections.length; subSection++) {
-					var aBlocks = aSubSections[subSection].getBlocks();
-
-					for (var block = 0; aBlocks && block < aBlocks.length; block++) {
-						var aFormContainers;
-
-						if (aBlocks[block].isA("sap.ui.layout.form.Form")) {
-							aFormContainers = aBlocks[block].getFormContainers();
-						} else if (
-							aBlocks[block].getContent &&
-							aBlocks[block].getContent() &&
-							aBlocks[block].getContent().isA("sap.ui.layout.form.Form")
-						) {
-							aFormContainers = aBlocks[block].getContent().getFormContainers();
-						}
-
-						for (var formContainer = 0; aFormContainers && formContainer < aFormContainers.length; formContainer++) {
-							var aFormElements = aFormContainers[formContainer].getFormElements();
-
-							for (var formElement = 0; aFormElements && formElement < aFormElements.length; formElement++) {
-								var aFields = aFormElements[formElement].getFields();
+				if (aSubSections) {
+					for (var subSection = 0; subSection < aSubSections.length; subSection++) {
+						var aBlocks = aSubSections[subSection].getBlocks();
+
+						if (aBlocks) {
+							for (var block = 0; block < aBlocks.length; block++) {
+								var aFormContainers;
+
+								if (aBlocks[block].isA("sap.ui.layout.form.Form")) {
+									aFormContainers = aBlocks[block].getFormContainers();
+								} else if (
+									aBlocks[block].getContent &&
+									aBlocks[block].getContent() &&
+									aBlocks[block].getContent().isA("sap.ui.layout.form.Form")
+								) {
+									aFormContainers = aBlocks[block].getContent().getFormContainers();
+								}
 
-								if (aFields[0].getRequired() && !aFields[0].getValue()) {
-									return aFields[0];
+								if (aFormContainers) {
+									for (var formContainer = 0; formContainer < aFormContainers.length; formContainer++) {
+										var aFormElements = aFormContainers[formContainer].getFormElements();
+										if (aFormElements) {
+											for (var formElement = 0; formElement < aFormElements.length; formElement++) {
+												var aFields = aFormElements[formElement].getFields();
+
+												if (aFields[0].getRequired() && !aFields[0].getValue()) {
+													return aFields[0];
+												}
+											}
+										}
+									}
 								}
 							}
 						}
@@ -379,15 +398,24 @@ sap.ui.define(
 			},
 
 			_onBackNavigationInDraft: function(oContext) {
-				CommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(
-					function() {
-						history.back();
-					},
-					Function.prototype,
-					oContext,
-					this.getView().getController(),
-					false
-				);
+				if (
+					this.getAppComponent()
+						.getRouterProxy()
+						.checkIfBackHasSameContext()
+				) {
+					// Back nav will keep the same context --> no need to display the dialog
+					history.back();
+				} else {
+					CommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(
+						function() {
+							history.back();
+						},
+						Function.prototype,
+						oContext,
+						this,
+						false
+					);
+				}
 			},
 
 			_onAfterBinding: function(oBindingContext, mParameters) {
@@ -396,7 +424,7 @@ sap.ui.define(
 					aTables = this._findTables(),
 					aFormContainers = this._findFormContainers();
 
-				this.sideEffects.clearPropertiesStatus();
+				this._sideEffects.clearPropertiesStatus();
 
 				// TODO: this is only a temp solution as long as the model fix the cache issue and we use this additional
 				// binding with ownRequest
@@ -574,8 +602,10 @@ sap.ui.define(
 							});
 					});
 
-					// should be called only after binding is ready hence calling it in onAfterBinding
-					oObjectPage._triggerVisibleSubSectionsEvents();
+					if (!this.getView().getViewData().useNewLazyLoading) {
+						// should be called only after binding is ready hence calling it in onAfterBinding
+						oObjectPage._triggerVisibleSubSectionsEvents();
+					}
 				}
 			},
 			onPageReady: function(mParameters) {
@@ -666,7 +696,7 @@ sap.ui.define(
 					icon: ""
 				};
 
-				return Promise.resolve(oTitleInfo);
+				return oTitleInfo;
 			},
 
 			_executeHeaderShortcut: function(sId) {
@@ -1088,7 +1118,6 @@ sap.ui.define(
 					aPathParts.forEach(function(sPathPart, i) {
 						sPath += "/" + sPathPart;
 						var oRootViewController = oAppComponent.getRootViewController();
-						var oTitleHierarchyCache = oRootViewController.getTitleHierarchyCache();
 						var pWaitForTitleHiearchyInfo;
 						var sParameterPath = oMetaModel.getMetaPath(sPath);
 						var bResultContext = oMetaModel.getObject(sParameterPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
@@ -1097,11 +1126,9 @@ sap.ui.define(
 							iSkipParameterized = 1;
 							return;
 						}
-						if (!oTitleHierarchyCache[sPath]) {
-							pWaitForTitleHiearchyInfo = oRootViewController.addNewEntryInCacheTitle(sPath, oAppComponent);
-						} else {
-							pWaitForTitleHiearchyInfo = Promise.resolve(oTitleHierarchyCache[sPath]);
-						}
+
+						pWaitForTitleHiearchyInfo = oRootViewController.getTitleInfoFromPath(sPath);
+
 						pWaitForTitleHiearchyInfo
 							.then(function(oTitleHiearchyInfo) {
 								var idx = i - iSkipParameterized,

package/src/sap/fe/templates/ObjectPage/controls/StashableHBox.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/m/HBox", "sap/m/HBoxRenderer", "sap/ui/core/StashedControlSupport"],

package/src/sap/fe/templates/ObjectPage/controls/StashableVBox.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/m/VBox", "sap/m/VBoxRenderer", "sap/ui/core/StashedControlSupport"],

package/src/sap/fe/templates/ObjectPage/controls/SubSectionBlock.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(["sap/uxap/BlockBase"], function(BlockBase) {

package/src/sap/fe/templates/ObjectPage/designtime/FlexBox.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 // Provides the Design Time Metadata for the sap.m.FlexBox control
 sap.ui.define([], function() {

package/src/sap/fe/templates/ObjectPage/designtime/StashableHBox.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the Design Time Metadata for the sap.fe.templates.ObjectPage.controls.StashableHBox control

package/src/sap/fe/templates/ObjectPage/designtime/StashableVBox.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the Design Time Metadata for the sap.fe.templates.ObjectPage.controls.StashableVBox control

package/src/sap/fe/templates/ObjectPage/flexibility/StashableHBox.flexibility.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(["sap/ui/fl/changeHandler/BaseRename"], function(BaseRename) {

package/src/sap/fe/templates/ObjectPage/flexibility/StashableVBox.flexibility.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([], function() {

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/navigation/SelectionVariant"], function(CommonUtils, SelectionVariant) {
 	"use strict";

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/navigation/SelectionVariant"], function(CommonUtils, SelectionVariant) {
 	"use strict";

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define([], function() {
 	"use strict";

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

@@ -1,10 +1,22 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define([], function() {
 	"use strict";
 	return {
+		onBeforeContextUpdate: function(oListBinding, iCurrentContextIndex, iIndexUpdate) {
+			var oCurrentView = this.getView(),
+				oControlContext = oCurrentView && oCurrentView.getBindingContext(),
+				aCurrentContexts = oListBinding && oListBinding.getCurrentContexts(),
+				oPaginatorCurrentContext = aCurrentContexts[iCurrentContextIndex];
+
+			if (oPaginatorCurrentContext && oControlContext && oPaginatorCurrentContext.getPath() !== oControlContext.getPath()) {
+				// Prevent default update of context index in Object Page Paginator when view context is different from the paginator context.
+				return true;
+			}
+		},
+
 		onContextUpdate: function(oContext) {
 			var that = this;
 			that.base._routing.navigateToContext(oContext, { callExtension: true });

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -229,25 +229,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 +286,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,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/fe/core/library", "sap/fe/core/helpers/KeepAliveHelper"], function(CoreLibrary, KeepAliveHelper) {
 	"use strict";
@@ -40,26 +40,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/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/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>