@textbus/xnote 0.2.0 → 0.2.1

package/bundles/editor.d.ts

@@ -11,9 +11,15 @@ export interface XNoteCollaborateConfig extends CollaborateConfig {
         id: string;
     };
 }
+/**
+ * XNote 配置项
+ */
 export interface EditorConfig extends TextbusConfig {
+    /** 默认 HTML 内容*/
     content?: string;
+    /** 协作服务配置 */
     collaborateConfig?: XNoteCollaborateConfig;
+    /** 视图配置项 */
     viewOptions?: Partial<ViewOptions>;
 }
 export declare class Editor extends Textbus {

package/bundles/index.esm.js

@@ -6006,6 +6006,9 @@ class Matcher {
     }
 }
 
+/**
+ * 组件架构信息
+ */
 class Organization {
 }
 function registerAtShortcut(textbus) {
@@ -6055,6 +6058,8 @@ class AtComponent extends Component {
         this.focus = new Subject();
         this.members = createSignal([]);
         this.selectedIndex = createSignal(0);
+        this.selection = this.textbus.get(Selection);
+        this.organization = this.textbus.get(Organization);
     }
     getSlots() {
         if (this.state.userInfo) {
@@ -6108,10 +6113,7 @@ class AtComponent extends Component {
         });
         onBreak((ev) => {
             const member = this.members()[this.selectedIndex()];
-            if (member) {
-                this.state.userInfo = Object.assign({}, member);
-            }
-            selection.selectComponentEnd(this);
+            this.atMember(member);
             ev.preventDefault();
         });
         useDynamicShortcut({
@@ -6147,12 +6149,18 @@ class AtComponent extends Component {
             subs.unsubscribe();
         });
     }
+    atMember(member) {
+        if (member) {
+            this.state.userInfo = Object.assign({}, member);
+            this.organization.atMember(member);
+        }
+        this.selection.selectComponentEnd(this);
+    }
 }
 AtComponent.componentName = 'AtComponent';
 AtComponent.type = ContentType.InlineComponent;
 
 function AtComponentView(props) {
-    const selection = inject(Selection);
     const dropdownRef = createRef();
     const subscription = props.component.focus.subscribe((b) => {
         if (dropdownRef.current && props.component.members().length) {
@@ -6204,8 +6212,7 @@ function AtComponentView(props) {
                         const yiq = (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000;
                         const color = yiq >= 128 ? '#000' : '#fff';
                         return (jsxs("div", { onClick: () => {
-                                props.component.state.userInfo = member;
-                                selection.selectComponentEnd(props.component);
+                                props.component.atMember(member);
                             }, class: ['xnote-at-member', { selected: index === selectedIndex }], children: [jsx("div", { class: "xnote-at-member-avatar", children: member.avatar ? jsx("img", { src: member.avatar, alt: member.name }) :
                                         jsx("span", { class: "xnote-at-member-avatar-bg", style: { background: member.color, color }, children: member.name }) }), jsxs("div", { class: "xnote-at-member-info", children: [jsx("div", { class: "xnote-at-member-name", children: member.name }), jsx("div", { class: "xnote-at-member-desc", children: member.groupName })] })] }, member.id));
                     }) }), children: [jsx("span", { children: "@" }), slot && jsx(SlotRender, { slot: slot, tag: "span", class: "xnote-at-input" })] }) }));
@@ -7255,7 +7262,7 @@ const stepComponentLoader = {
     }
 };
 
-class XNoteMessageBug extends MessageBus {
+class XNoteMessageBus extends MessageBus {
     constructor(selection, collaborateCursor, userinfo) {
         super();
         this.selection = selection;
@@ -7365,9 +7372,9 @@ class Editor extends Textbus {
                         provide: CollaborateSelectionAwarenessDelegate,
                         useClass: TableSelectionAwarenessDelegate
                     }, {
-                        provide: XNoteMessageBug,
+                        provide: XNoteMessageBus,
                         useFactory: (selection, collaborateCursor) => {
-                            return new XNoteMessageBug(selection, collaborateCursor, editorConfig.collaborateConfig.userinfo);
+                            return new XNoteMessageBus(selection, collaborateCursor, editorConfig.collaborateConfig.userinfo);
                         },
                         deps: [
                             Selection,
@@ -7375,7 +7382,7 @@ class Editor extends Textbus {
                         ]
                     }, {
                         provide: MessageBus,
-                        useExisting: XNoteMessageBug
+                        useExisting: XNoteMessageBus
                     }]
             });
         }
