@sapui5/sap.fe.templates 1.94.0 → 1.96.3

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

@@ -10,45 +10,41 @@
 			ID: 'sap/fe/core/helpers/StableIdHelper'
 	}"
 >
-	<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderFacets}">
-		<template:then>
-			<template:with path="converterContext>headerFacets" var="converterHeaderFacets">
-				<template:repeat list="{converterHeaderFacets>}" var="converterHeaderFacet">
-					<template:if test="{= ${converterHeaderFacet>type} === 'Annotation'}">
-						<!-- Header facets from OData Service Annotations -->
+	<template:with path="converterContext>header/facets" var="converterHeaderFacets">
+		<template:repeat list="{converterHeaderFacets>}" var="converterHeaderFacet">
+			<template:if test="{= ${converterHeaderFacet>type} === 'Annotation'}">
+				<!-- Header facets from OData Service Annotations -->
+			<template:then>
+				<template:with path="converterHeaderFacet>annotationPath" var="headerFacet">
+					<template:with path="headerFacet>" var="collectionHeaderFacet">
+						<template:if test="{= ${converterHeaderFacet>facetType} === 'Reference' }">
 						<template:then>
-							<template:with path="converterHeaderFacet>annotationPath" var="headerFacet">
-								<template:with path="headerFacet>" var="collectionHeaderFacet">
-									<template:if test="{= ${converterHeaderFacet>facetType} === 'Reference' }">
-										<template:then>
-											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacet" type="XML" />
-										</template:then>
-										<template:elseif test="{= ${converterHeaderFacet>facetType} === 'Collection' }">
-											<fe:StashableVBox
-												id="{= ID.generate(['fe', 'HeaderCollectionFacetContainer', { Facet: ${collectionHeaderFacet>} } ])}"
-												dt:designtime="{= ${converterHeaderFacet>flexSettings/designtime} === 'Default' ? 'sap/fe/templates/ObjectPage/designtime/StashableVBox.designtime' : ${converterHeaderFacet>flexSettings/designtime}}"
-												fl:flexibility="sap/fe/templates/ObjectPage/flexibility/StashableVBox.flexibility"
-												stashed="{converterHeaderFacet>stashed}"
-												displayInline="true"
-											>
-												<template:repeat list="{converterHeaderFacet>facets}" var="converterHeaderFacet">
-													<template:with path="converterHeaderFacet>annotationPath" var="headerFacet">
-														<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacet" type="XML" />
-													</template:with>
-												</template:repeat>
-											</fe:StashableVBox>
-										</template:elseif>
-									</template:if>
-								</template:with>
-							</template:with>
+							<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacet" type="XML" />
 						</template:then>
-						<template:elseif test="{= ${converterHeaderFacet>fragmentName}}">
-							<!-- Custom header facets from manifest (FPM) -->
-							<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacetCustomContainer" type="XML" />
+						<template:elseif test="{= ${converterHeaderFacet>facetType} === 'Collection' }">
+							<fe:StashableVBox
+										id="{= ID.generate(['fe', 'HeaderCollectionFacetContainer', { Facet: ${collectionHeaderFacet>} } ])}"
+										dt:designtime="{= ${converterHeaderFacet>flexSettings/designtime} === 'Default' ? 'sap/fe/templates/ObjectPage/designtime/StashableVBox.designtime' : ${converterHeaderFacet>flexSettings/designtime}}"
+										fl:flexibility="sap/fe/templates/ObjectPage/flexibility/StashableVBox.flexibility"
+										stashed="{converterHeaderFacet>stashed}"
+										displayInline="true"
+									>
+							<template:repeat list="{converterHeaderFacet>facets}" var="converterHeaderFacet">
+								<template:with path="converterHeaderFacet>annotationPath" var="headerFacet">
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacet" type="XML" />
+								</template:with>
+							</template:repeat>
+							</fe:StashableVBox>
 						</template:elseif>
-					</template:if>
-				</template:repeat>
-			</template:with>
-		</template:then>
-	</template:if>
+						</template:if>
+					</template:with>
+				</template:with>
+			</template:then>
+			<template:elseif test="{= ${converterHeaderFacet>fragmentName}}">
+				<!-- Custom header facets from manifest (FPM) -->
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacetCustomContainer" type="XML" />
+			</template:elseif>
+			</template:if>
+		</template:repeat>
+	</template:with>
 </core:FragmentDefinition>

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

