stimeo-ui 0.16.0 → 0.17.0

package/dist/controllers/dropdown_controller.d.ts

@@ -27,11 +27,22 @@ import { Controller } from '@hotwired/stimulus';
  *   non-focusable menu content), so a press aimed at another layer never closes
  *   the menu or steals focus, and one keypress closes exactly one layer.
  * - A click outside the controller element closes the menu.
+ * - A trigger or a menu that takes over — in one task, or after an earlier one leaves
+ *   in a later task — carries the open state, and an `aria-controls` this controller
+ *   supplied names the menu that is first. With no menu left the dropdown reads
+ *   closed and leaves the Escape stack. One that stops resolving as the target gets
+ *   back what it carried before this controller wrote on it.
+ * - A Turbo morph that keeps the elements drops the attributes the server did not
+ *   send — the menu's `hidden`, the trigger's `aria-expanded` and the
+ *   `aria-controls` this controller supplied. They are written back from the open
+ *   state the controller holds, so a closed menu does not show up and an open one
+ *   stays described.
  * - Each move of the open state is reported: `stimeo--dropdown:open` and
  *   `stimeo--dropdown:close` dispatch `{ reason: StateReason }`, after the
  *   attributes above are written. Both are informational, so neither is
  *   cancelable. A call that leaves the state where it already was, the
