@textbus/xnote 0.0.6 → 0.0.7

package/bundles/editor.d.ts

@@ -4,9 +4,16 @@ import { CollaborateConfig } from '@textbus/collaborate';
 import { Textbus, TextbusConfig } from '@textbus/core';
 import './assets/icons/style.css';
 import './textbus/doc.scss';
+export interface XNoteCollaborateConfig extends CollaborateConfig {
+    userinfo: {
+        username: string;
+        color: string;
+        id: string;
+    };
+}
 export interface EditorConfig extends TextbusConfig {
     content?: string;
-    collaborateConfig?: CollaborateConfig;
+    collaborateConfig?: XNoteCollaborateConfig;
     viewOptions?: Partial<ViewOptions>;
 }
 export declare class Editor extends Textbus {

package/bundles/fonts/textbus.svg

@@ -84,4 +84,4 @@
 <glyph unicode="&#xea7b;" glyph-name="indent-increase" d="M0 896.004h1024v-128h-1024zM384 704.004h640v-128h-640zM384 512.004h640v-128h-640zM384 320.004h640v-128h-640zM0 128.004h1024v-128h-1024zM0 256.004v384l256-192z" />
 <glyph unicode="&#xea7c;" glyph-name="indent-decrease" d="M0 896.004h1024v-128h-1024zM384 704.004h640v-128h-640zM384 512.004h640v-128h-640zM384 320.004h640v-128h-640zM0 128.004h1024v-128h-1024zM256 640.004v-384l-256 192z" />
 <glyph unicode="&#xea80;" glyph-name="code" horiz-adv-x="1280" d="M832 224l96-96 320 320-320 320-96-96 224-224zM448 672l-96 96-320-320 320-320 96 96-224 224zM701.298 809.481l69.468-18.944-191.987-704.026-69.468 18.944 191.987 704.026z" />
-</font></defs></svg>
+</font></defs></svg>

package/bundles/index.esm.js

@@ -10,7 +10,7 @@ import { v4 } from 'uuid';
 import Katex from 'katex';
 import { ViewflyAdapter, ViewflyVDomAdapter } from '@textbus/adapter-viewfly';
 import { any2Hsl, hsl2Rgb } from '@tanbo/color';
-import { CollaborateModule, UserActivity } from '@textbus/collaborate';
+import { MessageBus, CollaborateModule } from '@textbus/collaborate';
 
 var scopedId$n = "vf-d94b56";
 
@@ -991,7 +991,8 @@ function ParagraphView(props) {
 }
 const paragraphComponentLoader = {
     match(element, returnableContentTypes) {
-        return returnableContentTypes.includes(ContentType.BlockComponent) && (element.dataset.component === ParagraphComponent.componentName || /^P|H[1-6]$/.test(element.tagName));
+        return returnableContentTypes.includes(ContentType.BlockComponent) &&
+            (element.dataset.component === ParagraphComponent.componentName || /^P|H[1-6]$/.test(element.tagName));
     },
     read(element, textbus, slotParser) {
         let content;
@@ -6185,7 +6186,7 @@ let TableSelectionAwarenessDelegate = class TableSelectionAwarenessDelegate exte
         this.domAdapter = domAdapter;
         this.selection = selection;
     }
-    getRects(abstractSelection) {
+    getRects(abstractSelection, _, data) {
         const { focusSlot, anchorSlot } = abstractSelection;
         const focusPaths = this.selection.getPathsBySlot(focusSlot);
         const anchorPaths = this.selection.getPathsBySlot(anchorSlot);
@@ -6204,7 +6205,7 @@ let TableSelectionAwarenessDelegate = class TableSelectionAwarenessDelegate exte
         if (!(commonAncestorComponent instanceof TableComponent)) {
             return false;
         }
-        const rect = commonAncestorComponent.getMaxRectangle(findFocusCell(commonAncestorComponent, startSlot), findFocusCell(commonAncestorComponent, endSlot));
+        const rect = data.data || commonAncestorComponent.getMaxRectangle(findFocusCell(commonAncestorComponent, startSlot), findFocusCell(commonAncestorComponent, endSlot));
         const renderer = this.domAdapter;
         if (!rect) {
             return false;
@@ -6338,6 +6339,30 @@ const stepComponentLoader = {
     }
 };
 
+class XNoteMessageBug extends MessageBus {
+    constructor(selection, collaborateCursor, userinfo) {
+        super();
+        this.selection = selection;
+        this.collaborateCursor = collaborateCursor;
+        this.userinfo = userinfo;
+        this.messageChangeEvent = new Subject();
+        this.onMessageChange = this.messageChangeEvent.asObservable();
+    }
+    get() {
+        const selection = this.selection;
+        const c = selection.commonAncestorComponent;
+        return Object.assign(Object.assign({}, this.userinfo), { selection: selection.getPaths(), data: (!selection.isCollapsed && c instanceof TableComponent) ? c.getSelectedRect() : null });
+    }
+    consume(message) {
+        this.messageChangeEvent.next([...message]);
+        this.collaborateCursor.draw(message.filter(item => {
+            return item.message.id !== this.userinfo.id;
+        }).map(item => {
+            return item.message;
+        }));
+    }
+}
+
 class Editor extends Textbus {
     constructor(editorConfig = {}) {
         const adapter = new ViewflyAdapter({
@@ -6403,9 +6428,20 @@ class Editor extends Textbus {
         const modules = [browserModule];
         if (editorConfig.collaborateConfig) {
             modules.push(new CollaborateModule(editorConfig.collaborateConfig));
-            browserModule.providers.push({
-                provide: CollaborateSelectionAwarenessDelegate,
-                useClass: TableSelectionAwarenessDelegate
+            modules.push({
+                providers: [{
+                        provide: CollaborateSelectionAwarenessDelegate,
+                        useClass: TableSelectionAwarenessDelegate
+                    }, {
+                        provide: MessageBus,
+                        useFactory: (selection, collaborateCursor) => {
+                            return new XNoteMessageBug(selection, collaborateCursor, editorConfig.collaborateConfig.userinfo);
+                        },
+                        deps: [
+                            Selection,
+                            CollaborateCursor
+                        ]
+                    }]
             });
         }
         const vDomAdapter = new ViewflyVDomAdapter({
@@ -6475,19 +6511,7 @@ class Editor extends Textbus {
             ], plugins: [
                 new LeftToolbarPlugin(),
                 new ToolbarPlugin(),
-            ], setup(textbus) {
-                if (editorConfig.collaborateConfig) {
-                    const activity = textbus.get(UserActivity);
-                    const collabCursor = textbus.get(CollaborateCursor);
-                    const sub = activity.onStateChange.subscribe(ev => {
-                        collabCursor.draw(ev);
-                    });
-                    return () => {
-                        sub.unsubscribe();
-                    };
-                }
-            },
-            onAfterStartup(textbus) {
+            ], onAfterStartup(textbus) {
                 registerBoldShortcut(textbus);
                 registerCodeShortcut(textbus);
                 registerItalicShortcut(textbus);

package/bundles/index.js

@@ -993,7 +993,8 @@ function ParagraphView(props) {
 }
 const paragraphComponentLoader = {
     match(element, returnableContentTypes) {
-        return returnableContentTypes.includes(core$1.ContentType.BlockComponent) && (element.dataset.component === ParagraphComponent.componentName || /^P|H[1-6]$/.test(element.tagName));
+        return returnableContentTypes.includes(core$1.ContentType.BlockComponent) &&
+            (element.dataset.component === ParagraphComponent.componentName || /^P|H[1-6]$/.test(element.tagName));
     },
     read(element, textbus, slotParser) {
         let content;
@@ -6187,7 +6188,7 @@ let TableSelectionAwarenessDelegate = class TableSelectionAwarenessDelegate exte
         this.domAdapter = domAdapter;
         this.selection = selection;
     }
-    getRects(abstractSelection) {
+    getRects(abstractSelection, _, data) {
         const { focusSlot, anchorSlot } = abstractSelection;
         const focusPaths = this.selection.getPathsBySlot(focusSlot);
         const anchorPaths = this.selection.getPathsBySlot(anchorSlot);
@@ -6206,7 +6207,7 @@ let TableSelectionAwarenessDelegate = class TableSelectionAwarenessDelegate exte
         if (!(commonAncestorComponent instanceof TableComponent)) {
             return false;
         }
-        const rect = commonAncestorComponent.getMaxRectangle(findFocusCell(commonAncestorComponent, startSlot), findFocusCell(commonAncestorComponent, endSlot));
+        const rect = data.data || commonAncestorComponent.getMaxRectangle(findFocusCell(commonAncestorComponent, startSlot), findFocusCell(commonAncestorComponent, endSlot));
         const renderer = this.domAdapter;
         if (!rect) {
             return false;
@@ -6340,6 +6341,30 @@ const stepComponentLoader = {
     }
 };
 
+class XNoteMessageBug extends collaborate.MessageBus {
+    constructor(selection, collaborateCursor, userinfo) {
+        super();
+        this.selection = selection;
+        this.collaborateCursor = collaborateCursor;
+        this.userinfo = userinfo;
+        this.messageChangeEvent = new core$1.Subject();
+        this.onMessageChange = this.messageChangeEvent.asObservable();
+    }
+    get() {
+        const selection = this.selection;
+        const c = selection.commonAncestorComponent;
+        return Object.assign(Object.assign({}, this.userinfo), { selection: selection.getPaths(), data: (!selection.isCollapsed && c instanceof TableComponent) ? c.getSelectedRect() : null });
+    }
+    consume(message) {
+        this.messageChangeEvent.next([...message]);
+        this.collaborateCursor.draw(message.filter(item => {
+            return item.message.id !== this.userinfo.id;
+        }).map(item => {
+            return item.message;
+        }));
+    }
+}
+
 class Editor extends core$1.Textbus {
     constructor(editorConfig = {}) {
         const adapter = new adapterViewfly.ViewflyAdapter({
@@ -6405,9 +6430,20 @@ class Editor extends core$1.Textbus {
         const modules = [browserModule];
         if (editorConfig.collaborateConfig) {
             modules.push(new collaborate.CollaborateModule(editorConfig.collaborateConfig));
-            browserModule.providers.push({
-                provide: platformBrowser.CollaborateSelectionAwarenessDelegate,
-                useClass: TableSelectionAwarenessDelegate
+            modules.push({
+                providers: [{
+                        provide: platformBrowser.CollaborateSelectionAwarenessDelegate,
+                        useClass: TableSelectionAwarenessDelegate
+                    }, {
+                        provide: collaborate.MessageBus,
+                        useFactory: (selection, collaborateCursor) => {
+                            return new XNoteMessageBug(selection, collaborateCursor, editorConfig.collaborateConfig.userinfo);
+                        },
+                        deps: [
+                            core$1.Selection,
+                            platformBrowser.CollaborateCursor
+                        ]
+                    }]
             });
         }
         const vDomAdapter = new adapterViewfly.ViewflyVDomAdapter({
@@ -6477,19 +6513,7 @@ class Editor extends core$1.Textbus {
             ], plugins: [
                 new LeftToolbarPlugin(),
                 new ToolbarPlugin(),
-            ], setup(textbus) {
-                if (editorConfig.collaborateConfig) {
-                    const activity = textbus.get(collaborate.UserActivity);
-                    const collabCursor = textbus.get(platformBrowser.CollaborateCursor);
-                    const sub = activity.onStateChange.subscribe(ev => {
-                        collabCursor.draw(ev);
-                    });
-                    return () => {
-                        sub.unsubscribe();
-                    };
-                }
-            },
-            onAfterStartup(textbus) {
+            ], onAfterStartup(textbus) {
                 registerBoldShortcut(textbus);
                 registerCodeShortcut(textbus);
                 registerItalicShortcut(textbus);

package/bundles/textbus/components/table/table-selection-awareness-delegate.d.ts

@@ -1,4 +1,4 @@
-import { CollaborateSelectionAwarenessDelegate, DomAdapter } from '@textbus/platform-browser';
+import { CollaborateSelectionAwarenessDelegate, DomAdapter, UserSelectionCursor } from '@textbus/platform-browser';
 import { AbstractSelection, Slot, Selection } from '@textbus/core';
 import { TableComponent } from './table.component';
 export declare function findFocusCell(table: TableComponent, slot: Slot): Slot | null;
@@ -6,7 +6,7 @@ export declare class TableSelectionAwarenessDelegate extends CollaborateSelectio
     private domAdapter;
     private selection;
     constructor(domAdapter: DomAdapter, selection: Selection);
-    getRects(abstractSelection: AbstractSelection): false | {
+    getRects(abstractSelection: AbstractSelection, _: any, data: UserSelectionCursor): false | {
         left: number;
         top: number;
         width: number;

package/bundles/xnote-message-bus.d.ts

@@ -0,0 +1,21 @@
+import { Observable, Selection, Subject } from '@textbus/core';
+import { CollaborateCursor, UserSelectionCursor } from '@textbus/platform-browser';
+import { Message, MessageBus } from '@textbus/collaborate';
+export interface UserInfo {
+    username: string;
+    color: string;
+    id: string;
+}
+export interface XNoteMessage extends UserSelectionCursor {
+    id: string;
+}
+export declare class XNoteMessageBug extends MessageBus<XNoteMessage> {
+    private selection;
+    private collaborateCursor;
+    private userinfo;
+    onMessageChange: Observable<Message<XNoteMessage>[]>;
+    protected messageChangeEvent: Subject<Message<XNoteMessage>[]>;
+    constructor(selection: Selection, collaborateCursor: CollaborateCursor, userinfo: UserInfo);
+    get(): XNoteMessage;
+    consume(message: Message<XNoteMessage>[]): void;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "A high-performance rich text editor that supports multiplayer online collaboration.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -27,10 +27,10 @@
   },
   "dependencies": {
     "@tanbo/color": "^0.1.1",
-    "@textbus/adapter-viewfly": "^4.1.0",
-    "@textbus/collaborate": "^4.1.0",
-    "@textbus/core": "^4.1.0",
-    "@textbus/platform-browser": "^4.1.0",
+    "@textbus/adapter-viewfly": "^4.2.0",
+    "@textbus/collaborate": "^4.2.0",
+    "@textbus/core": "^4.2.0",
+    "@textbus/platform-browser": "^4.2.0",
     "@viewfly/core": "^1.0.5",
     "@viewfly/hooks": "^1.0.5",
     "@viewfly/platform-browser": "^1.0.5",