@textbus/platform-browser 3.5.0 → 3.5.3

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

@@ -86,17 +86,17 @@ export declare class Parser {
     attributeLoaders: AttributeLoader<any>[];
     constructor(options: ViewOptions, injector: Injector);
     /**
-     * 使用指定的组件加载器解析一段 HTML 字符串
+     * 使用指定的组件加载器解析一段 HTML 字符串或 DOM 元素
      * @param html
      * @param rootComponentLoader
      */
-    parseDoc(html: string, rootComponentLoader: ComponentLoader): void | Slot<any> | ComponentInstance<import("@textbus/core").ComponentExtends, any, unknown>;
+    parseDoc(html: string | HTMLElement, rootComponentLoader: ComponentLoader): void | Slot<any> | ComponentInstance<import("@textbus/core").ComponentExtends, any, unknown>;
     /**
-     * 将一段 HTML 解析到指定插槽
+     * 将一段 HTML 或 DOM 元素解析到指定插槽
      * @param html
      * @param rootSlot
      */
-    parse(html: string, rootSlot: Slot): Slot<any>;
+    parse(html: string | HTMLElement, rootSlot: Slot): Slot<any>;
     private readComponent;
     private readText;
     private readFormats;

package/bundles/index.esm.js

@@ -1239,23 +1239,23 @@ let Parser = Parser_1 = class Parser {
         this.attributeLoaders = attributeLoaders;
     }
     /**
-     * 使用指定的组件加载器解析一段 HTML 字符串
+     * 使用指定的组件加载器解析一段 HTML 字符串或 DOM 元素
      * @param html
      * @param rootComponentLoader
      */
     parseDoc(html, rootComponentLoader) {
-        const element = Parser_1.parseHTML(html);
+        const element = typeof html === 'string' ? Parser_1.parseHTML(html) : html;
         return rootComponentLoader.read(element, this.injector, (childSlot, slotRootElement, slotContentHostElement = slotRootElement) => {
             return this.readSlot(childSlot, slotRootElement, slotContentHostElement);
         });
     }
     /**
-     * 将一段 HTML 解析到指定插槽
+     * 将一段 HTML 或 DOM 元素解析到指定插槽
      * @param html
      * @param rootSlot
      */
     parse(html, rootSlot) {
-        const element = Parser_1.parseHTML(html);
+        const element = typeof html === 'string' ? Parser_1.parseHTML(html) : html;
         return this.readFormats(element, rootSlot);
     }
     readComponent(el, slot) {
@@ -1739,17 +1739,14 @@ let MagicInput = class MagicInput extends Input {
             this.doc.body.appendChild(div);
             div.focus();
             setTimeout(() => {
-                let html = div.innerHTML;
-                if (!html && text && this.isFirefox) {
-                    html = text;
-                }
-                this.handlePaste(html, text);
                 this.doc.body.removeChild(div);
+                div.style.cssText = '';
+                this.handlePaste(div, text);
             });
         }));
     }
