@textbus/platform-browser 3.4.5 → 3.4.9

package/bundles/dom-support/parser.d.ts

@@ -34,7 +34,7 @@ export interface ComponentLoader {
     /** 识别组件的匹配方法 */
     match(element: HTMLElement): boolean;
     /** 读取组件内容的方法 */
-    read(element: HTMLElement, injector: Injector, slotParser: SlotParser): ComponentInstance | Slot;
+    read(element: HTMLElement, injector: Injector, slotParser: SlotParser): ComponentInstance | Slot | void;
 }
 export interface FormatLoaderReadResult<T extends FormatValue> {
     formatter: Formatter<T>;
@@ -90,7 +90,7 @@ export declare class Parser {
      * @param html
      * @param rootComponentLoader
      */
-    parseDoc(html: string, rootComponentLoader: ComponentLoader): Slot<any> | ComponentInstance<import("@textbus/core").ComponentExtends, any, unknown>;
+    parseDoc(html: string, rootComponentLoader: ComponentLoader): void | Slot<any> | ComponentInstance<import("@textbus/core").ComponentExtends, any, unknown>;
     /**
      * 将一段 HTML 解析到指定插槽
      * @param html
@@ -98,6 +98,7 @@ export declare class Parser {
      */
     parse(html: string, rootSlot: Slot): Slot<any>;
     private readComponent;
+    private readText;
     private readFormats;
     private readSlot;
     private applyFormats;

package/bundles/index.esm.js

@@ -1269,6 +1269,9 @@ let Parser = Parser_1 = class Parser {
                     const result = t.read(el, this.injector, (childSlot, slotRootElement, slotContentHostElement = slotRootElement) => {
                         return this.readSlot(childSlot, slotRootElement, slotContentHostElement);
                     });
+                    if (!result) {
+                        return;
+                    }
                     if (result instanceof Slot) {
                         result.toDelta().forEach(i => slot.insert(i.insert, i.formats));
                         return;
@@ -1280,12 +1283,15 @@ let Parser = Parser_1 = class Parser {
             this.readFormats(el, slot);
         }
         else if (el.nodeType === Node.TEXT_NODE) {
-            const textContent = el.textContent;
-            if (/^\s*[\r\n\u200b]+\s*$/.test(textContent)) {
-                return;
-            }
-            slot.insert(textContent);
+            this.readText(slot, el);
+        }
+    }
+    readText(slot, el) {
+        const textContent = el.textContent;
+        if (/^\s*[\r\n\u200b]+\s*$/.test(textContent)) {
+            return;
         }
+        slot.insert(textContent);
     }
     readFormats(el, slot) {
         const formats = this.formatLoaders.filter(f => {
@@ -1312,13 +1318,20 @@ let Parser = Parser_1 = class Parser {
         return slot;
     }
     readSlot(childSlot, slotRootElement, slotContentElement) {
-        this.attributeLoaders.filter(a => {
-            return a.match(slotRootElement);
-        }).forEach(a => {
-            const r = a.read(slotRootElement);
-            childSlot.setAttribute(r.attribute, r.value);
-        });
-        this.readFormats(slotContentElement, childSlot);
+        if (slotRootElement.nodeType === Node.ELEMENT_NODE) {
+            this.attributeLoaders.filter(a => {
+                return a.match(slotRootElement);
+            }).forEach(a => {
+                const r = a.read(slotRootElement);
+                childSlot.setAttribute(r.attribute, r.value);
+            });
+        }
+        if (slotContentElement.nodeType === Node.ELEMENT_NODE) {
+            this.readFormats(slotContentElement, childSlot);
+        }
+        else {
+            this.readText(childSlot, slotContentElement);
+        }
         return childSlot;
     }
     applyFormats(slot, formatItems) {

package/bundles/index.js

@@ -1271,6 +1271,9 @@ exports.Parser = Parser_1 = class Parser {
                     const result = t.read(el, this.injector, (childSlot, slotRootElement, slotContentHostElement = slotRootElement) => {
                         return this.readSlot(childSlot, slotRootElement, slotContentHostElement);
                     });
+                    if (!result) {
+                        return;
+                    }
                     if (result instanceof core.Slot) {
                         result.toDelta().forEach(i => slot.insert(i.insert, i.formats));
                         return;
@@ -1282,12 +1285,15 @@ exports.Parser = Parser_1 = class Parser {
             this.readFormats(el, slot);
         }
         else if (el.nodeType === Node.TEXT_NODE) {
-            const textContent = el.textContent;
-            if (/^\s*[\r\n\u200b]+\s*$/.test(textContent)) {
-                return;
-            }
-            slot.insert(textContent);
+            this.readText(slot, el);
+        }
+    }
+    readText(slot, el) {
+        const textContent = el.textContent;
+        if (/^\s*[\r\n\u200b]+\s*$/.test(textContent)) {
+            return;
         }
+        slot.insert(textContent);
     }
     readFormats(el, slot) {
         const formats = this.formatLoaders.filter(f => {
@@ -1314,13 +1320,20 @@ exports.Parser = Parser_1 = class Parser {
         return slot;
     }
     readSlot(childSlot, slotRootElement, slotContentElement) {
-        this.attributeLoaders.filter(a => {
-            return a.match(slotRootElement);
-        }).forEach(a => {
-            const r = a.read(slotRootElement);
-            childSlot.setAttribute(r.attribute, r.value);
-        });
-        this.readFormats(slotContentElement, childSlot);
+        if (slotRootElement.nodeType === Node.ELEMENT_NODE) {
+            this.attributeLoaders.filter(a => {
+                return a.match(slotRootElement);
+            }).forEach(a => {
+                const r = a.read(slotRootElement);
+                childSlot.setAttribute(r.attribute, r.value);
+            });
+        }
+        if (slotContentElement.nodeType === Node.ELEMENT_NODE) {
+            this.readFormats(slotContentElement, childSlot);
+        }
+        else {
+            this.readText(childSlot, slotContentElement);
+        }
         return childSlot;
     }
     applyFormats(slot, formatItems) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.4.5",
+  "version": "3.4.9",
   "description": "Textbus is a rich text editor and framework that is highly customizable and extensible to achieve rich wysiwyg effects.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "81634d5c7c1439e514895dba49a4d1c73f2fd7ff"
+  "gitHead": "fe0b65d7da3ddadb9a6d311572c3e497154dcc86"
 }