@tiptap/extension-list 3.23.6 → 3.25.0

package/dist/task-list/index.js

@@ -21,7 +21,11 @@ var TaskList = Node.create({
     ];
   },
   renderHTML({ HTMLAttributes }) {
-    return ["ul", mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, { "data-type": this.name }), 0];
+    return [
+      "ul",
+      mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, { "data-type": this.name }),
+      0
+    ];
   },
   parseMarkdown: (token, h) => {
     return h.createNode("taskList", {}, h.parseChildren(token.items || []));

package/dist/task-list/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/task-list/task-list.ts"],"sourcesContent":["import { mergeAttributes, Node, parseIndentedBlocks } from '@tiptap/core'\n\nexport interface TaskListOptions {\n  /**\n   * The node type name for a task item.\n   * @default 'taskItem'\n   * @example 'myCustomTaskItem'\n   */\n  itemTypeName: string\n\n  /**\n   * The HTML attributes for a task list node.\n   * @default {}\n   * @example { class: 'foo' }\n   */\n  HTMLAttributes: Record<string, any>\n}\n\ndeclare module '@tiptap/core' {\n  interface Commands<ReturnType> {\n    taskList: {\n      /**\n       * Toggle a task list\n       * @example editor.commands.toggleTaskList()\n       */\n      toggleTaskList: () => ReturnType\n    }\n  }\n}\n\n/**\n * This extension allows you to create task lists.\n * @see https://www.tiptap.dev/api/nodes/task-list\n */\nexport const TaskList = Node.create<TaskListOptions>({\n  name: 'taskList',\n\n  addOptions() {\n    return {\n      itemTypeName: 'taskItem',\n      HTMLAttributes: {},\n    }\n  },\n\n  group: 'block list',\n\n  content() {\n    return `${this.options.itemTypeName}+`\n  },\n\n  parseHTML() {\n    return [\n      {\n        tag: `ul[data-type=\"${this.name}\"]`,\n        priority: 51,\n      },\n    ]\n  },\n\n  renderHTML({ HTMLAttributes }) {\n    return ['ul', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, { 'data-type': this.name }), 0]\n  },\n\n  parseMarkdown: (token, h) => {\n    return h.createNode('taskList', {}, h.parseChildren(token.items || []))\n  },\n\n  renderMarkdown: (node, h) => {\n    if (!node.content) {\n      return ''\n    }\n\n    return h.renderChildren(node.content, '\\n')\n  },\n\n  markdownTokenizer: {\n    name: 'taskList',\n    level: 'block',\n    start(src) {\n      // Look for the start of a task list item\n      const index = src.match(/^\\s*[-+*]\\s+\\[([ xX])\\]\\s+/)?.index\n      return index !== undefined ? index : -1\n    },\n    tokenize(src, tokens, lexer) {\n      // Helper function to recursively parse task lists\n      const parseTaskListContent = (content: string): any[] | undefined => {\n        const nestedResult = parseIndentedBlocks(\n          content,\n          {\n            itemPattern: /^(\\s*)([-+*])\\s+\\[([ xX])\\]\\s+(.*)$/,\n            extractItemData: match => ({\n              indentLevel: match[1].length,\n              mainContent: match[4],\n              checked: match[3].toLowerCase() === 'x',\n            }),\n            createToken: (data, nestedTokens) => ({\n              type: 'taskItem',\n              raw: '',\n              mainContent: data.mainContent,\n              indentLevel: data.indentLevel,\n              checked: data.checked,\n              text: data.mainContent,\n              tokens: lexer.inlineTokens(data.mainContent),\n              nestedTokens,\n            }),\n            // Allow recursive nesting\n            customNestedParser: parseTaskListContent,\n          },\n          lexer,\n        )\n\n        if (nestedResult) {\n          // Return as task list token\n          return [\n            {\n              type: 'taskList',\n              raw: nestedResult.raw,\n              items: nestedResult.items,\n            },\n          ]\n        }\n\n        // Fall back to regular markdown parsing if not a task list\n        return lexer.blockTokens(content)\n      }\n\n      const result = parseIndentedBlocks(\n        src,\n        {\n          itemPattern: /^(\\s*)([-+*])\\s+\\[([ xX])\\]\\s+(.*)$/,\n          extractItemData: match => ({\n            indentLevel: match[1].length,\n            mainContent: match[4],\n            checked: match[3].toLowerCase() === 'x',\n          }),\n          createToken: (data, nestedTokens) => ({\n            type: 'taskItem',\n            raw: '',\n            mainContent: data.mainContent,\n            indentLevel: data.indentLevel,\n            checked: data.checked,\n            text: data.mainContent,\n            tokens: lexer.inlineTokens(data.mainContent),\n            nestedTokens,\n          }),\n          // Use the recursive parser for nested content\n          customNestedParser: parseTaskListContent,\n        },\n        lexer,\n      )\n\n      if (!result) {\n        return undefined\n      }\n\n      return {\n        type: 'taskList',\n        raw: result.raw,\n        items: result.items,\n      }\n    },\n  },\n\n  markdownOptions: {\n    indentsContent: true,\n  },\n\n  addCommands() {\n    return {\n      toggleTaskList:\n        () =>\n        ({ commands }) => {\n          return commands.toggleList(this.name, this.options.itemTypeName)\n        },\n    }\n  },\n\n  addKeyboardShortcuts() {\n    return {\n      'Mod-Shift-9': () => this.editor.commands.toggleTaskList(),\n    }\n  },\n})\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/task-list/task-list.ts"],"sourcesContent":["import { mergeAttributes, Node, parseIndentedBlocks } from '@tiptap/core'\n\nexport interface TaskListOptions {\n  /**\n   * The node type name for a task item.\n   * @default 'taskItem'\n   * @example 'myCustomTaskItem'\n   */\n  itemTypeName: string\n\n  /**\n   * The HTML attributes for a task list node.\n   * @default {}\n   * @example { class: 'foo' }\n   */\n  HTMLAttributes: Record<string, any>\n}\n\ndeclare module '@tiptap/core' {\n  interface Commands<ReturnType> {\n    taskList: {\n      /**\n       * Toggle a task list\n       * @example editor.commands.toggleTaskList()\n       */\n      toggleTaskList: () => ReturnType\n    }\n  }\n}\n\n/**\n * This extension allows you to create task lists.\n * @see https://www.tiptap.dev/api/nodes/task-list\n */\nexport const TaskList = Node.create<TaskListOptions>({\n  name: 'taskList',\n\n  addOptions() {\n    return {\n      itemTypeName: 'taskItem',\n      HTMLAttributes: {},\n    }\n  },\n\n  group: 'block list',\n\n  content() {\n    return `${this.options.itemTypeName}+`\n  },\n\n  parseHTML() {\n    return [\n      {\n        tag: `ul[data-type=\"${this.name}\"]`,\n        priority: 51,\n      },\n    ]\n  },\n\n  renderHTML({ HTMLAttributes }) {\n    return [\n      'ul',\n      mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, { 'data-type': this.name }),\n      0,\n    ]\n  },\n\n  parseMarkdown: (token, h) => {\n    return h.createNode('taskList', {}, h.parseChildren(token.items || []))\n  },\n\n  renderMarkdown: (node, h) => {\n    if (!node.content) {\n      return ''\n    }\n\n    return h.renderChildren(node.content, '\\n')\n  },\n\n  markdownTokenizer: {\n    name: 'taskList',\n    level: 'block',\n    start(src) {\n      // Look for the start of a task list item\n      const index = src.match(/^\\s*[-+*]\\s+\\[([ xX])\\]\\s+/)?.index\n      return index !== undefined ? index : -1\n    },\n    tokenize(src, tokens, lexer) {\n      // Helper function to recursively parse task lists\n      const parseTaskListContent = (content: string): any[] | undefined => {\n        const nestedResult = parseIndentedBlocks(\n          content,\n          {\n            itemPattern: /^(\\s*)([-+*])\\s+\\[([ xX])\\]\\s+(.*)$/,\n            extractItemData: match => ({\n              indentLevel: match[1].length,\n              mainContent: match[4],\n              checked: match[3].toLowerCase() === 'x',\n            }),\n            createToken: (data, nestedTokens) => ({\n              type: 'taskItem',\n              raw: '',\n              mainContent: data.mainContent,\n              indentLevel: data.indentLevel,\n              checked: data.checked,\n              text: data.mainContent,\n              tokens: lexer.inlineTokens(data.mainContent),\n              nestedTokens,\n            }),\n            // Allow recursive nesting\n            customNestedParser: parseTaskListContent,\n          },\n          lexer,\n        )\n\n        if (nestedResult) {\n          // Return as task list token\n          return [\n            {\n              type: 'taskList',\n              raw: nestedResult.raw,\n              items: nestedResult.items,\n            },\n          ]\n        }\n\n        // Fall back to regular markdown parsing if not a task list\n        return lexer.blockTokens(content)\n      }\n\n      const result = parseIndentedBlocks(\n        src,\n        {\n          itemPattern: /^(\\s*)([-+*])\\s+\\[([ xX])\\]\\s+(.*)$/,\n          extractItemData: match => ({\n            indentLevel: match[1].length,\n            mainContent: match[4],\n            checked: match[3].toLowerCase() === 'x',\n          }),\n          createToken: (data, nestedTokens) => ({\n            type: 'taskItem',\n            raw: '',\n            mainContent: data.mainContent,\n            indentLevel: data.indentLevel,\n            checked: data.checked,\n            text: data.mainContent,\n            tokens: lexer.inlineTokens(data.mainContent),\n            nestedTokens,\n          }),\n          // Use the recursive parser for nested content\n          customNestedParser: parseTaskListContent,\n        },\n        lexer,\n      )\n\n      if (!result) {\n        return undefined\n      }\n\n      return {\n        type: 'taskList',\n        raw: result.raw,\n        items: result.items,\n      }\n    },\n  },\n\n  markdownOptions: {\n    indentsContent: true,\n  },\n\n  addCommands() {\n    return {\n      toggleTaskList:\n        () =>\n        ({ commands }) => {\n          return commands.toggleList(this.name, this.options.itemTypeName)\n        },\n    }\n  },\n\n  addKeyboardShortcuts() {\n    return {\n      'Mod-Shift-9': () => this.editor.commands.toggleTaskList(),\n    }\n  },\n})\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,18 +1,30 @@
 {
   "name": "@tiptap/extension-list",
+  "version": "3.25.0",
   "description": "List extension for tiptap",
-  "version": "3.23.6",
-  "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
     "tiptap extension"
   ],
+  "homepage": "https://tiptap.dev",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ueberdosis/tiptap",
+    "directory": "packages/extension-list"
+  },
   "funding": {
     "type": "github",
     "url": "https://github.com/sponsors/ueberdosis"
   },
+  "files": [
+    "src",
+    "dist"
+  ],
   "type": "module",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": {
@@ -79,28 +91,15 @@
       "require": "./dist/task-list/index.cjs"
     }
   },
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "src",
-    "dist"
-  ],
   "devDependencies": {
-    "@tiptap/pm": "^3.23.6",
-    "@tiptap/core": "^3.23.6"
+    "@tiptap/core": "^3.25.0",
+    "@tiptap/pm": "^3.25.0"
   },
   "peerDependencies": {
-    "@tiptap/core": "3.23.6",
-    "@tiptap/pm": "3.23.6"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ueberdosis/tiptap",
-    "directory": "packages/extension-list"
+    "@tiptap/core": "3.25.0",
+    "@tiptap/pm": "3.25.0"
   },
   "scripts": {
-    "build": "tsup",
-    "lint": "prettier ./src/ --check && eslint --cache --quiet --no-error-on-unmatched-pattern ./src/"
+    "build": "tsup"
   }
 }

