@textbus/platform-browser 4.0.0-alpha.12 → 4.0.0-alpha.15

package/bundles/browser-module.d.ts

@@ -1,4 +1,4 @@
-import { ComponentLiteral, Module } from '@textbus/core';
+import { Component, ComponentInstance, ComponentLiteral, Module, Textbus } from '@textbus/core';
 import { Provider } from '@viewfly/core';
 import { AttributeLoader, ComponentLoader, FormatLoader } from './parser';
 import { DomAdapter } from './dom-adapter';
@@ -17,8 +17,6 @@ export interface ViewOptions {
     formatLoaders?: FormatLoader<any>[];
     /** 属性加载器 */
     attributeLoaders?: AttributeLoader<any>[];
-    /** 默认内容 */
-    content?: string | ComponentLiteral;
     /** 使用 contentEditable 作为编辑器控制可编辑范围 */
     useContentEditable?: boolean;
 }
@@ -28,6 +26,21 @@ export declare class BrowserModule implements Module {
     providers: Provider[];
     private workbench;
     constructor(host: HTMLElement, config: ViewOptions);
+    /**
+     * 解析 HTML 并返回一个组件实例
+     * @param html 要解析的 HTML
+     * @param rootComponentLoader 文档根组件加载器
+     * @param textbus
+     */
+    readDocumentByHTML(html: string, rootComponentLoader: ComponentLoader, textbus: Textbus): ComponentInstance;
+    /**
+     * 将组件数据解析到组件实例中
+     * @param data 要解析的 JSON 数据
+     * @param rootComponent 根组件
+     * @param textbus
+     */
+    readDocumentByComponentLiteral(data: ComponentLiteral, rootComponent: Component, textbus: Textbus): ComponentInstance;
+    onAfterStartup(textbus: Textbus): void;
     onDestroy(): void;
     private static createLayout;
 }

package/bundles/index.esm.js

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { Slot, Textbus, ViewAdapter, createBidirectionalMapping, ComponentInstance, VElement, VTextNode, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, NativeSelectionBridge, FocusManager } from '@textbus/core';
+import { Slot, Textbus, ViewAdapter, createBidirectionalMapping, ComponentInstance, VElement, VTextNode, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, makeError, NativeSelectionBridge, FocusManager, Registry } from '@textbus/core';
 import { Subject, filter, fromEvent, Subscription, distinctUntilChanged, merge, map, Observable } from '@tanbo/stream';
 import { InjectionToken, Injectable, Inject, Optional } from '@viewfly/core';
 
@@ -375,26 +375,7 @@ class DomAdapter extends ViewAdapter {
             return [];
         }
         const rootVNode = this.slotRootVElementCaches.get(slot);
