lexxy 0.9.13.beta → 0.9.15.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97cf5bf0fcc025d3ec9064f73665b7127b81daca68c91281c9e365c7fe5742ad
-  data.tar.gz: dc26d1228a98da394ac222d046a24cf3ffbd71d72f83245311ab9fdd0334a1db
+  metadata.gz: 2d9a254f888998ed62a3d7af0cbf6644a0b82fde3ca02d0eefc604c512e12ba9
+  data.tar.gz: b0d14ac32727c31eaf0709f16f178ad1056d38e30959141ef3e8b2cbb3f170fe
 SHA512:
-  metadata.gz: 103f687cdc45cc9c3b7b6c5454cb044294c3f1f944ce465a54fcf9285b2ce57ce5cf0c0316a68d4b1ee323d796beb4e74d4d366a1138276ab8e63e390b7ce207
-  data.tar.gz: d4d9b8b61d43b8ab8983547b657e8785907222564913177fbfdd25f77cf2b72fb832c2d4ebe887d38b5df6b5f020680d3eb7c767bf09e1102c70d4ca4567b9d8
+  metadata.gz: 3964a7317fdaf7ac44d2c31f546e073a13942bd3a3839be20f9a32a6159e4bc0daf7db35579a21fba551caaa4f136435be392ef70e99c3461eb40ccf3dfdb6c2
+  data.tar.gz: f3ea71f58d2a94b6226f9c0e4ace4b08f3ab0fb3d08eaff38159c38f736667661db6e60b0918d3e69a9563c89b244c1d8d3d5b052f8e7f0ea2da298d6011dc1d

data/README.md

@@ -2,9 +2,6 @@
 
 A modern rich text editor for Rails.
 
