forge-select 0.7.1 → 0.7.3

package/dist/index.js

@@ -324,6 +324,12 @@ var ForgeSelect = class {
     this.highlightedIndex = -1;
     this.typeaheadBuffer = "";
     this.typeaheadTimer = null;
+    // Keyed by the option object, not its value: duplicateValuePolicy only warns
+    // by default, so two options can share a value while carrying different
+    // labels, and a value-keyed cache would render the first one's content for
+    // both. Still explicitly bounded — a WeakMap would not collect anything while
+    // `data` holds every key, so scrolling a long list would retain a detached
+    // node per option visited.
     this.rowContentCache = /* @__PURE__ */ new Map();
     this.rowElementCache = /* @__PURE__ */ new Map();
     this.rowHeightCache = /* @__PURE__ */ new Map();
@@ -511,8 +517,21 @@ 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;
+      }
     }
     this.emitter.emit("close");
     for (const plugin of this.plugins) plugin.onClose?.(this);
@@ -1562,11 +1581,28 @@ var ForgeSelect = class {
     this.rowHeightCache.clear();
     this.rowOffsetsCache = null;
   }
+  /** Identifies a row *position*, which is what measured heights are tied to. */
   rowKey(row, index) {
     if (row.kind === "option") return `option:${row.option.value}:${index}`;
     if (row.kind === "group") return `group:${row.label}:${index}`;
     return `${row.kind}:${index}`;
   }
+  /**
+   * Identifies a row's *content* for `<li>` recycling, deliberately without the
+   * row index: filtering shifts every index below the first change, so an
+   * index-keyed element cache misses on every keystroke — exactly when the list
+   * re-renders most. renderRow() rewrites the element completely, so reusing it
+   * at a new position is safe.
+   *
+   * Keys are not guaranteed unique within a render — duplicateValuePolicy
+   * defaults to warning rather than rejecting duplicate values — so callers
+   * must not hand the same element to two rows of one render.
+   */
+  rowElementKey(row) {
+    if (row.kind === "option") return `option:${row.option.value}`;
+    if (row.kind === "group") return `group:${row.label}`;
+    return row.kind;
+  }
   measuredRowHeight(index) {
     return this.opts.variableItemHeight ? this.rowHeightCache.get(this.rowKey(this.rows[index], index)) ?? this.opts.itemHeight : this.opts.itemHeight;
   }
@@ -1628,9 +1664,12 @@ var ForgeSelect = class {
       this.list.append(topSpacer);
     }
     const appended = [];
+    const claimed = /* @__PURE__ */ new Set();
     for (let i = start; i < end; i++) {
-      const key = this.rowKey(this.rows[i], i);
-      const element = this.renderRow(this.rows[i], this.rowElementCache.get(key));
+      const key = this.rowElementKey(this.rows[i]);
+      const cached = this.rowElementCache.get(key);
+      const element = this.renderRow(this.rows[i], cached && !claimed.has(cached) ? cached : void 0);
+      claimed.add(element);
       this.rowElementCache.set(key, element);
       if (this.rowElementCache.size > ROW_CACHE_LIMIT) {
         const oldest = this.rowElementCache.keys().next().value;
@@ -1800,7 +1839,7 @@ var ForgeSelect = class {
       }
       return holder;
     }
-    let cached = this.rowContentCache.get(option.value);
+    let cached = this.rowContentCache.get(option);
     if (!cached) {
       const holder = document.createElement("span");
       holder.className = "forge-select__option-content";
@@ -1809,7 +1848,7 @@ var ForgeSelect = class {
         const oldest = this.rowContentCache.keys().next().value;
         this.rowContentCache.delete(oldest);
       }
-      this.rowContentCache.set(option.value, holder);
+      this.rowContentCache.set(option, holder);
       cached = holder;
     }
     return cached.cloneNode(true);
@@ -1877,13 +1916,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) {