@micro-zoe/micro-app 1.0.0-beta.0 → 1.0.0-beta.1

package/lib/index.d.ts

@@ -147,6 +147,7 @@ declare module '@micro-zoe/micro-app/libs/utils' {
     export function isDivElement(target: unknown): target is HTMLDivElement;
     export function isImageElement(target: unknown): target is HTMLImageElement;
     export function isBaseElement(target: unknown): target is HTMLBaseElement;
+    export function isMicroAppBody(target: unknown): target is HTMLElement;
     export function isProxyDocument(target: unknown): target is Document;
     /**
         * format error log

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-beta.0';
+const version = '1.0.0-beta.1';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -114,6 +114,10 @@ function isBaseElement(target) {
     var _a, _b;
     return ((_b = (_a = target) === null || _a === void 0 ? void 0 : _a.tagName) === null || _b === void 0 ? void 0 : _b.toUpperCase()) === 'BASE';
 }
+function isMicroAppBody(target) {
+    var _a, _b;
+    return ((_b = (_a = target) === null || _a === void 0 ? void 0 : _a.tagName) === null || _b === void 0 ? void 0 : _b.toUpperCase()) === 'MICRO-APP-BODY';
+}
 // is ProxyDocument
 function isProxyDocument(target) {
     return toString.call(target) === '[object ProxyDocument]';
@@ -1518,22 +1522,30 @@ function updateElementInfo(node, appName) {
     var _a, _b;
     const proxyWindow = (_b = (_a = appInstanceMap.get(appName)) === null || _a === void 0 ? void 0 : _a.sandBox) === null || _b === void 0 ? void 0 : _b.proxyWindow;
     if (proxyWindow && isNode(node) && !node.__MICRO_APP_NAME__) {
-        // TODO: 测试baseURI和ownerDocument在with沙箱中是否正确
+        /**
+         * TODO:
+         *  1. 测试baseURI和ownerDocument在with沙箱中是否正确
+         *    经过验证with沙箱不能重写ownerDocument，否则react点击事件会触发两次
+         *  2. with沙箱所有node设置__MICRO_APP_NAME__都使用updateElementInfo
+         *  3. 性能: defineProperty的性能肯定不如直接设置
+        */
         rawDefineProperties(node, {
             baseURI: {
                 configurable: true,
                 get: () => proxyWindow.location.href,
             },
-            ownerDocument: {
-                configurable: true,
-                get: () => proxyWindow.document,
-            },
             __MICRO_APP_NAME__: {
                 configurable: true,
                 writable: true,
                 value: appName,
             },
         });
+        if (isIframeSandbox(appName)) {
+            rawDefineProperty(node, 'ownerDocument', {
+                configurable: true,
+                get: () => proxyWindow.document,
+            });
+        }
     }
     return node;
 }