@@ -19,9 +19,15 @@
 	For HeaderFacets, a section to the object page is added which is only visible in edit mode.
 	The object page has one section with one sub-section for all header facets, and a block for each facet.
 	-->
-	<template:with path="converterContext>headerSection" var="headerSection">
+	<template:with path="converterContext>header/section" var="headerSection">
 		<template:if test="{viewData>/editableHeaderContent}">
-			<uxap:ObjectPageSection id="{headerSection>id}" title="{headerSection>title}" visible="{headerSection>visible}" titleUppercase="false">
+			<uxap:ObjectPageSection
+				dt:designtime="not-adaptable-visibility"
+				id="{headerSection>id}"
+				title="{headerSection>title}"
+				visible="{headerSection>visible}"
+				titleUppercase="false"
+			>
 				<uxap:subSections>
 					<uxap:ObjectPageSubSection id="fe::EditableHeaderSubSection">
 						<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.EditableHeaderFacet" type="XML" />
@@ -51,6 +57,7 @@
 						>
 							<uxap:customData>
 								<core:CustomData key="strategyForVisibilityChange" value="lazyLoading" />
+								<core:CustomData key="isVisibilityDynamic" value="{subSection>isVisibilityDynamic}" />
 							</uxap:customData>
 							<template:if test="{= ${subSection>type} === 'Mixed'}">
 								<template:then>

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/SectionFormContent.fragment.xml

@@ -14,5 +14,6 @@
 		useFormContainerLabels="{= ${subSection>formDefinition/useFormContainerLabels}}"
 		partOfPreview="true"
 		formContainers="{subSection>formDefinition/formContainers}"
+		isVisible="{subSection>formDefinition/isVisible}"
 	/>
 </core:FragmentDefinition>

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

@@ -14,5 +14,6 @@
 		useFormContainerLabels="{= ${subSection>formDefinition/useFormContainerLabels}}"
 		partOfPreview="false"
 		formContainers="{subSection>formDefinition/formContainers}"
+		isVisible="{subSection>formDefinition/isVisible}"
 	/>
 </core:FragmentDefinition>

