stimeo-ui 0.17.0 → 0.18.1

package/dist/controllers/popover_controller.d.ts

@@ -12,6 +12,9 @@ import { Controller } from '@hotwired/stimulus';
  *          role="dialog" aria-label="Edit profile" hidden>…</div>
  *   </div>
  *
+ * The controller root groups the panel and its related controls, including additional
+ * `open` and `close` invokers. Unrelated page controls belong outside this root.
+ *
  * Implements the WAI-ARIA APG **Dialog** pattern run *non-modally* (no
  * `aria-modal`, no focus trap, no `inert`/scroll lock). The background stays
  * fully interactive; this is the modeless counterpart to `stimeo--dialog`. For
@@ -37,10 +40,11 @@ import { Controller } from '@hotwired/stimulus';
  *   focus. Focus stays at the clicked element, or falls back to the document body
  *   for a non-focusable destination.
  * - Because it is modeless, focus is *not* trapped: when `Tab` moves focus out of
- *   the controller it closes (detected via bubbling `focusout`) without yanking
+ *   the controller it closes (detected via `focusout` and document `focusin`) without yanking
  *   focus back, so forward and reverse traversal preserve their natural destination.
  *   A `focusout` with no destination is ignored because it also occurs for clicks
- *   on non-focusable content and when the browser window loses focus.
+ *   on non-focusable content and when the browser window loses focus. A later known
+ *   external focus destination closes it even when focus first fell to the body.
  * - Opt-in **dismiss on scroll** (`closeOnScroll`): while open, scrolling a tracked
  *   scroll-parent ancestor (or the window) closes the panel, the usual convention for
  *   anchored popups. Closes without restoring focus (like the modeless `focusout` path)
@@ -84,9 +88,9 @@ declare class PopoverController extends Controller<HTMLElement> {
     connect(): void;
     /**
      * Removes every standing listener registered in {@link connect} plus any active
-     * dismiss-on-scroll observers. `removeEventListener` is a no-op when it was
-     * never added, so this is safe in the closed state too — no listener outlives
-     * the element after a Turbo navigation.
+     * dismiss-on-scroll observers. Releasing the set is a no-op for what it does not
+     * hold, so this is safe in the closed state too — no listener outlives the
+     * element after a Turbo navigation.
      */
     disconnect(): void;
     /**

package/dist/controllers/popover_controller.js

@@ -1,15 +1,26 @@
 import { Controller } from '@hotwired/stimulus';
 
+function setAttributeIfChanged(element, name, value, beforeWrite) {
+  if (element.getAttribute(name) === value) return false;
+  if (value === null) element.removeAttribute(name);
+  else element.setAttribute(name, value);
+  return true;
+}
+
 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;
+  const registry2 = create();
+  Object.defineProperty(globalThis, symbol, { value: registry2 });
+  return registry2;
 }
 
+var registry = sharedRegistry(
+  "stimeo-ui.attribute-lease.registry.v1",
+  () => ({ stacks: /* @__PURE__ */ new WeakMap(), names: /* @__PURE__ */ new Map() })
+);
 function isAttributeValue(value) {
   return value === null || typeof value === "string";
 }
@@ -26,24 +37,46 @@ function readLeaseRecord(element, record) {
     return void 0;
   }
 }
