@micro-zoe/micro-app 1.0.0-rc.21 → 1.0.0-rc.23

package/lib/index.d.ts

@@ -422,6 +422,7 @@ declare module '@micro-zoe/micro-app/interact' {
                 * @param appName app.name
                 */
             clearDataListener(appName: string): void;
+            changeEventAppName(newAppName: string, oldAppName: string): void;
     }
     export class EventCenterForMicroApp extends EventCenterForGlobal {
             appName: string;

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-rc.21';
+const version = '1.0.0-rc.23';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -1682,6 +1682,8 @@ const BASE_SCOPE_WINDOW_EVENT = [
     'appstate-change',
     'statechange',
     'mounted',
+    'error'
+    // 'beforeunload', // remove at 2024.5.30 by cangdu
 ];
 // bind event of with sandbox
 const SCOPE_WINDOW_EVENT_OF_WITH = BASE_SCOPE_WINDOW_EVENT;
@@ -2711,6 +2713,14 @@ class EventCenterForBaseApp extends EventCenterForGlobal {
     clearDataListener(appName) {
         eventCenter.off(createEventName(formatAppName(appName), false));
     }
+    changeEventAppName(newAppName, oldAppName) {
+        const newEventName = createEventName(formatAppName(newAppName), true);
+        const oldEventName = createEventName(formatAppName(oldAppName), true);
+        if (eventCenter.eventList.has(oldEventName)) {
+            eventCenter.eventList.set(newEventName, eventCenter.eventList.get(oldEventName));
+            eventCenter.eventList.delete(oldEventName);
+        }
+    }
 }
 // Event center for sub app
 class EventCenterForMicroApp extends EventCenterForGlobal {
@@ -6012,9 +6022,9 @@ function patchDocumentPrototype(appName, microAppWindow) {
     }
     // query element👇
     function querySelector(selectors) {
-        var _a;
+        var _a, _b;
         const _this = getBindTarget(this);
-        if (selectors === 'body') {
+        if (selectors === 'body' && ((_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.inheritBaseBody) !== true) {
             return this.body;
         }
         if (!selectors ||
@@ -6033,7 +6043,7 @@ function patchDocumentPrototype(appName, microAppWindow) {
          *
          * Issue: https://github.com/jd-opensource/micro-app/issues/1335
          */
-        const result = (_a = appInstanceMap.get(appName)) === null || _a === void 0 ? void 0 : _a.querySelector(selectors);
+        const result = (_b = appInstanceMap.get(appName)) === null || _b === void 0 ? void 0 : _b.querySelector(selectors);
         return result || selectors === 'base' ? result : rawMicroQuerySelector.call(microDocument, selectors);
     }
     function querySelectorAll(selectors) {
@@ -6158,10 +6168,10 @@ function patchDocumentProperty(appName, microAppWindow, sandbox) {
             enumerable: true,
             configurable: true,
             get: () => {
-                var _a;
+                var _a, _b;
                 throttleDeferForIframeAppName(appName);
-                if (tagName === 'body') {
-                    return ((_a = sandbox.options.container) === null || _a === void 0 ? void 0 : _a.querySelector('micro-app-body')) || rawDocument[tagName];
+                if (tagName === 'body' && ((_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.inheritBaseBody) !== true) {
+                    return ((_b = sandbox.options.container) === null || _b === void 0 ? void 0 : _b.querySelector('micro-app-body')) || rawDocument[tagName];
                 }
                 return rawDocument[tagName];
             },
@@ -6578,6 +6588,8 @@ class IframeSandbox {
         this.deleteIframeElement = this.createIframeElement(appName, browserHost + rawLocation.pathname, options);
         this.microAppWindow = this.iframe.contentWindow;
         this.patchIframe(this.microAppWindow, (resolve) => {
+            // refresh
+            this.microAppWindow = this.iframe.contentWindow;
             // create new html to iframe
             this.createIframeTemplate(this.microAppWindow);
             // get escapeProperties from plugins
@@ -7079,10 +7091,10 @@ class CreateApp {
             return this.setAppState(appStates.LOADING);
         }
         this.createSandbox();
-        // place outside of nextAction, as nextAction may execute async
-        this.setAppState(appStates.BEFORE_MOUNT);
         const nextAction = () => {
             var _a, _b, _c, _d, _e, _f, _g;
+            // place inside of nextAction, make sure iframe ready
+            this.setAppState(appStates.BEFORE_MOUNT);
             /**
              * Special scenes:
              * 1. mount before prerender exec mount (loading source)
@@ -8359,7 +8371,7 @@ function defineElement(tagName) {
             this.cacheData = null;
             this.connectedCount = 0;
             this.connectStateMap = new Map();
-            this.appName = ''; // app name
+            this._appName = ''; // app name
             this.appUrl = ''; // app url
             this.ssrUrl = ''; // html path in ssr mode
             this.version = version;
@@ -8723,6 +8735,7 @@ function defineElement(tagName) {
                     unmountcb,
                 });
             }
+            delete this.__MICRO_APP_NAME__;
         }
         // hidden app when disconnectedCallback called with keep-alive
         handleHiddenKeepAliveApp(callback) {
@@ -8900,6 +8913,15 @@ function defineElement(tagName) {
             }
             return null;
         }
+        set appName(value) {
+            if (value !== this._appName) {
+                microApp.changeEventAppName(value, this._appName);
+                this._appName = value;
+            }
+        }
+        get appName() {
+            return this._appName;
+        }
         /**
          * get publicPath from a valid address,it can used in micro-app-devtools
          */