@textbus/xnote 0.0.1-alpha.7 → 0.0.1-alpha.8

package/bundles/index.esm.js

@@ -901,7 +901,7 @@ class SourceCodeComponent extends Component {
             },
             action() {
                 if (selection.isCollapsed) {
-                    commander.insert(' ');
+                    commander.insert('  ');
                     return;
                 }
                 const blocks = selection.getBlocks();
@@ -1458,8 +1458,6 @@ class TableComponent extends Component {
                         rowspan: 1,
                         colspan: 1,
                         slot: new Slot([
-                            ContentType.Text,
-                            ContentType.InlineComponent,
                             ContentType.BlockComponent
                         ])
                     };
@@ -1541,8 +1539,6 @@ class TableComponent extends Component {
         this.state.rows.forEach(row => {
             const slot = new Slot([
                 ContentType.BlockComponent,
-                ContentType.InlineComponent,
-                ContentType.Text
             ]);
             slot.insert(new ParagraphComponent(this.textbus, {
                 slot: new Slot([
@@ -1570,8 +1566,6 @@ class TableComponent extends Component {
             cells: this.state.layoutWidth.map(() => {
                 const slot = new Slot([
                     ContentType.BlockComponent,
-                    ContentType.InlineComponent,
-                    ContentType.Text
                 ]);
                 slot.insert(new ParagraphComponent(this.textbus, {
                     slot: new Slot([
@@ -1779,8 +1773,6 @@ class BlockquoteComponent extends Component {
     }
     constructor(textbus, state = {
         slot: new Slot([
-            ContentType.Text,
-            ContentType.InlineComponent,
             ContentType.BlockComponent
         ])
     }) {
@@ -1798,8 +1790,6 @@ BlockquoteComponent.zenCoding = {
     createState() {
         return {
             slot: new Slot([
-                ContentType.Text,
-                ContentType.InlineComponent,
                 ContentType.BlockComponent
             ])
         };
@@ -1822,14 +1812,10 @@ const blockquoteComponentLoader = {
     },
     read(element, textbus, slotParser) {
         const delta = slotParser(new Slot([
-            ContentType.Text,
             ContentType.BlockComponent,
-            ContentType.InlineComponent
         ]), element).toDelta();
         const slot = new Slot([
             ContentType.BlockComponent,
-            ContentType.InlineComponent,
-            ContentType.Text
         ]);
         deltaToBlock(delta, textbus).forEach(i => {
             slot.insert(i);
@@ -2159,8 +2145,6 @@ class HighlightBoxComponent extends Component {
         type: '',
         slot: new Slot([
             ContentType.BlockComponent,
-            ContentType.InlineComponent,
-            ContentType.Text
         ])
     }) {
         super(textbus, state);
@@ -2214,13 +2198,9 @@ const highlightBoxComponentLoader = {
     read(element, textbus, slotParser) {
         const delta = slotParser(new Slot([
             ContentType.BlockComponent,
-            ContentType.InlineComponent,
-            ContentType.Text
         ]), element.querySelector('.xnote-highlight-box-content')).toDelta();
         const slot = new Slot([
             ContentType.BlockComponent,
-            ContentType.InlineComponent,
-            ContentType.Text
         ]);
         deltaToBlock(delta, textbus).forEach(i => {
             slot.insert(i);
@@ -3934,45 +3914,17 @@ class RootComponent extends Component {
         this.onCompositionStart = new Subject();
     }
     static fromJSON(textbus, json) {
-        // const heading = textbus.get(Registry).createSlot(json.heading)
         const content = textbus.get(Registry).createSlot(json.content);
         return new RootComponent(textbus, {
-            // heading,
             content
         });
     }
     setup() {
-        // const textbus = useContext()
-        // const selection = textbus.get(Selection)
-        // onBreak(ev => {
-        //   if (ev.target === this.state.heading) {
-        //     const afterContent = ev.target.cut(ev.data.index)
-        //     const p = new ParagraphComponent(textbus, {
-        //       slot: afterContent
-        //     })
-        //     const body = this.state.content
-        //     body.retain(0)
-        //     body.insert(p)
-        //     selection.setPosition(afterContent, 0)
-        //     ev.preventDefault()
-        //   }
-        // })
         useBlockContent(this.state.content);
         onCompositionStart(ev => {
             this.onCompositionStart.next(ev);
         });
     }
-    afterCheck() {
-        const content = this.state.content;
-        const lastContent = content.getContentAtIndex(content.length - 1);
-        if (lastContent instanceof ParagraphComponent ||
-            lastContent instanceof ListComponent ||
-            lastContent instanceof TodolistComponent) {
-            return;
-        }
-        content.retain(content.length);
-        content.insert(new ParagraphComponent(this.textbus));
-    }
 }
 RootComponent.componentName = 'RootComponent';
 RootComponent.type = ContentType.BlockComponent;
@@ -3987,9 +3939,6 @@ function RootView(props) {
             sub.unsubscribe();
         };
     });
-    // onUpdated(() => {
-    //   props.component.afterCheck()
-    // })
     const readonly = useReadonly();
     const output = useOutput();
     return () => {
@@ -4658,8 +4607,6 @@ const tableComponentLoader = {
                 Array.from(row.cells).forEach(cell => {
                     const slot = new Slot([
                         ContentType.BlockComponent,
-                        ContentType.InlineComponent,
-                        ContentType.Text
                     ]);
                     arr.push({
                         slot,
@@ -4668,8 +4615,6 @@ const tableComponentLoader = {
                     });
                     const delta = slotParser(new Slot([
                         ContentType.BlockComponent,
-                        ContentType.InlineComponent,
-                        ContentType.Text
                     ]), cell).toDelta();
                     const results = deltaToBlock(delta, textbus);
                     results.forEach(i => {
@@ -4687,8 +4632,6 @@ const tableComponentLoader = {
                 Array.from(row.cells).forEach(cell => {
                     const slot = new Slot([
                         ContentType.BlockComponent,
-                        ContentType.InlineComponent,
-                        ContentType.Text
                     ]);
                     arr.push({
                         slot,
@@ -4697,8 +4640,6 @@ const tableComponentLoader = {
                     });
                     const delta = slotParser(new Slot([
                         ContentType.BlockComponent,
-                        ContentType.InlineComponent,
-                        ContentType.Text
                     ]), cell).toDelta();
                     const results = deltaToBlock(delta, textbus);
                     results.forEach(i => {
@@ -4775,8 +4716,6 @@ function autoComplete(table) {
                     rowspan: 1,
                     colspan: 1,
                     slot: new Slot([
-                        ContentType.Text,
-                        ContentType.InlineComponent,
                         ContentType.BlockComponent
                     ])
                 };
@@ -4933,14 +4872,12 @@ class Editor extends Textbus {
             const parser = this.get(Parser);
             const doc = parser.parseDoc(config.content, rootComponentLoader);
             rootComp = doc instanceof Component ? doc : new RootComponent(this, {
-                // heading: new Slot([ContentType.Text]),
                 content: doc
             });
         }
         else {
             rootComp = new RootComponent(this, {
-                // heading: new Slot([ContentType.Text]),
-                content: new Slot([ContentType.Text, ContentType.InlineComponent, ContentType.BlockComponent])
+                content: new Slot([ContentType.BlockComponent])
             });
         }
         return this.render(rootComp);

package/bundles/index.js

@@ -903,7 +903,7 @@ class SourceCodeComponent extends core$1.Component {
             },
             action() {
                 if (selection.isCollapsed) {
-                    commander.insert(' ');
+                    commander.insert('  ');
                     return;
                 }
                 const blocks = selection.getBlocks();
@@ -1460,8 +1460,6 @@ class TableComponent extends core$1.Component {
                         rowspan: 1,
                         colspan: 1,
                         slot: new core$1.Slot([
-                            core$1.ContentType.Text,
-                            core$1.ContentType.InlineComponent,
                             core$1.ContentType.BlockComponent
                         ])
                     };
@@ -1543,8 +1541,6 @@ class TableComponent extends core$1.Component {
         this.state.rows.forEach(row => {
             const slot = new core$1.Slot([
                 core$1.ContentType.BlockComponent,
-                core$1.ContentType.InlineComponent,
-                core$1.ContentType.Text
             ]);
             slot.insert(new ParagraphComponent(this.textbus, {
                 slot: new core$1.Slot([
@@ -1572,8 +1568,6 @@ class TableComponent extends core$1.Component {
             cells: this.state.layoutWidth.map(() => {
                 const slot = new core$1.Slot([
                     core$1.ContentType.BlockComponent,
-                    core$1.ContentType.InlineComponent,
-                    core$1.ContentType.Text
                 ]);
                 slot.insert(new ParagraphComponent(this.textbus, {
                     slot: new core$1.Slot([
@@ -1781,8 +1775,6 @@ class BlockquoteComponent extends core$1.Component {
     }
     constructor(textbus, state = {
         slot: new core$1.Slot([
-            core$1.ContentType.Text,
-            core$1.ContentType.InlineComponent,
             core$1.ContentType.BlockComponent
         ])
     }) {
@@ -1800,8 +1792,6 @@ BlockquoteComponent.zenCoding = {
     createState() {
         return {
             slot: new core$1.Slot([
-                core$1.ContentType.Text,
-                core$1.ContentType.InlineComponent,
                 core$1.ContentType.BlockComponent
             ])
         };
@@ -1824,14 +1814,10 @@ const blockquoteComponentLoader = {
     },
     read(element, textbus, slotParser) {
         const delta = slotParser(new core$1.Slot([
-            core$1.ContentType.Text,
             core$1.ContentType.BlockComponent,
-            core$1.ContentType.InlineComponent
         ]), element).toDelta();
         const slot = new core$1.Slot([
             core$1.ContentType.BlockComponent,
-            core$1.ContentType.InlineComponent,
-            core$1.ContentType.Text
         ]);
         deltaToBlock(delta, textbus).forEach(i => {
             slot.insert(i);
@@ -2161,8 +2147,6 @@ class HighlightBoxComponent extends core$1.Component {
         type: '',
         slot: new core$1.Slot([
             core$1.ContentType.BlockComponent,
-            core$1.ContentType.InlineComponent,
-            core$1.ContentType.Text
         ])
     }) {
         super(textbus, state);
@@ -2216,13 +2200,9 @@ const highlightBoxComponentLoader = {
     read(element, textbus, slotParser) {
         const delta = slotParser(new core$1.Slot([
             core$1.ContentType.BlockComponent,
-            core$1.ContentType.InlineComponent,
-            core$1.ContentType.Text
         ]), element.querySelector('.xnote-highlight-box-content')).toDelta();
         const slot = new core$1.Slot([
             core$1.ContentType.BlockComponent,
-            core$1.ContentType.InlineComponent,
-            core$1.ContentType.Text
         ]);
         deltaToBlock(delta, textbus).forEach(i => {
             slot.insert(i);
@@ -3936,45 +3916,17 @@ class RootComponent extends core$1.Component {
         this.onCompositionStart = new core$1.Subject();
     }
     static fromJSON(textbus, json) {
-        // const heading = textbus.get(Registry).createSlot(json.heading)
         const content = textbus.get(core$1.Registry).createSlot(json.content);
         return new RootComponent(textbus, {
-            // heading,
             content
         });
     }
     setup() {
-        // const textbus = useContext()
-        // const selection = textbus.get(Selection)
-        // onBreak(ev => {
-        //   if (ev.target === this.state.heading) {
-        //     const afterContent = ev.target.cut(ev.data.index)
-        //     const p = new ParagraphComponent(textbus, {
-        //       slot: afterContent
-        //     })
-        //     const body = this.state.content
-        //     body.retain(0)
-        //     body.insert(p)
-        //     selection.setPosition(afterContent, 0)
-        //     ev.preventDefault()
-        //   }
-        // })
         useBlockContent(this.state.content);
         core$1.onCompositionStart(ev => {
             this.onCompositionStart.next(ev);
         });
     }
-    afterCheck() {
-        const content = this.state.content;
-        const lastContent = content.getContentAtIndex(content.length - 1);
-        if (lastContent instanceof ParagraphComponent ||
-            lastContent instanceof ListComponent ||
-            lastContent instanceof TodolistComponent) {
-            return;
-        }
-        content.retain(content.length);
-        content.insert(new ParagraphComponent(this.textbus));
-    }
 }
 RootComponent.componentName = 'RootComponent';
 RootComponent.type = core$1.ContentType.BlockComponent;
@@ -3989,9 +3941,6 @@ function RootView(props) {
             sub.unsubscribe();
         };
     });
-    // onUpdated(() => {
-    //   props.component.afterCheck()
-    // })
     const readonly = useReadonly();
     const output = useOutput();
     return () => {
@@ -4660,8 +4609,6 @@ const tableComponentLoader = {
                 Array.from(row.cells).forEach(cell => {
                     const slot = new core$1.Slot([
                         core$1.ContentType.BlockComponent,
-                        core$1.ContentType.InlineComponent,
-                        core$1.ContentType.Text
                     ]);
                     arr.push({
                         slot,
@@ -4670,8 +4617,6 @@ const tableComponentLoader = {
                     });
                     const delta = slotParser(new core$1.Slot([
                         core$1.ContentType.BlockComponent,
-                        core$1.ContentType.InlineComponent,
-                        core$1.ContentType.Text
                     ]), cell).toDelta();
                     const results = deltaToBlock(delta, textbus);
                     results.forEach(i => {
@@ -4689,8 +4634,6 @@ const tableComponentLoader = {
                 Array.from(row.cells).forEach(cell => {
                     const slot = new core$1.Slot([
                         core$1.ContentType.BlockComponent,
-                        core$1.ContentType.InlineComponent,
-                        core$1.ContentType.Text
                     ]);
                     arr.push({
                         slot,
@@ -4699,8 +4642,6 @@ const tableComponentLoader = {
                     });
                     const delta = slotParser(new core$1.Slot([
                         core$1.ContentType.BlockComponent,
-                        core$1.ContentType.InlineComponent,
-                        core$1.ContentType.Text
                     ]), cell).toDelta();
                     const results = deltaToBlock(delta, textbus);
                     results.forEach(i => {
@@ -4777,8 +4718,6 @@ function autoComplete(table) {
                     rowspan: 1,
                     colspan: 1,
                     slot: new core$1.Slot([
-                        core$1.ContentType.Text,
-                        core$1.ContentType.InlineComponent,
                         core$1.ContentType.BlockComponent
                     ])
                 };
@@ -4935,14 +4874,12 @@ class Editor extends core$1.Textbus {
             const parser = this.get(platformBrowser.Parser);
             const doc = parser.parseDoc(config.content, rootComponentLoader);
             rootComp = doc instanceof core$1.Component ? doc : new RootComponent(this, {
-                // heading: new Slot([ContentType.Text]),
                 content: doc
             });
         }
         else {
             rootComp = new RootComponent(this, {
-                // heading: new Slot([ContentType.Text]),
-                content: new core$1.Slot([core$1.ContentType.Text, core$1.ContentType.InlineComponent, core$1.ContentType.BlockComponent])
+                content: new core$1.Slot([core$1.ContentType.BlockComponent])
             });
         }
         return this.render(rootComp);

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

@@ -11,7 +11,6 @@ export declare class RootComponent extends Component<RootComponentState> {
     static fromJSON(textbus: Textbus, json: ComponentStateLiteral<RootComponentState>): RootComponent;
     onCompositionStart: Subject<Event<Slot, CompositionStartEventData>>;
     setup(): void;
-    afterCheck(): void;
 }
 export declare function RootView(props: ViewComponentProps<RootComponent>): () => any;
 export declare const rootComponentLoader: ComponentLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.0.1-alpha.7",
+  "version": "0.0.1-alpha.8",
   "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.44",
-    "@textbus/collaborate": "^4.0.0-alpha.44",
-    "@textbus/core": "^4.0.0-alpha.44",
-    "@textbus/platform-browser": "^4.0.0-alpha.44",
+    "@textbus/adapter-viewfly": "^4.0.0-alpha.45",
+    "@textbus/collaborate": "^4.0.0-alpha.45",
+    "@textbus/core": "^4.0.0-alpha.45",
+    "@textbus/platform-browser": "^4.0.0-alpha.45",
     "@viewfly/core": "^1.0.0-alpha.2",
     "@viewfly/hooks": "^1.0.0-alpha.2",
     "@viewfly/platform-browser": "^1.0.0-alpha.2",