lexxy 0.9.17 → 0.9.19.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd7e6d4971352233c9eaf05d0501f780dcf7029822385349c310a4c84c7198a6
-  data.tar.gz: 62ee0a3aa3009089c6bfbd3bd089afe40e4e7abe7cdba70efe45e20b137d0afe
+  metadata.gz: f6b15ddc26ce7b82fd871ed3f5dfa96598b84278da3af81c7c8e7ed1c7d8135b
+  data.tar.gz: eedb6f7b9cca87c16c1737c6db392b2fb8a38f560ca20f3c615dbd865afafbfc
 SHA512:
-  metadata.gz: 77269a9a5bc4bfee9da077aec96649b68b7cf3a128f0b76c82c0d0b668d7e1e03a15ee83d04816e5dee8a4b82d90e98d7c230913a2b3a40d3cacf00637cbf41c
-  data.tar.gz: 436e73b527e5e5e9305fa5d8803194f06359e84a6a7f19f35575ec27caa8336f96843ce342f1ded93f88cce8d34dc0f3c46fb163d6cc9e951cdf905f953c3ac3
+  metadata.gz: 6945b89f20390bc1f407d95de1f365ef97508b8e7c8ac4c8960d48df6a8d53e39cfcc39795988e8e4e77b37d2d4e60819ffc0faf0a8f1035b3acedaede71d978
+  data.tar.gz: 791d8ac7ffebbe6987fc70571bb04450e17e93571f89bd10abdcbf7586b0b3deed48208a0e035b66eceeb5cb42db373399894b2aead182c19139ab3cc0f11d5b

data/app/assets/javascript/lexxy.js

