@textbus/platform-browser 3.5.0 → 4.0.0-alpha.1

package/bundles/{core/injection-tokens.d.ts → injection-tokens.d.ts}

@@ -1,5 +1,5 @@
-import { InjectionToken } from '@tanbo/di';
-import { ViewOptions } from './types';
+import { InjectionToken } from '@viewfly/core';
+import { ViewOptions } from './browser-module';
 /**
  * 编辑器可选项依赖注入 token
  */

package/bundles/{core/magic-input.d.ts → magic-input.d.ts}

@@ -1,7 +1,7 @@
 import { Observable } from '@tanbo/stream';
-import { Injector } from '@tanbo/di';
+import { Injector } from '@viewfly/core';
 import { Commander, Controller, Keyboard, Scheduler, Selection } from '@textbus/core';
-import { Parser } from '../dom-support/parser';
+import { Parser } from './parser';
 import { Caret, CaretPosition, CompositionState, Input, Scroller } from './types';
 interface CaretStyle {
     height: string;

package/bundles/{core/native-input.d.ts → native-input.d.ts}

@@ -1,14 +1,15 @@
-import { Injector } from '@tanbo/di';
+import { Injector } from '@viewfly/core';
 import { Observable } from '@tanbo/stream';
-import { Commander, Controller, Keyboard, Renderer, Scheduler, Selection } from '@textbus/core';
+import { Commander, Controller, Keyboard, Scheduler, Selection } from '@textbus/core';
 import { Caret, CaretPosition, CompositionState, Input, Scroller } from './types';
-import { Parser } from '../dom-support/parser';
+import { Parser } from './parser';
+import { DomAdapter } from './dom-adapter';
 declare class NativeCaret implements Caret {
     private scheduler;
     onPositionChange: Observable<CaretPosition | null>;
     set nativeRange(range: Range | null);
     get nativeRange(): Range | null;
-    get rect(): import("../_utils/uikit").Rect;
+    get rect(): import("./_utils/uikit").Rect;
     private oldPosition;
     private _nativeRange;
     private subs;
@@ -19,12 +20,11 @@ declare class NativeCaret implements Caret {
     destroy(): void;
 }
 export declare class NativeInput extends Input {
-    private injector;
     private parser;
     private scheduler;
     private selection;
     private keyboard;
-    private renderer;
+    private domAdapter;
     private commander;
     private controller;
     caret: NativeCaret;
@@ -42,7 +42,7 @@ export declare class NativeInput extends Input {
     private isMac;
     private isMobileBrowser;
     private ignoreComposition;
-    constructor(injector: Injector, parser: Parser, scheduler: Scheduler, selection: Selection, keyboard: Keyboard, renderer: Renderer, commander: Commander, controller: Controller);
+    constructor(injector: Injector, parser: Parser, scheduler: Scheduler, selection: Selection, keyboard: Keyboard, domAdapter: DomAdapter<any, any>, commander: Commander, controller: Controller);
     focus(nativeRange: Range): void;
     blur(): void;
     destroy(): void;

package/bundles/{dom-support/parser.d.ts → parser.d.ts}

@@ -1,17 +1,6 @@
-import { Injector } from '@tanbo/di';
+import { Injector } from '@viewfly/core';
 import { Attribute, ComponentInstance, Formatter, FormatValue, Slot } from '@textbus/core';
-import { ViewOptions } from '../core/types';
-/**
- * 组件可附加携带的信息，如一些样式表、脚本、或编辑时模式时的样式
- */
-export interface ComponentResources {
-    links?: Array<{
-        [key: string]: string;
-    }>;
-    styles?: string[];
-    scripts?: string[];
-    editModeStyles?: string[];
-}
+import { ViewOptions } from './browser-module';
 /**
  * 插槽解析器
  */
@@ -29,8 +18,6 @@ export interface SlotParser {
  * 组件加载器
  */
 export interface ComponentLoader {
-    /** 组件所需要的外部资源 */
-    resources?: ComponentResources;
     /** 识别组件的匹配方法 */
     match(element: HTMLElement): boolean;
     /** 读取组件内容的方法 */
@@ -90,7 +77,7 @@ export declare class Parser {
      * @param html
      * @param rootComponentLoader
      */
-    parseDoc(html: string, rootComponentLoader: ComponentLoader): void | Slot<any> | ComponentInstance<import("@textbus/core").ComponentExtends, any, unknown>;
+    parseDoc(html: string, rootComponentLoader: ComponentLoader): void | Slot<any> | ComponentInstance<unknown, unknown, unknown>;
     /**
      * 将一段 HTML 解析到指定插槽
      * @param html

package/bundles/public-api.d.ts

@@ -1,7 +1,11 @@
 import 'reflect-metadata';
 export * from './_utils/uikit';
 export * from './_utils/env';
-export * from './collaborate/collaborate-cursor';
-export * from './core/_api';
-export * from './dom-support/_api';
-export * from './viewer';
+export * from './browser-module';
+export * from './collaborate-cursor';
+export * from './dom-adapter';
+export * from './injection-tokens';
+export * from './magic-input';
+export * from './parser';
+export * from './selection-bridge';
+export * from './types';

package/bundles/{core/selection-bridge.d.ts → selection-bridge.d.ts}

@@ -1,22 +1,21 @@
 import { Observable } from '@tanbo/stream';
-import { Injector } from '@tanbo/di';
-import { NativeSelectionBridge, NativeSelectionConnector, Renderer, SelectionPosition, AbstractSelection, RootComponentRef, Controller, Selection } from '@textbus/core';
-import { Rect } from '../_utils/uikit';
-import { Input, ViewOptions } from './types';
+import { Injector } from '@viewfly/core';
+import { NativeSelectionBridge, NativeSelectionConnector, SelectionPosition, AbstractSelection, RootComponentRef, Controller, Selection } from '@textbus/core';
+import { Rect } from './_utils/uikit';
+import { Input } from './types';
+import { DomAdapter } from './dom-adapter';
+import { ViewOptions } from './browser-module';
 /**
  * Textbus PC 端选区桥接实现
  */
 export declare class SelectionBridge implements NativeSelectionBridge {
     private config;
-    private injector;
-    private controller;
     private selection;
     private rootComponentRef;
     private input;
-    private renderer;
+    private domAdapter;
     onSelectionChange: Observable<Range | null>;
     nativeSelection: globalThis.Selection;
-    private selectionMaskElement;
     private selectionChangeEvent;
     private subs;
     private sub;
@@ -24,10 +23,9 @@ export declare class SelectionBridge implements NativeSelectionBridge {
     private ignoreSelectionChange;
     private changeFromUser;
     private docContainer;
-    private maskContainer;
     private cacheCaretPositionTimer;
     private oldCaretPosition;
-    constructor(config: ViewOptions, injector: Injector, controller: Controller, selection: Selection, rootComponentRef: RootComponentRef, input: Input, renderer: Renderer);
+    constructor(config: ViewOptions, injector: Injector, controller: Controller, selection: Selection, rootComponentRef: RootComponentRef, input: Input, domAdapter: DomAdapter<any, any>);
     connect(connector: NativeSelectionConnector): void;
     disConnect(): void;
     getRect(location: SelectionPosition): Rect | null;

package/bundles/types.d.ts

@@ -0,0 +1,44 @@
+import { Slot } from '@textbus/core';
+import { Observable } from '@tanbo/stream';
+import { Rect } from './_utils/uikit';
+export interface CaretLimit {
+    top: number;
+    bottom: number;
+}
+export interface Scroller {
+    onScroll: Observable<any>;
+    getLimit(): CaretLimit;
+    setOffset(offsetScrollTop: number): void;
+}
+export interface CaretPosition {
+    left: number;
+    top: number;
+    height: number;
+}
+export interface Caret {
+    onPositionChange: Observable<CaretPosition | null>;
+    readonly rect: Rect;
+    refresh(isFixedCaret: boolean): void;
+    correctScrollTop(scroller: Scroller): void;
+}
+export interface CompositionState {
+    slot: Slot;
+    index: number;
+    data: string;
+}
+export declare abstract class Input {
+    /**
+     * @experimental
+     */
+    abstract composition: boolean;
+    /**
+     * @experimental
+     */
+    abstract compositionState: CompositionState | null;
+    abstract onReady: Promise<void>;
+    abstract caret: Caret;
+    abstract disabled: boolean;
+    abstract focus(nativeRange: Range, reFlash: boolean): void;
+    abstract blur(): void;
+    abstract destroy(): void;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.5.0",
+  "version": "4.0.0-alpha.1",
   "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",
@@ -25,9 +25,9 @@
     "typescript editor"
   ],
   "dependencies": {
-    "@tanbo/di": "^1.1.5",
     "@tanbo/stream": "^1.2.0",
-    "@textbus/core": "^3.5.0",
+    "@textbus/core": "^4.0.0-alpha.1",
+    "@viewfly/core": "^0.2.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "8792e92aa4b3dd1cc6f190a6585bdd4cfb933779"
+  "gitHead": "c66a476c5776f8cf719ebb0f9e7adebb391f82c1"
 }

package/bundles/core/_api.d.ts

@@ -1,6 +0,0 @@
-export * from './dom-renderer';
-export * from './injection-tokens';
-export * from './magic-input';
-export * from './native-input';
-export * from './selection-bridge';
-export * from './types';

package/bundles/core/dom-renderer.d.ts

@@ -1,53 +0,0 @@
-import { NativeNode, NativeRenderer } from '@textbus/core';
-/**
- * Textbus PC 端浏览器渲染能力实现
- */
-export declare class DomRenderer implements NativeRenderer {
-    isSVG: RegExp;
-    xlinkNameSpace: string;
-    possibleXlinkNames: {
-        xlinkActuate: string;
-        xlinkactuate: string;
-        'xlink:actuate': string;
-        xlinkArcrole: string;
-        xlinkarcrole: string;
-        'xlink:arcrole': string;
-        xlinkHref: string;
-        xlinkhref: string;
-        'xlink:href': string;
-        xlinkRole: string;
-        xlinkrole: string;
-        'xlink:role': string;
-        xlinkShow: string;
-        xlinkshow: string;
-        'xlink:show': string;
-        xlinkTitle: string;
-        xlinktitle: string;
-        'xlink:title': string;
-        xlinkType: string;
-        xlinktype: string;
-        'xlink:type': string;
-    };
-    booleanProps: Record<string, string[]>;
-    valueProps: Record<string, string[]>;
-    listen<T = any>(node: NativeNode, type: string, callback: (ev: T) => any): void;
-    unListen(node: NativeNode, type: string, callback: (ev: any) => any): void;
-    createTextNode(textContent: string): NativeNode;
-    createElement(name: string): NativeNode;
-    appendChild(parent: NativeNode, newChild: NativeNode): void;
-    remove(node: NativeNode): void;
-    insertBefore(newNode: NativeNode, ref: NativeNode): void;
-    getChildByIndex(parent: NativeNode, index: number): NativeNode | null;
-    addClass(target: NativeNode, name: string): void;
-    removeClass(target: NativeNode, name: string): void;
-    setStyle(target: NativeNode, key: string, value: any): void;
-    syncTextContent(target: NativeNode, content: string): void;
-    removeStyle(target: NativeNode, key: string): void;
-    setAttribute(target: NativeNode, key: string, value: string): void;
-    removeAttribute(target: NativeNode, key: string): void;
-    setXlinkAttribute(target: NativeNode, key: string, value: string): void;
-    removeXlinkAttribute(target: NativeNode, key: string): void;
-    replace(newChild: NativeNode, oldChild: NativeNode): void;
-    copy(): void;
-    static replaceEmpty(s: string): string;
-}

package/bundles/core/types.d.ts

@@ -1,74 +0,0 @@
-import { ComponentLiteral, Module, Slot, TextbusConfig } from '@textbus/core';
-import { Observable } from '@tanbo/stream';
-import { FormatLoader, ComponentLoader, AttributeLoader } from '../dom-support/parser';
-import { Rect } from '../_utils/uikit';
-export interface ViewModule extends Module {
-    componentLoaders?: ComponentLoader[];
-    formatLoaders?: FormatLoader<any>[];
-    attributeLoaders?: AttributeLoader<any>[];
-}
-/**
- * Textbus PC 端配置接口
- */
-export interface ViewOptions extends TextbusConfig {
-    imports?: ViewModule[];
-    /** 自动获取焦点 */
-    autoFocus?: boolean;
-    /** 编辑区最小高度 */
-    minHeight?: string;
-    /** 组件加载器 */
-    componentLoaders?: ComponentLoader[];
-    /** 格式加载器 */
-    formatLoaders?: FormatLoader<any>[];
-    /** 属性加载器 */
-    attributeLoaders?: AttributeLoader<any>[];
-    /** 默认内容 */
-    content?: string | ComponentLiteral;
-    /** 文档默认样式表 */
-    styleSheets?: string[];
-    /** 配置文档编辑状态下用到的样式 */
-    editingStyleSheets?: string[];
-    /** 使用 contentEditable 作为编辑器控制可编辑范围 */
-    useContentEditable?: boolean;
-}
-export interface CaretLimit {
-    top: number;
-    bottom: number;
-}
-export interface Scroller {
-    onScroll: Observable<any>;
-    getLimit(): CaretLimit;
-    setOffset(offsetScrollTop: number): void;
-}
-export interface CaretPosition {
-    left: number;
-    top: number;
-    height: number;
-}
-export interface Caret {
-    onPositionChange: Observable<CaretPosition | null>;
-    readonly rect: Rect;
-    refresh(isFixedCaret: boolean): void;
-    correctScrollTop(scroller: Scroller): void;
-}
-export interface CompositionState {
-    slot: Slot;
-    index: number;
-    data: string;
-}
-export declare abstract class Input {
-    /**
-     * @experimental
-     */
-    abstract composition: boolean;
-    /**
-     * @experimental
-     */
-    abstract compositionState: CompositionState | null;
-    abstract onReady: Promise<void>;
-    abstract caret: Caret;
-    abstract disabled: boolean;
-    abstract focus(nativeRange: Range, reFlash: boolean): void;
-    abstract blur(): void;
-    abstract destroy(): void;
-}

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

@@ -1,2 +0,0 @@
-export * from './output-translator';
-export * from './parser';

package/bundles/dom-support/output-translator.d.ts

@@ -1,20 +0,0 @@
-import { VElement } from '@textbus/core';
-/**
- * HTML 输出转换器，用于将虚拟 DOM 转换为 HTML 字符串
- */
-export declare class OutputTranslator {
-    static singleTags: string[];
-    static simpleXSSFilter: {
-        text(text: string): string;
-        attrName(text: string): string;
-        attrValue(text: string): string;
-    };
-    private singleTagTest;
-    /**
-     * 将虚拟 DOM 转换为 HTML 字符串的方法
-     * @param vDom 虚拟 DOM 节点
-     */
-    transform(vDom: VElement): string;
-    private vDomToHTMLString;
-    private replaceEmpty;
-}

package/bundles/viewer.d.ts

@@ -1,90 +0,0 @@
-import { Observable, Subject, Subscription } from '@tanbo/stream';
-import { Starter, ComponentLiteral, Component } from '@textbus/core';
-import { ComponentLoader } from './dom-support/_api';
-import { ViewOptions } from './core/_api';
-export interface Resources {
-    styleSheets: string[];
-    styleSheet: string;
-    links: Record<string, string>[];
-    scripts: string[];
-}
-/**
- * Textbus PC 端编辑器
- */
-export declare class Viewer extends Starter {
-    rootComponent: Component;
-    rootComponentLoader: ComponentLoader;
-    options: ViewOptions;
-    /** 当视图获得焦点时触发 */
-    onFocus: Observable<void>;
-    /** 当视图失去焦点时触发 */
-    onBlur: Observable<void>;
-    /** 当编辑器内容变化时触发 */
-    onChange: Observable<void>;
-    /** 当用户按 Ctrl + S 时触发 */
-    onSave: Observable<void>;
-    /** 编辑器是否已销毁 */
-    destroyed: boolean;
-    /** 编辑器是否已准备好 */
-    isReady: boolean;
-    get readonly(): boolean;
-    set readonly(b: boolean);
-    isFocus(): boolean;
-    protected changeEvent: Subject<void>;
-    protected subs: Subscription[];
-    protected _isFocus: boolean;
-    private controller;
-    private workbench;
-    private id;
-    private resourceNodes;
-    private focusEvent;
-    private blurEvent;
-    private saveEvent;
-    private styleSheet;
-    private scripts;
-    private links;
-    constructor(rootComponent: Component, rootComponentLoader: ComponentLoader, options?: ViewOptions);
-    /**
-     * 初始化编辑器
-     * @param host 编辑器容器
-     */
-    mount(host: HTMLElement): Promise<this>;
-    /**
-     * 获取焦点
-     */
-    focus(): void;
-    /**
-     * 取消编辑器焦点
-     */
-    blur(): void;
-    /**
-     * 获取编辑器所有资源
-     */
-    getResources(): Resources;
-    /**
-     * 获取 HTML 格式的内容
-     */
-    getHTML(): string;
-    /**
-     * 获取 JSON 格式的内容
-     */
-    getJSON(): ComponentLiteral;
-    /**
-     * 清空内容
-     */
-    clear(): void;
-    /**
-     * 销毁编辑器
-     */
-    destroy(): void;
-    /**
-     * 替换编辑的内容
-     * @param content
-     */
-    replaceContent(content: string | ComponentLiteral): void;
-    protected guardReady(): void;
-    private initDefaultShortcut;
-    private initDocStyleSheetsAndScripts;
-    private static createLayout;
-    private static cssMin;
-}