@tiptap/extension-list 3.24.0 → 3.26.0

package/dist/kit/index.cjs

@@ -23,7 +23,7 @@ __export(index_exports, {
   ListKit: () => ListKit
 });
 module.exports = __toCommonJS(index_exports);
-var import_core12 = require("@tiptap/core");
+var import_core13 = require("@tiptap/core");
 
 // src/bullet-list/bullet-list.ts
 var import_core = require("@tiptap/core");
@@ -106,7 +106,116 @@ var BulletList = import_core.Node.create({
 });
 
 // src/item/list-item.ts
+var import_core3 = require("@tiptap/core");
+
+// src/helpers/createBranchingListDeleteKeymap.ts
 var import_core2 = require("@tiptap/core");
+
+// src/helpers/hoistBranchingNestedList.ts
+var import_model = require("@tiptap/pm/model");
+
+// src/helpers/getBranchingNestedListAtCursor.ts
+var getBranchingNestedListAtCursor = (state, itemName, wrapperNames) => {
+  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 = [];
+  nodeAfter.forEach((child) => {
+    items.push(child);
+  });
+  if (items.length === 0) {
+    return null;
+  }
+  return {
+    listItemDepth,
+    nestedList: nodeAfter,
+    nestedListPos: $from.after(),
+    insertPos: $from.after(listItemDepth),
+    items
+  };
+};
+
+// src/helpers/hoistBranchingNestedList.ts
+var hoistBranchingNestedList = (state, dispatch, itemName, wrapperNames) => {
+  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, import_model.Fragment.from(items));
+  tr.setSelection(selection.map(tr.doc, tr.mapping));
+  if (dispatch) {
+    dispatch(tr);
+  }
+  return true;
+};
+
+// src/helpers/handleDeleteBranchingNestedList.ts
+var handleDeleteBranchingNestedList = (editor, itemName, wrapperNames) => {
+  return hoistBranchingNestedList(editor.state, editor.view.dispatch, itemName, wrapperNames);
+};
+
+// src/helpers/createBranchingListDeleteKeymap.ts
+var createBranchingListDeleteKeymap = (itemName, wrapperNames) => {
+  return import_core2.Extension.create({
+    name: `${itemName}BranchingDeleteKeymap`,
+    priority: 101,
+    addKeyboardShortcuts() {
+      const handleDelete2 = () => handleDeleteBranchingNestedList(this.editor, itemName, wrapperNames);
+      return {
+        Delete: handleDelete2,
+        "Mod-Delete": handleDelete2
+      };
+    }
+  });
+};
+
+// src/item/list-item.ts
 function isSameLineOrderedListToken(token) {
   var _a, _b;
   const nestedToken = (_a = token.tokens) == null ? void 0 : _a[0];
@@ -126,7 +235,7 @@ function parseSameLineOrderedListText(text, helpers) {
     }
   ]);
 }
