stimeo-ui 0.16.0 → 0.17.0

data/dist/controllers/listbox_controller.js

@@ -1,14 +1,179 @@
 import { Controller } from '@hotwired/stimulus';
 
-// src/controllers/listbox_controller.ts
+var FOCUS_EVENTS = /* @__PURE__ */ new Set(["blur", "focus", "focusin", "focusout"]);
+var POINTER_EVENTS = /* @__PURE__ */ new Set(["mouseenter", "mouseleave", "pointerenter", "pointerleave"]);
+function stateReasonFor(event) {
+  if (!event) return "api";
+  if (FOCUS_EVENTS.has(event.type)) return "focus";
+  if (POINTER_EVENTS.has(event.type)) return "pointer";
+  return "user";
+}
+
+function actionSource(source) {
+  if (source instanceof HTMLElement) {
+    return { event: null, host: source, origin: source, reason: "api" };
+  }
+  const event = source ?? null;
+  return {
+    event,
+    host: event?.currentTarget instanceof Element ? event.currentTarget : null,
+    origin: event?.target instanceof Element ? event.target : null,
+    reason: stateReasonFor(event)
+  };
+}
 
-// src/utils/arrow_step.ts
 function isReservedArrowChord(event, allow = []) {
   if (!event.key.startsWith("Arrow")) return false;
   return event.altKey && !allow.includes("alt") || event.ctrlKey && !allow.includes("ctrl") || event.metaKey && !allow.includes("meta") || event.shiftKey && !allow.includes("shift");
 }
 
