lexxy 0.9.6.beta → 0.9.8.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b3e32d6616564bae023ac462dadcbc6a9b3ca526e152d1f0166233e64483548
-  data.tar.gz: c8f19bbac5ae8129e4b70e769233005598005b04f9820e4f025dccaca67ced73
+  metadata.gz: 35be558d191256d60a92fd727768d719247399dfa0f017d54560a4a7eb775666
+  data.tar.gz: 3f568f51b50c2cf790aa0ae1803dcd6350e22c9a09a354f0048473df1b41e831
 SHA512:
-  metadata.gz: 5f4862084d7dd764d555ab65995f005249071ab747314ee499150f2708b2ec09af785f0347fd3dc5a7039d61a9b64889f5300a47ea463171633bd865c521ce6b
-  data.tar.gz: a1eb5afc29e8ef304c534bb75c9375d0f3dbc80aafbb55ab7981ff8de9043acbf9f07ac88569d46fe0824c6da41759d42330e300acf9a8083c1fdf2bed0f8cac
+  metadata.gz: bf76840177aee96461993510ebce333a632b8c8781a81ed973ee9231d29b63817e3a22e0f7be73c1175f1868e4d7d5bf1a23dd506f2fc1c3c2e0df0a7f360634
+  data.tar.gz: b87a831bc8e1d4ec5a558ea3df22a19ea0c9fda29d3e7dde772aaffb31202f1746810ad8b029f59310e4a6722ff4a1d017394a47accf208e247535ebd314d59e

data/README.md

@@ -3,7 +3,7 @@
 A modern rich text editor for Rails.
 
 > [!IMPORTANT]
-> This is an early beta. It hasn't been battle-tested yet. Please try it out and report any issues you find.
+> 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)**
 
@@ -26,7 +26,7 @@ Visit the **[documentation site](https://basecamp.github.io/lexxy)**.
 
 ## Roadmap
 
-This is an early beta. Here's what's coming next:
+This is a beta. Here's what's coming next:
 
 - [x] Configurable editors in Action Text: Choose your editor like you choose your database.
 - [x] More editing features:

data/app/assets/javascript/lexxy.js

@@ -6247,7 +6247,7 @@ purify.addHook("uponSanitizeElement", (node, data) => {
   }
 });
 