-        const getNodes = (vElement, nativeNode, result) => {
-            if (vElement.location) {
-                result.push(nativeNode);
-            }
-            for (let i = 0; i < vElement.children.length; i++) {
-                const vChild = vElement.children[i];
-                const nativeChild = nativeNode.childNodes[i];
-                if (vChild instanceof VElement) {
-                    getNodes(vChild, nativeChild, result);
-                }
-                else if (vChild instanceof VTextNode) {
-                    result.push(nativeChild);
-                }
-                else {
-                    result.push(this.getNativeNodeByComponent(vChild));
-                }
-            }
-            return result;
-        };
-        return getNodes(rootVNode, rootNativeNode, []);
+        return getNodes(this, rootVNode, rootNativeNode, []);
     }
     /**
      * 获取原生节点的原始数据在文档中的位置
@@ -410,40 +391,59 @@ class DomAdapter extends ViewAdapter {
         }
         const slot = this.slotRootNativeElementCaches.get(slotRootNode);
         const rootVNode = this.slotRootVElementCaches.get(slot);
-        const getLocation = (target, tree, vNodeTree) => {
-            if (target === tree) {
-                return Object.assign({}, vNodeTree.location);
-            }
-            const childNodes = tree.childNodes;
-            for (let i = 0; i < childNodes.length; i++) {
-                const child = vNodeTree.children[i];
-                const nativeChild = tree.childNodes[i];
-                if (nativeChild === target) {
-                    if (child instanceof ComponentInstance) {
-                        const index = child.parent.indexOf(child);
-                        return {
-                            slot: child.parent,
-                            startIndex: index,
-                            endIndex: index + 1
-                        };
-                    }
-                    return child.location;
-                }
-                else if (child instanceof VElement) {
-                    let r = null;
-                    if (nativeChild.nodeType === Node.ELEMENT_NODE) {
-                        r = getLocation(target, nativeChild, child);
-                    }
-                    if (r) {
-                        return r;
-                    }
-                }
-            }
-            return null;
-        };
         return getLocation(node, slotRootNode, rootVNode);
     }
 }
+function getNodes(adapter, vElement, nativeNode, result) {
+    if (vElement.location) {
+        result.push(nativeNode);
+    }
+    for (let i = 0; i < vElement.children.length; i++) {
+        const vChild = vElement.children[i];
+        const nativeChild = nativeNode.childNodes[i];
+        if (vChild instanceof VElement) {
+            getNodes(adapter, vChild, nativeChild, result);
+        }
+        else if (vChild instanceof VTextNode) {
+            result.push(nativeChild);
+        }
+        else {
+            result.push(adapter.getNativeNodeByComponent(vChild));
+        }
+    }
+    return result;
+}
+function getLocation(target, tree, vNodeTree) {
+    if (target === tree) {
+        return Object.assign({}, vNodeTree.location);
+    }
+    const childNodes = tree.childNodes;
+    for (let i = 0; i < childNodes.length; i++) {
+        const child = vNodeTree.children[i];
+        const nativeChild = tree.childNodes[i];
+        if (nativeChild === target) {
+            if (child instanceof ComponentInstance) {
+                const index = child.parent.indexOf(child);
+                return {
+                    slot: child.parent,
+                    startIndex: index,
+                    endIndex: index + 1
+                };
+            }
+            return child.location;
+        }
+        else if (child instanceof VElement) {
+            let r = null;
+            if (nativeChild.nodeType === Node.ELEMENT_NODE) {
+                r = getLocation(target, nativeChild, child);
+            }
+            if (r) {
+                return r;
+            }
+        }
+    }
+    return null;
+}
 
 /**
  * Textbus PC 端选区桥接实现
@@ -2041,8 +2041,8 @@ let NativeInput = class NativeInput extends Input {
             });
         }));
     }
-    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
@@ -2295,6 +2295,7 @@ NativeInput = __decorate([
         Controller])
 ], NativeInput);
 
+const browserErrorFn = makeError('BrowserModule');
 class BrowserModule {
     constructor(host, config) {
         this.host = host;
@@ -2357,6 +2358,35 @@ class BrowserModule {
         this.workbench = wrapper;
         this.host.append(wrapper);
     }
+    /**
+     * 解析 HTML 并返回一个组件实例
+     * @param html 要解析的 HTML
+     * @param rootComponentLoader 文档根组件加载器
+     * @param textbus
+     */
+    readDocumentByHTML(html, rootComponentLoader, textbus) {
+        const parser = textbus.get(Parser);
+        const doc = parser.parseDoc(html, rootComponentLoader);
+        if (doc instanceof ComponentInstance) {
+            return doc;
+        }
+        throw browserErrorFn('rootComponentLoader must return a component instance.');
+    }
+    /**
+     * 将组件数据解析到组件实例中
+     * @param data 要解析的 JSON 数据
+     * @param rootComponent 根组件
+     * @param textbus
+     */
+    readDocumentByComponentLiteral(data, rootComponent, textbus) {
+        const registry = textbus.get(Registry);
+        return registry.createComponentByFactory(data, rootComponent);
+    }
+    onAfterStartup(textbus) {
+        if (this.config.autoFocus) {
+            textbus.focus();
+        }
+    }
     onDestroy() {
         this.workbench.remove();
     }

package/bundles/index.js

@@ -377,26 +377,7 @@ class DomAdapter extends core$1.ViewAdapter {
             return [];
         }
         const rootVNode = this.slotRootVElementCaches.get(slot);
