@textbus/platform-browser 4.0.0-alpha.8 → 4.0.1

package/bundles/magic-input.d.ts

@@ -1,46 +1,45 @@
 import { Observable } from '@tanbo/stream';
 import { Commander, Controller, Keyboard, Scheduler, Selection, Textbus } from '@textbus/core';
 import { Parser } from './parser';
-import { Caret, CaretPosition, CompositionState, Input, Scroller } from './types';
+import { Caret, CaretLimit, CaretPosition, Input } from './types';
+import { DomAdapter } from './dom-adapter';
 interface CaretStyle {
     height: string;
     lineHeight: string;
     fontSize: string;
 }
 declare class ExperimentalCaret implements Caret {
+    private domRenderer;
     private scheduler;
     private editorMask;
     onPositionChange: Observable<CaretPosition | null>;
     onStyleChange: Observable<CaretStyle>;
     elementRef: HTMLElement;
-    compositionState: CompositionState | null;
+    changeFromSelf: boolean;
+    getLimit: () => CaretLimit;
     get rect(): DOMRect;
-    compositionElement: HTMLElement;
     private timer;
     private caret;
-    private oldPosition;
     private set display(value);
     private get display();
     private _display;
     private flashing;
-    private subs;
     private subscription;
     private positionChangeEvent;
     private styleChangeEvent;
     private oldRange;
-    private isFixed;
-    constructor(scheduler: Scheduler, editorMask: HTMLElement);
-    refresh(isFixedCaret?: boolean): void;
+    constructor(domRenderer: DomAdapter, scheduler: Scheduler, editorMask: HTMLElement);
+    refresh(): void;
     show(range: Range, restart: boolean): void;
     hide(): void;
     destroy(): void;
-    correctScrollTop(scroller: Scroller): void;
     private updateCursorPosition;
 }
 /**
  * Textbus PC 端输入实现
  */
 export declare class MagicInput extends Input {
+    private domAdapter;
     private parser;
     private keyboard;
     private commander;
@@ -49,7 +48,6 @@ export declare class MagicInput extends Input {
     private scheduler;
     private textbus;
     composition: boolean;
-    compositionState: CompositionState | null;
     onReady: Promise<void>;
     caret: ExperimentalCaret;
     set disabled(b: boolean);
@@ -66,10 +64,11 @@ export declare class MagicInput extends Input {
     private isFocus;
     private nativeFocus;
     private ignoreComposition;
-    constructor(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;
+    private reInit;
     private init;
     private handleDefaultActions;
     private handlePaste;

package/bundles/native-input.d.ts

@@ -1,26 +1,22 @@
 import { Observable } from '@tanbo/stream';
-import { Commander, Controller, Keyboard, Scheduler, Selection, Textbus } from '@textbus/core';
-import { Caret, CaretPosition, CompositionState, Input, Scroller } from './types';
+import { Commander, Controller, Keyboard, Selection, Textbus } from '@textbus/core';
+import { Caret, CaretPosition, Input } from './types';
 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;
-    private oldPosition;
     private _nativeRange;
     private subs;
     private positionChangeEvent;
-    constructor(scheduler: Scheduler);
+    constructor();
     refresh(): void;
-    correctScrollTop(scroller: Scroller): void;
     destroy(): void;
 }
 export declare class NativeInput extends Input {
     private parser;
-    private scheduler;
     private selection;
     private keyboard;
     private domAdapter;
@@ -28,7 +24,6 @@ export declare class NativeInput extends Input {
     private controller;
     caret: NativeCaret;
     composition: boolean;
-    compositionState: CompositionState | null;
     onReady: Promise<void>;
     set disabled(b: boolean);
     get disabled(): boolean;
@@ -41,7 +36,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, selection: Selection, keyboard: Keyboard, domAdapter: DomAdapter, commander: Commander, controller: Controller);
     focus(nativeRange: Range): void;
     blur(): void;
     destroy(): void;

package/bundles/parser.d.ts

@@ -1,4 +1,4 @@
-import { Attribute, ComponentInstance, Formatter, FormatValue, Slot, Textbus } from '@textbus/core';
+import { Attribute, Component, ContentType, Formatter, FormatValue, Slot, Textbus } from '@textbus/core';
 import { ViewOptions } from './browser-module';
 /**
  * 插槽解析器
@@ -18,18 +18,18 @@ export interface SlotParser {
  */
 export interface ComponentLoader {
     /** 识别组件的匹配方法 */
-    match(element: HTMLElement): boolean;
+    match(element: HTMLElement, returnableContentTypes: ContentType[]): boolean;
     /** 读取组件内容的方法 */
-    read(element: HTMLElement, textbus: Textbus, slotParser: SlotParser): ComponentInstance | Slot | void;
+    read(element: HTMLElement, textbus: Textbus, slotParser: SlotParser): Component | Slot | void;
 }
-export interface FormatLoaderReadResult<T extends FormatValue> {
+export interface FormatLoaderReadResult<T = FormatValue> {
     formatter: Formatter<T>;
     value: T;
 }
 /**
  * 格式加载器
  */
-export interface FormatLoader<T extends FormatValue> {
+export interface FormatLoader<T = FormatValue> {
     /**
      * 匹配一个 DOM 节点是否是某个格式节点
      * @param element
@@ -41,14 +41,14 @@ export interface FormatLoader<T extends FormatValue> {
      */
     read(element: HTMLElement): FormatLoaderReadResult<T>;
 }
-export interface AttributeLoaderReadResult<T extends FormatValue> {
+export interface AttributeLoaderReadResult<T = FormatValue> {
     attribute: Attribute<T>;
     value: T;
 }
 /**
  * 属性加载器
  */
-export interface AttributeLoader<T extends FormatValue> {
+export interface AttributeLoader<T = FormatValue> {
     /**
      * 匹配一个 DOM 节点是否是某个属性节点
      * @param element
@@ -64,7 +64,6 @@ export interface AttributeLoader<T extends FormatValue> {
  * 用于解析 HTML，并把 HTML 内容转换为 Textbus 可以支持的组件或插槽数据
  */
 export declare class Parser {
-    private options;
     private textbus;
     static parseHTML(html: string): HTMLElement;
     componentLoaders: ComponentLoader[];
@@ -76,13 +75,13 @@ export declare class Parser {
      * @param html
      * @param rootComponentLoader
      */
-    parseDoc(html: string | HTMLElement, rootComponentLoader: ComponentLoader): void | Slot<any> | ComponentInstance<unknown, unknown, unknown>;
+    parseDoc(html: string | HTMLElement, rootComponentLoader: ComponentLoader): void | Slot | Component<import("@textbus/core").State>;
     /**
      * 将一段 HTML 或 DOM 元素解析到指定插槽
      * @param html
      * @param rootSlot
      */
-    parse(html: string | HTMLElement, rootSlot: Slot): Slot<any>;
+    parse(html: string | HTMLElement, rootSlot: Slot): Slot;
     private readComponent;
     private readText;
     private readFormats;

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/bundles/types.d.ts

@@ -1,15 +1,9 @@
-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;
@@ -18,13 +12,7 @@ export interface CaretPosition {
 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;
+    refresh(): void;
 }
 export declare abstract class Input {
     /**
@@ -34,7 +22,6 @@ export declare abstract class Input {
     /**
      * @experimental
      */
-    abstract compositionState: CompositionState | null;
     abstract onReady: Promise<void>;
     abstract caret: Caret;
     abstract disabled: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "4.0.0-alpha.8",
+  "version": "4.0.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,10 +25,10 @@
     "typescript editor"
   ],
   "dependencies": {
-    "@tanbo/stream": "^1.2.0",
-    "@textbus/core": "^4.0.0-alpha.8",
-    "@viewfly/core": "^0.3.0",
-    "reflect-metadata": "^0.1.13"
+    "@tanbo/stream": "^1.2.5",
+    "@textbus/collaborate": "^4.0.1",
+    "@textbus/core": "^4.0.1",
+    "@viewfly/core": "^1.0.0-alpha.22"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^23.0.2",
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "1bb613c7a7a24ee4611b96c632296debb13879f2"
+  "gitHead": "650431b993553439e58d48949bd9cadda23fb147"
 }