@micro-zoe/micro-app 1.0.0-beta.2 → 1.0.0-beta.3

package/lib/index.d.ts

@@ -243,7 +243,7 @@ declare module '@micro-zoe/micro-app/libs/utils' {
         * @param target Accept cloned elements
         * @param deep deep clone or transfer dom
         */
-    export function cloneContainer<T extends Element | ShadowRoot, Q extends Element | ShadowRoot>(origin: T, target: Q, deep: boolean): Q;
+    export function cloneContainer<T extends Element | ShadowRoot, Q extends Element | ShadowRoot>(target: Q, origin: T, deep: boolean): Q;
     export function isInvalidQuerySelectorKey(key: string): boolean;
     export function isUniqueElement(key: string): boolean;
     /**

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-beta.2';
+const version = '1.0.0-beta.3';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -356,7 +356,7 @@ function pureCreateElement(tagName, options) {
  * @param target Accept cloned elements
  * @param deep deep clone or transfer dom
  */
-function cloneContainer(origin, target, deep) {
+function cloneContainer(target, origin, deep) {
     target.innerHTML = '';
     if (deep) {
         // TODO: ShadowRoot兼容，ShadowRoot不能直接使用cloneNode
@@ -562,7 +562,6 @@ var appStates;
 (function (appStates) {
     appStates["CREATED"] = "created";
     appStates["LOADING"] = "loading";
-    appStates["LOADED"] = "loaded";
     appStates["LOAD_FAILED"] = "load_failed";
     appStates["MOUNTING"] = "mounting";
     appStates["MOUNTED"] = "mounted";
@@ -1501,7 +1500,7 @@ function execScripts(app, initHook) {
         // Notice the second render
         if (appSpaceData.defer || appSpaceData.async) {
             // TODO: defer和module彻底分开，不要混在一起
-            if (scriptInfo.isExternal && !scriptInfo.code && !(app.iframe && appSpaceData.module)) {
+            if (scriptInfo.isExternal && !scriptInfo.code && !isTypeModule(app, scriptInfo)) {
                 deferScriptPromise.push(fetchSource(address, app.name));
             }
             else {
@@ -1585,9 +1584,19 @@ function runScript(address, app, scriptInfo, callback, replaceElement) {
             appSpaceData.sandboxType = sandboxType;
             appSpaceData.parsedFunction = null;
         }
+        /**
+         * TODO: 优化逻辑
+         * 是否是内联模式应该由外部传入，这样自外而内更加统一，逻辑更加清晰
+         */
         if (isInlineMode(app, scriptInfo)) {
             const scriptElement = replaceElement || pureCreateElement('script');
             runCode2InlineScript(address, appSpaceData.parsedCode, isTypeModule(app, scriptInfo), scriptElement, appSpaceData.attrs, callback);
+            /**
+             * TODO: 优化逻辑
+             * replaceElement不存在说明是初始化执行，需要主动插入script
+             * 但这里的逻辑不清晰，应该明确声明是什么环境下才需要主动插入，而不是用replaceElement间接判断
+             * replaceElement还有可能是注释类型(一定是在后台执行)，这里的判断都是间接判断，不够直观
+             */
             if (!replaceElement) {
                 // TEST IGNORE
                 const parent = app.iframe ? app.sandBox.microBody : app.querySelector('micro-app-body');
@@ -1623,7 +1632,7 @@ function runDynamicRemoteScript(address, app, scriptInfo, originScript) {
         runScript(address, app, scriptInfo, dispatchScriptOnLoadEvent, replaceElement);
         !isTypeModule(app, scriptInfo) && dispatchScriptOnLoadEvent();
     };
-    if (scriptInfo.code || (app.iframe && scriptInfo.appSpace[app.name].module)) {
+    if (scriptInfo.code || isTypeModule(app, scriptInfo)) {
         defer(runDynamicScript);
     }
     else {
@@ -2172,14 +2181,21 @@ function patchElementAndDocument() {
         }
         return globalEnv.rawRemoveChild.call(this, oldChild);
     };
+    /**
+     * The insertAdjacentElement method of the Element interface inserts a given element node at a given position relative to the element it is invoked upon.
+     * NOTE:
+     *  1. parameter 2 of insertAdjacentElement must type 'Element'
+     */
     rawRootElement.prototype.insertAdjacentElement = function (where, element) {
         var _a;
-        if (element === null || element === void 0 ? void 0 : element.__MICRO_APP_NAME__) {
+        if ((element === null || element === void 0 ? void 0 : element.__MICRO_APP_NAME__) && isElement(element)) {
             const app = appInstanceMap.get(element.__MICRO_APP_NAME__);
             if (app === null || app === void 0 ? void 0 : app.container) {
-                element = handleNewNode(element, app);
-                const realParent = (_a = getHijackParent(this, element, app)) !== null && _a !== void 0 ? _a : this;
-                return globalEnv.rawInsertAdjacentElement.call(realParent, where, element);
+                const processedEle = handleNewNode(element, app);
+                if (!isElement(processedEle))
+                    return element;
+                const realParent = (_a = getHijackParent(this, processedEle, app)) !== null && _a !== void 0 ? _a : this;
+                return globalEnv.rawInsertAdjacentElement.call(realParent, where, processedEle);
             }
         }
         return globalEnv.rawInsertAdjacentElement.call(this, where, element);
@@ -3294,8 +3310,12 @@ class EventCenterForMicroApp extends EventCenterForGlobal {
  * @param microAppEventCenter instance of EventCenterForMicroApp
  */
 function recordDataCenterSnapshot(microAppEventCenter) {
-    if (microAppEventCenter && !microAppEventCenter.umdDataListeners) {
-        microAppEventCenter.umdDataListeners = { global: new Set(), normal: new Set() };
+    var _a, _b;
+    if (microAppEventCenter) {
+        microAppEventCenter.umdDataListeners = {
+            global: new Set((_a = microAppEventCenter.umdDataListeners) === null || _a === void 0 ? void 0 : _a.global),
+            normal: new Set((_b = microAppEventCenter.umdDataListeners) === null || _b === void 0 ? void 0 : _b.normal),
+        };
         const globalEventInfo = eventCenter.eventList.get('global');
         if (globalEventInfo) {
             for (const cb of globalEventInfo.callbacks) {
@@ -3306,7 +3326,9 @@ function recordDataCenterSnapshot(microAppEventCenter) {
         }
         const subAppEventInfo = eventCenter.eventList.get(createEventName(microAppEventCenter.appName, true));
         if (subAppEventInfo) {
-            microAppEventCenter.umdDataListeners.normal = new Set(subAppEventInfo.callbacks);
+            for (const cb of subAppEventInfo.callbacks) {
+                microAppEventCenter.umdDataListeners.normal.add(cb);
+            }
         }
     }
 }
@@ -3331,7 +3353,7 @@ function rebuildDataCenterSnapshot(microAppEventCenter) {
  * @param microAppEventCenter instance of EventCenterForMicroApp
  */
 function resetDataCenterSnapshot(microAppEventCenter) {
-    delete microAppEventCenter.umdDataListeners;
+    microAppEventCenter === null || microAppEventCenter === void 0 ? true : delete microAppEventCenter.umdDataListeners;
 }
 
 // 管理 app 的单例
@@ -3473,19 +3495,23 @@ function createProxyDocument(appName, sandbox) {
      *  3. prerender/keep-alive(default, umd): not clear timers, record & rebuild events
      */
     const record = () => {
-        // record onclick handler
-        sstOnClickHandler = sstOnClickHandler || onClickHandler;
+        /**
+         * record onclick handler
+         * onClickHandler maybe set again after prerender/keep-alive app hidden
+         */
+        sstOnClickHandler = onClickHandler || sstOnClickHandler;
         // record document event
         eventListenerMap.forEach((listenerList, type) => {
             if (listenerList.size) {
-                sstEventListenerMap.set(type, new Set(listenerList));
+                const cacheList = sstEventListenerMap.get(type) || [];
+                sstEventListenerMap.set(type, new Set([...cacheList, ...listenerList]));
             }
         });
     };
     // rebuild event and timer before remount app
     const rebuild = () => {
         // rebuild onclick event
-        if (sstOnClickHandler)
+        if (sstOnClickHandler && !onClickHandler)
             proxyDocument.onclick = sstOnClickHandler;
         // rebuild document event
         sstEventListenerMap.forEach((listenerList, type) => {
@@ -3500,8 +3526,8 @@ function createProxyDocument(appName, sandbox) {
         // Clear the function bound by micro app through document.onclick
         if (isFunction(onClickHandler)) {
             rawRemoveEventListener.call(rawDocument, 'click', onClickHandler);
-            onClickHandler = null;
         }
+        onClickHandler = null;
         // Clear document binding event
         if (eventListenerMap.size) {
             eventListenerMap.forEach((listenerList, type) => {
@@ -3631,7 +3657,8 @@ function patchWindowEffect(appName, microAppWindow) {
         // record window event
         eventListenerMap.forEach((listenerList, type) => {
             if (listenerList.size) {
-                sstEventListenerMap.set(type, new Set(listenerList));
+                const cacheList = sstEventListenerMap.get(type) || [];
+                sstEventListenerMap.set(type, new Set([...cacheList, ...listenerList]));
             }
         });
     };
@@ -3849,7 +3876,7 @@ function getNoHashMicroPathFromURL(appName, baseUrl) {
  */
 function isEffectiveApp(appName) {
     const app = appInstanceMap.get(appName);
-    return !!(app && !app.isPrefetch);
+    return !!(app && !app.isPrefetch && !app.isHidden());
 }
 
 /**
@@ -5551,7 +5578,8 @@ function patchWindowEffect$1(microAppWindow) {
         // record window event
         eventListenerMap.forEach((listenerList, type) => {
             if (listenerList.size) {
-                sstEventListenerMap.set(type, new Set(listenerList));
+                const cacheList = sstEventListenerMap.get(type) || [];
+                sstEventListenerMap.set(type, new Set([...cacheList, ...listenerList]));
             }
         });
     };
@@ -5839,19 +5867,23 @@ function patchDocumentEffect(appName, microAppWindow) {
      *  3. after init prerender app
      */
     const record = () => {
-        // record onclick handler
-        sstOnClickHandler = sstOnClickHandler || onClickHandler;
+        /**
+         * record onclick handler
+         * onClickHandler maybe set again after prerender/keep-alive app hidden
+         */
+        sstOnClickHandler = onClickHandler || sstOnClickHandler;
         // record document event
         eventListenerMap.forEach((listenerList, type) => {
             if (listenerList.size) {
-                sstEventListenerMap.set(type, new Set(listenerList));
+                const cacheList = sstEventListenerMap.get(type) || [];
+                sstEventListenerMap.set(type, new Set([...cacheList, ...listenerList]));
             }
         });
     };
     // rebuild event and timer before remount app
     const rebuild = () => {
         // rebuild onclick event
-        if (sstOnClickHandler)
+        if (sstOnClickHandler && !onClickHandler)
             microDocument.onclick = sstOnClickHandler;
         sstEventListenerMap.forEach((listenerList, type) => {
             for (const listener of listenerList) {
@@ -5864,8 +5896,8 @@ function patchDocumentEffect(appName, microAppWindow) {
         // Clear the function bound by micro app through document.onclick
         if (isFunction(onClickHandler)) {
             rawRemoveEventListener.call(rawDocument, 'click', onClickHandler);
-            onClickHandler = null;
         }
+        onClickHandler = null;
         // Clear document binding event
         if (eventListenerMap.size) {
             eventListenerMap.forEach((listenerList, type) => {
@@ -6174,9 +6206,7 @@ class IframeSandbox {
         if (this.active)
             return;
         this.active = true;
-        // TODO: 虚拟路由升级
-        // eslint-disable-next-line
-        if (useMemoryRouter || true) {
+        if (useMemoryRouter) {
             this.initRouteState(defaultPage);
             // unique listener of popstate event for sub app
             this.removeHistoryListener = addHistoryListener(this.microAppWindow.__MICRO_APP_NAME__);
@@ -6275,8 +6305,9 @@ class IframeSandbox {
      *  2. unmount prerender app manually
      */
     resetEffectSnapshot() {
-        this.windowEffect.reset();
-        this.documentEffect.reset();
+        var _a, _b;
+        (_a = this.windowEffect) === null || _a === void 0 ? void 0 : _a.reset();
+        (_b = this.documentEffect) === null || _b === void 0 ? void 0 : _b.reset();
         resetDataCenterSnapshot(this.microAppWindow.microApp);
     }
     /**
@@ -6287,14 +6318,16 @@ class IframeSandbox {
      * 3. after init prerender app
      */
     recordEffectSnapshot() {
-        this.windowEffect.record();
-        this.documentEffect.record();
+        var _a, _b;
+        (_a = this.windowEffect) === null || _a === void 0 ? void 0 : _a.record();
+        (_b = this.documentEffect) === null || _b === void 0 ? void 0 : _b.record();
         recordDataCenterSnapshot(this.microAppWindow.microApp);
     }
     // rebuild umd snapshot before remount umd app
     rebuildEffectSnapshot() {
-        this.windowEffect.rebuild();
-        this.documentEffect.rebuild();
+        var _a, _b;
+        (_a = this.windowEffect) === null || _a === void 0 ? void 0 : _a.rebuild();
+        (_b = this.documentEffect) === null || _b === void 0 ? void 0 : _b.rebuild();
         rebuildDataCenterSnapshot(this.microAppWindow.microApp);
     }
     /**
@@ -6308,14 +6341,14 @@ class IframeSandbox {
      * @param keepAlive is keep-alive app
      */
     releaseGlobalEffect({ clearData = false }) {
-        var _a, _b, _c;
-        this.windowEffect.release();
-        this.documentEffect.release();
-        (_a = this.microAppWindow.microApp) === null || _a === void 0 ? void 0 : _a.clearDataListener();
-        (_b = this.microAppWindow.microApp) === null || _b === void 0 ? void 0 : _b.clearGlobalDataListener();
+        var _a, _b, _c, _d, _e;
+        (_a = this.windowEffect) === null || _a === void 0 ? void 0 : _a.release();
+        (_b = this.documentEffect) === null || _b === void 0 ? void 0 : _b.release();
+        (_c = this.microAppWindow.microApp) === null || _c === void 0 ? void 0 : _c.clearDataListener();
+        (_d = this.microAppWindow.microApp) === null || _d === void 0 ? void 0 : _d.clearGlobalDataListener();
         if (clearData) {
             microApp.clearData(this.microAppWindow.__MICRO_APP_NAME__);
-            (_c = this.microAppWindow.microApp) === null || _c === void 0 ? void 0 : _c.clearData();
+            (_e = this.microAppWindow.microApp) === null || _e === void 0 ? void 0 : _e.clearData();
         }
     }
     // set __MICRO_APP_PRE_RENDER__ state
@@ -6570,9 +6603,14 @@ class CreateApp {
         var _a;
         if (++this.loadSourceLevel === 2) {
             this.source.html = html;
-            this.setAppState(appStates.LOADED);
-            if (!this.isPrefetch && appStates.UNMOUNT !== this.state) {
+            if (!this.isPrefetch && !this.isUnmounted()) {
                 getRootContainer(this.container).mount(this);
+                // Abandonment plan
+                // if (this.isHidden()) {
+                //   getRootContainer(this.container!).unmount()
+                // } else if (!this.isUnmounted()) {
+                //   getRootContainer(this.container!).mount(this)
+                // }
             }
             else if (this.isPrerender) {
                 /**
@@ -6613,7 +6651,7 @@ class CreateApp {
      */
     onLoadError(e) {
         this.loadSourceLevel = -1;
-        if (appStates.UNMOUNT !== this.state) {
+        if (!this.isUnmounted()) {
             this.onerror(e);
             this.setAppState(appStates.LOAD_FAILED);
         }
@@ -6667,7 +6705,7 @@ class CreateApp {
                  */
                 (_a = this.sandBox) === null || _a === void 0 ? void 0 : _a.rebuildEffectSnapshot();
                 // current this.container is <div prerender='true'></div>
-                cloneContainer(this.container, container, false);
+                cloneContainer(container, this.container, false);
                 /**
                  * set this.container to <micro-app></micro-app>
                  * NOTE:
@@ -6698,7 +6736,7 @@ class CreateApp {
                 }
                 this.setAppState(appStates.MOUNTING);
                 // TODO: 将所有cloneContainer中的'as Element'去掉，兼容shadowRoot的场景
-                cloneContainer(this.source.html, this.container, !this.umdMode);
+                cloneContainer(this.container, this.source.html, !this.umdMode);
                 (_e = this.sandBox) === null || _e === void 0 ? void 0 : _e.start({
                     umdMode: this.umdMode,
                     baseroute,
@@ -6778,12 +6816,21 @@ class CreateApp {
      * dispatch mounted event when app run finished
      */
     dispatchMountedEvent() {
-        if (appStates.UNMOUNT !== this.state) {
+        var _a;
+        if (!this.isUnmounted()) {
             this.setAppState(appStates.MOUNTED);
             // call window.onmount of child app
             execMicroAppGlobalHook(this.getMicroAppGlobalHook(microGlobalEvent.ONMOUNT), this.name, microGlobalEvent.ONMOUNT, microApp.getData(this.name, true));
             // dispatch event mounted to parent
             dispatchLifecyclesEvent(this.container, this.name, lifeCycles.MOUNTED);
+            /**
+             * Hidden Keep-alive app during resource loading, render normally to ensure their liveliness (running in the background) characteristics.
+             * Actions:
+             *  1. Record & release all global events after mount
+             */
+            if (this.isHidden()) {
+                (_a = this.sandBox) === null || _a === void 0 ? void 0 : _a.recordAndReleaseEffect({ keepAlive: true });
+            }
         }
     }
     /**
@@ -6853,7 +6900,7 @@ class CreateApp {
     actionsForUnmount({ destroy, clearData, keepRouteState, unmountcb, }) {
         var _a;
         if (this.umdMode && this.container && !destroy) {
-            cloneContainer(this.container, this.source.html, false);
+            cloneContainer(this.source.html, this.container, false);
         }
         /**
          * this.container maybe contains micro-app element, stop sandbox should exec after cloneContainer
@@ -6909,7 +6956,6 @@ class CreateApp {
             // called after lifeCyclesEvent
             (_a = this.sandBox) === null || _a === void 0 ? void 0 : _a.removeRouteInfoForKeepAliveApp();
         }
-        this.container = cloneContainer(this.container, pureCreateElement('div'), false);
         (_b = this.sandBox) === null || _b === void 0 ? void 0 : _b.recordAndReleaseEffect({ keepAlive: true });
         callback === null || callback === void 0 ? void 0 : callback();
     }
@@ -6924,7 +6970,7 @@ class CreateApp {
         // dispatch beforeShow event to base app
         dispatchLifecyclesEvent(container, this.name, lifeCycles.BEFORESHOW);
         this.setKeepAliveState(keepAliveStates.KEEP_ALIVE_SHOW);
-        this.container = cloneContainer(this.container, container, false);
+        this.container = cloneContainer(container, this.container, false);
         if (this.useMemoryRouter) {
             // called before lifeCyclesEvent
             (_b = this.sandBox) === null || _b === void 0 ? void 0 : _b.setRouteInfoForKeepAliveApp();
@@ -6975,10 +7021,18 @@ class CreateApp {
     getKeepAliveState() {
         return this.keepAliveState;
     }
+    // is app unmounted
+    isUnmounted() {
+        return appStates.UNMOUNT === this.state;
+    }
+    // is app already hidden
+    isHidden() {
+        return keepAliveStates.KEEP_ALIVE_HIDDEN === this.keepAliveState;
+    }
     // get umd library, if it not exist, return empty object
     getUmdLibraryHooks() {
         // after execScripts, the app maybe unmounted
-        if (appStates.UNMOUNT !== this.state && this.sandBox) {
+        if (!this.isUnmounted() && this.sandBox) {
             const libraryName = getRootContainer(this.container).getAttribute('library') || `micro-app-${this.name}`;
             const proxyWindow = this.sandBox.proxyWindow;
             // compatible with pre versions
@@ -7041,16 +7095,14 @@ function defineElement(tagName) {
                      * If oldApp exist & appName is different, determine whether oldApp is running
                      */
                     if (formatAttrName !== this.appName && oldApp) {
-                        if (oldApp.getAppState() !== appStates.UNMOUNT &&
-                            oldApp.getKeepAliveState() !== keepAliveStates.KEEP_ALIVE_HIDDEN &&
-                            !oldApp.isPrefetch) {
+                        if (!oldApp.isUnmounted() && !oldApp.isHidden() && !oldApp.isPrefetch) {
                             this.setAttribute('name', this.appName);
                             return logError(`app name conflict, an app named ${formatAttrName} is running`);
                         }
                     }
                     if (formatAttrName !== this.appName || formatAttrUrl !== this.appUrl) {
                         if (formatAttrName === this.appName) {
-                            this.handleUnmount(true, () => {
+                            this.unmount(true, () => {
                                 this.actionsForAttributeChange(formatAttrName, formatAttrUrl, oldApp);
                             });
                         }
@@ -7059,7 +7111,7 @@ function defineElement(tagName) {
                             this.actionsForAttributeChange(formatAttrName, formatAttrUrl, oldApp);
                         }
                         else {
-                            this.handleUnmount(this.getDestroyCompatibleResult(), () => {
+                            this.unmount(false, () => {
                                 this.actionsForAttributeChange(formatAttrName, formatAttrUrl, oldApp);
                             });
                         }
@@ -7131,15 +7183,13 @@ function defineElement(tagName) {
          */
         handleDisconnected(destroy = false, callback) {
             const app = appInstanceMap.get(this.appName);
-            if (app &&
-                app.getAppState() !== appStates.UNMOUNT &&
-                app.getKeepAliveState() !== keepAliveStates.KEEP_ALIVE_HIDDEN) {
+            if (app && !app.isUnmounted() && !app.isHidden()) {
                 // keep-alive
                 if (this.getKeepAliveModeResult() && !destroy) {
                     this.handleHiddenKeepAliveApp(callback);
                 }
                 else {
-                    this.handleUnmount(destroy || this.getDestroyCompatibleResult(), callback);
+                    this.unmount(destroy, callback);
                 }
             }
         }
@@ -7199,16 +7249,16 @@ function defineElement(tagName) {
                  * 2. Even if the keep-alive app is pushed into the background, it is still active and cannot be replaced. Otherwise, it is difficult for developers to troubleshoot in case of conflict and  will leave developers at a loss
                  * 3. When scopecss, useSandbox of prefetch app different from target app, delete prefetch app and create new one
                  */
-                if (oldApp.getKeepAliveState() === keepAliveStates.KEEP_ALIVE_HIDDEN &&
+                if (oldApp.isHidden() &&
                     oldApp.url === this.appUrl) {
                     this.handleShowKeepAliveApp(oldApp);
                 }
-                else if (oldAppUrl === targetUrl && (oldApp.getAppState() === appStates.UNMOUNT ||
+                else if (oldAppUrl === targetUrl && (oldApp.isUnmounted() ||
                     (oldApp.isPrefetch &&
                         this.sameCoreOptions(oldApp)))) {
-                    this.handleAppMount(oldApp);
+                    this.handleMount(oldApp);
                 }
-                else if (oldApp.isPrefetch || oldApp.getAppState() === appStates.UNMOUNT) {
+                else if (oldApp.isPrefetch || oldApp.isUnmounted()) {
                     if ((process.env.NODE_ENV !== 'production') && this.sameCoreOptions(oldApp)) {
                         /**
                          * url is different & old app is unmounted or prefetch, create new app to replace old one
@@ -7247,7 +7297,7 @@ function defineElement(tagName) {
              * scene5: if oldApp is KEEP_ALIVE_HIDDEN, name must different
              */
             if (oldApp) {
-                if (oldApp.getKeepAliveState() === keepAliveStates.KEEP_ALIVE_HIDDEN) {
+                if (oldApp.isHidden()) {
                     if (oldApp.url === this.appUrl) {
                         this.handleShowKeepAliveApp(oldApp);
                     }
@@ -7262,7 +7312,7 @@ function defineElement(tagName) {
                      * 推荐：if (
                      *  oldApp.url === this.appUrl &&
                      *  oldApp.ssrUrl === this.ssrUrl && (
-                     *    oldApp.getAppState() === appStates.UNMOUNT ||
+                     *    oldApp.isUnmounted() ||
                      *    (oldApp.isPrefetch && this.sameCoreOptions(oldApp))
                      *  )
                      * )
@@ -7270,7 +7320,7 @@ function defineElement(tagName) {
                 }
                 else if (oldApp.url === this.appUrl && oldApp.ssrUrl === this.ssrUrl) {
                     // mount app
-                    this.handleAppMount(oldApp);
+                    this.handleMount(oldApp);
                 }
                 else {
                     this.handleCreateApp();
@@ -7317,7 +7367,7 @@ function defineElement(tagName) {
             const oldApp = appInstanceMap.get(this.appName);
             if (oldApp) {
                 if (oldApp.isPrerender) {
-                    this.handleUnmount(true, createAppInstance);
+                    this.unmount(true, createAppInstance);
                 }
                 else {
                     oldApp.actionsForCompletelyDestroy();
@@ -7335,7 +7385,7 @@ function defineElement(tagName) {
          * 2. is remount in another container ?
          * 3. is remount with change properties of the container ?
          */
-        handleAppMount(app) {
+        handleMount(app) {
             app.isPrefetch = false;
             // TODO: Can defer be removed?
             defer(() => this.mount(app));
@@ -7358,13 +7408,13 @@ function defineElement(tagName) {
         /**
          * unmount app
          * @param destroy delete cache resources when unmount
+         * @param unmountcb callback
          */
-        handleUnmount(destroy, unmountcb) {
+        unmount(destroy, unmountcb) {
             const app = appInstanceMap.get(this.appName);
-            if (app &&
-                app.getAppState() !== appStates.UNMOUNT) {
+            if (app && !app.isUnmounted()) {
                 app.unmount({
-                    destroy,
+                    destroy: destroy || this.getDestroyCompatibleResult(),
                     clearData: this.getDisposeResult('clear-data'),
                     keepRouteState: this.getDisposeResult('keep-router-state'),
                     unmountcb,
@@ -7374,9 +7424,7 @@ function defineElement(tagName) {
         // hidden app when disconnectedCallback called with keep-alive
         handleHiddenKeepAliveApp(callback) {
             const app = appInstanceMap.get(this.appName);
-            if (app &&
-                app.getAppState() !== appStates.UNMOUNT &&
-                app.getKeepAliveState() !== keepAliveStates.KEEP_ALIVE_HIDDEN) {
+            if (app && !app.isUnmounted() && !app.isHidden()) {
                 app.hiddenKeepAliveApp(callback);
             }
         }
@@ -7674,10 +7722,10 @@ function fetchGlobalResources(resources, suffix, sourceHandler) {
 function getActiveApps({ excludeHiddenApp = false, excludePreRender = false, } = {}) {
     const activeApps = [];
     appInstanceMap.forEach((app, appName) => {
-        if (appStates.UNMOUNT !== app.getAppState() &&
+        if (!app.isUnmounted() &&
             (!app.isPrefetch || (app.isPrerender && !excludePreRender)) &&
             (!excludeHiddenApp ||
-                keepAliveStates.KEEP_ALIVE_HIDDEN !== app.getKeepAliveState())) {
+                !app.isHidden())) {
             activeApps.push(appName);
         }
     });
@@ -7697,7 +7745,7 @@ function unmountApp(appName, options) {
     const app = appInstanceMap.get(formatAppName(appName));
     return new Promise((resolve) => {
         if (app) {
-            if (app.getAppState() === appStates.UNMOUNT || app.isPrefetch) {
+            if (app.isUnmounted() || app.isPrefetch) {
                 if (app.isPrerender) {
                     app.unmount({
                         destroy: !!(options === null || options === void 0 ? void 0 : options.destroy),
@@ -7712,7 +7760,7 @@ function unmountApp(appName, options) {
                     resolve(true);
                 }
             }
-            else if (app.getKeepAliveState() === keepAliveStates.KEEP_ALIVE_HIDDEN) {
+            else if (app.isHidden()) {
                 if (options === null || options === void 0 ? void 0 : options.destroy) {
                     app.unmount({
                         destroy: true,