@textbus/platform-browser 4.0.0-alpha.5 → 4.0.0-alpha.50

package/bundles/magic-input.d.ts

@@ -1,22 +1,21 @@
 import { Observable } from '@tanbo/stream';
-import { Injector } from '@viewfly/core';
-import { Commander, Controller, Keyboard, Scheduler, Selection } from '@textbus/core';
+import { Commander, Controller, Keyboard, Scheduler, Selection, Textbus } from '@textbus/core';
 import { Parser } from './parser';
-import { Caret, CaretPosition, CompositionState, Input, Scroller } from './types';
+import { Caret, CaretPosition, Input, Scroller } 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;
     get rect(): DOMRect;
-    compositionElement: HTMLElement;
     private timer;
     private caret;
     private oldPosition;
@@ -30,7 +29,7 @@ declare class ExperimentalCaret implements Caret {
     private styleChangeEvent;
     private oldRange;
     private isFixed;
-    constructor(scheduler: Scheduler, editorMask: HTMLElement);
+    constructor(domRenderer: DomAdapter, scheduler: Scheduler, editorMask: HTMLElement);
     refresh(isFixedCaret?: boolean): void;
     show(range: Range, restart: boolean): void;
     hide(): void;
@@ -42,15 +41,15 @@ declare class ExperimentalCaret implements Caret {
  * Textbus PC 端输入实现
  */
 export declare class MagicInput extends Input {
+    private domAdapter;
     private parser;
     private keyboard;
     private commander;
     private selection;
     private controller;
     private scheduler;
-    private injector;
+    private textbus;
     composition: boolean;
-    compositionState: CompositionState | null;
     onReady: Promise<void>;
     caret: ExperimentalCaret;
     set disabled(b: boolean);
@@ -67,10 +66,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, injector: Injector);
+    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,7 +1,6 @@
-import { Injector } from '@viewfly/core';
 import { Observable } from '@tanbo/stream';
-import { Commander, Controller, Keyboard, Scheduler, Selection } from '@textbus/core';
-import { Caret, CaretPosition, CompositionState, Input, Scroller } from './types';
+import { Commander, Controller, Keyboard, Scheduler, Selection, Textbus } from '@textbus/core';
+import { Caret, CaretPosition, Input, Scroller } from './types';
 import { Parser } from './parser';
 import { DomAdapter } from './dom-adapter';
 declare class NativeCaret implements Caret {
@@ -29,7 +28,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;
@@ -42,7 +40,7 @@ export declare class NativeInput extends Input {
     private isMac;
     private isMobileBrowser;
     private ignoreComposition;
-    constructor(injector: Injector, 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/parser.d.ts

@@ -1,5 +1,4 @@
-import { Injector } from '@viewfly/core';
-import { Attribute, ComponentInstance, Formatter, FormatValue, Slot } from '@textbus/core';
+import { Attribute, Component, Formatter, FormatValue, Slot, Textbus } from '@textbus/core';
 import { ViewOptions } from './browser-module';
 /**
  * 插槽解析器
@@ -21,16 +20,16 @@ export interface ComponentLoader {
     /** 识别组件的匹配方法 */
     match(element: HTMLElement): boolean;
     /** 读取组件内容的方法 */
-    read(element: HTMLElement, injector: Injector, 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
@@ -42,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
@@ -66,24 +65,24 @@ export interface AttributeLoader<T extends FormatValue> {
  */
 export declare class Parser {
     private options;
-    private injector;
+    private textbus;
     static parseHTML(html: string): HTMLElement;
     componentLoaders: ComponentLoader[];
     formatLoaders: FormatLoader<any>[];
     attributeLoaders: AttributeLoader<any>[];
-    constructor(options: ViewOptions, injector: Injector);
+    constructor(options: ViewOptions, textbus: Textbus);
     /**
      * 使用指定的组件加载器解析一段 HTML 字符串或 DOM 元素
      * @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

@@ -1,10 +1,9 @@
 import { Observable } from '@tanbo/stream';
-import { Injector } from '@viewfly/core';
-import { NativeSelectionBridge, NativeSelectionConnector, SelectionPosition, AbstractSelection, RootComponentRef, Controller, Selection } from '@textbus/core';
+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 端选区桥接实现
  */
@@ -25,7 +24,7 @@ export declare class SelectionBridge implements NativeSelectionBridge {
     private docContainer;
     private cacheCaretPositionTimer;
     private oldCaretPosition;
-    constructor(config: ViewOptions, injector: Injector, 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,4 +1,3 @@
-import { Slot } from '@textbus/core';
 import { Observable } from '@tanbo/stream';
 import { Rect } from './_utils/uikit';
 export interface CaretLimit {
@@ -21,11 +20,6 @@ export interface Caret {
     refresh(isFixedCaret: boolean): void;
     correctScrollTop(scroller: Scroller): void;
 }
-export interface CompositionState {
-    slot: Slot;
-    index: number;
-    data: string;
-}
 export declare abstract class Input {
     /**
      * @experimental
@@ -34,7 +28,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.5",
+  "version": "4.0.0-alpha.50",
   "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,10 @@
     "typescript editor"
   ],
   "dependencies": {
-    "@tanbo/stream": "^1.2.0",
-    "@textbus/core": "^4.0.0-alpha.5",
-    "@viewfly/core": "^0.2.4",
+    "@tanbo/stream": "^1.2.3",
+    "@textbus/collaborate": "^4.0.0-alpha.50",
+    "@textbus/core": "^4.0.0-alpha.50",
+    "@viewfly/core": "^1.0.0-alpha.4",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -48,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "072831527fe07e7c21a14f3141d55b24d321a690"
+  "gitHead": "a7918554368f01ea704bedb8750a7513602aae49"
 }