package/src/sap/fe/templates/RootContainer/controller/Fcl.controller.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(
 	[
@@ -9,12 +9,24 @@ sap.ui.define(
 		"./RootContainerBaseController",
 		"sap/f/FlexibleColumnLayoutSemanticHelper",
 		"sap/ui/core/Component",
+		"sap/fe/core/CommonUtils",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/m/Link",
 		"sap/m/MessagePage",
 		"sap/m/MessageBox"
 	],
-	function(Log, JSONModel, BaseController, FlexibleColumnLayoutSemanticHelper, Component, ViewState, Link, MessagePage, MessageBox) {
+	function(
+		Log,
+		JSONModel,
+		BaseController,
+		FlexibleColumnLayoutSemanticHelper,
+		Component,
+		CommonUtils,
+		ViewState,
+		Link,
+		MessagePage,
+		MessageBox
+	) {
 		"use strict";
 
 		var CONSTANTS = {
@@ -54,28 +66,54 @@ sap.ui.define(
 				applyInitialStateOnly: function() {
 					return false;
 				},
+				adaptBindingRefreshControls: function(aControls) {
+					this.getView()
+						.getController()
+						._getAllVisibleViews()
+						.forEach(function(oChildView) {
+							var pChildView = new Promise(function(resolve) {
+								resolve(oChildView);
+							});
+							aControls.push(pChildView);
+						});
+				},
 				adaptStateControls: function(aStateControls) {
 					this.getView()
 						.getController()
 						._getAllVisibleViews()
 						.forEach(function(oChildView) {
 							var pChildView = new Promise(function(resolve) {
-								if (
-									oChildView &&
-									oChildView.getController &&
-									oChildView.getController().isPlaceholder &&
-									oChildView.getController().isPlaceholder()
-								) {
-									oChildView.getController().attachEventOnce("targetPageInsertedInContainer", function(oEvent) {
-										var oTargetPage = oEvent.getParameter("targetpage");
-										resolve(_getViewFromContainer(oTargetPage));
-									});
-								} else {
-									resolve(oChildView);
-								}
+								resolve(oChildView);
 							});
 							aStateControls.push(pChildView);
 						});
+				},
+				onRestore: function() {
+					var oView = this.getView(),
+						oNavContainer = oView.byId("appContent");
+					var oInternalModel = oNavContainer.getModel("internal");
+					var oPages = oInternalModel.getProperty("/pages");
+
+					for (var sComponentId in oPages) {
+						oInternalModel.setProperty("/pages/" + sComponentId + "/restoreStatus", "pending");
+					}
+				},
+				onSuspend: function() {
+					var oFCLController = this.getView().getController();
+					var oFCLControl = oFCLController.getFclControl();
+					var aBeginColumnPages = oFCLControl.getBeginColumnPages() || [];
+					var aMidColumnPages = oFCLControl.getMidColumnPages() || [];
+					var aEndColumnPages = oFCLControl.getEndColumnPages() || [];
+					var aPages = [].concat(aBeginColumnPages, aMidColumnPages, aEndColumnPages);
+
+					aPages.forEach(function(oPage) {
+						var oTargetView = _getViewFromContainer(oPage);
+
+						var oController = oTargetView && oTargetView.getController();
+						if (oController && oController.viewState && oController.viewState.onSuspend) {
+							return oController.viewState.onSuspend();
+						}
+					});
 				}
 			}),
 
@@ -498,9 +536,11 @@ sap.ui.define(
 				if (FCLLevel >= this._oFCLConfig.maxColumnsCount) {
 					// The view is on a level > max number of columns. It's always fullscreen without close/exit buttons
 					viewColumn = oFclColName[this._oFCLConfig.maxColumnsCount - 1];
+					oUIState.actionButtonsInfo.midColumn.fullScreen = null;
 					oUIState.actionButtonsInfo.midColumn.exitFullScreen = null;
 					oUIState.actionButtonsInfo.midColumn.closeColumn = null;
 					oUIState.actionButtonsInfo.endColumn.exitFullScreen = null;
+					oUIState.actionButtonsInfo.endColumn.fullScreen = null;
 					oUIState.actionButtonsInfo.endColumn.closeColumn = null;
 				} else {
 					viewColumn = oFclColName[FCLLevel];
@@ -520,7 +560,13 @@ sap.ui.define(
 				// so we have to add this info manually
 				oUIState.actionButtonsInfo.beginColumn = { fullScreen: null, exitFullScreen: null, closeColumn: null };
 
-				oView.getModel("fclhelper").setProperty("/actionButtonsInfo", Object.assign({}, oUIState.actionButtonsInfo[viewColumn]));
+				var oActionButtonInfos = Object.assign({}, oUIState.actionButtonsInfo[viewColumn]);
+				oActionButtonInfos.switchVisible = oActionButtonInfos.fullScreen !== null || oActionButtonInfos.exitFullScreen !== null;
+				oActionButtonInfos.switchIcon =
+					oActionButtonInfos.fullScreen !== null ? "sap-icon://full-screen" : "sap-icon://exit-full-screen";
+				oActionButtonInfos.isFullScreen = oActionButtonInfos.fullScreen === null;
+
+				oView.getModel("fclhelper").setProperty("/actionButtonsInfo", oActionButtonInfos);
 
 				oView.getModel("fclhelper").setProperty("/showShareIcon", this._updateShareButtonVisibility(viewColumn, sLayout));
 			},
@@ -551,11 +597,7 @@ sap.ui.define(
 
 					// Update the layout of the FlexibleColumnLayout
 					if (sLayout) {
-						if (!this.getFclControl().getModel("fcl")) {
-							this.getFclControl().setModel(new JSONModel(), "fcl");
-							this.getFclControl().bindProperty("layout", "fcl>/layout");
-						}
-						this.getFclControl().setProperty("layout", sLayout);
+						this.getFclControl().setLayout(sLayout);
 					}
 				}
 			},
@@ -710,104 +752,63 @@ sap.ui.define(
 				return aViews;
 			},
 
-			/**
-			 * Trigger the navigation to the Placeholder for a specific route target.
-			 *
-			 * @function
-			 * @name sap.fe.templates.RootContainer.controller.Fcl.controller#displayPlaceholders
-			 * @memberof sap.fe.templates.RootContainer.controller.Fcl.controller
-			 * @param {object} [oTarget] Route target for which the placeHolder must be displayed
-			 * @param {object} [aTargets] Array containing routing targets for the current navigation
-			 * @param {object} [oPlaceholderTarget] Object containing the view to be displayed . if empty the placeHolder view is created and stored
-			 * @param {object} [oRootContainer] NavContainer or FCL
-			 * @param {object} [oRouter] The router component
-			 *
-			 * @returns {boolean} `true` if the placeHolder is displayed
-			 * @ui5-restricted
-			 * @final
-			 */
-			displayPlaceholders: function(oTarget, aTargets, oPlaceholderTarget, oRootContainer, oRouter) {
-				var targetIndex = aTargets.indexOf(oTarget);
-				var bPlaceholderDisplayed = false;
-				var oFCLLayout = /layout=(.*)Column/.exec(oRouter.getHashChanger().hash);
-				var fnTo;
-				var toView;
-				var bFirstNavigation = false;
-				if (oFCLLayout && oFCLLayout[1] === "End") {
-					// this case is used for deeplink with FCLLevel >3
-					if (!oPlaceholderTarget["end"]) {
-						oPlaceholderTarget["end"] = this.oPlaceholder.createPlaceholderView(oTarget.name);
-						oRootContainer.addEndColumnPage(oPlaceholderTarget["end"]);
-						oRootContainer.setDefaultTransitionNameEndColumn("placeholder");
-						bFirstNavigation = true;
-					}
-					toView = oPlaceholderTarget["end"];
-					fnTo = oRootContainer.toEndColumnPage;
-				} else {
-					switch (targetIndex) {
-						case 0:
-							if (!oPlaceholderTarget["begin"]) {
-								oPlaceholderTarget["begin"] = this.oPlaceholder.createPlaceholderView(oTarget.name);
-								oRootContainer.addBeginColumnPage(oPlaceholderTarget["begin"]);
-								oRootContainer.setDefaultTransitionNameBeginColumn("placeholder");
-								bFirstNavigation = true;
-							}
-							toView = oPlaceholderTarget["begin"];
-							fnTo = oRootContainer.toBeginColumnPage;
-							break;
-						case 1:
-							if (!oPlaceholderTarget["mid"]) {
-								oPlaceholderTarget["mid"] = this.oPlaceholder.createPlaceholderView(oTarget.name);
-								oRootContainer.addMidColumnPage(oPlaceholderTarget["mid"]);
-								oRootContainer.setDefaultTransitionNameMidColumn("placeholder");
-								bFirstNavigation = true;
+			onContainerReady: function() {
+				var aViews = this._getAllVisibleViews();
+				var aRestorePromises = [];
+				aViews.reduce(function(aPromises, oTargetView) {
+					aPromises.push(CommonUtils.restoreView(oTargetView));
+					return aPromises;
+				}, aRestorePromises);
+				return Promise.all(aRestorePromises);
+			},
+
+			getRightmostContext: function() {
+				var oContext;
+				switch (this.getFclControl().getLayout()) {
+					case sap.f.LayoutType.OneColumn:
+						if (this.getFclControl().getCurrentBeginColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentBeginColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.TwoColumnsBeginExpanded:
+					case sap.f.LayoutType.TwoColumnsMidExpanded:
+						if (this.getFclControl().getCurrentMidColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentMidColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.ThreeColumnsEndExpanded:
+					case sap.f.LayoutType.ThreeColumnsMidExpanded:
+					case sap.f.LayoutType.ThreeColumnsMidExpandedEndHidden:
+					case sap.f.LayoutType.ThreeColumnsBeginExpandedEndHidden:
+					case sap.f.LayoutType.EndColumnFullScreen:
+						if (this.getFclControl().getCurrentEndColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentEndColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.MidColumnFullScreen:
+						// In this case we need to determine if this mid column fullscreen comes from a 2 or a 3 column layout
+						var sLayoutWhenExitFullScreen = this.getHelper().getCurrentUIState().actionButtonsInfo.midColumn.exitFullScreen;
+						if (sLayoutWhenExitFullScreen.indexOf("ThreeColumn") >= 0) {
+							// We come from a 3 column layout
+							if (this.getFclControl().getCurrentEndColumnPage()) {
+								oContext = _getViewFromContainer(this.getFclControl().getCurrentEndColumnPage()).getBindingContext();
 							}
-							toView = oPlaceholderTarget["mid"];
-							fnTo = oRootContainer.toMidColumnPage;
-							break;
-						case 2:
-							if (!oPlaceholderTarget["end"]) {
-								oPlaceholderTarget["end"] = this.oPlaceholder.createPlaceholderView(oTarget.name);
-								oRootContainer.addEndColumnPage(oPlaceholderTarget["end"]);
-								oRootContainer.setDefaultTransitionNameEndColumn("placeholder");
-								bFirstNavigation = true;
+						} else {
+							// We come from a 2 column layout
+							if (this.getFclControl().getCurrentMidColumnPage()) {
+								oContext = _getViewFromContainer(this.getFclControl().getCurrentMidColumnPage()).getBindingContext();
 							}
-							toView = oPlaceholderTarget["end"];
-							fnTo = oRootContainer.toEndColumnPage;
-							break;
-						default:
-							break;
-					}
-				}
-				var sStartupParameter;
-				var bPlaceholderScreenEnabledFirstTimeOnly;
-				if (this.oPlaceholder.isPlaceholderEnabled) {
-					if (oTarget.name === "sap.fe.templates.ListReport") {
-						sStartupParameter = this.oPlaceholder.getEnumStartingParams().FE_DATA_LOADED;
-						bPlaceholderScreenEnabledFirstTimeOnly = true;
-					} else {
-						sStartupParameter = this.oPlaceholder.getEnumStartingParams().FE_HEROES_LOADED;
-						bPlaceholderScreenEnabledFirstTimeOnly = false;
-					}
-				}
-				if ((bPlaceholderScreenEnabledFirstTimeOnly && !toView.getController().istargetNavigated(oTarget)) || bFirstNavigation) {
-					toView.getController().setPlaceholderOption(sStartupParameter);
-					fnTo.apply(oRootContainer, [toView, "show"]);
-					bPlaceholderDisplayed = true;
-				} else if (!bPlaceholderScreenEnabledFirstTimeOnly && targetIndex === aTargets.length - 1) {
-					//placeholder should not be displayed if only the appstate is modified
-					var sCurrentHashNoAppState = oRouter
-						.getHashChanger()
-						.getHash()
-						.replace(/[&?]{1}sap-iapp-state=[A-Z0-9]+/, "");
-					if (this.sPreviousHashNoAppState !== sCurrentHashNoAppState) {
-						toView.getController().setPlaceholderOption(sStartupParameter);
-						fnTo.apply(oRootContainer, [toView, "show"]);
-						bPlaceholderDisplayed = true;
-					}
-					this.sPreviousHashNoAppState = sCurrentHashNoAppState;
+						}
+						break;
+
+					default:
+						Log.error("Unhandled switch case for " + this.getFclControl().getLayout());
 				}
-				return bPlaceholderDisplayed;
+
+				return oContext;
 			}
 		});
 	},

package/src/sap/fe/templates/RootContainer/controller/NavContainer.controller.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(
 	[
@@ -30,32 +30,74 @@ sap.ui.define(
 				applyInitialStateOnly: function() {
 					return false;
 				},
+				adaptBindingRefreshControls: function(aControls) {
+					var oView = this.getView(),
+						oController = oView.getController();
+					aControls.push(oController._getCurrentPage(oView));
+				},
 				adaptStateControls: function(aStateControls) {
-					var that = this;
-					var pCurrentPage = new Promise(function(resolve) {
-						var oView = that.getView(),
-							oNavContainer = oView.byId("appContent");
-						var oCurrentPage = oNavContainer.getCurrentPage();
-						if (
-							oCurrentPage &&
-							oCurrentPage.getController &&
-							oCurrentPage.getController().isPlaceholder &&
-							oCurrentPage.getController().isPlaceholder()
-						) {
-							oCurrentPage.getController().attachEventOnce("targetPageInsertedInContainer", function(oEvent) {
-								var oTargetPage = oEvent.getParameter("targetpage");
-								var oTargetView = CommonUtils.getTargetView(oTargetPage);
-								resolve(oTargetView !== that.getView() && oTargetView);
-							});
-						} else {
-							var oTargetView = CommonUtils.getTargetView(oCurrentPage);
-							resolve(oTargetView !== that.getView() && oTargetView);
+					var oView = this.getView(),
+						oController = oView.getController();
+					aStateControls.push(oController._getCurrentPage(oView));
+				},
+				onRestore: function() {
+					var oView = this.getView(),
+						oNavContainer = oView.byId("appContent");
+					var oInternalModel = oNavContainer.getModel("internal");
+					var oPages = oInternalModel.getProperty("/pages");
+
+					for (var sComponentId in oPages) {
+						oInternalModel.setProperty("/pages/" + sComponentId + "/restoreStatus", "pending");
+					}
+				},
+				onSuspend: function() {
+					var oView = this.getView(),
+						oNavContainer = oView.byId("appContent");
+					var aPages = oNavContainer.getPages();
+					aPages.forEach(function(oPage) {
+						var oTargetView = CommonUtils.getTargetView(oPage);
+
+						var oController = oTargetView && oTargetView.getController();
+						if (oController && oController.viewState && oController.viewState.onSuspend) {
+							return oController.viewState.onSuspend();
 						}
 					});
-					aStateControls.push(pCurrentPage);
 				}
 			}),
 
+			onContainerReady: function() {
+				// Restore views if neccessary.
+				var oView = this.getView(),
+					oPagePromise = this._getCurrentPage(oView);
+
+				return oPagePromise.then(function(oCurrentPage) {
+					var oTargetView = CommonUtils.getTargetView(oCurrentPage);
+					return CommonUtils.restoreView(oTargetView);
+				});
+			},
+
+			_getCurrentPage: function(oView) {
+				return new Promise(function(resolve) {
+					var oNavContainer = oView.byId("appContent");
+					var oCurrentPage = oNavContainer.getCurrentPage();
+					if (
+						oCurrentPage &&
+						oCurrentPage.getController &&
+						oCurrentPage.getController().isPlaceholder &&
+						oCurrentPage.getController().isPlaceholder()
+					) {
+						oCurrentPage.getController().attachEventOnce("targetPageInsertedInContainer", function(oEvent) {
+							var oTargetPage = oEvent.getParameter("targetpage");
+							var oTargetView = CommonUtils.getTargetView(oTargetPage);
+							resolve(oTargetView !== oView && oTargetView);
+						});
+					} else {
+						var oTargetView = CommonUtils.getTargetView(oCurrentPage);
+						resolve(oTargetView !== oView && oTargetView);
+					}
+				});
+			},
+
 			/**
 			 * @private
 			 * @name sap.fe.templates.RootContainer.controller.NavContainer.getMetadata
@@ -118,56 +160,6 @@ sap.ui.define(
 				}
 
 				oNavContainer.to(this.oMessagePage.getId());
-			},
-
-			/**
-			 * Trigger the navigation to the Placeholder for a specific route target.
-			 *
-			 * @function
-			 * @name sap.fe.templates.RootContainer.controller.NavContainer.controller#displayPlaceholders
-			 * @memberof sap.fe.templates.RootContainer.controller.NavContainer.controller
-			 * @param {object} [oTarget] Route target for which the placeHolder must be displayed
-			 * @param {object} [aTargets] Array containing routing targets for the current navigation
-			 * @param {object} [oPlaceholderTarget] Object containing the view to be displayed . if empty the placeHolder view is created and stored
-			 * @param {object} [oRootContainer] NavContainer or FCL
-			 *
-			 * @returns {boolean} `true` if the placeHolder is displayed
-			 * @ui5-restricted
-			 * @final
-			 */
-			displayPlaceholders: function(oTarget, aTargets, oPlaceholderTarget, oRootContainer) {
-				var bPlaceholderDisplayed = false;
-				oRootContainer.setDefaultTransitionName("placeholder");
-				var oPlaceholderMapping = this.oPlaceholder.getPlaceholderMapping();
-
-				if (oPlaceholderMapping[oTarget.name]) {
-					if (!oPlaceholderTarget.view) {
-						oPlaceholderTarget.view = this.oPlaceholder.createPlaceholderView(oTarget.name);
-						oRootContainer.addPage(oPlaceholderTarget.view);
-					}
-
-					var sStartupParameter;
-					var bPlaceholderScreenEnabledFirstTimeOnly;
-					if (this.oPlaceholder.isPlaceholderEnabled) {
-						if (oTarget.name === "sap.fe.templates.ListReport") {
-							sStartupParameter = this.oPlaceholder.getEnumStartingParams().FE_DATA_LOADED;
-							bPlaceholderScreenEnabledFirstTimeOnly = true;
-						} else {
-							sStartupParameter = this.oPlaceholder.getEnumStartingParams().FE_HEROES_LOADED;
-							bPlaceholderScreenEnabledFirstTimeOnly = false;
-						}
-					}
-					if (
-						(bPlaceholderScreenEnabledFirstTimeOnly && !oPlaceholderTarget.view.getController().istargetNavigated(oTarget)) ||
-						!bPlaceholderScreenEnabledFirstTimeOnly
-					) {
-						oPlaceholderTarget.view.getController().setPlaceholderOption(sStartupParameter);
-						oRootContainer.to(oPlaceholderTarget.view, "show");
-						bPlaceholderDisplayed = true;
-					}
-				}
-
-				return bPlaceholderDisplayed;
 			}
 		});
 	},