stimeo-ui 0.17.0 → 0.18.0

data/dist/controllers/menu_controller.js

@@ -1,20 +1,41 @@
 import { Controller } from '@hotwired/stimulus';
 
+function isAriaDisabled(element) {
+  for (let current = element; current; current = current.parentElement) {
+    if (current.getAttribute("aria-disabled") === "true") return true;
+  }
+  return false;
+}
+
 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");
 }
+function hasModifierChord(event) {
+  return event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
+}
+
+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";
 }
@@ -31,24 +52,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);
@@ -58,8 +101,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;
@@ -77,31 +120,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;
   }
@@ -110,7 +130,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,
@@ -140,15 +160,23 @@ 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);
+  }
+};
+
+var ClickVerdicts = class {
+  #verdicts = /* @__PURE__ */ new WeakMap();
+  record(event, entries, refused) {
+    this.#verdicts.set(event, { entries, refused });
+  }
+  for(event, entry) {
+    const verdict = event && this.#verdicts.get(event);
+    if (!verdict?.entries.includes(entry)) return void 0;
+    return verdict.refused;
   }
 };
 
@@ -166,25 +194,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);
       }
     }
@@ -193,22 +221,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--) {
@@ -228,6 +256,21 @@ function ownerIndex(candidates, node) {
 function ownerOf(candidates, node) {
   return candidates[ownerIndex(candidates, node)] ?? null;
 }
+function ownersOf(candidates, node) {
+  if (!(node instanceof Node)) return [];
+  return candidates.filter((candidate) => candidate.contains(node));
+}
+
+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 TimerRegistry = class {
   ids = /* @__PURE__ */ new Set();
@@ -289,15 +332,17 @@ var MenuController = class extends Controller {
   #expanded = new AttributeLease("aria-expanded", this.identifier);
   #menu = null;
   #clickOwner = null;
+  #clickVerdicts = new ClickVerdicts();
   #activated = /* @__PURE__ */ new WeakSet();
   #connected = false;
   #reporting = false;
+  #listeners = new ListenerSet();
   connect() {
     this.#close("api");
-    this.element.addEventListener("click", this.#onItemClickCapture, true);
-    this.element.addEventListener("click", this.#onDelegatedItemClick);
-    this.element.addEventListener("keydown", this.#onDelegatedItemKeydown);
-    document.addEventListener("click", this.#onOutsideClick, true);
+    this.#listeners.add(this.element, "click", this.#onItemClickCapture, { capture: true });
+    this.#listeners.add(this.element, "click", this.#onDelegatedItemClick);
+    this.#listeners.add(this.element, "keydown", this.#onDelegatedItemKeydown);
+    this.#listeners.add(document, "click", this.#onOutsideClick, { capture: true });
     this.#connected = true;
     this.#reporting = true;
   }
@@ -306,10 +351,7 @@ var MenuController = class extends Controller {
     this.#reporting = false;
     this.#timers.clearAll();
     this.#escapeLayer.deactivate();
-    this.element.removeEventListener("click", this.#onItemClickCapture, true);
-    this.element.removeEventListener("click", this.#onDelegatedItemClick);
-    this.element.removeEventListener("keydown", this.#onDelegatedItemKeydown);
-    document.removeEventListener("click", this.#onOutsideClick, true);
+    this.#listeners.dispose();
   }
   triggerTargetConnected() {
     if (this.#connected) this.#reflectTrigger();
@@ -398,6 +440,7 @@ var MenuController = class extends Controller {
   #handleItemKeydown(event, from) {
     if (event.defaultPrevented) return;
     if (isReservedArrowChord(event)) return;
+    if ((event.key === "Home" || event.key === "End") && hasModifierChord(event)) return;
     const items = this.#navigableItems;
     const currentIndex = items.indexOf(from);
     switch (event.key) {
@@ -424,12 +467,22 @@ var MenuController = class extends Controller {
     }
   }
   activate(event) {
-    if (event !== void 0) {
-      if (this.#activated.has(event)) return;
-      this.#activated.add(event);
-    }
+    if (event === void 0) this.#closeAndRestore("select");
+    else this.#activateItem(this.#itemFrom(event.target), event);
+  }
+  #activateItem(item, event) {
+    if (item !== null && this.#refuses(item, event)) return;
+    if (this.#activated.has(event)) return;
+    this.#activated.add(event);
     this.#closeAndRestore("select");
   }
+  #refuses(item, event) {
+    const recorded = this.#clickVerdicts.for(event, item);
+    if (recorded !== void 0) return recorded;
+    return ownersOf(this.itemTargets, event.target).some(
+      (owner) => this.#isActivationDisabled(owner)
+    );
+  }
   #closeAndRestore(reason) {
     this.#close(reason);
     if (this.hasTriggerTarget) this.triggerTarget.focus();
@@ -446,20 +499,20 @@ var MenuController = class extends Controller {
     const item = this.#clickOwner;
     this.#clickOwner = null;
     if (item === null) return;
-    this.activate(event);
+    this.#activateItem(item, event);
   };
   #itemFrom(node) {
     return ownerOf(this.itemTargets, node);
   }
   #onItemClickCapture = (event) => {
-    const target = event.target;
-    if (!(target instanceof Node)) {
-      this.#clickOwner = null;
-      return;
-    }
-    const item = this.#itemFrom(target);
-    this.#clickOwner = item;
-    if (item === null || item.getAttribute("aria-disabled") !== "true") return;
+    const items = ownersOf(this.itemTargets, event.target);
+    this.#clickOwner = items[0] ?? null;
+    this.#clickVerdicts.record(
+      event,
+      items,
+      items.some((item) => this.#isActivationDisabled(item))
+    );
+    if (!items.some((item) => isAriaDisabled(item))) return;
     this.#clickOwner = null;
     event.preventDefault();
     event.stopImmediatePropagation();
@@ -480,6 +533,9 @@ var MenuController = class extends Controller {
     if (item.hasAttribute("hidden")) return false;
     return !item.disabled;
   }
+  #isActivationDisabled(item) {
+    return !this.#isNavigable(item) || isAriaDisabled(item);
+  }
   get #isOpen() {
     return this.hasMenuTarget && !this.menuTarget.hidden;
   }

data/dist/controllers/menubar_controller.js

@@ -22,6 +22,13 @@ function actionSource(source) {
   };
 }
 
+function isAriaDisabled(element) {
+  for (let current = element; current; current = current.parentElement) {
+    if (current.getAttribute("aria-disabled") === "true") return true;
+  }
+  return false;
+}
+
 function isRtl(element) {
   return window.getComputedStyle(element).direction === "rtl";
 }
@@ -30,6 +37,21 @@ 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");
 }
+function hasModifierChord(event) {
+  return event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
+}
+
+var ClickVerdicts = class {
+  #verdicts = /* @__PURE__ */ new WeakMap();
+  record(event, entries, refused) {
+    this.#verdicts.set(event, { entries, refused });
+  }
+  for(event, entry) {
+    const verdict = event && this.#verdicts.get(event);
+    if (!verdict?.entries.includes(entry)) return void 0;
+    return verdict.refused;
+  }
+};
 
 function sharedRegistry(key, create) {
   const symbol = Symbol.for(key);
@@ -117,6 +139,10 @@ function ownerIndex(candidates, node) {
 function ownerOf(candidates, node) {
   return candidates[ownerIndex(candidates, node)] ?? null;
 }
+function ownersOf(candidates, node) {
+  if (!(node instanceof Node)) return [];
+  return candidates.filter((candidate) => candidate.contains(node));
+}
 
 var ListenerSet = class {
   #abort = new AbortController();
@@ -145,6 +171,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;
@@ -175,6 +204,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();
@@ -298,6 +330,7 @@ var MenubarController = class extends Controller {
   #connected = false;
   #reporting = false;
   #focused = null;
+  #clickVerdicts = new ClickVerdicts();
   #onFocusIn = (event) => {
     this.#focused = event.target;
   };
@@ -306,14 +339,15 @@ var MenubarController = class extends Controller {
     if (next && !this.element.contains(next)) this.#focused = null;
   };
   #morph = new MorphRenderWatcher(() => this.#reconcile());
+  #listeners = new ListenerSet();
   connect() {
     this.#morph.observe(this.element);
     this.#closeAllMenus("api");
     this.#reconcile();
-    this.element.addEventListener("click", this.#onDisabledClickCapture, true);
-    this.element.addEventListener("focusin", this.#onFocusIn);
-    this.element.addEventListener("focusout", this.#onFocusOut);
-    document.addEventListener("click", this.#onOutsideClick, true);
+    this.#listeners.add(this.element, "click", this.#onClickCapture, { capture: true });
+    this.#listeners.add(this.element, "focusin", this.#onFocusIn);
+    this.#listeners.add(this.element, "focusout", this.#onFocusOut);
+    this.#listeners.add(document, "click", this.#onOutsideClick, { capture: true });
     if (typeof MutationObserver !== "undefined") {
       this.#observer = new MutationObserver(() => this.#morph.schedule());
       this.#observer.observe(this.element, {
@@ -332,10 +366,7 @@ var MenubarController = class extends Controller {
     this.#reporting = false;
     this.#escapeLayer.deactivate();
     this.#layerActive = false;
-    this.element.removeEventListener("click", this.#onDisabledClickCapture, true);
-    this.element.removeEventListener("focusin", this.#onFocusIn);
-    this.element.removeEventListener("focusout", this.#onFocusOut);
-    document.removeEventListener("click", this.#onOutsideClick, true);
+    this.#listeners.dispose();
     this.#focused = null;
     this.#observer?.disconnect();
     this.#observer = null;
@@ -368,16 +399,18 @@ var MenubarController = class extends Controller {
     if (!top || !this.topTargets.includes(top)) return;
     if (origin && origin.closest(`[data-controller~="${this.identifier}"]`) !== this.element)
       return;
+    if (this.#refuses(top, event, origin)) return;
     const moveFocus = event !== null || this.element.contains(document.activeElement);
     if (this.#isExpanded(top)) {
       this.#closeMenu(top, reason);
     } else {
-      this.#openMenu(top, "first", reason, moveFocus);
+      this.#openMenu(top, "first", reason, moveFocus, true);
     }
   }
   onTopKeydown(event) {
     if (event.defaultPrevented) return;
     if (isReservedArrowChord(event)) return;
+    if ((event.key === "Home" || event.key === "End") && hasModifierChord(event)) return;
     const tops = this.#navigableTops;
     const index = tops.indexOf(event.currentTarget);
     if (index === -1) return;
@@ -417,6 +450,7 @@ var MenubarController = class extends Controller {
   onItemKeydown(event) {
     if (event.defaultPrevented) return;
     if (isReservedArrowChord(event)) return;
+    if ((event.key === "Home" || event.key === "End") && hasModifierChord(event)) return;
     const item = event.currentTarget;
     const menu = item.closest("[role='menu']");
     if (!menu) return;
@@ -465,6 +499,7 @@ var MenubarController = class extends Controller {
     if (!item || !this.itemTargets.includes(item)) return;
     if (origin && origin.closest(`[data-controller~="${this.identifier}"]`) !== this.element)
       return;
+    if (this.#refuses(item, event, origin)) return;
     const moveFocus = event !== null || this.element.contains(document.activeElement);
     const menu = item.closest("[role='menu']");
     const top = this.#topFor(menu);
@@ -482,10 +517,10 @@ var MenubarController = class extends Controller {
       this.#roving.setActive(this.topTargets.indexOf(destination), { focus: true });
     }
   }
-  #openMenu(opener, focus, reason, moveFocus = true) {
+  #openMenu(opener, focus, reason, moveFocus = true, judged = false) {
     if (!opener) return;
     const menu = this.#menuFor(opener);
-    if (!menu || this.#isActivationBlocked(opener)) {
+    if (!menu || !judged && isAriaDisabled(opener)) {
       if (menu || !opener.hasAttribute("aria-controls")) {
         this.#closeAllMenus(reason);
         this.#focusTop(
@@ -562,13 +597,14 @@ var MenubarController = class extends Controller {
       this.#closeAllMenus("outside");
     }
   };
-  #onDisabledClickCapture = (event) => {
-    const target = event.target;
-    if (!(target instanceof Node)) return;
-    const blocked = [...this.topTargets, ...this.itemTargets].some(
-      (element) => this.#isActivationBlocked(element) && element.contains(target)
+  #onClickCapture = (event) => {
+    const entries = ownersOf(this.#entries, event.target);
+    this.#clickVerdicts.record(
+      event,
+      entries,
+      entries.some((entry) => this.#isActivationDisabled(entry))
     );
-    if (!blocked) return;
+    if (!entries.some((entry) => isAriaDisabled(entry))) return;
     event.preventDefault();
     event.stopImmediatePropagation();
   };
@@ -637,6 +673,9 @@ var MenubarController = class extends Controller {
   #itemsIn(menu) {
     return this.itemTargets.filter((item) => menu.contains(item) && this.#isNavigable(item));
   }
+  get #entries() {
+    return [...this.topTargets, ...this.itemTargets];
+  }
   get #navigableTops() {
     return this.topTargets.filter((top) => this.#isNavigable(top));
   }
@@ -644,8 +683,15 @@ var MenubarController = class extends Controller {
     if (element.hasAttribute("hidden")) return false;
     return !element.disabled;
   }
-  #isActivationBlocked(element) {
-    return element.getAttribute("aria-disabled") === "true";
+  #isActivationDisabled(element) {
+    return !this.#isNavigable(element) || isAriaDisabled(element);
+  }
+  #refuses(entry, event, origin) {
+    const recorded = this.#clickVerdicts.for(event, entry);
+    if (recorded !== void 0) return recorded;
+    if (this.#isActivationDisabled(entry)) return true;
+    const target = event ? event.target : origin;
+    return ownersOf(this.#entries, target).some((owner) => this.#isActivationDisabled(owner));
   }
   #focusAt(items, index) {
     items[index]?.focus();