package/src/helpers/createBranchingListDeleteKeymap.ts

@@ -0,0 +1,24 @@
+import { Extension } from '@tiptap/core'
+
+import { handleDeleteBranchingNestedList } from './handleDeleteBranchingNestedList.js'
+
+/**
+ * Creates a high-priority keymap extension that handles Delete for branching nested lists.
+ * Kept separate from the list item node so Enter/Tab shortcuts keep their default priority.
+ */
+export const createBranchingListDeleteKeymap = (itemName: string, wrapperNames: string[]) => {
+  return Extension.create({
+    name: `${itemName}BranchingDeleteKeymap`,
+    priority: 101,
+
+    addKeyboardShortcuts() {
+      const handleDelete = () =>
+        handleDeleteBranchingNestedList(this.editor, itemName, wrapperNames)
+
+      return {
+        Delete: handleDelete,
+        'Mod-Delete': handleDelete,
+      }
+    },
+  })
+}

package/src/helpers/getBranchingNestedListAtCursor.ts

@@ -0,0 +1,116 @@
+import type { Node } from '@tiptap/pm/model'
+import type { EditorState } from '@tiptap/pm/state'
+
+export type BranchingNestedListAtCursor = {
+  listItemDepth: number
+  nestedList: Node
+  nestedListPos: number
+  insertPos: number
+  items: Node[]
+}
+
+/**
+ * Resolves a branching nested list immediately after the cursor when the selection is
+ * collapsed at the end of a textblock inside a list item.
+ *
+ * @param state - The editor state to inspect.
+ * @param itemName - The list item node name (for example `listItem` or `taskItem`).
+ * @param wrapperNames - List wrapper node names (for example `bulletList` and `orderedList`).
+ * @returns Resolved positions and nodes for hoisting, or `null` when not applicable.
+ *
+ * @example
+ * ```ts
+ * const context = getBranchingNestedListAtCursor(editor.state, 'listItem', [
+ *   'bulletList',
+ *   'orderedList',
+ * ])
+ *
+ * if (context) {
+ *   // cursor is at the end of Item 1 before a branching nested sublist
+ * }
+ * ```
+ */
+export const getBranchingNestedListAtCursor = (
+  state: EditorState,
+  itemName: string,
+  wrapperNames: string[],
+): BranchingNestedListAtCursor | null => {
+  const { selection } = state
+
+  if (!selection.empty) {
+    return null
+  }
+
+  const { $from } = selection
+
+  if (!$from.parent.isTextblock) {
+    return null
+  }
+
+  if ($from.parentOffset !== $from.parent.content.size) {
+    return null
+  }
+
+  let listItemDepth = -1
+
+  for (let depth = $from.depth; depth > 0; depth -= 1) {
+    if ($from.node(depth).type.name === itemName) {
+      listItemDepth = depth
+      break
+    }
+  }
+
+  if (listItemDepth < 0) {
+    return null
+  }
+
+  const listItem = $from.node(listItemDepth)
+  const indexInListItem = $from.index(listItemDepth)
+
+  if (indexInListItem + 1 >= listItem.childCount) {
+    return null
+  }
+
+  const nextChild = listItem.child(indexInListItem + 1)
+
+  if (!wrapperNames.includes(nextChild.type.name)) {
+    return null
+  }
+
+  const itemType = state.schema.nodes[itemName]
+  let hasBranching = false
+
+  nextChild.forEach(child => {
+    if (child.type === itemType && child.childCount > 1) {
+      hasBranching = true
+    }
+  })
+
+  if (!hasBranching) {
+    return null
+  }
+
+  const nodeAfter = state.doc.resolve($from.after()).nodeAfter
+
+  if (!nodeAfter || !wrapperNames.includes(nodeAfter.type.name)) {
+    return null
+  }
+
+  const items: Node[] = []
+
+  nodeAfter.forEach(child => {
+    items.push(child)
+  })
+
+  if (items.length === 0) {
+    return null
+  }
+
+  return {
+    listItemDepth,
+    nestedList: nodeAfter,
+    nestedListPos: $from.after(),
+    insertPos: $from.after(listItemDepth),
+    items,
+  }
+}

