lexxy 0.1.10.beta → 0.1.12.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fffdc9d43469a6366a3d6fa16b6e5b8284c5a19bdcfa3cbffeb79a96cf16970
-  data.tar.gz: b1e76d677c2c7e9c55ff713eba32c89f04cc0e267153f4e4def7cf48238dc733
+  metadata.gz: 18d165a2a610d44b12147598b0d876c26ac560805e026812b28bedf906fc79ce
+  data.tar.gz: b7f6432b4efa2b5674186f11f408ba0d9bebad133a35e6df45b9b70d87102bc5
 SHA512:
-  metadata.gz: 0c7752a992efceb4f40f411bb154037a21b7ffeb83db7dc28bf882f68ed2ff57f21ebe4c1d61dc420d6b344fd45fb8d819595a753e33d90134a8e3536d6fd0ba
-  data.tar.gz: 761ce9eee667c72a4cab67a5572cad3013f468c9248f415477c144b640a26852400c07afcdbe287afe492f858d54a798281ac96c89814fd69683f3ecd4488d77
+  metadata.gz: 7283442089ee6b769f928a9551c048da6c69e242fe5f7f7213bee79e03fb6567abaaa14319669bf3de62be571f5bbc60b825b5fa639a0ba0236f0559695498de
+  data.tar.gz: d9e94ff8f7a1a1493c9d3073aaa6e4bb56a21431ca42f6b61d6d37d4edca3286764f613dcd4b4ab65dce9c5d515349b1d3f4bbc8d38473ab99a85d010c42a6e6

data/app/assets/javascript/lexxy.js

@@ -5091,6 +5091,17 @@ function getListType(node) {
   return null
 }
 