-function buildConfig(allowedElements) {
+function buildConfig(allowedElements ) {
   const tagAttributes = {};
 
   for (const element of allowedElements) {
@@ -7551,15 +7551,12 @@ var Lexxy = {
   }
 };
 
-function sanitize(html, allowedElements) {
-  return purify.sanitize(html, buildConfig(allowedElements))
+function setSanitizerConfig(allowedTags) {
+  purify.clearConfig();
+  purify.setConfig(buildConfig(allowedTags));
 }
 
-// Sanitize HTML for custom attachment content (mentions, cards, etc.).
-// Uses DOMPurify defaults to strip XSS vectors (scripts, event handlers)
-// while preserving the richer tag set that server-rendered attachment
-// content legitimately uses (e.g. <span>, <div>, <img>).
-function sanitizeAttachmentContent(html) {
+function sanitize(html) {
   return purify.sanitize(html)
 }
 
@@ -7655,7 +7652,7 @@ class CustomActionTextAttachmentNode extends Fi {
   createDOM() {
     const figure = createElement(this.tagName, { "content-type": this.contentType, "data-lexxy-decorator": true });
 
-    figure.insertAdjacentHTML("beforeend", sanitizeAttachmentContent(this.innerHtml));
+    figure.insertAdjacentHTML("beforeend", sanitize(this.innerHtml));
 
     const deleteButton = createElement("lexxy-node-delete-button");
     figure.appendChild(deleteButton);
@@ -8924,14 +8921,24 @@ function normalizeFilteredText(string) {
     .normalize("NFD").replace(/[\u0300-\u036f]/g, "") // Remove diacritics
 }
 
-function filterMatches(text, potentialMatch) {
-  return normalizeFilteredText(text).includes(normalizeFilteredText(potentialMatch))
+function filterMatchPosition(text, potentialMatch) {
+  const normalizedText = normalizeFilteredText(text);
+  const normalizedMatch = normalizeFilteredText(potentialMatch);
+
+  if (!normalizedMatch) return 0
+
+  const match = normalizedText.match(new RegExp(`(?:^|\\b)${escapeForRegExp(normalizedMatch)}`));
+  return match ? match.index : -1
 }
 
 function upcaseFirst(string) {
   return string.charAt(0).toUpperCase() + string.slice(1)
 }
 
+function escapeForRegExp(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+}
+
 // Parses a value that may arrive as a boolean or as a string (e.g. from DOM
 // getAttribute) into a proper boolean. Ensures "false" doesn't evaluate as truthy.
 function parseBoolean(value) {
@@ -13185,7 +13192,7 @@ class LexicalEditorElement extends HTMLElement {
   get value() {
     if (!this.cachedValue) {
       this.editor?.getEditorState().read(() => {
-        this.cachedValue = sanitize(g(this.editor, null), this.#allowedElements);
+        this.cachedValue = sanitize(g(this.editor, null));
       });
     }
 
@@ -13244,6 +13251,7 @@ class LexicalEditorElement extends HTMLElement {
     this.#registerFocusEvents();
     this.#attachDebugHooks();
     this.#attachToolbar();
+    this.#configureSanitizer();
     this.#loadInitialValue();
     this.#resetBeforeTurboCaches();
   }
@@ -13520,6 +13528,10 @@ class LexicalEditorElement extends HTMLElement {
     }
   }
 
+  #configureSanitizer() {
+    setSanitizerConfig(this.#allowedElements);
+  }
+
   get #allowedElements() {
     return this.#importableTags.concat(this.extensions.allowedElements)
   }
@@ -13819,7 +13831,7 @@ class LinkDropdown extends ToolbarDropdown {
   get #selectedLinkUrl() {
     return this.editor.getEditorState().read(() => {
       const linkNode = this.editorElement.selection.nearestNodeOfType(M$5);
-      return linkNode?.getUrl() ?? null
+      return linkNode?.getURL() ?? ""
     })
   }
 }
@@ -13983,21 +13995,41 @@ class LocalFilterSource extends BaseSource {
   }
 
   #buildListItemsFromPromptItems(promptItems, filter) {
-    const listItems = [];
     this.promptItemByListItem = new WeakMap();
 
-    for (const promptItem of promptItems) {
-      if (listItems.length >= MAX_RENDERED_SUGGESTIONS$1) break
+    if (!filter) {
+      return this.#buildAllListItems(promptItems)
+    }
 
+    const matches = [];
+    for (const promptItem of promptItems) {
       const searchableText = promptItem.getAttribute("search");
-
-      if (!filter || filterMatches(searchableText, filter)) {
-        const listItem = this.buildListItemElementFor(promptItem);
-        this.promptItemByListItem.set(listItem, promptItem);
-        listItems.push(listItem);
+      const position = filterMatchPosition(searchableText, filter);
+      if (position >= 0) {
+        matches.push({ promptItem, position });
       }
     }
 
+    matches.sort((a, b) => a.position - b.position);
+
+    const listItems = [];
+    for (const { promptItem } of matches) {
+      if (listItems.length >= MAX_RENDERED_SUGGESTIONS$1) break
+      const listItem = this.buildListItemElementFor(promptItem);
+      this.promptItemByListItem.set(listItem, promptItem);
+      listItems.push(listItem);
+    }
+    return listItems
+  }
+
+  #buildAllListItems(promptItems) {
+    const listItems = [];
+    for (const promptItem of promptItems) {
+      if (listItems.length >= MAX_RENDERED_SUGGESTIONS$1) break
+      const listItem = this.buildListItemElementFor(promptItem);
+      this.promptItemByListItem.set(listItem, promptItem);
+      listItems.push(listItem);
+    }
     return listItems
   }
 }