- *   normalization in {@link connect}, and {@link disconnect} are all silent.
+ *   normalization in {@link connect}, a trigger or a menu that takes over, the
+ *   repair after a morph, and {@link disconnect} are all silent.
  */
 declare class DropdownController extends Controller<HTMLElement> {
     #private;
@@ -39,13 +50,32 @@ declare class DropdownController extends Controller<HTMLElement> {
     static actions: readonly ["close", "open", "toggle"];
     static events: readonly ["close", "open"];
     readonly triggerTarget: HTMLButtonElement;
+    readonly triggerTargets: HTMLButtonElement[];
     readonly menuTarget: HTMLElement;
+    readonly menuTargets: HTMLElement[];
     readonly hasMenuTarget: boolean;
     readonly hasTriggerTarget: boolean;
     /** Starts in the closed state and registers outside-click handling. */
     connect(): void;
     /** Removes the listeners registered in {@link connect}. */
     disconnect(): void;
+    /** Brings a trigger that arrives after connect to the open state and names the menu from it. */
+    triggerTargetConnected(): void;
+    /**
+     * Gives a trigger that no longer resolves as one its own `aria-expanded` and `aria-controls`
+     * back — after `disconnect()` too, since dropping the identifier leaves the element on the
+     * page — and brings the trigger that stays to the open state.
+     */
+    triggerTargetDisconnected(trigger: HTMLButtonElement): void;
+    /** Applies the open state to a menu that arrives after connect in front of the others. */
+    menuTargetConnected(): void;
+    /**
+     * Applies the open state to the menu left, then gives a menu that no longer resolves as the
+     * target its own `hidden` back — after `disconnect()` too, since dropping the identifier
+     * leaves the element on the page. The open state is read off the departing menu first,
+     * while it still carries it.
+     */
+    menuTargetDisconnected(menu: HTMLElement): void;
     /** Toggles the menu between open and closed. Bound via `data-action`. */
     toggle(event?: Event): void;
     /** Reveals the menu and reflects the open state on the trigger. */

package/dist/controllers/dropdown_controller.js

@@ -1,14 +1,21 @@
 import { Controller } from '@hotwired/stimulus';
 
-// src/controllers/dropdown_controller.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;
+}
 
-// src/utils/aria_ids.ts
-var counter = 0;
+var ids = sharedRegistry("stimeo-ui.aria-ids.registry.v1", () => ({ counter: 0 }));
 function uniqueId(prefix = "stimeo") {
   let candidate;
   do {
-    counter += 1;
-    candidate = `${prefix}-${counter}`;
+    ids.counter += 1;
+    candidate = `${prefix}-${ids.counter}`;
   } while (typeof document !== "undefined" && document.getElementById(candidate) !== null);
   return candidate;
 }
@@ -19,7 +26,143 @@ function ensureId(element, prefix = "stimeo") {
   return id;
 }
 
-// src/utils/escape_layer.ts
+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 claimsWhileFocusWithin(element) {
   return () => {
     const active = element.ownerDocument.activeElement;
@@ -27,17 +170,11 @@ function claimsWhileFocusWithin(element) {
   };
 }
 var EscapeLayer = class _EscapeLayer {
-  static #registries = /* @__PURE__ */ new WeakMap();
-  #ownerDocument = null;
-  /** Dismissal callback while active; `null` when inactive. */
-  #onDismiss = null;
-  /** Live predicate deciding whether the layer claims a press; `null` = always. */
-  #claims = null;
-  /**
-   * Activates this layer at the top of its document's Escape stack, installing
-   * the document's shared resolver listener if this is its first layer.
-   * Re-activating an already-active layer moves it to the top.
-   */
+  static #registries = sharedRegistry(
+    "stimeo-ui.escape-layer.registry.v1",
+    () => /* @__PURE__ */ new WeakMap()
+  );
+  #active = null;
   activate(ownerDocument = document, options) {
     this.deactivate();
     let registry = _EscapeLayer.#registries.get(ownerDocument);
@@ -46,44 +183,31 @@ var EscapeLayer = class _EscapeLayer {
       _EscapeLayer.#registries.set(ownerDocument, registry);
       ownerDocument.addEventListener("keydown", registry.onKeydown);
     }
-    registry.stack.push(this);
-    this.#ownerDocument = ownerDocument;
-    this.#onDismiss = options.onDismiss;
-    this.#claims = options.claims ?? null;
-  }
-  /**
-   * Removes this layer from its document's Escape stack, uninstalling the
-   * shared listener when the stack empties. Safe to call when inactive.
-   */
+    const entry = { onDismiss: options.onDismiss, claims: options.claims ?? null };
+    registry.stack.push(entry);
+    this.#active = { document: ownerDocument, entry };
+  }
   deactivate() {
-    const ownerDocument = this.#ownerDocument;
-    if (!ownerDocument) return;
-    const registry = _EscapeLayer.#registries.get(ownerDocument);
+    const active = this.#active;
+    if (!active) return;
+    const registry = _EscapeLayer.#registries.get(active.document);
     if (registry) {
-      const index = registry.stack.lastIndexOf(this);
+      const index = registry.stack.lastIndexOf(active.entry);
       if (index >= 0) registry.stack.splice(index, 1);
       if (registry.stack.length === 0) {
-        ownerDocument.removeEventListener("keydown", registry.onKeydown);
-        _EscapeLayer.#registries.delete(ownerDocument);
+        active.document.removeEventListener("keydown", registry.onKeydown);
+        _EscapeLayer.#registries.delete(active.document);
       }
     }
-    this.#ownerDocument = null;
-    this.#onDismiss = null;
-    this.#claims = null;
-  }
-  /**
-   * Whether this active layer would own a press right now: it is the topmost
-   * layer whose {@link EscapeLayerOptions.claims} passes. Exposed for tests
-   * and diagnostics — production dismissal goes through the shared listener.
-   */
+    this.#active = null;
+  }
   get ownsEscape() {
-    const ownerDocument = this.#ownerDocument;
-    if (!ownerDocument) return false;
-    const registry = _EscapeLayer.#registries.get(ownerDocument);
+    const active = this.#active;
+    if (!active) return false;
+    const registry = _EscapeLayer.#registries.get(active.document);
     if (!registry) return false;
-    return _EscapeLayer.#resolveOwner(registry.stack) === this;
+    return _EscapeLayer.#resolveOwner(registry.stack) === active.entry;
   }
-  /** Builds a document's registry with its shared resolver listener. */
   static #createRegistry() {
     const registry = {
       stack: [],
@@ -92,24 +216,86 @@ var EscapeLayer = class _EscapeLayer {
         const owner = _EscapeLayer.#resolveOwner(registry.stack);
         if (!owner) return;
         event.preventDefault();
-        owner.#onDismiss?.();
+        owner.onDismiss();
       }
     };
     return registry;
   }