@@ -7502,4 +7509,4 @@ class Editor extends Textbus {
     }
 }
 
-export { AtComponent, AtComponentView, AttrTool, BlockTool, BlockquoteComponent, BlockquoteView, BoldTool, Button, CellAlignTool, CellBackgroundTool, CleanFormatsTool, CodeTool, ColorPicker, ColorTool, ComponentToolbar, Divider, DragResize, Dropdown, DropdownContextService, DropdownMenuContainer, DropdownMenuPortal, DropdownService, Editor, EditorService, FileUploader, FontFamilyTool, FontSizeTool, HighlightBoxComponent, HighlightBoxView, ImageComponent, ImageView, InlineToolbar, InlineToolbarPlugin, InsertMenu, InsertTool, ItalicTool, KatexComponent, KatexComponentView, Keymap, LeftToolbar, LeftToolbarPlugin, LinkJump, LinkTool, ListComponent, ListComponentView, Matcher, MenuHeading, MenuItem, MergeCellsTool, Organization, OutputInjectionToken, ParagraphComponent, ParagraphView, Picker, Popup, RedoTool, RefreshService, RootComponent, RootView, SourceCodeComponent, SourceCodeView, SplitCellsTool, SplitLine, StaticToolbar, StaticToolbarPlugin, StrikeThroughTool, SubscriptTool, SuperscriptTool, SuspensionToolbar, SuspensionToolbarPlugin, TableComponent, TableComponentView, TodolistComponent, TodolistView, ToolbarItem, UnderlineTool, UndoTool, VideoComponent, VideoView, XNoteMessageBug, atComponentLoader, backgroundColorFormatLoader, backgroundColorFormatter, blockquoteComponentLoader, boldFormatLoader, boldFormatter, cellAlignAttr, cellAlignAttrLoader, cellBackgroundAttr, cellBackgroundAttrLoader, codeFormatLoader, codeFormatter, colorFormatLoader, colorFormatter, deltaToBlock, fontFamilyFormatLoader, fontFamilyFormatter, fontSizeFormatLoader, fontSizeFormatter, headingAttr, headingAttrLoader, highlightBoxComponentLoader, imageComponentLoader, isSupportFont, italicFormatLoader, italicFormatter, katexComponentLoader, languageList, linkFormatLoader, linkFormatter, listComponentLoader, paragraphComponentLoader, registerAtShortcut, registerBlockquoteShortcut, registerBoldShortcut, registerCodeShortcut, registerHeadingShortcut, registerItalicShortcut, registerListShortcut, registerStrikeThroughShortcut, registerTextAlignShortcut, registerTextIndentShortcut, registerUnderlineShortcut, rootComponentLoader, sourceCodeComponentLoader, sourceCodeThemes, strikeThroughFormatLoader, strikeThroughFormatter, subscriptFormatLoader, subscriptFormatter, superscriptFormatLoader, superscriptFormatter, tableComponentLoader, textAlignAttr, textAlignAttrLoader, textIndentAttr, textIndentAttrLoader, toBlockquote, toList, todolistComponentLoader, toggleBold, toggleCode, toggleItalic, toggleStrikeThrough, toggleUnderline, underlineFormatLoader, underlineFormatter, useActiveBlock, useBlockContent, useBlockTransform, useOutput, useReadonly, videoComponentLoader };
+export { AtComponent, AtComponentView, AttrTool, BlockTool, BlockquoteComponent, BlockquoteView, BoldTool, Button, CellAlignTool, CellBackgroundTool, CleanFormatsTool, CodeTool, ColorPicker, ColorTool, ComponentToolbar, Divider, DragResize, Dropdown, DropdownContextService, DropdownMenuContainer, DropdownMenuPortal, DropdownService, Editor, EditorService, FileUploader, FontFamilyTool, FontSizeTool, HighlightBoxComponent, HighlightBoxView, ImageComponent, ImageView, InlineToolbar, InlineToolbarPlugin, InsertMenu, InsertTool, ItalicTool, KatexComponent, KatexComponentView, Keymap, LeftToolbar, LeftToolbarPlugin, LinkJump, LinkTool, ListComponent, ListComponentView, Matcher, MenuHeading, MenuItem, MergeCellsTool, Organization, OutputInjectionToken, ParagraphComponent, ParagraphView, Picker, Popup, RedoTool, RefreshService, RootComponent, RootView, SourceCodeComponent, SourceCodeView, SplitCellsTool, SplitLine, StaticToolbar, StaticToolbarPlugin, StrikeThroughTool, SubscriptTool, SuperscriptTool, SuspensionToolbar, SuspensionToolbarPlugin, TableComponent, TableComponentView, TodolistComponent, TodolistView, ToolbarItem, UnderlineTool, UndoTool, VideoComponent, VideoView, XNoteMessageBus, atComponentLoader, backgroundColorFormatLoader, backgroundColorFormatter, blockquoteComponentLoader, boldFormatLoader, boldFormatter, cellAlignAttr, cellAlignAttrLoader, cellBackgroundAttr, cellBackgroundAttrLoader, codeFormatLoader, codeFormatter, colorFormatLoader, colorFormatter, deltaToBlock, fontFamilyFormatLoader, fontFamilyFormatter, fontSizeFormatLoader, fontSizeFormatter, headingAttr, headingAttrLoader, highlightBoxComponentLoader, imageComponentLoader, isSupportFont, italicFormatLoader, italicFormatter, katexComponentLoader, languageList, linkFormatLoader, linkFormatter, listComponentLoader, paragraphComponentLoader, registerAtShortcut, registerBlockquoteShortcut, registerBoldShortcut, registerCodeShortcut, registerHeadingShortcut, registerItalicShortcut, registerListShortcut, registerStrikeThroughShortcut, registerTextAlignShortcut, registerTextIndentShortcut, registerUnderlineShortcut, rootComponentLoader, sourceCodeComponentLoader, sourceCodeThemes, strikeThroughFormatLoader, strikeThroughFormatter, subscriptFormatLoader, subscriptFormatter, superscriptFormatLoader, superscriptFormatter, tableComponentLoader, textAlignAttr, textAlignAttrLoader, textIndentAttr, textIndentAttrLoader, toBlockquote, toList, todolistComponentLoader, toggleBold, toggleCode, toggleItalic, toggleStrikeThrough, toggleUnderline, underlineFormatLoader, underlineFormatter, useActiveBlock, useBlockContent, useBlockTransform, useOutput, useReadonly, videoComponentLoader };

