stimeo-ui 0.17.0 → 0.18.1

data/dist/controllers/context_menu_controller.js

@@ -22,21 +22,42 @@ 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 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";
 }
@@ -53,24 +74,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);
@@ -80,8 +123,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;
@@ -99,31 +142,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;
   }
@@ -132,7 +152,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,
@@ -162,15 +182,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;
   }
 };
 
@@ -188,25 +216,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);
       }
     }
@@ -215,22 +243,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--) {
@@ -243,6 +271,29 @@ var EscapeLayer = class _EscapeLayer {
   }
 };
 
+function ownerIndex(candidates, node) {
+  if (!(node instanceof Node)) return -1;
+  return candidates.findIndex((candidate) => candidate.contains(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();
   clear(id) {
@@ -289,11 +340,13 @@ var ContextMenuController = class _ContextMenuController extends Controller {
   #menu = null;
   #connected = false;
   #reporting = false;
+  #clickVerdicts = new ClickVerdicts();
+  #listeners = new ListenerSet();
   connect() {
     this.#closeMenu("api");
-    this.element.addEventListener("click", this.#onItemClickCapture, true);
-    document.addEventListener("click", this.#onOutsidePointer, true);
-    document.addEventListener("contextmenu", this.#onOutsidePointer, true);
+    this.#listeners.add(this.element, "click", this.#onItemClickCapture, { capture: true });
+    this.#listeners.add(document, "click", this.#onOutsidePointer, { capture: true });
+    this.#listeners.add(document, "contextmenu", this.#onOutsidePointer, { capture: true });
     this.#connected = true;
     this.#reporting = true;
   }
@@ -302,9 +355,7 @@ var ContextMenuController = class _ContextMenuController extends Controller {
     this.#reporting = false;
     this.#timers.clearAll();
     this.#escapeLayer.deactivate();
-    this.element.removeEventListener("click", this.#onItemClickCapture, true);
-    document.removeEventListener("click", this.#onOutsidePointer, true);
-    document.removeEventListener("contextmenu", this.#onOutsidePointer, true);
+    this.#listeners.dispose();
   }
   regionTargetConnected() {
     if (this.#connected) this.#reflectRegion();
@@ -342,6 +393,7 @@ var ContextMenuController = class _ContextMenuController extends Controller {
   onItemKeydown(event) {
     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(event.currentTarget);
     switch (event.key) {
@@ -373,9 +425,18 @@ var ContextMenuController = class _ContextMenuController extends Controller {
         break;
     }
   }
-  activate() {
+  activate(event) {
+    const item = ownerOf(this.itemTargets, event?.target);
+    if (item !== null && this.#refuses(item, event)) return;
     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)
+    );
+  }
   #openAt(x, y, reason) {
     if (!this.hasMenuTarget) return;
     this.#timers.clearAll();
@@ -435,12 +496,13 @@ var ContextMenuController = class _ContextMenuController extends Controller {
     if (this.#isOpen && !this.element.contains(event.target)) this.#closeMenu("outside");
   };
   #onItemClickCapture = (event) => {
-    const target = event.target;
-    if (!(target instanceof Node)) return;
-    const disabled = this.itemTargets.some(
-      (item) => item.getAttribute("aria-disabled") === "true" && item.contains(target)
+    const items = ownersOf(this.itemTargets, event.target);
+    this.#clickVerdicts.record(
+      event,
+      items,
+      items.some((item) => this.#isActivationDisabled(item))
     );
-    if (!disabled) return;
+    if (!items.some((item) => isAriaDisabled(item))) return;
     event.preventDefault();
     event.stopImmediatePropagation();
   };
@@ -451,6 +513,9 @@ var ContextMenuController = class _ContextMenuController 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/countdown_controller.js

@@ -1,5 +1,12 @@
 import { Controller } from '@hotwired/stimulus';
 
+function fillTemplate(template, values) {
+  return template.replace(/\{([a-zA-Z][a-zA-Z0-9]*)\}/g, (match, name) => {
+    const replacement = Object.hasOwn(values, name) ? values[name] : void 0;
+    return replacement === void 0 ? match : String(replacement);
+  });
+}
+
 function announce(message, options = {}) {
   const text = message.trim();
   if (text.length === 0) return;
@@ -9,12 +16,6 @@ function announce(message, options = {}) {
     })
   );
 }
-function fillTemplate(template, values) {
-  return template.replace(/\{([a-zA-Z][a-zA-Z0-9]*)\}/g, (match, name) => {
-    const replacement = values[name];
-    return replacement === void 0 ? match : String(replacement);
-  });
-}
 
 var ListenerSet = class {
   #abort = new AbortController();
@@ -43,6 +44,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;
@@ -73,6 +77,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();
@@ -127,6 +134,94 @@ var NumberValueReader = class {
   }
 };
 
+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;
+}
+
+var OwnedText = class {
+  #attribute;
+  #channel;
+  #guard;
+  #writes = /* @__PURE__ */ new WeakMap();
+  constructor(attribute, channel = "text", guard = () => true) {
+    this.#attribute = attribute;
+    this.#channel = channel;
+    this.#guard = guard;
+  }
+  hasRecord(element) {
+    return element.hasAttribute(this.#attribute);
+  }
+  read(element, evidence = {}) {
+    if (evidence.source === "live") return this.#writes.get(element) ?? null;
+    const raw = element.getAttribute(this.#attribute);
+    if (raw === null) return null;
+    try {
+      const record = JSON.parse(raw);
+      if (!Array.isArray(record) || record.length !== 3 || record[0] !== this.#channel || typeof record[1] !== "string" || typeof record[2] !== "string")
+        return null;
+      return { original: record[1], written: record[2] };
+    } catch {
+      return null;
+    }
+  }
+  owns(element, evidence = {}) {
+    return this.#ownedRecord(element, evidence) !== null;
+  }
+  #ownedRecord(element, evidence) {
+    const record = this.read(element, evidence);
+    if (record === null || !this.#guard(element)) return null;
+    if (this.#channel === "text" && element.firstElementChild !== null) return null;
+    const current = this.#current(element);
+    return current === record.written || evidence.source === "live" && evidence.allowOriginal === true && current === record.original ? record : null;
+  }
+  write(element, written, original, force = false) {
+    const current = this.#current(element);
+    if (current === null) return;
+    const before = original ?? this.#writes.get(element)?.original ?? this.read(element)?.original ?? current;
+    if (force || current !== written) this.#put(element, written);
+    this.remember(element, written, before);
+  }
+  remember(element, written, original) {
+    const current = this.#current(element);
+    if (current === null) return;
+    const before = original ?? this.#writes.get(element)?.original ?? this.read(element)?.original ?? current;
+    this.#writes.set(element, { original: before, written });
+    setAttributeIfChanged(
+      element,
+      this.#attribute,
+      JSON.stringify([this.#channel, before, written])
+    );
+  }
+  clear(element, evidence = {}) {
+    if (!this.owns(element, evidence)) return false;
+    if (this.#current(element) !== "") this.#put(element, "");
+    this.forget(element);
+    return true;
+  }
+  restore(element, evidence = {}) {
+    const record = this.#ownedRecord(element, evidence);
+    if (record === null) return false;
+    if (this.#current(element) !== record.original) this.#put(element, record.original);
+    this.forget(element);
+    return true;
+  }
+  forget(element) {
+    setAttributeIfChanged(element, this.#attribute, null);
+    this.#writes.delete(element);
+  }
+  #current(element) {
+    if (this.#channel === "text") return element.textContent ?? "";
+    return element instanceof HTMLInputElement ? element.value : null;
+  }
+  #put(element, text) {
+    if (this.#channel === "text") element.textContent = text;
+    else if (element instanceof HTMLInputElement) element.value = text;
+  }
+};
+
 var TimerRegistry = class {
   ids = /* @__PURE__ */ new Set();
   clear(id) {
@@ -189,7 +284,7 @@ var CountdownController = class _CountdownController extends Controller {
   #renderedAmount = 0;
   #phase = "paused";
   #valuesDirty = false;
-  #statusWrites = /* @__PURE__ */ new WeakMap();
+  #statusText = new OwnedText(this.#ownedStatus);
   connect() {
     this.#connected = true;
     this.#resync.observe(this.element);
@@ -245,8 +340,7 @@ var CountdownController = class _CountdownController extends Controller {
   }
   statusTargetDisconnected(status) {
     if (!this.statusTargets.includes(status) && this.#ownsStatus(status)) {
-      status.removeAttribute(this.#ownedStatus);
-      this.#statusWrites.delete(status);
+      this.#statusText.forget(status);
     }
     this.#resync.schedule();
   }
@@ -366,25 +460,19 @@ var CountdownController = class _CountdownController extends Controller {
     this.#writeStatus(status, label);
   }
   #ownsStatus(status) {
-    const held = this.#statusWrites.get(status);
-    if (!status.hasAttribute(this.#ownedStatus) && held && status.firstElementChild === null && (status.textContent === held.text || status.textContent === held.original))
-      return true;
-    return status.getAttribute(this.#ownedStatus) === status.textContent && status.firstElementChild === null;
+    return this.#statusText.owns(status) || !this.#statusText.hasRecord(status) && this.#statusText.owns(status, { source: "live", allowOriginal: true });
   }
   #isEmpty(status) {
     return status.textContent === "" && status.firstElementChild === null;
   }
   #writeStatus(status, text) {
-    const original = this.#statusWrites.get(status)?.original ?? status.textContent ?? "";
-    this.#statusWrites.set(status, { original, text });
-    if (status.textContent !== text) status.textContent = text;
-    if (status.getAttribute(this.#ownedStatus) !== text)
-      status.setAttribute(this.#ownedStatus, text);
+    this.#statusText.write(status, text);
   }
   #releaseStatus(status) {
-    status.textContent = "";
-    status.removeAttribute(this.#ownedStatus);
-    this.#statusWrites.delete(status);
+    this.#statusText.clear(
+      status,
+      this.#statusText.hasRecord(status) ? {} : { source: "live", allowOriginal: true }
+    );
   }
   #announceCompletion() {
     announce(fillTemplate(this.announceTextValue, {}));