@37signals/lexxy 0.1.11-beta → 0.1.13-beta

package/dist/lexxy.esm.js

@@ -493,6 +493,7 @@ class ActionTextAttachmentNode extends DecoratorNode {
           conversion: () => ({
             node: new ActionTextAttachmentNode({
               src: img.getAttribute("src"),
+              caption: img.getAttribute("alt") || "",
               contentType: "image/*",
               width: img.getAttribute("width"),
               height: img.getAttribute("height")
@@ -513,7 +514,7 @@ class ActionTextAttachmentNode extends DecoratorNode {
     this.altText = altText || "";
     this.caption = caption || "";
     this.contentType = contentType || "";
-    this.fileName = fileName;
+    this.fileName = fileName || "";
     this.fileSize = fileSize;
     this.width = width;
     this.height = height;
@@ -2032,38 +2033,25 @@ class Contents {
     }, { tag: HISTORY_MERGE_TAG });
   }
 
-  deleteSelectedNodes() {
+  async deleteSelectedNodes() {
+    let focusNode = null;
+
     this.editor.update(() => {
       if ($isNodeSelection(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 (!$isElementNode(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 = $getRoot();
-        if (root.getChildrenSize() === 0) {
-          root.append($createParagraphNode());
-        }
+        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();
     });
   }
 
@@ -2198,6 +2186,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 (!$isElementNode(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 = $getRoot();
+    if (root.getChildrenSize() === 0) {
+      const newParagraph = $createParagraphNode();
+      root.append(newParagraph);
+      newParagraph.selectStart();
+    } else if (focusNode) {
+      if ($isTextNode(focusNode) || $isParagraphNode(focusNode)) {
+        focusNode.selectEnd();
+      } else {
+        focusNode.selectNext(0, 0);
+      }
+    }
+  }
+
   #collectSelectedListItems(selection) {
     const nodes = selection.getNodes();
     const listItems = new Set();
@@ -2449,6 +2476,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@37signals/lexxy",
-  "version": "0.1.11-beta",
+  "version": "0.1.13-beta",
   "description": "Lexxy - A modern rich text editor for Rails.",
   "module": "dist/lexxy.esm.js",
   "type": "module",