@textbus/collaborate 2.5.4 → 2.5.6

package/bundles/collaborate-cursor.d.ts

@@ -1,3 +1,4 @@
+import { Injector } from '@tanbo/di';
 import { SelectionBridge } from '@textbus/browser';
 import { Selection, SelectionPaths, AbstractSelection, Scheduler, Rect } from '@textbus/core';
 export interface RemoteSelection {
@@ -20,11 +21,11 @@ export declare abstract class CollaborateSelectionAwarenessDelegate {
     abstract getRects(abstractSelection: AbstractSelection, nativeRange: Range): false | Rect[];
 }
 export declare class CollaborateCursor {
-    private container;
-    private awarenessDelegate;
+    private injector;
     private nativeSelection;
     private scheduler;
     private selection;
+    private awarenessDelegate;
     private host;
     private canvasContainer;
     private canvas;
@@ -33,7 +34,8 @@ export declare class CollaborateCursor {
     private onRectsChange;
     private subscription;
     private currentSelection;
-    constructor(container: HTMLElement, awarenessDelegate: CollaborateSelectionAwarenessDelegate, nativeSelection: SelectionBridge, scheduler: Scheduler, selection: Selection);
+    private container;
+    constructor(injector: Injector, nativeSelection: SelectionBridge, scheduler: Scheduler, selection: Selection, awarenessDelegate?: CollaborateSelectionAwarenessDelegate | null);
     refresh(): void;
     destroy(): void;
     draw(paths: RemoteSelection[]): void;

package/bundles/index.esm.js

@@ -1,10 +1,10 @@
 import { Scheduler, Selection, defineComponent, ContentType, VElement, makeError, HISTORY_STACK_SIZE, ChangeOrigin, Slot, FormatType, RootComponentRef, Controller, Translator, Registry, Starter, History } from '@textbus/core';
-import { Injectable, Inject, Optional } from '@tanbo/di';
+import { Injectable, Optional, Injector, Inject } from '@tanbo/di';
 import { Subject, Subscription, fromEvent, delay, map, filter } from '@tanbo/stream';
 import { Doc, UndoManager, Array, createAbsolutePositionFromRelativePosition, createRelativePositionFromTypeIndex, Map, Text } from 'yjs';
-import { VIEW_CONTAINER, createElement, getLayoutRectByRange, SelectionBridge } from '@textbus/browser';
+import { createElement, VIEW_CONTAINER, getLayoutRectByRange, SelectionBridge } from '@textbus/browser';
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -37,12 +37,12 @@ function __metadata(metadataKey, metadataValue) {
 class CollaborateSelectionAwarenessDelegate {
 }
 let CollaborateCursor = class CollaborateCursor {
-    constructor(container, awarenessDelegate, nativeSelection, scheduler, selection) {
-        this.container = container;
-        this.awarenessDelegate = awarenessDelegate;
+    constructor(injector, nativeSelection, scheduler, selection, awarenessDelegate = null) {
+        this.injector = injector;
         this.nativeSelection = nativeSelection;
         this.scheduler = scheduler;
         this.selection = selection;
+        this.awarenessDelegate = awarenessDelegate;
         this.host = createElement('div', {
             styles: {
                 position: 'absolute',
@@ -91,9 +91,10 @@ let CollaborateCursor = class CollaborateCursor {
         this.onRectsChange = new Subject();
         this.subscription = new Subscription();
         this.currentSelection = [];
+        this.container = injector.get(VIEW_CONTAINER);
         this.canvasContainer.append(this.canvas);
         this.host.append(this.canvasContainer, this.tooltips);
-        container.prepend(this.host);
+        this.container.prepend(this.host);
         this.subscription.add(this.onRectsChange.subscribe(rects => {
             for (const rect of rects) {
                 this.context.fillStyle = rect.color;
@@ -187,7 +188,7 @@ let CollaborateCursor = class CollaborateCursor {
                 color: item.color,
                 left: cursorRect.left - containerRect.left,
                 top: cursorRect.top - containerRect.top,
-                width: 2,
+                width: 1,
                 height: cursorRect.height
             };
             if (rect.left < 0 || rect.top < 0 || rect.left > containerRect.width) {
@@ -230,7 +231,6 @@ let CollaborateCursor = class CollaborateCursor {
         const userTip = createElement('span', {
             styles: {
                 position: 'absolute',
-                display: 'none',
                 left: '50%',
                 transform: 'translateX(-50%)',
                 marginBottom: '2px',
@@ -238,6 +238,7 @@ let CollaborateCursor = class CollaborateCursor {
                 whiteSpace: 'nowrap',
                 color: '#fff',
                 boxShadow: '0 1px 2px rgba(0,0,0,.1)',
+                opacity: 0.8,
                 borderRadius: '3px',
                 padding: '3px 5px',
                 pointerEvents: 'none',
@@ -248,20 +249,13 @@ let CollaborateCursor = class CollaborateCursor {
                 position: 'absolute',
                 top: '-2px',
                 left: '-2px',
-                width: '6px',
-                height: '6px',
+                width: '5px',
+                height: '5px',
+                borderRadius: '50%',
                 pointerEvents: 'auto',
                 pointer: 'cursor',
             },
-            children: [userTip],
-            on: {
-                mouseenter() {
-                    userTip.style.display = 'block';
-                },
-                mouseleave() {
-                    userTip.style.display = 'none';
-                }
-            }
+            children: [userTip]
         });
         child = createElement('span', {
             styles: {
@@ -281,13 +275,11 @@ let CollaborateCursor = class CollaborateCursor {
 };
 CollaborateCursor = __decorate([
     Injectable(),
-    __param(0, Inject(VIEW_CONTAINER)),
-    __param(1, Optional()),
-    __metadata("design:paramtypes", [HTMLElement,
-        CollaborateSelectionAwarenessDelegate,
+    __param(4, Optional()),
+    __metadata("design:paramtypes", [Injector,
         SelectionBridge,
         Scheduler,
-        Selection])
+        Selection, Object])
 ], CollaborateCursor);
 
 function createUnknownComponent(factoryName, canInsertInlineComponent) {

package/bundles/index.js

@@ -6,7 +6,7 @@ var stream = require('@tanbo/stream');
 var yjs = require('yjs');
 var browser = require('@textbus/browser');
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -39,12 +39,12 @@ function __metadata(metadataKey, metadataValue) {
 class CollaborateSelectionAwarenessDelegate {
 }
 exports.CollaborateCursor = class CollaborateCursor {
-    constructor(container, awarenessDelegate, nativeSelection, scheduler, selection) {
-        this.container = container;
-        this.awarenessDelegate = awarenessDelegate;
+    constructor(injector, nativeSelection, scheduler, selection, awarenessDelegate = null) {
+        this.injector = injector;
         this.nativeSelection = nativeSelection;
         this.scheduler = scheduler;
         this.selection = selection;
+        this.awarenessDelegate = awarenessDelegate;
         this.host = browser.createElement('div', {
             styles: {
                 position: 'absolute',
@@ -93,9 +93,10 @@ exports.CollaborateCursor = class CollaborateCursor {
         this.onRectsChange = new stream.Subject();
         this.subscription = new stream.Subscription();
         this.currentSelection = [];
+        this.container = injector.get(browser.VIEW_CONTAINER);
         this.canvasContainer.append(this.canvas);
         this.host.append(this.canvasContainer, this.tooltips);
-        container.prepend(this.host);
+        this.container.prepend(this.host);
         this.subscription.add(this.onRectsChange.subscribe(rects => {
             for (const rect of rects) {
                 this.context.fillStyle = rect.color;
@@ -189,7 +190,7 @@ exports.CollaborateCursor = class CollaborateCursor {
                 color: item.color,
                 left: cursorRect.left - containerRect.left,
                 top: cursorRect.top - containerRect.top,
-                width: 2,
+                width: 1,
                 height: cursorRect.height
             };
             if (rect.left < 0 || rect.top < 0 || rect.left > containerRect.width) {
@@ -232,7 +233,6 @@ exports.CollaborateCursor = class CollaborateCursor {
         const userTip = browser.createElement('span', {
             styles: {
                 position: 'absolute',
-                display: 'none',
                 left: '50%',
                 transform: 'translateX(-50%)',
                 marginBottom: '2px',
@@ -240,6 +240,7 @@ exports.CollaborateCursor = class CollaborateCursor {
                 whiteSpace: 'nowrap',
                 color: '#fff',
                 boxShadow: '0 1px 2px rgba(0,0,0,.1)',
+                opacity: 0.8,
                 borderRadius: '3px',
                 padding: '3px 5px',
                 pointerEvents: 'none',
@@ -250,20 +251,13 @@ exports.CollaborateCursor = class CollaborateCursor {
                 position: 'absolute',
                 top: '-2px',
                 left: '-2px',
-                width: '6px',
-                height: '6px',
+                width: '5px',
+                height: '5px',
+                borderRadius: '50%',
                 pointerEvents: 'auto',
                 pointer: 'cursor',
             },
-            children: [userTip],
-            on: {
-                mouseenter() {
-                    userTip.style.display = 'block';
-                },
-                mouseleave() {
-                    userTip.style.display = 'none';
-                }
-            }
+            children: [userTip]
         });
         child = browser.createElement('span', {
             styles: {
@@ -283,13 +277,11 @@ exports.CollaborateCursor = class CollaborateCursor {
 };
 exports.CollaborateCursor = __decorate([
     di.Injectable(),
-    __param(0, di.Inject(browser.VIEW_CONTAINER)),
-    __param(1, di.Optional()),
-    __metadata("design:paramtypes", [HTMLElement,
-        CollaborateSelectionAwarenessDelegate,
+    __param(4, di.Optional()),
+    __metadata("design:paramtypes", [di.Injector,
         browser.SelectionBridge,
         core.Scheduler,
-        core.Selection])
+        core.Selection, Object])
 ], exports.CollaborateCursor);
 
 function createUnknownComponent(factoryName, canInsertInlineComponent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "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,8 +27,8 @@
   "dependencies": {
     "@tanbo/di": "^1.1.3",
     "@tanbo/stream": "^1.1.8",
-    "@textbus/browser": "^2.5.4",
-    "@textbus/core": "^2.5.4",
+    "@textbus/browser": "^2.5.5",
+    "@textbus/core": "^2.5.5",
     "reflect-metadata": "^0.1.13",
     "y-protocols": "^1.0.5",
     "yjs": "^13.5.39"
@@ -36,7 +36,9 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^23.0.2",
     "@rollup/plugin-typescript": "^9.0.2",
-    "rollup": "^3.2.5"
+    "rimraf": "^3.0.2",
+    "rollup": "^3.2.5",
+    "tslib": "^2.4.1"
   },
   "author": {
     "name": "Tanbo",
@@ -49,5 +51,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "e735eef19dfb830c5fe186622328f3e7a86086be"
+  "gitHead": "cd75d4ae54f0976cbb87c654ab322b5d66f572e5"
 }