lexxy 0.9.7.beta → 0.9.8.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d626ffd428a2d550fb3439d9ee89e2e71a86f6bdaa3a990d5c5f8954394e5529
-  data.tar.gz: 98f0d3b26df745b0a6477e508de91bf2f9be89c079fccf3f3d53648c92d311b6
+  metadata.gz: 35be558d191256d60a92fd727768d719247399dfa0f017d54560a4a7eb775666
+  data.tar.gz: 3f568f51b50c2cf790aa0ae1803dcd6350e22c9a09a354f0048473df1b41e831
 SHA512:
-  metadata.gz: 286a01f5de6b3d69347a1a40f54709718e245c4de7f3cca176635a2acb44fcea5e19d78f5fac1b9aaef66c1671d920073700c28918350d3d62f20e71931fa6dd
-  data.tar.gz: 0003b9f77dc7c231067a69ca758626941df4cec24393d3f897b6705b3526e5e8260f290f9fa8591bf7a3d982e4fac3e2033a9aaa16ce33b9665a60f2d4f9c4fd
+  metadata.gz: bf76840177aee96461993510ebce333a632b8c8781a81ed973ee9231d29b63817e3a22e0f7be73c1175f1868e4d7d5bf1a23dd506f2fc1c3c2e0df0a7f360634
+  data.tar.gz: b87a831bc8e1d4ec5a558ea3df22a19ea0c9fda29d3e7dde772aaffb31202f1746810ad8b029f59310e4a6722ff4a1d017394a47accf208e247535ebd314d59e

data/app/assets/javascript/lexxy.js

@@ -8921,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) {
@@ -13821,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() ?? ""
     })
   }
 }
@@ -13985,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
   }
 }