@textbus/platform-browser 4.0.0-alpha.52 → 4.0.0-alpha.54

package/bundles/index.esm.js

@@ -168,7 +168,6 @@ let Parser = Parser_1 = class Parser {
         return new DOMParser().parseFromString(html, 'text/html').body;
     }
     constructor(options, textbus) {
-        this.options = options;
         this.textbus = textbus;
         const componentLoaders = [
             ...(options.componentLoaders || [])
@@ -213,8 +212,9 @@ let Parser = Parser_1 = class Parser {
                 slot.insert('\n');
                 return;
             }
+            const schema = [...slot.schema];
             for (const t of this.componentLoaders) {
-                if (t.match(el)) {
+                if (t.match(el, schema)) {
                     const result = t.read(el, this.textbus, (childSlot, slotRootElement, slotContentHostElement = slotRootElement) => {
                         return this.readSlot(childSlot, slotRootElement, slotContentHostElement);
                     });
@@ -911,16 +911,20 @@ class ExperimentalCaret {
         this.domRenderer = domRenderer;
         this.scheduler = scheduler;
         this.editorMask = editorMask;
+        this.changeFromSelf = false;
+        this.getLimit = function () {
+            return {
+                top: 0,
+                bottom: document.documentElement.clientHeight
+            };
+        };
         this.timer = null;
-        this.oldPosition = null;
         this._display = true;
         this.flashing = true;
-        this.subs = [];
         this.subscription = new Subscription();
         this.positionChangeEvent = new Subject();
         this.styleChangeEvent = new Subject();
         this.oldRange = null;
-        this.isFixed = false;
         this.onPositionChange = this.positionChangeEvent.pipe(distinctUntilChanged());
         this.onStyleChange = this.styleChangeEvent.asObservable();
         this.elementRef = createElement('div', {
@@ -948,20 +952,12 @@ class ExperimentalCaret {
         }));
         this.editorMask.appendChild(this.elementRef);
     }
-    refresh(isFixedCaret = false) {
-        this.isFixed = isFixedCaret;
+    refresh() {
         if (this.oldRange) {
             this.show(this.oldRange, false);
         }
-        this.isFixed = false;
     }
     show(range, restart) {
-        const oldRect = this.elementRef.getBoundingClientRect();
-        this.oldPosition = {
-            top: oldRect.top,
-            left: oldRect.left,
-            height: oldRect.height
-        };
         this.oldRange = range;
         if (restart || this.scheduler.lastChangesHasLocalUpdate) {
             clearTimeout(this.timer);
@@ -991,61 +987,6 @@ class ExperimentalCaret {
     destroy() {
         clearTimeout(this.timer);
         this.subscription.unsubscribe();
-        this.subs.forEach(i => i.unsubscribe());
-    }
-    correctScrollTop(scroller) {
-        this.subs.forEach(i => i.unsubscribe());
-        this.subs = [];
-        const scheduler = this.scheduler;
-        let docIsChanged = true;
-        function limitPosition(position) {
-            const { top, bottom } = scroller.getLimit();
-            const caretTop = position.top;
-            if (caretTop + position.height > bottom) {
-                const offset = caretTop - bottom + position.height;
-                scroller.setOffset(offset);
-            }
-            else if (position.top < top) {
-                scroller.setOffset(-(top - position.top));
-            }
-        }
-        let isPressed = false;
-        this.subs.push(scroller.onScroll.subscribe(() => {
-            if (this.oldPosition) {
-                const rect = this.rect;
-                this.oldPosition.top = rect.top;
-                this.oldPosition.left = rect.left;
-                this.oldPosition.height = rect.height;
-            }
-        }), fromEvent(document, 'mousedown', true).subscribe(() => {
-            isPressed = true;
-        }), fromEvent(document, 'mouseup', true).subscribe(() => {
-            isPressed = false;
-        }), scheduler.onDocChange.subscribe(() => {
-            docIsChanged = true;
-        }), this.onPositionChange.subscribe(position => {
-            if (position) {
-                if (docIsChanged) {
-                    if (scheduler.lastChangesHasLocalUpdate) {
-                        limitPosition(position);
-                    }
-                    else if (this.oldPosition) {
-                        const offset = Math.floor(position.top - this.oldPosition.top);
-                        scroller.setOffset(offset);
-                    }
-                }
-                else if (!isPressed) {
-                    if (this.isFixed && this.oldPosition) {
-                        const offset = Math.floor(position.top - this.oldPosition.top);
-                        scroller.setOffset(offset);
-                    }
-                    else {
-                        limitPosition(position);
-                    }
-                }
-            }
-            docIsChanged = false;
-        }));
     }
     updateCursorPosition(nativeRange) {
         const startContainer = nativeRange.startContainer;
@@ -1103,6 +1044,21 @@ class ExperimentalCaret {
             top: rectTop,
             height: boxHeight
         });
+        if (this.changeFromSelf) {
+            this.changeFromSelf = false;
+            const selfRect = this.elementRef.getBoundingClientRect();
+            const limit = this.getLimit();
+            if (selfRect.top < limit.top) {
+                this.elementRef.scrollIntoView({
+                    block: 'start'
+                });
+            }
+            else if (selfRect.bottom > limit.bottom) {
+                this.elementRef.scrollIntoView({
+                    block: 'end'
+                });
+            }
+        }
     }
 }
 /**
@@ -1324,6 +1280,7 @@ let MagicInput = class MagicInput extends Input {
                 key = keys.charAt(+ev.code.substring(5));
                 ev.preventDefault();
             }
+            this.caret.changeFromSelf = true;
             const is = this.keyboard.execShortcut({
                 key: key,
                 altKey: ev.altKey,
@@ -1334,6 +1291,9 @@ let MagicInput = class MagicInput extends Input {
                 this.ignoreComposition = true;
                 ev.preventDefault();
             }
+            else {
+                this.caret.changeFromSelf = false;
+            }
         }));
     }
     handleInput(textarea) {
@@ -1342,6 +1302,7 @@ let MagicInput = class MagicInput extends Input {
             return !this.ignoreComposition;
         })).subscribe(() => {
             if (!this.selection.isCollapsed) {
+                this.caret.changeFromSelf = true;
                 this.commander.delete();
             }
             this.composition = true;
@@ -1367,7 +1328,8 @@ let MagicInput = class MagicInput extends Input {
                 offset: ev.data.length,
                 index: startIndex
             };
-            this.caret.refresh(true);
+            this.caret.changeFromSelf = true;
+            this.caret.refresh();
             const event = new Event(startSlot, {
                 index: startIndex,
                 data: ev.data
@@ -1401,6 +1363,7 @@ let MagicInput = class MagicInput extends Input {
             this.composition = false;
             this.domAdapter.composition = null;
             if (text) {
+                this.caret.changeFromSelf = true;
                 this.commander.write(text);
             }
             else {
@@ -1755,9 +1718,7 @@ class NativeCaret {
             height: 0
         };
     }
-    constructor(scheduler) {
-        this.scheduler = scheduler;
-        this.oldPosition = null;
+    constructor() {
         this._nativeRange = null;
         this.subs = [];
         this.positionChangeEvent = new Subject();
@@ -1766,59 +1727,6 @@ class NativeCaret {
     refresh() {
         //
     }
-    correctScrollTop(scroller) {
-        this.destroy();
-        const scheduler = this.scheduler;
-        let docIsChanged = true;
-        function limitPosition(position) {
-            const { top, bottom } = scroller.getLimit();
-            const caretTop = position.top;
-            if (caretTop + position.height > bottom) {
-                const offset = caretTop - bottom + position.height;
-                scroller.setOffset(offset);
-            }
-            else if (position.top < top) {
-                scroller.setOffset(-(top - position.top));
-            }
-        }
-        let isPressed = false;
-        this.subs.push(scroller.onScroll.subscribe(() => {
-            if (this.oldPosition) {
-                const rect = this.rect;
-                this.oldPosition.top = rect.top;
-                this.oldPosition.left = rect.left;
-                this.oldPosition.height = rect.height;
-            }
-        }), fromEvent(document, 'mousedown', true).subscribe(() => {
-            isPressed = true;
-        }), fromEvent(document, 'mouseup', true).subscribe(() => {
-            isPressed = false;
-        }), scheduler.onDocChange.subscribe(() => {
-            docIsChanged = true;
-        }), this.onPositionChange.subscribe(position => {
-            if (position) {
-                if (docIsChanged) {
-                    if (scheduler.lastChangesHasLocalUpdate) {
-                        limitPosition(position);
-                    }
-                    else if (this.oldPosition) {
-                        const offset = Math.floor(position.top - this.oldPosition.top);
-                        scroller.setOffset(offset);
-                    }
-                }
-                else if (!isPressed) {
-                    if (this.oldPosition) {
-                        const offset = Math.floor(position.top - this.oldPosition.top);
-                        scroller.setOffset(offset);
-                    }
-                    else {
-                        limitPosition(position);
-                    }
-                }
-            }
-            docIsChanged = false;
-        }));
-    }
     destroy() {
         this.subs.forEach(i => i.unsubscribe());
         this.subs = [];
@@ -1836,16 +1744,15 @@ let NativeInput = class NativeInput extends Input {
     get disabled() {
         return this._disabled;
     }
-    constructor(textbus, parser, scheduler, selection, keyboard, domAdapter, commander, controller) {
+    constructor(textbus, parser, selection, keyboard, domAdapter, commander, controller) {
         super();
         this.parser = parser;
-        this.scheduler = scheduler;
         this.selection = selection;
         this.keyboard = keyboard;
         this.domAdapter = domAdapter;
         this.commander = commander;
         this.controller = controller;
-        this.caret = new NativeCaret(this.scheduler);
+        this.caret = new NativeCaret();
         this.composition = false;
         // compositionState: CompositionState | null = null
         this.onReady = Promise.resolve();
@@ -2177,7 +2084,6 @@ NativeInput = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [Textbus,
         Parser,
-        Scheduler,
         Selection,
         Keyboard,
         DomAdapter,
@@ -2296,11 +2202,24 @@ class BrowserModule {
                 right: 0,
                 top: 0,
                 bottom: 0,
-                zIndex: 1,
                 pointerEvents: 'none',
                 // overflow: 'hidden'
             }
         });
+        const maskWrapper = createElement('div', {
+            styles: {
+                position: 'absolute',
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0,
+                margin: '0 -2px',
+                zIndex: 1,
+                pointerEvents: 'none',
+                overflow: 'hidden'
+            },
+            children: [mask]
+        });
         const wrapper = createElement('div', {
             attrs: {
                 'data-textbus-view': VIEW_CONTAINER,
@@ -2311,7 +2230,7 @@ class BrowserModule {
                 position: 'relative',
                 flexDirection: 'column'
             },
-            children: [mask]
+            children: [maskWrapper]
         });
         return {
             wrapper,

package/bundles/index.js

@@ -170,7 +170,6 @@ exports.Parser = Parser_1 = class Parser {
         return new DOMParser().parseFromString(html, 'text/html').body;
     }
     constructor(options, textbus) {
-        this.options = options;
         this.textbus = textbus;
         const componentLoaders = [
             ...(options.componentLoaders || [])
@@ -215,8 +214,9 @@ exports.Parser = Parser_1 = class Parser {
                 slot.insert('\n');
                 return;
             }
+            const schema = [...slot.schema];
             for (const t of this.componentLoaders) {
-                if (t.match(el)) {
+                if (t.match(el, schema)) {
                     const result = t.read(el, this.textbus, (childSlot, slotRootElement, slotContentHostElement = slotRootElement) => {
                         return this.readSlot(childSlot, slotRootElement, slotContentHostElement);
                     });
@@ -913,16 +913,20 @@ class ExperimentalCaret {
         this.domRenderer = domRenderer;
         this.scheduler = scheduler;
         this.editorMask = editorMask;
+        this.changeFromSelf = false;
+        this.getLimit = function () {
+            return {
+                top: 0,
+                bottom: document.documentElement.clientHeight
+            };
+        };
         this.timer = null;
-        this.oldPosition = null;
         this._display = true;
         this.flashing = true;
-        this.subs = [];
         this.subscription = new stream.Subscription();
         this.positionChangeEvent = new stream.Subject();
         this.styleChangeEvent = new stream.Subject();
         this.oldRange = null;
-        this.isFixed = false;
         this.onPositionChange = this.positionChangeEvent.pipe(stream.distinctUntilChanged());
         this.onStyleChange = this.styleChangeEvent.asObservable();
         this.elementRef = createElement('div', {
@@ -950,20 +954,12 @@ class ExperimentalCaret {
         }));
         this.editorMask.appendChild(this.elementRef);
     }
-    refresh(isFixedCaret = false) {
-        this.isFixed = isFixedCaret;
+    refresh() {
         if (this.oldRange) {
             this.show(this.oldRange, false);
         }
-        this.isFixed = false;
     }
     show(range, restart) {
-        const oldRect = this.elementRef.getBoundingClientRect();
-        this.oldPosition = {
-            top: oldRect.top,
-            left: oldRect.left,
-            height: oldRect.height
-        };
         this.oldRange = range;
         if (restart || this.scheduler.lastChangesHasLocalUpdate) {
             clearTimeout(this.timer);
@@ -993,61 +989,6 @@ class ExperimentalCaret {
     destroy() {
         clearTimeout(this.timer);
         this.subscription.unsubscribe();
-        this.subs.forEach(i => i.unsubscribe());
-    }
-    correctScrollTop(scroller) {
-        this.subs.forEach(i => i.unsubscribe());
-        this.subs = [];
-        const scheduler = this.scheduler;
-        let docIsChanged = true;
-        function limitPosition(position) {
-            const { top, bottom } = scroller.getLimit();
-            const caretTop = position.top;
-            if (caretTop + position.height > bottom) {
-                const offset = caretTop - bottom + position.height;
-                scroller.setOffset(offset);
-            }
-            else if (position.top < top) {
-                scroller.setOffset(-(top - position.top));
-            }
-        }
-        let isPressed = false;
-        this.subs.push(scroller.onScroll.subscribe(() => {
-            if (this.oldPosition) {
-                const rect = this.rect;
-                this.oldPosition.top = rect.top;
-                this.oldPosition.left = rect.left;
-                this.oldPosition.height = rect.height;
-            }
-        }), stream.fromEvent(document, 'mousedown', true).subscribe(() => {
-            isPressed = true;
-        }), stream.fromEvent(document, 'mouseup', true).subscribe(() => {
-            isPressed = false;
-        }), scheduler.onDocChange.subscribe(() => {
-            docIsChanged = true;
-        }), this.onPositionChange.subscribe(position => {
-            if (position) {
-                if (docIsChanged) {
-                    if (scheduler.lastChangesHasLocalUpdate) {
-                        limitPosition(position);
-                    }
-                    else if (this.oldPosition) {
-                        const offset = Math.floor(position.top - this.oldPosition.top);
-                        scroller.setOffset(offset);
-                    }
-                }
-                else if (!isPressed) {
-                    if (this.isFixed && this.oldPosition) {
-                        const offset = Math.floor(position.top - this.oldPosition.top);
-                        scroller.setOffset(offset);
-                    }
-                    else {
-                        limitPosition(position);
-                    }
-                }
-            }
-            docIsChanged = false;
-        }));
     }
     updateCursorPosition(nativeRange) {
         const startContainer = nativeRange.startContainer;
@@ -1105,6 +1046,21 @@ class ExperimentalCaret {
             top: rectTop,
             height: boxHeight
         });
+        if (this.changeFromSelf) {
+            this.changeFromSelf = false;
+            const selfRect = this.elementRef.getBoundingClientRect();
+            const limit = this.getLimit();
+            if (selfRect.top < limit.top) {
+                this.elementRef.scrollIntoView({
+                    block: 'start'
+                });
+            }
+            else if (selfRect.bottom > limit.bottom) {
+                this.elementRef.scrollIntoView({
+                    block: 'end'
+                });
+            }
+        }
     }
 }
 /**
@@ -1326,6 +1282,7 @@ exports.MagicInput = class MagicInput extends Input {
                 key = keys.charAt(+ev.code.substring(5));
                 ev.preventDefault();
             }
+            this.caret.changeFromSelf = true;
             const is = this.keyboard.execShortcut({
                 key: key,
                 altKey: ev.altKey,
@@ -1336,6 +1293,9 @@ exports.MagicInput = class MagicInput extends Input {
                 this.ignoreComposition = true;
                 ev.preventDefault();
             }
+            else {
+                this.caret.changeFromSelf = false;
+            }
         }));
     }
     handleInput(textarea) {
@@ -1344,6 +1304,7 @@ exports.MagicInput = class MagicInput extends Input {
             return !this.ignoreComposition;
         })).subscribe(() => {
             if (!this.selection.isCollapsed) {
+                this.caret.changeFromSelf = true;
                 this.commander.delete();
             }
             this.composition = true;
@@ -1369,7 +1330,8 @@ exports.MagicInput = class MagicInput extends Input {
                 offset: ev.data.length,
                 index: startIndex
             };
-            this.caret.refresh(true);
+            this.caret.changeFromSelf = true;
+            this.caret.refresh();
             const event = new core$1.Event(startSlot, {
                 index: startIndex,
                 data: ev.data
@@ -1403,6 +1365,7 @@ exports.MagicInput = class MagicInput extends Input {
             this.composition = false;
             this.domAdapter.composition = null;
             if (text) {
+                this.caret.changeFromSelf = true;
                 this.commander.write(text);
             }
             else {
@@ -1757,9 +1720,7 @@ class NativeCaret {
             height: 0
         };
     }
-    constructor(scheduler) {
-        this.scheduler = scheduler;
-        this.oldPosition = null;
+    constructor() {
         this._nativeRange = null;
         this.subs = [];
         this.positionChangeEvent = new stream.Subject();
@@ -1768,59 +1729,6 @@ class NativeCaret {
     refresh() {
         //
     }
-    correctScrollTop(scroller) {
-        this.destroy();
-        const scheduler = this.scheduler;
-        let docIsChanged = true;
-        function limitPosition(position) {
-            const { top, bottom } = scroller.getLimit();
-            const caretTop = position.top;
-            if (caretTop + position.height > bottom) {
-                const offset = caretTop - bottom + position.height;
-                scroller.setOffset(offset);
-            }
-            else if (position.top < top) {
-                scroller.setOffset(-(top - position.top));
-            }
-        }
-        let isPressed = false;
-        this.subs.push(scroller.onScroll.subscribe(() => {
-            if (this.oldPosition) {
-                const rect = this.rect;
-                this.oldPosition.top = rect.top;
-                this.oldPosition.left = rect.left;
-                this.oldPosition.height = rect.height;
-            }
-        }), stream.fromEvent(document, 'mousedown', true).subscribe(() => {
-            isPressed = true;
-        }), stream.fromEvent(document, 'mouseup', true).subscribe(() => {
-            isPressed = false;
-        }), scheduler.onDocChange.subscribe(() => {
-            docIsChanged = true;
-        }), this.onPositionChange.subscribe(position => {
-            if (position) {
-                if (docIsChanged) {
-                    if (scheduler.lastChangesHasLocalUpdate) {
-                        limitPosition(position);
-                    }
-                    else if (this.oldPosition) {
-                        const offset = Math.floor(position.top - this.oldPosition.top);
-                        scroller.setOffset(offset);
-                    }
-                }
-                else if (!isPressed) {
-                    if (this.oldPosition) {
-                        const offset = Math.floor(position.top - this.oldPosition.top);
-                        scroller.setOffset(offset);
-                    }
-                    else {
-                        limitPosition(position);
-                    }
-                }
-            }
-            docIsChanged = false;
-        }));
-    }
     destroy() {
         this.subs.forEach(i => i.unsubscribe());
         this.subs = [];
@@ -1838,16 +1746,15 @@ exports.NativeInput = class NativeInput extends Input {
     get disabled() {
         return this._disabled;
     }
-    constructor(textbus, parser, scheduler, selection, keyboard, domAdapter, commander, controller) {
+    constructor(textbus, parser, selection, keyboard, domAdapter, commander, controller) {
         super();
         this.parser = parser;
-        this.scheduler = scheduler;
         this.selection = selection;
         this.keyboard = keyboard;
         this.domAdapter = domAdapter;
         this.commander = commander;
         this.controller = controller;
-        this.caret = new NativeCaret(this.scheduler);
+        this.caret = new NativeCaret();
         this.composition = false;
         // compositionState: CompositionState | null = null
         this.onReady = Promise.resolve();
@@ -2179,7 +2086,6 @@ exports.NativeInput = __decorate([
     core.Injectable(),
     __metadata("design:paramtypes", [core$1.Textbus,
         exports.Parser,
-        core$1.Scheduler,
         core$1.Selection,
         core$1.Keyboard,
         DomAdapter,
@@ -2298,11 +2204,24 @@ class BrowserModule {
                 right: 0,
                 top: 0,
                 bottom: 0,
-                zIndex: 1,
                 pointerEvents: 'none',
                 // overflow: 'hidden'
             }
         });
+        const maskWrapper = createElement('div', {
+            styles: {
+                position: 'absolute',
+                left: 0,
+                right: 0,
+                top: 0,
+                bottom: 0,
+                margin: '0 -2px',
+                zIndex: 1,
+                pointerEvents: 'none',
+                overflow: 'hidden'
+            },
+            children: [mask]
+        });
         const wrapper = createElement('div', {
             attrs: {
                 'data-textbus-view': VIEW_CONTAINER,
@@ -2313,7 +2232,7 @@ class BrowserModule {
                 position: 'relative',
                 flexDirection: 'column'
             },
-            children: [mask]
+            children: [maskWrapper]
         });
         return {
             wrapper,

package/bundles/magic-input.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from '@tanbo/stream';
 import { Commander, Controller, Keyboard, Scheduler, Selection, Textbus } from '@textbus/core';
 import { Parser } from './parser';
-import { Caret, CaretPosition, Input, Scroller } from './types';
+import { Caret, CaretLimit, CaretPosition, Input } from './types';
 import { DomAdapter } from './dom-adapter';
 interface CaretStyle {
     height: string;
@@ -15,26 +15,24 @@ declare class ExperimentalCaret implements Caret {
     onPositionChange: Observable<CaretPosition | null>;
     onStyleChange: Observable<CaretStyle>;
     elementRef: HTMLElement;
+    changeFromSelf: boolean;
+    getLimit: () => CaretLimit;
     get rect(): DOMRect;
     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(domRenderer: DomAdapter, scheduler: Scheduler, editorMask: HTMLElement);
-    refresh(isFixedCaret?: boolean): void;
+    refresh(): void;
     show(range: Range, restart: boolean): void;
     hide(): void;
     destroy(): void;
-    correctScrollTop(scroller: Scroller): void;
     private updateCursorPosition;
 }
 /**

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, 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;
@@ -40,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, 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, Component, Formatter, FormatValue, Slot, Textbus } from '@textbus/core';
+import { Attribute, Component, ContentType, Formatter, FormatValue, Slot, Textbus } from '@textbus/core';
 import { ViewOptions } from './browser-module';
 /**
  * 插槽解析器
@@ -18,7 +18,7 @@ export interface SlotParser {
  */
 export interface ComponentLoader {
     /** 识别组件的匹配方法 */
-    match(element: HTMLElement): boolean;
+    match(element: HTMLElement, returnableContentTypes: ContentType[]): boolean;
     /** 读取组件内容的方法 */
     read(element: HTMLElement, textbus: Textbus, slotParser: SlotParser): Component | Slot | void;
 }
@@ -64,7 +64,6 @@ export interface AttributeLoader<T = FormatValue> {
  * 用于解析 HTML，并把 HTML 内容转换为 Textbus 可以支持的组件或插槽数据
  */
 export declare class Parser {
-    private options;
     private textbus;
     static parseHTML(html: string): HTMLElement;
     componentLoaders: ComponentLoader[];

package/bundles/types.d.ts

@@ -4,11 +4,6 @@ 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;
@@ -17,8 +12,7 @@ export interface CaretPosition {
 export interface Caret {
     onPositionChange: Observable<CaretPosition | null>;
     readonly rect: Rect;
-    refresh(isFixedCaret: boolean): void;
-    correctScrollTop(scroller: Scroller): void;
+    refresh(): void;
 }
 export declare abstract class Input {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "4.0.0-alpha.52",
+  "version": "4.0.0-alpha.54",
   "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,9 +26,9 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.4",
-    "@textbus/collaborate": "^4.0.0-alpha.52",
-    "@textbus/core": "^4.0.0-alpha.52",
-    "@viewfly/core": "^1.0.0-alpha.4",
+    "@textbus/collaborate": "^4.0.0-alpha.54",
+    "@textbus/core": "^4.0.0-alpha.54",
+    "@viewfly/core": "^1.0.0-alpha.5",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -49,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "c32fdbd9a1a03585b408297efc3c5414b3be5559"
+  "gitHead": "2797081feb8bf81936f41778775c9eb2dae35e59"
 }