-        const getNodes = (vElement, nativeNode, result) => {
-            if (vElement.location) {
-                result.push(nativeNode);
-            }
-            for (let i = 0; i < vElement.children.length; i++) {
-                const vChild = vElement.children[i];
-                const nativeChild = nativeNode.childNodes[i];
-                if (vChild instanceof core$1.VElement) {
-                    getNodes(vChild, nativeChild, result);
-                }
-                else if (vChild instanceof core$1.VTextNode) {
-                    result.push(nativeChild);
-                }
-                else {
-                    result.push(this.getNativeNodeByComponent(vChild));
-                }
-            }
-            return result;
-        };
-        return getNodes(rootVNode, rootNativeNode, []);
+        return getNodes(this, rootVNode, rootNativeNode, []);
     }
     /**
      * 获取原生节点的原始数据在文档中的位置
@@ -412,40 +393,59 @@ class DomAdapter extends core$1.ViewAdapter {
         }
         const slot = this.slotRootNativeElementCaches.get(slotRootNode);
         const rootVNode = this.slotRootVElementCaches.get(slot);
-        const getLocation = (target, tree, vNodeTree) => {
-            if (target === tree) {
-                return Object.assign({}, vNodeTree.location);
-            }
-            const childNodes = tree.childNodes;
-            for (let i = 0; i < childNodes.length; i++) {
-                const child = vNodeTree.children[i];
-                const nativeChild = tree.childNodes[i];
-                if (nativeChild === target) {
-                    if (child instanceof core$1.ComponentInstance) {
-                        const index = child.parent.indexOf(child);
-                        return {
-                            slot: child.parent,
-                            startIndex: index,
-                            endIndex: index + 1
-                        };
-                    }
-                    return child.location;
-                }
-                else if (child instanceof core$1.VElement) {
-                    let r = null;
-                    if (nativeChild.nodeType === Node.ELEMENT_NODE) {
-                        r = getLocation(target, nativeChild, child);
-                    }
-                    if (r) {
-                        return r;
-                    }
-                }
-            }
-            return null;
-        };
         return getLocation(node, slotRootNode, rootVNode);
     }
 }
+function getNodes(adapter, vElement, nativeNode, result) {
+    if (vElement.location) {
+        result.push(nativeNode);
+    }
+    for (let i = 0; i < vElement.children.length; i++) {
+        const vChild = vElement.children[i];
+        const nativeChild = nativeNode.childNodes[i];
+        if (vChild instanceof core$1.VElement) {
+            getNodes(adapter, vChild, nativeChild, result);
+        }
+        else if (vChild instanceof core$1.VTextNode) {
+            result.push(nativeChild);
+        }
+        else {
+            result.push(adapter.getNativeNodeByComponent(vChild));
+        }
+    }
+    return result;
+}
+function getLocation(target, tree, vNodeTree) {
+    if (target === tree) {
+        return Object.assign({}, vNodeTree.location);
+    }
+    const childNodes = tree.childNodes;
+    for (let i = 0; i < childNodes.length; i++) {
+        const child = vNodeTree.children[i];
+        const nativeChild = tree.childNodes[i];
+        if (nativeChild === target) {
+            if (child instanceof core$1.ComponentInstance) {
+                const index = child.parent.indexOf(child);
+                return {
+                    slot: child.parent,
+                    startIndex: index,
+                    endIndex: index + 1
+                };
+            }
+            return child.location;
+        }
+        else if (child instanceof core$1.VElement) {
+            let r = null;
+            if (nativeChild.nodeType === Node.ELEMENT_NODE) {
+                r = getLocation(target, nativeChild, child);
+            }
+            if (r) {
+                return r;
+            }
+        }
+    }
+    return null;
+}
 
 /**
  * Textbus PC 端选区桥接实现
@@ -2043,8 +2043,8 @@ let NativeInput = class NativeInput extends Input {
             });
         }));
     }
-    handlePaste(html, text) {
-        const slot = this.parser.parse(html, new core$1.Slot([
+    handlePaste(dom, text) {
+        const slot = this.parser.parse(dom, new core$1.Slot([
             core$1.ContentType.BlockComponent,
             core$1.ContentType.InlineComponent,
             core$1.ContentType.Text
@@ -2297,6 +2297,7 @@ NativeInput = __decorate([
         core$1.Controller])
 ], NativeInput);
 
+const browserErrorFn = core$1.makeError('BrowserModule');
 class BrowserModule {
     constructor(host, config) {
         this.host = host;
@@ -2359,6 +2360,35 @@ class BrowserModule {
         this.workbench = wrapper;
         this.host.append(wrapper);
     }
+    /**
+     * 解析 HTML 并返回一个组件实例
+     * @param html 要解析的 HTML
+     * @param rootComponentLoader 文档根组件加载器
+     * @param textbus
+     */
+    readDocumentByHTML(html, rootComponentLoader, textbus) {
+        const parser = textbus.get(exports.Parser);
+        const doc = parser.parseDoc(html, rootComponentLoader);
+        if (doc instanceof core$1.ComponentInstance) {
+            return doc;
+        }
+        throw browserErrorFn('rootComponentLoader must return a component instance.');
+    }
+    /**
+     * 将组件数据解析到组件实例中
+     * @param data 要解析的 JSON 数据
+     * @param rootComponent 根组件
+     * @param textbus
+     */
+    readDocumentByComponentLiteral(data, rootComponent, textbus) {
+        const registry = textbus.get(core$1.Registry);
+        return registry.createComponentByFactory(data, rootComponent);
+    }
+    onAfterStartup(textbus) {
+        if (this.config.autoFocus) {
+            textbus.focus();
+        }
+    }
     onDestroy() {
         this.workbench.remove();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "4.0.0-alpha.12",
+  "version": "4.0.0-alpha.15",
   "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",
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.0",
-    "@textbus/core": "^4.0.0-alpha.12",
+    "@textbus/core": "^4.0.0-alpha.15",
     "@viewfly/core": "^0.3.0",
     "reflect-metadata": "^0.1.13"
   },
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "3c0456c3f13888fdeefb4ed307ad643644a05e43"
+  "gitHead": "e3c96a118993009a8c4dce7e6504db02226f0da6"
 }