@textbus/xnote 0.0.1-alpha.10 → 0.0.1-alpha.12

package/bundles/index.esm.js

@@ -647,14 +647,14 @@ function ParagraphView(props) {
     const output = useOutput();
     return () => {
         const slot = props.component.state.slot;
-        return (jsx("div", { class: "xnote-paragraph", ref: props.rootRef, "data-component": ParagraphComponent.name, children: adapter.slotRender(slot, children => {
+        return (jsx("div", { class: "xnote-paragraph", ref: props.rootRef, "data-component": ParagraphComponent.componentName, children: adapter.slotRender(slot, children => {
                 return (createVNode('p', null, children));
             }, readonly() || output()) }));
     };
 }
 const paragraphComponentLoader = {
     match(element) {
-        return element.dataset.compoment === ParagraphComponent.name || /P|H[1-6]/.test(element.tagName);
+        return element.dataset.compoment === ParagraphComponent.componentName || /P|H[1-6]/.test(element.tagName);
     },
     read(element, textbus, slotParser) {
         const content = /P|H[1-6]/.test(element.tagName) ? element : element.children[0];
@@ -4042,7 +4042,7 @@ class RootComponent extends Component {
         });
     }
     setup() {
-        useBlockContent(this.state.content);
+        useBlockContent((slot) => slot === this.state.content);
         onCompositionStart(ev => {
             this.onCompositionStart.next(ev);
         });
@@ -4065,7 +4065,7 @@ function RootView(props) {
     const output = useOutput();
     return () => {
         const { rootRef } = props;
-        return (jsx("div", { class: "xnote-root", ref: [rootRef, ref], children: adapter.slotRender(content, children => {
+        return (jsx("div", { class: "xnote-root", ref: [rootRef, ref], "data-comopnent": props.component.name, children: adapter.slotRender(content, children => {
                 return (createVNode('div', {
                     class: 'xnote-content',
                     'data-placeholder': content.isEmpty ? '请输入内容' : ''
@@ -4084,9 +4084,7 @@ const rootComponentLoader = {
             ContentType.Text
         ]), element).toDelta();
         const slot = new Slot([
-            ContentType.BlockComponent,
-            ContentType.InlineComponent,
-            ContentType.Text
+            ContentType.BlockComponent
         ]);
         deltaToBlock(delta, textbus).forEach(i => {
             slot.insert(i);
@@ -4940,9 +4938,22 @@ class Editor extends Textbus {
         if (config.content) {
             const parser = this.get(Parser);
             const doc = parser.parseDoc(config.content, rootComponentLoader);
-            rootComp = doc instanceof Component ? doc : new RootComponent(this, {
-                content: doc
-            });
+            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
+                });
+            }
         }
         else {
             rootComp = new RootComponent(this, {

package/bundles/index.js

@@ -649,14 +649,14 @@ function ParagraphView(props) {
     const output = useOutput();
     return () => {
         const slot = props.component.state.slot;
-        return (jsxRuntime.jsx("div", { class: "xnote-paragraph", ref: props.rootRef, "data-component": ParagraphComponent.name, children: adapter.slotRender(slot, children => {
+        return (jsxRuntime.jsx("div", { class: "xnote-paragraph", ref: props.rootRef, "data-component": ParagraphComponent.componentName, children: adapter.slotRender(slot, children => {
                 return (core$1.createVNode('p', null, children));
             }, readonly() || output()) }));
     };
 }
 const paragraphComponentLoader = {
     match(element) {
-        return element.dataset.compoment === ParagraphComponent.name || /P|H[1-6]/.test(element.tagName);
+        return element.dataset.compoment === ParagraphComponent.componentName || /P|H[1-6]/.test(element.tagName);
     },
     read(element, textbus, slotParser) {
         const content = /P|H[1-6]/.test(element.tagName) ? element : element.children[0];
@@ -4044,7 +4044,7 @@ class RootComponent extends core$1.Component {
         });
     }
     setup() {
-        useBlockContent(this.state.content);
+        useBlockContent((slot) => slot === this.state.content);
         core$1.onCompositionStart(ev => {
             this.onCompositionStart.next(ev);
         });
@@ -4067,7 +4067,7 @@ function RootView(props) {
     const output = useOutput();
     return () => {
         const { rootRef } = props;
-        return (jsxRuntime.jsx("div", { class: "xnote-root", ref: [rootRef, ref], children: adapter.slotRender(content, children => {
+        return (jsxRuntime.jsx("div", { class: "xnote-root", ref: [rootRef, ref], "data-comopnent": props.component.name, children: adapter.slotRender(content, children => {
                 return (core$1.createVNode('div', {
                     class: 'xnote-content',
                     'data-placeholder': content.isEmpty ? '请输入内容' : ''
@@ -4086,9 +4086,7 @@ const rootComponentLoader = {
             core$1.ContentType.Text
         ]), element).toDelta();
         const slot = new core$1.Slot([
-            core$1.ContentType.BlockComponent,
-            core$1.ContentType.InlineComponent,
-            core$1.ContentType.Text
+            core$1.ContentType.BlockComponent
         ]);
         deltaToBlock(delta, textbus).forEach(i => {
             slot.insert(i);
@@ -4942,9 +4940,22 @@ class Editor extends core$1.Textbus {
         if (config.content) {
             const parser = this.get(platformBrowser.Parser);
             const doc = parser.parseDoc(config.content, rootComponentLoader);
-            rootComp = doc instanceof core$1.Component ? doc : new RootComponent(this, {
-                content: doc
-            });
+            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
+                });
+            }
         }
         else {
             rootComp = new RootComponent(this, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.0.1-alpha.10",
+  "version": "0.0.1-alpha.12",
   "description": "Viewfly project.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -14,10 +14,10 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@textbus/adapter-viewfly": "^4.0.0-alpha.49",
-    "@textbus/collaborate": "^4.0.0-alpha.49",
-    "@textbus/core": "^4.0.0-alpha.49",
-    "@textbus/platform-browser": "^4.0.0-alpha.49",
+    "@textbus/adapter-viewfly": "^4.0.0-alpha.50",
+    "@textbus/collaborate": "^4.0.0-alpha.50",
+    "@textbus/core": "^4.0.0-alpha.50",
+    "@textbus/platform-browser": "^4.0.0-alpha.50",
     "@viewfly/core": "^1.0.0-alpha.4",
     "@viewfly/hooks": "^1.0.0-alpha.4",
     "@viewfly/platform-browser": "^1.0.0-alpha.4",