-  /** The topmost stack layer whose claims predicate passes, or `null`. */
   static #resolveOwner(stack) {
     for (let index = stack.length - 1; index >= 0; index--) {
       const layer = stack[index];
       if (!layer) continue;
-      if (layer.#claims && !layer.#claims()) continue;
+      if (layer.claims && !layer.claims()) continue;
       return layer;
     }
     return null;
   }
 };
 
-// src/utils/state_reason.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;
+  constructor(run) {
+    this.#run = run;
+  }
+  activate() {
+    this.#active = true;
+  }
+  cancel() {
+    this.#active = false;
+    this.#queued = false;
+    this.#generation += 1;
+  }
+  schedule() {
+    if (!this.#active || this.#queued) return;
+    this.#queued = true;
+    const generation = this.#generation;
+    queueMicrotask(() => {
+      if (generation !== this.#generation || !this.#queued || !this.#active) return;
+      this.#queued = false;
+      this.#run();
+    });
+  }
+};
+
+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 FOCUS_EVENTS = /* @__PURE__ */ new Set(["blur", "focus", "focusin", "focusout"]);
 var POINTER_EVENTS = /* @__PURE__ */ new Set(["mouseenter", "mouseleave", "pointerenter", "pointerleave"]);
 function stateReasonFor(event) {
@@ -119,35 +305,56 @@ function stateReasonFor(event) {
   return "user";
 }
 
-// src/controllers/dropdown_controller.ts
 var DropdownController = class extends Controller {
   static targets = ["trigger", "menu"];
   static actions = ["close", "open", "toggle"];
   static events = ["close", "open"];
-  /** Escape-stack membership while open; the shared resolver dismisses via it. */
   #escapeLayer = new EscapeLayer();
-  /** Whether state moves are reported: set once `connect()` settled the baseline. */
+  #menuHidden = new AttributeLease("hidden", this.identifier);
+  #expanded = new AttributeLease("aria-expanded", this.identifier);
+  #suppliedControls = /* @__PURE__ */ new WeakMap();
+  #menu = null;
+  #connected = false;
   #reporting = false;
-  /** Closes the menu when a click lands outside the controller's element. */
+  #openState = false;
+  #morphRender = new MorphRenderWatcher(() => this.#repair());
   #onOutsideClick = (event) => {
     if (!this.element.contains(event.target)) {
       this.#close("outside");
     }
   };
-  /** Starts in the closed state and registers outside-click handling. */
   connect() {
     this.#associateTriggerWithMenu();
     this.#close("api");
     document.addEventListener("click", this.#onOutsideClick, true);
+    this.#morphRender.observe(this.element);
+    this.#connected = true;
     this.#reporting = true;
   }
-  /** Removes the listeners registered in {@link connect}. */
   disconnect() {
+    this.#connected = false;
     this.#reporting = false;
     this.#escapeLayer.deactivate();
     document.removeEventListener("click", this.#onOutsideClick, true);
+    this.#morphRender.disconnect();
+  }
+  triggerTargetConnected() {
+    if (this.#connected) this.#reflectTrigger();
+  }
+  triggerTargetDisconnected(trigger) {
+    if (!this.triggerTargets.includes(trigger)) {
+      this.#expanded.return(trigger);
+      this.#withdrawControls(trigger);
+    }
+    if (this.#connected) this.#reflectTrigger();
+  }
+  menuTargetConnected() {
+    this.#adoptMenu();
+  }
+  menuTargetDisconnected(menu) {
+    this.#adoptMenu();
+    if (!this.menuTargets.includes(menu)) this.#menuHidden.return(menu);
   }
-  /** Toggles the menu between open and closed. Bound via `data-action`. */
   toggle(event) {
     if (this.#isOpen) {
       this.close(event);
@@ -155,62 +362,85 @@ var DropdownController = class extends Controller {
       this.open(event);
     }
   }
-  /** Reveals the menu and reflects the open state on the trigger. */
   open(event) {
     this.#open(stateReasonFor(event));
   }
-  /** Hides the menu and reflects the closed state on the trigger. */
   close(event) {
     this.#close(stateReasonFor(event));
   }
-  /** Reveals the menu, reflects the open state, and reports a move. */
   #open(reason) {
     if (!this.hasMenuTarget) return;
+    const menu = this.menuTarget;
     const was = this.#isOpen;
     this.#escapeLayer.activate(document, {
       onDismiss: () => this.#closeAndRestore(),
       claims: claimsWhileFocusWithin(this.element)
     });
-    this.menuTarget.hidden = false;
-    if (this.hasTriggerTarget) {
-      this.triggerTarget.setAttribute("aria-expanded", "true");
-    }
+    this.#menuHidden.write(menu, null);
+    this.#menu = menu;
+    this.#openState = true;
+    if (this.hasTriggerTarget) this.#expanded.write(this.triggerTarget, "true");
     if (!was && this.#reporting) this.dispatch("open", { detail: { reason }, cancelable: false });
   }
-  /** Hides the menu, reflects the closed state, and reports a move. */
   #close(reason) {
     const was = this.#isOpen;
     this.#escapeLayer.deactivate();
-    if (!this.hasMenuTarget) return;
-    this.menuTarget.hidden = true;
-    if (this.hasTriggerTarget) {
-      this.triggerTarget.setAttribute("aria-expanded", "false");
-    }
+    this.#openState = false;
+    const menu = this.hasMenuTarget ? this.menuTarget : null;
+    this.#menu = menu;
+    if (!menu) return;
+    this.#menuHidden.write(menu, "");
+    if (this.hasTriggerTarget) this.#expanded.write(this.triggerTarget, "false");
     if (was && this.#reporting) this.dispatch("close", { detail: { reason }, cancelable: false });
   }
-  /** Closes and restores focus to the trigger (the keyboard-dismissal path). */
+  #adoptMenu() {
+    if (!this.#connected) return;
+    const menu = this.hasMenuTarget ? this.menuTarget : null;
+    const previous = this.#menu;
+    this.#menu = menu;
+    if (!menu) {
+      this.#escapeLayer.deactivate();
+      this.#openState = false;
+    } else if (menu !== previous) {
+      this.#menuHidden.write(menu, previous?.hidden ?? true ? "" : null);
+    }
+    this.#reflectTrigger();
+  }
+  #reflectTrigger() {
+    if (!this.hasTriggerTarget) return;
+    this.#expanded.write(this.triggerTarget, String(this.#isOpen));
+    this.#associateTriggerWithMenu();
+  }
+  #repair() {
+    if (!this.hasMenuTarget) return;
+    this.#menuHidden.write(this.menuTarget, this.#openState ? null : "");
+    this.#reflectTrigger();
+  }
   #closeAndRestore() {
     this.#close("escape");
     if (this.hasTriggerTarget) this.triggerTarget.focus();
   }
-  /** Whether the menu is currently visible. */
   get #isOpen() {
     return this.hasMenuTarget && !this.menuTarget.hidden;
   }
-  /**
-   * Associates the disclosure trigger and controlled region without clobbering
-   * authored markup.
-   */
   #associateTriggerWithMenu() {
     if (!this.hasTriggerTarget || !this.hasMenuTarget) return;
-    if (this.triggerTarget.hasAttribute("aria-controls")) return;
-    this.triggerTarget.setAttribute(
-      "aria-controls",
-      ensureId(this.menuTarget, "stimeo--dropdown-menu")
-    );
+    const trigger = this.triggerTarget;
+    const controls = trigger.getAttribute("aria-controls");
+    if (controls !== null && controls !== this.#suppliedControls.get(trigger)) return;
+    const id = ensureId(this.menuTarget, "stimeo--dropdown-menu");
+    if (controls === id) return;
+    trigger.setAttribute("aria-controls", id);
+    this.#suppliedControls.set(trigger, id);
+  }
+  #withdrawControls(trigger) {
+    const supplied = this.#suppliedControls.get(trigger);
+    this.#suppliedControls.delete(trigger);
+    if (supplied !== void 0 && trigger.getAttribute("aria-controls") === supplied) {
+      trigger.removeAttribute("aria-controls");
+    }
   }
 };
 
 export { DropdownController };
-//# sourceMappingURL=dropdown_controller.js.map
 //# sourceMappingURL=dropdown_controller.js.map