@sendbird/actionbook-core 0.9.7 → 0.9.9

package/dist/ui/index.js

@@ -2745,27 +2745,52 @@ function findParentList(state, pos) {
   }
   return null;
 }
+var NOOP = /* @__PURE__ */ Symbol("noop");
 function handleListInputRule(state, start, end, listType, attrs) {
   const resolvePos = Math.max(start, end - 1);
   const parentList = findParentList(state, resolvePos);
   if (!parentList) return null;
   const $from = state.doc.resolve(resolvePos);
-  const { depth, node: listNode } = parentList;
+  const { depth: listDepth, node: listNode } = parentList;
   const paraContentSize = $from.parent.content.size;
   const matchedLen = end - start;
   if (paraContentSize !== matchedLen) return null;
-  const listStart = $from.before(depth);
-  const listEnd = $from.after(depth);
   if (listNode.type === listType) {
-    const tr = state.tr.replaceWith(listStart, listEnd, actionbookSchema.nodes.paragraph.create());
-    tr.setSelection(TextSelection.near(tr.doc.resolve(listStart)));
-    return tr;
-  } else {
-    const tr = state.tr.delete(start, end);
-    const mappedListPos = tr.mapping.map(listStart);
-    tr.setNodeMarkup(mappedListPos, listType, attrs ?? null);
-    return tr;
+    return NOOP;
   }
+  const { listItem: liType } = actionbookSchema.nodes;
+  const tr = state.tr.delete(start, end);
+  const $pos = tr.doc.resolve(tr.mapping.map(resolvePos));
+  let liDepth = -1;
+  for (let d = $pos.depth; d > 0; d--) {
+    if ($pos.node(d).type === liType) {
+      liDepth = d;
+      break;
+    }
+  }
+  if (liDepth < 0) return null;
+  const parentListAfterDelete = $pos.node(liDepth - 1);
+  const liIndex = $pos.index(liDepth - 1);
+  const liNode = parentListAfterDelete.child(liIndex);
+  const parentListStart = $pos.before(liDepth - 1);
+  const parentListEnd = $pos.after(liDepth - 1);
+  const fragments = [];
+  if (liIndex > 0) {
+    const beforeItems = [];
+    for (let i = 0; i < liIndex; i++) beforeItems.push(parentListAfterDelete.child(i));
+    fragments.push(parentListAfterDelete.type.create(parentListAfterDelete.attrs, beforeItems));
+  }
+  fragments.push(listType.create(attrs ?? null, liNode));
+  if (liIndex < parentListAfterDelete.childCount - 1) {
+    const afterItems = [];
+    for (let i = liIndex + 1; i < parentListAfterDelete.childCount; i++) {
+      afterItems.push(parentListAfterDelete.child(i));
+    }
+    fragments.push(parentListAfterDelete.type.create(parentListAfterDelete.attrs, afterItems));
+  }
+  tr.replaceWith(parentListStart, parentListEnd, fragments);
+  tr.setSelection(TextSelection.near(tr.doc.resolve(tr.mapping.map(start))));
+  return tr;
 }
 function markInputRule(pattern, markType, markerLen) {
   return new InputRule(pattern, (state, match, start, end) => {
@@ -2836,8 +2861,9 @@ function createInputRulesPlugin() {
         const fallback = wrappingInputRule(BULLET_LIST_RE, blType);
         rules.push(
           new InputRule(BULLET_LIST_RE, (state, match, start, end) => {
-            const toggled = handleListInputRule(state, start, end, blType);
-            if (toggled) return toggled;
+            const result = handleListInputRule(state, start, end, blType);
+            if (result === NOOP) return null;
+            if (result) return result;
             const handler = fallback.handler;
             return handler(state, match, start, end);
           })
@@ -2848,8 +2874,9 @@ function createInputRulesPlugin() {
         const fallback = wrappingInputRule(ORDERED_LIST_RE, olType, (m) => ({ start: +m[1] }));
         rules.push(
           new InputRule(ORDERED_LIST_RE, (state, match, start, end) => {
-            const toggled = handleListInputRule(state, start, end, olType, { start: +match[1] });
-            if (toggled) return toggled;
+            const result = handleListInputRule(state, start, end, olType, { start: +match[1] });
+            if (result === NOOP) return null;
+            if (result) return result;
             const handler = fallback.handler;
             return handler(state, match, start, end);
           })
@@ -2859,14 +2886,6 @@ function createInputRulesPlugin() {
       rules.push(
         new InputRule(JUMP_POINT_RE2, (state, match, start, end) => {
           const id = match[1];
-          let exists = false;
-          state.doc.descendants((node) => {
-            if (node.type === jumpPointType && node.attrs.id === id) {
-              exists = true;
-              return false;
-            }
-          });
-          if (exists) return null;
           const tr = state.tr.delete(start, end).insert(start, jumpPointType.create({ id }));
           const afterAtom = start + 1;
           tr.insertText(" ", afterAtom);
@@ -3071,6 +3090,69 @@ var backspaceDeleteEmptyBlock = (state, dispatch) => {
   }
   return false;
 };
+var joinListItemBackward = (state, dispatch) => {
+  const { $from } = state.selection;
+  if (!state.selection.empty) return false;
+  if ($from.parentOffset !== 0) return false;
+  if (!cursorDirectlyInListItem(state)) return false;
+  if ($from.index($from.depth - 1) !== 0) return false;
+  const liDepth = $from.depth - 1;
+  const listDepth = liDepth - 1;
+  if (listDepth < 0) return false;
+  const listNode = $from.node(listDepth);
+  if (listNode.type !== bulletList && listNode.type !== orderedList) return false;
+  const liIndex = $from.index(listDepth);
+  if (liIndex > 0) {
+    if (dispatch) {
+      const joinPos = $from.before(liDepth);
+      const tr = state.tr.join(joinPos);
+      const mappedPos = tr.mapping.map(joinPos);
+      if (tr.doc.resolve(mappedPos).nodeBefore?.isTextblock && tr.doc.resolve(mappedPos).nodeAfter?.isTextblock) {
+        tr.join(mappedPos);
+      }
+      dispatch(tr.scrollIntoView());
+    }
+    return true;
+  }
+  const listStart = $from.before(listDepth);
+  const parentOfList = $from.node(listDepth - 1);
+  const listIndexInParent = $from.index(listDepth - 1);
+  if (listIndexInParent > 0) {
+    const prevBlock = parentOfList.child(listIndexInParent - 1);
+    if (prevBlock.isTextblock) {
+      if (dispatch) {
+        const liNode = listNode.child(0);
+        const firstPara = liNode.firstChild;
+        const liStart = $from.before(liDepth);
+        const liEnd = $from.after(liDepth);
+        const tr = state.tr;
+        if (listNode.childCount === 1) {
+          tr.delete(listStart, $from.after(listDepth));
+        } else {
+          tr.delete(liStart, liEnd);
+        }
+        const prevBlockEnd = tr.mapping.map(listStart) - 1;
+        if (firstPara.content.size > 0) {
+          tr.insert(prevBlockEnd, firstPara.content);
+        }
+        if (liNode.childCount > 1) {
+          const nestedContent = [];
+          for (let i = 1; i < liNode.childCount; i++) {
+            nestedContent.push(liNode.child(i));
+          }
+          const insertPos = tr.mapping.map(listStart);
+          for (const node of nestedContent) {
+            tr.insert(insertPos, node);
+          }
+        }
+        tr.setSelection(TextSelection2.near(tr.doc.resolve(prevBlockEnd)));
+        dispatch(tr.scrollIntoView());
+      }
+      return true;
+    }
+  }
+  return liftListItem(listItem)(state, dispatch);
+};
 var backspaceCommand = chainCommands(
   backspaceDeleteEmptyBlock,
   backspaceAfterList,
@@ -3082,7 +3164,13 @@ var backspaceCommand = chainCommands(
     if ($from.parent.type === heading) {
       return setBlockType(paragraph)(state, dispatch);
     }
+    return false;
+  },
+  joinListItemBackward,
+  (state, dispatch) => {
     if (!cursorDirectlyInListItem(state)) return false;
+    const { $from } = state.selection;
+    if ($from.parentOffset !== 0) return false;
     if ($from.index($from.depth - 1) !== 0) return false;
     return liftListItem(listItem)(state, dispatch);
   },
@@ -3168,9 +3256,27 @@ var exitBlockOnDoubleEnter = (state, dispatch) => {
   dispatch(tr.scrollIntoView());
   return true;
 };
+var exitCodeBlockOnEnter = (state, dispatch) => {
+  const { $from } = state.selection;
+  if ($from.parent.type.name !== "codeBlock") return false;
+  const codeBlock = $from.parent;
+  const text2 = codeBlock.textContent;
+  if ($from.parentOffset !== text2.length) return false;
+  if (!text2.endsWith("\n")) return false;
+  if (dispatch) {
+    const codeBlockPos = $from.before($from.depth);
+    const tr = state.tr.delete($from.pos - 1, $from.pos);
+    const blockEnd = tr.mapping.map(codeBlockPos + codeBlock.nodeSize);
+    tr.insert(blockEnd, paragraph.create());
+    tr.setSelection(TextSelection2.near(tr.doc.resolve(blockEnd + 1)));
+    dispatch(tr.scrollIntoView());
+  }
+  return true;
+};
 var enterCommand = chainCommands(
   exitNoteBlockOnEnter,
   exitBlockOnDoubleEnter,
+  exitCodeBlockOnEnter,
   newlineInCode,
   // Split list item on Enter; lift empty list item out of list
   splitListItem(listItem),
@@ -5293,18 +5399,10 @@ function createJumpPointEditPlugin() {
           const [, id] = match;
           const jumpPointType = newState.schema.nodes.jumpPoint;
           if (jumpPointType) {
-            let duplicate = false;
-            newState.doc.descendants((node, pos) => {
-              if (node.type === jumpPointType && node.attrs.id === id) {
-                if (pos < safeFrom || pos >= safeTo) duplicate = true;
-              }
-            });
-            if (!duplicate) {
-              reconvertTr.replaceWith(safeFrom, safeTo, jumpPointType.create({ id }));
-              const mappedCursor = reconvertTr.mapping.map(cursor);
-              const clampedCursor = Math.min(mappedCursor, reconvertTr.doc.content.size);
-              reconvertTr.setSelection(TextSelection3.near(reconvertTr.doc.resolve(clampedCursor)));
-            }
+            reconvertTr.replaceWith(safeFrom, safeTo, jumpPointType.create({ id }));
+            const mappedCursor = reconvertTr.mapping.map(cursor);
+            const clampedCursor = Math.min(mappedCursor, reconvertTr.doc.content.size);
+            reconvertTr.setSelection(TextSelection3.near(reconvertTr.doc.resolve(clampedCursor)));
           }
         }
       }
@@ -6205,15 +6303,6 @@ function getElseBranch(view, nodePos) {
   }
   return false;
 }
-function deleteBlock(view, blockPos) {
-  const blockNode = view.state.doc.nodeAt(blockPos);
-  if (blockNode?.type.name !== "jinjaIfBlock") {
-    return false;
-  }
-  view.dispatch(view.state.tr.delete(blockPos, blockPos + blockNode.nodeSize).scrollIntoView());
-  view.focus();
-  return true;
-}
 function insertNewBranch(view, nodePos, branchType, condition = "") {
   const context = getBranchContext(view, nodePos);
   if (!context) return false;
@@ -6239,14 +6328,36 @@ function insertNewBranch(view, nodePos, branchType, condition = "") {
 function deleteBranch(view, nodePos, branchType) {
   const context = getBranchContext(view, nodePos);
   if (!context) return false;
+  const { branchNode, branchPos, branchIndex, blockNode, blockPos } = context;
+  const branchContent = branchNode.content;
   if (branchType === "if") {
-    if (context.blockNode.childCount === 1) {
-      return deleteBlock(view, context.blockPos);
+    if (blockNode.childCount === 1) {
+      const tr2 = view.state.tr;
+      if (isBranchBodyEmpty(branchNode)) {
+        tr2.replaceWith(blockPos, blockPos + blockNode.nodeSize, view.state.schema.nodes.paragraph.create());
+        tr2.setSelection(TextSelection4.near(tr2.doc.resolve(blockPos)));
+      } else {
+        tr2.replaceWith(blockPos, blockPos + blockNode.nodeSize, branchContent);
+        tr2.setSelection(TextSelection4.near(tr2.doc.resolve(blockPos)));
+      }
+      view.dispatch(tr2.scrollIntoView());
+      view.focus();
+      return true;
     }
-    const nextBranch = context.blockNode.child(context.branchIndex + 1);
+    const nextBranch = blockNode.child(branchIndex + 1);
     const promotedCondition = typeof nextBranch.attrs.condition === "string" ? nextBranch.attrs.condition : "";
-    const tr = view.state.tr.delete(context.branchPos, context.branchPos + context.branchNode.nodeSize);
-    tr.setNodeMarkup(context.branchPos, void 0, {
+    const tr = view.state.tr;
+    if (!isBranchBodyEmpty(branchNode)) {
+      const nextBranchPos = branchPos + branchNode.nodeSize;
+      const nextBranchContentStart = nextBranchPos + 1;
+      for (let i = branchContent.childCount - 1; i >= 0; i--) {
+        tr.insert(nextBranchContentStart, branchContent.child(i));
+      }
+    }
+    const mappedBranchPos = tr.mapping.map(branchPos);
+    const mappedBranchEnd = tr.mapping.map(branchPos + branchNode.nodeSize);
+    tr.delete(mappedBranchPos, mappedBranchEnd);
+    tr.setNodeMarkup(mappedBranchPos, void 0, {
       ...nextBranch.attrs,
       branchType: "if",
       condition: promotedCondition
@@ -6255,7 +6366,23 @@ function deleteBranch(view, nodePos, branchType) {
     view.focus();
     return true;
   }
-  view.dispatch(view.state.tr.delete(context.branchPos, context.branchPos + context.branchNode.nodeSize).scrollIntoView());
+  if (!isBranchBodyEmpty(branchNode) && branchIndex > 0) {
+    const prevBranch = blockNode.child(branchIndex - 1);
+    const prevBranchPos = branchPos - prevBranch.nodeSize;
+    const prevBranchContentEnd = prevBranchPos + prevBranch.nodeSize - 1;
+    const tr = view.state.tr;
+    for (let i = 0; i < branchContent.childCount; i++) {
+      tr.insert(prevBranchContentEnd + i, branchContent.child(i));
+    }
+    const mappedBranchPos = tr.mapping.map(branchPos);
+    const mappedBranchEnd = tr.mapping.map(branchPos + branchNode.nodeSize);
+    tr.delete(mappedBranchPos, mappedBranchEnd);
+    tr.setSelection(TextSelection4.near(tr.doc.resolve(tr.mapping.map(prevBranchContentEnd)), -1));
+    view.dispatch(tr.scrollIntoView());
+    view.focus();
+    return true;
+  }
+  view.dispatch(view.state.tr.delete(branchPos, branchPos + branchNode.nodeSize).scrollIntoView());
   view.focus();
   return true;
 }
@@ -6274,7 +6401,8 @@ function ConditionDisplay({
   branchType,
   condition,
   editable = true,
-  onConditionChange
+  onConditionChange,
+  onBackspaceEmpty
 }) {
   const [isEditing, setIsEditing] = useState3(false);
   const [draftValue, setDraftValue] = useState3(condition);
@@ -6329,6 +6457,10 @@ function ConditionDisplay({
             event.preventDefault();
             cancel();
           }
+          if (event.key === "Backspace" && draftValue === "" && onBackspaceEmpty) {
+            event.preventDefault();
+            onBackspaceEmpty();
+          }
         }
       }
     );
@@ -6448,7 +6580,8 @@ function JinjaBranchHeader({
           branchType,
           condition,
           editable,
-          onConditionChange
+          onConditionChange,
+          onBackspaceEmpty: onDelete
         }
       ),
       editable ? /* @__PURE__ */ jsxs5("div", { className: "jinja-branch-actions", ref: kebabRef, children: [
@@ -6486,7 +6619,7 @@ function JinjaBranchHeader({
         ) : null
       ] }) : null
     ] }),
-    isLastBranch ? /* @__PURE__ */ jsx6("div", { className: "jinja-add-footer", children: /* @__PURE__ */ jsx6("div", { className: "jinja-add-footer-col", children: /* @__PURE__ */ jsxs5("div", { className: "jinja-add-footer-actions", ref: footerRef, children: [
+    isLastBranch && editable ? /* @__PURE__ */ jsx6("div", { className: "jinja-add-footer", children: /* @__PURE__ */ jsx6("div", { className: "jinja-add-footer-col", children: /* @__PURE__ */ jsxs5("div", { className: "jinja-add-footer-actions", ref: footerRef, children: [
       /* @__PURE__ */ jsx6(
         "button",
         {
@@ -6661,7 +6794,7 @@ var JinjaIfBranchView = class {
     return target != null && this.headerContainer.contains(target);
   }
   ignoreMutation(mutation) {
-    return this.headerContainer.contains(mutation.target);
+    return mutation.target === this.dom || this.headerContainer.contains(mutation.target);
   }
   destroy() {
     if (this._onSiblingsChanged) {