@sapui5/sap.ushell 1.134.1 → 1.135.0

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/ApplicationContainer.js

@@ -2,12 +2,12 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.134.1
+ * @version 1.135.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/core/Control",
-    "sap/ushell/components/applicationIntegration/ApplicationContainerRenderer",
+    "sap/ushell/appIntegration/ApplicationContainerRenderer",
     "sap/ushell/Config",
     "sap/ushell/library", // css style dependency
     "sap/ushell/utils"
@@ -25,14 +25,14 @@ sap.ui.define([
         return {};
     }
 
-    // shortcut for sap.ushell.components.applicationIntegration.contracts.StatefulType
-    const StatefulType = ushellLibrary.components.applicationIntegration.contracts.StatefulType;
+    // shortcut for sap.ushell.appIntegration.contracts.StatefulType
+    const StatefulType = ushellLibrary.appIntegration.contracts.StatefulType;
 
     // shortcut for sap.ushell.components.container.ApplicationType
     const ApplicationType = ushellLibrary.components.container.ApplicationType;
 
     /**
-     * @alias sap.ushell.components.applicationIntegration.ApplicationContainer
+     * @alias sap.ushell.appIntegration.ApplicationContainer
      * Creates a new container control embedding the application with the given URL. The default
      * application type is "URL" and allows to embed web applications into an <code>IFRAME</code>.
      * By default, the container is visible and occupies the whole width and height of its parent.
@@ -46,9 +46,11 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      * @since 1.15.0
      */ // eslint-disable-next-line max-len
-    const ApplicationContainer = Control.extend("sap.ushell.components.applicationIntegration.ApplicationContainer", /** @lends sap.ushell.components.applicationIntegration.ApplicationContainer.prototype */ {
+    const ApplicationContainer = Control.extend("sap.ushell.appIntegration.ApplicationContainer", /** @lends sap.ushell.appIntegration.ApplicationContainer.prototype */ {
         metadata: {
+            library: "sap.ushell",
             properties: {
+                visible: { type: "boolean", defaultValue: true },
                 /**
                  * The container's height as a CSS size. This attribute is provided to the browser "as is"!
                  * <b>Note:</b> The HTML 4.01 specification allows pixels and percentages,
@@ -63,10 +65,11 @@ sap.ui.define([
                 width: { defaultValue: "100%", type: "sap.ui.core.CSSSize" },
 
                 active: { defaultValue: true, type: "boolean" },
-                currentAppUrl: { defaultValue: "", type: "string" },
+                initialAppId: { defaultValue: "", type: "string" },
                 currentAppId: { defaultValue: "", type: "string" },
+                currentAppUrl: { defaultValue: "", type: "string" },
                 shellUIService: { type: "object" },
-                statefulType: { defaultValue: StatefulType.NotSupported, type: "sap.ushell.components.applicationIntegration.contracts.StatefulType" },
+                statefulType: { defaultValue: StatefulType.NotSupported, type: "sap.ushell.appIntegration.contracts.StatefulType" },
                 beforeAppCloseEvent: { type: "object" },
                 isKeepAlive: { defaultValue: false, type: "boolean" },
                 isFetchedFromCache: { defaultValue: false, type: "boolean" },
@@ -81,6 +84,22 @@ sap.ui.define([
 
                 currentAppTargetResolution: { type: "object" },
 
+                /**
+                 * Whether the container is ready for rendering.
+                 * Subclasses should prevent any preparation steps and the actual rendering if this
+                 * property is set to <code>false</code>. The subclasses should render the container
+                 * with the base renderer instead. This property should be set to <code>true</code
+                 * by the AppLifeCycle whenever the container state is ready to be applied to the UI.
+                 */
+                readyForRendering: { defaultValue: false, type: "boolean" },
+
+                /**
+                 * Whether the container has been rendered completely.
+                 * Subclasses should set this property once the actual rendering is done.
+                 * It prevents the container from being invalidated.
+                 */
+                renderComplete: { defaultValue: false, type: "boolean" },
+
                 // ==========================================
                 // ========== ResolvedHashFragment ==========
 
@@ -120,7 +139,9 @@ sap.ui.define([
                     }
                 }
             },
-            library: "sap.ushell"
+            interfaces: [
+                "sap.ushell.renderer.INavContainerPage"
+            ]
         },
         renderer: ApplicationContainerRenderer
     });
@@ -128,7 +149,7 @@ sap.ui.define([
     // we have to cache the UI5 version first to have it available sync for the renderer
     ApplicationContainer.ui5version = null;
     ApplicationContainer.ui5versionPromise = ushellUtils.getUi5Version().then((sVersion) => {
-        Log.debug(`Using ui5-version: ${sVersion}`, null, "sap.ushell.components.applicationIntegration.ApplicationContainer");
+        Log.debug(`Using ui5-version: ${sVersion}`, null, "sap.ushell.appIntegration.ApplicationContainer");
         ApplicationContainer.ui5version = sVersion;
     });
 
@@ -146,7 +167,7 @@ sap.ui.define([
     };
 
     ApplicationContainer.prototype.invalidate = function () {
-        if (this.getDomRef()) {
+        if (this.getRenderComplete()) {
             //always prevent re-rendering of application container once it's rendered
             return this;
         }
@@ -154,6 +175,110 @@ sap.ui.define([
         return Control.prototype.invalidate.apply(this, arguments);
     };
 
+    /**
+     * Implementation of sap.ushell.renderer.INavContainerPage interface.
+     * @param {boolean} bVisible The new visibility state of the control.
+     *
+     * @since 1.135.0
+     * @private
+     */
+    ApplicationContainer.prototype.setVisibility = function (bVisible) {
+        this.setProperty("visible", bVisible, true);
+
+        if (bVisible) {
+            this.removeStyleClass("sapUShellApplicationContainerHidden");
+        } else {
+            this.addStyleClass("sapUShellApplicationContainerHidden");
+        }
+
+        // set aria-hidden attribute directly on dom element,
+        // as the control is not rerendered
+        const oDomRef = this.getDomRef();
+        if (oDomRef) {
+            oDomRef.setAttribute("aria-hidden", !bVisible);
+        }
+    };
+
+    /**
+     * Sets the active state of the application container.
+     * @param {string} bActive The new active state.
+     *
+     * @since 1.135.0
+     * @private
+     */
+    ApplicationContainer.prototype.setActive = function (bActive) {
+        this.setProperty("active", bActive);
+
+        const oDomRef = this.getDomRef();
+        if (oDomRef) {
+            oDomRef.setAttribute("data-sap-ushell-active", bActive);
+        }
+    };
+
+    /**
+     * Sets the initial application id.
+     * @param {string} sAppId The initial application id.
+     *
+     * @since 1.135.0
+     * @private
+     */
+    ApplicationContainer.prototype.setInitialAppId = function (sAppId) {
+        this.setProperty("initialAppId", sAppId);
+
+        const oDomRef = this.getDomRef();
+        if (oDomRef) {
+            oDomRef.setAttribute("data-sap-ushell-initial-app-id", sAppId);
+        }
+    };
+
+    /**
+     * Sets the current application id.
+     * @param {string} sAppId The new application id.
+     *
+     * @since 1.135.0
+     * @private
+     */
+    ApplicationContainer.prototype.setCurrentAppId = function (sAppId) {
+        this.setProperty("currentAppId", sAppId);
+
+        const oDomRef = this.getDomRef();
+        if (oDomRef) {
+            oDomRef.setAttribute("data-sap-ushell-current-app-id", sAppId);
+        }
+    };
+
+    /**
+     * Sets the stateful type of the application container.
+     * @param {sap.ushell.appIntegration.contracts.StatefulType} sNewStatefulType The new stateful type.
+     *
+     * @since 1.135.0
+     * @private
+     */
+    ApplicationContainer.prototype.setStatefulType = function (sNewStatefulType) {
+        this.setProperty("statefulType", sNewStatefulType);
+
+        const oDomRef = this.getDomRef();
+        if (oDomRef) {
+            oDomRef.setAttribute("data-sap-ushell-stateful-type", sNewStatefulType);
+        }
+    };
+
+    /**
+     * Sets the framework id of the application.
+     * @param {string} sFrameworkId The new framework id.
+     *
+     * @since 1.135.0
+     * @private
+     */
+    ApplicationContainer.prototype.setFrameworkId = function (sFrameworkId) {
+        this.setProperty("frameworkId", sFrameworkId);
+
+        const oDomRef = this.getDomRef();
+        if (oDomRef) {
+            oDomRef.setAttribute("data-sap-ushell-framework-id", sFrameworkId);
+        }
+    };
+
     /**
      * Method called by the appLifeCycle to post a "before close" message to the app
      * running in the iframe before the iframe its destroyed.

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

@@ -0,0 +1,54 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+
+
+sap.ui.define([
+    "sap/ushell/Config"
+], (
+    Config
+) => {
+    "use strict";
+
+    if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+        return {};
+    }
+
+    const ApplicationContainerRenderer = {
+        apiVersion: 2
+    };
+
+    ApplicationContainerRenderer.waitForUI5Version = function (oContainer) {
+        const ApplicationContainer = oContainer.getMetadata().getClass();
+        // we have to cache the UI5 version first
+        if (ApplicationContainer.ui5version === null) {
+            ApplicationContainer.ui5versionPromise.then(() => {
+                oContainer.invalidate();
+            });
+            return true;
+        }
+    };
+
+    ApplicationContainerRenderer.render = function (oRenderManager, oContainer) {
+        /*
+         * This is only a placeholder rendering, the actual rendering is done by the sub classes.
+         * It is executed when the application is not ready for rendering.
+         * Once it is ready, the application will be rendered by the sub classes and any further
+         * rendering will be suppressed.
+         */
+
+        oRenderManager.openStart("div", oContainer);
+        oRenderManager.accessibilityState(oContainer);
+        oRenderManager.attr("data-sap-ushell-active", oContainer.getActive());
+        oRenderManager.attr("data-sap-ushell-initial-app-id", oContainer.getInitialAppId());
+        oRenderManager.attr("data-sap-ushell-current-app-id", oContainer.getCurrentAppId());
+        oRenderManager.attr("data-sap-ushell-stateful-type", oContainer.getStatefulType());
+        oRenderManager.attr("data-sap-ushell-framework-id", oContainer.getFrameworkId());
+        oRenderManager.class("sapUShellApplicationContainer");
+        oRenderManager.style("height", oContainer.getHeight());
+        oRenderManager.style("width", oContainer.getWidth());
+        oRenderManager.openEnd();
+
+        oRenderManager.close("div");
+    };
+
+    return ApplicationContainerRenderer;
+});

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

@@ -0,0 +1,57 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+sap.ui.define([
+    "sap/ushell/Config",
+    "sap/ushell/state/StateManager"
+], function (
+    Config,
+    StateManager
+) {
+    "use strict";
+
+    if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
+        return {};
+    }
+
+    // shortcut for sap.ushell.state.StateManager.LaunchpadState
+    const LaunchpadState = StateManager.LaunchpadState;
+
+    class ApplicationHandle {
+        static #oNavContainer = null;
+        static #oAppLifeCycle = null;
+
+        #sStorageAppId = null;
+        #oResolvedHashFragment = null;
+        #oApplicationContainer = null;
+        #sNavigationRedirectHash = null;
+
+        constructor (sStorageAppId, oResolvedHashFragment, oApplicationContainer, sNavigationRedirectHash) {
+            this.#sStorageAppId = sStorageAppId;
+            this.#oResolvedHashFragment = oResolvedHashFragment;
+            this.#oApplicationContainer = oApplicationContainer;
+            this.#sNavigationRedirectHash = sNavigationRedirectHash;
+        }
+
+        static init (oAppLifeCycle, oNavContainer) {
+            this.#oAppLifeCycle = oAppLifeCycle;
+            this.#oNavContainer = oNavContainer;
+        }
+
+        navTo (bIsNavToHome) {
+            const sAppContainerId = this.#oApplicationContainer.getId();
+            ApplicationHandle.#oNavContainer.navTo(sAppContainerId);
+
+            ApplicationHandle.#oAppLifeCycle.switchViewState(
+                bIsNavToHome ? LaunchpadState.Home : LaunchpadState.App,
+                this.#sStorageAppId,
+                this.#oResolvedHashFragment.applicationType,
+                this.#oResolvedHashFragment.explicitNavMode
+            );
+        }
+
+        getNavigationRedirectHash () {
+            return this.#sNavigationRedirectHash;
+        }
+    }
+
+    return ApplicationHandle;
+});

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/IframeApplicationContainer.js

@@ -8,11 +8,11 @@ sap.ui.define([
     "sap/base/util/uid",
     "sap/ui/Device",
     "sap/ui/thirdparty/URI",
+    "sap/ushell/appIntegration/ApplicationContainer",
+    "sap/ushell/appIntegration/IframeApplicationContainerRenderer",
+    "sap/ushell/appIntegration/PostMessageManager",
     "sap/ushell/ApplicationType/UrlPostProcessing",
     "sap/ushell/ApplicationType/systemAlias",
-    "sap/ushell/components/applicationIntegration/ApplicationContainer",
-    "sap/ushell/components/applicationIntegration/IframeApplicationContainerRenderer",
-    "sap/ushell/components/applicationIntegration/PostMessageManager",
     "sap/ushell/Config",
     "sap/ushell/Container",
     "sap/ushell/library", // css style dependency
@@ -24,11 +24,11 @@ sap.ui.define([
     uid,
     Device,
     URI,
-    UrlPostProcessing,
-    systemAliasUtils,
     ApplicationContainer,
     IframeApplicationContainerRenderer,
     PostMessageManager,
+    UrlPostProcessing,
+    systemAliasUtils,
     Config,
     Container,
     ushellLibrary,
@@ -43,22 +43,27 @@ sap.ui.define([
     }
 
     /**
-     * @alias sap.ushell.components.applicationIntegration.IframeApplicationContainer
+     * @alias sap.ushell.appIntegration.IframeApplicationContainer
      * @class
      *
-     * @extends sap.ushell.components.applicationIntegration.ApplicationContainer
+     * @extends sap.ushell.appIntegration.ApplicationContainer
      *
      * @since 1.134.0
      * @private
      */ // eslint-disable-next-line max-len
-    const IframeApplicationContainer = ApplicationContainer.extend("sap.ushell.components.applicationIntegration.IframeApplicationContainer", /** @lends sap.ushell.components.applicationIntegration.IframeApplicationContainer.prototype */ {
+    const IframeApplicationContainer = ApplicationContainer.extend("sap.ushell.appIntegration.IframeApplicationContainer", /** @lends sap.ushell.appIntegration.IframeApplicationContainer.prototype */ {
         metadata: {
+            library: "sap.ushell",
             properties: {
+                visible: { type: "boolean", defaultValue: true },
                 globalDirtyStorageKey: { defaultValue: "", type: "string" },
                 iframeUrl: { defaultValue: "", type: "string", visibility: "hidden" },
                 iframePostAllParams: { defaultValue: false, type: "boolean" },
                 iframeWithPost: { defaultValue: false, type: "boolean" }
-            }
+            },
+            interfaces: [
+                "sap.ushell.renderer.INavContainerPage"
+            ]
         },
         renderer: IframeApplicationContainerRenderer
     });
@@ -66,6 +71,8 @@ sap.ui.define([
     IframeApplicationContainer.prototype.init = function () {
         ApplicationContainer.prototype.init.apply(this, arguments);
 
+        this._aPendingRequestsWaitingForResponse = [];
+
         // set object default values again to prevent them from being "synced"
         this.setProperty("isIframeValidTime", { time: 0 }, true);
 
@@ -82,7 +89,7 @@ sap.ui.define([
     };
 
     IframeApplicationContainer.prototype.onBeforeRendering = function () {
-        if (this.getDomRef()) {
+        if (!this.getReadyForRendering()) {
             return;
         }
 
@@ -102,6 +109,10 @@ sap.ui.define([
     };
 
     IframeApplicationContainer.prototype.onAfterRendering = async function () {
+        if (!this.getReadyForRendering()) {
+            return;
+        }
+
         // after rendering, the iframe and its origin is available
         const MessageBroker = await Container.getServiceAsync("MessageBroker");
         const sTargetOrigin = this.getPostMessageTargetOrigin();
@@ -114,6 +125,37 @@ sap.ui.define([
         }
     };
 
+    /**
+     * Implementation of sap.ushell.renderer.INavContainerPage interface.
+     * @param {boolean} bVisible The new visibility state of the control.
+     *
+     * @since 1.135.0
+     * @private
+     */
+    IframeApplicationContainer.prototype.setVisibility = function (bVisible) {
+        this.setProperty("visible", bVisible, true);
+
+        // set aria-hidden attribute directly on dom element,
+        // as the control is not rerendered
+        const oDomRef = this.getDomRef();
+        if (oDomRef) {
+            oDomRef.setAttribute("aria-hidden", !bVisible);
+        }
+
+        if (bVisible) {
+            this.removeStyleClass("sapUShellApplicationContainerIframeHidden");
+            this.removeStyleClass("sapUShellApplicationContainerIframeHiddenButActive");
+            return;
+        }
+
+        // see sendRequest for explanation
+        if (this._aPendingRequestsWaitingForResponse.length > 0) {
+            this.addStyleClass("sapUShellApplicationContainerIframeHiddenButActive");
+        } else {
+            this.addStyleClass("sapUShellApplicationContainerIframeHidden");
+        }
+    };
+
     IframeApplicationContainer.prototype._attachLogoutEvent = function () {
         const sApplicationType = this.getApplicationType();
         if (ushellUtils.isApplicationTypeEmbeddedInIframe(sApplicationType)) {
@@ -253,7 +295,7 @@ sap.ui.define([
             return;
         }
 
-        Log.debug("getGlobalDirty() send pro54_getGlobalDirty ", null, "sap.ushell.components.applicationIntegration.ApplicationContainer");
+        Log.debug("getGlobalDirty() send pro54_getGlobalDirty ", null, "sap.ushell.appIntegration.ApplicationContainer");
 
         const sTargetOrigin = this.getPostMessageTargetOrigin();
         const sMessage = JSON.stringify({ action: "pro54_getGlobalDirty" });
@@ -278,7 +320,7 @@ sap.ui.define([
     IframeApplicationContainer.prototype._getIframe = function () {
         const oIFrame = this.getDomRef();
         if (!oIFrame || oIFrame.tagName !== "IFRAME") {
-            if (this.getIframeWithPost() === true && oIFrame && oIFrame.getAttribute && oIFrame.getAttribute("sap-iframe-app") === "true") {
+            if (this.getIframeWithPost() === true && oIFrame && oIFrame.getAttribute && oIFrame.getAttribute("data-sap-ushell-iframe-app") === "true") {
                 return document.getElementById(`${oIFrame.getAttribute("id")}-iframe`);
             }
             return null;
@@ -332,14 +374,59 @@ sap.ui.define([
         return false;
     };
 
-    IframeApplicationContainer.prototype.sendRequest = function (sServiceRequest, oMessageBody, bWaitForResponse) {
-        return PostMessageManager.sendRequest(
+    /**
+     * Sends a request to the iframe and awaits the response if required.
+     * @param {string} sServiceRequest The service request
+     * @param {any} oMessageBody The message body which should be sent. Needs to be serializable.
+     * @param {boolean} [bWaitForResponse=false] Whether to wait for a response
+     * @returns {Promise<any>} Resolves with the response of the iframe if <code>bWaitForResponse</code> is true.
+     *
+     * @since 1.134.0
+     * @private
+     */
+    IframeApplicationContainer.prototype.sendRequest = async function (sServiceRequest, oMessageBody, bWaitForResponse = false) {
+        if (!bWaitForResponse) {
+            return PostMessageManager.sendRequest(
+                sServiceRequest,
+                oMessageBody,
+                this.getPostMessageTarget(),
+                this.getPostMessageTargetOrigin(),
+                false
+            );
+        }
+
+        /*
+         * If the iframe is hidden, calls of setTimeout and setInterval are throttled within the iframe for certain browsers
+         * (currently Chrome and Edge) if the iframe content comes from a different domain.
+         * This can lead to a delayed app start as the following post message to create the app within the iFrame waits until the app is created.
+         * Currently this is ONLY relevant for the UI5 app runtime when its UI5 bootstrap is NOT switched to async.
+         * In this case UI5 uses many setTimeouts with a delay of 0 during component creation to simulate async behavior.
+         */
+        if (!this.getProperty("visible")) {
+            this.addStyleClass("sapUShellApplicationContainerIframeHiddenButActive");
+            this.removeStyleClass("sapUShellApplicationContainerIframeHidden");
+        }
+
+        const oPromise = PostMessageManager.sendRequest(
             sServiceRequest,
             oMessageBody,
             this.getPostMessageTarget(),
             this.getPostMessageTargetOrigin(),
-            bWaitForResponse
+            true
         );
+
+        // for concurrent requests, we need to keep track of the promises
+        this._aPendingRequestsWaitingForResponse.push(oPromise);
+        const oResult = await oPromise;
+        this._aPendingRequestsWaitingForResponse = this._aPendingRequestsWaitingForResponse.filter((oPendingRequest) => oPendingRequest !== oPromise);
+
+        // only make the iframe unresponsive again if there are no more pending requests AND the iframe is still hidden
+        if (this._aPendingRequestsWaitingForResponse.length === 0 && !this.getProperty("visible")) {
+            this.addStyleClass("sapUShellApplicationContainerIframeHidden");
+            this.removeStyleClass("sapUShellApplicationContainerIframeHiddenButActive");
+        }
+
+        return oResult;
     };
 
     IframeApplicationContainer.prototype.sendBeforeAppCloseEvent = async function () {

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/IframeApplicationContainerRenderer.js

@@ -6,8 +6,8 @@ sap.ui.define([
     "sap/ui/core/Renderer",
     "sap/ui/core/RenderManager",
     "sap/ui/thirdparty/URI",
+    "sap/ushell/appIntegration/ApplicationContainerRenderer",
     "sap/ushell/ApplicationType/systemAlias",
-    "sap/ushell/components/applicationIntegration/ApplicationContainerRenderer",
     "sap/ushell/Config",
     "sap/ushell/Container",
     "sap/ushell/resources",
@@ -18,8 +18,8 @@ sap.ui.define([
     Renderer,
     RenderManager,
     URI,
-    systemAliasUtils,
     ApplicationContainerRenderer,
+    systemAliasUtils,
     Config,
     Container,
     ushellResources,
@@ -37,6 +37,11 @@ sap.ui.define([
     const IframeApplicationContainerRenderer = Renderer.extend(ApplicationContainerRenderer);
 
     IframeApplicationContainerRenderer.render = function (oRenderManager, oContainer) {
+        if (!oContainer.getReadyForRendering()) {
+            ApplicationContainerRenderer.render(oRenderManager, oContainer);
+            return;
+        }
+
         if (this.waitForUI5Version(oContainer)) {
             return;
         }
@@ -44,10 +49,13 @@ sap.ui.define([
         if (oContainer.getProperty("iframeWithPost")) {
             const sIframeUrl = oContainer.getProperty("iframeUrl");
             this._renderIframeWithPOST(oRenderManager, oContainer, sIframeUrl, ++iIframeIdx);
-            return;
+
+        } else {
+            this._renderIframe(oRenderManager, oContainer);
         }
 
-        this._renderIframe(oRenderManager, oContainer);
+        // mark the rendering as complete, this will suppress any further invalidation
+        oContainer.setRenderComplete(true);
     };
 
     IframeApplicationContainerRenderer._renderIframe = function (oRenderManager, oContainer) {
@@ -58,7 +66,12 @@ sap.ui.define([
         oRenderManager.accessibilityState(oContainer);
         oRenderManager.attr("src", sIframeUrl);
         oRenderManager.attr("title", ushellResources.i18n.getText("AppilcationContainer.IframeTitle"));
-        oRenderManager.attr("sap-iframe-idx", ++iIframeIdx);
+        oRenderManager.attr("data-sap-ushell-active", oContainer.getActive());
+        oRenderManager.attr("data-sap-ushell-iframe-idx", ++iIframeIdx);
+        oRenderManager.attr("data-sap-ushell-initial-app-id", oContainer.getInitialAppId());
+        oRenderManager.attr("data-sap-ushell-current-app-id", oContainer.getCurrentAppId());
+        oRenderManager.attr("data-sap-ushell-stateful-type", oContainer.getStatefulType());
+        oRenderManager.attr("data-sap-ushell-framework-id", oContainer.getFrameworkId());
         oRenderManager.class("sapUShellApplicationContainer");
         oRenderManager.style("height", oContainer.getHeight());
         oRenderManager.style("width", oContainer.getWidth());
@@ -74,18 +87,6 @@ sap.ui.define([
     IframeApplicationContainerRenderer._renderIframeWithPOST = function (oRenderManager, oContainer, sIframeUrl, iIframeIdx) {
         const sAdaptedIframeUrl = ushellUtils.filterOutParamsFromLegacyAppURL(sIframeUrl);
 
-        // we need to remove the sapUShellApplicationContainerIframeHidden style as the style is relevant
-        // only in the parent div of this iframe
-        let bIsHidden = false;
-        if (oContainer.hasStyleClass("sapUShellApplicationContainerIframeHidden")) {
-            bIsHidden = true;
-            oContainer.toggleStyleClass("sapUShellApplicationContainerIframeHidden", false);
-        }
-
-        if (bIsHidden) {
-            oContainer.toggleStyleClass("sapUShellApplicationContainerIframeHidden", true);
-        }
-
         // render the wrapper; we need to to do some async calculation and then rerender
         this._renderPostWrapper(oRenderManager, oContainer);
 
@@ -144,7 +145,12 @@ sap.ui.define([
     IframeApplicationContainerRenderer._renderPostWrapper = function (oRenderManager, oContainer) {
         //generate the <div> element that wraps the <form> and the <iframe>
         oRenderManager.openStart("div", oContainer);
-        oRenderManager.attr("sap-iframe-app", "true");
+        oRenderManager.attr("data-sap-ushell-active", oContainer.getActive());
+        oRenderManager.attr("data-sap-ushell-iframe-app", "true");
+        oRenderManager.attr("data-sap-ushell-initial-app-id", oContainer.getInitialAppId());
+        oRenderManager.attr("data-sap-ushell-current-app-id", oContainer.getCurrentAppId());
+        oRenderManager.attr("data-sap-ushell-stateful-type", oContainer.getStatefulType());
+        oRenderManager.attr("data-sap-ushell-framework-id", oContainer.getFrameworkId());
         oRenderManager.class("sapUShellApplicationContainer");
         oRenderManager.style("height", oContainer.getHeight());
         oRenderManager.style("width", oContainer.getWidth());
@@ -193,7 +199,7 @@ sap.ui.define([
             try {
                 const aDataArray = await Navigation.getAppStateData(oAppStatesInfo.aAppStateKeysArray);
                 if (aDataArray) {
-                    aKeys = [...oAppStatesInfo.aAppStateKeysArray];
+                    aKeys = [...oAppStatesInfo.aAppStateNamesArray];
                     aValues = [...aDataArray];
                 }
             } catch {
@@ -253,7 +259,7 @@ sap.ui.define([
         oRenderManager.accessibilityState(oContainer);
         oRenderManager.attr("sap-orig-src", sIframeUrl);
         oRenderManager.attr("title", ushellResources.i18n.getText("AppilcationContainer.IframeTitle"));
-        oRenderManager.attr("sap-iframe-idx", iIframeIdx);
+        oRenderManager.attr("data-sap-ushell-iframe-idx", iIframeIdx);
         oRenderManager.class("sapUShellApplicationContainer");
         oRenderManager.style("height", oContainer.getHeight());
         oRenderManager.style("width", oContainer.getWidth());

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/KeepAliveApps.js

@@ -39,7 +39,7 @@ sap.ui.define([
 
         /**
          * Removes all entries related to a given container
-         * @param {sap.ushell.components.applicationIntegration.ApplicationContainer} oApplicationContainer
+         * @param {sap.ushell.appIntegration.ApplicationContainer} oApplicationContainer
          * @param {function} [fnBeforeRemove]
          */
         this.removeByContainer = function (oApplicationContainer, fnBeforeRemove) {