forge-select 0.7.2 → 0.7.4

package/dist/index.cjs

@@ -543,22 +543,20 @@ var ForgeSelect = class {
     }
     this.typeaheadBuffer = "";
     this.highlightedIndex = -1;
-    if (this.searchInput) {
-      const hadQuery = this.query !== "";
-      this.searchInput.value = "";
-      this.query = "";
-      if (hadQuery && this.opts.ajax) {
-        this.ajaxRequestId += 1;
-        if (this.ajaxTimer) {
-          clearTimeout(this.ajaxTimer);
-          this.ajaxTimer = null;
-        }
-        this.ajaxController?.abort();
-        this.ajaxController = null;
-        this.setLoading(false);
-        this.loadingMore = false;
-        this.remoteLoaded = false;
+    const hadQuery = this.query !== "";
+    if (this.searchInput) this.searchInput.value = "";
+    this.query = "";
+    if (hadQuery && this.opts.ajax) {
+      this.ajaxRequestId += 1;
+      if (this.ajaxTimer) {
+        clearTimeout(this.ajaxTimer);
+        this.ajaxTimer = null;
       }
+      this.ajaxController?.abort();
+      this.ajaxController = null;
+      this.setLoading(false);
+      this.loadingMore = false;
+      this.remoteLoaded = false;
     }
     this.emitter.emit("close");
     for (const plugin of this.plugins) plugin.onClose?.(this);
@@ -654,16 +652,17 @@ var ForgeSelect = class {
     if (options.beforeCreate !== void 0) this.opts.beforeCreate = options.beforeCreate;
     if (options.createOption !== void 0) this.opts.createOption = options.createOption;
     if (options.missingSelectionPolicy !== void 0) this.opts.missingSelectionPolicy = options.missingSelectionPolicy;
+    let needsReindex = false;
     if (options.duplicateValuePolicy !== void 0) {
       this.opts.duplicateValuePolicy = options.duplicateValuePolicy;
-      this.rebuildOptionIndexes();
+      needsReindex = true;
     }
     if (options.filterOption !== void 0) this.opts.filterOption = options.filterOption;
     if (options.searchFields !== void 0) this.opts.searchFields = options.searchFields;
     if (options.tokenSearch !== void 0) this.opts.tokenSearch = options.tokenSearch;
     if (options.accentInsensitive !== void 0) {
       this.opts.accentInsensitive = options.accentInsensitive;
-      this.rebuildOptionIndexes();
+      needsReindex = true;
     }
     if (options.searchScorer !== void 0) this.opts.searchScorer = options.searchScorer;
     if (options.highlightSearch !== void 0) this.opts.highlightSearch = options.highlightSearch;
@@ -690,6 +689,7 @@ var ForgeSelect = class {
       if (options.disabled) this.disable();
       else this.enable();
     }
+    if (needsReindex) this.rebuildOptionIndexes();
     this.root.classList.toggle("forge-select--sortable", this.opts.sortable && this.opts.multiple);
     this.updateSearchVisibility();
     this.clearRowCaches();
@@ -741,20 +741,6 @@ var ForgeSelect = class {
    * the same fallback used for values selected from a stale ajax page).
    */
   setData(data) {
-    if (this.ajaxTimer) {
-      clearTimeout(this.ajaxTimer);
-      this.ajaxTimer = null;
-    }
-    this.ajaxController?.abort();
-    this.ajaxController = null;
-    this.ajaxRequestId += 1;
-    this.setLoading(false);
-    this.loadingMore = false;
-    this.loadError = null;
-    this.remoteLoaded = true;
-    this.page = 0;
-    this.hasMore = false;
-    this.nextCursor = void 0;
     const previousData = this.data;
     this.data = data;
     try {
@@ -770,6 +756,20 @@ var ForgeSelect = class {
       this.rebuildOptionIndexes();
       throw new Error(`ForgeSelect: setData() is missing selected value(s): ${missing.join(", ")}`);
     }
+    if (this.ajaxTimer) {
+      clearTimeout(this.ajaxTimer);
+      this.ajaxTimer = null;
+    }
+    this.ajaxController?.abort();
+    this.ajaxController = null;
+    this.ajaxRequestId += 1;
+    this.setLoading(false);
+    this.loadingMore = false;
+    this.loadError = null;
+    this.remoteLoaded = true;
+    this.page = 0;
+    this.hasMore = false;
+    this.nextCursor = void 0;
     this.opts.data = data;
     if (missing.length > 0 && this.opts.missingSelectionPolicy === "prune") {
       this.selected = this.selected.filter((value) => this.optionByValue.has(value));
@@ -1301,7 +1301,8 @@ var ForgeSelect = class {
       return { option: existing, created: false };
     }
     if (this.opts.beforeCreate?.(trimmed) === false) return void 0;
-    const created = this.opts.createOption?.(trimmed) ?? { value: trimmed, label: trimmed };
+    if (!this.opts.createOption) return this.addCreatedOption({ value: trimmed, label: trimmed });
+    const created = this.opts.createOption(trimmed);
     if (created instanceof Promise) {
       return created.then((option) => option ? this.addCreatedOption(option) : void 0);
     }
@@ -1943,13 +1944,19 @@ var ForgeSelect = class {
     }
     return false;
   }
+  /**
+   * Reads the id off the row the render pass just marked, rather than rebuilding
+   * it from the highlight index. Virtual scrolling drops off-window rows, so an
+   * index-derived id can name an element that no longer exists, and
+   * aria-activedescendant must resolve to a real one — a dangling reference
+   * reads to assistive tech as no active option at all. Keyboard navigation
+   * scrolls the highlight back into view, which restores the reference.
+   */
   updateActiveDescendant() {
     const target = this.searchInput ?? this.control;
-    if (this.highlightedIndex >= 0) {
-      target.setAttribute("aria-activedescendant", `${this.uid}-nav-${this.highlightedIndex}`);
-    } else {
-      target.removeAttribute("aria-activedescendant");
-    }
+    const highlighted = this.list.querySelector(".forge-select__option--highlighted");
+    if (highlighted) target.setAttribute("aria-activedescendant", highlighted.id);
+    else target.removeAttribute("aria-activedescendant");
   }
   // ---------------------------------------------------------------- remote data
   scheduleRemoteLoad(query, delay) {
@@ -1975,7 +1982,7 @@ var ForgeSelect = class {
     this.emitter.emit("loading", loading);
   }
   remoteCacheKey(query, page, cursor) {
-    return `${query}\0${cursor ?? page}`;
+    return `${query}\0${cursor !== void 0 ? `c:${cursor}` : `p:${page}`}`;
   }
   fetchRemoteResult(query, page, signal, cursor) {
     const key = this.remoteCacheKey(query, page, cursor);
@@ -2083,6 +2090,7 @@ var ForgeSelect = class {
       if (!append) {
         this.data = [];
         this.clearRowCaches();
+        this.rebuildOptionIndexes();
       }
       this.hasMore = false;
       this.loadError = error;