refactor: make nest block use the transactions API

Author: nperez0111

packages/core/src/api/blockManipulation/commands/nestBlock/nestBlock.ts

@@ -1,5 +1,5 @@
 import { Fragment, NodeType, Slice } from "prosemirror-model";
-import { EditorState, Transaction } from "prosemirror-state";
+import { Transaction } from "prosemirror-state";
 import { ReplaceAroundStep } from "prosemirror-transform";
 
 import { BlockNoteEditor } from "../../../../editor/BlockNoteEditor.js";
@@ -11,68 +11,67 @@ import { getBlockInfoFromTransaction } from "../../../getBlockInfoFromPos.js";
  *
  * The original function derives too many information from the parentnode and itemtype
  */
-function sinkListItem(itemType: NodeType, groupType: NodeType) {
-  return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
-    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,
-      );
+function sinkListItem(
+  tr: Transaction,
+  itemType: NodeType,
+  groupType: NodeType,
+) {
+  const { $from, $to } = tr.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;
+  }
+  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;
+
+  tr.step(
+    new ReplaceAroundStep(
+      before - (nestedBefore ? 3 : 1),
+      after,
+      before,
+      after,
+      slice,
+      1,
+      true,
+    ),
+  ).scrollIntoView();
 
-      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;
-  };
+  return true;
 }
 
 export function nestBlock(editor: BlockNoteEditor<any, any, any>) {
-  return editor.exec((state, dispatch) =>
+  return editor.transact((tr) => {
     sinkListItem(
-      state.schema.nodes["blockContainer"],
-      state.schema.nodes["blockGroup"],
-    )(state, dispatch),
-  );
+      tr,
+      editor.pmSchema.nodes["blockContainer"],
+      editor.pmSchema.nodes["blockGroup"],
+    );
+  });
 }
 
 export function unnestBlock(editor: BlockNoteEditor<any, any, any>) {