stimeo-ui 0.17.0 → 0.18.0

package/dist/controllers/dialog_controller.d.ts

@@ -20,14 +20,13 @@ import { Controller } from '@hotwired/stimulus';
  *
  * @remarks
  * Behavior only. The sole visual side effect is locking `document.body`'s scroll
- * while open (the minimum required by the pattern); all other styling is the
- * consumer's. Clicking the dialog backdrop (the dialog target itself, outside
- * its content) also closes it.
+ * while open; all other styling is the consumer's. Clicking the dialog backdrop
+ * (the dialog target itself, outside its content) also closes it.
  *
  * The modal lifecycle — focus trap, scroll lock, background `inert`, focus
  * restore, and teardown reversal — is delegated to the shared `FocusTrap`
- * primitive (also used by `stimeo--alert-dialog` and `stimeo--drawer`). This controller only owns
- * *when* to open/close and the dialog-specific backdrop click.
+ * primitive. This controller only owns *when* to open/close and the
+ * dialog-specific backdrop click.
  *
  * Each move of the open state is reported: `stimeo--dialog:open` and
  * `stimeo--dialog:close` dispatch `{ reason: StateReason }`, after the dialog's

package/dist/controllers/dialog_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);
   }
 };
 
@@ -192,25 +198,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);
       }
     }