package/bundles/index.js

@@ -6008,6 +6008,9 @@ class Matcher {
     }
 }
 
+/**
+ * 组件架构信息
+ */
 class Organization {
 }
 function registerAtShortcut(textbus) {
@@ -6057,6 +6060,8 @@ class AtComponent extends core$1.Component {
         this.focus = new core$1.Subject();
         this.members = core.createSignal([]);
         this.selectedIndex = core.createSignal(0);
+        this.selection = this.textbus.get(core$1.Selection);
+        this.organization = this.textbus.get(Organization);
     }
     getSlots() {
         if (this.state.userInfo) {
@@ -6110,10 +6115,7 @@ class AtComponent extends core$1.Component {
         });
         core$1.onBreak((ev) => {
             const member = this.members()[this.selectedIndex()];
-            if (member) {
-                this.state.userInfo = Object.assign({}, member);
-            }
-            selection.selectComponentEnd(this);
+            this.atMember(member);
             ev.preventDefault();
         });
         core$1.useDynamicShortcut({
@@ -6149,12 +6151,18 @@ class AtComponent extends core$1.Component {
             subs.unsubscribe();
         });
     }
+    atMember(member) {
+        if (member) {
+            this.state.userInfo = Object.assign({}, member);
+            this.organization.atMember(member);
+        }
+        this.selection.selectComponentEnd(this);
+    }
 }
 AtComponent.componentName = 'AtComponent';
 AtComponent.type = core$1.ContentType.InlineComponent;
 
 function AtComponentView(props) {
-    const selection = core.inject(core$1.Selection);
     const dropdownRef = core.createRef();
     const subscription = props.component.focus.subscribe((b) => {
         if (dropdownRef.current && props.component.members().length) {
@@ -6206,8 +6214,7 @@ function AtComponentView(props) {
                         const yiq = (rgb.r * 299 + rgb.g * 587 + rgb.b * 114) / 1000;
                         const color$1 = yiq >= 128 ? '#000' : '#fff';
                         return (jsxRuntime.jsxs("div", { onClick: () => {
-                                props.component.state.userInfo = member;
-                                selection.selectComponentEnd(props.component);
+                                props.component.atMember(member);
                             }, class: ['xnote-at-member', { selected: index === selectedIndex }], children: [jsxRuntime.jsx("div", { class: "xnote-at-member-avatar", children: member.avatar ? jsxRuntime.jsx("img", { src: member.avatar, alt: member.name }) :
                                         jsxRuntime.jsx("span", { class: "xnote-at-member-avatar-bg", style: { background: member.color, color: color$1 }, children: member.name }) }), jsxRuntime.jsxs("div", { class: "xnote-at-member-info", children: [jsxRuntime.jsx("div", { class: "xnote-at-member-name", children: member.name }), jsxRuntime.jsx("div", { class: "xnote-at-member-desc", children: member.groupName })] })] }, member.id));
                     }) }), children: [jsxRuntime.jsx("span", { children: "@" }), slot && jsxRuntime.jsx(SlotRender, { slot: slot, tag: "span", class: "xnote-at-input" })] }) }));
