@textbus/platform-browser 3.0.0-alpha.41 → 3.0.0-alpha.42

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

@@ -52,5 +52,4 @@ export declare class Parser {
     private readComponent;
     private readFormats;
     private readSlot;
-    private applyFormats;
 }

package/bundles/index.esm.js

@@ -1250,11 +1250,9 @@ let Parser = Parser_1 = class Parser {
     }
     parse(html, rootSlot) {
         const element = Parser_1.parseHTML(html);
-        const formatItems = this.readFormats(element, rootSlot, []);
-        this.applyFormats(rootSlot, formatItems);
-        return rootSlot;
+        return this.readFormats(element, rootSlot);
     }
-    readComponent(el, slot, formatItems) {
+    readComponent(el, slot) {
         if (el.nodeType === Node.ELEMENT_NODE) {
             if (el.tagName === 'BR') {
                 slot.insert('\n');
@@ -1273,7 +1271,7 @@ let Parser = Parser_1 = class Parser {
                     return;
                 }
             }
-            this.readFormats(el, slot, formatItems);
+            this.readFormats(el, slot);
         }
         else if (el.nodeType === Node.TEXT_NODE) {
             const textContent = el.textContent;
@@ -1283,26 +1281,21 @@ let Parser = Parser_1 = class Parser {
             slot.insert(textContent);
         }
     }
-    readFormats(el, slot, formatItems) {
-        const formats = this.formatLoaders.filter(f => {
+    readFormats(el, slot) {
+        this.formatLoaders.filter(f => {
             return f.match(el);
-        }).map(f => {
-            return f.read(el);
+        }).forEach(f => {
+            const v = f.read(el);
+            slot.applyFormat(v.formatter, {
+                startIndex: 0,
+                endIndex: slot.length,
+                value: v.value
+            });
         });
-        const startIndex = slot.index;
         Array.from(el.childNodes).forEach(child => {
-            this.readComponent(child, slot, formatItems);
+            this.readComponent(child, slot);
         });
-        const endIndex = slot.index;
-        formatItems.unshift(...formats.map(i => {
-            return {
-                formatter: i.formatter,
-                value: i.value,
-                startIndex,
-                endIndex
-            };
-        }));
-        return formatItems;
+        return slot;
     }
     readSlot(childSlot, slotRootElement, slotContentElement) {
         this.attributeLoaders.filter(a => {
@@ -1311,15 +1304,7 @@ let Parser = Parser_1 = class Parser {
             const r = a.read(slotRootElement);
             childSlot.setAttribute(r.attribute, r.value);
         });
-        const childFormatItems = this.readFormats(slotContentElement, childSlot, []);
-        this.applyFormats(childSlot, childFormatItems);
-        return childSlot;
-    }
-    applyFormats(slot, formatItems) {
-        formatItems.forEach(i => {
-            slot.retain(i.startIndex);
-            slot.retain(i.endIndex - i.startIndex, i.formatter, i.value);
-        });
+        return this.readFormats(slotContentElement, childSlot);
     }
 };
 Parser = Parser_1 = __decorate([

package/bundles/index.js

@@ -1252,11 +1252,9 @@ exports.Parser = Parser_1 = class Parser {
     }
     parse(html, rootSlot) {
         const element = Parser_1.parseHTML(html);
-        const formatItems = this.readFormats(element, rootSlot, []);
-        this.applyFormats(rootSlot, formatItems);
-        return rootSlot;
+        return this.readFormats(element, rootSlot);
     }
-    readComponent(el, slot, formatItems) {
+    readComponent(el, slot) {
         if (el.nodeType === Node.ELEMENT_NODE) {
             if (el.tagName === 'BR') {
                 slot.insert('\n');
@@ -1275,7 +1273,7 @@ exports.Parser = Parser_1 = class Parser {
                     return;
                 }
             }
-            this.readFormats(el, slot, formatItems);
+            this.readFormats(el, slot);
         }
         else if (el.nodeType === Node.TEXT_NODE) {
             const textContent = el.textContent;
@@ -1285,26 +1283,21 @@ exports.Parser = Parser_1 = class Parser {
             slot.insert(textContent);
         }
     }
-    readFormats(el, slot, formatItems) {
-        const formats = this.formatLoaders.filter(f => {
+    readFormats(el, slot) {
+        this.formatLoaders.filter(f => {
             return f.match(el);
-        }).map(f => {
-            return f.read(el);
+        }).forEach(f => {
+            const v = f.read(el);
+            slot.applyFormat(v.formatter, {
+                startIndex: 0,
+                endIndex: slot.length,
+                value: v.value
+            });
         });
-        const startIndex = slot.index;
         Array.from(el.childNodes).forEach(child => {
-            this.readComponent(child, slot, formatItems);
+            this.readComponent(child, slot);
         });
-        const endIndex = slot.index;
-        formatItems.unshift(...formats.map(i => {
-            return {
-                formatter: i.formatter,
-                value: i.value,
-                startIndex,
-                endIndex
-            };
-        }));
-        return formatItems;
+        return slot;
     }
     readSlot(childSlot, slotRootElement, slotContentElement) {
         this.attributeLoaders.filter(a => {
@@ -1313,15 +1306,7 @@ exports.Parser = Parser_1 = class Parser {
             const r = a.read(slotRootElement);
             childSlot.setAttribute(r.attribute, r.value);
         });
-        const childFormatItems = this.readFormats(slotContentElement, childSlot, []);
-        this.applyFormats(childSlot, childFormatItems);
-        return childSlot;
-    }
-    applyFormats(slot, formatItems) {
-        formatItems.forEach(i => {
-            slot.retain(i.startIndex);
-            slot.retain(i.endIndex - i.startIndex, i.formatter, i.value);
-        });
+        return this.readFormats(slotContentElement, childSlot);
     }
 };
 exports.Parser = Parser_1 = __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.0.0-alpha.41",
+  "version": "3.0.0-alpha.42",
   "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": "646cc933c5ab2f0fe0d4f28c4fb95d8a11b88891"
+  "gitHead": "5ac4dfb4ae18393afc93ffac9df4012d68adeffa"
 }