-var AttributeLease = class _AttributeLease {
-  static #registry = sharedRegistry(
-    "stimeo-ui.attribute-lease.registry.v1",
-    () => ({ stacks: /* @__PURE__ */ new WeakMap(), names: /* @__PURE__ */ new Map() })
-  );
+function attributeStack(element, attribute) {
+  const byAttribute = registry.stacks.get(element) ?? /* @__PURE__ */ new Map();
+  registry.stacks.set(element, byAttribute);
+  const known = byAttribute.get(attribute);
+  if (known) return known;
+  const found = [];
+  for (const record of registry.names.get(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;
+  const stack = found.sort((one, other) => depth(one) - depth(other)).map(({ record, written, original, linked }, index) => ({
+    lease: null,
+    record,
+    written,
+    original,
+    linked: linked && index > 0
+  }));
+  byAttribute.set(attribute, stack);
+  return stack;
+}
+function findHold(stack, lease, record) {
+  return stack.find((held) => held.lease === lease) ?? stack.find((held) => held.lease === null && held.record === record);
+}
+var AttributeLease = class {
   #attribute;
   #record;
   #base;
+  #preserveAuthor;
   #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;
+    this.#preserveAuthor = options.preserveAuthor === true;
+    const names = registry.names;
     names.set(attribute, (names.get(attribute) ?? /* @__PURE__ */ new Set()).add(this.#record));
   }
   write(element, value) {
-    const stack = this.#stack(element);
+    const stack = attributeStack(element, this.#attribute);
     const hold = this.#take(stack) ?? this.#acquire(element, stack);
     this.#held.add(element);
     const shows = !this.#covered(element, stack, hold);
@@ -53,8 +86,8 @@ var AttributeLease = class _AttributeLease {
   }
   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 known = registry.stacks.get(element)?.has(this.#attribute);
+    const stack = held || known || element.hasAttribute(this.#record) ? attributeStack(element, this.#attribute) : [];
     const hold = this.#take(stack);
     if (!hold) return false;
     const carries = element.getAttribute(this.#attribute) === hold.written;
@@ -72,31 +105,8 @@ var AttributeLease = class _AttributeLease {
   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);
+    const hold = findHold(stack, this, this.#record);
     if (hold) hold.lease = this;
     return hold;
   }
@@ -105,7 +115,7 @@ var AttributeLease = class _AttributeLease {
     const top = stack.at(-1);
     const bottom = stack[0];
     const over = top?.written === current ? top : void 0;
-    const from = this.#base ? bottom : over;
+    const from = this.#base ? this.#preserveAuthor && !stack.some((held) => held.written === current) ? void 0 : bottom : over;
     const hold = {
       lease: this,
       record: this.#record,
@@ -135,15 +145,11 @@ var AttributeLease = class _AttributeLease {
       );
     });
     for (const [name, recorded] of records) {
-      if (element.getAttribute(name) === recorded) continue;
-      if (recorded === null) element.removeAttribute(name);
-      else element.setAttribute(name, recorded);
+      setAttributeIfChanged(element, 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);
+    setAttributeIfChanged(element, this.#attribute, value);
   }
 };
 
@@ -161,25 +167,25 @@ var EscapeLayer = class _EscapeLayer {
   #active = null;
   activate(ownerDocument = document, options) {
     this.deactivate();
-    let registry = _EscapeLayer.#registries.get(ownerDocument);
-    if (!registry) {
-      registry = _EscapeLayer.#createRegistry();
-      _EscapeLayer.#registries.set(ownerDocument, registry);
-      ownerDocument.addEventListener("keydown", registry.onKeydown);
+    let registry2 = _EscapeLayer.#registries.get(ownerDocument);
+    if (!registry2) {
+      registry2 = _EscapeLayer.#createRegistry();
+      _EscapeLayer.#registries.set(ownerDocument, registry2);
+      ownerDocument.addEventListener("keydown", registry2.onKeydown);
     }
     const entry = { onDismiss: options.onDismiss, claims: options.claims ?? null };
-    registry.stack.push(entry);
+    registry2.stack.push(entry);
     this.#active = { document: ownerDocument, entry };
   }
   deactivate() {
     const active = this.#active;
     if (!active) return;
-    const registry = _EscapeLayer.#registries.get(active.document);
-    if (registry) {
-      const index = registry.stack.lastIndexOf(active.entry);
-      if (index >= 0) registry.stack.splice(index, 1);
-      if (registry.stack.length === 0) {
-        active.document.removeEventListener("keydown", registry.onKeydown);
+    const registry2 = _EscapeLayer.#registries.get(active.document);
+    if (registry2) {
+      const index = registry2.stack.lastIndexOf(active.entry);
+      if (index >= 0) registry2.stack.splice(index, 1);
+      if (registry2.stack.length === 0) {
+        active.document.removeEventListener("keydown", registry2.onKeydown);
         _EscapeLayer.#registries.delete(active.document);
       }
     }
@@ -188,22 +194,22 @@ var EscapeLayer = class _EscapeLayer {
   get ownsEscape() {
     const active = this.#active;
     if (!active) return false;
-    const registry = _EscapeLayer.#registries.get(active.document);
-    if (!registry) return false;
-    return _EscapeLayer.#resolveOwner(registry.stack) === active.entry;
+    const registry2 = _EscapeLayer.#registries.get(active.document);
+    if (!registry2) return false;
+    return _EscapeLayer.#resolveOwner(registry2.stack) === active.entry;
   }
   static #createRegistry() {
-    const registry = {
+    const registry2 = {
       stack: [],
       onKeydown: (event) => {
         if (event.key !== "Escape" || event.defaultPrevented || event.isComposing) return;
-        const owner = _EscapeLayer.#resolveOwner(registry.stack);
+        const owner = _EscapeLayer.#resolveOwner(registry2.stack);
         if (!owner) return;
         event.preventDefault();
         owner.onDismiss();
       }
     };
-    return registry;
+    return registry2;
   }
   static #resolveOwner(stack) {
     for (let index = stack.length - 1; index >= 0; index--) {
@@ -301,6 +307,17 @@ function firstTabStop(root) {
   return null;
 }
 
+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();
+  }
+};
+
 function observeScrollDismiss(element, onScroll) {
   const targets = [...scrollParents(element), window];
   const handler = () => onScroll();
@@ -347,10 +364,12 @@ var PopoverController = class extends Controller {
   #shownPanel = null;
   #connected = false;
   #reporting = false;
+  #listeners = new ListenerSet();
   connect() {
     this.#close("api");
-    document.addEventListener("click", this.#onOutsideClick, true);
-    this.element.addEventListener("focusout", this.#onFocusOut);
+    this.#listeners.add(document, "click", this.#onOutsideClick, { capture: true });
+    this.#listeners.add(this.element, "focusout", this.#onFocusOut);
+    this.#listeners.add(document, "focusin", this.#onDocumentFocusIn, { capture: true });
     this.#connected = true;
     this.#reporting = true;
   }
@@ -358,8 +377,7 @@ var PopoverController = class extends Controller {
     this.#connected = false;
     this.#reporting = false;
     this.#release();
-    document.removeEventListener("click", this.#onOutsideClick, true);
-    this.element.removeEventListener("focusout", this.#onFocusOut);
+    this.#listeners.dispose();
   }
   closeOnScrollValueChanged() {
     if (this.#shownPanel) this.#syncScrollDismiss();
@@ -458,6 +476,14 @@ var PopoverController = class extends Controller {
     if (!(next instanceof Node) || this.element.contains(next)) return;
     this.#close("focus");
   };
+  #onDocumentFocusIn = (event) => {
+    if (!this.#closable) return;
+    const target = event.target;
+    if (!(target instanceof Node) || target === document.body || this.element.contains(target)) {
+      return;
+    }
+    this.#close("focus");
+  };
   get #isOpen() {
     return this.hasPanelTarget && !this.panelTarget.hidden;
   }