fix: fail to convert list having blockQuote with spaces to wysiwyg (n…

…hn#1792) * fix: wrong wysiwyg listItem content property * chore: add convertor test case(block nodes in list)
ahamelers · Sep 7, 2021 · 4e8563a · 4e8563a
1 parent a47c4d5
commit 4e8563a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/src/__test__/unit/convertor.spec.ts b/src/__test__/unit/convertor.spec.ts
@@ -316,6 +316,29 @@ describe('Convertor', () => {
       assertConverting(markdown, expected);
     });
 
+    it('block nodes in list', () => {
+      const markdown = source`
+        1. foo
+
+            \`\`\`
+            bar
+            \`\`\`
+        
+            > bam
+      `;
+      const expected = source`
+        1. foo
+
+            \`\`\`
+            bar
+            \`\`\`
+        
+            > bam
+      `;
+
+      assertConverting(markdown, expected);
+    });
+
     it('soft break', () => {
       const markdown = source`
         foo

diff --git a/src/wysiwyg/nodes/bulletList.ts b/src/wysiwyg/nodes/bulletList.ts
@@ -19,7 +19,7 @@ export class BulletList extends NodeSchema {
   get schema() {
     return {
       content: 'listItem+',
-      group: 'block listGroup',
+      group: 'block',
       attrs: {
         rawHTML: { default: null },
         ...getDefaultCustomAttrs(),

diff --git a/src/wysiwyg/nodes/listItem.ts b/src/wysiwyg/nodes/listItem.ts
@@ -11,7 +11,8 @@ export class ListItem extends NodeSchema {
 
   get schema() {
     return {
-      content: 'paragraph listGroup*',
+      content: 'paragraph block*',
+      selectable: false,
       attrs: {
         task: { default: false },
         checked: { default: false },

diff --git a/src/wysiwyg/nodes/orderedList.ts b/src/wysiwyg/nodes/orderedList.ts
@@ -15,7 +15,7 @@ export class OrderedList extends NodeSchema {
   get schema() {
     return {
       content: 'listItem+',
-      group: 'block listGroup',
+      group: 'block',
       attrs: {
         order: { default: 1 },
         rawHTML: { default: null },

diff --git a/src/wysiwyg/nodes/paragraph.ts b/src/wysiwyg/nodes/paragraph.ts
@@ -11,7 +11,7 @@ export class Paragraph extends NodeSchema {
   get schema() {
     return {
       content: 'inline*',
-      group: 'block listGroup',
+      group: 'block',
       attrs: {
         ...getDefaultCustomAttrs(),
       },