@textbus/platform-browser 3.0.0-alpha.50 → 3.0.0-alpha.51

package/bundles/collaborate/collaborate-cursor.d.ts

@@ -1,5 +1,5 @@
 import { Injector } from '@tanbo/di';
-import { Selection, SelectionPaths, AbstractSelection, Scheduler } from '@textbus/core';
+import { Selection, SelectionPaths, AbstractSelection, Renderer } from '@textbus/core';
 import { SelectionBridge } from '../core/selection-bridge';
 import { Rect } from '../_utils/uikit';
 export interface RemoteSelection {
@@ -24,7 +24,7 @@ export declare abstract class CollaborateSelectionAwarenessDelegate {
 export declare class CollaborateCursor {
     private injector;
     private nativeSelection;
-    private scheduler;
+    private renderer;
     private selection;
     private awarenessDelegate?;
     private host;
@@ -36,7 +36,7 @@ export declare class CollaborateCursor {
     private subscription;
     private currentSelection;
     private container;
-    constructor(injector: Injector, nativeSelection: SelectionBridge, scheduler: Scheduler, selection: Selection, awarenessDelegate?: CollaborateSelectionAwarenessDelegate | undefined);
+    constructor(injector: Injector, nativeSelection: SelectionBridge, renderer: Renderer, selection: Selection, awarenessDelegate?: CollaborateSelectionAwarenessDelegate | undefined);
     refresh(): void;
     destroy(): void;
     draw(paths: RemoteSelection[]): void;

package/bundles/core/magic-input.d.ts

@@ -10,7 +10,6 @@ interface CaretStyle {
 }
 interface CompositionState {
     slot: Slot;
-    index: number;
     data: string;
 }
 declare class ExperimentalCaret implements Caret {

package/bundles/index.esm.js

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import { InjectionToken, Injectable, Inject, Injector, Optional } from '@tanbo/di';
-import { VTextNode, VElement, Controller, Selection, RootComponentRef, Renderer, Scheduler, Slot, ContentType, Keyboard, Commander, makeError, Starter, NativeRenderer, NativeSelectionBridge, OutputRenderer, Registry, invokeListener, History } from '@textbus/core';
+import { VTextNode, VElement, Controller, Selection, RootComponentRef, Renderer, Slot, ContentType, Keyboard, Commander, Scheduler, makeError, Starter, NativeRenderer, NativeSelectionBridge, OutputRenderer, Registry, invokeListener, History } from '@textbus/core';
 import { Subject, filter, fromEvent, Subscription, merge, map, Observable, distinctUntilChanged } from '@tanbo/stream';
 
 function createElement(tagName, options = {}) {
@@ -59,8 +59,8 @@ function getLayoutRectByRange(range) {
         }
         else if (beforeNode.nodeType === Node.TEXT_NODE) {
             const range2 = document.createRange();
-            range2.setStart(beforeNode, beforeNode.textContent.length);
-            range2.setEnd(beforeNode, beforeNode.textContent.length);
+            range2.selectNodeContents(beforeNode);
+            range2.collapse();
             return range2.getBoundingClientRect();
         }
     }
@@ -776,10 +776,10 @@ SelectionBridge = __decorate([
 class CollaborateSelectionAwarenessDelegate {
 }
 let CollaborateCursor = class CollaborateCursor {
-    constructor(injector, nativeSelection, scheduler, selection, awarenessDelegate) {
+    constructor(injector, nativeSelection, renderer, selection, awarenessDelegate) {
         this.injector = injector;
         this.nativeSelection = nativeSelection;
-        this.scheduler = scheduler;
+        this.renderer = renderer;
         this.selection = selection;
         this.awarenessDelegate = awarenessDelegate;
         this.host = createElement('div', {
@@ -845,7 +845,7 @@ let CollaborateCursor = class CollaborateCursor {
         }), fromEvent(window, 'resize').subscribe(() => {
             this.canvas.style.height = document.documentElement.clientHeight + 'px';
             this.refresh();
-        }), this.scheduler.onDocChanged.subscribe(() => {
+        }), this.renderer.onViewUpdated.subscribe(() => {
             this.refresh();
         }));
     }
@@ -1017,7 +1017,7 @@ CollaborateCursor = __decorate([
     __param(4, Optional()),
     __metadata("design:paramtypes", [Injector,
         SelectionBridge,
-        Scheduler,
+        Renderer,
         Selection,
         CollaborateSelectionAwarenessDelegate])
 ], CollaborateCursor);
@@ -1767,16 +1767,17 @@ let MagicInput = class MagicInput extends Input {
         }));
     }
     handleInput(textarea) {
-        let startIndex = 0;
-        this.subscription.add(fromEvent(textarea, 'compositionstart').subscribe(() => {
-            startIndex = this.selection.startOffset;
-        }), fromEvent(textarea, 'compositionupdate').subscribe(ev => {
+        this.subscription.add(fromEvent(textarea, 'compositionupdate').subscribe(ev => {
+            if (ev.data === ' ') {
+                // 处理搜狗五笔不符合 composition 事件预期，会意外跳光标的问题
+                return;
+            }
+            const slot = this.selection.startSlot;
             this.caret.compositionState = {
-                slot: this.selection.startSlot,
-                index: startIndex,
+                slot,
                 data: ev.data
             };
-            this.caret.refresh(true);
+            slot.changeMarker.forceMarkDirtied();
         }), fromEvent(textarea, 'compositionend').subscribe(() => {
             this.caret.compositionState = null;
         }));

package/bundles/index.js

@@ -61,8 +61,8 @@ function getLayoutRectByRange(range) {
         }
         else if (beforeNode.nodeType === Node.TEXT_NODE) {
             const range2 = document.createRange();
-            range2.setStart(beforeNode, beforeNode.textContent.length);
-            range2.setEnd(beforeNode, beforeNode.textContent.length);
+            range2.selectNodeContents(beforeNode);
+            range2.collapse();
             return range2.getBoundingClientRect();
         }
     }
@@ -778,10 +778,10 @@ exports.SelectionBridge = __decorate([
 class CollaborateSelectionAwarenessDelegate {
 }
 exports.CollaborateCursor = class CollaborateCursor {
-    constructor(injector, nativeSelection, scheduler, selection, awarenessDelegate) {
+    constructor(injector, nativeSelection, renderer, selection, awarenessDelegate) {
         this.injector = injector;
         this.nativeSelection = nativeSelection;
-        this.scheduler = scheduler;
+        this.renderer = renderer;
         this.selection = selection;
         this.awarenessDelegate = awarenessDelegate;
         this.host = createElement('div', {
@@ -847,7 +847,7 @@ exports.CollaborateCursor = class CollaborateCursor {
         }), stream.fromEvent(window, 'resize').subscribe(() => {
             this.canvas.style.height = document.documentElement.clientHeight + 'px';
             this.refresh();
-        }), this.scheduler.onDocChanged.subscribe(() => {
+        }), this.renderer.onViewUpdated.subscribe(() => {
             this.refresh();
         }));
     }
@@ -1019,7 +1019,7 @@ exports.CollaborateCursor = __decorate([
     __param(4, di.Optional()),
     __metadata("design:paramtypes", [di.Injector,
         exports.SelectionBridge,
-        core.Scheduler,
+        core.Renderer,
         core.Selection,
         CollaborateSelectionAwarenessDelegate])
 ], exports.CollaborateCursor);
@@ -1769,16 +1769,17 @@ exports.MagicInput = class MagicInput extends Input {
         }));
     }
     handleInput(textarea) {
-        let startIndex = 0;
-        this.subscription.add(stream.fromEvent(textarea, 'compositionstart').subscribe(() => {
-            startIndex = this.selection.startOffset;
-        }), stream.fromEvent(textarea, 'compositionupdate').subscribe(ev => {
+        this.subscription.add(stream.fromEvent(textarea, 'compositionupdate').subscribe(ev => {
+            if (ev.data === ' ') {
+                // 处理搜狗五笔不符合 composition 事件预期，会意外跳光标的问题
+                return;
+            }
+            const slot = this.selection.startSlot;
             this.caret.compositionState = {
-                slot: this.selection.startSlot,
-                index: startIndex,
+                slot,
                 data: ev.data
             };
-            this.caret.refresh(true);
+            slot.changeMarker.forceMarkDirtied();
         }), stream.fromEvent(textarea, 'compositionend').subscribe(() => {
             this.caret.compositionState = null;
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.0.0-alpha.50",
+  "version": "3.0.0-alpha.51",
   "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",
@@ -27,7 +27,7 @@
   "dependencies": {
     "@tanbo/di": "^1.1.4",
     "@tanbo/stream": "^1.1.9",
-    "@textbus/core": "^3.0.0-alpha.50",
+    "@textbus/core": "^3.0.0-alpha.51",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "ad396a0f17fc18d1eaddd2532f223c1252cf5d6f"
+  "gitHead": "4f2557bae5aa8800130c827f502d4439bddb1ff4"
 }