@blocknote/core 0.17.1 → 0.19.0

package/src/api/blockManipulation/commands/nestBlock/nestBlock.ts

@@ -0,0 +1,100 @@
+import { Fragment, NodeType, Slice } from "prosemirror-model";
+import { EditorState } from "prosemirror-state";
+import { ReplaceAroundStep } from "prosemirror-transform";
+
+import { BlockNoteEditor } from "../../../../editor/BlockNoteEditor.js";
+import { getBlockInfoFromSelection } from "../../../getBlockInfoFromPos.js";
+
+// TODO: Unit tests
+/**
+ * This is a modified version of https://github.com/ProseMirror/prosemirror-schema-list/blob/569c2770cbb8092d8f11ea53ecf78cb7a4e8f15a/src/schema-list.ts#L232
+ *
+ * The original function derives too many information from the parentnode and itemtype
+ */
+function sinkListItem(itemType: NodeType, groupType: NodeType) {
+  return function ({ state, dispatch }: { state: EditorState; dispatch: any }) {
+    const { $from, $to } = state.selection;
+    const range = $from.blockRange(
+      $to,
+      (node) =>
+        node.childCount > 0 &&
+        (node.type.name === "blockGroup" || node.type.name === "column") // change necessary to not look at first item child type
+    );
+    if (!range) {
+      return false;
+    }
+    const startIndex = range.startIndex;
+    if (startIndex === 0) {
+      return false;
+    }
+    const parent = range.parent;
+    const nodeBefore = parent.child(startIndex - 1);
+    if (nodeBefore.type !== itemType) {
+      return false;
+    }
+    if (dispatch) {
+      const nestedBefore =
+        nodeBefore.lastChild && nodeBefore.lastChild.type === groupType; // change necessary to check groupType instead of parent.type
+      const inner = Fragment.from(nestedBefore ? itemType.create() : null);
+      const slice = new Slice(
+        Fragment.from(
+          itemType.create(null, Fragment.from(groupType.create(null, inner))) // change necessary to create "groupType" instead of parent.type
+        ),
+        nestedBefore ? 3 : 1,
+        0
+      );
+
+      const before = range.start;
+      const after = range.end;
+      dispatch(
+        state.tr
+          .step(
+            new ReplaceAroundStep(
+              before - (nestedBefore ? 3 : 1),
+              after,
+              before,
+              after,
+              slice,
+              1,
+              true
+            )
+          )
+          .scrollIntoView()
+      );
+    }
+    return true;
+  };
+}
+
+export function nestBlock(editor: BlockNoteEditor<any, any, any>) {
+  return editor._tiptapEditor.commands.command(
+    sinkListItem(
+      editor._tiptapEditor.schema.nodes["blockContainer"],
+      editor._tiptapEditor.schema.nodes["blockGroup"]
+    )
+  );
+}
+
+export function unnestBlock(editor: BlockNoteEditor<any, any, any>) {
+  editor._tiptapEditor.commands.liftListItem("blockContainer");
+}
+
+export function canNestBlock(editor: BlockNoteEditor<any, any, any>) {
+  const { bnBlock: blockContainer } = getBlockInfoFromSelection(
+    editor._tiptapEditor.state
+  );
+
+  return (
+    editor._tiptapEditor.state.doc.resolve(blockContainer.beforePos)
+      .nodeBefore !== null
+  );
+}
+export function canUnnestBlock(editor: BlockNoteEditor<any, any, any>) {
+  const { bnBlock: blockContainer } = getBlockInfoFromSelection(
+    editor._tiptapEditor.state
+  );
+
+  return (
+    editor._tiptapEditor.state.doc.resolve(blockContainer.beforePos).depth > 1
+  );
+}

package/src/api/blockManipulation/commands/removeBlocks/__snapshots__/removeBlocks.test.ts.snap