+function isPrintableCharacter(event) {
+  // Ignore if modifier keys are pressed (except Shift for uppercase)
+  if (event.ctrlKey || event.metaKey || event.altKey) return false
+
+  // Ignore special keys
+  if (event.key.length > 1 && event.key !== 'Enter' && event.key !== 'Space') return false
+
+  // Accept single character keys (letters, numbers, punctuation)
+  return event.key.length === 1
+}
+
 class LexicalToolbarElement extends HTMLElement {
   constructor() {
     super();
@@ -5551,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")
@@ -5950,6 +5962,8 @@ class CommandDispatcher {
 
   dispatchInsertUnorderedList() {
     const selection = Nr();
+    if (!selection) return;
+
     const anchorNode = selection.anchor.getNode();
 
     if (this.selection.isInsideList && anchorNode && getListType(anchorNode) === "bullet") {
@@ -5961,6 +5975,8 @@ class CommandDispatcher {
 
   dispatchInsertOrderedList() {
     const selection = Nr();
+    if (!selection) return;
+
     const anchorNode = selection.anchor.getNode();
 
     if (this.selection.isInsideList && anchorNode && getListType(anchorNode) === "number") {
@@ -6133,11 +6149,14 @@ function nextFrame() {
 class Selection {
   constructor(editorElement) {
     this.editorElement = editorElement;
+    this.editorContentElement = editorElement.editorContentElement;
     this.editor = this.editorElement.editor;
     this.previouslySelectedKeys = new Set();
 
     this.#listenForNodeSelections();
     this.#processSelectionChangeCommands();
+    this.#handleInputWhenDecoratorNodesSelected();
+    this.#containEditorFocus();
   }
 
   clear() {
@@ -6231,6 +6250,21 @@ class Selection {
     return this.#findNextSiblingUp(anchorNode)
   }
 
+  get topLevelNodeAfterCursor() {
+    const { anchorNode, offset } = this.#getCollapsedSelectionData();
+    if (!anchorNode) return null
+
+    if (Qn(anchorNode)) {
+      return this.#getNextNodeFromTextEnd(anchorNode)
+    }
+
+    if (di(anchorNode)) {
+      return this.#getNodeAfterElementNode(anchorNode, offset)
+    }
+
+    return this.#findNextSiblingUp(anchorNode)
+  }
+
   get nodeBeforeCursor() {
     const { anchorNode, offset } = this.#getCollapsedSelectionData();
     if (!anchorNode) return null
@@ -6246,6 +6280,21 @@ class Selection {
     return this.#findPreviousSiblingUp(anchorNode)
   }
 
+  get topLevelNodeBeforeCursor() {
+    const { anchorNode, offset } = this.#getCollapsedSelectionData();
+    if (!anchorNode) return null
+
+    if (Qn(anchorNode)) {
+      return this.#getPreviousNodeFromTextStart(anchorNode)
+    }
+
+    if (di(anchorNode)) {
+      return this.#getNodeBeforeElementNode(anchorNode, offset)
+    }
+
+    return this.#findPreviousSiblingUp(anchorNode)
+  }
+
   get #contents() {
     return this.editorElement.contents
   }
@@ -6266,9 +6315,9 @@ class Selection {
 
   #processSelectionChangeCommands() {
     this.editor.registerCommand(Te$1, this.#selectPreviousNode.bind(this), Ii);
-    this.editor.registerCommand(Ne$1, this.#selectPreviousNode.bind(this), Ii);
     this.editor.registerCommand(ve$1, this.#selectNextNode.bind(this), Ii);
-    this.editor.registerCommand(we$1, this.#selectNextNode.bind(this), Ii);
+    this.editor.registerCommand(Ne$1, this.#selectPreviousTopLevelNode.bind(this), Ii);
+    this.editor.registerCommand(we$1, this.#selectNextTopLevelNode.bind(this), Ii);
 
     this.editor.registerCommand(De$1, this.#deleteSelectedOrNext.bind(this), Ii);
     this.editor.registerCommand(Ae$1, this.#deletePreviousOrNext.bind(this), Ii);
@@ -6299,6 +6348,93 @@ class Selection {
     });
   }
 
+  // In Safari, when the only node in the document is an attachment, it won't let you enter text
+  // before/below it. There is probably a better fix here, but this workaround solves the problem until
+  // we find it.
+  #handleInputWhenDecoratorNodesSelected() {
+    this.editor.getRootElement().addEventListener("keydown", (event) => {
+      if (isPrintableCharacter(event)) {
+        this.editor.update(() => {
+          const selection = Nr();
+
+          if (cr(selection) && selection.isCollapsed()) {
+            const anchorNode = selection.anchor.getNode();
+            const offset = selection.anchor.offset;
+
+            const nodeBefore = this.#getNodeBeforePosition(anchorNode, offset);
+            const nodeAfter = this.#getNodeAfterPosition(anchorNode, offset);
+
+            if (nodeBefore instanceof gi && !nodeBefore.isInline()) {
+              event.preventDefault();
+              this.#contents.createParagraphAfterNode(nodeBefore, event.key);
+              return
+            } else if (nodeAfter instanceof gi && !nodeAfter.isInline()) {
+              event.preventDefault();
+              this.#contents.createParagraphBeforeNode(nodeAfter, event.key);
+              return
+            }
+          }
+        });
+      }
+    }, true);
+  }
+
+  #getNodeBeforePosition(node, offset) {
+    if (Qn(node) && offset === 0) {
+      return node.getPreviousSibling()
+    }
+    if (di(node) && offset > 0) {
+      return node.getChildAtIndex(offset - 1)
+    }
+    return null
+  }
+
+  #getNodeAfterPosition(node, offset) {
+    if (Qn(node) && offset === node.getTextContentSize()) {
+      return node.getNextSibling()
+    }
+    if (di(node)) {
+      return node.getChildAtIndex(offset)
+    }
+    return null
+  }
+
+  #containEditorFocus() {
+    // Workaround for a bizarre Chrome bug where the cursor abandons the editor to focus on not-focusable elements
+    // above when navigating UP/DOWN when Lexical shows its fake cursor on custom decorator nodes.
+    this.editorContentElement.addEventListener("keydown", (event) => {
+      if (event.key === "ArrowUp") {
+        const lexicalCursor = this.editor.getRootElement().querySelector('[data-lexical-cursor]');
+
+        if (lexicalCursor) {
+          let currentElement = lexicalCursor.previousElementSibling;
+          while (currentElement && currentElement.hasAttribute('data-lexical-cursor')) {
+            currentElement = currentElement.previousElementSibling;
+          }
+
+          if (!currentElement) {
+            event.preventDefault();
+          }
+        }
+      }
+
+      if (event.key === "ArrowDown") {
+        const lexicalCursor = this.editor.getRootElement().querySelector('[data-lexical-cursor]');
+
+        if (lexicalCursor) {
+          let currentElement = lexicalCursor.nextElementSibling;
+          while (currentElement && currentElement.hasAttribute('data-lexical-cursor')) {
+            currentElement = currentElement.nextElementSibling;
+          }
+
+          if (!currentElement) {
+            event.preventDefault();
+          }
+        }
+      }
+    }, true);
+  }
+
   #syncSelectedClasses() {
     this.#clearPreviouslyHighlightedItems();
     this.#highlightNewItems();
@@ -6341,6 +6477,22 @@ class Selection {
     }
   }
 
+  async #selectPreviousTopLevelNode() {
+    if (this.current) {
+      await this.#withCurrentNode((currentNode) => currentNode.selectPrevious());
+    } else {
+      this.#selectInLexical(this.topLevelNodeBeforeCursor);
+    }
+  }
+
+  async #selectNextTopLevelNode() {
+    if (this.current) {
+      await this.#withCurrentNode((currentNode) => currentNode.selectNext(0, 0));
+    } else {
+      this.#selectInLexical(this.topLevelNodeAfterCursor);
+    }
+  }
+
   async #withCurrentNode(fn) {
     await nextFrame();
     if (this.current) {
@@ -6895,6 +7047,30 @@ class Contents {
     });
   }
 
+  createParagraphAfterNode(node, text) {
+    const newParagraph = Pi();
+    node.insertAfter(newParagraph);
+    newParagraph.selectStart();
+
+    // Insert the typed text
+    if (text) {
+      newParagraph.append(Xn(text));
+      newParagraph.select(1, 1); // Place cursor after the text
+    }
+  }
+
+  createParagraphBeforeNode(node, text) {
+    const newParagraph = Pi();
+    node.insertBefore(newParagraph);
+    newParagraph.selectStart();
+
+    // Insert the typed text
+    if (text) {
+      newParagraph.append(Xn(text));
+      newParagraph.select(1, 1); // Place cursor after the text
+    }
+  }
+
   uploadFile(file) {
     if (!this.editorElement.supportsAttachments) {
       console.warn("This editor does not supports attachments (it's configured with [attachments=false])");
@@ -6929,25 +7105,34 @@ class Contents {
   deleteSelectedNodes() {
     this.editor.update(() => {
       if (ur(this.#selection.current)) {
-        let nodesWereRemoved = false;
-        this.#selection.current.getNodes().forEach((node) => {
+        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
 
-          node.remove();
+          const children = parent.getChildren();
+          const index = children.indexOf(node);
 
-          if (parent.getType() === "root" && parent.getChildrenSize() === 0) {
-            parent.append(Pi());
+          if (index >= 0) {
+            parent.splice(index, 1, []);
           }
-
-          nodesWereRemoved = true;
         });
 
-        if (nodesWereRemoved) {
-          this.#selection.clear();
-          this.editor.focus();
-
-          return true
+        // Check if root is empty after all removals
+        const root = ps();
+        if (root.getChildrenSize() === 0) {
+          root.append(Pi());
         }
+
+        this.#selection.clear();
+        this.editor.focus();
+
+        return true
       }
     });
   }
@@ -7406,6 +7591,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();
@@ -7435,9 +7623,10 @@ class LexicalEditorElement extends HTMLElement {
   static debug = true
   static commands = [ "bold", "italic", "" ]
 
-  static observedAttributes = [ "connected" ]
+  static observedAttributes = [ "connected", "required" ]
 
   #initialValue = ""
+  #validationTextArea = document.createElement("textarea")
 
   constructor() {
     super();
@@ -7470,6 +7659,11 @@ class LexicalEditorElement extends HTMLElement {
     if (name === "connected" && this.isConnected && oldValue != null && oldValue !== newValue) {
       requestAnimationFrame(() => this.#reconnect());
     }
+
+    if (name === "required" && this.isConnected) {
+      this.#validationTextArea.required = this.hasAttribute("required");
+      this.#setValidity();
+    }
   }
 
   formResetCallback() {
@@ -7523,7 +7717,7 @@ class LexicalEditorElement extends HTMLElement {
       Ys(Mi);
       const root = ps();
       root.clear();
-      root.append(...this.#parseHtmlIntoLexicalNodes(html));
+      if (html !== "") root.append(...this.#parseHtmlIntoLexicalNodes(html));
       root.select();
 
       this.#toggleEmptyStatus();
@@ -7636,6 +7830,7 @@ class LexicalEditorElement extends HTMLElement {
 
     this.internals.setFormValue(html);
     this._internalFormValue = html;
+    this.#validationTextArea.value = this.#isEmpty ? "" : html;
 
     if (changed) {
       dispatch(this, "lexxy:change");
@@ -7664,7 +7859,7 @@ class LexicalEditorElement extends HTMLElement {
       this.cachedValue = null;
       this.#internalFormValue = this.value;
       this.#toggleEmptyStatus();
-      this.#validateRequired();
+      this.#setValidity();
     }));
   }
 
@@ -7771,11 +7966,11 @@ class LexicalEditorElement extends HTMLElement {
     return !this.editorContentElement.textContent.trim() && !containsVisuallyRelevantChildren(this.editorContentElement)
   }
 
-  #validateRequired() {
-    if (this.hasAttribute("required") && this.#isEmpty) {
-      this.internals.setValidity({ valueMissing: true }, "Please fill out this field.", this.editorContentElement);
-    } else {
+  #setValidity() {
+    if (this.#validationTextArea.validity.valid) {
       this.internals.setValidity({});
+    } else {
+      this.internals.setValidity(this.#validationTextArea.validity, this.#validationTextArea.validationMessage, this.editorContentElement);
     }
   }