@sapui5/sap.ushell 1.141.3 → 1.143.0

package/src/main/js/sap/ushell/appIntegration/IframeApplicationContainer.js

@@ -54,13 +54,43 @@ sap.ui.define([
             library: "sap.ushell",
             properties: {
                 visible: { type: "boolean", defaultValue: true },
-                globalDirtyStorageKey: { defaultValue: "", type: "string" },
+                nwbcDirtyStorageKey: { defaultValue: "", type: "string" },
                 iframeUrl: { defaultValue: "", type: "string", visibility: "hidden" },
                 iframePostAllParams: { defaultValue: false, type: "boolean" },
                 iframeWithPost: { defaultValue: false, type: "boolean" },
 
                 iframeIsValidSupport: { defaultValue: false, type: "boolean" },
-                lastIframeIsValidTime: { defaultValue: 0, type: "int" }
+                lastIframeIsValidTime: { defaultValue: 0, type: "int" },
+
+                /* ==========================================
+                 * =============== Rendering ================
+                 * General flow:
+                 *  1) readyForRendering=false => render placeholder
+                 *  2) readyForRendering=true => invalidation
+                 *  3) onBeforeRendering
+                 *  4) prepareRendering => preparingRendering=true
+                 *  5) async calculations => renderingPrepared=true
+                 *  6) invalidation
+                 *  7) final rendering
+                 *  8) set renderComplete=true (might be set async)
+                 *  9) rendered() resolves
+                 */
+
+                /**
+                 * Indicates whether the rendering is currently being prepared.
+                 *
+                 * @since 1.141.0
+                 * @private
+                 */
+                preparingRendering: { defaultValue: false, type: "boolean", visibility: "hidden" },
+
+                /**
+                 * Indicates whether the preparations for the rendering are done and the final rendering can be done.
+                 *
+                 * @since 1.141.0
+                 * @private
+                 */
+                renderingPrepared: { defaultValue: false, type: "boolean", visibility: "hidden" }
             },
             interfaces: [
                 "sap.ushell.renderer.INavContainerPage"
@@ -76,11 +106,11 @@ sap.ui.define([
 
         this.setProperty("lastIframeIsValidTime", Date.now(), true);
 
-        const sDirtyStateStorageKey = `sap.ushell.Container.dirtyState.${uid()}`;
-        this.setProperty("globalDirtyStorageKey", sDirtyStateStorageKey, true);
-        localStorage.removeItem(this.getGlobalDirtyStorageKey()); // remove container from list of NWBC-containing containers; if this container was an NWBC container before
+        const sNwbcDirtyStateStorageKey = `sap.ushell.Container.dirtyState.${uid()}`;
+        this.setProperty("nwbcDirtyStorageKey", sNwbcDirtyStateStorageKey, true);
+        localStorage.removeItem(this.getNwbcDirtyStorageKey()); // remove container from list of NWBC-containing containers; if this container was an NWBC container before
 
-        this._fnStorageEventListener = this._handleStorageEvent.bind(this);
+        this._fnStorageEventListener = this._handleNwbcStorageEvent.bind(this);
         addEventListener("storage", this._fnStorageEventListener);
 
         // be sure to remove entry from list of NWBC-containing containers when the window is closed
@@ -88,31 +118,56 @@ sap.ui.define([
         addEventListener("pagehide", this._fnPagehideEventListener);
     };
 
-    IframeApplicationContainer.prototype.onBeforeRendering = function () {
-        if (!this.getReadyForRendering()) {
+    /**
+     * This callback is called once during the rendering phase and interrupts the rendering.
+     * It is awaited and the rendering continues once the returned promise is resolved.
+     *
+     * No changes to the rendering relevant properties of the control must be done during this phase.
+     */
+    IframeApplicationContainer.prototype.prepareRendering = async function () {
+        if (this.getProperty("preparingRendering") || this.getProperty("renderingPrepared")) {
             return;
         }
 
-        this._attachLogoutEvent(); // todo: [FLPCOREANDUX-10024] might be always added
-        this._initNWBCStorage();
-        this._addRemoteSystemForUrl();
-        this._calculateIframeUrl(); // todo: [FLPCOREANDUX-10024] check whether this can be async
-        this._calculateIframeWithPost();
+        try {
+            this._attachNwbcLogoutEvent();
+            this._initNwbcDirtyState();
+            this._addRemoteSystemForUrl();
+            await this._calculateIframeUrl();
+            this._calculateIframeWithPost();
 
-        // the post mechanism requires the iframeUrl without system alias
-        if (!this.getProperty("iframeWithPost")) {
-            const sIframeUrl = this.getProperty("iframeUrl");
-            const sIframeUrlWithSystemAlias = systemAliasUtils.addSystemAlias(sIframeUrl, this);
+            // the post mechanism requires the iframeUrl without system alias
+            if (!this.getProperty("iframeWithPost")) {
+                const sIframeUrl = this.getProperty("iframeUrl");
+                const sIframeUrlWithSystemAlias = systemAliasUtils.addSystemAlias(sIframeUrl, this);
 
-            this.setProperty("iframeUrl", sIframeUrlWithSystemAlias, true);
+                this.setProperty("iframeUrl", sIframeUrlWithSystemAlias, true);
+            }
+        } catch (oError) {
+            Log.error("Error during prepareRendering:", oError, "sap.ushell.appIntegration.IframeApplicationContainer");
         }
+
+        this.setProperty("preparingRendering", false, true);
+        this.setProperty("renderingPrepared", true); // triggers re-rendering
     };
 
-    IframeApplicationContainer.prototype.onAfterRendering = async function () {
+    IframeApplicationContainer.prototype.onBeforeRendering = function () {
         if (!this.getReadyForRendering()) {
             return;
         }
 
+        this.prepareRendering();
+    };
+
+    IframeApplicationContainer.prototype.onAfterRendering = async function () {
+        if (
+            !this.getReadyForRendering()
+            || this.getProperty("preparingRendering")
+            || !this.getProperty("renderingPrepared")
+        ) {
+            return;
+        }
+
         // after rendering, the iframe and its origin is available
         const MessageBroker = await Container.getServiceAsync("MessageBroker");
         const sTargetOrigin = this.getPostMessageTargetOrigin();
@@ -120,8 +175,9 @@ sap.ui.define([
 
         // iOS Safari ignores CSS width and height of the iframe. The iframe is as big as its contents.
         // Scrolling inside of a such an iframe is not possible. Scroll the parent container instead.
-        if (Device.os.ios && this.$().prop("tagName") === "IFRAME") {
-            this.$().parent().css("overflow", "auto"); // todo: [FLPCOREANDUX-10024] fix this
+        const oDomRef = this.getDomRef();
+        if (Device.os.ios && oDomRef?.tagName === "IFRAME") {
+            oDomRef.parentNode.style.overflow = "auto";
         }
     };
 
@@ -183,19 +239,20 @@ sap.ui.define([
         return this;
     };
 
-    IframeApplicationContainer.prototype._attachLogoutEvent = function () {
+    IframeApplicationContainer.prototype._attachNwbcLogoutEvent = function () {
         const sApplicationType = this.getApplicationType();
         if (ushellUtils.isApplicationTypeEmbeddedInIframe(sApplicationType)) {
-            this._fnLogout = this._handleLogout.bind(this);
+            this._fnLogout = this._handleNwbcLogout.bind(this);
             Container.attachLogoutEvent(this._fnLogout);
         }
     };
 
-    IframeApplicationContainer.prototype._initNWBCStorage = function () {
+    IframeApplicationContainer.prototype._initNwbcDirtyState = function () {
         const sApplicationType = this.getApplicationType();
-        if (ushellUtils.isApplicationTypeEmbeddedInIframe(sApplicationType, true) || ushellUtils.isApplicationTypeEmbeddedInIframe(this.getFrameworkId())) {
+        const sFrameworkId = this.getFrameworkId();
+        if (ushellUtils.isApplicationTypeEmbeddedInIframe(sApplicationType, true) || ushellUtils.isApplicationTypeEmbeddedInIframe(sFrameworkId)) {
             // add this container to list of NWBC-containing containers
-            ushellUtils.localStorageSetItem(this.getGlobalDirtyStorageKey(), Container.DirtyState.INITIAL);
+            ushellUtils.localStorageSetItem(this.getNwbcDirtyStorageKey(), Container.DirtyState.INITIAL);
         }
     };
 
@@ -238,12 +295,12 @@ sap.ui.define([
         this.setProperty("iframeWithPost", bEnablePost, true);
     };
 
-    IframeApplicationContainer.prototype._calculateIframeUrl = function () {
+    IframeApplicationContainer.prototype._calculateIframeUrl = async function () {
         const sApplicationType = this.getApplicationType();
 
         let sIframeUrl = this.getUrl();
         // add classic ui flags
-        sIframeUrl = UrlPostProcessing.processUrl(
+        sIframeUrl = await UrlPostProcessing.processUrl(
             sIframeUrl,
             sApplicationType,
             false, // bForExplaceNavigation
@@ -307,9 +364,9 @@ sap.ui.define([
         Container.addRemoteSystem(this._oSystem);
     };
 
-    IframeApplicationContainer.prototype._handleStorageEvent = function (oEvent) {
+    IframeApplicationContainer.prototype._handleNwbcStorageEvent = function (oEvent) {
         // only handle events for the current application
-        if (oEvent.key !== this.getGlobalDirtyStorageKey()) {
+        if (oEvent.key !== this.getNwbcDirtyStorageKey()) {
             return;
         }
 
@@ -329,7 +386,7 @@ sap.ui.define([
         oTarget.postMessage(sMessage, sTargetOrigin);
     };
 
-    IframeApplicationContainer.prototype._handleLogout = function (oEvent) {
+    IframeApplicationContainer.prototype._handleNwbcLogout = function (oEvent) {
         const oContentWindow = this.getPostMessageTarget();
         const sApplicationType = this.getApplicationType();
 
@@ -485,7 +542,7 @@ sap.ui.define([
 
     IframeApplicationContainer.prototype.exit = function () {
         // remove container from list of NWBC-containing containers; if this container was an NWBC container before
-        localStorage.removeItem(this.getGlobalDirtyStorageKey());
+        localStorage.removeItem(this.getNwbcDirtyStorageKey());
 
         if (this._fnStorageEventListener) {
             removeEventListener("storage", this._fnStorageEventListener);

package/src/main/js/sap/ushell/appIntegration/IframeApplicationContainerRenderer.js

@@ -32,22 +32,27 @@ sap.ui.define([
     const IframeApplicationContainerRenderer = Renderer.extend(ApplicationContainerRenderer);
 
     IframeApplicationContainerRenderer.render = function (oRenderManager, oContainer) {
-        if (!oContainer.getReadyForRendering()) {
+        if (
+            !oContainer.getReadyForRendering()
+            || oContainer.getProperty("preparingRendering")
+            || !oContainer.getProperty("renderingPrepared")
+        ) {
             ApplicationContainerRenderer.render(oRenderManager, oContainer);
             return;
         }
 
-        if (this.waitForUI5Version(oContainer)) {
-            return;
-        }
-
         if (oContainer.getProperty("iframeWithPost")) {
             const sIframeUrl = oContainer.getProperty("iframeUrl");
-            this._renderIframeWithPOST(oRenderManager, oContainer, sIframeUrl, ++iIframeIdx);
-        } else {
-            this._renderIframe(oRenderManager, oContainer);
+            this._renderIframeWithPOST(oRenderManager, oContainer, sIframeUrl, ++iIframeIdx).then(() => {
+                // mark the rendering as complete, this will suppress any further invalidation
+                oContainer.setRenderComplete(true);
+            });
+
+            return;
         }
 
+        this._renderIframe(oRenderManager, oContainer);
+
         // mark the rendering as complete, this will suppress any further invalidation
         oContainer.setRenderComplete(true);
     };
@@ -78,55 +83,51 @@ sap.ui.define([
         oRenderManager.close("iframe");
     };
 
-    IframeApplicationContainerRenderer._renderIframeWithPOST = function (oRenderManager, oContainer, sIframeUrl, iIframeIdx) {
+    IframeApplicationContainerRenderer._renderIframeWithPOST = async function (oRenderManager, oContainer, sIframeUrl, iIframeIdx) {
         const sAdaptedIframeUrl = ushellUtils.filterOutParamsFromLegacyAppURL(sIframeUrl);
 
         // render the wrapper; we need to to do some async calculation and then rerender
         this._renderPostWrapper(oRenderManager, oContainer);
 
-        this._getAdditionalDataForPost(oContainer, sAdaptedIframeUrl)
-            .then(async (oFLPParams) => {
-                // we are now running async and need to use a new RenderManager
-                const oRenderManagerNew = new RenderManager();
-
-                // When sending a POST request, we concatenate the string "-iframe" to the 'id' attribute of the <iframe> node.
-                // The reason is that in POST request the IFRAME element is a child of a new 'div' element, that holds the
-                // original id of the <iframe> node, and in order not to associate them with them with the same id we add this string.
-                const sFormId = `${oContainer.getId()}-form`;
-                const sIframeId = `${oContainer.getId()}-iframe`;
-
-                const oUrls = this._calculatePostUrls(oContainer, sAdaptedIframeUrl);
-
-                this._renderPostForm(
-                    oRenderManagerNew,
-                    oContainer,
-                    sFormId,
-                    sIframeId,
-                    oFLPParams,
-                    oUrls.form,
-                    `${oContainer.getDataHelpId()}-form`,
-                    oUrls.iframeWithoutSystemAlias
-                );
-
-                this._renderPostIframe(
-                    oRenderManagerNew,
-                    oContainer,
-                    sIframeId,
-                    oUrls.iframe,
-                    oUrls.form,
-                    `${oContainer.getDataHelpId()}-iframe`,
-                    iIframeIdx
-                );
-
-                // now finally apply the changes
-                oRenderManagerNew.flush(oContainer.getDomRef());
-                oRenderManagerNew.destroy();
-
-                await ushellUtils.awaitTimeout(0);
-
-                return sFormId;
-            })
-            .then((sFormId) => {
+        const oFLPParams = await this._getAdditionalDataForPost(oContainer, sAdaptedIframeUrl);
+        // we are now running async and need to use a new RenderManager
+        const oRenderManagerNew = new RenderManager();
+
+        // When sending a POST request, we concatenate the string "-iframe" to the 'id' attribute of the <iframe> node.
+        // The reason is that in POST request the IFRAME element is a child of a new 'div' element, that holds the
+        // original id of the <iframe> node, and in order not to associate them with them with the same id we add this string.
+        const sFormId = `${oContainer.getId()}-form`;
+        const sIframeId = `${oContainer.getId()}-iframe`;
+
+        const oUrls = this._calculatePostUrls(oContainer, sAdaptedIframeUrl);
+
+        this._renderPostForm(
+            oRenderManagerNew,
+            oContainer,
+            sFormId,
+            sIframeId,
+            oFLPParams,
+            oUrls.form,
+            `${oContainer.getDataHelpId()}-form`,
+            oUrls.iframeWithoutSystemAlias
+        );
+
+        this._renderPostIframe(
+            oRenderManagerNew,
+            oContainer,
+            sIframeId,
+            oUrls.iframe,
+            oUrls.form,
+            `${oContainer.getDataHelpId()}-iframe`,
+            iIframeIdx
+        );
+
+        // now finally apply the changes
+        oRenderManagerNew.flush(oContainer.getDomRef());
+        oRenderManagerNew.destroy();
+
+        ushellUtils.awaitTimeout(0)
+            .then(() => {
                 const oForm = document.getElementById(sFormId);
                 if (oForm) {
                     oForm.submit();

package/src/main/js/sap/ushell/appIntegration/PostMessageHandler/LifecycleHandler.js

@@ -129,9 +129,7 @@ sap.ui.define([
                         aNewCapabilities.push("sap.ushell.services.appLifeCycle.create");
                         aNewCapabilities.push("sap.ushell.services.appLifeCycle.destroy");
 
-                        // todo: [FLPCOREANDUX-10024] this is a workaround
-                        const bIsAppruntime = !ushellUtils.isSAPLegacyApplicationType(oApplicationContainer.getApplicationType(), oApplicationContainer.getFrameworkId());
-                        if (bIsAppruntime) {
+                        if (oSetup.isKeepAlive) { // e.g. appRuntime
                             aNewCapabilities.push("sap.ushell.services.appLifeCycle.store");
                             aNewCapabilities.push("sap.ushell.services.appLifeCycle.restore");
                         }

package/src/main/js/sap/ushell/appIntegration/PostMessageHandler/NWBCHandler.js

@@ -61,7 +61,7 @@ sap.ui.define([
          */
         "sap.ushell.appIntegration.PostMessageManager.NWBCHandler.pro54_setGlobalDirty": {
             async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
-                const sDirtyStateStorageKey = oApplicationContainer.getGlobalDirtyStorageKey();
+                const sDirtyStateStorageKey = oApplicationContainer.getNwbcDirtyStorageKey();
                 if (localStorage.getItem(sDirtyStateStorageKey) === Container.DirtyState.PENDING) {
                     Log.debug(
                         `getGlobalDirty() pro54_setGlobalDirty SetItem key:${sDirtyStateStorageKey} value: ${oMessageBody.globalDirty}`,

package/src/main/js/sap/ushell/appIntegration/PostMessageHandler/NavigationHandler.js

@@ -318,14 +318,14 @@ sap.ui.define([
             async handler (oMessageBody, oMessageEvent) {
                 const { appSpecificRoute, writeHistory } = oMessageBody;
 
-                const oHash = UrlParsing.parseShellHash(hasher.getHash());
+                const oParsedHash = UrlParsing.parseShellHash(hasher.getHash());
 
                 // do nothing if new is exactly like the current one
-                if (oHash.appSpecificRoute === appSpecificRoute) {
+                if (oParsedHash.appSpecificRoute === appSpecificRoute) {
                     return;
                 }
-                oHash.appSpecificRoute = appSpecificRoute;
-                const sNewHash = `#${UrlParsing.constructShellHash(oHash)}`;
+                oParsedHash.appSpecificRoute = appSpecificRoute;
+                const sNewHash = `#${UrlParsing.constructShellHash(oParsedHash)}`;
                 hasher.disableBlueBoxHashChangeTrigger = true;
                 if (writeHistory === true || writeHistory === "true") {
                     hasher.setHash(sNewHash);

package/src/main/js/sap/ushell/appIntegration/PostMessageManager.js

@@ -50,7 +50,8 @@ sap.ui.define([
      * @typedef {object} RequestHandlerOptions
      * @property {boolean} [provideApplicationContext=false] flag to indicate if the application context should be used.
      * @property {boolean} [allowInactive=false] flag to indicate if the request should be allowed from inactive applications.
-     * @property {function(MessageEvent):Promise<boolean>} [isValidRequest] an async function to validate the request
+     * @property {function(MessageEvent):Promise<boolean>} [isValidRequest] an async function to validate the request if not
+     * provided the request is validated by default checks. This requires that the request comes from a known application iframe.
      *
      * @see {@link sap.ushell.appIntegration.PostMessageManager#setRequestHandler}
      *
@@ -113,6 +114,7 @@ sap.ui.define([
 
         #bInitialized = false;
         #bDisabled = false;
+        #bSkipSourceValidation = false;
 
         #aEventPreprocessor = [];
         #aResponseHandlers = [];
@@ -142,15 +144,23 @@ sap.ui.define([
                 return;
             }
 
+            // Use provided methods or create fallbacks. The fallbacks are only relevant for tests
             const fnGetCurrentApplication = oOptions.getCurrentApplication || function () {};
-            this.#fnGetCurrentApplication = fnGetCurrentApplication;
+            const fnGetAllApplications = oOptions.getAllApplications || function () {
+                const oCurrentApplication = fnGetCurrentApplication();
+                return oCurrentApplication ? [oCurrentApplication] : [];
+            };
 
-            const fnGetAllApplications = oOptions.getAllApplications || function () { return []; };
+            this.#fnGetCurrentApplication = fnGetCurrentApplication;
             this.#fnGetAllApplications = fnGetAllApplications;
 
             if (oOptions.skipReplay) {
                 this.#bKeepMessagesForLaterProcessing = false;
             }
+            if (oOptions.skipSourceValidation) {
+                // only for testing
+                this.#bSkipSourceValidation = true;
+            }
 
             this.#fnPostMessageEventHandler = this.#handlePostMessageEvent.bind(this);
             addEventListener("message", this.#fnPostMessageEventHandler);
@@ -382,13 +392,9 @@ sap.ui.define([
                 return DoNotReply;
             }
 
+            await this.#validateServiceRequest(oMessageEvent, sServiceRequest);
+
             const oRequestHandlerOptions = this.#getServiceRequestHandlerOptions(sServiceRequest);
-            if (typeof oRequestHandlerOptions?.isValidRequest === "function") {
-                const bIsValidRequest = await oRequestHandlerOptions.isValidRequest(oMessageEvent);
-                if (!bIsValidRequest) {
-                    throw new Error(`Invalid request for service ${sServiceRequest}.`);
-                }
-            }
 
             if (oRequestHandlerOptions.provideApplicationContext) {
                 const oApplicationContainer = this.#getApplicationContainerContext(oSourceWindow);
@@ -396,14 +402,6 @@ sap.ui.define([
                     throw new Error("Cannot find the related application for the service request.");
                 }
 
-                if (!oApplicationContainer.getActive() && !oRequestHandlerOptions?.allowInactive) {
-                    throw new Error("Received Post Message from an inactive application.");
-                }
-
-                if (!oApplicationContainer.isTrustedPostMessageSource(oMessageEvent)) {
-                    throw new Error("Received Post Message from an untrusted source.");
-                }
-
                 oLogger.debug(`Handling service request for ${sServiceRequest} (${oMessage.request_id}) with application context ${oApplicationContainer.getId()}.`);
 
                 return fnServiceRequestHandler(oMessage.body, oApplicationContainer, oMessageEvent);
@@ -414,6 +412,48 @@ sap.ui.define([
             return fnServiceRequestHandler(oMessage.body, oMessageEvent);
         }
 
+        async #validateServiceRequest (oMessageEvent, sServiceRequest) {
+            // only for testing
+            if (this.#bSkipSourceValidation) {
+                return;
+            }
+
+            const oRequestHandlerOptions = this.#getServiceRequestHandlerOptions(sServiceRequest);
+            const bUseCustomValidation = typeof oRequestHandlerOptions.isValidRequest === "function";
+
+            if (bUseCustomValidation) {
+                const bIsValidRequest = await oRequestHandlerOptions.isValidRequest(oMessageEvent);
+                if (!bIsValidRequest) {
+                    throw new Error(`Invalid request for service ${sServiceRequest}.`);
+                }
+            } else {
+                const oApplicationContainer = this.#getApplicationContainerContext(oMessageEvent.source);
+                /**
+                 * For most post messages we expect that we can find the related application container.
+                 * There are certain scenario where this is not the case:
+                 *  1) NWBC Compatibility mode: The message is coming from a nested iframe
+                 *  2) Standalone iframes created by plugins
+                 *
+                 * For case 1) we assume that message is coming from the current application.
+                 *  - should be active
+                 *  - should be trusted (same domain)
+                 *
+                 * Case 2) is not supported.
+                 */
+                if (!oApplicationContainer) {
+                    throw new Error("Cannot find the related application for the service request.");
+                }
+
+                if (!oApplicationContainer.getActive() && !oRequestHandlerOptions.allowInactive) {
+                    throw new Error("Received Post Message from an inactive application.");
+                }
+
+                if (!oApplicationContainer.isTrustedPostMessageSource(oMessageEvent)) {
+                    throw new Error("Received Post Message from an untrusted source.");
+                }
+            }
+        }
+
         /**
          * Returns the request handler for the given service request.
          * @param {string} sServiceRequest The service request name.
@@ -877,6 +917,7 @@ sap.ui.define([
 
             this.#bInitialized = false;
             this.#bDisabled = false;
+            this.#bSkipSourceValidation = false;
 
             this.#aEventPreprocessor = [];
             this.#oRequestHandlers = {};

package/src/main/js/sap/ushell/appIntegration/PostMessagePluginInterface.js

@@ -76,6 +76,10 @@ sap.ui.define([
      * @alias sap.ushell.appIntegration.PostMessagePluginInterface
      * @class
      * @classdesc This class provides an interface independent of the runtime environment
+     * for post message communication. However, it is only meant to be used in the context
+     * of "application runtimes" (FLP, appruntime).
+     *
+     * It is not meant to be used in standalone iframes.
      *
      * @private
      */

package/src/main/js/sap/ushell/appIntegration/UI5ApplicationContainer.js

@@ -42,8 +42,9 @@ sap.ui.define([
                  * component metadata and constructor which might already be loaded
                  */
                 componentHandle: { type: "object" },
-                // todo: [FLPCOREANDUX-10024] Remove this
+
                 ui5ComponentId: { type: "string" },
+
                 ui5ComponentName: { type: "string" }
             },
             aggregations: {
@@ -71,15 +72,6 @@ sap.ui.define([
             return;
         }
 
-        // todo: [FLPCOREANDUX-10024] Remove this publish
-        EventBus.getInstance().publish(
-            "sap.ushell.components.container.ApplicationContainer",
-            "_prior.newUI5ComponentInstantion",
-            {
-                name: this.getUi5ComponentName()
-            }
-        );
-
         const oComponent = this.getComponentHandle().getInstance();
 
         const oComponentContainer = new ComponentContainer({
@@ -91,13 +83,6 @@ sap.ui.define([
         oComponentContainer.setWidth(this.getWidth());
         oComponentContainer.addStyleClass("sapUShellApplicationContainer");
 
-        this._fnDisableRouterEventHandler = this._disableRouter.bind(this);
-        EventBus.getInstance().subscribe(
-            "sap.ushell.components.container.ApplicationContainer",
-            "_prior.newUI5ComponentInstantion",
-            this._fnDisableRouterEventHandler
-        );
-
         this.setAggregation("child", oComponentContainer);
 
         return this._publishAppComponentLoaded(oComponent);
@@ -119,7 +104,14 @@ sap.ui.define([
         return this;
     };
 
-    // todo: [FLPCOREANDUX-10024] Check whether this might be publicly used
+    /**
+     * Fires the EventBus event ["sap.ushell", "appComponentLoaded"]
+     * This is SAP internally used e.g. for custom focus handling.
+     *
+     * @param {sap.ui.core.UIComponent} oComponent The newly created component.
+     *
+     * @private
+     */
     UI5ApplicationContainer.prototype._publishAppComponentLoaded = async function (oComponent) {
         const PluginManager = await Container.getServiceAsync("PluginManager");
         await ushellUtils.promisify(PluginManager.getPluginLoadingPromise("RendererExtensions"));
@@ -131,9 +123,12 @@ sap.ui.define([
 
     /**
      * Invoke <code>getRouter.stop()<code> on the oComponentAn event handler for the onNewAppInstantiated event
+     * This method might be called before the component is created.
+     *
+     * @private
      */
-    UI5ApplicationContainer.prototype._disableRouter = function () {
-        const oComponent = this.getComponentHandle().getInstance();
+    UI5ApplicationContainer.prototype.stopRouter = function () {
+        const oComponent = this.getComponentHandle()?.getInstance();
         if (!oComponent || !oComponent.isA("sap.ui.core.UIComponent")) {
             return;
         }
@@ -162,14 +157,6 @@ sap.ui.define([
     };
 
     UI5ApplicationContainer.prototype.exit = function () {
-        if (this._fnDisableRouterEventHandler) {
-            EventBus.getInstance().unsubscribe(
-                "sap.ushell.components.container.ApplicationContainer",
-                "_prior.newUI5ComponentInstantion",
-                this._fnDisableRouterEventHandler
-            );
-        }
-
         this._destroyChild();
 
         // before initial render the child aggregation is not set