@textbus/platform-browser 4.0.1 → 4.0.3

package/bundles/browser-module.d.ts

@@ -7,7 +7,7 @@ import { DomAdapter } from './dom-adapter';
  */
 export interface ViewOptions {
     /** 跨平台适配器 */
-    adapter: DomAdapter;
+    adapter: DomAdapter<any, any>;
     /** 编辑器根节点 */
     renderTo(): HTMLElement;
     /** 自动获取焦点 */

package/bundles/collaborate-cursor.d.ts

@@ -1,11 +1,9 @@
-import { Selection, AbstractSelection, Scheduler, Textbus } from '@textbus/core';
-import { UserActivity } from '@textbus/collaborate';
+import { Selection, AbstractSelection, Scheduler, Textbus, SelectionPaths } from '@textbus/core';
 import { SelectionBridge } from './selection-bridge';
 import { Rect } from './_utils/uikit';
 export interface SelectionRect extends Rect {
     color: string;
     username: string;
-    id: string;
 }
 export interface RemoteSelectionCursor {
     cursor: HTMLElement;
@@ -18,6 +16,14 @@ export interface RemoteSelectionCursor {
 export declare abstract class CollaborateSelectionAwarenessDelegate {
     abstract getRects(abstractSelection: AbstractSelection, nativeRange: Range): false | Rect[];
 }
+/**
+ * 协作用户虚拟光标信息
+ */
+export interface UserSelectionCursor {
+    username: string;
+    color: string;
+    selection: SelectionPaths;
+}
 /**
  * 协作光标绘制类
  */
@@ -25,7 +31,6 @@ export declare class CollaborateCursor {
     private nativeSelection;
     private scheduler;
     private selection;
-    private userActivity;
     private awarenessDelegate?;
     private host;
     private canvasContainer;
@@ -34,11 +39,10 @@ export declare class CollaborateCursor {
     private tooltips;
     private onRectsChange;
     private subscription;
-    private currentSelection;
+    private selectionCursors;
     private container;
     private ratio;
-    constructor(textbus: Textbus, nativeSelection: SelectionBridge, scheduler: Scheduler, selection: Selection, userActivity: UserActivity, awarenessDelegate?: CollaborateSelectionAwarenessDelegate | undefined);
-    init(): void;
+    constructor(textbus: Textbus, nativeSelection: SelectionBridge, scheduler: Scheduler, selection: Selection, awarenessDelegate?: CollaborateSelectionAwarenessDelegate | undefined);
     /**
      * 刷新协作光标，由于 Textbus 只会绘制可视区域的光标，当可视区域发生变化时，需要重新绘制
      */
@@ -48,7 +52,7 @@ export declare class CollaborateCursor {
      * 根据远程用户光标位置，绘制协作光标
      * @param paths
      */
-    private draw;
+    draw(paths: UserSelectionCursor[]): void;
     protected drawUserCursor(rects: SelectionRect[]): void;
     private getUserCursor;
 }

package/bundles/index.esm.js

@@ -2,7 +2,6 @@ import 'reflect-metadata';
 import { Slot, Textbus, Adapter, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, makeError, NativeSelectionBridge, FocusManager, Component, Registry } from '@textbus/core';
 import { Subject, filter, fromEvent, Subscription, distinctUntilChanged, merge, map, Observable } from '@tanbo/stream';
 import { InjectionToken, Injectable, Inject, Optional } from '@viewfly/core';
-import { UserActivity } from '@textbus/collaborate';
 
 function createElement(tagName, options = {}) {
     const el = document.createElement(tagName);
@@ -1480,11 +1479,10 @@ class CollaborateSelectionAwarenessDelegate {
  * 协作光标绘制类
  */
 let CollaborateCursor = class CollaborateCursor {
-    constructor(textbus, nativeSelection, scheduler, selection, userActivity, awarenessDelegate) {
+    constructor(textbus, nativeSelection, scheduler, selection, awarenessDelegate) {
         this.nativeSelection = nativeSelection;
         this.scheduler = scheduler;
         this.selection = selection;
-        this.userActivity = userActivity;
         this.awarenessDelegate = awarenessDelegate;
         this.host = createElement('div', {
             styles: {
@@ -1533,7 +1531,7 @@ let CollaborateCursor = class CollaborateCursor {
         });
         this.onRectsChange = new Subject();
         this.subscription = new Subscription();
-        this.currentSelection = [];
+        this.selectionCursors = [];
         this.ratio = window.devicePixelRatio || 1;
         this.container = textbus.get(VIEW_CONTAINER);
         this.canvasContainer.append(this.canvas);
@@ -1554,18 +1552,11 @@ let CollaborateCursor = class CollaborateCursor {
             this.refresh();
         }));
     }
-    init() {
-        if (this.userActivity) {
-            this.subscription.add(this.userActivity.onStateChange.subscribe(v => {
-                this.draw(v);
-            }));
-        }
-    }
     /**
      * 刷新协作光标，由于 Textbus 只会绘制可视区域的光标，当可视区域发生变化时，需要重新绘制
      */
     refresh() {
-        this.draw(this.currentSelection);
+        this.draw(this.selectionCursors);
     }
     destroy() {
         this.subscription.unsubscribe();
@@ -1575,7 +1566,7 @@ let CollaborateCursor = class CollaborateCursor {
      * @param paths
      */
     draw(paths) {
-        this.currentSelection = paths;
+        this.selectionCursors = paths;
         const containerRect = this.container.getBoundingClientRect();
         this.canvas.style.top = containerRect.top * -1 + 'px';
         this.canvas.width = this.canvas.offsetWidth * this.ratio;
@@ -1632,7 +1623,6 @@ let CollaborateCursor = class CollaborateCursor {
             for (let i = rects.length - 1; i >= 0; i--) {
                 const rect = rects[i];
                 selectionRects.push({
-                    id: item.id,
                     color: item.color,
                     username: item.username,
                     left: rect.left - containerRect.left,
@@ -1647,7 +1637,6 @@ let CollaborateCursor = class CollaborateCursor {
             cursorRange.collapse(true);
             const cursorRect = getLayoutRectByRange(cursorRange);
             const rect = {
-                id: item.id,
                 username: item.username,
                 color: item.color,
                 left: cursorRect.left - containerRect.left,
@@ -1740,12 +1729,10 @@ let CollaborateCursor = class CollaborateCursor {
 CollaborateCursor = __decorate([
     Injectable(),
     __param(4, Optional()),
-    __param(5, Optional()),
     __metadata("design:paramtypes", [Textbus,
         SelectionBridge,
         Scheduler,
         Selection,
-        UserActivity,
         CollaborateSelectionAwarenessDelegate])
 ], CollaborateCursor);
 
@@ -2251,11 +2238,8 @@ class BrowserModule {
         if (!(host instanceof HTMLElement)) {
             throw browserErrorFn('view container is not a HTMLElement');
         }
-        const cursor = textbus.get(CollaborateCursor);
-        cursor.init();
         host.append(this.workbench);
         return () => {
-            cursor.destroy();
             this.workbench.remove();
         };
     }

package/bundles/index.js

@@ -4,7 +4,6 @@ require('reflect-metadata');
 var core$1 = require('@textbus/core');
 var stream = require('@tanbo/stream');
 var core = require('@viewfly/core');
-var collaborate = require('@textbus/collaborate');
 
 function createElement(tagName, options = {}) {
     const el = document.createElement(tagName);
@@ -1482,11 +1481,10 @@ class CollaborateSelectionAwarenessDelegate {
  * 协作光标绘制类
  */
 exports.CollaborateCursor = class CollaborateCursor {
-    constructor(textbus, nativeSelection, scheduler, selection, userActivity, awarenessDelegate) {
+    constructor(textbus, nativeSelection, scheduler, selection, awarenessDelegate) {
         this.nativeSelection = nativeSelection;
         this.scheduler = scheduler;
         this.selection = selection;
-        this.userActivity = userActivity;
         this.awarenessDelegate = awarenessDelegate;
         this.host = createElement('div', {
             styles: {
@@ -1535,7 +1533,7 @@ exports.CollaborateCursor = class CollaborateCursor {
         });
         this.onRectsChange = new stream.Subject();
         this.subscription = new stream.Subscription();
-        this.currentSelection = [];
+        this.selectionCursors = [];
         this.ratio = window.devicePixelRatio || 1;
         this.container = textbus.get(VIEW_CONTAINER);
         this.canvasContainer.append(this.canvas);
@@ -1556,18 +1554,11 @@ exports.CollaborateCursor = class CollaborateCursor {
             this.refresh();
         }));
     }
-    init() {
-        if (this.userActivity) {
-            this.subscription.add(this.userActivity.onStateChange.subscribe(v => {
-                this.draw(v);
-            }));
-        }
-    }
     /**
      * 刷新协作光标，由于 Textbus 只会绘制可视区域的光标，当可视区域发生变化时，需要重新绘制
      */
     refresh() {
-        this.draw(this.currentSelection);
+        this.draw(this.selectionCursors);
     }
     destroy() {
         this.subscription.unsubscribe();
@@ -1577,7 +1568,7 @@ exports.CollaborateCursor = class CollaborateCursor {
      * @param paths
      */
     draw(paths) {
-        this.currentSelection = paths;
+        this.selectionCursors = paths;
         const containerRect = this.container.getBoundingClientRect();
         this.canvas.style.top = containerRect.top * -1 + 'px';
         this.canvas.width = this.canvas.offsetWidth * this.ratio;
@@ -1634,7 +1625,6 @@ exports.CollaborateCursor = class CollaborateCursor {
             for (let i = rects.length - 1; i >= 0; i--) {
                 const rect = rects[i];
                 selectionRects.push({
-                    id: item.id,
                     color: item.color,
                     username: item.username,
                     left: rect.left - containerRect.left,
@@ -1649,7 +1639,6 @@ exports.CollaborateCursor = class CollaborateCursor {
             cursorRange.collapse(true);
             const cursorRect = getLayoutRectByRange(cursorRange);
             const rect = {
-                id: item.id,
                 username: item.username,
                 color: item.color,
                 left: cursorRect.left - containerRect.left,
@@ -1742,12 +1731,10 @@ exports.CollaborateCursor = class CollaborateCursor {
 exports.CollaborateCursor = __decorate([
     core.Injectable(),
     __param(4, core.Optional()),
-    __param(5, core.Optional()),
     __metadata("design:paramtypes", [core$1.Textbus,
         exports.SelectionBridge,
         core$1.Scheduler,
         core$1.Selection,
-        collaborate.UserActivity,
         CollaborateSelectionAwarenessDelegate])
 ], exports.CollaborateCursor);
 
@@ -2253,11 +2240,8 @@ class BrowserModule {
         if (!(host instanceof HTMLElement)) {
             throw browserErrorFn('view container is not a HTMLElement');
         }
-        const cursor = textbus.get(exports.CollaborateCursor);
-        cursor.init();
         host.append(this.workbench);
         return () => {
-            cursor.destroy();
             this.workbench.remove();
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "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,8 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.5",
-    "@textbus/collaborate": "^4.0.1",
-    "@textbus/core": "^4.0.1",
-    "@viewfly/core": "^1.0.0-alpha.22"
+    "@textbus/core": "^4.0.3",
+    "@viewfly/core": "^1.0.2"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^23.0.2",
@@ -48,5 +47,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "650431b993553439e58d48949bd9cadda23fb147"
+  "gitHead": "cf4fd289b73bc777124a32fe42bb58eba05a34f1"
 }