@@ -171,6 +171,11 @@ exports[`Test removeBlocks > Remove multiple consecutive blocks 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -922,6 +927,11 @@ exports[`Test removeBlocks > Remove single block 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [

package/src/api/blockManipulation/commands/removeBlocks/removeBlocks.ts

@@ -45,7 +45,7 @@ export function removeBlocksWithCallback<
 
     // Keeps traversing nodes if block with target ID has not been found.
     if (
-      node.type.name !== "blockContainer" ||
+      !node.type.isInGroup("bnBlock") ||
       !idsOfBlocksToRemove.has(node.attrs.id)
     ) {
       return true;

package/src/api/blockManipulation/commands/replaceBlocks/__snapshots__/replaceBlocks.test.ts.snap

@@ -171,6 +171,11 @@ exports[`Test replaceBlocks > Remove multiple consecutive blocks 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -922,6 +927,11 @@ exports[`Test replaceBlocks > Remove single block 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -1357,6 +1367,11 @@ exports[`Test replaceBlocks > Replace multiple consecutive blocks with multiple
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -1752,6 +1767,11 @@ exports[`Test replaceBlocks > Replace multiple consecutive blocks with single ba
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -2204,6 +2224,11 @@ exports[`Test replaceBlocks > Replace multiple consecutive blocks with single co
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -3730,6 +3755,11 @@ exports[`Test replaceBlocks > Replace single block with multiple 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -4195,6 +4225,11 @@ exports[`Test replaceBlocks > Replace single block with single basic 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -4717,6 +4752,11 @@ exports[`Test replaceBlocks > Replace single block with single complex 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [

package/src/api/blockManipulation/commands/splitBlock/__snapshots__/splitBlock.test.ts.snap

@@ -275,6 +275,11 @@ exports[`Test splitBlocks > Basic 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -763,6 +768,11 @@ exports[`Test splitBlocks > Block has children 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -1251,6 +1261,11 @@ exports[`Test splitBlocks > Don't keep props 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -1739,6 +1754,11 @@ exports[`Test splitBlocks > Don't keep type 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -2221,6 +2241,11 @@ exports[`Test splitBlocks > End of content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -2710,6 +2735,11 @@ exports[`Test splitBlocks > Keep type 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [

package/src/api/blockManipulation/commands/splitBlock/splitBlock.test.ts

@@ -28,11 +28,15 @@ function setSelectionWithOffset(
   offset: number
 ) {
   const posInfo = getNodeById(targetBlockId, doc);
-  const { blockContent } = getBlockInfo(posInfo);
+  const info = getBlockInfo(posInfo);
+
+  if (!info.isBlockContainer) {
+    throw new Error("Target block is not a block container");
+  }
 
   getEditor()._tiptapEditor.view.dispatch(
     getEditor()._tiptapEditor.state.tr.setSelection(
-      TextSelection.create(doc, blockContent.beforePos + offset + 1)
+      TextSelection.create(doc, info.blockContent.beforePos + offset + 1)
     )
   );
 }
@@ -123,12 +127,12 @@ describe("Test splitBlocks", () => {
 
     splitBlock(getEditor()._tiptapEditor.state.selection.anchor);
 
-    const { blockContainer } = getBlockInfoFromSelection(
+    const { bnBlock } = getBlockInfoFromSelection(
       getEditor()._tiptapEditor.state
     );
 
     const anchorIsAtStartOfNewBlock =
-      blockContainer.node.attrs.id === "0" &&
+      bnBlock.node.attrs.id === "0" &&
       getEditor()._tiptapEditor.state.selection.$anchor.parentOffset === 0;
 
     expect(anchorIsAtStartOfNewBlock).toBeTruthy();

package/src/api/blockManipulation/commands/splitBlock/splitBlock.ts

@@ -22,20 +22,24 @@ export const splitBlockCommand = (
       posInBlock
     );
 
-    const { blockContainer, blockContent } = getBlockInfo(
-      nearestBlockContainerPos
-    );
+    const info = getBlockInfo(nearestBlockContainerPos);
+
+    if (!info.isBlockContainer) {
+      throw new Error(
+        `BlockContainer expected when calling splitBlock, position ${posInBlock}`
+      );
+    }
 
     const types = [
       {
-        type: blockContainer.node.type, // always keep blockcontainer type
-        attrs: keepProps ? { ...blockContainer.node.attrs, id: undefined } : {},
+        type: info.bnBlock.node.type, // always keep blockcontainer type
+        attrs: keepProps ? { ...info.bnBlock.node.attrs, id: undefined } : {},
       },
       {
         type: keepType
-          ? blockContent.node.type
+          ? info.blockContent.node.type
           : state.schema.nodes["paragraph"],
-        attrs: keepProps ? { ...blockContent.node.attrs } : {},
+        attrs: keepProps ? { ...info.blockContent.node.attrs } : {},
       },
     ];
 

package/src/api/blockManipulation/commands/updateBlock/__snapshots__/updateBlock.test.ts.snap

@@ -258,6 +258,11 @@ exports[`Test updateBlock > Revert all props 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -729,6 +734,11 @@ exports[`Test updateBlock > Revert single prop 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -1200,6 +1210,11 @@ exports[`Test updateBlock > Update all props 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -1671,6 +1686,11 @@ exports[`Test updateBlock > Update children 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -1889,6 +1909,7 @@ exports[`Test updateBlock > Update inline content to empty table content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [],
       "rows": [],
       "type": "tableContent",
     },
@@ -2138,6 +2159,11 @@ exports[`Test updateBlock > Update inline content to empty table content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -2607,6 +2633,11 @@ exports[`Test updateBlock > Update inline content to no content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -2825,6 +2856,11 @@ exports[`Test updateBlock > Update inline content to table content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -3150,6 +3186,11 @@ exports[`Test updateBlock > Update inline content to table content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -3617,6 +3658,11 @@ exports[`Test updateBlock > Update no content to empty inline content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -4056,6 +4102,7 @@ exports[`Test updateBlock > Update no content to empty table content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [],
       "rows": [],
       "type": "tableContent",
     },
@@ -4086,6 +4133,11 @@ exports[`Test updateBlock > Update no content to empty table content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -4559,6 +4611,11 @@ exports[`Test updateBlock > Update no content to inline content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -4998,6 +5055,11 @@ exports[`Test updateBlock > Update no content to table content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -5104,6 +5166,11 @@ exports[`Test updateBlock > Update no content to table content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -5575,6 +5642,11 @@ exports[`Test updateBlock > Update single prop 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -7235,6 +7307,11 @@ exports[`Test updateBlock > Update type 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -7705,6 +7782,11 @@ exports[`Test updateBlock > Update with plain content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [
@@ -8162,6 +8244,11 @@ exports[`Test updateBlock > Update with styled content 1`] = `
   {
     "children": [],
     "content": {
+      "columnWidths": [
+        undefined,
+        undefined,
+        undefined,
+      ],
       "rows": [
         {
           "cells": [

package/src/api/blockManipulation/commands/updateBlock/updateBlock.test.ts

@@ -189,11 +189,11 @@ describe("Test updateBlock", () => {
   });
 
   it("Update inline content to empty table content", () => {
-    updateBlock(getEditor(), "paragraph-0", {
-      type: "table",
-    });
-
-    expect(getEditor().document).toMatchSnapshot();
+    expect(() => {
+      updateBlock(getEditor(), "paragraph-0", {
+        type: "table",
+      });
+    }).toThrow();
   });
 
   it("Update table content to empty inline content", () => {