package/src/helpers/handleDeleteBranchingNestedList.ts

@@ -0,0 +1,25 @@
+import type { Editor } from '@tiptap/core'
+
+import { hoistBranchingNestedList } from './hoistBranchingNestedList.js'
+
+/**
+ * Handles Delete for a list item when a branching nested sublist follows the cursor.
+ *
+ * @param editor - The editor instance whose state should be updated.
+ * @param itemName - The list item node name (for example `listItem` or `taskItem`).
+ * @param wrapperNames - List wrapper node names (for example `bulletList` and `orderedList`).
+ * @returns `true` when the nested list was hoisted, otherwise `false`.
+ *
+ * @example
+ * ```ts
+ * Delete: () =>
+ *   handleDeleteBranchingNestedList(editor, 'listItem', ['bulletList', 'orderedList']),
+ * ```
+ */
+export const handleDeleteBranchingNestedList = (
+  editor: Editor,
+  itemName: string,
+  wrapperNames: string[],
+) => {
+  return hoistBranchingNestedList(editor.state, editor.view.dispatch, itemName, wrapperNames)
+}

package/src/helpers/hasBranchingNestedListAfterCursor.ts

@@ -0,0 +1,30 @@
+import type { EditorState } from '@tiptap/pm/state'
+
+import { getBranchingNestedListAtCursor } from './getBranchingNestedListAtCursor.js'
+
+/**
+ * Returns whether the cursor is at the end of a list item textblock and the next
+ * sibling is a nested list that contains at least one branching list item.
+ *
+ * @param state - The editor state to inspect.
+ * @param itemName - The list item node name (for example `listItem` or `taskItem`).
+ * @param wrapperNames - List wrapper node names (for example `bulletList` and `orderedList`).
+ * @returns `true` when {@link hoistBranchingNestedList} should handle Delete.
+ *
+ * @example
+ * ```ts
+ * if (hasBranchingNestedListAfterCursor(editor.state, 'listItem', ['bulletList', 'orderedList'])) {
+ *   hoistBranchingNestedList(editor.state, editor.view.dispatch, 'listItem', [
+ *     'bulletList',
+ *     'orderedList',
+ *   ])
+ * }
+ * ```
+ */
+export const hasBranchingNestedListAfterCursor = (
+  state: EditorState,
+  itemName: string,
+  wrapperNames: string[],
+): boolean => {
+  return getBranchingNestedListAtCursor(state, itemName, wrapperNames) !== null
+}

