fix(core): adjust the splitBlock to return false when failed (#5371)

ueberdosis · Jul 22, 2024 · 618bca9 · 618bca9
1 parent 2104f0f
commit 618bca9
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 31 deletions.
diff --git a/.changeset/eleven-needles-argue.md b/.changeset/eleven-needles-argue.md
@@ -0,0 +1,5 @@
+---
+"@tiptap/core": patch
+---
+
+Adjust the `splitBlock` command to return `false` when it was unsuccessful.
diff --git a/packages/core/src/commands/splitBlock.ts b/packages/core/src/commands/splitBlock.ts
@@ -61,45 +61,45 @@ export const splitBlock: RawCommands['splitBlock'] = ({ keepMarks = true } = {})
     return false
   }
 
-  if (dispatch) {
-    const atEnd = $to.parentOffset === $to.parent.content.size
-
-    if (selection instanceof TextSelection) {
-      tr.deleteSelection()
-    }
-
-    const deflt = $from.depth === 0
-      ? undefined
-      : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)))
-
-    let types = atEnd && deflt
+  const atEnd = $to.parentOffset === $to.parent.content.size
+
+  const deflt = $from.depth === 0
+    ? undefined
+    : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)))
+
+  let types = atEnd && deflt
+    ? [
+      {
+        type: deflt,
+        attrs: newAttributes,
+      },
+    ]
+    : undefined
+
+  let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types)
+
+  if (
+    !types
+      && !can
+      && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : undefined)
+  ) {
+    can = true
+    types = deflt
       ? [
         {
           type: deflt,
           attrs: newAttributes,
         },
       ]
       : undefined
+  }
 
-    let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types)
-
-    if (
-      !types
-        && !can
-        && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : undefined)
-    ) {
-      can = true
-      types = deflt
-        ? [
-          {
-            type: deflt,
-            attrs: newAttributes,
-          },
-        ]
-        : undefined
-    }
-
+  if (dispatch) {
     if (can) {
+      if (selection instanceof TextSelection) {
+        tr.deleteSelection()
+      }
+
       tr.split(tr.mapping.map($from.pos), 1, types)
 
       if (deflt && !atEnd && !$from.parentOffset && $from.parent.type !== deflt) {
@@ -119,5 +119,5 @@ export const splitBlock: RawCommands['splitBlock'] = ({ keepMarks = true } = {})
     tr.scrollIntoView()
   }
 
-  return true
+  return can
 }