lexxy 0.1.11.beta → 0.1.13.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72557f2f915d20c07de190adaad818d1900728371f65482d8f01a51b3b4c5f24
-  data.tar.gz: 0fabe3de15525414a0e7e548f4d8e5c605bff3e26074bc79541c20bbcb92946c
+  metadata.gz: 263e76081a9e0910c9d470ef6c6252af14fd78d3e05905b0170a4641e2854433
+  data.tar.gz: 5868f9ef392f984b4254d06561fd3305d962ceac71ebbd69a422b6a651be1cc6
 SHA512:
-  metadata.gz: 31d13d76af610866ca92fc340c90f71d3b8a44e6a27f616feb76c2f56cf6f074f22323edd67258054982386f480ab37b9d7b32ff7d7e946be3ec2fc8cb7371bd
-  data.tar.gz: 73f85f0ed7d75452cc6d0c28cc3cfd45d0f1bb544068287b25822b060c14926410d09d7923738879c6f15164a644daea3b3097cfff0cd4a34fbbd3a76f0c5c74
+  metadata.gz: fd7111fead7f70799d1e6c8fd3fbc3f6b3996dabc29cc17aa51d5e595050045e8d4cdf353f2f0210a5672d5343964df0a5a2515b1a96cd5fff4b56c06a842c19
+  data.tar.gz: d5f72056d6be21b3005da384a3c026f6675398ed09faf2da46502e6b4cb8f457736d0fcaa4af76bc22fabe6a0ac3404c0d86a0d20f884503eaee4c34209540aa

data/app/assets/javascript/lexxy.js

@@ -5562,6 +5562,7 @@ class ActionTextAttachmentNode extends gi {
           conversion: () => ({
             node: new ActionTextAttachmentNode({
               src: img.getAttribute("src"),
+              caption: img.getAttribute("alt") || "",
               contentType: "image/*",
               width: img.getAttribute("width"),
               height: img.getAttribute("height")
@@ -5582,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;
@@ -7101,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();
     });
   }
 
@@ -7267,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();
@@ -7590,6 +7617,9 @@ class Clipboard {
   #handlePastedFiles(clipboardData) {
     if (!this.editorElement.supportsAttachments) return
 
+    const html = clipboardData.getData('text/html');
+    if (html) return // Ignore if image copied from browser since we will load it as a remote image
+
     this.#preservingScrollPosition(() => {
       for (const item of clipboardData.items) {
         const file = item.getAsFile();