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

package/bundles/browser-module.d.ts

@@ -6,8 +6,8 @@ import { DomAdapter } from './dom-adapter';
  * Textbus PC 端配置接口
  */
 export interface ViewOptions {
-    /** 渲染平台适配器 */
-    adapter: DomAdapter<any, any>;
+    /** 跨平台适配器 */
+    adapter: DomAdapter;
     /** 编辑器根节点 */
     renderTo(): HTMLElement;
     /** 自动获取焦点 */

package/bundles/dom-adapter.d.ts

@@ -1,77 +1,6 @@
-import { Component, Slot, ViewAdapter, NodeLocation, VElement, VTextNode, Textbus } from '@textbus/core';
-export interface CompositionState {
-    slot: Slot;
-    text: string;
-    offset: number;
-    index: number;
-}
-/**
- * Textbus PC 端浏览器渲染能力桥接器抽象类，提供了 DOM 元素查询能力，具体渲染能力由各前端框架实现相应桥接
- */
-export declare abstract class DomAdapter<ViewComponent, ViewElement> extends ViewAdapter {
-    private mount;
+import { Adapter } from '@textbus/core';
+import { Subject } from '@tanbo/stream';
+export declare abstract class DomAdapter<ViewComponent extends object = object, ViewElement extends object = object> extends Adapter<HTMLElement, Node, ViewComponent, ViewElement> {
+    onViewUpdated: Subject<void>;
     host: HTMLElement;
-    compositionNode: HTMLElement | null;
-    composition: CompositionState | null;
-    protected firstRending: boolean;
-    protected componentRootElementCaches: {
-        set: {
-            (key: Component<import("@textbus/core").State>, value: HTMLElement): void;
-            (key: HTMLElement, value: Component<import("@textbus/core").State>): void;
-        };
-        get: {
-            (key: Component<import("@textbus/core").State>): HTMLElement;
-            (key: HTMLElement): Component<import("@textbus/core").State>;
-        };
-        remove: (key: HTMLElement | Component<import("@textbus/core").State>) => void;
-    };
-    protected slotRootNativeElementCaches: {
-        set: {
-            (key: Slot, value: HTMLElement): void;
-            (key: HTMLElement, value: Slot): void;
-        };
-        get: {
-            (key: Slot): HTMLElement;
-            (key: HTMLElement): Slot;
-        };
-        remove: (key: HTMLElement | Slot) => void;
-    };
-    protected slotRootVElementCaches: WeakMap<Slot, VElement>;
-    protected renderedSlotCache: WeakMap<Slot, true>;
-    protected constructor(mount: (host: HTMLElement, viewComponent: ViewComponent, textbus: Textbus) => (void | (() => void)));
-    render(rootComponent: Component, textbus: Textbus): void | (() => void);
-    abstract componentRender(component: Component): ViewComponent;
-    abstract slotRender(slot: Slot, slotHostRender: (children: Array<VElement | VTextNode | Component>) => VElement, renderEnv: any): ViewElement;
-    copy(): void;
-    /**
-     * 根据组件获取组件的根 DOM 节点
-     * @param component
-     */
-    getNativeNodeByComponent(component: Component): HTMLElement | null;
-    /**
-     * 根据 DOM 节点，获对对应的组件根节点，如传入的 DOM 节点不为组件的根节点，则返回 null
-     * @param node
-     */
-    getComponentByNativeNode(node: HTMLElement): Component | null;
-    /**
-     * 根据插槽获取插槽的根 DOM 节点
-     * @param slot
-     */
-    getNativeNodeBySlot(slot: Slot): HTMLElement | null;
-    /**
-     * 根据 DOM 节点，获对对应的插槽根节点，如传入的 DOM 节点不为插槽的根节点，则返回 null
-     * @param node
-     */
-    getSlotByNativeNode(node: HTMLElement): Slot | null;
-    /**
-     * 获取插槽内容节点集合
-     * @param slot
-     */
-    getNodesBySlot(slot: Slot): Node[];
-    /**
-     * 获取原生节点的原始数据在文档中的位置
-     * @param node
-     */
-    getLocationByNativeNode(node: Node): NodeLocation | null;
-    protected insertCompositionByIndex(slot: Slot, vNode: VElement, composition: CompositionState, createCompositionNode: (composition: CompositionState) => VElement): void;
 }

package/bundles/index.esm.js

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { Slot, Textbus, ViewAdapter, createBidirectionalMapping, Component, VTextNode, VElement, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, makeError, NativeSelectionBridge, FocusManager, Registry } from '@textbus/core';
+import { Slot, Textbus, Adapter, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, makeError, NativeSelectionBridge, FocusManager, Component, Registry } from '@textbus/core';
 import { Subject, filter, fromEvent, Subscription, distinctUntilChanged, merge, map, Observable } from '@tanbo/stream';
 import { InjectionToken, Injectable, Inject, Optional } from '@viewfly/core';
 import { UserActivity } from '@textbus/collaborate';
@@ -301,13 +301,10 @@ Parser = Parser_1 = __decorate([
 class Input {
 }
 
-/**
- * Textbus PC 端浏览器渲染能力桥接器抽象类，提供了 DOM 元素查询能力，具体渲染能力由各前端框架实现相应桥接
- */
-class DomAdapter extends ViewAdapter {
-    constructor(mount) {
-        super();
-        this.mount = mount;
+class DomAdapter extends Adapter {
+    constructor() {
+        super(...arguments);
+        this.onViewUpdated = new Subject();
         this.host = createElement('div', {
             styles: {
                 cursor: 'text',
@@ -323,197 +320,8 @@ class DomAdapter extends ViewAdapter {
                 id: 'textbus-' + Number((Math.random() + '').substring(2)).toString(16)
             }
         });
-        this.compositionNode = null;
-        this.composition = null;
-        this.firstRending = true;
-        this.componentRootElementCaches = createBidirectionalMapping(a => {
-            return a instanceof Component;
-        });
-        this.slotRootNativeElementCaches = createBidirectionalMapping(a => {
-            return a instanceof Slot;
-        });
-        this.slotRootVElementCaches = new WeakMap();
-        this.renderedSlotCache = new WeakMap();
-    }
-    render(rootComponent, textbus) {
-        const view = this.componentRender(rootComponent);
-        this.firstRending = false;
-        return this.mount(this.host, view, textbus);
-    }
-    copy() {
-        document.execCommand('copy');
-    }
-    /**
-     * 根据组件获取组件的根 DOM 节点
-     * @param component
-     */
-    getNativeNodeByComponent(component) {
-        return this.componentRootElementCaches.get(component) || null;
-    }
-    /**
-     * 根据 DOM 节点，获对对应的组件根节点，如传入的 DOM 节点不为组件的根节点，则返回 null
-     * @param node
-     */
-    getComponentByNativeNode(node) {
-        return this.componentRootElementCaches.get(node) || null;
-    }
-    /**
-     * 根据插槽获取插槽的根 DOM 节点
-     * @param slot
-     */
-    getNativeNodeBySlot(slot) {
-        return this.slotRootNativeElementCaches.get(slot) || null;
-    }
-    /**
-     * 根据 DOM 节点，获对对应的插槽根节点，如传入的 DOM 节点不为插槽的根节点，则返回 null
-     * @param node
-     */
-    getSlotByNativeNode(node) {
-        return this.slotRootNativeElementCaches.get(node) || null;
-    }
-    /**
-     * 获取插槽内容节点集合
-     * @param slot
-     */
-    getNodesBySlot(slot) {
-        const rootNativeNode = this.getNativeNodeBySlot(slot);
-        if (!rootNativeNode) {
-            return [];
-        }
-        const rootVNode = this.slotRootVElementCaches.get(slot);
-        return getNodes(this, rootVNode, rootNativeNode, []);
-    }
-    /**
-     * 获取原生节点的原始数据在文档中的位置
-     * @param node
-     */
-    getLocationByNativeNode(node) {
-        let slotRootNode = node;
-        while (!this.slotRootNativeElementCaches.get(slotRootNode)) {
-            slotRootNode = slotRootNode.parentNode;
-            if (!slotRootNode) {
-                return null;
-            }
-        }
-        const slot = this.slotRootNativeElementCaches.get(slotRootNode);
-        const rootVNode = this.slotRootVElementCaches.get(slot);
-        return getLocation(node, slotRootNode, rootVNode);
-    }
-    insertCompositionByIndex(slot, vNode, composition, createCompositionNode) {
-        const location = vNode.location;
-        const nodes = vNode.children;
-        if (location && location.slot === composition.slot) {
-            for (let i = 0; i < nodes.length; i++) {
-                const child = nodes[i];
-                if (child instanceof VTextNode) {
-                    const childLocation = child.location;
-                    if (childLocation) {
-                        if (composition.index > childLocation.startIndex && composition.index <= childLocation.endIndex) {
-                            const compositionNode = createCompositionNode(composition);
-                            if (composition.index === childLocation.endIndex) {
-                                nodes.splice(i + 1, 0, compositionNode);
-                                break;
-                            }
-                            const splitIndex = composition.index - childLocation.startIndex;
-                            const beforeNode = new VTextNode(child.textContent.slice(0, splitIndex));
-                            beforeNode.location = {
-                                slot: childLocation.slot,
-                                startIndex: childLocation.startIndex,
-                                endIndex: childLocation.startIndex + splitIndex
-                            };
-                            const afterNode = new VTextNode(child.textContent.slice(splitIndex));
-                            afterNode.location = {
-                                slot: childLocation.slot,
-                                startIndex: composition.index,
-                                endIndex: childLocation.endIndex
-                            };
-                            nodes.splice(i, 1, beforeNode, compositionNode, afterNode);
-                            break;
-                        }
-                        else if (composition.index === 0 && childLocation.startIndex === 0) {
-                            nodes.splice(i, 0, createCompositionNode(composition));
-                            break;
-                        }
-                    }
-                }
-                else if (child instanceof Component) {
-                    const componentIndex = slot.indexOf(child);
-                    if (composition.index === componentIndex + 1) {
-                        nodes.splice(i + 1, 0, createCompositionNode(composition));
-                        break;
-                    }
-                    else if (componentIndex === 0 && composition.index === 0) {
-                        nodes.splice(i, 0, createCompositionNode(composition));
-                        break;
-                    }
-                }
-                else if (child.tagName === 'br') {
-                    const location = child.location;
-                    if (location) {
-                        if (location.endIndex === composition.index) {
-                            nodes.splice(i + 1, 0, createCompositionNode(composition));
-                            break;
-                        }
-                        else if (location.startIndex === 0 && composition.index === 0) {
-                            nodes.splice(i, 0, createCompositionNode(composition));
-                            break;
-                        }
-                    }
-                }
-            }
-        }
     }
 }
-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 Component) {
-                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 端选区桥接实现
@@ -1099,8 +907,8 @@ class ExperimentalCaret {
     get display() {
         return this._display;
     }
-    constructor(adapter, scheduler, editorMask) {
-        this.adapter = adapter;
+    constructor(domRenderer, scheduler, editorMask) {
+        this.domRenderer = domRenderer;
         this.scheduler = scheduler;
         this.editorMask = editorMask;
         this.timer = null;
@@ -1246,7 +1054,7 @@ class ExperimentalCaret {
             this.positionChangeEvent.next(null);
             return;
         }
-        const compositionNode = this.adapter.compositionNode;
+        const compositionNode = this.domRenderer.compositionNode;
         if (compositionNode) {
             nativeRange = nativeRange.cloneRange();
             nativeRange.selectNodeContents(compositionNode);
@@ -1310,9 +1118,9 @@ let MagicInput = class MagicInput extends Input {
     get disabled() {
         return this._disabled;
     }
-    constructor(adapter, parser, keyboard, commander, selection, controller, scheduler, textbus) {
+    constructor(domAdapter, parser, keyboard, commander, selection, controller, scheduler, textbus) {
         super();
-        this.adapter = adapter;
+        this.domAdapter = domAdapter;
         this.parser = parser;
         this.keyboard = keyboard;
         this.commander = commander;
@@ -1321,7 +1129,7 @@ let MagicInput = class MagicInput extends Input {
         this.scheduler = scheduler;
         this.textbus = textbus;
         this.composition = false;
-        this.caret = new ExperimentalCaret(this.adapter, this.scheduler, this.textbus.get(VIEW_MASK));
+        this.caret = new ExperimentalCaret(this.domAdapter, this.scheduler, this.textbus.get(VIEW_MASK));
         this.isSafari = isSafari();
         this.isFirefox = isFirefox();
         this.isMac = isMac();
@@ -1409,10 +1217,10 @@ let MagicInput = class MagicInput extends Input {
             this.isFocus = false;
             this.nativeFocus = false;
             this.caret.hide();
-            if (this.adapter.composition) {
-                const slot = this.adapter.composition.slot;
-                this.adapter.composition = null;
-                this.adapter.compositionNode = null;
+            if (this.domAdapter.composition) {
+                const slot = this.domAdapter.composition.slot;
+                this.domAdapter.composition = null;
+                this.domAdapter.compositionNode = null;
                 slot.__changeMarker__.forceMarkDirtied();
             }
         }), fromEvent(textarea, 'focus').subscribe(() => {
@@ -1553,7 +1361,7 @@ let MagicInput = class MagicInput extends Input {
                 return;
             }
             const startSlot = this.selection.startSlot;
-            this.adapter.composition = {
+            this.domAdapter.composition = {
                 slot: startSlot,
                 text: ev.data,
                 offset: ev.data.length,
@@ -1591,7 +1399,7 @@ let MagicInput = class MagicInput extends Input {
         }))).subscribe(text => {
             var _a;
             this.composition = false;
-            this.adapter.composition = null;
+            this.domAdapter.composition = null;
             if (text) {
                 this.commander.write(text);
             }
@@ -2405,11 +2213,8 @@ class BrowserModule {
                 provide: Input,
                 useClass: config.useContentEditable ? NativeInput : MagicInput
             }, {
-                provide: ViewAdapter,
-                useFactory(v) {
-                    return v;
-                },
-                deps: [DomAdapter]
+                provide: Adapter,
+                useValue: config.adapter
             }, {
                 provide: DomAdapter,
                 useValue: config.adapter
@@ -2515,4 +2320,4 @@ class BrowserModule {
     }
 }
 
-export { BrowserModule, CollaborateCursor, CollaborateSelectionAwarenessDelegate, DomAdapter, EDITOR_OPTIONS, Input, MagicInput, Parser, SelectionBridge, VIEW_CONTAINER, VIEW_DOCUMENT, VIEW_MASK, createElement, createTextNode, getLayoutRectByRange, isFirefox, isMac, isMobileBrowser, isSafari, isWindows };
+export { BrowserModule, CollaborateCursor, CollaborateSelectionAwarenessDelegate, DomAdapter, EDITOR_OPTIONS, Input, MagicInput, NativeInput, Parser, SelectionBridge, VIEW_CONTAINER, VIEW_DOCUMENT, VIEW_MASK, createElement, createTextNode, getLayoutRectByRange, isFirefox, isMac, isMobileBrowser, isSafari, isWindows };

package/bundles/index.js

@@ -303,13 +303,10 @@ exports.Parser = Parser_1 = __decorate([
 class Input {
 }
 
-/**
- * Textbus PC 端浏览器渲染能力桥接器抽象类，提供了 DOM 元素查询能力，具体渲染能力由各前端框架实现相应桥接
- */
-class DomAdapter extends core$1.ViewAdapter {
-    constructor(mount) {
-        super();
-        this.mount = mount;
+class DomAdapter extends core$1.Adapter {
+    constructor() {
+        super(...arguments);
+        this.onViewUpdated = new stream.Subject();
         this.host = createElement('div', {
             styles: {
                 cursor: 'text',
@@ -325,197 +322,8 @@ class DomAdapter extends core$1.ViewAdapter {
                 id: 'textbus-' + Number((Math.random() + '').substring(2)).toString(16)
             }
         });
-        this.compositionNode = null;
-        this.composition = null;
-        this.firstRending = true;
-        this.componentRootElementCaches = core$1.createBidirectionalMapping(a => {
-            return a instanceof core$1.Component;
-        });
-        this.slotRootNativeElementCaches = core$1.createBidirectionalMapping(a => {
-            return a instanceof core$1.Slot;
-        });
-        this.slotRootVElementCaches = new WeakMap();
-        this.renderedSlotCache = new WeakMap();
-    }
-    render(rootComponent, textbus) {
-        const view = this.componentRender(rootComponent);
-        this.firstRending = false;
-        return this.mount(this.host, view, textbus);
-    }
-    copy() {
-        document.execCommand('copy');
-    }
-    /**
-     * 根据组件获取组件的根 DOM 节点
-     * @param component
-     */
-    getNativeNodeByComponent(component) {
-        return this.componentRootElementCaches.get(component) || null;
-    }
-    /**
-     * 根据 DOM 节点，获对对应的组件根节点，如传入的 DOM 节点不为组件的根节点，则返回 null
-     * @param node
-     */
-    getComponentByNativeNode(node) {
-        return this.componentRootElementCaches.get(node) || null;
-    }
-    /**
-     * 根据插槽获取插槽的根 DOM 节点
-     * @param slot
-     */
-    getNativeNodeBySlot(slot) {
-        return this.slotRootNativeElementCaches.get(slot) || null;
-    }
-    /**
-     * 根据 DOM 节点，获对对应的插槽根节点，如传入的 DOM 节点不为插槽的根节点，则返回 null
-     * @param node
-     */
-    getSlotByNativeNode(node) {
-        return this.slotRootNativeElementCaches.get(node) || null;
-    }
-    /**
-     * 获取插槽内容节点集合
-     * @param slot
-     */
-    getNodesBySlot(slot) {
-        const rootNativeNode = this.getNativeNodeBySlot(slot);
-        if (!rootNativeNode) {
-            return [];
-        }
-        const rootVNode = this.slotRootVElementCaches.get(slot);
-        return getNodes(this, rootVNode, rootNativeNode, []);
-    }
-    /**
-     * 获取原生节点的原始数据在文档中的位置
-     * @param node
-     */
-    getLocationByNativeNode(node) {
-        let slotRootNode = node;
-        while (!this.slotRootNativeElementCaches.get(slotRootNode)) {
-            slotRootNode = slotRootNode.parentNode;
-            if (!slotRootNode) {
-                return null;
-            }
-        }
-        const slot = this.slotRootNativeElementCaches.get(slotRootNode);
-        const rootVNode = this.slotRootVElementCaches.get(slot);
-        return getLocation(node, slotRootNode, rootVNode);
-    }
-    insertCompositionByIndex(slot, vNode, composition, createCompositionNode) {
-        const location = vNode.location;
-        const nodes = vNode.children;
-        if (location && location.slot === composition.slot) {
-            for (let i = 0; i < nodes.length; i++) {
-                const child = nodes[i];
-                if (child instanceof core$1.VTextNode) {
-                    const childLocation = child.location;
-                    if (childLocation) {
-                        if (composition.index > childLocation.startIndex && composition.index <= childLocation.endIndex) {
-                            const compositionNode = createCompositionNode(composition);
-                            if (composition.index === childLocation.endIndex) {
-                                nodes.splice(i + 1, 0, compositionNode);
-                                break;
-                            }
-                            const splitIndex = composition.index - childLocation.startIndex;
-                            const beforeNode = new core$1.VTextNode(child.textContent.slice(0, splitIndex));
-                            beforeNode.location = {
-                                slot: childLocation.slot,
-                                startIndex: childLocation.startIndex,
-                                endIndex: childLocation.startIndex + splitIndex
-                            };
-                            const afterNode = new core$1.VTextNode(child.textContent.slice(splitIndex));
-                            afterNode.location = {
-                                slot: childLocation.slot,
-                                startIndex: composition.index,
-                                endIndex: childLocation.endIndex
-                            };
-                            nodes.splice(i, 1, beforeNode, compositionNode, afterNode);
-                            break;
-                        }
-                        else if (composition.index === 0 && childLocation.startIndex === 0) {
-                            nodes.splice(i, 0, createCompositionNode(composition));
-                            break;
-                        }
-                    }
-                }
-                else if (child instanceof core$1.Component) {
-                    const componentIndex = slot.indexOf(child);
-                    if (composition.index === componentIndex + 1) {
-                        nodes.splice(i + 1, 0, createCompositionNode(composition));
-                        break;
-                    }
-                    else if (componentIndex === 0 && composition.index === 0) {
-                        nodes.splice(i, 0, createCompositionNode(composition));
-                        break;
-                    }
-                }
-                else if (child.tagName === 'br') {
-                    const location = child.location;
-                    if (location) {
-                        if (location.endIndex === composition.index) {
-                            nodes.splice(i + 1, 0, createCompositionNode(composition));
-                            break;
-                        }
-                        else if (location.startIndex === 0 && composition.index === 0) {
-                            nodes.splice(i, 0, createCompositionNode(composition));
-                            break;
-                        }
-                    }
-                }
-            }
-        }
     }
 }
-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.Component) {
-                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 端选区桥接实现
@@ -1101,8 +909,8 @@ class ExperimentalCaret {
     get display() {
         return this._display;
     }
-    constructor(adapter, scheduler, editorMask) {
-        this.adapter = adapter;
+    constructor(domRenderer, scheduler, editorMask) {
+        this.domRenderer = domRenderer;
         this.scheduler = scheduler;
         this.editorMask = editorMask;
         this.timer = null;
@@ -1248,7 +1056,7 @@ class ExperimentalCaret {
             this.positionChangeEvent.next(null);
             return;
         }
-        const compositionNode = this.adapter.compositionNode;
+        const compositionNode = this.domRenderer.compositionNode;
         if (compositionNode) {
             nativeRange = nativeRange.cloneRange();
             nativeRange.selectNodeContents(compositionNode);
@@ -1312,9 +1120,9 @@ exports.MagicInput = class MagicInput extends Input {
     get disabled() {
         return this._disabled;
     }
-    constructor(adapter, parser, keyboard, commander, selection, controller, scheduler, textbus) {
+    constructor(domAdapter, parser, keyboard, commander, selection, controller, scheduler, textbus) {
         super();
-        this.adapter = adapter;
+        this.domAdapter = domAdapter;
         this.parser = parser;
         this.keyboard = keyboard;
         this.commander = commander;
@@ -1323,7 +1131,7 @@ exports.MagicInput = class MagicInput extends Input {
         this.scheduler = scheduler;
         this.textbus = textbus;
         this.composition = false;
-        this.caret = new ExperimentalCaret(this.adapter, this.scheduler, this.textbus.get(VIEW_MASK));
+        this.caret = new ExperimentalCaret(this.domAdapter, this.scheduler, this.textbus.get(VIEW_MASK));
         this.isSafari = isSafari();
         this.isFirefox = isFirefox();
         this.isMac = isMac();
@@ -1411,10 +1219,10 @@ exports.MagicInput = class MagicInput extends Input {
             this.isFocus = false;
             this.nativeFocus = false;
             this.caret.hide();
-            if (this.adapter.composition) {
-                const slot = this.adapter.composition.slot;
-                this.adapter.composition = null;
-                this.adapter.compositionNode = null;
+            if (this.domAdapter.composition) {
+                const slot = this.domAdapter.composition.slot;
+                this.domAdapter.composition = null;
+                this.domAdapter.compositionNode = null;
                 slot.__changeMarker__.forceMarkDirtied();
             }
         }), stream.fromEvent(textarea, 'focus').subscribe(() => {
@@ -1555,7 +1363,7 @@ exports.MagicInput = class MagicInput extends Input {
                 return;
             }
             const startSlot = this.selection.startSlot;
-            this.adapter.composition = {
+            this.domAdapter.composition = {
                 slot: startSlot,
                 text: ev.data,
                 offset: ev.data.length,
@@ -1593,7 +1401,7 @@ exports.MagicInput = class MagicInput extends Input {
         }))).subscribe(text => {
             var _a;
             this.composition = false;
-            this.adapter.composition = null;
+            this.domAdapter.composition = null;
             if (text) {
                 this.commander.write(text);
             }
@@ -2018,7 +1826,7 @@ class NativeCaret {
         this.subs = [];
     }
 }
-let NativeInput = class NativeInput extends Input {
+exports.NativeInput = class NativeInput extends Input {
     set disabled(b) {
         this._disabled = b;
         if (this.controller.readonly) {
@@ -2367,7 +2175,7 @@ let NativeInput = class NativeInput extends Input {
         }));
     }
 };
-NativeInput = __decorate([
+exports.NativeInput = __decorate([
     core.Injectable(),
     __metadata("design:paramtypes", [core$1.Textbus,
         exports.Parser,
@@ -2377,7 +2185,7 @@ NativeInput = __decorate([
         DomAdapter,
         core$1.Commander,
         core$1.Controller])
-], NativeInput);
+], exports.NativeInput);
 
 const browserErrorFn = core$1.makeError('BrowserModule');
 class BrowserModule {
@@ -2405,13 +2213,10 @@ class BrowserModule {
                 useExisting: exports.SelectionBridge
             }, {
                 provide: Input,
-                useClass: config.useContentEditable ? NativeInput : exports.MagicInput
+                useClass: config.useContentEditable ? exports.NativeInput : exports.MagicInput
             }, {
-                provide: core$1.ViewAdapter,
-                useFactory(v) {
-                    return v;
-                },
-                deps: [DomAdapter]
+                provide: core$1.Adapter,
+                useValue: config.adapter
             }, {
                 provide: DomAdapter,
                 useValue: config.adapter

package/bundles/magic-input.d.ts

@@ -9,7 +9,7 @@ interface CaretStyle {
     fontSize: string;
 }
 declare class ExperimentalCaret implements Caret {
-    private adapter;
+    private domRenderer;
     private scheduler;
     private editorMask;
     onPositionChange: Observable<CaretPosition | null>;
@@ -29,7 +29,7 @@ declare class ExperimentalCaret implements Caret {
     private styleChangeEvent;
     private oldRange;
     private isFixed;
-    constructor(adapter: DomAdapter<any, any>, scheduler: Scheduler, editorMask: HTMLElement);
+    constructor(domRenderer: DomAdapter, scheduler: Scheduler, editorMask: HTMLElement);
     refresh(isFixedCaret?: boolean): void;
     show(range: Range, restart: boolean): void;
     hide(): void;
@@ -41,7 +41,7 @@ declare class ExperimentalCaret implements Caret {
  * Textbus PC 端输入实现
  */
 export declare class MagicInput extends Input {
-    private adapter;
+    private domAdapter;
     private parser;
     private keyboard;
     private commander;
@@ -66,7 +66,7 @@ export declare class MagicInput extends Input {
     private isFocus;
     private nativeFocus;
     private ignoreComposition;
-    constructor(adapter: DomAdapter<any, any>, parser: Parser, keyboard: Keyboard, commander: Commander, selection: Selection, controller: Controller, scheduler: Scheduler, textbus: Textbus);
+    constructor(domAdapter: DomAdapter, parser: Parser, keyboard: Keyboard, commander: Commander, selection: Selection, controller: Controller, scheduler: Scheduler, textbus: Textbus);
     focus(range: Range, restart: boolean): void;
     blur(): void;
     destroy(): void;

package/bundles/native-input.d.ts

@@ -40,7 +40,7 @@ export declare class NativeInput extends Input {
     private isMac;
     private isMobileBrowser;
     private ignoreComposition;
-    constructor(textbus: Textbus, parser: Parser, scheduler: Scheduler, selection: Selection, keyboard: Keyboard, domAdapter: DomAdapter<any, any>, commander: Commander, controller: Controller);
+    constructor(textbus: Textbus, parser: Parser, scheduler: Scheduler, selection: Selection, keyboard: Keyboard, domAdapter: DomAdapter, commander: Commander, controller: Controller);
     focus(nativeRange: Range): void;
     blur(): void;
     destroy(): void;

package/bundles/public-api.d.ts

@@ -6,6 +6,7 @@ export * from './collaborate-cursor';
 export * from './dom-adapter';
 export * from './injection-tokens';
 export * from './magic-input';
+export * from './native-input';
 export * from './parser';
 export * from './selection-bridge';
 export * from './types';

package/bundles/selection-bridge.d.ts

@@ -2,8 +2,8 @@ import { Observable } from '@tanbo/stream';
 import { NativeSelectionBridge, NativeSelectionConnector, SelectionPosition, AbstractSelection, RootComponentRef, Controller, Selection, Textbus } from '@textbus/core';
 import { Rect } from './_utils/uikit';
 import { Input } from './types';
-import { DomAdapter } from './dom-adapter';
 import { ViewOptions } from './browser-module';
+import { DomAdapter } from './dom-adapter';
 /**
  * Textbus PC 端选区桥接实现
  */
@@ -24,7 +24,7 @@ export declare class SelectionBridge implements NativeSelectionBridge {
     private docContainer;
     private cacheCaretPositionTimer;
     private oldCaretPosition;
-    constructor(config: ViewOptions, textbus: Textbus, controller: Controller, selection: Selection, rootComponentRef: RootComponentRef, input: Input, domAdapter: DomAdapter<any, any>);
+    constructor(config: ViewOptions, textbus: Textbus, controller: Controller, selection: Selection, rootComponentRef: RootComponentRef, input: Input, domAdapter: DomAdapter);
     connect(connector: NativeSelectionConnector): void;
     disConnect(): void;
     getRect(location: SelectionPosition): Rect | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "4.0.0-alpha.41",
+  "version": "4.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",
@@ -26,8 +26,8 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.3",
-    "@textbus/collaborate": "^4.0.0-alpha.41",
-    "@textbus/core": "^4.0.0-alpha.41",
+    "@textbus/collaborate": "^4.0.0-alpha.42",
+    "@textbus/core": "^4.0.0-alpha.42",
     "@viewfly/core": "^1.0.0-alpha.1",
     "reflect-metadata": "^0.1.13"
   },
@@ -49,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "b5c18b176790c339fb7fb35e3d427b8a81ffcd84"
+  "gitHead": "690f066925bac5379883f54f470684c74645d12e"
 }