@@ -1620,25 +1632,39 @@ function invokePrototypeMethod(app, rawMethod, parent, targetChild, passiveChild
      */
     if (hijackParent) {
         /**
-         * Adapter for
+         * If parentNode is <micro-app-body>, return rawDocument.body
+         * Scenes:
+         *  1. element-ui@2/lib/utils/vue-popper.js
+         *    if (this.popperElm.parentNode === document.body) ...
          * WARNING:
-         * Verifying that the parentNode of the targetChild points to document.body will cause other problems ?
+         *  1. When operate child from parentNode async, may have been unmount
+         *    e.g. target.parentNode.remove(target)
+         * ISSUE:
+         *  1. https://github.com/micro-zoe/micro-app/issues/739
+         *    Solution: Return the true value when node not in document
          */
         if (!isIframeSandbox(app.name) &&
-            hijackParent.tagName === 'MICRO-APP-BODY' &&
+            isMicroAppBody(hijackParent) &&
             rawMethod !== globalEnv.rawRemoveChild) {
             const descriptor = Object.getOwnPropertyDescriptor(targetChild, 'parentNode');
-            if (!descriptor || descriptor.configurable) {
-                rawDefineProperty(targetChild, 'parentNode', {
-                    configurable: true,
-                    get() {
-                        /**
-                         * When operate child from parentNode async, may have been unmount
-                         * e.g.
-                         * target.parentNode.remove(target)
-                         */
-                        return !app.container ? hijackParent : document.body;
+            if ((!descriptor || descriptor.configurable) && !targetChild.__MICRO_APP_HAS_DPN__) {
+                rawDefineProperties(targetChild, {
+                    parentNode: {
+                        configurable: true,
+                        get() {
+                            var _a, _b;
+                            const result = globalEnv.rawParentNodeDesc.get.call(this);
+                            if (isMicroAppBody(result) && app.container) {
+                                // TODO: remove getRootElementParentNode
+                                return ((_b = (_a = microApp.options).getRootElementParentNode) === null || _b === void 0 ? void 0 : _b.call(_a, this, app.name)) || document.body;
+                            }
+                            return result;
+                        },
                     },
+                    __MICRO_APP_HAS_DPN__: {
+                        configurable: true,
+                        get: () => true,
+                    }
                 });
             }
         }
@@ -1857,8 +1883,8 @@ function patchElementAndDocument() {
     //      * BUG:
     //      *  1. vue2 umdMode, throw error when render again (<div id='app'></div> will be deleted when render again )
     //      */
-    //     if (result?.tagName === 'MICRO-APP-BODY' && appInstanceMap.get(this.__MICRO_APP_NAME__)?.container) {
-    //       return globalEnv.rawDocument.body
+    //     if (isMicroAppBody(result) && appInstanceMap.get(this.__MICRO_APP_NAME__)?.container) {
+    //       return document.body
     //     }
     //     return result
     //   },
@@ -5121,6 +5147,7 @@ class WithSandBox {
         microAppWindow.__MICRO_APP_NAME__ = appName;
         microAppWindow.__MICRO_APP_URL__ = url;
         microAppWindow.__MICRO_APP_PUBLIC_PATH__ = getEffectivePath(url);
+        microAppWindow.__MICRO_APP_BASE_ROUTE__ = '';
         microAppWindow.__MICRO_APP_WINDOW__ = microAppWindow;
         microAppWindow.__MICRO_APP_PRE_RENDER__ = false;
         microAppWindow.__MICRO_APP_UMD_MODE__ = false;
@@ -5954,7 +5981,7 @@ function patchIframeNode(appName, microAppWindow, iframeSandbox) {
         configurable: true,
         enumerable: true,
         get() {
-            var _a;
+            var _a, _b, _c;
             // set html.parentNode to microDocument
             throttleDeferForParentNode(microDocument);
             const result = rawParentNodeLDesc.get.call(this);
@@ -5967,8 +5994,8 @@ function patchIframeNode(appName, microAppWindow, iframeSandbox) {
              *  Will it cause other problems ?
              *  e.g. target.parentNode.remove(target)
              */
-            if ((result === null || result === void 0 ? void 0 : result.tagName) === 'MICRO-APP-BODY' && ((_a = appInstanceMap.get(appName)) === null || _a === void 0 ? void 0 : _a.container)) {
-                return rawDocument.body;
+            if (isMicroAppBody(result) && ((_a = appInstanceMap.get(appName)) === null || _a === void 0 ? void 0 : _a.container)) {
+                return ((_c = (_b = microApp.options).getRootElementParentNode) === null || _c === void 0 ? void 0 : _c.call(_b, this, appName)) || rawDocument.body;
             }
             return result;
         },
@@ -6049,14 +6076,14 @@ class IframeSandbox {
         const childFullPath = childStaticLocation.pathname + childStaticLocation.search + childStaticLocation.hash;
         this.deleteIframeElement = this.createIframeElement(appName, browserHost);
         this.microAppWindow = this.iframe.contentWindow;
-        // TODO: 优化代码
-        // exec before initStaticGlobalKeys
-        this.createProxyLocation(appName, url, this.microAppWindow, childStaticLocation, browserHost, childHost);
-        this.createProxyWindow(appName, this.microAppWindow);
-        this.initStaticGlobalKeys(appName, url);
-        // get escapeProperties from plugins
-        this.getSpecialProperties(appName);
         this.patchIframe(this.microAppWindow, (resolve) => {
+            // TODO: 优化代码
+            // exec before initStaticGlobalKeys
+            this.createProxyLocation(appName, url, this.microAppWindow, childStaticLocation, browserHost, childHost);
+            this.createProxyWindow(this.microAppWindow);
+            this.initStaticGlobalKeys(appName, url);
+            // get escapeProperties from plugins
+            this.getSpecialProperties(appName);
             this.createIframeTemplate(this.microAppWindow);
             patchIframeRoute(appName, this.microAppWindow, childFullPath);
             this.windowEffect = patchIframeWindow(appName, this.microAppWindow);
@@ -6229,6 +6256,7 @@ class IframeSandbox {
         this.microAppWindow.__MICRO_APP_NAME__ = appName;
         this.microAppWindow.__MICRO_APP_URL__ = url;
         this.microAppWindow.__MICRO_APP_PUBLIC_PATH__ = getEffectivePath(url);
+        this.microAppWindow.__MICRO_APP_BASE_ROUTE__ = '';
         this.microAppWindow.__MICRO_APP_WINDOW__ = this.microAppWindow;
         this.microAppWindow.__MICRO_APP_PRE_RENDER__ = false;
         this.microAppWindow.__MICRO_APP_UMD_MODE__ = false;
@@ -6245,18 +6273,27 @@ class IframeSandbox {
     }
     // TODO: RESTRUCTURE
     patchIframe(microAppWindow, cb) {
+        const oldMicroDocument = microAppWindow.document;
         this.sandboxReady = new Promise((resolve) => {
             (function iframeLocationReady() {
                 setTimeout(() => {
-                    if (microAppWindow.location.href === 'about:blank') {
-                        iframeLocationReady();
+                    try {
+                        if (microAppWindow.document === oldMicroDocument) {
+                            iframeLocationReady();
+                        }
+                        else {
+                            /**
+                             * NOTE:
+                             *  1. microAppWindow will not be recreated
+                             *  2. the properties of microAppWindow may be recreated, such as document
+                             *  3. the variables added to microAppWindow may be cleared
+                             */
+                            microAppWindow.stop();
+                            cb(resolve);
+                        }
                     }
-                    else {
-                        /**
-                         * microAppWindow.document rebuild
-                         */
-                        microAppWindow.stop();
-                        cb(resolve);
+                    catch (e) {
+                        iframeLocationReady();
                     }
                 }, 0);
             })();
@@ -6285,7 +6322,7 @@ class IframeSandbox {
     createProxyLocation(appName, url, microAppWindow, childStaticLocation, browserHost, childHost) {
         this.proxyLocation = createMicroLocation(appName, url, microAppWindow, childStaticLocation, browserHost, childHost);
     }
-    createProxyWindow(appName, microAppWindow) {
+    createProxyWindow(microAppWindow) {
         const rawWindow = globalEnv.rawWindow;
         this.proxyWindow = new Proxy(microAppWindow, {
             get: (target, key) => {
@@ -6903,8 +6940,8 @@ class CreateApp {
         return {};
     }
     getMicroAppGlobalHook(eventName) {
-        var _a;
-        const listener = ((_a = this.sandBox) === null || _a === void 0 ? void 0 : _a.proxyWindow)[eventName];
+        var _a, _b;
+        const listener = (_b = (_a = this.sandBox) === null || _a === void 0 ? void 0 : _a.proxyWindow) === null || _b === void 0 ? void 0 : _b[eventName];
         return isFunction(listener) ? listener : null;
     }
     querySelector(selectors) {