@textbus/xnote 0.0.1 → 0.0.3

package/README.md

@@ -56,8 +56,6 @@ const editor = new Editor({
 
 ## 粘贴图片 Base64 转 URL
 
-base64 转 url 实现思路为 base64 转
-
 ```ts
 import { Commander } from '@textbus/core'
 import { Injectable } from '@viewfly/core'
@@ -102,4 +100,42 @@ const editor = new Editor({
 })
 ```
 
+## @ 人
+
+在文档中 @ 人功能需实现以下接口，以对接用户信息
+
+```ts
+export abstract class Organization {
+  abstract getMembers(name?: string): Promise<Member[]>
+
+  abstract getMemberById(id: string): Promise<Member | null>
+}
+```
+然后在编辑器初始化时传入你的实现
+```ts
+const editor = new Editor({
+  providers: [{
+    provide: Organization,
+    useValue: new YourOrganization()
+  }]
+})
+```
+
+## 协作支持
+
+Textbus 天然支持协作，只需要在编辑器配置项中添加协作配置信息即可，具体配置你可以参考 [https://textbus.io/guide/collab/](https://textbus.io/guide/collab/)
+
+```ts
+const editor = new Editor({
+  collaborateConfig: {
+    userinfo: user, // 用户信息
+    createConnector(yDoc): SyncConnector {
+      // 返回连接器
+      return new YWebsocketConnector('wss://example.com', 'docName', yDoc)
+    }
+  }
+})
+```
+
+
 

package/bundles/index.esm.js

@@ -2,14 +2,14 @@ import { jsxs, jsx, Fragment } from '@viewfly/core/jsx-runtime';
 import { withScopedCSS } from '@viewfly/scoped-css';
 import { Injectable, InjectFlags, Injector, inject, createSignal, onUnmounted, createRef, withAnnotation, onUpdated, onMounted, InjectionToken, getCurrentInstance, ReflectiveInjector, createDynamicRef, jsx as jsx$1, viewfly, watch } from '@viewfly/core';
 import { Subject, Selection, fromEvent, Subscription, Attribute, Keyboard, Commander, Controller, useContext, onBreak, onContentInsert, ContentType, merge, createVNode, Slot, Component, Registry, Query, QueryStateType, BehaviorSubject, onSlotApplyFormat, onSlotSetAttribute, onPaste, onFocus, onBlur, useDynamicShortcut, VTextNode, onFocusIn, onFocusOut, onDestroy, onGetRanges, Formatter, onParentSlotUpdated, Textbus, RootComponentRef, filter, map, distinctUntilChanged, sampleTime, debounceTime, throttleTime, delay, onContentInserted, onContentDeleted, switchMap, fromPromise, onCompositionStart } from '@textbus/core';
-import { VIEW_CONTAINER, isMac, DomAdapter, Input, SelectionBridge, BrowserModule, VIEW_DOCUMENT, CollaborateSelectionAwarenessDelegate, isMobileBrowser, Parser } from '@textbus/platform-browser';
+import { VIEW_CONTAINER, isMac, DomAdapter, Input, SelectionBridge, BrowserModule, VIEW_DOCUMENT, CollaborateSelectionAwarenessDelegate, isMobileBrowser, CollaborateCursor, Parser } from '@textbus/platform-browser';
 import { createPortal, createApp, DomRenderer, HTMLRenderer, OutputTranslator } from '@viewfly/platform-browser';
 import { useProduce } from '@viewfly/hooks';
 import highlightjs from 'highlight.js';
 import Katex from 'katex';
 import { ViewflyAdapter, ViewflyVDomAdapter } from '@textbus/adapter-viewfly';
 import { any2Hsl, hsl2Rgb } from '@tanbo/color';
-import { CollaborateModule } from '@textbus/collaborate';
+import { CollaborateModule, UserActivity } from '@textbus/collaborate';
 
 var scopedId$n = "vf-d94b56";
 
@@ -4567,6 +4567,9 @@ class AtComponent extends Component {
         this.selectedIndex = createSignal(0);
     }
     getSlots() {
+        if (this.state.userInfo) {
+            return [];
+        }
         if (this.state.slot) {
             return [this.state.slot];
         }
@@ -5743,7 +5746,19 @@ class Editor extends Textbus {
             ], plugins: [
                 new LeftToolbarPlugin(),
                 new ToolbarPlugin(),
-            ], onAfterStartup(textbus) {
+            ], 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) {
                 registerBoldShortcut(textbus);
                 registerCodeShortcut(textbus);
                 registerItalicShortcut(textbus);

package/bundles/index.js

@@ -4569,6 +4569,9 @@ class AtComponent extends core$1.Component {
         this.selectedIndex = core.createSignal(0);
     }
     getSlots() {
+        if (this.state.userInfo) {
+            return [];
+        }
         if (this.state.slot) {
             return [this.state.slot];
         }
@@ -5745,7 +5748,19 @@ class Editor extends core$1.Textbus {
             ], plugins: [
                 new LeftToolbarPlugin(),
                 new ToolbarPlugin(),
-            ], onAfterStartup(textbus) {
+            ], 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) {
                 registerBoldShortcut(textbus);
                 registerCodeShortcut(textbus);
                 registerItalicShortcut(textbus);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "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.0.0",
-    "@textbus/collaborate": "^4.0.0",
-    "@textbus/core": "^4.0.0",
-    "@textbus/platform-browser": "^4.0.0",
+    "@textbus/adapter-viewfly": "^4.0.2",
+    "@textbus/collaborate": "^4.0.2",
+    "@textbus/core": "^4.0.1",
+    "@textbus/platform-browser": "^4.0.2",
     "@viewfly/core": "^1.0.0-alpha.22",
     "@viewfly/hooks": "^1.0.0-alpha.22",
     "@viewfly/platform-browser": "^1.0.0-alpha.22",