@@ -10357,9 +10357,12 @@ class Selection {
   }
 
   get isOnPreviewableImage() {
-    const selection = Qr();
-    const firstNode = selection?.getNodes().at(0);
-    return $isActionTextAttachmentNode(firstNode) && firstNode.isPreviewableImage
+    return this.previewableImageNode != null
+  }
+
+  get previewableImageNode() {
+    const firstNode = Qr()?.getNodes().at(0);
+    return $isActionTextAttachmentNode(firstNode) && firstNode.isPreviewableImage ? firstNode : null
   }
 
   get isAtNodeStart() {
@@ -11334,7 +11337,10 @@ class GalleryUploader extends Uploader {
 
   #findOrCreateGallery() {
     if (this.selection.isOnPreviewableImage) {
-      this.#gallery = $findOrCreateGalleryForImage(this.#selectedNode);
+      // Resolve from the previewable image itself (the selection's first node), not from
+      // #selectedNode (the anchor) — those differ when the selection runs from an image
+      // into following text, and the anchor text node can't join a gallery (returns null).
+      this.#gallery = $findOrCreateGalleryForImage(this.selection.previewableImageNode);
     } else if (this.#selectionIsAfterGalleryEdge) {
       this.#gallery = $findOrCreateGalleryForImage(this.selection.nodeBeforeCursor);
     } else {
@@ -11671,7 +11677,8 @@ class NodeInserter {
     const INSERTERS = [
       CodeNodeInserter,
       ShadowRootNodeInserter,
-      NodeSelectionNodeInserter
+      NodeSelectionNodeInserter,
+      BlockContainerNodeInserter
     ];
     const Inserter = INSERTERS.find(inserter => inserter.handles(selection));
     return Inserter ? new Inserter(selection) : selection
@@ -11697,14 +11704,40 @@ class CodeNodeInserter extends NodeInserter {
 
     const caret = lc(codeNode, insertionIndex + 1, "previous");
 
+    // Nodes that are already in the document come from the format-toggle path (existing
+    // content converted into this code block). Brand-new nodes (dropped/pasted content)
+    // were never attached.
+    const existingNodes = new Set(nodes.filter(node => node.isAttached()));
+    const trailingNodes = [];
+
     for (const node of nodes) {
-      if (!node.isAttached()) continue
-      if (caret.getNodeAtCaret() && Wi(node)) { caret.insert(or()); }
+      if (existingNodes.has(node)) {
+        if (!node.isAttached()) continue // already pulled in when a converted ancestor was removed
+      } else if (!this.#canJoinCodeBlock(node)) {
+        trailingNodes.push(node); // e.g. a dropped attachment, which a code block can't hold
+        continue
+      }
 
+      if (caret.getNodeAtCaret() && Wi(node)) { caret.insert(or()); }
       caret.insert(this.#convertNodeToCodeChild(node));
     }
 
-    caret.getNodeAtCaret().selectEnd();
+    const lastTrailingNode = this.#insertAfterCodeBlock(codeNode, trailingNodes);
+    const nodeToSelect = lastTrailingNode ?? caret.getNodeAtCaret();
+    nodeToSelect?.selectEnd();
+  }
+
+  #canJoinCodeBlock(node) {
+    return Tr(node) || sr(node)
+  }
+
+  #insertAfterCodeBlock(codeNode, nodes) {
+    let previousNode = codeNode;
+    for (const node of nodes) {
+      previousNode.insertAfter(node);
+      previousNode = node;
+    }
+    return nodes.at(-1)
   }
 
   #convertNodeToCodeChild(node) {
@@ -11720,7 +11753,7 @@ class CodeNodeInserter extends NodeInserter {
 
 class ShadowRootNodeInserter extends NodeInserter {
   static handles(selection) {
-    return $isShadowRoot(selection?.anchor.getNode())
+    return $isShadowRoot(selection?.anchor?.getNode())
   }
 
   insertNodes(nodes) {
@@ -11749,6 +11782,31 @@ class NodeSelectionNodeInserter extends NodeInserter {
   }
 }
 
+// Lexical's RangeSelection.insertNodes requires every selection point to have a block
+// ancestor with inline children. An element point on a container of block nodes — e.g.
+// a quote holding paragraphs — has none, so Lexical throws invariant #211 or #212.
+// Descend such points to a leaf position before inserting.
+class BlockContainerNodeInserter extends NodeInserter {
+  static handles(selection) {
+    return Fr(selection) &&
+      [ selection.anchor, selection.focus ].some($isPointOnBlockContainer)
+  }
+
+  insertNodes(nodes) {
+    St$3(this.selection);
+    this.selection.insertNodes(nodes);
+  }
+}
+
+function $isPointOnBlockContainer(point) {
+  if (point.type === "element") {
+    const firstChild = point.getNode().getFirstChild();
+    return (Wi(firstChild) || ji(firstChild)) && !firstChild.isInline()
+  } else {
+    return false
+  }
+}
+
 class Contents {
   constructor(editorElement) {
     this.editorElement = editorElement;
@@ -11845,7 +11903,7 @@ class Contents {
       blockElements.forEach(node => this.#unwrapCodeBlock(node));
     } else {
       $expandSelectionToLineBreaksAndSplitAtEdges(selection);
-      const elements = this.#blockLevelElementsInSelection(selection);
+      const elements = this.#outermostElements(this.#blockLevelElementsInSelection(selection));
       if (elements.length === 0) return
 
       const codeNode = I$1("plain");
@@ -11981,6 +12039,8 @@ class Contents {
   }
 
   uploadFiles(files, { selectLast } = {}) {
+    if (!this.editorElement) return // Disposed (e.g. on turbo:before-cache); a late drop can still land here
+
     if (!this.editorElement.supportsAttachments) {
       console.warn("This editor does not supports attachments (it's configured with [attachments=false])");
       return
@@ -12171,6 +12231,18 @@ class Contents {
     return Array.from(elements)
   }
 
+  // Selections spanning nested structures (a quote and its inner paragraphs,
+  // nested list items) yield both an element and its ancestor. Converting the
+  // ancestor detaches its whole subtree — including a node freshly inserted
+  // inside it — which can leave the selection on removed nodes (Lexical
+  // invariant #19). The outermost elements already cover their descendants'
+  // text content, so keep only those.
+  #outermostElements(elements) {
+    return elements.filter((element) => {
+      return elements.every((other) => other === element || !element.getParents().includes(other))
+    })
+  }
+
   #insertUploadNodes(nodes) {
     if (nodes.every($isActionTextAttachmentNode)) {
       const uploader = Uploader.for(this.editorElement, []);
@@ -13770,12 +13842,23 @@ class EarlyEscapeListItemNode extends ge$2 {
     return super.insertNewAfter(selection, restoreSelection)
   }
 
+  get #isInBlockquote() {
+    return Boolean(At$2(this, At$1))
+  }
+
   #shouldEscape(selection) {
-    if (!At$2(this, At$1)) return false
-    if ($isBlankNode(this)) return true
+    if (this.#isInPasteOperation() || !this.#isInBlockquote) {
+      return false
+    } else if ($isBlankNode(this)) {
+      return true
+    } else {
+      const paragraph = At$2(selection.anchor.getNode(), Zi);
+      return paragraph && $isBlankNode(paragraph) && pe$2(paragraph.getParent())
+    }
+  }
 
-    const paragraph = At$2(selection.anchor.getNode(), Zi);
-    return paragraph && $isBlankNode(paragraph) && pe$2(paragraph.getParent())
+  #isInPasteOperation() {
+    return Es(jn)
   }
 
   #escapeFromList() {
@@ -13823,7 +13906,7 @@ class FormatEscapeExtension extends LexxyExtension {
   }
 
   get allowedElements() {
-    return [ { tag: "li", attributes: [ "value" ] } ]
+    return [ { tag: "ol", attributes: [ "start" ] }, { tag: "li", attributes: [ "value" ] } ]
   }
 
   get lexicalExtension() {
@@ -14296,8 +14379,8 @@ class LexicalEditorElement extends HTMLElement {
     return this.#historyState.redo
   }
 
-  #readSanitizedEditorValue(editor = this.editor) {
-    return editor?.read(() => {
+  #readSanitizedEditorValue() {
+    return this.editor?.read(() => {
       return sanitize(ht$1(this.editor, null))
     }) ?? null
   }
@@ -14331,7 +14414,6 @@ class LexicalEditorElement extends HTMLElement {
   }
 
   #initialize() {
-    this.#synchronizeWithChanges();
     this.#registerComponents();
     this.#handleEnter();
     this.#registerFocusEvents();
@@ -14340,6 +14422,9 @@ class LexicalEditorElement extends HTMLElement {
     this.#attachDebugHooks();
     this.#attachToolbar();
     this.#resetBeforeTurboCaches();
+
+    this.#setInternalFormValue(this.value, { suppressEvent: true });
+    this.#synchronizeWithChanges();
   }
 
   #registerFileAcceptFilter() {
@@ -14367,7 +14452,6 @@ class LexicalEditorElement extends HTMLElement {
       $initialEditorState: (editor) => {
         this.#configureSanitizer(editor);
         this.#loadInitialValue(editor);
-        this.#setInternalFormValue(this.#readSanitizedEditorValue(editor));
       },
     },
       ...this.extensions.lexicalExtensions
@@ -14435,13 +14519,13 @@ class LexicalEditorElement extends HTMLElement {
     return Array.from(this.attributes).filter(attribute => attribute.name.startsWith("aria-"))
   }
 
-  #setInternalFormValue(html) {
-    const changed = this.#previousInternalFormValue !== null && html !== this.#previousInternalFormValue;
+  #setInternalFormValue(html, { suppressEvent = false } = {}) {
+    const changed = html !== this.#previousInternalFormValue;
 
     this.internals.setFormValue(html);
     this.#previousInternalFormValue = html;
 
-    if (changed) {
+    if (changed && !suppressEvent) {
       dispatch(this, "lexxy:change");
     }
   }