@blocknote/core 0.16.0 → 0.17.1

package/src/blocks/HeadingBlockContent/HeadingBlockContent.ts

@@ -1,12 +1,13 @@
 import { InputRule } from "@tiptap/core";
+import { updateBlockCommand } from "../../api/blockManipulation/commands/updateBlock/updateBlock.js";
+import { getBlockInfoFromSelection } from "../../api/getBlockInfoFromPos.js";
 import {
   PropSchema,
   createBlockSpecFromStronglyTypedTiptapNode,
   createStronglyTypedTiptapNode,
-} from "../../schema";
-import { createDefaultBlockDOMOutputSpec } from "../defaultBlockHelpers";
-import { defaultProps } from "../defaultProps";
-import { getCurrentBlockContentType } from "../../api/getCurrentBlockContentType";
+} from "../../schema/index.js";
+import { createDefaultBlockDOMOutputSpec } from "../defaultBlockHelpers.js";
+import { defaultProps } from "../defaultProps.js";
 
 export const headingPropSchema = {
   ...defaultProps,
@@ -46,19 +47,27 @@ const HeadingBlockContent = createStronglyTypedTiptapNode({
         return new InputRule({
           find: new RegExp(`^(#{${level}})\\s$`),
           handler: ({ state, chain, range }) => {
-            if (getCurrentBlockContentType(this.editor) !== "inline*") {
+            const blockInfo = getBlockInfoFromSelection(state);
+            if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
               return;
             }
 
             chain()
-              .BNUpdateBlock(state.selection.from, {
-                type: "heading",
-                props: {
-                  level: level as any,
-                },
-              })
+              .command(
+                updateBlockCommand(
+                  this.options.editor,
+                  blockInfo.blockContainer.beforePos,
+                  {
+                    type: "heading",
+                    props: {
+                      level: level as any,
+                    },
+                  }
+                )
+              )
               // Removes the "#" character(s) used to set the heading.
-              .deleteRange({ from: range.from, to: range.to });
+              .deleteRange({ from: range.from, to: range.to })
+              .run();
           },
         });
       }),
@@ -68,48 +77,61 @@ const HeadingBlockContent = createStronglyTypedTiptapNode({
   addKeyboardShortcuts() {
     return {
       "Mod-Alt-1": () => {
-        if (getCurrentBlockContentType(this.editor) !== "inline*") {
+        const blockInfo = getBlockInfoFromSelection(this.editor.state);
+        if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
           return true;
         }
 
-        return this.editor.commands.BNUpdateBlock(
-          this.editor.state.selection.anchor,
-          {
-            type: "heading",
-            props: {
-              level: 1 as any,
-            },
-          }
+        // call updateBlockCommand
+        return this.editor.commands.command(
+          updateBlockCommand(
+            this.options.editor,
+            blockInfo.blockContainer.beforePos,
+            {
+              type: "heading",
+              props: {
+                level: 1 as any,
+              },
+            }
+          )
         );
       },
       "Mod-Alt-2": () => {
-        if (getCurrentBlockContentType(this.editor) !== "inline*") {
+        const blockInfo = getBlockInfoFromSelection(this.editor.state);
+        if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
           return true;
         }
 
-        return this.editor.commands.BNUpdateBlock(
-          this.editor.state.selection.anchor,
-          {
-            type: "heading",
-            props: {
-              level: 2 as any,
-            },
-          }
+        return this.editor.commands.command(
+          updateBlockCommand(
+            this.options.editor,
+            blockInfo.blockContainer.beforePos,
+            {
+              type: "heading",
+              props: {
+                level: 2 as any,
+              },
+            }
+          )
         );
       },
       "Mod-Alt-3": () => {
-        if (getCurrentBlockContentType(this.editor) !== "inline*") {
+        const blockInfo = getBlockInfoFromSelection(this.editor.state);
+        if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
           return true;
         }
 
-        return this.editor.commands.BNUpdateBlock(
-          this.editor.state.selection.anchor,
-          {
-            type: "heading",
-            props: {
-              level: 3 as any,
-            },
-          }
+        return this.editor.commands.command(
+          updateBlockCommand(
+            this.options.editor,
+            blockInfo.blockContainer.beforePos,
+            {
+              type: "heading",
+              props: {
+                level: 3 as any,
+              },
+            }
+          )
         );
       },
     };

package/src/blocks/ImageBlockContent/ImageBlockContent.ts

@@ -1,12 +1,12 @@
-import type { BlockNoteEditor } from "../../editor/BlockNoteEditor";
+import type { BlockNoteEditor } from "../../editor/BlockNoteEditor.js";
 import {
   BlockFromConfig,
   createBlockSpec,
   FileBlockConfig,
   Props,
   PropSchema,
-} from "../../schema";
-import { defaultProps } from "../defaultProps";
+} from "../../schema/index.js";
+import { defaultProps } from "../defaultProps.js";
 import {
   createFigureWithCaption,
   createFileAndCaptionWrapper,
@@ -14,8 +14,8 @@ import {
   createLinkWithCaption,
   createResizeHandlesWrapper,
   parseFigureElement,
-} from "../FileBlockContent/fileBlockHelpers";
-import { parseImageElement } from "./imageBlockHelpers";
+} from "../FileBlockContent/fileBlockHelpers.js";
+import { parseImageElement } from "./imageBlockHelpers.js";
 
 export const imagePropSchema = {
   textAlignment: defaultProps.textAlignment,

package/src/blocks/ListItemBlockContent/BulletListItemBlockContent/BulletListItemBlockContent.ts

@@ -1,13 +1,14 @@
 import { InputRule } from "@tiptap/core";
+import { updateBlockCommand } from "../../../api/blockManipulation/commands/updateBlock/updateBlock.js";
+import { getBlockInfoFromSelection } from "../../../api/getBlockInfoFromPos.js";
 import {
   PropSchema,
   createBlockSpecFromStronglyTypedTiptapNode,
   createStronglyTypedTiptapNode,
-} from "../../../schema";
-import { createDefaultBlockDOMOutputSpec } from "../../defaultBlockHelpers";
-import { defaultProps } from "../../defaultProps";
-import { handleEnter } from "../ListItemKeyboardShortcuts";
-import { getCurrentBlockContentType } from "../../../api/getCurrentBlockContentType";
+} from "../../../schema/index.js";
+import { createDefaultBlockDOMOutputSpec } from "../../defaultBlockHelpers.js";
+import { defaultProps } from "../../defaultProps.js";
+import { handleEnter } from "../ListItemKeyboardShortcuts.js";
 
 export const bulletListItemPropSchema = {
   ...defaultProps,
@@ -26,15 +27,22 @@ const BulletListItemBlockContent = createStronglyTypedTiptapNode({
       new InputRule({
         find: new RegExp(`^[-+*]\\s$`),
         handler: ({ state, chain, range }) => {
-          if (getCurrentBlockContentType(this.editor) !== "inline*") {
+          const blockInfo = getBlockInfoFromSelection(state);
+          if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
             return;
           }
 
           chain()
-            .BNUpdateBlock(state.selection.from, {
-              type: "bulletListItem",
-              props: {},
-            })
+            .command(
+              updateBlockCommand(
+                this.options.editor,
+                blockInfo.blockContainer.beforePos,
+                {
+                  type: "bulletListItem",
+                  props: {},
+                }
+              )
+            )
             // Removes the "-", "+", or "*" character used to set the list.
             .deleteRange({ from: range.from, to: range.to });
         },
@@ -44,18 +52,22 @@ const BulletListItemBlockContent = createStronglyTypedTiptapNode({
 
   addKeyboardShortcuts() {
     return {
-      Enter: () => handleEnter(this.editor),
+      Enter: () => handleEnter(this.options.editor),
       "Mod-Shift-8": () => {
-        if (getCurrentBlockContentType(this.editor) !== "inline*") {
+        const blockInfo = getBlockInfoFromSelection(this.editor.state);
+        if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
           return true;
         }
 
-        return this.editor.commands.BNUpdateBlock(
-          this.editor.state.selection.anchor,
-          {
-            type: "bulletListItem",
-            props: {},
-          }
+        return this.options.editor.commands.command(
+          updateBlockCommand(
+            this.options.editor,
+            blockInfo.blockContainer.beforePos,
+            {
+              type: "bulletListItem",
+              props: {},
+            }
+          )
         );
       },
     };

package/src/blocks/ListItemBlockContent/CheckListItemBlockContent/CheckListItemBlockContent.ts

@@ -1,13 +1,17 @@
 import { InputRule } from "@tiptap/core";
+import { updateBlockCommand } from "../../../api/blockManipulation/commands/updateBlock/updateBlock.js";
+import {
+  getBlockInfoFromSelection,
+  getNearestBlockContainerPos,
+} from "../../../api/getBlockInfoFromPos.js";
 import {
   PropSchema,
   createBlockSpecFromStronglyTypedTiptapNode,
   createStronglyTypedTiptapNode,
-} from "../../../schema";
-import { createDefaultBlockDOMOutputSpec } from "../../defaultBlockHelpers";
-import { defaultProps } from "../../defaultProps";
-import { handleEnter } from "../ListItemKeyboardShortcuts";
-import { getCurrentBlockContentType } from "../../../api/getCurrentBlockContentType";
+} from "../../../schema/index.js";
+import { createDefaultBlockDOMOutputSpec } from "../../defaultBlockHelpers.js";
+import { defaultProps } from "../../defaultProps.js";
+import { handleEnter } from "../ListItemKeyboardShortcuts.js";
 
 export const checkListItemPropSchema = {
   ...defaultProps,
@@ -44,17 +48,24 @@ const checkListItemBlockContent = createStronglyTypedTiptapNode({
       new InputRule({
         find: new RegExp(`\\[\\s*\\]\\s$`),
         handler: ({ state, chain, range }) => {
-          if (getCurrentBlockContentType(this.editor) !== "inline*") {
+          const blockInfo = getBlockInfoFromSelection(state);
+          if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
             return;
           }
 
           chain()
-            .BNUpdateBlock(state.selection.from, {
-              type: "checkListItem",
-              props: {
-                checked: false as any,
-              },
-            })
+            .command(
+              updateBlockCommand(
+                this.options.editor,
+                blockInfo.blockContainer.beforePos,
+                {
+                  type: "checkListItem",
+                  props: {
+                    checked: false as any,
+                  },
+                }
+              )
+            )
             // Removes the characters used to set the list.
             .deleteRange({ from: range.from, to: range.to });
         },
@@ -62,17 +73,25 @@ const checkListItemBlockContent = createStronglyTypedTiptapNode({
       new InputRule({
         find: new RegExp(`\\[[Xx]\\]\\s$`),
         handler: ({ state, chain, range }) => {
-          if (getCurrentBlockContentType(this.editor) !== "inline*") {
+          const blockInfo = getBlockInfoFromSelection(state);
+
+          if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
             return;
           }
 
           chain()
-            .BNUpdateBlock(state.selection.from, {
-              type: "checkListItem",
-              props: {
-                checked: true as any,
-              },
-            })
+            .command(
+              updateBlockCommand(
+                this.options.editor,
+                blockInfo.blockContainer.beforePos,
+                {
+                  type: "checkListItem",
+                  props: {
+                    checked: true as any,
+                  },
+                }
+              )
+            )
             // Removes the characters used to set the list.
             .deleteRange({ from: range.from, to: range.to });
         },
@@ -82,18 +101,22 @@ const checkListItemBlockContent = createStronglyTypedTiptapNode({
 
   addKeyboardShortcuts() {
     return {
-      Enter: () => handleEnter(this.editor),
+      Enter: () => handleEnter(this.options.editor),
       "Mod-Shift-9": () => {
-        if (getCurrentBlockContentType(this.editor) !== "inline*") {
+        const blockInfo = getBlockInfoFromSelection(this.options.editor.state);
+        if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
           return true;
         }
 
-        return this.editor.commands.BNUpdateBlock(
-          this.editor.state.selection.anchor,
-          {
-            type: "checkListItem",
-            props: {},
-          }
+        return this.editor.commands.command(
+          updateBlockCommand(
+            this.options.editor,
+            blockInfo.blockContainer.beforePos,
+            {
+              type: "checkListItem",
+              props: {},
+            }
+          )
         );
       },
     };
@@ -211,13 +234,24 @@ const checkListItemBlockContent = createStronglyTypedTiptapNode({
           return;
         }
 
+        // TODO: test
         if (typeof getPos !== "boolean") {
-          this.editor.commands.BNUpdateBlock(getPos(), {
-            type: "checkListItem",
-            props: {
-              checked: checkbox.checked as any,
-            },
-          });
+          const beforeBlockContainerPos = getNearestBlockContainerPos(
+            editor.state.doc,
+            getPos()
+          );
+          this.editor.commands.command(
+            updateBlockCommand(
+              this.options.editor,
+              beforeBlockContainerPos.posBeforeNode,
+              {
+                type: "checkListItem",
+                props: {
+                  checked: checkbox.checked as any,
+                },
+              }
+            )
+          );
         }
       };
       checkbox.addEventListener("change", changeHandler);

package/src/blocks/ListItemBlockContent/ListItemKeyboardShortcuts.ts

@@ -1,35 +1,39 @@
-import { Editor } from "@tiptap/core";
-import { getBlockInfoFromPos } from "../../api/getBlockInfoFromPos";
+import { splitBlockCommand } from "../../api/blockManipulation/commands/splitBlock/splitBlock.js";
+import { updateBlockCommand } from "../../api/blockManipulation/commands/updateBlock/updateBlock.js";
+import { getBlockInfoFromSelection } from "../../api/getBlockInfoFromPos.js";
+import { BlockNoteEditor } from "../../editor/BlockNoteEditor.js";
 
-export const handleEnter = (editor: Editor) => {
-  const { contentNode, contentType } = getBlockInfoFromPos(
-    editor.state.doc,
-    editor.state.selection.from
-  )!;
+export const handleEnter = (editor: BlockNoteEditor<any, any, any>) => {
+  const ttEditor = editor._tiptapEditor;
+  const { blockContent, blockContainer } = getBlockInfoFromSelection(
+    ttEditor.state
+  );
 
   const selectionEmpty =
-    editor.state.selection.anchor === editor.state.selection.head;
+    ttEditor.state.selection.anchor === ttEditor.state.selection.head;
 
   if (
     !(
-      contentType.name === "bulletListItem" ||
-      contentType.name === "numberedListItem" ||
-      contentType.name === "checkListItem"
+      blockContent.node.type.name === "bulletListItem" ||
+      blockContent.node.type.name === "numberedListItem" ||
+      blockContent.node.type.name === "checkListItem"
     ) ||
     !selectionEmpty
   ) {
     return false;
   }
 
-  return editor.commands.first(({ state, chain, commands }) => [
+  return ttEditor.commands.first(({ state, chain, commands }) => [
     () =>
       // Changes list item block to a paragraph block if the content is empty.
       commands.command(() => {
-        if (contentNode.childCount === 0) {
-          return commands.BNUpdateBlock(state.selection.from, {
-            type: "paragraph",
-            props: {},
-          });
+        if (blockContent.node.childCount === 0) {
+          return commands.command(
+            updateBlockCommand(editor, blockContainer.beforePos, {
+              type: "paragraph",
+              props: {},
+            })
+          );
         }
 
         return false;
@@ -39,10 +43,10 @@ export const handleEnter = (editor: Editor) => {
       // Splits the current block, moving content inside that's after the cursor
       // to a new block of the same type below.
       commands.command(() => {
-        if (contentNode.childCount > 0) {
+        if (blockContent.node.childCount > 0) {
           chain()
             .deleteSelection()
-            .BNSplitBlock(state.selection.from, true)
+            .command(splitBlockCommand(state.selection.from, true))
             .run();
 
           return true;

package/src/blocks/ListItemBlockContent/NumberedListItemBlockContent/NumberedListIndexingPlugin.ts

@@ -1,5 +1,5 @@
 import { Plugin, PluginKey } from "prosemirror-state";
-import { getBlockInfoFromPos } from "../../../api/getBlockInfoFromPos";
+import { getBlockInfo } from "../../../api/getBlockInfoFromPos.js";
 
 // ProseMirror Plugin which automatically assigns indices to ordered list items per nesting level.
 const PLUGIN_KEY = new PluginKey(`numbered-list-indexing`);
@@ -21,46 +21,44 @@ export const NumberedListIndexingPlugin = () => {
           node.firstChild!.type.name === "numberedListItem"
         ) {
           let newIndex = "1";
-          const isFirstBlockInDoc = pos === 1;
 
-          const blockInfo = getBlockInfoFromPos(tr.doc, pos + 1)!;
-          if (blockInfo === undefined) {
-            return;
-          }
+          const blockInfo = getBlockInfo({
+            posBeforeNode: pos,
+            node,
+          });
 
           // Checks if this block is the start of a new ordered list, i.e. if it's the first block in the document, the
           // first block in its nesting level, or the previous block is not an ordered list item.
-          if (!isFirstBlockInDoc) {
-            const prevBlockInfo = getBlockInfoFromPos(tr.doc, pos - 2)!;
-            if (prevBlockInfo === undefined) {
-              return;
-            }
 
-            const isFirstBlockInNestingLevel =
-              blockInfo.depth !== prevBlockInfo.depth;
+          const prevBlock = tr.doc.resolve(
+            blockInfo.blockContainer.beforePos
+          ).nodeBefore;
 
-            if (!isFirstBlockInNestingLevel) {
-              const prevBlockContentNode = prevBlockInfo.contentNode;
-              const prevBlockContentType = prevBlockInfo.contentType;
+          if (prevBlock) {
+            const prevBlockInfo = getBlockInfo({
+              posBeforeNode:
+                blockInfo.blockContainer.beforePos - prevBlock.nodeSize,
+              node: prevBlock,
+            });
 
-              const isPrevBlockOrderedListItem =
-                prevBlockContentType.name === "numberedListItem";
+            const isPrevBlockOrderedListItem =
+              prevBlockInfo.blockContent.node.type.name === "numberedListItem";
 
-              if (isPrevBlockOrderedListItem) {
-                const prevBlockIndex = prevBlockContentNode.attrs["index"];
+            if (isPrevBlockOrderedListItem) {
+              const prevBlockIndex =
+                prevBlockInfo.blockContent.node.attrs["index"];
 
-                newIndex = (parseInt(prevBlockIndex) + 1).toString();
-              }
+              newIndex = (parseInt(prevBlockIndex) + 1).toString();
             }
           }
 
-          const contentNode = blockInfo.contentNode;
+          const contentNode = blockInfo.blockContent.node;
           const index = contentNode.attrs["index"];
 
           if (index !== newIndex) {
             modified = true;
 
-            tr.setNodeMarkup(pos + 1, undefined, {
+            tr.setNodeMarkup(blockInfo.blockContent.beforePos, undefined, {
               index: newIndex,
             });
           }

package/src/blocks/ListItemBlockContent/NumberedListItemBlockContent/NumberedListItemBlockContent.ts

@@ -1,14 +1,15 @@
 import { InputRule } from "@tiptap/core";
+import { updateBlockCommand } from "../../../api/blockManipulation/commands/updateBlock/updateBlock.js";
+import { getBlockInfoFromSelection } from "../../../api/getBlockInfoFromPos.js";
 import {
   PropSchema,
   createBlockSpecFromStronglyTypedTiptapNode,
   createStronglyTypedTiptapNode,
-} from "../../../schema";
-import { createDefaultBlockDOMOutputSpec } from "../../defaultBlockHelpers";
-import { defaultProps } from "../../defaultProps";
-import { handleEnter } from "../ListItemKeyboardShortcuts";
-import { NumberedListIndexingPlugin } from "./NumberedListIndexingPlugin";
-import { getCurrentBlockContentType } from "../../../api/getCurrentBlockContentType";
+} from "../../../schema/index.js";
+import { createDefaultBlockDOMOutputSpec } from "../../defaultBlockHelpers.js";
+import { defaultProps } from "../../defaultProps.js";
+import { handleEnter } from "../ListItemKeyboardShortcuts.js";
+import { NumberedListIndexingPlugin } from "./NumberedListIndexingPlugin.js";
 
 export const numberedListItemPropSchema = {
   ...defaultProps,
@@ -39,15 +40,22 @@ const NumberedListItemBlockContent = createStronglyTypedTiptapNode({
       new InputRule({
         find: new RegExp(`^1\\.\\s$`),
         handler: ({ state, chain, range }) => {
-          if (getCurrentBlockContentType(this.editor) !== "inline*") {
+          const blockInfo = getBlockInfoFromSelection(state);
+          if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
             return;
           }
 
           chain()
-            .BNUpdateBlock(state.selection.from, {
-              type: "numberedListItem",
-              props: {},
-            })
+            .command(
+              updateBlockCommand(
+                this.options.editor,
+                blockInfo.blockContainer.beforePos,
+                {
+                  type: "numberedListItem",
+                  props: {},
+                }
+              )
+            )
             // Removes the "1." characters used to set the list.
             .deleteRange({ from: range.from, to: range.to });
         },
@@ -57,18 +65,22 @@ const NumberedListItemBlockContent = createStronglyTypedTiptapNode({
 
   addKeyboardShortcuts() {
     return {
-      Enter: () => handleEnter(this.editor),
+      Enter: () => handleEnter(this.options.editor),
       "Mod-Shift-7": () => {
-        if (getCurrentBlockContentType(this.editor) !== "inline*") {
+        const blockInfo = getBlockInfoFromSelection(this.editor.state);
+        if (blockInfo.blockContent.node.type.spec.content !== "inline*") {
           return true;
         }
 
-        return this.editor.commands.BNUpdateBlock(
-          this.editor.state.selection.anchor,
-          {
-            type: "numberedListItem",
-            props: {},
-          }
+        return this.editor.commands.command(
+          updateBlockCommand(
+            this.options.editor,
+            blockInfo.blockContainer.beforePos,
+            {
+              type: "numberedListItem",
+              props: {},
+            }
+          )
         );
       },
     };