@textbus/platform-browser 3.0.0-alpha.49 → 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

@@ -1,6 +1,6 @@
 import { Observable } from '@tanbo/stream';
 import { Injector } from '@tanbo/di';
-import { Commander, Controller, Keyboard, Scheduler, Selection } from '@textbus/core';
+import { Commander, Controller, Keyboard, Scheduler, Selection, Slot } from '@textbus/core';
 import { Parser } from '../dom-support/parser';
 import { Caret, CaretPosition, Input, Scroller } from './types';
 interface CaretStyle {
@@ -8,12 +8,17 @@ interface CaretStyle {
     lineHeight: string;
     fontSize: string;
 }
+interface CompositionState {
+    slot: Slot;
+    data: string;
+}
 declare class ExperimentalCaret implements Caret {
     private scheduler;
     private editorMask;
     onPositionChange: Observable<CaretPosition | null>;
     onStyleChange: Observable<CaretStyle>;
     elementRef: HTMLElement;
+    compositionState: CompositionState | null;
     get rect(): DOMRect;
     private timer;
     private caret;
@@ -27,6 +32,7 @@ declare class ExperimentalCaret implements Caret {
     private styleChangeEvent;
     private oldRange;
     private isFixed;
+    private compositionElement;
     constructor(scheduler: Scheduler, editorMask: HTMLElement);
     refresh(isFixedCaret?: boolean): void;
     show(range: Range, restart: boolean): void;
@@ -51,6 +57,9 @@ export declare class MagicInput extends Input {
     caret: ExperimentalCaret;
     set disabled(b: boolean);
     get disabled(): boolean;
+    private isSafari;
+    private isMac;
+    private isWindows;
     private _disabled;
     private container;
     private subscription;
@@ -58,9 +67,6 @@ export declare class MagicInput extends Input {
     private textarea;
     private isFocus;
     private nativeFocus;
-    private isSafari;
-    private isMac;
-    private isWindows;
     private isSougouPinYin;
     constructor(parser: Parser, keyboard: Keyboard, commander: Commander, selection: Selection, controller: Controller, scheduler: Scheduler, injector: Injector);
     focus(range: Range, restart: boolean): void;

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);
@@ -1361,6 +1361,7 @@ class ExperimentalCaret {
     constructor(scheduler, editorMask) {
         this.scheduler = scheduler;
         this.editorMask = editorMask;
+        this.compositionState = null;
         this.timer = null;
         this.oldPosition = null;
         this._display = true;
@@ -1370,6 +1371,11 @@ class ExperimentalCaret {
         this.styleChangeEvent = new Subject();
         this.oldRange = null;
         this.isFixed = false;
+        this.compositionElement = createElement('span', {
+            styles: {
+                textDecoration: 'underline'
+            }
+        });
         this.onPositionChange = this.positionChangeEvent.pipe(distinctUntilChanged());
         this.onStyleChange = this.styleChangeEvent.asObservable();
         this.elementRef = createElement('div', {
@@ -1502,6 +1508,14 @@ class ExperimentalCaret {
             this.positionChangeEvent.next(null);
             return;
         }
+        if (this.compositionState) {
+            const compositionElement = this.compositionElement;
+            compositionElement.innerText = this.compositionState.data;
+            nativeRange = nativeRange.cloneRange();
+            nativeRange.insertNode(compositionElement);
+            nativeRange.selectNodeContents(compositionElement);
+            nativeRange.collapse();
+        }
         const rect = getLayoutRectByRange(nativeRange);
         const { fontSize, lineHeight, color } = getComputedStyle(node);
         let height;
@@ -1571,15 +1585,15 @@ let MagicInput = class MagicInput extends Input {
         this.injector = injector;
         this.composition = false;
         this.caret = new ExperimentalCaret(this.scheduler, this.injector.get(VIEW_MASK));
+        this.isSafari = isSafari();
+        this.isMac = isMac();
+        this.isWindows = isWindows();
         this._disabled = false;
         this.container = this.createEditableFrame();
         this.subscription = new Subscription();
         this.textarea = null;
         this.isFocus = false;
         this.nativeFocus = false;
-        this.isSafari = isSafari();
-        this.isMac = isMac();
-        this.isWindows = isWindows();
         this.isSougouPinYin = false; // 有 bug 版本搜狗拼音
         this.onReady = new Promise(resolve => {
             this.subscription.add(fromEvent(this.container, 'load').subscribe(() => {
@@ -1753,6 +1767,20 @@ let MagicInput = class MagicInput extends Input {
         }));
     }
     handleInput(textarea) {
+        this.subscription.add(fromEvent(textarea, 'compositionupdate').subscribe(ev => {
+            if (ev.data === ' ') {
+                // 处理搜狗五笔不符合 composition 事件预期，会意外跳光标的问题
+                return;
+            }
+            const slot = this.selection.startSlot;
+            this.caret.compositionState = {
+                slot,
+                data: ev.data
+            };
+            slot.changeMarker.forceMarkDirtied();
+        }), fromEvent(textarea, 'compositionend').subscribe(() => {
+            this.caret.compositionState = null;
+        }));
         this.subscription.add(merge(fromEvent(textarea, 'beforeinput').pipe(filter(ev => {
             ev.preventDefault();
             if (this.isSafari) {
@@ -1786,7 +1814,7 @@ let MagicInput = class MagicInput extends Input {
                 display: 'block',
                 height: '100%',
                 position: 'relative',
-                top: this.isWindows ? '6px' : '0'
+                top: this.isWindows ? '3px' : '0'
             }
         });
     }
@@ -1908,7 +1936,7 @@ let NativeInput = class NativeInput extends Input {
     set disabled(b) {
         this._disabled = b;
         if (b && !this.controller.readonly) {
-            this.documentView.contentEditable = b ? 'true' : 'false';
+            this.documentView.contentEditable = b ? 'false' : 'true';
         }
     }
     get disabled() {
@@ -2609,7 +2637,7 @@ class Viewer extends Starter {
         });
         const styleEl = document.createElement('style');
         docStyles.push(...(options.styleSheets || []));
-        editModeStyles.push(`#${this.id} *::selection{background-color: rgba(18, 150, 219, .2); color:inherit}`, ...(options.editingStyleSheets || []));
+        editModeStyles.push(`#${this.id} *::selection{background-color: rgba(18, 150, 219, .4); color:inherit}`, ...(options.editingStyleSheets || []));
         this.styleSheet = Viewer.cssMin(docStyles.join(''));
         styleEl.innerHTML = this.styleSheet + Viewer.cssMin(editModeStyles.join(''));
         this.resourceNodes.push(styleEl);

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);
@@ -1363,6 +1363,7 @@ class ExperimentalCaret {
     constructor(scheduler, editorMask) {
         this.scheduler = scheduler;
         this.editorMask = editorMask;
+        this.compositionState = null;
         this.timer = null;
         this.oldPosition = null;
         this._display = true;
@@ -1372,6 +1373,11 @@ class ExperimentalCaret {
         this.styleChangeEvent = new stream.Subject();
         this.oldRange = null;
         this.isFixed = false;
+        this.compositionElement = createElement('span', {
+            styles: {
+                textDecoration: 'underline'
+            }
+        });
         this.onPositionChange = this.positionChangeEvent.pipe(stream.distinctUntilChanged());
         this.onStyleChange = this.styleChangeEvent.asObservable();
         this.elementRef = createElement('div', {
@@ -1504,6 +1510,14 @@ class ExperimentalCaret {
             this.positionChangeEvent.next(null);
             return;
         }
+        if (this.compositionState) {
+            const compositionElement = this.compositionElement;
+            compositionElement.innerText = this.compositionState.data;
+            nativeRange = nativeRange.cloneRange();
+            nativeRange.insertNode(compositionElement);
+            nativeRange.selectNodeContents(compositionElement);
+            nativeRange.collapse();
+        }
         const rect = getLayoutRectByRange(nativeRange);
         const { fontSize, lineHeight, color } = getComputedStyle(node);
         let height;
@@ -1573,15 +1587,15 @@ exports.MagicInput = class MagicInput extends Input {
         this.injector = injector;
         this.composition = false;
         this.caret = new ExperimentalCaret(this.scheduler, this.injector.get(VIEW_MASK));
+        this.isSafari = isSafari();
+        this.isMac = isMac();
+        this.isWindows = isWindows();
         this._disabled = false;
         this.container = this.createEditableFrame();
         this.subscription = new stream.Subscription();
         this.textarea = null;
         this.isFocus = false;
         this.nativeFocus = false;
-        this.isSafari = isSafari();
-        this.isMac = isMac();
-        this.isWindows = isWindows();
         this.isSougouPinYin = false; // 有 bug 版本搜狗拼音
         this.onReady = new Promise(resolve => {
             this.subscription.add(stream.fromEvent(this.container, 'load').subscribe(() => {
@@ -1755,6 +1769,20 @@ exports.MagicInput = class MagicInput extends Input {
         }));
     }
     handleInput(textarea) {
+        this.subscription.add(stream.fromEvent(textarea, 'compositionupdate').subscribe(ev => {
+            if (ev.data === ' ') {
+                // 处理搜狗五笔不符合 composition 事件预期，会意外跳光标的问题
+                return;
+            }
+            const slot = this.selection.startSlot;
+            this.caret.compositionState = {
+                slot,
+                data: ev.data
+            };
+            slot.changeMarker.forceMarkDirtied();
+        }), stream.fromEvent(textarea, 'compositionend').subscribe(() => {
+            this.caret.compositionState = null;
+        }));
         this.subscription.add(stream.merge(stream.fromEvent(textarea, 'beforeinput').pipe(stream.filter(ev => {
             ev.preventDefault();
             if (this.isSafari) {
@@ -1788,7 +1816,7 @@ exports.MagicInput = class MagicInput extends Input {
                 display: 'block',
                 height: '100%',
                 position: 'relative',
-                top: this.isWindows ? '6px' : '0'
+                top: this.isWindows ? '3px' : '0'
             }
         });
     }
@@ -1910,7 +1938,7 @@ exports.NativeInput = class NativeInput extends Input {
     set disabled(b) {
         this._disabled = b;
         if (b && !this.controller.readonly) {
-            this.documentView.contentEditable = b ? 'true' : 'false';
+            this.documentView.contentEditable = b ? 'false' : 'true';
         }
     }
     get disabled() {
@@ -2611,7 +2639,7 @@ class Viewer extends core.Starter {
         });
         const styleEl = document.createElement('style');
         docStyles.push(...(options.styleSheets || []));
-        editModeStyles.push(`#${this.id} *::selection{background-color: rgba(18, 150, 219, .2); color:inherit}`, ...(options.editingStyleSheets || []));
+        editModeStyles.push(`#${this.id} *::selection{background-color: rgba(18, 150, 219, .4); color:inherit}`, ...(options.editingStyleSheets || []));
         this.styleSheet = Viewer.cssMin(docStyles.join(''));
         styleEl.innerHTML = this.styleSheet + Viewer.cssMin(editModeStyles.join(''));
         this.resourceNodes.push(styleEl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "3.0.0-alpha.49",
+  "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.49",
+    "@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": "61f5bf6f105709ecb2cc8f1a5f6f0bf7bcac574e"
+  "gitHead": "4f2557bae5aa8800130c827f502d4439bddb1ff4"
 }