Merge branch 'main' into feature/latex

# Conflicts: # packages/core/src/api/blockManipulation/__snapshots__/blockManipulation.test.ts.snap # packages/core/src/api/blockManipulation/blockManipulation.test.ts # packages/core/src/api/nodeConversions/__snapshots__/nodeConversions.test.ts.snap
TypeCellOS · jkcs · Jun 4, 2024 · Jun 4, 2024 · Jun 4, 2024 · Jun 4, 2024
commit 9a8871b603bfb5a0fb7c6f58cbf0a13ac07ce60b
diff --git a/packages/core/src/api/blockManipulation/__snapshots__/blockManipulation.test.ts.snap b/packages/core/src/api/blockManipulation/__snapshots__/blockManipulation.test.ts.snap
@@ -615,4 +615,100 @@ exports[`Inserting Blocks with Different Placements > Insert nested inside exist
 ]
 `;
 
-exports[`Update Custom Block content > update Custom Block with line break 1`] = `"<div class=\\"bn-block-group\\" data-node-type=\\"blockGroup\\"><div class=\\"bn-block-outer\\" data-node-type=\\"blockOuter\\" data-id=\\"1\\"><div class=\\"bn-block\\" data-node-type=\\"blockContainer\\" data-id=\\"1\\"><div class=\\"bn-block-content\\" data-content-type=\\"customBlock\\"><div class=\\"bn-inline-content custom-block\\" data-editable=\\"\\">Updated Custom Block with <br>line <br>break</div></div><div class=\\"bn-block-group\\" data-node-type=\\"blockGroup\\"><div class=\\"bn-block-outer\\" data-node-type=\\"blockOuter\\" data-id=\\"2\\"><div class=\\"bn-block\\" data-node-type=\\"blockContainer\\" data-id=\\"2\\"><div class=\\"bn-block-content\\" data-content-type=\\"customBlock\\"><div class=\\"bn-inline-content custom-block\\" data-editable=\\"\\">Custom Block</div></div></div></div></div></div></div><div class=\\"bn-block-outer\\" data-node-type=\\"blockOuter\\" data-id=\\"0\\"><div class=\\"bn-block\\" data-node-type=\\"blockContainer\\" data-id=\\"0\\"><div class=\\"bn-block-content\\" data-content-type=\\"paragraph\\"><p class=\\"bn-inline-content\\"></p></div></div></div></div>"`;
+exports[`Update Line Breaks > Update custom block with line break 1`] = `
+[
+  {
+    "children": [],
+    "content": [
+      {
+        "styles": {},
+        "text": "Line1
+Line2",
+        "type": "text",
+      },
+    ],
+    "id": "1",
+    "props": {
+      "backgroundColor": "default",
+      "textAlignment": "left",
+      "textColor": "default",
+    },
+    "type": "paragraph",
+  },
+  {
+    "children": [],
+    "content": [
+      {
+        "styles": {},
+        "text": "Updated Custom Block with
+line
+break",
+        "type": "text",
+      },
+    ],
+    "id": "2",
+    "props": {},
+    "type": "customBlock",
+  },
+  {
+    "children": [],
+    "content": [],
+    "id": "0",
+    "props": {
+      "backgroundColor": "default",
+      "textAlignment": "left",
+      "textColor": "default",
+    },
+    "type": "paragraph",
+  },
+]
+`;
+
+exports[`Update Line Breaks > Update paragraph with line break 1`] = `
+[
+  {
+    "children": [],
+    "content": [
+      {
+        "styles": {},
+        "text": "Updated Custom Block with
+line
+break",
+        "type": "text",
+      },
+    ],
+    "id": "1",
+    "props": {
+      "backgroundColor": "default",
+      "textAlignment": "left",
+      "textColor": "default",
+    },
+    "type": "paragraph",
+  },
+  {
+    "children": [],
+    "content": [
+      {
+        "styles": {},
+        "text": "Line1
+Line2",
+        "type": "text",
+      },
+    ],
+    "id": "2",
+    "props": {},
+    "type": "customBlock",
+  },
+  {
+    "children": [],
+    "content": [],
+    "id": "0",
+    "props": {
+      "backgroundColor": "default",
+      "textAlignment": "left",
+      "textColor": "default",
+    },
+    "type": "paragraph",
+  },
+]
+`;
diff --git a/packages/core/src/api/blockManipulation/blockManipulation.test.ts b/packages/core/src/api/blockManipulation/blockManipulation.test.ts
@@ -1,7 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import {
   Block,
-  DefaultBlockSchema,
   defaultBlockSpecs,
   DefaultInlineContentSchema,
   DefaultStyleSchema,
@@ -10,14 +9,13 @@ import {
 import { BlockNoteEditor } from "../../editor/BlockNoteEditor";
 import { createBlockSpec } from "../../schema";
 import { BlockNoteSchema } from "../../editor/BlockNoteSchema";
-import { createInternalHTMLSerializer } from "../exporters/html/internalHTMLSerializer";
 
 const CustomBlock = createBlockSpec(
   {
     type: "customBlock",
     propSchema: {},
     content: "inline",
-  },
+  } as const,
   {
     render: () => {
       const dom = document.createElement("div");
@@ -34,7 +32,7 @@ const CustomBlock = createBlockSpec(
 const schema = BlockNoteSchema.create({
   blockSpecs: {
     ...defaultBlockSpecs,
-    customBlock: CustomBlock
+    customBlock: CustomBlock,
   },
 });
 
@@ -70,12 +68,6 @@ let blocksWithLineBreaks: PartialBlock<
   DefaultStyleSchema
 >[];
 
-let customBlock: PartialBlock<
-  typeof schema.blockSchema,
-  DefaultInlineContentSchema,
-  DefaultStyleSchema
->;
-
 let insert: (
   placement: "before" | "nested" | "after"
 ) => Block<
@@ -86,7 +78,7 @@ let insert: (
 
 beforeEach(() => {
   editor = BlockNoteEditor.create<typeof schema.blockSchema>({
-    schema: schema
+    schema: schema,
   });
 
   editor.mount(div);
@@ -131,10 +123,16 @@ beforeEach(() => {
     },
   ];
 
-  customBlock = {
-    type: 'customBlock',
-    content: 'Custom Block',
-  }
+  blocksWithLineBreaks = [
+    {
+      type: "paragraph",
+      content: "Line1\nLine2",
+    },
+    {
+      type: "customBlock",
+      content: "Line1\nLine2",
+    },
+  ];
 
   insert = (placement) => {
     const existingBlock = editor.document[0];
@@ -287,26 +285,33 @@ describe("Insert, Update, & Delete Blocks", () => {
   });
 });
 
-describe("Update Custom Block content", () => {
-  it("update Custom Block with line break", async () => {
+describe("Update Line Breaks", () => {
+  it("Update paragraph with line break", async () => {
     await waitForEditor();
 
     const existingBlock = editor.document[0];
-    editor.insertBlocks([customBlock], existingBlock);
+    editor.insertBlocks(blocksWithLineBreaks, existingBlock);
 
     const newBlock = editor.document[0];
+    editor.updateBlock(newBlock, {
+      type: "paragraph",
+      content: "Updated Custom Block with \nline \nbreak",
+    });
+
+    expect(editor.document).toMatchSnapshot();
+  });
+  it("Update custom block with line break", async () => {
+    await waitForEditor();
+
+    const existingBlock = editor.document[0];
+    editor.insertBlocks(blocksWithLineBreaks, existingBlock);
+
+    const newBlock = editor.document[1];
     editor.updateBlock(newBlock, {
       type: "customBlock",
       content: "Updated Custom Block with \nline \nbreak",
-      children: [customBlock],
     });
 
-    const serializer = createInternalHTMLSerializer(
-      editor._tiptapEditor.schema,
-      editor
-    );
-    const internalHTML = serializer.serializeBlocks(editor.document);
-
-    expect(internalHTML).toMatchSnapshot();
+    expect(editor.document).toMatchSnapshot();
   });
-});
+});
diff --git a/packages/core/src/api/nodeConversions/__snapshots__/nodeConversions.test.ts.snap b/packages/core/src/api/nodeConversions/__snapshots__/nodeConversions.test.ts.snap
@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Test BlockNote-Prosemirror conversion > Case: custom blocks schema > Convert customBlock/basic to/from prosemirror 1`] = `
+exports[`Test BlockNote-Prosemirror conversion > Case: custom blocks schema > Convert customParagraph/basic to/from prosemirror 1`] = `
 {
   "attrs": {
     "backgroundColor": "default",
@@ -9,20 +9,23 @@ exports[`Test BlockNote-Prosemirror conversion > Case: custom blocks schema > Co
   },
   "content": [
     {
+      "attrs": {
+        "textAlignment": "left",
+      },
       "content": [
         {
-          "text": "Custom customBlock",
+          "text": "Custom Paragraph",
           "type": "text",
         },
       ],
-      "type": "customBlock",
+      "type": "customParagraph",
     },
   ],
   "type": "blockContainer",
 }
 `;
 
-exports[`Test BlockNote-Prosemirror conversion > Case: custom blocks schema > Convert customParagraph/basic to/from prosemirror 1`] = `
+exports[`Test BlockNote-Prosemirror conversion > Case: custom blocks schema > Convert customParagraph/lineBreaks to/from prosemirror 1`] = `
 {
   "attrs": {
     "backgroundColor": "default",
@@ -36,7 +39,14 @@ exports[`Test BlockNote-Prosemirror conversion > Case: custom blocks schema > Co
       },
       "content": [
         {
-          "text": "Custom Paragraph",
+          "text": "Line 1",
+          "type": "text",
+        },
+        {
+          "type": "hardBreak",
+        },
+        {
+          "text": "Line 2",
           "type": "text",
         },
       ],