-    handlePaste(html, text) {
-        const slot = this.parser.parse(html, new Slot([
+    handlePaste(dom, text) {
+        const slot = this.parser.parse(dom, new Slot([
             ContentType.BlockComponent,
             ContentType.InlineComponent,
             ContentType.Text
@@ -2118,14 +2115,14 @@ let NativeInput = class NativeInput extends Input {
             document.body.appendChild(div);
             div.focus();
             setTimeout(() => {
-                const html = div.innerHTML;
-                this.handlePaste(html, text);
                 document.body.removeChild(div);
+                div.style.cssText = '';
+                this.handlePaste(div, text);
             });
         }));
     }
-    handlePaste(html, text) {
-        const slot = this.parser.parse(html, new Slot([
+    handlePaste(dom, text) {
+        const slot = this.parser.parse(dom, new Slot([
             ContentType.BlockComponent,
             ContentType.InlineComponent,
             ContentType.Text
@@ -2516,16 +2513,18 @@ class Viewer extends Starter {
             }, {
                 provide: Viewer,
                 useFactory: () => this
-            }];
-        super(Object.assign(Object.assign({}, options), { plugins: options.plugins || [], providers: [
-                ...(options.providers || []),
-                ...staticProviders,
-                DomRenderer,
-                Parser,
-                SelectionBridge,
-                OutputTranslator,
-                CollaborateCursor
-            ], setup: options.setup }));
+            },
+            DomRenderer,
+            Parser,
+            SelectionBridge,
+            OutputTranslator,
+            CollaborateCursor
+        ];
+        options.imports = options.imports || [];
+        options.imports.push({
+            providers: staticProviders
+        });
+        super(Object.assign(Object.assign({}, options), { plugins: options.plugins || [], providers: options.providers, setup: options.setup }));
         this.rootComponent = rootComponent;
         this.rootComponentLoader = rootComponentLoader;
         this.options = options;

package/bundles/index.js

@@ -1241,23 +1241,23 @@ exports.Parser = Parser_1 = class Parser {
         this.attributeLoaders = attributeLoaders;
     }
     /**
-     * 使用指定的组件加载器解析一段 HTML 字符串
+     * 使用指定的组件加载器解析一段 HTML 字符串或 DOM 元素
      * @param html
      * @param rootComponentLoader
      */
     parseDoc(html, rootComponentLoader) {
-        const element = Parser_1.parseHTML(html);
+        const element = typeof html === 'string' ? Parser_1.parseHTML(html) : html;
         return rootComponentLoader.read(element, this.injector, (childSlot, slotRootElement, slotContentHostElement = slotRootElement) => {
             return this.readSlot(childSlot, slotRootElement, slotContentHostElement);
         });
     }
     /**
-     * 将一段 HTML 解析到指定插槽
+     * 将一段 HTML 或 DOM 元素解析到指定插槽
      * @param html
      * @param rootSlot
      */
     parse(html, rootSlot) {
-        const element = Parser_1.parseHTML(html);
+        const element = typeof html === 'string' ? Parser_1.parseHTML(html) : html;
         return this.readFormats(element, rootSlot);
     }
     readComponent(el, slot) {
@@ -1741,17 +1741,14 @@ exports.MagicInput = class MagicInput extends Input {
             this.doc.body.appendChild(div);
             div.focus();
             setTimeout(() => {
-                let html = div.innerHTML;
-                if (!html && text && this.isFirefox) {
-                    html = text;
-                }
-                this.handlePaste(html, text);
                 this.doc.body.removeChild(div);
+                div.style.cssText = '';
+                this.handlePaste(div, text);
             });
         }));
     }
-    handlePaste(html, text) {
-        const slot = this.parser.parse(html, new core.Slot([
+    handlePaste(dom, text) {
+        const slot = this.parser.parse(dom, new core.Slot([
             core.ContentType.BlockComponent,
             core.ContentType.InlineComponent,
             core.ContentType.Text
@@ -2120,14 +2117,14 @@ exports.NativeInput = class NativeInput extends Input {
             document.body.appendChild(div);
             div.focus();
             setTimeout(() => {
-                const html = div.innerHTML;
-                this.handlePaste(html, text);
                 document.body.removeChild(div);
+                div.style.cssText = '';
+                this.handlePaste(div, text);
             });
         }));
     }
-    handlePaste(html, text) {
-        const slot = this.parser.parse(html, new core.Slot([
+    handlePaste(dom, text) {
+        const slot = this.parser.parse(dom, new core.Slot([
             core.ContentType.BlockComponent,
             core.ContentType.InlineComponent,
             core.ContentType.Text
@@ -2518,16 +2515,18 @@ class Viewer extends core.Starter {
             }, {
                 provide: Viewer,
                 useFactory: () => this
-            }];
-        super(Object.assign(Object.assign({}, options), { plugins: options.plugins || [], providers: [
-                ...(options.providers || []),
-                ...staticProviders,
-                exports.DomRenderer,
-                exports.Parser,
-                exports.SelectionBridge,
-                exports.OutputTranslator,
-                exports.CollaborateCursor
-            ], setup: options.setup }));
+            },
+            exports.DomRenderer,
+            exports.Parser,
+            exports.SelectionBridge,
+            exports.OutputTranslator,
+            exports.CollaborateCursor
+        ];
+        options.imports = options.imports || [];
+        options.imports.push({
+            providers: staticProviders
+        });
+        super(Object.assign(Object.assign({}, options), { plugins: options.plugins || [], providers: options.providers, setup: options.setup }));
         this.rootComponent = rootComponent;
         this.rootComponentLoader = rootComponentLoader;
         this.options = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.5.0",
+  "version": "3.5.3",
   "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",
@@ -27,7 +27,7 @@
   "dependencies": {
     "@tanbo/di": "^1.1.5",
     "@tanbo/stream": "^1.2.0",
-    "@textbus/core": "^3.5.0",
+    "@textbus/core": "^3.5.3",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "8792e92aa4b3dd1cc6f190a6585bdd4cfb933779"
+  "gitHead": "054ef00184c90bbef8632a892ee3d5a06bb67d46"
 }