@textbus/platform-browser 4.0.0-alpha.28 → 4.0.0-alpha.30

package/bundles/browser-module.d.ts

@@ -42,7 +42,7 @@ export declare class BrowserModule implements Module {
      * @param textbus
      */
     readDocumentByComponentLiteral(data: ComponentLiteral, rootComponent: ComponentConstructor, textbus: Textbus): Component;
-    setup(): () => void;
+    setup(textbus: Textbus): () => void;
     onAfterStartup(textbus: Textbus): void;
     private static createLayout;
 }

package/bundles/collaborate-cursor.d.ts

@@ -1,15 +1,7 @@
-import { Selection, SelectionPaths, AbstractSelection, Scheduler, Textbus } from '@textbus/core';
+import { Selection, AbstractSelection, Scheduler, Textbus } from '@textbus/core';
+import { UserActivity } from '@textbus/collaborate';
 import { SelectionBridge } from './selection-bridge';
 import { Rect } from './_utils/uikit';
-/**
- * 远程用户及光标位置信息
- */
-export interface RemoteSelection {
-    id: string;
-    color: string;
-    username: string;
-    paths: SelectionPaths;
-}
 export interface SelectionRect extends Rect {
     color: string;
     username: string;
@@ -33,6 +25,7 @@ export declare class CollaborateCursor {
     private nativeSelection;
     private scheduler;
     private selection;
+    private userActivity;
     private awarenessDelegate?;
     private host;
     private canvasContainer;
@@ -43,7 +36,8 @@ export declare class CollaborateCursor {
     private subscription;
     private currentSelection;
     private container;
-    constructor(textbus: Textbus, nativeSelection: SelectionBridge, scheduler: Scheduler, selection: Selection, awarenessDelegate?: CollaborateSelectionAwarenessDelegate | undefined);
+    constructor(textbus: Textbus, nativeSelection: SelectionBridge, scheduler: Scheduler, selection: Selection, userActivity: UserActivity, awarenessDelegate?: CollaborateSelectionAwarenessDelegate | undefined);
+    init(): void;
     /**
      * 刷新协作光标，由于 Textbus 只会绘制可视区域的光标，当可视区域发生变化时，需要重新绘制
      */
@@ -53,7 +47,7 @@ export declare class CollaborateCursor {
      * 根据远程用户光标位置，绘制协作光标
      * @param paths
      */
-    draw(paths: RemoteSelection[]): void;
+    private draw;
     protected drawUserCursor(rects: SelectionRect[]): void;
     private getUserCursor;
 }

package/bundles/index.esm.js

@@ -2,6 +2,7 @@ import 'reflect-metadata';
 import { Slot, Textbus, ViewAdapter, createBidirectionalMapping, Component, VElement, VTextNode, Controller, Selection, RootComponentRef, ContentType, Event, invokeListener, Keyboard, Commander, Scheduler, makeError, NativeSelectionBridge, FocusManager, 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);
@@ -1568,10 +1569,11 @@ class CollaborateSelectionAwarenessDelegate {
  * 协作光标绘制类
  */
 let CollaborateCursor = class CollaborateCursor {
-    constructor(textbus, nativeSelection, scheduler, selection, awarenessDelegate) {
+    constructor(textbus, nativeSelection, scheduler, selection, userActivity, awarenessDelegate) {
         this.nativeSelection = nativeSelection;
         this.scheduler = scheduler;
         this.selection = selection;
+        this.userActivity = userActivity;
         this.awarenessDelegate = awarenessDelegate;
         this.host = createElement('div', {
             styles: {
@@ -1640,6 +1642,13 @@ let CollaborateCursor = class CollaborateCursor {
             this.refresh();
         }));
     }
+    init() {
+        if (this.userActivity) {
+            this.subscription.add(this.userActivity.onStateChange.subscribe(v => {
+                this.draw(v);
+            }));
+        }
+    }
     /**
      * 刷新协作光标，由于 Textbus 只会绘制可视区域的光标，当可视区域发生变化时，需要重新绘制
      */
@@ -1662,10 +1671,10 @@ let CollaborateCursor = class CollaborateCursor {
         this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
         const users = [];
         paths.filter(i => {
-            return i.paths.anchor.length && i.paths.focus.length;
+            return i.selection.anchor.length && i.selection.focus.length;
         }).forEach(item => {
-            const anchorPaths = [...item.paths.anchor];
-            const focusPaths = [...item.paths.focus];
+            const anchorPaths = [...item.selection.anchor];
+            const focusPaths = [...item.selection.focus];
             const anchorOffset = anchorPaths.pop();
             const anchorSlot = this.selection.findSlotByPaths(anchorPaths);
             const focusOffset = focusPaths.pop();
@@ -1813,10 +1822,12 @@ let CollaborateCursor = class CollaborateCursor {
 CollaborateCursor = __decorate([
     Injectable(),
     __param(4, Optional()),
+    __param(5, Optional()),
     __metadata("design:paramtypes", [Textbus,
         SelectionBridge,
         Scheduler,
         Selection,
+        UserActivity,
         CollaborateSelectionAwarenessDelegate])
 ], CollaborateCursor);
 
@@ -2381,13 +2392,16 @@ class BrowserModule {
         const registry = textbus.get(Registry);
         return registry.createComponentByFactory(data, rootComponent);
     }
-    setup() {
+    setup(textbus) {
         const host = this.config.renderTo();
         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,6 +4,7 @@ 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);
@@ -1570,10 +1571,11 @@ class CollaborateSelectionAwarenessDelegate {
  * 协作光标绘制类
  */
 exports.CollaborateCursor = class CollaborateCursor {
-    constructor(textbus, nativeSelection, scheduler, selection, awarenessDelegate) {
+    constructor(textbus, nativeSelection, scheduler, selection, userActivity, awarenessDelegate) {
         this.nativeSelection = nativeSelection;
         this.scheduler = scheduler;
         this.selection = selection;
+        this.userActivity = userActivity;
         this.awarenessDelegate = awarenessDelegate;
         this.host = createElement('div', {
             styles: {
@@ -1642,6 +1644,13 @@ exports.CollaborateCursor = class CollaborateCursor {
             this.refresh();
         }));
     }
+    init() {
+        if (this.userActivity) {
+            this.subscription.add(this.userActivity.onStateChange.subscribe(v => {
+                this.draw(v);
+            }));
+        }
+    }
     /**
      * 刷新协作光标，由于 Textbus 只会绘制可视区域的光标，当可视区域发生变化时，需要重新绘制
      */
@@ -1664,10 +1673,10 @@ exports.CollaborateCursor = class CollaborateCursor {
         this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
         const users = [];
         paths.filter(i => {
-            return i.paths.anchor.length && i.paths.focus.length;
+            return i.selection.anchor.length && i.selection.focus.length;
         }).forEach(item => {
-            const anchorPaths = [...item.paths.anchor];
-            const focusPaths = [...item.paths.focus];
+            const anchorPaths = [...item.selection.anchor];
+            const focusPaths = [...item.selection.focus];
             const anchorOffset = anchorPaths.pop();
             const anchorSlot = this.selection.findSlotByPaths(anchorPaths);
             const focusOffset = focusPaths.pop();
@@ -1815,10 +1824,12 @@ 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);
 
@@ -2383,13 +2394,16 @@ class BrowserModule {
         const registry = textbus.get(core$1.Registry);
         return registry.createComponentByFactory(data, rootComponent);
     }
-    setup() {
+    setup(textbus) {
         const host = this.config.renderTo();
         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.0-alpha.28",
+  "version": "4.0.0-alpha.30",
   "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,7 +26,8 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.3",
-    "@textbus/core": "^4.0.0-alpha.28",
+    "@textbus/collaborate": "^4.0.0-alpha.30",
+    "@textbus/core": "^4.0.0-alpha.30",
     "@viewfly/core": "^0.6.0",
     "reflect-metadata": "^0.1.13"
   },
@@ -48,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "afb457beb39742c7e00f78b71cd24e13443bae56"
+  "gitHead": "9b14d8cf2a2473f31a36b51ee3d988ddecf776fb"
 }