-// src/utils/field_mirror.ts
+function sharedRegistry(key, create) {
+  const symbol = Symbol.for(key);
+  const scope = globalThis;
+  const existing = scope[symbol];
+  if (existing !== void 0) return existing;
+  const registry = create();
+  Object.defineProperty(globalThis, symbol, { value: registry });
+  return registry;
+}
+
+function isAttributeValue(value) {
+  return value === null || typeof value === "string";
+}
+function readLeaseRecord(element, record) {
+  try {
+    const parsed = JSON.parse(element.getAttribute(record) ?? "null");
+    if (!Array.isArray(parsed)) return void 0;
+    const [original, written, ...rest] = parsed;
+    const linked = rest[0] !== false;
+    const beneath = linked ? rest : rest.slice(1);
+    if (!beneath.every((under) => typeof under === "string")) return void 0;
+    return isAttributeValue(original) && isAttributeValue(written) ? { original, written, linked, beneath } : void 0;
+  } catch {
+    return void 0;
+  }
+}
+var AttributeLease = class _AttributeLease {
+  static #registry = sharedRegistry(
+    "stimeo-ui.attribute-lease.registry.v1",
+    () => ({ stacks: /* @__PURE__ */ new WeakMap(), names: /* @__PURE__ */ new Map() })
+  );
+  #attribute;
+  #record;
+  #base;
+  #held = /* @__PURE__ */ new Set();
+  constructor(attribute, owner, options = {}) {
+    this.#attribute = attribute;
+    this.#record = `data-${owner}-${attribute}-lease`;
+    this.#base = options.base === true;
+    const names = _AttributeLease.#registry.names;
+    names.set(attribute, (names.get(attribute) ?? /* @__PURE__ */ new Set()).add(this.#record));
+  }
+  write(element, value) {
+    const stack = this.#stack(element);
+    const hold = this.#take(stack) ?? this.#acquire(element, stack);
+    this.#held.add(element);
+    const shows = !this.#covered(element, stack, hold);
+    hold.written = value;
+    this.#mark(element, stack);
+    if (shows) this.#reflect(element, value);
+  }
+  return(element) {
+    const held = this.#held.delete(element);
+    const known = _AttributeLease.#registry.stacks.get(element)?.has(this.#attribute);
+    const stack = held || known || element.hasAttribute(this.#record) ? this.#stack(element) : [];
+    const hold = this.#take(stack);
+    if (!hold) return false;
+    const carries = element.getAttribute(this.#attribute) === hold.written;
+    const owns = carries && !this.#covered(element, stack, hold);
+    const index = stack.indexOf(hold);
+    stack.splice(index, 1);
+    const above = stack[index];
+    if (above) above.linked &&= hold.linked;
+    this.#mark(element, stack);
+    if (!owns) return true;
+    const below = hold.linked ? stack[index - 1] : void 0;
+    this.#reflect(element, below ? below.written : hold.original);
+    return true;
+  }
+  returnAll() {
+    for (const element of Array.from(this.#held)) this.return(element);
+  }
+  #stack(element) {
+    const stacks = _AttributeLease.#registry.stacks;
+    const byAttribute = stacks.get(element) ?? /* @__PURE__ */ new Map();
+    stacks.set(element, byAttribute);
+    const stack = byAttribute.get(this.#attribute) ?? this.#seed(element);
+    byAttribute.set(this.#attribute, stack);
+    return stack;
+  }
+  #seed(element) {
+    const found = [];
+    for (const record of _AttributeLease.#registry.names.get(this.#attribute) ?? []) {
+      const read = readLeaseRecord(element, record);
+      if (read) found.push({ ...read, record });
+    }
+    const depth = ({ beneath }) => beneath.filter((name) => found.some((other) => other.record === name)).length;
+    return found.sort((one, other) => depth(one) - depth(other)).map(({ record, written, original, linked }, index) => ({
+      lease: null,
+      record,
+      written,
+      original,
+      linked: linked && index > 0
+    }));
+  }
+  #take(stack) {
+    const hold = stack.find((held) => held.lease === this) ?? stack.find((held) => held.lease === null && held.record === this.#record);
+    if (hold) hold.lease = this;
+    return hold;
+  }
+  #acquire(element, stack) {
+    const current = element.getAttribute(this.#attribute);
+    const top = stack.at(-1);
+    const bottom = stack[0];
+    const over = top?.written === current ? top : void 0;
+    const from = this.#base ? bottom : over;
+    const hold = {
+      lease: this,
+      record: this.#record,
+      written: current,
+      original: from ? from.original : current,
+      linked: !this.#base && over !== void 0
+    };
+    if (this.#base && bottom) {
+      bottom.linked = true;
+      stack.unshift(hold);
+    } else stack.push(hold);
+    return hold;
+  }
+  #covered(element, stack, hold) {
+    const current = element.getAttribute(this.#attribute);
+    return stack.slice(stack.indexOf(hold) + 1).some((above) => above.written === current);
+  }
+  #mark(element, stack) {
+    const records = /* @__PURE__ */ new Map([[this.#record, null]]);
+    stack.forEach((hold, index) => {
+      const names = stack.slice(0, index).map((under) => under.record);
+      const beneath = [...new Set(names.reverse())].filter((name) => name !== hold.record);
+      const marker = hold.linked || beneath.length === 0 ? [] : [false];
+      records.set(
+        hold.record,
+        hold.written === hold.original && beneath.length === 0 && index === stack.length - 1 ? null : JSON.stringify([hold.original, hold.written, ...marker, ...beneath])
+      );
+    });
+    for (const [name, recorded] of records) {
+      if (element.getAttribute(name) === recorded) continue;
+      if (recorded === null) element.removeAttribute(name);
+      else element.setAttribute(name, recorded);
+    }
+  }
+  #reflect(element, value) {
+    if (element.getAttribute(this.#attribute) === value) return;
+    if (value === null) element.removeAttribute(this.#attribute);
+    else element.setAttribute(this.#attribute, value);
+  }
+};
+
 function writeField(field, value) {
   if (field.value === value) return false;
   field.value = value;
@@ -18,27 +183,33 @@ function commitField(target) {
   target.dispatchEvent(new Event("change", { bubbles: true }));
 }
 
-// src/utils/microtask_coalescer.ts
+var ListenerSet = class {
+  #abort = new AbortController();
+  add(target, type, handler, options) {
+    target.addEventListener(type, handler, { ...options, signal: this.#abort.signal });
+  }
+  dispose() {
+    this.#abort.abort();
+    this.#abort = new AbortController();
+  }
+};
+
 var MicrotaskCoalescer = class {
   #run;
   #queued = false;
   #active = false;
   #generation = 0;
-  /** @param run - the single reconciliation pass, invoked at most once per batch. */
   constructor(run) {
     this.#run = run;
   }
-  /** Opens the window in which {@link schedule} is honoured; call from `connect()`. */
   activate() {
     this.#active = true;
   }
-  /** Closes the window and drops any pending pass; call from `disconnect()`. */
   cancel() {
     this.#active = false;
     this.#queued = false;
     this.#generation += 1;
   }
-  /** Requests one pass after the batch settles. Idempotent; inert outside the window. */
   schedule() {
     if (!this.#active || this.#queued) return;
     this.#queued = true;
@@ -51,7 +222,42 @@ var MicrotaskCoalescer = class {
   }
 };
 
-// src/utils/option_scroll.ts
+var MorphRenderWatcher = class {
+  #listeners = new ListenerSet();
+  #pass;
+  #element = null;
+  #onMorph = () => this.#pass.schedule();
+  constructor(run) {
+    this.#pass = new MicrotaskCoalescer(run);
+  }
+  observe(element) {
+    if (this.#element === element) return;
+    this.disconnect();
+    this.#element = element;
+    this.#pass.activate();
+    this.#listeners.add(element, "turbo:morph-element", this.#onMorph);
+  }
+  schedule() {
+    this.#pass.schedule();
+  }
+  disconnect() {
+    this.#listeners.dispose();
+    this.#pass.cancel();
+    this.#element = null;
+  }
+};
+
+var MoveCounter = class {
+  #sequence = 0;
+  record() {
+    this.#sequence += 1;
+    return this.#sequence;
+  }
+  isLatest(token) {
+    return token === this.#sequence;
+  }
+};
+
 function scrollOptionIntoView(list, option) {
   if (list.scrollHeight <= list.clientHeight) return;
   const listRect = list.getBoundingClientRect();
@@ -63,43 +269,28 @@ function scrollOptionIntoView(list, option) {
   }
 }
 
-// src/utils/safe_timeout.ts
+function targetSelector(identifier, name) {
+  return `[data-${identifier}-target~="${name}"]`;
+}
+
 var TimerRegistry = class {
-  /** Live timer ids that have not yet been cleared (or, for timeouts, fired). */
   ids = /* @__PURE__ */ new Set();
-  /**
-   * Cancels a single tracked timer.
-   *
-   * No-ops if the id is unknown (already cleared, fired, or never owned by this
-   * registry), so callers can clear defensively without guarding.
-   */
   clear(id) {
     if (this.ids.delete(id)) {
       this.cancel(id);
     }
   }
-  /**
-   * Cancels every tracked timer. Call this from a controller's `disconnect()`
-   * to guarantee no timer outlives the element.
-   */
   clearAll() {
     for (const id of this.ids) {
       this.cancel(id);
     }
     this.ids.clear();
   }
-  /** Number of timers currently tracked (pending). */
   get size() {
     return this.ids.size;
   }
 };
 var SafeTimeout = class extends TimerRegistry {
-  /**
-   * Schedules `callback` after `delay` ms and returns the timer id.
-   *
-   * The id is removed from the registry automatically when the timeout fires,
-   * so {@link TimerRegistry.size | size} reflects only still-pending timers.
-   */
   set(callback, delay) {
     const id = this.schedule(() => {
       this.ids.delete(id);
@@ -116,29 +307,18 @@ var SafeTimeout = class extends TimerRegistry {
   }
 };
 
-// src/utils/typeahead.ts
 var TYPEAHEAD_RESET_MS = 500;
 var Typeahead = class {
-  /** Timer registry for the pending idle reset; private so `reset()` is the only exit. */
   #timers = new SafeTimeout();
-  /** Idle window before the query resets, in milliseconds. */
   #resetMs;
-  /** The accumulated lowercase query, empty when idle. */
   #query = "";
-  /** Id of the pending reset timer, `0` when none is scheduled. */
   #timerId = 0;
-  /** @param options - Overrides for the idle window. */
   constructor({ resetMs = TYPEAHEAD_RESET_MS } = {}) {
     this.#resetMs = resetMs;
   }
-  /** The query a search would currently run with; empty while idle. */
   get query() {
     return this.#query;
   }
-  /**
-   * Folds `key` into the query, restarts the idle window, and returns the query to
-   * search with. A repeated character collapses the query to that one character.
-   */
   push(key) {
     const char = key.toLowerCase();
     const repeated = this.#query.length > 0 && [...this.#query].every((c) => c === char);
@@ -147,7 +327,6 @@ var Typeahead = class {
     this.#timerId = this.#timers.set(() => this.reset(), this.#resetMs);
     return this.#query;
   }
-  /** Clears the query and cancels the pending idle reset. */
   reset() {
     this.#query = "";
     this.#timers.clear(this.#timerId);
@@ -174,149 +353,129 @@ function findTypeaheadMatch(items, from, query, label = (item) => typeaheadLabel
   return -1;
 }
 
-// src/controllers/listbox_controller.ts
 var OBSERVED_ATTRIBUTES = ["aria-selected", "data-value"];
 function setAttributeIfChanged(element, name, value) {
   if (element.getAttribute(name) !== value) element.setAttribute(name, value);
 }
 var ListboxController = class extends Controller {
+  #moves = new MoveCounter();
   static targets = ["trigger", "value", "list", "option", "field"];
   static values = {
     placeholder: { type: String, default: "" }
   };
   static actions = ["close", "onTriggerKeydown", "open", "select", "toggle"];
   static events = ["change", "reconcile"];
-  /** Stable ID of the active option; DOM targets are resolved afresh before use. */
   #activeId = null;
-  /** Target ID order captured while an option is active, used only for removal fallback. */
   #activeOrder = [];
-  /**
-   * Collapses the target callbacks, Value changes and observed option writes of
-   * one DOM mutation into a single pass; refused before `connect()` and after
-   * `disconnect()`.
-   */
-  #reconcile = new MicrotaskCoalescer(() => this.#reconcileOptions());
-  /** Watches the option attributes a page can rewrite in place; set while connected. */
+  #reconcile = new MorphRenderWatcher(() => this.#reconcileOptions());
   #observer = null;
-  /** The selection last settled: on connect, by the user, or by a reported pass. */
   #settled = { option: null, value: "" };
-  /** Accumulated typeahead query and its idle-reset timer. */
+  #shownList = null;
+  #listHidden = new AttributeLease("hidden", this.identifier);
+  #expanded = new AttributeLease("aria-expanded", this.identifier);
+  #activeDescendant = new AttributeLease(
+    "aria-activedescendant",
+    this.identifier
+  );
   #typeahead = new Typeahead();
-  /**
-   * Establishes the ARIA baseline, settles the selection without reporting it,
-   * starts closed, and listens for outside clicks.
-   */
   connect() {
     this.#normalizeSelection();
     this.close();
     document.addEventListener("click", this.#onOutsideClick, true);
     this.#settled = this.#selection();
-    this.#reconcile.activate();
+    this.#reconcile.observe(this.element);
     this.#observeOptions();
   }
-  /**
-   * Establishes an inactive baseline for a late option, then re-applies the
-   * selection baseline and re-resolves active identity once the batch is in.
-   */
   optionTargetConnected(option) {
     option.removeAttribute("data-active");
     this.#reconcile.schedule();
   }
-  /**
-   * Removes controller-owned active state, then settles the selection and the
-   * active option among the surviving targets once the batch is in.
-   */
   optionTargetDisconnected(option) {
     option.removeAttribute("data-active");
     this.#reconcile.schedule();
   }
-  /** Fills a form field inserted or replaced at runtime with the current selection. */
+  triggerTargetConnected() {
+    this.#reconcile.schedule();
+  }
+  triggerTargetDisconnected(trigger) {
+    if (!this.triggerTargets.includes(trigger)) {
+      this.#expanded.return(trigger);
+      this.#activeDescendant.return(trigger);
+    }
+    this.#reconcile.schedule();
+  }
+  listTargetConnected() {
+    this.#reconcile.schedule();
+  }
+  listTargetDisconnected(list) {
+    if (!this.listTargets.includes(list)) {
+      if (list === this.#shownList) this.#adoptPageClose();
+      this.#listHidden.return(list);
+    }
+    this.#reconcile.schedule();
+  }
   fieldTargetConnected() {
     this.#reconcile.schedule();
   }
-  /** Writes the current selection into a trigger value inserted or replaced at runtime. */
+  fieldTargetDisconnected() {
+    this.#reconcile.schedule();
+  }
   valueTargetConnected() {
     this.#reconcile.schedule();
   }
-  /**
-   * Re-renders the empty-selection label when application code (or a Turbo morph)
-   * changes `placeholder` at runtime.
-   */
+  valueTargetDisconnected() {
+    this.#reconcile.schedule();
+  }
   placeholderValueChanged() {
     this.#reconcile.schedule();
   }
-  /**
-   * Brings the authored DOM to the shape the APG requires, and derives the state
-   * that follows from the selection.
-   *
-   * Three things happen, and only these three — which option is chosen is the
-   * author's, and is never changed:
-   *
-   * 1. Every option gets an explicit value. An absent `aria-selected` means "not
-   *    selectable" in ARIA, so a forgotten attribute hides a selectable option
-   *    from assistive technology.
-   * 2. At most one stays `true`. The first in DOM order wins, since that is the
-   *    only deterministic reading of "which one did the author mean"; an option
-   *    the page inserts ahead of the selection, already selected, takes it over.
-   * 3. The trigger label and the hidden field are derived from that selection,
-   *    an empty one included. Without this the widget announces a choice it does
-   *    not submit: the popup says "Banana", the trigger still says "Choose…", and
-   *    the form posts "".
-   *
-   * Nothing is reported here: `connect()` describes the initial state, and a
-   * page-driven pass reports a moved selection itself. The scan is the `option`
-   * target set: a `role="option"` without the target is outside the contract and
-   * is neither counted nor written.
-   */
   #normalizeSelection() {
     const selected = this.optionTargets.find(
       (option) => option.getAttribute("aria-selected") === "true"
     );
     this.#applySelection(selected);
   }
-  /**
-   * The pass the page's changes run: the selection is normalized and mirrored,
-   * the active option re-resolved, then a selection that moved is reported. The
-   * report comes last, so options a subscriber rewrites are the next pass's to
-   * settle.
-   */
   #reconcileOptions() {
     this.#normalizeSelection();
+    this.#reconcileOpenState();
     this.#reconcileActive();
     this.#reportMove();
   }
-  /**
-   * Reports the selection as `reconcile` when its option or value differs from the
-   * selection last settled. The settled selection is replaced before dispatching,
-   * so a move a subscriber makes is measured against what it was told.
-   */
+  #reconcileOpenState() {
+    if (!this.hasListTarget) {
+      this.#shownList = null;
+      return;
+    }
+    if (this.#shownList && this.listTargets.includes(this.#shownList)) this.#adoptPageClose();
+    const list = this.listTarget;
+    if (this.#shownList !== null && list !== this.#shownList) {
+      this.#listHidden.write(list, null);
+      this.#shownList = list;
+    }
+    if (this.hasTriggerTarget) {
+      this.#expanded.write(this.triggerTarget, list.hidden ? "false" : "true");
+    }
+  }
+  #adoptPageClose() {
+    if (this.#shownList?.hidden) this.#shownList = null;
+  }
   #reportMove() {
     const { option, value } = this.#selection();
     if (option === this.#settled.option && value === this.#settled.value) return;
     this.#settled = { option, value };
     this.dispatch("reconcile", { detail: { value, option } });
   }
-  /** The selected option target, if any, and the value its field submits. */
   #selection() {
     const option = this.optionTargets.find((candidate) => candidate.getAttribute("aria-selected") === "true") ?? null;
     return { option, value: option ? this.#optionValue(option) : "" };
   }
-  /**
-   * Releases the outside-click listener and the option observer, drops a queued
-   * pass, and clears the typeahead timer.
-   */
   disconnect() {
-    this.#reconcile.cancel();
+    this.#reconcile.disconnect();
     this.#observer?.disconnect();
     this.#observer = null;
     document.removeEventListener("click", this.#onOutsideClick, true);
     this.#typeahead.reset();
   }
-  /**
-   * Toggles the list on a real mouse click. Keyboard activation of the
-   * `<button>` also fires a click (`detail === 0`); the keydown handler already
-   * drives that, so the synthetic click is ignored to avoid double-toggling.
-   */
   toggle(event) {
     if (event.detail === 0) return;
     if (this.#isClosed) {
@@ -325,7 +484,6 @@ var ListboxController = class extends Controller {
       this.close();
     }
   }
-  /** Yields claimed keys; otherwise routes the APG select-only keyboard model. */
   onTriggerKeydown(event) {
     if (event.defaultPrevented) return;
     if (isReservedArrowChord(event)) return;
@@ -351,7 +509,7 @@ var ListboxController = class extends Controller {
     switch (event.key) {
       case "ArrowDown":
         event.preventDefault();
-        this.#setActive(activeIndex < 0 ? 0 : (activeIndex + 1) % length);
+        this.#setActive((activeIndex + 1) % length);
         break;
       case "ArrowUp":
         event.preventDefault();
@@ -387,19 +545,24 @@ var ListboxController = class extends Controller {
         break;
     }
   }
-  /** Selects the clicked option and closes, returning focus to the trigger. */
-  select(event) {
-    const option = event.currentTarget.closest('[role="option"]');
+  select(source) {
+    const { event, host, origin, reason } = actionSource(source);
+    if (origin && origin.closest(`[data-controller~="${this.identifier}"]`) !== this.element)
+      return;
+    const option = host?.closest(targetSelector(this.identifier, "option"));
     if (!option || !this.optionTargets.includes(option)) return;
-    this.#selectOption(option);
+    const focus = event !== null || this.element.contains(document.activeElement);
+    if (!this.#selectOption(option, reason)) return;
     this.close();
-    this.triggerTarget.focus();
+    if (focus && (event !== null || this.element.contains(document.activeElement))) {
+      this.triggerTarget.focus();
+    }
   }
-  /** Opens the list and activates the selected option (else the first). */
   open() {
     if (!this.hasListTarget) return;
-    this.listTarget.hidden = false;
-    this.triggerTarget.setAttribute("aria-expanded", "true");
+    this.#listHidden.write(this.listTarget, null);
+    this.#shownList = this.listTarget;
+    this.#expanded.write(this.triggerTarget, "true");
     if (this.optionTargets.length === 0) {
       this.#setActive(-1);
       return;
@@ -409,37 +572,33 @@ var ListboxController = class extends Controller {
     );
     this.#setActive(selected === -1 ? 0 : selected);
   }
-  /** Closes the list, clears the active option, and resets the typeahead buffer. */
   close() {
     if (!this.hasListTarget) return;
-    this.listTarget.hidden = true;
-    this.triggerTarget.setAttribute("aria-expanded", "false");
+    this.#listHidden.write(this.listTarget, "");
+    this.#shownList = null;
+    this.#expanded.write(this.triggerTarget, "false");
     this.#setActive(-1);
     this.#typeahead.reset();
   }
-  /** Commits the active option (keyboard) and closes, returning focus. */
   #commitActive() {
-    this.#reconcileActive();
     const options = this.optionTargets;
     const activeIndex = this.#findActiveIndex(options);
-    const option = activeIndex < 0 ? void 0 : options[activeIndex];
+    const option = options[activeIndex];
     if (option) this.#selectOption(option);
     this.close();
     this.triggerTarget.focus();
   }
-  /** Applies selection: `aria-selected`, trigger label, hidden field, `change`. */
-  #selectOption(option) {
+  #selectOption(option, reason = "user") {
     const { value, fieldChanged } = this.#applySelection(option);
+    const changed = option !== this.#settled.option || value !== this.#settled.value;
     this.#settled = { option, value };
+    if (!changed) return true;
+    const token = this.#moves.record();
     if (fieldChanged) commitField(this.fieldTarget);
-    this.dispatch("change", { detail: { value, option } });
-  }
-  /**
-   * Writes `option` — or, when it is `undefined`, no selection — into
-   * `aria-selected`, the trigger label and the hidden field. Emits nothing: the
-   * user's commit and a page-driven pass each report it their own way, and
-   * `connect()` only describes the state it finds.
-   */
+    if (!this.#moves.isLatest(token)) return false;
+    this.dispatch("change", { detail: { value, option, reason } });
+    return this.#moves.isLatest(token);
+  }
   #applySelection(option) {
     for (const candidate of this.optionTargets) {
       setAttributeIfChanged(candidate, "aria-selected", candidate === option ? "true" : "false");
@@ -450,25 +609,6 @@ var ListboxController = class extends Controller {
     const fieldChanged = this.hasFieldTarget && writeField(this.fieldTarget, value);
     return { value, fieldChanged };
   }
-  /**
-   * Keeps the trigger value on the selection: the selected option's text, or, with
-   * nothing selected, `placeholder` when it is set, else the text the value held
-   * before this controller first wrote into it.
-   *
-   * The value is this controller's only while it holds the text last written into
-   * it and nothing else — the `owns-label` marker carries that text — and the text
-   * it held before is kept in the `original-label` marker. A value the page
-   * rewrote or added an element to after that — the marker is still there but no
-   * longer matches — is the page's: with nothing selected it is left exactly as it
-   * is, `placeholder` or not, and the next selection remembers its text before
-   * replacing it. A value with no marker at all — the author's, or one a morph put
-   * back without the markers — is taken over the same way by `placeholder` or by a
-   * selection. A value that only ever showed a selection has no text of its own to
-   * return to, so it is emptied rather than left naming an option that is not
-   * selected.
-   *
-   * @stimeoRenderRoot
-   */
   #renderLabel(option) {
     if (!this.hasValueTarget) return;
     const label = this.valueTarget;
@@ -493,20 +633,12 @@ var ListboxController = class extends Controller {
     if (label.textContent !== text) label.textContent = text;
     setAttributeIfChanged(label, ownsLabel, text);
   }
-  /** An option's visible label: its own text, trimmed. */
   #optionLabel(option) {
     return (option.textContent ?? "").trim();
   }
-  /** The value an option submits: its `data-value`, else its label. */
   #optionValue(option) {
     return option.dataset.value ?? this.#optionLabel(option);
   }
-  /**
-   * Watches the options' `aria-selected` and `data-value`. The listbox's own writes
-   * to them are dropped from the queue as they happen, so each record the callback
-   * receives is the page's, and only a record on one of the listbox's own options
-   * schedules a pass.
-   */
   #observeOptions() {
     const observer = new MutationObserver((records) => {
       if (this.#concernsOptions(records)) this.#reconcile.schedule();
@@ -518,33 +650,16 @@ var ListboxController = class extends Controller {
     });
     this.#observer = observer;
   }
-  /**
-   * Whether any record is about one of this listbox's own options. A widget nested
-   * inside it writes the same attributes on its own elements, and those are no
-   * reason to reconcile the listbox.
-   */
   #concernsOptions(records) {
     const options = new Set(this.optionTargets);
     return records.some((record) => options.has(record.target));
   }
-  /**
-   * Drops the records the listbox's own writes just queued, so the observer never
-   * takes them for the page's. A page write queued just before goes with them and
-   * owes nothing: every such write leaves every option's `aria-selected` at the
-   * value the selection gives it, and the selection is then read back from the DOM,
-   * so it already holds what the page wrote.
-   */
   #dropOwnRecords() {
     this.#observer?.takeRecords();
   }
-  /**
-   * Marks the option at `index` active via `data-active` and the trigger's
-   * `aria-activedescendant`. Pass `-1` to clear it (the attribute is removed, not
-   * set to empty, per the APG).
-   */
   #setActive(index) {
     const options = this.optionTargets;
-    const active = index < 0 ? null : options[index] ?? null;
+    const active = options[index] ?? null;
     for (const option of options) {
       const marked = option.hasAttribute("data-active");
       if (option === active) {
@@ -555,15 +670,14 @@ var ListboxController = class extends Controller {
     }
     if (active?.id) {
       this.#activeId = active.id;
-      this.triggerTarget.setAttribute("aria-activedescendant", active.id);
+      this.#activeDescendant.write(this.triggerTarget, active.id);
     } else {
       this.#activeId = null;
-      this.triggerTarget.removeAttribute("aria-activedescendant");
+      this.#activeDescendant.write(this.triggerTarget, null);
     }
     this.#activeOrder = active ? options.map((option) => option.id).filter(Boolean) : [];
     if (active && this.hasListTarget) scrollOptionIntoView(this.listTarget, active);
   }
-  /** Resolves active state against the current target collection. */
   #reconcileActive() {
     if (!this.hasTriggerTarget || this.#isClosed) {
       if (this.hasTriggerTarget) this.#setActive(-1);
@@ -583,17 +697,15 @@ var ListboxController = class extends Controller {
       return;
     }
     const activeId = this.triggerTarget.getAttribute("aria-activedescendant") ?? this.#activeId;
-    this.#setActive(activeId ? this.#findFallbackIndex(options, activeId) : -1);
+    this.#setActive(this.#findFallbackIndex(options, activeId));
   }
-  /** Finds the live target carrying the stable ID, or the active marker for an ID-less option. */
   #findActiveIndex(options) {
     const activeId = (this.hasTriggerTarget ? this.triggerTarget.getAttribute("aria-activedescendant") : null) ?? this.#activeId;
     if (activeId) return options.findIndex((option) => option.id === activeId);
     return options.findIndex((option) => option.hasAttribute("data-active"));
   }
-  /** Chooses a surviving former successor, then a former predecessor. */
   #findFallbackIndex(options, activeId) {
-    const oldIndex = this.#activeOrder.indexOf(activeId);
+    const oldIndex = this.#activeOrder.indexOf(activeId ?? "");
     if (oldIndex < 0) return -1;
     const indexesById = new Map(options.map((option, index) => [option.id, index]));
     for (let index = oldIndex + 1; index < this.#activeOrder.length; index += 1) {
@@ -606,27 +718,17 @@ var ListboxController = class extends Controller {
     }
     return -1;
   }
-  /**
-   * Advances the typeahead query and activates the next matching option.
-   *
-   * The search resumes just after the active option so repeating a character
-   * cycles through the options starting with it, rather than re-activating the
-   * same first match on every press.
-   */
   #typeaheadTo(options, activeIndex, char) {
     const index = findTypeaheadMatch(options, activeIndex, this.#typeahead.push(char));
     if (index !== -1) this.#setActive(index);
   }
-  /** Closes on an outside click before an inside handler can detach its target. */
   #onOutsideClick = (event) => {
     if (!this.#isClosed && !this.element.contains(event.target)) this.close();
   };
-  /** Whether the list is currently hidden. */
   get #isClosed() {
     return !this.hasListTarget || this.listTarget.hidden !== false;
   }
 };
 
 export { ListboxController };
-//# sourceMappingURL=listbox_controller.js.map
 //# sourceMappingURL=listbox_controller.js.map