package/src/helpers/hoistBranchingNestedList.ts

@@ -0,0 +1,56 @@
+import { Fragment } from '@tiptap/pm/model'
+import type { EditorState, Transaction } from '@tiptap/pm/state'
+
+import { getBranchingNestedListAtCursor } from './getBranchingNestedListAtCursor.js'
+
+/**
+ * Hoists all list items from a branching nested list after the cursor into the parent list.
+ *
+ * Use this when `joinForward` cannot restructure a nested list that contains list items
+ * with sublists (see issue #6906).
+ *
+ * @param state - The editor state to transform.
+ * @param dispatch - Optional dispatch function for the transaction.
+ * @param itemName - The list item node name (for example `listItem` or `taskItem`).
+ * @param wrapperNames - List wrapper node names (for example `bulletList` and `orderedList`).
+ * @returns `true` when the nested list was hoisted, otherwise `false`.
+ *
+ * @example
+ * ```ts
+ * // Cursor at the end of "Item 1" before a nested list with branching items.
+ * hoistBranchingNestedList(editor.state, editor.view.dispatch, 'listItem', [
+ *   'bulletList',
+ *   'orderedList',
+ * ])
+ * ```
+ */
+export const hoistBranchingNestedList = (
+  state: EditorState,
+  dispatch: ((tr: Transaction) => void) | undefined,
+  itemName: string,
+  wrapperNames: string[],
+) => {
+  const context = getBranchingNestedListAtCursor(state, itemName, wrapperNames)
+
+  if (!context) {
+    return false
+  }
+
+  const { selection } = state
+  const { nestedList, nestedListPos, insertPos, items } = context
+  const tr = state.tr
+
+  tr.delete(nestedListPos, nestedListPos + nestedList.nodeSize)
+
+  const mappedInsertPos = tr.mapping.map(insertPos)
+
+  tr.insert(mappedInsertPos, Fragment.from(items))
+
+  tr.setSelection(selection.map(tr.doc, tr.mapping))
+
+  if (dispatch) {
+    dispatch(tr)
+  }
+
+  return true
+}

