@37signals/lexxy 0.9.7-beta → 0.9.8-beta

package/dist/lexxy.esm.js

@@ -2542,14 +2542,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) {
@@ -7370,7 +7380,7 @@ class LinkDropdown extends ToolbarDropdown {
   get #selectedLinkUrl() {
     return this.editor.getEditorState().read(() => {
       const linkNode = this.editorElement.selection.nearestNodeOfType(LinkNode);
-      return linkNode?.getUrl() ?? null
+      return linkNode?.getURL() ?? ""
     })
   }
 }
@@ -7534,21 +7544,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
   }
 }

package/package.json

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