@blocknote/core 0.30.0 → 0.31.0

package/src/api/blockManipulation/getBlock/getBlock.ts

@@ -13,10 +13,10 @@ import { getPmSchema } from "../../pmUtil.js";
 export function getBlock<
   BSchema extends BlockSchema,
   I extends InlineContentSchema,
-  S extends StyleSchema
+  S extends StyleSchema,
 >(
   doc: Node,
-  blockIdentifier: BlockIdentifier
+  blockIdentifier: BlockIdentifier,
 ): Block<BSchema, I, S> | undefined {
   const id =
     typeof blockIdentifier === "string" ? blockIdentifier : blockIdentifier.id;
@@ -33,10 +33,10 @@ export function getBlock<
 export function getPrevBlock<
   BSchema extends BlockSchema,
   I extends InlineContentSchema,
-  S extends StyleSchema
+  S extends StyleSchema,
 >(
   doc: Node,
-  blockIdentifier: BlockIdentifier
+  blockIdentifier: BlockIdentifier,
 ): Block<BSchema, I, S> | undefined {
   const id =
     typeof blockIdentifier === "string" ? blockIdentifier : blockIdentifier.id;
@@ -59,10 +59,10 @@ export function getPrevBlock<
 export function getNextBlock<
   BSchema extends BlockSchema,
   I extends InlineContentSchema,
-  S extends StyleSchema
+  S extends StyleSchema,
 >(
   doc: Node,
-  blockIdentifier: BlockIdentifier
+  blockIdentifier: BlockIdentifier,
 ): Block<BSchema, I, S> | undefined {
   const id =
     typeof blockIdentifier === "string" ? blockIdentifier : blockIdentifier.id;
@@ -73,7 +73,7 @@ export function getNextBlock<
   }
 
   const $posAfterNode = doc.resolve(
-    posInfo.posBeforeNode + posInfo.node.nodeSize
+    posInfo.posBeforeNode + posInfo.node.nodeSize,
   );
   const nodeToConvert = $posAfterNode.nodeAfter;
   if (!nodeToConvert) {
@@ -86,10 +86,10 @@ export function getNextBlock<
 export function getParentBlock<
   BSchema extends BlockSchema,
   I extends InlineContentSchema,
-  S extends StyleSchema
+  S extends StyleSchema,
 >(
   doc: Node,
-  blockIdentifier: BlockIdentifier
+  blockIdentifier: BlockIdentifier,
 ): Block<BSchema, I, S> | undefined {
   const id =
     typeof blockIdentifier === "string" ? blockIdentifier : blockIdentifier.id;

package/src/api/blockManipulation/insertContentAt.ts

@@ -10,7 +10,7 @@ export function insertContentAt(
   nodes: Node[],
   options: {
     updateSelection: boolean;
-  } = { updateSelection: true }
+  } = { updateSelection: true },
 ) {
   // don’t dispatch an empty fragment because this can lead to strange errors
   // if (content.toString() === "<>") {

package/src/api/blockManipulation/selections/selection.ts

@@ -10,14 +10,17 @@ import {
   StyleSchema,
 } from "../../../schema/index.js";
 import { getBlockInfo, getNearestBlockPos } from "../../getBlockInfoFromPos.js";
-import { nodeToBlock } from "../../nodeConversions/nodeToBlock.js";
+import {
+  nodeToBlock,
+  prosemirrorSliceToSlicedBlocks,
+} from "../../nodeConversions/nodeToBlock.js";
 import { getNodeById } from "../../nodeUtil.js";
 import { getBlockNoteSchema, getPmSchema } from "../../pmUtil.js";
 
 export function getSelection<
   BSchema extends BlockSchema,
   I extends InlineContentSchema,
-  S extends StyleSchema
+  S extends StyleSchema,
 >(tr: Transaction): Selection<BSchema, I, S> | undefined {
   const pmSchema = getPmSchema(tr);
   // Return undefined if the selection is collapsed or a node is selected.
@@ -26,10 +29,10 @@ export function getSelection<
   }
 
   const $startBlockBeforePos = tr.doc.resolve(
-    getNearestBlockPos(tr.doc, tr.selection.from).posBeforeNode
+    getNearestBlockPos(tr.doc, tr.selection.from).posBeforeNode,
   );
   const $endBlockBeforePos = tr.doc.resolve(
-    getNearestBlockPos(tr.doc, tr.selection.to).posBeforeNode
+    getNearestBlockPos(tr.doc, tr.selection.to).posBeforeNode,
   );
 
   // Converts the node at the given index and depth around `$startBlockBeforePos`
@@ -37,14 +40,14 @@ export function getSelection<
   // at the depth of `$startBlockBeforePos`.
   const indexToBlock = (
     index: number,
-    depth?: number
+    depth?: number,
   ): Block<BSchema, I, S> => {
     const pos = $startBlockBeforePos.posAtIndex(index, depth);
     const node = tr.doc.resolve(pos).nodeAfter;
 
     if (!node) {
       throw new Error(
-        `Error getting selection - node not found at position ${pos}`
+        `Error getting selection - node not found at position ${pos}`,
       );
     }
 
@@ -120,7 +123,7 @@ export function getSelection<
 
   if (blocks.length === 0) {
     throw new Error(
-      `Error getting selection - selection doesn't span any blocks (${tr.selection})`
+      `Error getting selection - selection doesn't span any blocks (${tr.selection})`,
     );
   }
 
@@ -132,7 +135,7 @@ export function getSelection<
 export function setSelection(
   tr: Transaction,
   startBlock: BlockIdentifier,
-  endBlock: BlockIdentifier
+  endBlock: BlockIdentifier,
 ) {
   const startBlockId =
     typeof startBlock === "string" ? startBlock : startBlock.id;
@@ -142,7 +145,7 @@ export function setSelection(
 
   if (startBlockId === endBlockId) {
     throw new Error(
-      `Attempting to set selection with the same anchor and head blocks (id ${startBlockId})`
+      `Attempting to set selection with the same anchor and head blocks (id ${startBlockId})`,
     );
   }
   const anchorPosInfo = getNodeById(startBlockId, tr.doc);
@@ -171,12 +174,12 @@ export function setSelection(
     anchorBlockConfig.content === "none"
   ) {
     throw new Error(
-      `Attempting to set selection anchor in block without content (id ${startBlockId})`
+      `Attempting to set selection anchor in block without content (id ${startBlockId})`,
     );
   }
   if (!headBlockInfo.isBlockContainer || headBlockConfig.content === "none") {
     throw new Error(
-      `Attempting to set selection anchor in block without content (id ${endBlockId})`
+      `Attempting to set selection anchor in block without content (id ${endBlockId})`,
     );
   }
 
@@ -201,7 +204,7 @@ export function setSelection(
       tableMap.positionAt(
         tableMap.height - 1,
         tableMap.width - 1,
-        headBlockInfo.blockContent.node
+        headBlockInfo.blockContent.node,
       ) +
       1;
     const lastCellNodeSize = tr.doc.resolve(lastCellPos).nodeAfter!.nodeSize;
@@ -216,3 +219,47 @@ export function setSelection(
   //  restriction that the start/end blocks must have content.
   tr.setSelection(TextSelection.create(tr.doc, startPos, endPos));
 }
+
+export function getSelectionCutBlocks(tr: Transaction) {
+  // TODO: fix image node selection
+
+  const pmSchema = getPmSchema(tr);
+  let start = tr.selection.$from;
+  let end = tr.selection.$to;
+
+  // the selection moves below are used to make sure `prosemirrorSliceToSlicedBlocks` returns
+  // the correct information about whether content is cut at the start or end of a block
+
+  // if the end is at the end of a node (|</span></p>) move it forward so we include all closing tags (</span></p>|)
+  while (end.parentOffset >= end.parent.nodeSize - 2 && end.depth > 0) {
+    end = tr.doc.resolve(end.pos + 1);
+  }
+
+  // if the end is at the start of an empty node (</span></p><p>|) move it backwards so we drop empty start tags (</span></p>|)
+  while (end.parentOffset === 0 && end.depth > 0) {
+    end = tr.doc.resolve(end.pos - 1);
+  }
+
+  // if the start is at the start of a node (<p><span>|) move it backwards so we include all open tags (|<p><span>)
+  while (start.parentOffset === 0 && start.depth > 0) {
+    start = tr.doc.resolve(start.pos - 1);
+  }
+
+  // if the start is at the end of a node (|</p><p><span>|) move it forwards so we drop all closing tags (|<p><span>)
+  while (start.parentOffset >= start.parent.nodeSize - 2 && start.depth > 0) {
+    start = tr.doc.resolve(start.pos + 1);
+  }
+
+  const selectionInfo = prosemirrorSliceToSlicedBlocks(
+    tr.doc.slice(start.pos, end.pos, true),
+    pmSchema,
+  );
+
+  return {
+    _meta: {
+      startPos: start.pos,
+      endPos: end.pos,
+    },
+    ...selectionInfo,
+  };
+}

package/src/api/blockManipulation/selections/{textCursorPosition/textCursorPosition.ts → textCursorPosition.ts}

@@ -4,26 +4,26 @@ import {
   TextSelection,
   type Transaction,
 } from "prosemirror-state";
-import type { TextCursorPosition } from "../../../../editor/cursorPositionTypes.js";
+import type { TextCursorPosition } from "../../../editor/cursorPositionTypes.js";
 import type {
   BlockIdentifier,
   BlockSchema,
   InlineContentSchema,
   StyleSchema,
-} from "../../../../schema/index.js";
-import { UnreachableCaseError } from "../../../../util/typescript.js";
+} from "../../../schema/index.js";
+import { UnreachableCaseError } from "../../../util/typescript.js";
 import {
   getBlockInfo,
   getBlockInfoFromTransaction,
-} from "../../../getBlockInfoFromPos.js";
-import { nodeToBlock } from "../../../nodeConversions/nodeToBlock.js";
-import { getNodeById } from "../../../nodeUtil.js";
-import { getBlockNoteSchema, getPmSchema } from "../../../pmUtil.js";
+} from "../../getBlockInfoFromPos.js";
+import { nodeToBlock } from "../../nodeConversions/nodeToBlock.js";
+import { getNodeById } from "../../nodeUtil.js";
+import { getBlockNoteSchema, getPmSchema } from "../../pmUtil.js";
 
 export function getTextCursorPosition<
   BSchema extends BlockSchema,
   I extends InlineContentSchema,
-  S extends StyleSchema
+  S extends StyleSchema,
 >(tr: Transaction): TextCursorPosition<BSchema, I, S> {
   const { bnBlock } = getBlockInfoFromTransaction(tr);
   const pmSchema = getPmSchema(tr.doc);
@@ -58,7 +58,7 @@ export function getTextCursorPosition<
 export function setTextCursorPosition(
   tr: Transaction,
   targetBlock: BlockIdentifier,
-  placement: "start" | "end" = "start"
+  placement: "start" | "end" = "start",
 ) {
   const id = typeof targetBlock === "string" ? targetBlock : targetBlock.id;
   const pmSchema = getPmSchema(tr.doc);
@@ -84,11 +84,11 @@ export function setTextCursorPosition(
     if (contentType === "inline") {
       if (placement === "start") {
         tr.setSelection(
-          TextSelection.create(tr.doc, blockContent.beforePos + 1)
+          TextSelection.create(tr.doc, blockContent.beforePos + 1),
         );
       } else {
         tr.setSelection(
-          TextSelection.create(tr.doc, blockContent.afterPos - 1)
+          TextSelection.create(tr.doc, blockContent.afterPos - 1),
         );
       }
     } else if (contentType === "table") {
@@ -97,11 +97,11 @@ export function setTextCursorPosition(
         // and `tableCell` nodes to get to the `tableParagraph` node we want to
         // set the selection in.
         tr.setSelection(
-          TextSelection.create(tr.doc, blockContent.beforePos + 4)
+          TextSelection.create(tr.doc, blockContent.beforePos + 4),
         );
       } else {
         tr.setSelection(
-          TextSelection.create(tr.doc, blockContent.afterPos - 4)
+          TextSelection.create(tr.doc, blockContent.afterPos - 4),
         );
       }
     } else {