@domternal/core 0.7.3 → 0.7.4

package/dist/index.cjs

@@ -1126,7 +1126,7 @@ var markInputRulePatterns = {
   highlight: /(?:==)([^=]+)(?:==)$/
 };
 function wrappingInputRule(options) {
-  const { find: find2, type, getAttributes = null, joinPredicate, undoable, guard } = options;
+  const { find: find2, type, getAttributes = null, joinPredicate, undoable, guard, joinForward } = options;
   return new inputrules.InputRule(
     find2,
     (state, match, start, end) => {
@@ -1142,6 +1142,21 @@ function wrappingInputRule(options) {
       if (before?.type === type && transform.canJoin(tr.doc, start - 1) && (!joinPredicate || joinPredicate(match, before))) {
         tr.join(start - 1);
       }
+      if (joinForward) {
+        const $cursor = tr.selection.$from;
+        for (let d = $cursor.depth; d >= 0; d--) {
+          if ($cursor.node(d).type === type) {
+            const after = $cursor.after(d);
+            if (after < tr.doc.content.size && transform.canJoin(tr.doc, after)) {
+              const nodeAfter = tr.doc.nodeAt(after);
+              if (nodeAfter?.type === type && (!joinPredicate || joinPredicate(match, nodeAfter))) {
+                tr.join(after);
+              }
+            }
+            break;
+          }
+        }
+      }
       return tr;
     },
     undoable !== void 0 ? { undoable } : {}
@@ -1962,6 +1977,7 @@ function isInListItemLabel($pos) {
 }
 
 // src/utils/liftCurrentListItem.ts
+var LIST_ITEM_TYPES = /* @__PURE__ */ new Set(["listItem", "taskItem"]);
 function liftCurrentListItem(state, tr) {
   if (!tr.selection.empty) return false;
   if (tr.steps.length !== 0) return false;
@@ -1969,6 +1985,16 @@ function liftCurrentListItem(state, tr) {
   const listItemDepth = findListItemAncestorDepth($from);
   if (listItemDepth === -1) return false;
   if ($from.index(listItemDepth) !== 0) return false;
+  const wrapperParent = $from.node(listItemDepth - 2);
+  const isNested = LIST_ITEM_TYPES.has(wrapperParent.type.name);
+  if (isNested) {
+    const range = $from.blockRange();
+    if (!range) return false;
+    const target = transform.liftTarget(range);
+    if (target === null) return false;
+    tr.lift(range, target);
+    return true;
+  }
   const listItemType = $from.node(listItemDepth).type;
   return schemaList.liftListItem(listItemType)(state, (liftTr) => {
     for (const step of liftTr.steps) tr.step(step);
@@ -2176,13 +2202,13 @@ var lift = () => ({ tr, dispatch }) => {
 };
 
 // src/utils/listItemCursorContext.ts
-var LIST_ITEM_TYPES = /* @__PURE__ */ new Set(["listItem", "taskItem"]);
+var LIST_ITEM_TYPES2 = /* @__PURE__ */ new Set(["listItem", "taskItem"]);
 function getListItemCursorContext($from) {
   if ($from.parent.type.name !== "paragraph") return null;
   const itemDepth = $from.depth - 1;
   if (itemDepth < 1) return null;
   const itemNode = $from.node(itemDepth);
-  if (!LIST_ITEM_TYPES.has(itemNode.type.name)) return null;
+  if (!LIST_ITEM_TYPES2.has(itemNode.type.name)) return null;
   const wrapperDepth = itemDepth - 1;
   const childIndex = $from.index(itemDepth);
   return {
@@ -4078,7 +4104,7 @@ function defaultBubbleContexts(editor) {
 }
 
 // src/utils/insertAsListItemChild.ts
-var LIST_ITEM_TYPES2 = /* @__PURE__ */ new Set(["listItem", "taskItem"]);
+var LIST_ITEM_TYPES3 = /* @__PURE__ */ new Set(["listItem", "taskItem"]);
 var LIST_WRAPPER_TYPES = /* @__PURE__ */ new Set(["bulletList", "orderedList", "taskList"]);
 function insertAsListItemChild(args) {
   const { tr, wrapperPos, targetItemPos, blockNode, sourceRange } = args;
@@ -4091,7 +4117,7 @@ function insertAsListItemChild(args) {
   if (targetItemPos !== void 0) {
     if (targetItemPos < 0 || targetItemPos >= tr.doc.content.size) return { ok: false };
     const candidate = tr.doc.nodeAt(targetItemPos);
-    if (!candidate || !LIST_ITEM_TYPES2.has(candidate.type.name)) return { ok: false };
+    if (!candidate || !LIST_ITEM_TYPES3.has(candidate.type.name)) return { ok: false };
     if (targetItemPos < wrapperPos + 1 || targetItemPos >= wrapperPos + wrapper.nodeSize) {
       return { ok: false };
     }
@@ -4099,7 +4125,7 @@ function insertAsListItemChild(args) {
     targetItemStart = targetItemPos;
   } else {
     const last = wrapper.lastChild;
-    if (!last || !LIST_ITEM_TYPES2.has(last.type.name)) return { ok: false };
+    if (!last || !LIST_ITEM_TYPES3.has(last.type.name)) return { ok: false };
     let pos = wrapperPos + 1;
     for (let i = 0; i < wrapper.childCount - 1; i++) {
       pos += wrapper.child(i).nodeSize;
@@ -5893,11 +5919,11 @@ var BulletList = Node2.create({
     }
     return [
       // - item
-      wrappingInputRule({ find: /^\s*[-]\s$/, type: nodeType, guard: notInsideList }),
+      wrappingInputRule({ find: /^\s*[-]\s$/, type: nodeType, guard: notInsideList, joinForward: true }),
       // * item
-      wrappingInputRule({ find: /^\s*[*]\s$/, type: nodeType, guard: notInsideList }),
+      wrappingInputRule({ find: /^\s*[*]\s$/, type: nodeType, guard: notInsideList, joinForward: true }),
       // + item
-      wrappingInputRule({ find: /^\s*[+]\s$/, type: nodeType, guard: notInsideList })
+      wrappingInputRule({ find: /^\s*[+]\s$/, type: nodeType, guard: notInsideList, joinForward: true })
     ];
   }
 });
@@ -5998,6 +6024,7 @@ var OrderedList = Node2.create({
         find: /^(\d+)\.\s$/,
         type: nodeType,
         guard: notInsideList,
+        joinForward: true,
         getAttributes: (match) => {
           const num = match[1];
           return { start: num ? parseInt(num, 10) : 1 };
@@ -6527,9 +6554,9 @@ var TaskList = Node2.create({
     }
     return [
       // [ ] at start of line creates unchecked task
-      wrappingInputRule({ find: /^\s*\[\s?\]\s$/, type: nodeType, guard: notInsideList }),
+      wrappingInputRule({ find: /^\s*\[\s?\]\s$/, type: nodeType, guard: notInsideList, joinForward: true }),
       // [x] or [X] at start of line creates checked task
-      wrappingInputRule({ find: /^\s*\[[xX]\]\s$/, type: nodeType, guard: notInsideList })
+      wrappingInputRule({ find: /^\s*\[[xX]\]\s$/, type: nodeType, guard: notInsideList, joinForward: true })
     ];
   }
 });
@@ -7712,12 +7739,12 @@ var Placeholder = Extension.create({
     ];
   }
 });
-var LIST_ITEM_TYPES3 = /* @__PURE__ */ new Set(["listItem", "taskItem"]);
+var LIST_ITEM_TYPES4 = /* @__PURE__ */ new Set(["listItem", "taskItem"]);
 var LIST_WRAPPER_TYPES2 = /* @__PURE__ */ new Set(["bulletList", "orderedList", "taskList"]);
 function isCursorInsideListItem(state) {
   const { $from } = state.selection;
   for (let d = $from.depth; d > 0; d--) {
-    if (LIST_ITEM_TYPES3.has($from.node(d).type.name)) return true;
+    if (LIST_ITEM_TYPES4.has($from.node(d).type.name)) return true;
   }
   return false;
 }
@@ -7772,7 +7799,7 @@ function outdentBlockFromListItem(state$1, dispatch) {
   const { $from } = selection;
   let listItemDepth = -1;
   for (let d = $from.depth; d > 0; d--) {
-    if (LIST_ITEM_TYPES3.has($from.node(d).type.name)) {
+    if (LIST_ITEM_TYPES4.has($from.node(d).type.name)) {
       listItemDepth = d;
       break;
     }