@openui5/sap.ui.core 1.93.3 → 1.96.2

package/src/sap/ui/core/routing/async/Target.js

@@ -50,10 +50,8 @@ sap.ui.define([
 		 */
 		_display: function (vData, oSequencePromise, oTargetCreateInfo) {
 			if (this._oParent) {
-				// replace the sync
 				oSequencePromise = this._oParent._display(vData, oSequencePromise, Object.assign({}, oTargetCreateInfo));
 			}
-
 			return this._place(vData, oSequencePromise, oTargetCreateInfo);
 		},
 
@@ -215,284 +213,372 @@ sap.ui.define([
 		},
 
 		/**
-		 * Here the magic happens - recursion + placement + view creation needs to be refactored
+		 * Load the target and wait for the first <code>routeMatched</code> event if it's a Component target
 		 *
-		 * @param {object} [vData] an object that will be passed to the display event in the data property. If the
-		 * 		target has parents, the data will also be passed to them.
-		 * @param {Promise} oSequencePromise Promise chain for resolution in the correct order
-		 * @param {object} oTargetCreateInfo Additional information  for the component creation. Currently the object only contains the prefix for the routerHashChanger
-		 * @return {Promise} resolves with {name: *, view: *, control: *} if the target can be successfully displayed otherwise it rejects with an error message
+		 * @param {object} oTargetCreateInfo The corresponding target create info
+		 * @return {Promise} Promise resolving with the loaded target object and the promise that waits for the
+		 *  <code>routeMatched</code> event in case of a Component target
 		 * @private
 		 */
-		_place: function (vData, oSequencePromise, oTargetCreateInfo) {
-			if (vData instanceof Promise) {
-				oTargetCreateInfo = oSequencePromise;
-				oSequencePromise = vData;
-				vData = undefined;
-			}
+		load: function(oTargetCreateInfo) {
+			return this._load(oTargetCreateInfo)
+				.then(function (oLoadedTarget) {
+					return {
+						object: oLoadedTarget,
+						nestedComponentReady: this.waitForComponentTarget({
+							target: oLoadedTarget,
+							createInfo: oTargetCreateInfo
+						})
+					};
+				}.bind(this));
+		},
 
-			var oOptions = this._oOptions,
-				that = this,
-				oObject, sErrorMessage, pLoaded,
-				bInstantResolve = true,
-				fnResolve,
-				pNestedRouteMatched,
-				bIsComponentTarget = oOptions.type === "Component";
+		/**
+		 * Wait for the next <code>routeMatched</code> event from the Component target
+		 *
+		 * @param {object} mTargetOptions The option object that contains the loaded target object and the corresponding
+		 *  target create info.
+		 * @return {Promise} Promise resolving when the first <code>routeMatched</code> event is fired when the target
+		 *  has type "Component" otherwise the Promise resolves immediately
+		 * @private
+		 */
+		waitForComponentTarget: function(mTargetOptions) {
+			return new Promise(function(resolve, reject) {
+				var oLoadedTarget = mTargetOptions.target;
+				var oTargetCreateInfo = mTargetOptions.createInfo;
+				var bInstantResolve = true;
+
+				if (oLoadedTarget.isA("sap.ui.core.UIComponent")) {
+					var oRouter = oLoadedTarget.getRouter();
+					if (oRouter && oLoadedTarget.hasNativeRouter()) {
+						var sHash = oRouter.getHashChanger().getHash();
+						var oRoute = oRouter.getRouteByHash(sHash);
+						var bIgnoreInitialHash = oTargetCreateInfo && oTargetCreateInfo.ignoreInitialHash;
+
+						if (!oRouter._oConfig.async){
+							throw new Error("The router of component '" + oLoadedTarget.getId() +
+								"' which is loaded via the target '" + this._oOptions._name +
+								"' is defined as synchronous which is not supported using as a nested component.");
+						}
 
-			oTargetCreateInfo = oTargetCreateInfo || {};
+						if (oRouter._oOwner && oTargetCreateInfo) {
+							// update the flag once the component is displayed again after it's already loaded
+							oRouter._oOwner._bRoutingPropagateTitle = oTargetCreateInfo.propagateTitle;
+						}
 
-			if ((oOptions.name || oOptions.usage) && oOptions.type) {
-				pNestedRouteMatched = new Promise(function(resolve) {
-					fnResolve = resolve;
-				});
-				if (bIsComponentTarget) {
-					oTargetCreateInfo.componentId = that._oOptions.id || ManagedObjectMetadata.uid("uicomponent");
+						// TODO: offer getter for target info
+						//
+						// The router is normally initialized in the UIComponent.prototype.init function and the
+						// init function should be already called before it reaches this place which means that the
+						// router is initialized in most of the cases. If a router is already initialized, we still
+						// need to check whether the route match process is finished. If it's not finished, we are
+						// sure that there will be a "routeMatched" event fired and we can wait for it.
+						if (!bIgnoreInitialHash && (!oRouter.isInitialized() || oRouter._bMatchingProcessStarted) && oRoute && oRoute._oConfig.target) {
+							bInstantResolve = false;
+							oRouter.attachRouteMatched(resolve);
+						}
+						if (oRouter.isStopped()) {
+							// initialize the router in nested component
+							// if it has been previously stopped
+							oRouter.initialize(bIgnoreInitialHash);
+						}
+					}
 				}
-				pLoaded = this._load(oTargetCreateInfo).then(function (oObject) {
-					if (oObject.isA("sap.ui.core.UIComponent")) {
-						var oRouter = oObject.getRouter();
-						if (oRouter && oObject.hasNativeRouter()) {
-							var sHash = oRouter.getHashChanger().getHash();
-							var oRoute = oRouter.getRouteByHash(sHash);
-							var bIgnoreInitialHash = oTargetCreateInfo && oTargetCreateInfo.ignoreInitialHash;
-
-							if (!oRouter._oConfig.async){
-								throw new Error("The router of component '" + oObject.getId() +
-									"' which is loaded via the target '" + that._oOptions._name +
-									"' is defined as synchronous which is not supported using as a nested component.");
-							}
 
-							if (oRouter._oOwner && oTargetCreateInfo) {
-								// update the flag once the component is displayed again after it's already loaded
-								oRouter._oOwner._bRoutingPropagateTitle = oTargetCreateInfo.propagateTitle;
-							}
+				if (bInstantResolve) {
+					resolve();
+				}
+			}.bind(this));
+		},
+
+		/**
+		 * Find the container control in the following order:
+		 * <ul>
+		 *   <li>Within the parent target in case <code>oParentInfo</code> is given</li>
+		 *   <li>Within the root view of the owner component</li>
+		 *   <li>Using the given control ID in the global scope</li>
+		 * </ul>
+		 *
+		 * @param {object} [oParentInfo] The view information from the displayed parent target
+		 * @return {Promise} Promise resolving with the container control
+		 * @private
+		 */
+		resolveContainerControl: function(oParentInfo) {
+			// use a Promise.resovle() to delay the container resolve to occur after the current call stack because the
+			// oOptions.rootView can be available after the current call stack.
+			return Promise.resolve().then(function() {
+				oParentInfo = oParentInfo || {};
+
+				var oOptions = this._oOptions;
+				var vValid = this._isValid(oParentInfo);
+				var sErrorMessage;
+
+				// validate config and log errors if necessary
+				if (vValid !== true) {
+					sErrorMessage = vValid;
+					return this._refuseInvalidTarget(oOptions._name, sErrorMessage);
+				}
 
-							// TODO: offer getter for target info
-							//
-							// The router is normally initialized in the UIComponent.prototype.init function and the
-							// init function should be already called before it reaches this place which means that the
-							// router is initialized in most of the cases. If a router is already initialized, we still
-							// need to check whether the route match process is finished. If it's not finished, we are
-							// sure that there will be a "routeMatched" event fired and we can wait for it.
-							if (!bIgnoreInitialHash && (!oRouter.isInitialized() || oRouter._bMatchingProcessStarted) && oRoute && oRoute._oConfig.target) {
-								bInstantResolve = false;
-								oRouter.attachRouteMatched(fnResolve);
+				var oViewContainingTheControl = oParentInfo.view,
+					oControl = oParentInfo.control,
+					pViewContainingTheControl,
+					pContainerControl;
+
+				// if the parent target loads a component, the oViewContainingTheControl is an instance of
+				// ComponentContainer. The root control of the component should be retrieved and set as
+				// oViewContainingTheControl
+				if (oViewContainingTheControl && oViewContainingTheControl.isA("sap.ui.core.ComponentContainer")) {
+					oViewContainingTheControl = oViewContainingTheControl.getComponentInstance().getRootControl();
+				}
+
+				//no parent view - see if container can be found by using oOptions.controlId under oOptions.rootView
+				if (!oViewContainingTheControl && oOptions.rootView) {
+					// oOptions.rootView can be either an id or a promise that resolves with the id
+					pViewContainingTheControl = Promise.resolve(oOptions.rootView)
+						.then(function(oRootViewId) {
+							var oView;
+
+							if (oRootViewId) {
+								oView = sap.ui.getCore().byId(oRootViewId);
+								oOptions.rootView = oRootViewId;
 							}
-							if (oRouter.isStopped()) {
-								// initialize the router in nested component
-								// if it has been previously stopped
-								oRouter.initialize(bIgnoreInitialHash);
+
+							if (!oView) {
+								sErrorMessage = "Did not find the root view with the id " + oOptions.rootView;
+								return this._refuseInvalidTarget(oOptions._name, sErrorMessage);
+							} else {
+								return oView;
 							}
-						}
-					}
+						}.bind(this));
+				} else {
+					pViewContainingTheControl = Promise.resolve(oViewContainingTheControl);
+				}
 
-					if (bInstantResolve) {
-						fnResolve();
+				pViewContainingTheControl = pViewContainingTheControl.then(function(oView) {
+					if (oView && oView.isA("sap.ui.core.mvc.View")) {
+						return oView.loaded();
+					} else {
+						return oView;
 					}
-					return oObject;
 				});
-				// when target information is given
-				oSequencePromise = oSequencePromise
-					.then(function(oParentInfo) {
-						oParentInfo = oParentInfo || {};
 
-						var vValid = that._isValid(oParentInfo);
+				if (oOptions.controlId) {
+					pContainerControl = pViewContainingTheControl.then(function(oContainerView) {
+						var oContainerControl;
 
-						// validate config and log errors if necessary
-						if (vValid !== true) {
-							sErrorMessage = vValid;
-							return that._refuseInvalidTarget(oOptions._name, sErrorMessage);
+						if (oContainerView) {
+							oContainerControl = oContainerView.byId(oOptions.controlId);
 						}
 
-						var oViewContainingTheControl = oParentInfo.view,
-							oControl = oParentInfo.control,
-							pViewContainingTheControl,
-							pContainerControl;
-
-						// if the parent target loads a component, the oViewContainingTheControl is an instance of
-						// ComponentContainer. The root control of the component should be retrieved and set as
-						// oViewContainingTheControl
-						if (oViewContainingTheControl && oViewContainingTheControl.isA("sap.ui.core.ComponentContainer")) {
-							oViewContainingTheControl = oViewContainingTheControl.getComponentInstance().getRootControl();
+						if (!oContainerControl) {
+							//Test if control exists in core (without prefix) since it was not found in the parent or root view
+							oContainerControl =  sap.ui.getCore().byId(oOptions.controlId);
 						}
 
-						//no parent view - see if container can be found by using oOptions.controlId under oOptions.rootView
-						if (!oViewContainingTheControl && oOptions.rootView) {
-							// oOptions.rootView can be either an id or a promise that resolves with the id
-							pViewContainingTheControl = Promise.resolve(oOptions.rootView)
-								.then(function(oRootViewId) {
-									var oView;
-
-									if (oRootViewId) {
-										oView = sap.ui.getCore().byId(oRootViewId);
-										oOptions.rootView = oRootViewId;
-									}
-
-									if (!oView) {
-										sErrorMessage = "Did not find the root view with the id " + oOptions.rootView;
-										return that._refuseInvalidTarget(oOptions._name, sErrorMessage);
-									} else {
-										return oView;
-									}
-								});
-						} else {
-							pViewContainingTheControl = Promise.resolve(oViewContainingTheControl);
-						}
+						return oContainerControl;
+					});
+				} else {
+					pContainerControl = Promise.resolve(oControl);
+				}
 
-						pViewContainingTheControl = pViewContainingTheControl.then(function(oView) {
-							if (oView && oView.isA("sap.ui.core.mvc.View")) {
-								return oView.loaded();
-							} else {
-								return oView;
-							}
-						});
+				return pContainerControl.then(function(oContainerControl) {
+					if (!oContainerControl) {
+						sErrorMessage = "Control with ID " + oOptions.controlId + " could not be found";
+						return this._refuseInvalidTarget(oOptions._name, sErrorMessage);
+					} else {
+						return oContainerControl;
+					}
+				}.bind(this));
+			}.bind(this));
+		},
 
-						if (oOptions.controlId) {
-							pContainerControl = pViewContainingTheControl.then(function(oContainerView) {
-								var oContainerControl;
+		/**
+		 * Create and display the placeholder on the respective container
+		 *
+		 * @param {object} oTargetCreateInfo Object containing the target create info
+		 * @param {object} oContainerControl The container control
+		 * @returns {object} the view info object
+		 * @private
+		 */
+		displayPlaceholder: function(oTargetCreateInfo, oContainerControl) {
+			var oObject,
+				oOptions = this._oOptions,
+				bIsComponentTarget = oOptions.type === "Component",
+				bHasPlaceholderConfig = false,
+				oPlaceholderConfig = oTargetCreateInfo.placeholder || oOptions.placeholder || {},
+				pPlaceholder = Promise.resolve();
+
+			if (Placeholder.hasProviders()) {
+				Object.assign(oPlaceholderConfig, Placeholder.getPlaceholderFromProviders({
+					name: oOptions.name,
+					type: oOptions.type
+				}));
+			}
 
-								if (oContainerView) {
-									oContainerControl = oContainerView.byId(oOptions.controlId);
-								}
+			if (Object.keys(oPlaceholderConfig).length > 0) {
+				if (oPlaceholderConfig.autoClose === undefined) {
+					oPlaceholderConfig.autoClose = true;
+				}
+				bHasPlaceholderConfig = true;
+			}
 
-								if (!oContainerControl) {
-									//Test if control exists in core (without prefix) since it was not found in the parent or root view
-									oContainerControl =  sap.ui.getCore().byId(oOptions.controlId);
-								}
+			if (bIsComponentTarget) {
+				var oOwnerComponent = this._oCache._oComponent;
+				var sComponentContainerId = oTargetCreateInfo.componentId + "-container";
 
-								return oContainerControl;
-							});
-						} else {
-							pContainerControl = Promise.resolve(oControl);
-						}
+				oObject = (oOwnerComponent && oOwnerComponent.byId(sComponentContainerId))
+					|| sap.ui.getCore().byId(sComponentContainerId);
 
-						return pContainerControl.then(function(oContainerControl) {
-							if (!oContainerControl) {
-								sErrorMessage = "Control with ID " + oOptions.controlId + " could not be found";
-								return that._refuseInvalidTarget(oOptions._name, sErrorMessage);
-							} else {
-								return oContainerControl;
-							}
+				if (!oObject) {
+					// defaults mixed in with configured settings
+					var oContainerOptions = Object.assign({
+						height: "100%",
+						width: "100%",
+						lifecycle: ComponentLifecycle.Application
+					}, oOptions.containerOptions);
+
+					if (oOwnerComponent) {
+						oOwnerComponent.runAsOwner(function() {
+							oObject = new ComponentContainer(oOwnerComponent.createId(sComponentContainerId), oContainerOptions);
 						});
-					})
-					.then(function(oContainerControl) {
-						var bHasPlaceholderConfig = false;
-						var oPlaceholderConfig = oTargetCreateInfo.placeholder || that._oOptions.placeholder || {};
-
-						if (Placeholder.hasProviders()) {
-							Object.assign(oPlaceholderConfig, Placeholder.getPlaceholderFromProviders({
-									name: that._oOptions.name,
-									type:  that._oOptions.type
-								})
-							);
-						}
+					} else {
+						oObject = new ComponentContainer(sComponentContainerId, oContainerOptions);
+					}
+				}
 
-						if (Object.keys(oPlaceholderConfig).length > 0) {
-							if (oPlaceholderConfig.autoClose === undefined) {
-								oPlaceholderConfig.autoClose = true;
-							}
-							bHasPlaceholderConfig = true;
-						}
+				// set container object only if placeholder config is available
+				if (bHasPlaceholderConfig) {
+					oPlaceholderConfig.container = oObject;
+				}
+			}
 
-						if (bIsComponentTarget) {
-							var oOwnerComponent = that._oCache._oComponent;
-							var sComponentContainerId = oTargetCreateInfo.componentId + "-container";
-
-							oObject = (oOwnerComponent && oOwnerComponent.byId(sComponentContainerId))
-								|| sap.ui.getCore().byId(sComponentContainerId);
-
-							if (!oObject) {
-								// defaults mixed in with configured settings
-								var oContainerOptions = Object.assign({
-									height: "100%",
-									width: "100%",
-									lifecycle: ComponentLifecycle.Application
-								}, oOptions.containerOptions);
-
-								if (oOwnerComponent) {
-									oOwnerComponent.runAsOwner(function() {
-										oObject = new ComponentContainer(oOwnerComponent.createId(sComponentContainerId), oContainerOptions);
-									});
-								} else {
-									oObject = new ComponentContainer(sComponentContainerId, oContainerOptions);
-								}
-							}
+			// for view targets use container control to display placeholder
+			if (bHasPlaceholderConfig && oContainerControl.isA("sap.ui.core.IPlaceholderSupport")) {
+				oPlaceholderConfig.container = oContainerControl;
+			}
 
-							// set container object only if placeholder config is available
-							if (bHasPlaceholderConfig) {
-								oPlaceholderConfig.container = oObject;
-							}
-						}
+			// Placeholder creation
+			if (oPlaceholderConfig.container && !oTargetCreateInfo.repeatedRoute) {
+				oPlaceholderConfig.aggregation = this._oOptions.controlAggregation;
 
-						// for view targets use container control to display placeholder
-						if (bHasPlaceholderConfig && oContainerControl.isA("sap.ui.core.IPlaceholderSupport")) {
-							oPlaceholderConfig.container = oContainerControl;
-						}
+				var oCreateOptions = this._getCreateOptions(oTargetCreateInfo);
+				var oCachedObject = this._oCache.fetch(oCreateOptions, this._oOptions.type);
 
-						// Placeholder creation
-						if (oPlaceholderConfig.container) {
-							oPlaceholderConfig.aggregation = that._oOptions.controlAggregation;
+				if (oCachedObject && bIsComponentTarget) {
+					// for type "Component", the object that is saved in the placeholder config should be
+					// the component container instead of the component
+					oPlaceholderConfig.object = oObject;
+				} else {
+					oPlaceholderConfig.object = oCachedObject;
+				}
 
-							if (!oTargetCreateInfo.repeatedRoute) {
-								var oCreateOptions = that._getCreateOptions(oTargetCreateInfo);
-								var oCachedObject = that._oCache.fetch(oCreateOptions, that._oOptions.type);
+				if (oPlaceholderConfig.html) {
+					oPlaceholderConfig.placeholder = new Placeholder({
+						html: oPlaceholderConfig.html
+					});
+				}
 
-								if (oCachedObject && bIsComponentTarget) {
-									// for type "Component", the object that is saved in the placeholder config should be
-									// the component container instead of the component
-									oPlaceholderConfig.object = oObject;
-								} else {
-									oPlaceholderConfig.object = oCachedObject;
-								}
-							}
+				if (oPlaceholderConfig.placeholder && sap.ui.getCore().getConfiguration().getPlaceholder()) {
+					pPlaceholder = this.showPlaceholder(oPlaceholderConfig);
+				}
+			}
 
-							if (oPlaceholderConfig.html) {
-								oPlaceholderConfig.placeholder = new Placeholder({
-									html: oPlaceholderConfig.html
-								});
-							}
+			// wait for placeholder to load
+			return pPlaceholder.then(function(sPlaceholderContent) {
+				// returning view info object
+				return {
+					containerControl: oContainerControl,
+					object: oObject,
+					placeholderConfig: oPlaceholderConfig,
+					placeholderShown: !!sPlaceholderContent
+				};
+			});
+		},
 
-							if (oPlaceholderConfig.placeholder) {
-								that.showPlaceholder(oPlaceholderConfig);
-							}
-						}
+		/**
+		 * Here the magic happens - recursion + placement + view creation needs to be refactored
+		 *
+		 * @param {object} [vData] an object that will be passed to the display event in the data property. If the
+		 * 		target has parents, the data will also be passed to them.
+		 * @param {Promise} oSequencePromise Promise chain for resolution in the correct order
+		 * @param {object} oTargetCreateInfo Additional information  for the component creation. Currently the object only contains the prefix for the routerHashChanger
+		 * @return {Promise} resolves with {name: *, view: *, control: *} if the target can be successfully displayed otherwise it rejects with an error message
+		 * @private
+		 */
+		_place: function (vData, oSequencePromise, oTargetCreateInfo) {
+			var oOptions = this._oOptions,
+				that = this,
+				sErrorMessage,
+				bIsComponentTarget = oOptions.type === "Component";
 
-						return {
-							containerControl: oContainerControl,
-							object: oObject,
-							placeholderConfig: oPlaceholderConfig
-						};
-					})
-					.then(function(oViewInfo) {
-						return pLoaded.then(function(oObject) {
-							var oView, oRootControl;
-							if (bIsComponentTarget) {
-								var fnOriginalDestroy = oObject.destroy;
-								oObject.destroy = function () {
-									if (fnOriginalDestroy) {
-										fnOriginalDestroy.apply(this);
-									}
-									// destroy the component container when the component is destroyed
-									oViewInfo.object.destroy();
-								};
-								oViewInfo.object.setComponent(oObject);
-
-								oRootControl = oObject.getRootControl();
-								if (oRootControl && oRootControl.isA("sap.ui.core.mvc.View")) {
-									oView = oRootControl;
+			var pLoaded, /* target is loaded and promise for waiting on "routeMatched" event in nested component is ready*/
+				pContainerReady; /* container control and placeholder ready */
+
+			if (vData instanceof Promise) {
+				oTargetCreateInfo = oSequencePromise;
+				oSequencePromise = vData;
+				vData = undefined;
+			}
+
+			oTargetCreateInfo = oTargetCreateInfo || {};
+
+			if (bIsComponentTarget) {
+				oTargetCreateInfo.componentId = oOptions.id || ManagedObjectMetadata.uid("uicomponent");
+			}
+
+			if ((oOptions.name || oOptions.usage) && oOptions.type) {
+				// target loading
+				pLoaded = this.load(oTargetCreateInfo);
+
+				// Either if parent available, then we need to wait until the parent got displayed or
+				// if no target info is given, then we need to wait for the oSequencePromise to be resolved
+				if (this._oParent || oTargetCreateInfo.legacy) {
+					// resolve container control and placeholder creation
+					pContainerReady = oSequencePromise.then(this.resolveContainerControl.bind(this));
+				} else {
+					// no need to wait for oSequencePromise, resolve container control in parallel
+					pContainerReady = this.resolveContainerControl();
+				}
+
+				pContainerReady = pContainerReady.then(this.displayPlaceholder.bind(this, oTargetCreateInfo));
+
+				// when target information is given
+				oSequencePromise = Promise.all([pLoaded, pContainerReady, oSequencePromise])
+					// prepareTitleProvider
+					.then(function(aArguments) {
+						var oObject = aArguments[0].object,
+							oViewInfo = aArguments[1],
+							oView, oRootControl;
+
+						oViewInfo.nestedComponentReady = aArguments[0].nestedComponentReady;
+
+						if (bIsComponentTarget) {
+							var fnOriginalDestroy = oObject.destroy;
+							oObject.destroy = function () {
+								if (fnOriginalDestroy) {
+									fnOriginalDestroy.apply(this);
 								}
-							} else {
-								// view
-								oViewInfo.object = oObject;
-								oView = oObject;
+								// destroy the component container when the component is destroyed
+								oViewInfo.object.destroy();
+							};
+							oViewInfo.object.setComponent(oObject);
+
+							oRootControl = oObject.getRootControl();
+							if (oRootControl && oRootControl.isA("sap.ui.core.mvc.View")) {
+								oView = oRootControl;
 							}
+						} else {
+							// view
+							oViewInfo.object = oObject;
+							oView = oObject;
+						}
 
-							that._bindTitleInTitleProvider(oView);
-							that._addTitleProviderAsDependent(oView);
+						that._bindTitleInTitleProvider(oView);
+						that._addTitleProviderAsDependent(oView);
 
-							return oViewInfo;
-						});
+						return oViewInfo;
 					})
+					// placing the view or component into container
 					.then(function(oViewInfo) {
 						var oContainerControl = oViewInfo.containerControl,
 							oObject = oViewInfo.object;
@@ -529,7 +615,9 @@ sap.ui.define([
 							name: oOptions._name,
 							view: oObject,
 							control: oContainerControl,
-							placeholderConfig: oViewInfo.placeholderConfig
+							nestedComponentReady: oViewInfo.nestedComponentReady,
+							placeholderConfig: oViewInfo.placeholderConfig,
+							placeholderShown: oViewInfo.placeholderShown
 						};
 					});
 			} else {
@@ -540,33 +628,39 @@ sap.ui.define([
 				});
 			}
 
-			return Promise.all([oSequencePromise, pNestedRouteMatched]).then(function(aObjects) {
-				var oContainerControl = aObjects[0].control;
-				var oObject = aObjects[0].view;
-
-				if (oContainerControl && oObject) {
-					that.fireDisplay({
-						view : oObject.isA("sap.ui.core.mvc.View") ? oObject : undefined,
-						object: oObject,
-						control : oContainerControl,
-						config : that._oOptions,
-						data: vData,
-						routeRelevant: oTargetCreateInfo.routeRelevant
-					});
-				}
+			return oSequencePromise.then(function(oParams) {
+				var pNestedComponentReady = oParams.nestedComponentReady || Promise.resolve();
+				return pNestedComponentReady.then(function() {
+					var oContainerControl = oParams.control,
+						oObject = oParams.view,
+						oPlaceholderConfig = oParams.placeholderConfig;
 
-				if (aObjects[0].placeholderConfig && aObjects[0].placeholderConfig.container &&
-					that.hidePlaceholder && aObjects[0].placeholderConfig.autoClose) {
-					that.hidePlaceholder(aObjects[0].placeholderConfig);
-				}
+					if (oContainerControl && oObject) {
+						that.fireDisplay({
+							view : oObject.isA("sap.ui.core.mvc.View") ? oObject : undefined,
+							object: oObject,
+							control : oContainerControl,
+							config : that._oOptions,
+							data: vData,
+							routeRelevant: oTargetCreateInfo.routeRelevant
+						});
+					}
+
+					if (oPlaceholderConfig && oPlaceholderConfig.container &&
+						oPlaceholderConfig.autoClose && that.hidePlaceholder) {
+						that.hidePlaceholder(oPlaceholderConfig);
+					}
 
-				return aObjects[0];
+					return oParams;
+				});
 			});
 		},
 
 		showPlaceholder: function(mSettings) {
 			if (mSettings.container && mSettings.container.showPlaceholder) {
-				mSettings.container.showPlaceholder(mSettings);
+				return mSettings.container.showPlaceholder(mSettings);
+			} else {
+				return Promise.resolve();
 			}
 		},