@@ -219,22 +225,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--) {
@@ -467,6 +473,9 @@ var MicrotaskCoalescer = class {
     this.#queued = false;
     this.#generation += 1;
   }
+  get pending() {
+    return this.#queued;
+  }
   schedule() {
     if (!this.#active || this.#queued) return;
     this.#queued = true;
@@ -495,6 +504,9 @@ function queryOpenDescendants(root, selector) {
   return matches;
 }
 
+function holdsFocus(element) {
+  return element.matches(":focus") || deepActiveElement(element.ownerDocument) === element;
+}
 var TabindexLoan = class _TabindexLoan {
   static #registry = sharedRegistry(
     "stimeo-ui.tabindex-loan.registry.v1",
@@ -502,19 +514,22 @@ var TabindexLoan = class _TabindexLoan {
   );
   #value;
   #record;
+  #preserveFocus;
   #lent = /* @__PURE__ */ new Set();
-  constructor(value, owner) {
+  constructor(value, owner, options = {}) {
     this.#value = value;
     this.#record = `data-${owner}-tabindex-loan`;
+    this.#preserveFocus = options.preserveFocus === true;
     _TabindexLoan.#registry.names.add(this.#record);
   }
-  lend(element) {
+  lend(element, options = {}) {
     const stack = this.#stack(element);
     const current = element.getAttribute("tabindex");
     const held = stack.find((hold) => hold.loan === this) ?? stack.find(
       (hold) => hold.loan === null && hold.record === this.#record && hold.value === this.#value
     );
     const linked = stack.at(-1)?.value === current;
+    if (!held && options.onlyIfUnfocusable && (current !== null || element.tabIndex >= 0)) return;
     if (!held && current !== null && !linked) return;
     this.#lent.add(element);
     if (held) held.loan = this;
@@ -524,19 +539,28 @@ var TabindexLoan = class _TabindexLoan {
       element.setAttribute("tabindex", this.#value);
     }
   }
-  returnAll() {
-    for (const element of this.#lent) {
-      const stack = this.#stack(element);
-      const hold = stack.find((held) => held.loan === this);
-      if (hold) this.#release(element, stack, hold);
+  return(element) {
+    const stack = this.#stack(element);
+    const hold = stack.find((held) => held.loan === this) ?? stack.find(
+      (held) => held.loan === null && held.record === this.#record && held.value === this.#value
+    );
+    if (!hold) return false;
+    if (!this.#release(element, stack, hold, this.#preserveFocus)) {
+      hold.loan = this;
+      this.#lent.add(element);
+      return false;
     }
-    this.#lent.clear();
+    this.#lent.delete(element);
+    return true;
+  }
+  returnAll() {
+    for (const element of Array.from(this.#lent)) this.return(element);
   }
   reclaim(element) {
     if (element.getAttribute(this.#record) !== this.#value) return;
     const stack = this.#stack(element);
     const hold = stack.find((held) => held.loan === null && held.record === this.#record);
-    if (hold && !element.matches(":focus")) this.#release(element, stack, hold);
+    if (hold && !holdsFocus(element)) this.#release(element, stack, hold);
   }
   reclaimWithin(root) {
     for (const element of queryOpenDescendants(root, `[${this.#record}]`)) {
@@ -560,26 +584,26 @@ var TabindexLoan = class _TabindexLoan {
     for (const [index, hold] of holds.entries()) hold.linked = index > 0;
     return holds;
   }
-  #release(element, stack, hold) {
+  #release(element, stack, hold, preserveFocus = false) {
     const current = element.getAttribute("tabindex");
     const index = stack.indexOf(hold);
     const owns = current === hold.value && !stack.slice(index + 1).some((above2) => above2.value === current);
+    if (owns && preserveFocus && holdsFocus(element)) return false;
     stack.splice(index, 1);
     const above = stack[index];
     if (above) above.linked &&= hold.linked;
     this.#mark(element, stack);
-    if (!owns) return;
+    if (!owns) return true;
     const below = hold.linked ? stack[index - 1] : void 0;
     if (!below) element.removeAttribute("tabindex");
     else if (below.value !== current) element.setAttribute("tabindex", below.value);
+    return true;
   }
   #mark(element, stack) {
     const records = /* @__PURE__ */ new Map([[this.#record, null]]);
     for (const hold of stack) records.set(hold.record, hold.value);
     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);
     }
   }
 };
@@ -682,23 +706,23 @@ var FocusTrap = class _FocusTrap {
     return typeof option === "function" ? option() : option;
   }
   #joinStack() {
-    const registry = _FocusTrap.#registry(document);
-    if (registry.stack.length === 0) {
-      document.addEventListener("keydown", registry.onKeydown);
-      document.addEventListener("turbo:morph", registry.onMorph);
-      document.addEventListener("turbo:morph-element", registry.onMorph);
+    const registry2 = _FocusTrap.#registry(document);
+    if (registry2.stack.length === 0) {
+      document.addEventListener("keydown", registry2.onKeydown);
+      document.addEventListener("turbo:morph", registry2.onMorph);
+      document.addEventListener("turbo:morph-element", registry2.onMorph);
     }
-    registry.stack.push(this.#entry);
+    registry2.stack.push(this.#entry);
   }
   #leaveStack() {
-    const registry = _FocusTrap.#registry(document);
-    const index = registry.stack.indexOf(this.#entry);
-    const above = registry.stack.slice(index + 1);
-    registry.stack.splice(index, 1);
-    if (registry.stack.length === 0) {
-      document.removeEventListener("keydown", registry.onKeydown);
-      document.removeEventListener("turbo:morph", registry.onMorph);
-      document.removeEventListener("turbo:morph-element", registry.onMorph);
+    const registry2 = _FocusTrap.#registry(document);
+    const index = registry2.stack.indexOf(this.#entry);
+    const above = registry2.stack.slice(index + 1);
+    registry2.stack.splice(index, 1);
+    if (registry2.stack.length === 0) {
+      document.removeEventListener("keydown", registry2.onKeydown);
+      document.removeEventListener("turbo:morph", registry2.onMorph);
+      document.removeEventListener("turbo:morph-element", registry2.onMorph);
     }
     return above;
   }
@@ -773,22 +797,22 @@ var FocusTrap = class _FocusTrap {
     }
   }
   #lockScroll() {
-    const registry = _FocusTrap.#registry(document);
+    const registry2 = _FocusTrap.#registry(document);
     const body = document.body;
     if (!body.hasAttribute(OVERFLOW_MARK)) body.setAttribute(OVERFLOW_MARK, body.style.overflow);
-    registry.scrollLocks.add(this.#entry);
+    registry2.scrollLocks.add(this.#entry);
     this.#entry.lockedBody = body;
     body.style.overflow = "hidden";
   }
   #unlockScroll() {
-    const registry = _FocusTrap.#registry(document);
+    const registry2 = _FocusTrap.#registry(document);
     const body = this.#entry.lockedBody;
     this.#entry.lockedBody = null;
-    if (!registry.scrollLocks.delete(this.#entry) || !body) return;
-    if (!_FocusTrap.#isLocked(registry, body)) _FocusTrap.#unlock(body);
+    if (!registry2.scrollLocks.delete(this.#entry) || !body) return;
+    if (!_FocusTrap.#isLocked(registry2, body)) _FocusTrap.#unlock(body);
   }
-  static #isLocked(registry, body) {
-    return [...registry.scrollLocks].some((trap) => trap.lockedBody === body);
+  static #isLocked(registry2, body) {
+    return [...registry2.scrollLocks].some((trap) => trap.lockedBody === body);
   }
   static #unlock(body) {
     const saved = body.getAttribute(OVERFLOW_MARK);
@@ -797,62 +821,62 @@ var FocusTrap = class _FocusTrap {
     body.style.overflow = saved;
   }
   static #sweep() {
-    const registry = _FocusTrap.#registry(document);
+    const registry2 = _FocusTrap.#registry(document);
     for (const element of queryOpenDescendants(document, `[${INERT_MARK}]`)) {
-      if (registry.inerted.has(element)) continue;
+      if (registry2.inerted.has(element)) continue;
       element.removeAttribute(INERT_MARK);
       element.inert = false;
     }
-    if (!_FocusTrap.#isLocked(registry, document.body)) _FocusTrap.#unlock(document.body);
+    if (!_FocusTrap.#isLocked(registry2, document.body)) _FocusTrap.#unlock(document.body);
   }
   static #registry(ownerDocument) {
     const existing = _FocusTrap.#registries.get(ownerDocument);
     if (existing) return existing;
-    const morphs = new MicrotaskCoalescer(() => _FocusTrap.#reapply(registry));
+    const morphs = new MicrotaskCoalescer(() => _FocusTrap.#reapply(registry2));
     morphs.activate();
-    const registry = {
+    const registry2 = {
       stack: [],
-      onKeydown: (event) => _FocusTrap.#resolveTab(registry.stack, event),
+      onKeydown: (event) => _FocusTrap.#resolveTab(registry2.stack, event),
       onMorph: () => morphs.schedule(),
       inerted: /* @__PURE__ */ new Set(),
       scrollLocks: /* @__PURE__ */ new Set()
     };
-    _FocusTrap.#registries.set(ownerDocument, registry);
-    return registry;
+    _FocusTrap.#registries.set(ownerDocument, registry2);
+    return registry2;
   }
-  static #reapply(registry) {
+  static #reapply(registry2) {
     _FocusTrap.#reconcileBackground(document);
     const body = document.body;
-    if (!_FocusTrap.#isLocked(registry, body)) return;
+    if (!_FocusTrap.#isLocked(registry2, body)) return;
     if (!body.hasAttribute(OVERFLOW_MARK)) body.setAttribute(OVERFLOW_MARK, body.style.overflow);
     body.style.overflow = "hidden";
   }
   static #reconcileBackground(ownerDocument) {
-    const registry = _FocusTrap.#registry(ownerDocument);
-    for (const element of registry.inerted) {
-      if (!element.hasAttribute(INERT_MARK)) registry.inerted.delete(element);
+    const registry2 = _FocusTrap.#registry(ownerDocument);
+    for (const element of registry2.inerted) {
+      if (!element.hasAttribute(INERT_MARK)) registry2.inerted.delete(element);
     }
-    const background = _FocusTrap.#backgroundOf(registry);
-    for (const element of registry.inerted) {
+    const background = _FocusTrap.#backgroundOf(registry2);
+    for (const element of registry2.inerted) {
       if (background.has(element)) continue;
       element.removeAttribute(INERT_MARK);
       element.inert = false;
-      registry.inerted.delete(element);
+      registry2.inerted.delete(element);
     }
     const added = [];
     for (const element of background) {
-      if (registry.inerted.has(element)) continue;
+      if (registry2.inerted.has(element)) continue;
       element.setAttribute(INERT_MARK, "");
       element.inert = true;
-      registry.inerted.add(element);
+      registry2.inerted.add(element);
       added.push(element);
     }
     return added;
   }
-  static #backgroundOf(registry) {
-    const containers = registry.stack.map((trap) => trap.container());
+  static #backgroundOf(registry2) {
+    const containers = registry2.stack.map((trap) => trap.container());
     let top = -1;
-    registry.stack.forEach((trap, index) => {
+    registry2.stack.forEach((trap, index) => {
       if (trap.isolated && containers[index]) top = index;
     });
     const background = /* @__PURE__ */ new Set();
@@ -867,7 +891,7 @@ var FocusTrap = class _FocusTrap {
         const parent = flatTreeParent(node);
         for (const sibling of parent ? flatTreeChildren(parent) : []) {
           if (!(sibling instanceof HTMLElement) || kept.has(sibling)) continue;
-          if (sibling.inert && !registry.inerted.has(sibling)) continue;
+          if (sibling.inert && !registry2.inerted.has(sibling)) continue;
           background.add(sibling);
         }
       }
@@ -975,6 +999,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();