@social-mail/social-mail-client 1.2.283 → 1.2.285

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.283",
+  "version": "1.2.285",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/pages/websites/studio/WebSiteStudioPage.tsx

@@ -227,31 +227,32 @@ export default class WebSiteStudioPage extends ContentPage {
     }
 
     async downloadHtml(file: IAppFile, cancelToken) {
-        let text = await FetchBuilder.get(file.downloadUrl)
+        const text = await FetchBuilder.get(file.downloadUrl)
             .cancelToken(cancelToken)
             .responseAsText(true);
-        const parser = new DOMParser();
-        const doc = parser.parseFromString(text, "text/html");
-        const injects = Array.from(doc.documentElement.querySelectorAll("inject")) as HTMLElement[];
-        for (const e of injects) {
-            let src = e.getAttribute("src");
-            if(src.startsWith("/")) {
-                src = src.substring(1);
-            } else {
-                // will do it later
-            }
-            const injectedFile = await this.cloudFileService.children(this.root.appFileID, src)
-                .firstOrDefault();
-            text = await FetchBuilder.get(injectedFile.downloadUrl).responseAsText();
-            const dom = parser.parseFromString(text, "text/html");
-            const children = Array.from(dom.body.children);
-            e.innerHTML = "";
-            for (const iterator of children) {
-                iterator.setAttribute("contentEditable", "false");
-                e.appendChild(iterator);
-            }
-        }
-        return doc.documentElement.outerHTML;
+        return text;
+        // const parser = new DOMParser();
+        // const doc = parser.parseFromString(text, "text/html");
+        // const injects = Array.from(doc.documentElement.querySelectorAll("inject")) as HTMLElement[];
+        // for (const e of injects) {
+        //     let src = e.getAttribute("src");
+        //     if(src.startsWith("/")) {
+        //         src = src.substring(1);
+        //     } else {
+        //         // will do it later
+        //     }
+        //     const injectedFile = await this.cloudFileService.children(this.root.appFileID, src)
+        //         .firstOrDefault();
+        //     text = await FetchBuilder.get(injectedFile.downloadUrl).responseAsText();
+        //     const dom = parser.parseFromString(text, "text/html");
+        //     const children = Array.from(dom.body.children);
+        //     e.innerHTML = "";
+        //     for (const iterator of children) {
+        //         iterator.setAttribute("contentEditable", "false");
+        //         e.appendChild(iterator);
+        //     }
+        // }
+        // return doc.documentElement.outerHTML;
     }
 
     async createIndexHtml() {

package/src/site-editor/editor/WebSitePageEditor.tsx

@@ -120,6 +120,30 @@ export default class WebSitePageEditor extends HtmlPageEditor {
             this.htmlDocument.head.appendChild(script);
         }
         script.setAttribute("src", "//cdn.jsdelivr.net/npm/@social-mail/web-components@1.0.54/dist/components.webpack.js");
+
+        // inject injected component....
+        for(const e of Array.from(this.htmlDocument.querySelectorAll("inject"))) {
+            let src = e.getAttribute("src");
+            if(src.startsWith("/")) {
+                src = src.substring(1);
+            } else {
+                // will do it later
+            }
+            const file = await this.cloudFileService.children(this.folder.appFileID, src)
+                .firstOrDefault();
+            const text = await FetchBuilder.get(file.downloadUrl).responseAsText();
+            const parser = new DOMParser();
+            const dom = parser.parseFromString(text, "text/html");
+            const children = Array.from(dom.body.children);
+            for (const iterator of Array.from(e.children)) {
+                iterator.remove();
+            }
+            for (const iterator of children) {
+                iterator.setAttribute("contentEditable", "false");
+                iterator.remove();
+                e.appendChild(iterator);
+            }
+        }
     }