@textbus/xnote 0.2.7 → 0.3.0

package/README.md

@@ -100,6 +100,12 @@ const editor = new Editor({
 })
 ```
 
+## 更新编辑器内容
+
+```ts
+editor.setContent('<p>你好！</p>')
+```
+
 ## @ 人
 
 在文档中 @ 人功能需实现以下接口，以对接用户信息

package/bundles/editor.d.ts

@@ -1,8 +1,9 @@
 import { OutputTranslator } from '@viewfly/platform-browser';
 import { ViewOptions } from '@textbus/platform-browser';
 import { CollaborateConfig } from '@textbus/collaborate';
-import { Textbus, TextbusConfig } from '@textbus/core';
+import { ComponentStateLiteral, Textbus, TextbusConfig } from '@textbus/core';
 import './assets/icons/style.css';
+import { RootComponentState } from './textbus/components/_api';
 import './textbus/doc.scss';
 export interface XNoteCollaborateConfig extends CollaborateConfig {
     userinfo: {
@@ -16,7 +17,7 @@ export interface XNoteCollaborateConfig extends CollaborateConfig {
  */
 export interface EditorConfig extends TextbusConfig {
     /** 默认 HTML 内容*/
-    content?: string;
+    content?: string | ComponentStateLiteral<RootComponentState>;
     /** 协作服务配置 */
     collaborateConfig?: XNoteCollaborateConfig;
     /** 视图配置项 */
@@ -29,5 +30,9 @@ export declare class Editor extends Textbus {
     private vDomAdapter;
     constructor(editorConfig?: EditorConfig);
     mount(host: HTMLElement): Promise<this>;
+    setContent(content: string | ComponentStateLiteral<RootComponentState>): void;
     getHTML(): string;
+    private createModel;
+    private createModelFromState;
+    private createModelFromHTML;
 }

package/bundles/index.esm.js

@@ -6348,7 +6348,6 @@ class RootComponent extends Component {
 RootComponent.componentName = 'RootComponent';
 RootComponent.type = ContentType.BlockComponent;
 function RootView(props) {
-    const { content } = props.component.state;
     const ref = createDynamicRef(node => {
         const sub = props.component.onCompositionStart.subscribe(() => {
             node.children[0].dataset.placeholder = '';
@@ -6370,6 +6369,7 @@ function RootView(props) {
     }
     return () => {
         const { rootRef } = props;
+        const { content } = props.component.state;
         return (jsx("div", { class: "xnote-root", onClick: checkContent, style: !readonly() ? {
                 paddingBottom: '40px'
             } : {}, dir: "auto", ref: [rootRef, containerRef, ref], "data-component": props.component.name, children: jsx(SlotRender, { slot: content, tag: "div", class: "xnote-content", "data-placeholder": content.isEmpty ? '请输入内容' : '', renderEnv: readonly() || output() }) }));
@@ -7556,24 +7556,7 @@ class Editor extends Textbus {
         let rootComp;
         const config = this.editorConfig;
         if (config.content) {
-            const parser = this.get(Parser);
-            const doc = parser.parseDoc(config.content, rootComponentLoader);
-            if (doc instanceof Component) {
-                rootComp = doc;
-            }
-            else {
-                const content = new Slot([
-                    ContentType.BlockComponent
-                ]);
-                if (doc instanceof Slot) {
-                    deltaToBlock(doc.toDelta(), this).forEach(i => {
-                        content.insert(i);
-                    });
-                }
-                rootComp = new RootComponent(this, {
-                    content
-                });
-            }
+            rootComp = this.createModel(config.content);
         }
         else {
             rootComp = new RootComponent(this, {
@@ -7582,9 +7565,42 @@ class Editor extends Textbus {
         }
         return this.render(rootComp);
     }
+    setContent(content) {
+        this.guardReady();
+        const newModel = this.createModel(content);
+        const rootComponent = this.get(RootComponentRef).component;
+        Object.assign(rootComponent.state, newModel.state);
+    }
     getHTML() {
         return this.translator.transform(this.vDomAdapter.host);
     }
+    createModel(content) {
+        if (typeof content === 'string') {
+            return this.createModelFromHTML(content);
+        }
+        return this.createModelFromState(content);
+    }
+    createModelFromState(state) {
+        return RootComponent.fromJSON(this, state);
+    }
+    createModelFromHTML(html) {
+        const parser = this.get(Parser);
+        const doc = parser.parseDoc(html, rootComponentLoader);
+        if (doc instanceof Component) {
+            return doc;
+        }
+        const content = new Slot([
+            ContentType.BlockComponent
+        ]);
+        if (doc instanceof Slot) {
+            deltaToBlock(doc.toDelta(), this).forEach(i => {
+                content.insert(i);
+            });
+        }
+        return new RootComponent(this, {
+            content
+        });
+    }
 }
 
 export { AtComponent, AtComponentView, AttrTool, BlockTool, BlockquoteComponent, BlockquoteView, BoldTool, Button, CellAlignTool, CellBackgroundTool, CleanFormatsTool, CodeTool, ColorPicker, 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, TextBackgroundColorTool, TextColorTool, 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

@@ -6350,7 +6350,6 @@ class RootComponent extends core$1.Component {
 RootComponent.componentName = 'RootComponent';
 RootComponent.type = core$1.ContentType.BlockComponent;
 function RootView(props) {
-    const { content } = props.component.state;
     const ref = core.createDynamicRef(node => {
         const sub = props.component.onCompositionStart.subscribe(() => {
             node.children[0].dataset.placeholder = '';
@@ -6372,6 +6371,7 @@ function RootView(props) {
     }
     return () => {
         const { rootRef } = props;
+        const { content } = props.component.state;
         return (jsxRuntime.jsx("div", { class: "xnote-root", onClick: checkContent, style: !readonly() ? {
                 paddingBottom: '40px'
             } : {}, dir: "auto", ref: [rootRef, containerRef, ref], "data-component": props.component.name, children: jsxRuntime.jsx(SlotRender, { slot: content, tag: "div", class: "xnote-content", "data-placeholder": content.isEmpty ? '请输入内容' : '', renderEnv: readonly() || output() }) }));
@@ -7558,24 +7558,7 @@ class Editor extends core$1.Textbus {
         let rootComp;
         const config = this.editorConfig;
         if (config.content) {
-            const parser = this.get(platformBrowser.Parser);
-            const doc = parser.parseDoc(config.content, rootComponentLoader);
-            if (doc instanceof core$1.Component) {
-                rootComp = doc;
-            }
-            else {
-                const content = new core$1.Slot([
-                    core$1.ContentType.BlockComponent
-                ]);
-                if (doc instanceof core$1.Slot) {
-                    deltaToBlock(doc.toDelta(), this).forEach(i => {
-                        content.insert(i);
-                    });
-                }
-                rootComp = new RootComponent(this, {
-                    content
-                });
-            }
+            rootComp = this.createModel(config.content);
         }
         else {
             rootComp = new RootComponent(this, {
@@ -7584,9 +7567,42 @@ class Editor extends core$1.Textbus {
         }
         return this.render(rootComp);
     }
+    setContent(content) {
+        this.guardReady();
+        const newModel = this.createModel(content);
+        const rootComponent = this.get(core$1.RootComponentRef).component;
+        Object.assign(rootComponent.state, newModel.state);
+    }
     getHTML() {
         return this.translator.transform(this.vDomAdapter.host);
     }
+    createModel(content) {
+        if (typeof content === 'string') {
+            return this.createModelFromHTML(content);
+        }
+        return this.createModelFromState(content);
+    }
+    createModelFromState(state) {
+        return RootComponent.fromJSON(this, state);
+    }
+    createModelFromHTML(html) {
+        const parser = this.get(platformBrowser.Parser);
+        const doc = parser.parseDoc(html, rootComponentLoader);
+        if (doc instanceof core$1.Component) {
+            return doc;
+        }
+        const content = new core$1.Slot([
+            core$1.ContentType.BlockComponent
+        ]);
+        if (doc instanceof core$1.Slot) {
+            deltaToBlock(doc.toDelta(), this).forEach(i => {
+                content.insert(i);
+            });
+        }
+        return new RootComponent(this, {
+            content
+        });
+    }
 }
 
 exports.AtComponent = AtComponent;

package/index.tsx

@@ -0,0 +1,151 @@
+/* eslint-disable */
+import 'reflect-metadata'
+import { Editor, Member, Organization } from './src/public-api'
+import { SyncConnector, YWebsocketConnector } from '@textbus/collaborate'
+import { FileUploader } from './src/interfaces'
+import { UserInfo } from './src/xnote-message-bus'
+import { StaticToolbarPlugin, SuspensionToolbarPlugin } from '@textbus/xnote'
+import { VIEW_CONTAINER } from '@textbus/platform-browser'
+import { createRef, onMounted } from '@viewfly/core'
+import { createApp } from '@viewfly/platform-browser'
+import { RootComponentRef } from '@textbus/core'
+
+const firstNameText = '王、李、张、刘、陈、杨、黄、赵、周、吴、徐、孙、马、胡、朱、郭、何、罗、高、林'.replace(/、/g, '')
+const lastNameText = '本义既为女子所生子嗣则同一女子所生子嗣组成的亲族也可以称为姓以表示其同出于一个女性始祖的这种特殊的亲属关系这是姓的另一引申义此种亲族组织强调女性始祖则当如许多学者所推拟的其最初必形成于母系氏族社会中即夫从妻居子女属于母族世系以母方计对于这种具有血缘关系的亲属组织的名称杨希枚先生主张称为姓族典籍所记姬姓姜姓嬴姓最初应皆属母系姓族姬姜则是此种母系姓族之名号进入父系氏族社会后妻从夫居子女不再属母族而归于父族世系以父方计所以母系姓族遂转为父系姓族此后父系姓族仍然使用着母系姓族的名号其四姓在东周文献中有时是指姓族之名号如国语周语下言赐姓曰姜之姓即应理解为所赐姓族之名号即姜又如左传哀公五月昭夫人孟子卒昭公娶于吴故不书姓很明显姓在这里是指吴女所属姓族之名号即姬所谓姓族之姓与作姓族名号讲的姓是一实一名属于两种概念范畴所以会发生此种混同当如杨希枚先生所言是由于名代表实积久而以实为名于是产生姬姜之类姓之名号就是姓的概念司马迁在史记中常言姓某氏没能区别古代姓与氏之不同但他所说的姓意思即是指姓族之名号妘黄帝住姬水之滨以姬为姓司马迁在史记五帝本纪中说黄帝二十五子其得姓者十四人三语中胥臣解释说黄帝之子二十五宗其得姓者十四人为十二姓姬酉祁己滕箴任荀僖姞儇衣是也惟青阳与夷鼓同己姓后来的五帝少昊颛顼喾尧舜以及夏禹商族的祖先契周族的祖先农神后稷秦族的祖先伯益等都是黄帝的后代后稷承继姬姓他的后代建立了周朝周初周天子姬发大封诸侯时其中姬姓国个姬姓位于百家姓第位由姬姓演支出个姓占百家姓总姓姓的再演化出来的姓氏更是数不胜数了炎帝居姜水之旁以姜为姓姜姓还是今天中国的许多姓氏如吕姓谢姓齐姓高姓卢姓崔姓等的重要起源之一姜姓在当今以人口排名的中国百家姓氏中居于第位妘起源于帝喾高辛氏嬴起源于少昊金天氏；姚妫同源都是起源于帝舜；姒起源于大禹此外部落首领之子亦可得姓黄帝有二十五子得姓者十四人为姬酉祁己滕任荀葴僖姞儇依十二姓其中有四人分属二姓祝融之后为己董彭秃妘曹斟芈等八姓史称祝融八姓'
+
+function createUserName() {
+  const firstName = firstNameText.substr(Math.floor(Math.random() * firstNameText.length), 1)
+  const lastName = lastNameText.substr(Math.floor(Math.random() * lastNameText.length), 1 + Math.floor(Math.random() * 2))
+
+  return firstName + lastName
+}
+
+const username = createUserName()
+
+function createColor() {
+  const fn = function () {
+    const s = Math.floor(Math.random() * 255).toString(16)
+    if (s.length === 2) {
+      return s
+    }
+    return '0' + s
+  }
+
+  return `#${fn()}${fn()}${fn()}`
+}
+
+const user: UserInfo = {
+  username: username,
+  color: createColor(),
+  id: Math.random().toString()
+}
+
+function sleep(delay: number) {
+  return new Promise<void>(resolve => {
+    setTimeout(() => {
+      resolve()
+    }, delay)
+  })
+}
+
+class Http extends Organization {
+  async getMembers(name: string): Promise<Member[]> {
+    await sleep(100)
+    let len = Math.floor(20 / name.length + 1)
+
+    const arr = Array.from<Member>({ length: len }).map(() => {
+      return {
+        id: 'xxx',
+        name: name + createUserName(),
+        groupName: '部门-' + createUserName(),
+        groupId: 'xxx',
+        avatar: '',
+        color: createColor()
+      }
+    })
+
+    if (name.length) {
+      arr.unshift({
+        id: 'xxx',
+        name: name,
+        groupName: '部门-' + createUserName(),
+        groupId: 'xxx',
+        avatar: '',
+        color: createColor()
+      })
+    }
+
+    return Promise.resolve(arr)
+  }
+
+  atMember(member: Member) {
+    //
+  }
+}
+
+const editor = new Editor({
+  readonly: false,
+  // content: document.getElementById('article')!.innerHTML,
+  collaborateConfig: {
+    userinfo: user,
+    createConnector(yDoc): SyncConnector {
+      return new YWebsocketConnector('ws://localhost:1234', 'xnote', yDoc)
+      // return new YWebsocketConnector('wss://textbus.io/api', 'xnote', yDoc)
+    }
+  },
+  // plugins: [
+  //   new SuspensionToolbarPlugin()
+  // ],
+  providers: [
+    {
+      provide: Organization,
+      useValue: new Http()
+    },
+    {
+      provide: FileUploader,
+      useValue: {
+        uploadFile(type: string) {
+          console.log(type)
+        }
+      }
+    }
+  ]
+})
+
+function App() {
+  const editorRef = createRef<HTMLElement>()
+  const htmlRef = createRef<HTMLTextAreaElement>()
+
+  onMounted(() => {
+    editor.mount(editorRef.current!).then(() => {
+      const root = editor.get(RootComponentRef).component
+      root.changeMarker.onChange.subscribe(op => {
+        console.log(op)
+      })
+    })
+  })
+  return () => {
+    return (
+      <div>
+        <div style={{
+          display: 'flex',
+          height: '60px',
+        }}>
+          <button type="button" onClick={() => {
+            const html = editor.getHTML()
+            htmlRef.current!.value = html
+          }}>获取 HTML</button>
+          <textarea name="" id="" ref={htmlRef} cols="30" rows="10"></textarea>
+          <button type="button" onClick={() => {
+            const html = htmlRef.current!.value
+            editor.setContent(html)
+          }}>设置 HTML</button>
+        </div>
+        <div ref={editorRef}></div>
+      </div>
+    )
+  }
+}
+
+createApp(<App/>).mount(document.getElementById('app')!)
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.2.7",
+  "version": "0.3.0",
   "description": "A high-performance rich text editor that supports multiplayer online collaboration.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -27,14 +27,14 @@
   },
   "dependencies": {
     "@tanbo/color": "^0.1.1",
-    "@textbus/adapter-viewfly": "^4.3.0",
-    "@textbus/collaborate": "^4.3.0",
-    "@textbus/core": "^4.3.0",
-    "@textbus/platform-browser": "^4.3.0",
-    "@viewfly/core": "^1.1.1",
-    "@viewfly/hooks": "^1.1.1",
-    "@viewfly/platform-browser": "^1.1.1",
-    "@viewfly/scoped-css": "^1.1.1",
+    "@textbus/adapter-viewfly": "^4.3.1",
+    "@textbus/collaborate": "^4.3.1",
+    "@textbus/core": "^4.3.1",
+    "@textbus/platform-browser": "^4.3.1",
+    "@viewfly/core": "^1.1.2",
+    "@viewfly/hooks": "^1.1.2",
+    "@viewfly/platform-browser": "^1.1.5",
+    "@viewfly/scoped-css": "^1.1.2",
     "highlight.js": "^11.9.0",
     "katex": "^0.16.10",
     "uuid": "^10.0.0"
@@ -47,7 +47,7 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^5.8.0",
     "@typescript-eslint/parser": "^5.8.0",
-    "@viewfly/devtools": "^1.1.1",
+    "@viewfly/devtools": "^1.1.4",
     "autoprefixer": "^10.4.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "core-js": "^3.20.1",