@@ -7257,7 +7264,7 @@ const stepComponentLoader = {
     }
 };
 
-class XNoteMessageBug extends collaborate.MessageBus {
+class XNoteMessageBus extends collaborate.MessageBus {
     constructor(selection, collaborateCursor, userinfo) {
         super();
         this.selection = selection;
@@ -7367,9 +7374,9 @@ class Editor extends core$1.Textbus {
                         provide: platformBrowser.CollaborateSelectionAwarenessDelegate,
                         useClass: TableSelectionAwarenessDelegate
                     }, {
-                        provide: XNoteMessageBug,
+                        provide: XNoteMessageBus,
                         useFactory: (selection, collaborateCursor) => {
-                            return new XNoteMessageBug(selection, collaborateCursor, editorConfig.collaborateConfig.userinfo);
+                            return new XNoteMessageBus(selection, collaborateCursor, editorConfig.collaborateConfig.userinfo);
                         },
                         deps: [
                             core$1.Selection,
@@ -7377,7 +7384,7 @@ class Editor extends core$1.Textbus {
                         ]
                     }, {
                         provide: collaborate.MessageBus,
-                        useExisting: XNoteMessageBug
+                        useExisting: XNoteMessageBus
                     }]
             });
         }
@@ -7579,7 +7586,7 @@ exports.UnderlineTool = UnderlineTool;
 exports.UndoTool = UndoTool;
 exports.VideoComponent = VideoComponent;
 exports.VideoView = VideoView;
-exports.XNoteMessageBug = XNoteMessageBug;
+exports.XNoteMessageBus = XNoteMessageBus;
 exports.atComponentLoader = atComponentLoader;
 exports.backgroundColorFormatLoader = backgroundColorFormatLoader;
 exports.backgroundColorFormatter = backgroundColorFormatter;

package/bundles/textbus/components/at/at.component.d.ts

@@ -13,12 +13,17 @@ export interface Member {
     /** 成员背景色 */
     color?: string;
 }
-export declare abstract class Organization {
-    abstract getMembers(name?: string): Promise<Member[]>;
-    abstract getMemberById(id: string): Promise<Member | null>;
+/**
+ * 组件架构信息
+ */
+export declare abstract class Organization<T extends Member = Member> {
+    /** 根据当前输入获取成员列表 */
+    abstract getMembers(name?: string): Promise<T[]>;
+    /** 当 @ 某个成员时的回调 */
+    abstract atMember(member: T): void;
 }
-export interface AtComponentState {
-    userInfo?: Member;
+export interface AtComponentState<T extends Member = Member> {
+    userInfo?: T;
     slot?: Slot;
 }
 export declare function registerAtShortcut(textbus: Textbus): void;
@@ -29,7 +34,10 @@ export declare class AtComponent extends Component<AtComponentState> {
     focus: Subject<boolean>;
     members: import("@viewfly/core").Signal<Member[]>;
     selectedIndex: import("@viewfly/core").Signal<number>;
+    private selection;
+    private organization;
     constructor(textbus: Textbus, state?: AtComponentState);
     getSlots(): Slot[];
     setup(): void;
+    atMember(member?: Member): void;
 }

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

@@ -9,7 +9,7 @@ export interface UserInfo {
 export interface XNoteMessage extends UserSelectionCursor {
     id: string;
 }
-export declare class XNoteMessageBug extends MessageBus<XNoteMessage> {
+export declare class XNoteMessageBus extends MessageBus<XNoteMessage> {
     private selection;
     private collaborateCursor;
     private userinfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A high-performance rich text editor that supports multiplayer online collaboration.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",