@sendbird/actionbook-core 0.9.8 → 0.9.9

package/dist/ui/index.js

@@ -2886,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);
@@ -5407,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)));
           }
         }
       }
@@ -6319,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;
@@ -6353,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
@@ -6369,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;
 }
@@ -6388,7 +6401,8 @@ function ConditionDisplay({
   branchType,
   condition,
   editable = true,
-  onConditionChange
+  onConditionChange,
+  onBackspaceEmpty
 }) {
   const [isEditing, setIsEditing] = useState3(false);
   const [draftValue, setDraftValue] = useState3(condition);
@@ -6443,6 +6457,10 @@ function ConditionDisplay({
             event.preventDefault();
             cancel();
           }
+          if (event.key === "Backspace" && draftValue === "" && onBackspaceEmpty) {
+            event.preventDefault();
+            onBackspaceEmpty();
+          }
         }
       }
     );
@@ -6562,7 +6580,8 @@ function JinjaBranchHeader({
           branchType,
           condition,
           editable,
-          onConditionChange
+          onConditionChange,
+          onBackspaceEmpty: onDelete
         }
       ),
       editable ? /* @__PURE__ */ jsxs5("div", { className: "jinja-branch-actions", ref: kebabRef, children: [