-var ListItem = import_core2.Node.create({
+var ListItem = import_core3.Node.create({
   name: "listItem",
   addOptions() {
     return {
@@ -145,7 +254,7 @@ var ListItem = import_core2.Node.create({
     ];
   },
   renderHTML({ HTMLAttributes }) {
-    return ["li", (0, import_core2.mergeAttributes)(this.options.HTMLAttributes, HTMLAttributes), 0];
+    return ["li", (0, import_core3.mergeAttributes)(this.options.HTMLAttributes, HTMLAttributes), 0];
   },
   markdownTokenName: "list_item",
   parseMarkdown: (token, helpers) => {
@@ -204,7 +313,7 @@ var ListItem = import_core2.Node.create({
     };
   },
   renderMarkdown: (node, h, ctx) => {
-    return (0, import_core2.renderNestedMarkdownContent)(
+    return (0, import_core3.renderNestedMarkdownContent)(
       node,
       h,
       (context) => {
@@ -221,6 +330,14 @@ var ListItem = import_core2.Node.create({
       ctx
     );
   },
+  addExtensions() {
+    return [
+      createBranchingListDeleteKeymap(this.name, [
+        this.options.bulletListTypeName,
+        this.options.orderedListTypeName
+      ])
+    ];
+  },
   addKeyboardShortcuts() {
     return {
       Enter: () => this.editor.commands.splitListItem(this.name),
@@ -231,7 +348,7 @@ var ListItem = import_core2.Node.create({
 });
 
 // src/keymap/list-keymap.ts
-var import_core8 = require("@tiptap/core");
+var import_core9 = require("@tiptap/core");
 
 // src/keymap/listHelpers/index.ts
 var listHelpers_exports = {};
@@ -249,10 +366,10 @@ __export(listHelpers_exports, {
 });
 
 // src/keymap/listHelpers/findListItemPos.ts
-var import_core3 = require("@tiptap/core");
+var import_core4 = require("@tiptap/core");
 var findListItemPos = (typeOrName, state) => {
   const { $from } = state.selection;
-  const nodeType = (0, import_core3.getNodeType)(typeOrName, state.schema);
+  const nodeType = (0, import_core4.getNodeType)(typeOrName, state.schema);
   let currentNode = null;
   let currentDepth = $from.depth;
   let currentPos = $from.pos;
@@ -273,13 +390,13 @@ var findListItemPos = (typeOrName, state) => {
 };
 
 // src/keymap/listHelpers/getNextListDepth.ts
-var import_core4 = require("@tiptap/core");
+var import_core5 = require("@tiptap/core");
 var getNextListDepth = (typeOrName, state) => {
   const listItemPos = findListItemPos(typeOrName, state);
   if (!listItemPos) {
     return false;
   }
-  const [, depth] = (0, import_core4.getNodeAtPosition)(state, typeOrName, listItemPos.$pos.pos + 4);
+  const [, depth] = (0, import_core5.getNodeAtPosition)(state, typeOrName, listItemPos.$pos.pos + 4);
   return depth;
 };
 
@@ -297,36 +414,6 @@ var hasListBefore = (editorState, name, parentListTypes) => {
   return true;
 };
 
-// src/keymap/listHelpers/hasListItemBefore.ts
-var hasListItemBefore = (typeOrName, state) => {
-  var _a;
-  const { $anchor } = state.selection;
-  const $targetPos = state.doc.resolve($anchor.pos - 2);
-  if ($targetPos.index() === 0) {
-    return false;
-  }
-  if (((_a = $targetPos.nodeBefore) == null ? void 0 : _a.type.name) !== typeOrName) {
-    return false;
-  }
-  return true;
-};
-
-// src/keymap/listHelpers/listItemHasSubList.ts
-var import_core5 = require("@tiptap/core");
-var listItemHasSubList = (typeOrName, state, node) => {
-  if (!node) {
-    return false;
-  }
-  const nodeType = (0, import_core5.getNodeType)(typeOrName, state.schema);
-  let hasSubList = false;
-  node.descendants((child) => {
-    if (child.type === nodeType) {
-      hasSubList = true;
-    }
-  });
-  return hasSubList;
-};
-
 // src/keymap/listHelpers/handleBackspace.ts
 var handleBackspace = (editor, name, parentListTypes) => {
   if (editor.commands.undoInputRule()) {
@@ -357,16 +444,6 @@ var handleBackspace = (editor, name, parentListTypes) => {
   if (!(0, import_core6.isAtStartOfNode)(editor.state)) {
     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 (hasListItemBefore(name, editor.state) && !previousListItemHasSubList) {
-    return editor.commands.joinItemBackward();
-  }
   return editor.chain().liftListItem(name).run();
 };
 
@@ -435,8 +512,38 @@ var hasListItemAfter = (typeOrName, state) => {
   return true;
 };
 
+// src/keymap/listHelpers/hasListItemBefore.ts
+var hasListItemBefore = (typeOrName, state) => {
+  var _a;
+  const { $anchor } = state.selection;
+  const $targetPos = state.doc.resolve($anchor.pos - 2);
+  if ($targetPos.index() === 0) {
+    return false;
+  }
+  if (((_a = $targetPos.nodeBefore) == null ? void 0 : _a.type.name) !== typeOrName) {
+    return false;
+  }
+  return true;
+};
+
+// src/keymap/listHelpers/listItemHasSubList.ts
+var import_core8 = require("@tiptap/core");
+var listItemHasSubList = (typeOrName, state, node) => {
+  if (!node) {
+    return false;
+  }
+  const nodeType = (0, import_core8.getNodeType)(typeOrName, state.schema);
+  let hasSubList = false;
+  node.descendants((child) => {
+    if (child.type === nodeType) {
+      hasSubList = true;
+    }
+  });
+  return hasSubList;
+};
+
 // src/keymap/list-keymap.ts
-var ListKeymap = import_core8.Extension.create({
+var ListKeymap = import_core9.Extension.create({
   name: "listKeymap",
   addOptions() {
     return {
@@ -507,7 +614,7 @@ var ListKeymap = import_core8.Extension.create({
 });
 
 // src/ordered-list/ordered-list.ts
-var import_core9 = require("@tiptap/core");
+var import_core10 = require("@tiptap/core");
 
 // src/ordered-list/utils.ts
 var ORDERED_LIST_ITEM_REGEX = /^(\s*)(\d+)\.\s+(.*)$/;
@@ -686,7 +793,7 @@ function parseListItems(items, helpers) {
 var ListItemName2 = "listItem";
 var TextStyleName2 = "textStyle";
 var orderedListInputRegex = /^(\d+)\.\s$/;
-var OrderedList = import_core9.Node.create({
+var OrderedList = import_core10.Node.create({
   name: "orderedList",
   addOptions() {
     return {
@@ -723,7 +830,7 @@ var OrderedList = import_core9.Node.create({
   },
   renderHTML({ HTMLAttributes }) {
     const { start, ...attributesWithoutStart } = HTMLAttributes;
-    return start === 1 ? ["ol", (0, import_core9.mergeAttributes)(this.options.HTMLAttributes, attributesWithoutStart), 0] : ["ol", (0, import_core9.mergeAttributes)(this.options.HTMLAttributes, HTMLAttributes), 0];
+    return start === 1 ? ["ol", (0, import_core10.mergeAttributes)(this.options.HTMLAttributes, attributesWithoutStart), 0] : ["ol", (0, import_core10.mergeAttributes)(this.options.HTMLAttributes, HTMLAttributes), 0];
   },
   markdownTokenName: "list",
   parseMarkdown: (token, helpers) => {
@@ -798,14 +905,14 @@ var OrderedList = import_core9.Node.create({
     };
   },
   addInputRules() {
-    let inputRule = (0, import_core9.wrappingInputRule)({
+    let inputRule = (0, import_core10.wrappingInputRule)({
       find: orderedListInputRegex,
       type: this.type,
       getAttributes: (match) => ({ start: +match[1] }),
       joinPredicate: (match, node) => node.childCount + node.attrs.start === +match[1]
     });
     if (this.options.keepMarks || this.options.keepAttributes) {
-      inputRule = (0, import_core9.wrappingInputRule)({
+      inputRule = (0, import_core10.wrappingInputRule)({
         find: orderedListInputRegex,
         type: this.type,
         keepMarks: this.options.keepMarks,
@@ -820,9 +927,9 @@ var OrderedList = import_core9.Node.create({
 });
 
 // src/task-item/task-item.ts
-var import_core10 = require("@tiptap/core");
+var import_core11 = require("@tiptap/core");
 var inputRegex = /^\s*(\[([( |x])?\])\s$/;
-var TaskItem = import_core10.Node.create({
+var TaskItem = import_core11.Node.create({
   name: "taskItem",
   addOptions() {
     return {
@@ -862,7 +969,7 @@ var TaskItem = import_core10.Node.create({
   renderHTML({ node, HTMLAttributes }) {
     return [
       "li",
-      (0, import_core10.mergeAttributes)(this.options.HTMLAttributes, HTMLAttributes, {
+      (0, import_core11.mergeAttributes)(this.options.HTMLAttributes, HTMLAttributes, {
         "data-type": this.name
       }),
       [
@@ -898,7 +1005,13 @@ var TaskItem = import_core10.Node.create({
     var _a;
     const checkedChar = ((_a = node.attrs) == null ? void 0 : _a.checked) ? "x" : " ";
     const prefix = `- [${checkedChar}] `;
-    return (0, import_core10.renderNestedMarkdownContent)(node, h, prefix);
+    return (0, import_core11.renderNestedMarkdownContent)(node, h, prefix);
+  },
+  addExtensions() {
+    if (!this.options.nested) {
+      return [];
+    }
+    return [createBranchingListDeleteKeymap(this.name, [this.options.taskListTypeName])];
   },
   addKeyboardShortcuts() {
     const shortcuts = {
@@ -976,7 +1089,7 @@ var TaskItem = import_core10.Node.create({
           checkbox.checked = updatedNode.attrs.checked;
           updateA11Y(updatedNode);
           const extensionAttributes = editor.extensionManager.attributes;
-          const newHTMLAttributes = (0, import_core10.getRenderedAttributes)(updatedNode, extensionAttributes);
+          const newHTMLAttributes = (0, import_core11.getRenderedAttributes)(updatedNode, extensionAttributes);
           const newKeys = new Set(Object.keys(newHTMLAttributes));
           const staticAttrs = this.options.HTMLAttributes;
           prevRenderedAttributeKeys.forEach((key) => {
@@ -1007,7 +1120,7 @@ var TaskItem = import_core10.Node.create({
   },
   addInputRules() {
     return [
-      (0, import_core10.wrappingInputRule)({
+      (0, import_core11.wrappingInputRule)({
         find: inputRegex,
         type: this.type,
         getAttributes: (match) => ({
@@ -1019,8 +1132,8 @@ var TaskItem = import_core10.Node.create({
 });
 
 // src/task-list/task-list.ts
-var import_core11 = require("@tiptap/core");
-var TaskList = import_core11.Node.create({
+var import_core12 = require("@tiptap/core");
+var TaskList = import_core12.Node.create({
   name: "taskList",
   addOptions() {
     return {
@@ -1043,7 +1156,7 @@ var TaskList = import_core11.Node.create({
   renderHTML({ HTMLAttributes }) {
     return [
       "ul",
-      (0, import_core11.mergeAttributes)(this.options.HTMLAttributes, HTMLAttributes, { "data-type": this.name }),
+      (0, import_core12.mergeAttributes)(this.options.HTMLAttributes, HTMLAttributes, { "data-type": this.name }),
       0
     ];
   },
@@ -1066,7 +1179,7 @@ var TaskList = import_core11.Node.create({
     },
     tokenize(src, tokens, lexer) {
       const parseTaskListContent = (content) => {
-        const nestedResult = (0, import_core11.parseIndentedBlocks)(
+        const nestedResult = (0, import_core12.parseIndentedBlocks)(
           content,
           {
             itemPattern: /^(\s*)([-+*])\s+\[([ xX])\]\s+(.*)$/,
@@ -1101,7 +1214,7 @@ var TaskList = import_core11.Node.create({
         }
         return lexer.blockTokens(content);
       };
-      const result = (0, import_core11.parseIndentedBlocks)(
+      const result = (0, import_core12.parseIndentedBlocks)(
         src,
         {
           itemPattern: /^(\s*)([-+*])\s+\[([ xX])\]\s+(.*)$/,
@@ -1153,7 +1266,7 @@ var TaskList = import_core11.Node.create({
 });
 
 // src/kit/index.ts
-var ListKit = import_core12.Extension.create({
+var ListKit = import_core13.Extension.create({
   name: "listKit",
   addExtensions() {
     const extensions = [];