lexxy 0.1.12.beta → 0.1.13.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d165a2a610d44b12147598b0d876c26ac560805e026812b28bedf906fc79ce
-  data.tar.gz: b7f6432b4efa2b5674186f11f408ba0d9bebad133a35e6df45b9b70d87102bc5
+  metadata.gz: 263e76081a9e0910c9d470ef6c6252af14fd78d3e05905b0170a4641e2854433
+  data.tar.gz: 5868f9ef392f984b4254d06561fd3305d962ceac71ebbd69a422b6a651be1cc6
 SHA512:
-  metadata.gz: 7283442089ee6b769f928a9551c048da6c69e242fe5f7f7213bee79e03fb6567abaaa14319669bf3de62be571f5bbc60b825b5fa639a0ba0236f0559695498de
-  data.tar.gz: d9e94ff8f7a1a1493c9d3073aaa6e4bb56a21431ca42f6b61d6d37d4edca3286764f613dcd4b4ab65dce9c5d515349b1d3f4bbc8d38473ab99a85d010c42a6e6
+  metadata.gz: fd7111fead7f70799d1e6c8fd3fbc3f6b3996dabc29cc17aa51d5e595050045e8d4cdf353f2f0210a5672d5343964df0a5a2515b1a96cd5fff4b56c06a842c19
+  data.tar.gz: d5f72056d6be21b3005da384a3c026f6675398ed09faf2da46502e6b4cb8f457736d0fcaa4af76bc22fabe6a0ac3404c0d86a0d20f884503eaee4c34209540aa

data/app/assets/javascript/lexxy.js

@@ -5583,7 +5583,7 @@ class ActionTextAttachmentNode extends gi {
     this.altText = altText || "";
     this.caption = caption || "";
     this.contentType = contentType || "";
-    this.fileName = fileName;
+    this.fileName = fileName || "";
     this.fileSize = fileSize;
     this.width = width;
     this.height = height;
@@ -7102,38 +7102,25 @@ class Contents {
     }, { tag: Ti });
   }
 
-  deleteSelectedNodes() {
+  async deleteSelectedNodes() {
+    let focusNode = null;
+
     this.editor.update(() => {
       if (ur(this.#selection.current)) {
         const nodesToRemove = this.#selection.current.getNodes();
         if (nodesToRemove.length === 0) return
 
-        // Use splice() instead of node.remove() for proper removal and
-        // reconciliation. Would have issues with removing unintended decorator nodes
-        // with node.remove()
-        nodesToRemove.forEach((node) => {
-          const parent = node.getParent();
-          if (!di(parent)) return
-
-          const children = parent.getChildren();
-          const index = children.indexOf(node);
-
-          if (index >= 0) {
-            parent.splice(index, 1, []);
-          }
-        });
-
-        // Check if root is empty after all removals
-        const root = ps();
-        if (root.getChildrenSize() === 0) {
-          root.append(Pi());
-        }
+        focusNode = this.#findAdjacentNodeTo(nodesToRemove);
+        this.#deleteNodes(nodesToRemove);
+      }
+    });
 
-        this.#selection.clear();
-        this.editor.focus();
+    await nextFrame();
 
-        return true
-      }
+    this.editor.update(() => {
+      this.#selectAfterDeletion(focusNode);
+      this.#selection.clear();
+      this.editor.focus();
     });
   }
 
@@ -7268,6 +7255,45 @@ class Contents {
     nodesToDelete.forEach((node) => node.remove());
   }
 
+  #deleteNodes(nodes) {
+    // Use splice() instead of node.remove() for proper removal and
+    // reconciliation. Would have issues with removing unintended decorator nodes
+    // with node.remove()
+    nodes.forEach((node) => {
+      const parent = node.getParent();
+      if (!di(parent)) return
+
+      const children = parent.getChildren();
+      const index = children.indexOf(node);
+
+      if (index >= 0) {
+        parent.splice(index, 1, []);
+      }
+    });
+  }
+
+  #findAdjacentNodeTo(nodes) {
+    const firstNode = nodes[0];
+    const lastNode = nodes[nodes.length - 1];
+
+    return firstNode?.getPreviousSibling() || lastNode?.getNextSibling()
+  }
+
+  #selectAfterDeletion(focusNode) {
+    const root = ps();
+    if (root.getChildrenSize() === 0) {
+      const newParagraph = Pi();
+      root.append(newParagraph);
+      newParagraph.selectStart();
+    } else if (focusNode) {
+      if (Qn(focusNode) || Fi(focusNode)) {
+        focusNode.selectEnd();
+      } else {
+        focusNode.selectNext(0, 0);
+      }
+    }
+  }
+
   #collectSelectedListItems(selection) {
     const nodes = selection.getNodes();
     const listItems = new Set();