package/src/item/list-item.ts

@@ -1,6 +1,8 @@
 import type { JSONContent, MarkdownParseHelpers, MarkdownToken } from '@tiptap/core'
 import { mergeAttributes, Node, renderNestedMarkdownContent } from '@tiptap/core'
 
+import { createBranchingListDeleteKeymap } from '../helpers/createBranchingListDeleteKeymap.js'
+
 export interface ListItemOptions {
   /**
    * The HTML attributes for a list item node.
@@ -29,10 +31,10 @@ function isSameLineOrderedListToken(token: MarkdownToken): boolean {
 
   return Boolean(
     token.text &&
-      token.tokens?.length === 1 &&
-      nestedToken?.type === 'list' &&
-      nestedToken.ordered &&
-      nestedToken.raw === token.text,
+    token.tokens?.length === 1 &&
+    nestedToken?.type === 'list' &&
+    nestedToken.ordered &&
+    nestedToken.raw === token.text,
   )
 }
 
@@ -114,7 +116,12 @@ export const ListItem = Node.create<ListItemOptions>({
         // Check if the first token is a text token with nested inline tokens
         const firstToken = token.tokens[0]
 
-        if (firstToken && firstToken.type === 'text' && firstToken.tokens && firstToken.tokens.length > 0) {
+        if (
+          firstToken &&
+          firstToken.type === 'text' &&
+          firstToken.tokens &&
+          firstToken.tokens.length > 0
+        ) {
           // Parse the inline content from the text token
           const inlineContent = helpers.parseInline(firstToken.tokens)
 
@@ -175,6 +182,15 @@ export const ListItem = Node.create<ListItemOptions>({
     )
   },
 
+  addExtensions() {
+    return [
+      createBranchingListDeleteKeymap(this.name, [
+        this.options.bulletListTypeName,
+        this.options.orderedListTypeName,
+      ]),
+    ]
+  },
+
   addKeyboardShortcuts() {
     return {
       Enter: () => this.editor.commands.splitListItem(this.name),

package/src/keymap/listHelpers/handleBackspace.ts

@@ -2,10 +2,7 @@ import type { Editor } from '@tiptap/core'
 import { isAtStartOfNode, isNodeActive } from '@tiptap/core'
 import type { Node } from '@tiptap/pm/model'
 
-import { findListItemPos } from './findListItemPos.js'
 import { hasListBefore } from './hasListBefore.js'
-import { hasListItemBefore } from './hasListItemBefore.js'
-import { listItemHasSubList } from './listItemHasSubList.js'
 
 export const handleBackspace = (editor: Editor, name: string, parentListTypes: string[]) => {
   // this is required to still handle the undo handling
@@ -62,24 +59,8 @@ export const handleBackspace = (editor: Editor, name: string, parentListTypes: s
     return false
   }
 
-  const listItemPos = findListItemPos(name, editor.state)
-
-  if (!listItemPos) {
-    return false
-  }
-
-  const $prev = editor.state.doc.resolve(listItemPos.$pos.pos - 2)
-  const prevNode = $prev.node(listItemPos.depth)
-
-  const previousListItemHasSubList = listItemHasSubList(name, editor.state, prevNode)
-
-  // if the previous item is a list item and doesn't have a sublist, join the list items
-  if (hasListItemBefore(name, editor.state) && !previousListItemHasSubList) {
-    return editor.commands.joinItemBackward()
-  }
-
-  // otherwise in the end, a backspace should
-  // always just lift the list item if
-  // joining / merging is not possible
+  // At the start of a list item, lift it out. Top-level items split the
+  // wrapping list around them; nested items get promoted into the outer
+  // list. A second backspace then falls through to the merge branch above.
   return editor.chain().liftListItem(name).run()
 }

package/src/keymap/listHelpers/hasListBefore.ts

@@ -1,6 +1,10 @@
 import type { EditorState } from '@tiptap/pm/state'
 
-export const hasListBefore = (editorState: EditorState, name: string, parentListTypes: string[]) => {
+export const hasListBefore = (
+  editorState: EditorState,
+  name: string,
+  parentListTypes: string[],
+) => {
   const { $anchor } = editorState.selection
 
   const previousNodePos = Math.max(0, $anchor.pos - 2)

package/src/ordered-list/ordered-list.ts

@@ -81,7 +81,9 @@ export const OrderedList = Node.create<OrderedListOptions>({
       start: {
         default: 1,
         parseHTML: element => {
-          return element.hasAttribute('start') ? parseInt(element.getAttribute('start') || '', 10) : 1
+          return element.hasAttribute('start')
+            ? parseInt(element.getAttribute('start') || '', 10)
+            : 1
         },
       },
       type: {

package/src/ordered-list/utils.ts

@@ -1,4 +1,9 @@
-import type { JSONContent, MarkdownLexerConfiguration, MarkdownParseHelpers, MarkdownToken } from '@tiptap/core'
+import type {
+  JSONContent,
+  MarkdownLexerConfiguration,
+  MarkdownParseHelpers,
+  MarkdownToken,
+} from '@tiptap/core'
 
 /**
  * Matches an ordered list item line with optional leading whitespace.
@@ -28,10 +33,15 @@ function isBlockContentLine(line: string): boolean {
   const trimmedLine = line.trimStart()
 
   return (
+    // oxlint-disable-next-line prefer-string-starts-ends-with
     /^[-+*]\s+/.test(trimmedLine) ||
+    // oxlint-disable-next-line prefer-string-starts-ends-with
     /^\d+\.\s+/.test(trimmedLine) ||
+    // oxlint-disable-next-line prefer-string-starts-ends-with
     /^>\s?/.test(trimmedLine) ||
+    // oxlint-disable-next-line prefer-string-starts-ends-with
     /^```/.test(trimmedLine) ||
+    // oxlint-disable-next-line prefer-string-starts-ends-with
     /^~~~/.test(trimmedLine)
   )
 }
@@ -244,7 +254,10 @@ export function buildNestedStructure(
  * @param helpers - Markdown parse helpers for recursive parsing
  * @returns Array of listItem JSONContent nodes
  */
-export function parseListItems(items: MarkdownToken[], helpers: MarkdownParseHelpers): JSONContent[] {
+export function parseListItems(
+  items: MarkdownToken[],
+  helpers: MarkdownParseHelpers,
+): JSONContent[] {
   return items.map(item => {
     if (item.type !== 'list_item') {
       return helpers.parseChildren([item])[0]

package/src/task-item/task-item.ts

@@ -8,6 +8,8 @@ import {
 } from '@tiptap/core'
 import type { Node as ProseMirrorNode } from '@tiptap/pm/model'
 
+import { createBranchingListDeleteKeymap } from '../helpers/createBranchingListDeleteKeymap.js'
+
 export interface TaskItemOptions {
   /**
    * A callback function that is called when the checkbox is clicked while the editor is in readonly mode.
@@ -158,6 +160,14 @@ export const TaskItem = Node.create<TaskItemOptions>({
     return renderNestedMarkdownContent(node, h, prefix)
   },
 
+  addExtensions() {
+    if (!this.options.nested) {
+      return []
+    }
+
+    return [createBranchingListDeleteKeymap(this.name, [this.options.taskListTypeName])]
+  },
+
   addKeyboardShortcuts() {
     const shortcuts: {
       [key: string]: KeyboardShortcutCommand

package/src/task-list/task-list.ts

@@ -58,7 +58,11 @@ export const TaskList = Node.create<TaskListOptions>({
   },
 
   renderHTML({ HTMLAttributes }) {
-    return ['ul', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, { 'data-type': this.name }), 0]
+    return [
+      'ul',
+      mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, { 'data-type': this.name }),
+      0,
+    ]
   },
 
   parseMarkdown: (token, h) => {