-> [!IMPORTANT]
-> This is a beta. It hasn't been battle-tested yet. Please try it out and report any issues you find.
-
 **[Try it out!](https://basecamp.github.io/lexxy/try-it)**
 
 ## Features

data/app/assets/javascript/lexxy.js

@@ -6795,14 +6795,14 @@ class LexicalToolbarElement extends HTMLElement {
 
     this.#setButtonPressed("bold", isBold);
     this.#setButtonPressed("italic", isItalic);
+    this.#setButtonPressed("strikethrough", isStrikethrough);
+    this.#setButtonPressed("underline", isUnderline);
 
-    this.#setButtonPressed("format", isInHeading || isStrikethrough || isUnderline);
+    this.#setButtonPressed("format", isInHeading);
     this.#setButtonPressed("paragraph", !isInHeading);
     this.#setButtonPressed("heading-large", headingTag === "h2");
     this.#setButtonPressed("heading-medium", headingTag === "h3");
     this.#setButtonPressed("heading-small", headingTag === "h4");
-    this.#setButtonPressed("strikethrough", isStrikethrough);
-    this.#setButtonPressed("underline", isUnderline);
 
     this.#setButtonPressed("lists", isInList);
     this.#setButtonPressed("unordered-list", isInList && listType === "bullet");
@@ -6965,6 +6965,14 @@ class LexicalToolbarElement extends HTMLElement {
       ${ToolbarIcons.italic}
       </button>
 
+      <button class="lexxy-editor__toolbar-button" type="button" name="strikethrough" data-command="strikethrough" title="Strikethrough">
+        ${ToolbarIcons.strikethrough}
+      </button>
+
+      <button class="lexxy-editor__toolbar-button lexxy-editor__toolbar-group-end" type="button" name="underline" data-command="underline" title="Underline">
+        ${ToolbarIcons.underline}
+      </button>
+
       <lexxy-toolbar-dropdown class="lexxy-editor__toolbar-dropdown">
         <button data-dropdown-trigger class="lexxy-editor__toolbar-button lexxy-editor__toolbar-button--chevron" type="button" name="format" title="Text formatting" aria-haspopup="menu" aria-expanded="false">
           ${ToolbarIcons.heading}
@@ -6983,13 +6991,6 @@ class LexicalToolbarElement extends HTMLElement {
             ${ToolbarIcons.h4} <span>Small Heading</span>
           </button>
           <div class="lexxy-editor__toolbar-separator" role="separator"></div>
-          <button type="button" name="strikethrough" data-command="strikethrough" title="Strikethrough" role="menuitem">
-            ${ToolbarIcons.strikethrough} <span>Strikethrough</span>
-          </button>
-          <button type="button" name="underline" data-command="underline" title="Underline" role="menuitem">
-            ${ToolbarIcons.underline} <span>Underline</span>
-          </button>
-          <div class="lexxy-editor__toolbar-separator" role="separator"></div>
           <button type="button" name="clear-formatting" data-command="clearFormatting" title="Clear formatting" role="menuitem">
             ${ToolbarIcons.clearFormatting} <span>Clear formatting</span>
           </button>
@@ -7802,14 +7803,15 @@ function $isShadowRoot(node) {
   return Wi(node) && Is(node) && !Vi(node)
 }
 
+function $isSafeForRoot(node) {
+  return (Wi(node) || ji(node)) && !node.isParentRequired()
+}
+
 function $makeSafeForRoot(node) {
-  if (Tr(node)) {
-    return Tt$4(node, eo)
-  } else if (node.isParentRequired()) {
-    const parent = node.createRequiredParent();
-    return Tt$4(node, parent)
-  } else {
+  if ($isSafeForRoot(node)) {
     return node
+  } else {
+    return Tt$4(node, () => node.createParentElementNode())
   }
 }
 
@@ -7924,6 +7926,39 @@ function $isListItemStructurallyEmpty(listItem) {
   return true
 }
 
+// Returns the document text up to `offset` inside `targetNode`. Non-inline
+// element siblings are joined with `\n\n`, matching Lexical's own
+// ElementNode.getTextContent behavior.
+function $textBeforeOffset(targetNode, offset) {
+  const parts = [];
+  let done = false;
+
+  function visit(node) {
+    if (done) return
+    if (node === targetNode) {
+      parts.push(node.getTextContent().slice(0, offset));
+      done = true;
+      return
+    }
+    if (Wi(node)) {
+      const children = node.getChildren();
+      for (let i = 0; i < children.length; i++) {
+        visit(children[i]);
+        if (done) return
+        const child = children[i];
+        if (Wi(child) && !child.isInline() && i < children.length - 1) {
+          parts.push("\n\n");
+        }
+      }
+    } else {
+      parts.push(node.getTextContent());
+    }
+  }
+
+  visit(Zo());
+  return parts.join("")
+}
+
 function isAttachmentSpacerTextNode(node, previousNode, index, childCount) {
   return Tr(node)
     && node.getTextContent() === " "
@@ -14949,6 +14984,9 @@ class RemoteFilterSource extends BaseSource {
 const NOTHING_FOUND_DEFAULT_MESSAGE = "Nothing found";
 const FILTER_DEBOUNCE_INTERVAL = 50;
 
+// Start of line, or after a space or newline.
+const DEFAULT_ONLY_AT_PATTERN = "^|[ \\n]";
+
 class LexicalPromptElement extends HTMLElement {
   #globalListeners = new ListenerBin()
   #popoverListeners = new ListenerBin()
@@ -14994,6 +15032,10 @@ class LexicalPromptElement extends HTMLElement {
     return this.hasAttribute("supports-space-in-searches")
   }
 
+  get onlyAt() {
+    return this.getAttribute("only-at")
+  }
+
   get open() {
     return this.popoverElement?.classList?.contains("lexxy-prompt-menu--visible")
   }
@@ -15037,14 +15079,10 @@ class LexicalPromptElement extends HTMLElement {
           if (offset >= triggerLength) {
             const textBeforeCursor = fullText.slice(offset - triggerLength, offset);
 
-            // Check if trigger is at the start of the text node (new line case) or preceded by space or newline
             if (textBeforeCursor === this.trigger) {
-              const isAtStart = offset === triggerLength;
-
-              const charBeforeTrigger = offset > triggerLength ? fullText[offset - triggerLength - 1] : null;
-              const isPrecededBySpaceOrNewline = charBeforeTrigger === " " || charBeforeTrigger === "\n";
+              const textBeforeTrigger = $textBeforeOffset(node, offset - triggerLength);
 
-              if (isAtStart || isPrecededBySpaceOrNewline) {
+              if (this.#onlyAtRegExp.test(textBeforeTrigger)) {
                 this.#popoverListeners.dispose();
                 this.#showPopover();
               }
@@ -15055,7 +15093,15 @@ class LexicalPromptElement extends HTMLElement {
     }));
   }
 
+  get #onlyAtRegExp() {
+    return new RegExp(`(?:${this.onlyAt ?? DEFAULT_ONLY_AT_PATTERN})$`)
+  }
+
   get #promptContentTypePermitted() {
+    // `insert-editable-text` prompts never create attachments, so the
+    // editor's attachment support and content-type allowlist don't apply.
+    if (this.hasAttribute("insert-editable-text")) return true
+
     const el = this.#editorElement;
     if (!el.supportsAttachments) {
       return false
@@ -15758,6 +15804,8 @@ class TableController {
 
     this.currentCellKey = cellNode?.getKey() ?? null;
     this.currentTableNodeKey = tableNode?.getKey() ?? null;
+
+    return tableNode
   }
 
   executeTableCommand(command, customIndex = null) {
@@ -16260,9 +16308,8 @@ class TableTools extends HTMLElement {
 
   #monitorForTableSelection() {
     this.#listeners.track(this.#editor.registerUpdateListener(() => {
-      this.tableController.updateSelectedTable();
+      const tableNode = this.#editor.getRootElement() && this.tableController.updateSelectedTable();
 
-      const tableNode = this.tableController.currentTableNode;
       if (tableNode) {
         this.#show();
       } else {