stimeo-ui 0.17.0 → 0.18.0

package/dist/controllers/listbox_controller.js

@@ -26,17 +26,32 @@ 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;
+  beforeWrite?.();
+  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 +68,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 +117,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 +136,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 +146,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 +176,101 @@ 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 AuthoredMutationWatcher = class {
+  #onAuthored;
+  #claims = null;
+  #observer = null;
+  constructor(onAuthored) {
+    this.#onAuthored = onAuthored;
+  }
+  observe(root, options) {
+    this.disconnect();
+    const observer = new MutationObserver((records) => {
+      if (this.#observer !== observer) return;
+      const authored = this.#filter(records);
+      if (authored.length > 0) this.#onAuthored(authored);
+    });
+    this.#observer = observer;
+    this.#claims = { attributes: /* @__PURE__ */ new Map(), children: /* @__PURE__ */ new Map() };
+    observer.observe(root, {
+      attributes: true,
+      attributeFilter: [...options.attributes],
+      subtree: options.subtree ?? false,
+      childList: options.childList ?? false
+    });
+    if (options.ancestorAttributes) {
+      let ancestor = root.parentElement;
+      while (ancestor) {
+        observer.observe(ancestor, {
+          attributes: true,
+          attributeFilter: [...options.ancestorAttributes]
+        });
+        ancestor = ancestor.parentElement;
+      }
+    }
+  }
+  claim(target, name, value) {
+    const claims = this.#claims?.attributes;
+    let attributes = claims?.get(target);
+    if (!attributes) {
+      attributes = /* @__PURE__ */ new Map();
+      claims?.set(target, attributes);
+    }
+    const pending = attributes.get(name);
+    attributes.set(name, { value, count: (pending?.count ?? 0) + 1 });
+  }
+  claimCurrent(target, name) {
+    this.claim(target, name, target.getAttribute(name));
+  }
+  claimChildList(target, added, removed) {
+    const claims = this.#claims?.children;
+    const pending = claims?.get(target) ?? { added: /* @__PURE__ */ new Map(), removed: /* @__PURE__ */ new Map() };
+    for (const node of added) pending.added.set(node, (pending.added.get(node) ?? 0) + 1);
+    for (const node of removed) pending.removed.set(node, (pending.removed.get(node) ?? 0) + 1);
+    claims?.set(target, pending);
+  }
+  take() {
+    return this.#filter(this.#observer?.takeRecords() ?? []);
+  }
+  disconnect() {
+    this.#observer?.disconnect();
+    this.#observer = null;
+    this.#claims = null;
+  }
+  #filter(records) {
+    const authored = records.filter((record) => !this.#consume(record));
+    this.#claims?.attributes.clear();
+    this.#claims?.children.clear();
+    return authored;
+  }
+  #consume(record) {
+    if (record.type === "attributes") {
+      const target = record.target;
+      const pending2 = this.#claims?.attributes.get(target)?.get(record.attributeName);
+      if (!pending2 || pending2.count === 0 || target.getAttribute(record.attributeName) !== pending2.value) {
+        return false;
+      }
+      pending2.count -= 1;
+      return true;
+    }
+    const pending = this.#claims?.children.get(record.target);
+    if (!pending) return false;
+    const added = [...record.addedNodes];
+    const removed = [...record.removedNodes];
+    if (added.some((node) => !pending.added.get(node)) || removed.some((node) => !pending.removed.get(node))) {
+      return false;
+    }
+    for (const node of added) pending.added.set(node, (pending.added.get(node) ?? 0) - 1);
+    for (const node of removed) pending.removed.set(node, (pending.removed.get(node) ?? 0) - 1);
+    return true;
   }
 };
 
@@ -210,6 +310,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;
@@ -240,6 +343,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();
@@ -269,6 +375,87 @@ function scrollOptionIntoView(list, option) {
   }
 }
 
+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;
+  }
+};
+
 function targetSelector(identifier, name) {
   return `[data-${identifier}-target~="${name}"]`;
 }
@@ -354,11 +541,10 @@ function findTypeaheadMatch(items, from, query, label = (item) => typeaheadLabel
 }
 
 var OBSERVED_ATTRIBUTES = ["aria-selected", "data-value"];
-function setAttributeIfChanged(element, name, value) {
-  if (element.getAttribute(name) !== value) element.setAttribute(name, value);
-}
 var ListboxController = class extends Controller {
+  #labelText = new OwnedText(`data-${this.identifier}-owns-label`);
   #moves = new MoveCounter();
+  #connectionGeneration = 0;
   static targets = ["trigger", "value", "list", "option", "field"];
   static values = {
     placeholder: { type: String, default: "" }
@@ -368,7 +554,9 @@ var ListboxController = class extends Controller {
   #activeId = null;
   #activeOrder = [];
   #reconcile = new MorphRenderWatcher(() => this.#reconcileOptions());
-  #observer = null;
+  #observer = new AuthoredMutationWatcher((records) => {
+    if (this.#concernsOptions(records)) this.#reconcile.schedule();
+  });
   #settled = { option: null, value: "" };
   #shownList = null;
   #listHidden = new AttributeLease("hidden", this.identifier);
@@ -378,10 +566,11 @@ var ListboxController = class extends Controller {
     this.identifier
   );
   #typeahead = new Typeahead();
+  #listeners = new ListenerSet();
   connect() {
     this.#normalizeSelection();
     this.close();
-    document.addEventListener("click", this.#onOutsideClick, true);
+    this.#listeners.add(document, "click", this.#onOutsideClick, { capture: true });
     this.#settled = this.#selection();
     this.#reconcile.observe(this.element);
     this.#observeOptions();
@@ -470,10 +659,10 @@ var ListboxController = class extends Controller {
     return { option, value: option ? this.#optionValue(option) : "" };
   }
   disconnect() {
+    this.#connectionGeneration += 1;
     this.#reconcile.disconnect();
-    this.#observer?.disconnect();
-    this.#observer = null;
-    document.removeEventListener("click", this.#onOutsideClick, true);
+    this.#observer.disconnect();
+    this.#listeners.dispose();
     this.#typeahead.reset();
   }
   toggle(event) {
@@ -487,6 +676,7 @@ var ListboxController = class extends Controller {
   onTriggerKeydown(event) {
     if (event.defaultPrevented) return;
     if (isReservedArrowChord(event)) return;
+    if ((event.key === "Home" || event.key === "End") && hasModifierChord(event)) return;
     if (!this.#isClosed) this.#reconcileActive();
     const options = this.optionTargets;
     const length = options.length;
@@ -589,21 +779,22 @@ var ListboxController = class extends Controller {
     this.triggerTarget.focus();
   }
   #selectOption(option, reason = "user") {
+    const generation = this.#connectionGeneration;
     const { value, fieldChanged } = this.#applySelection(option);
     const changed = option !== this.#settled.option || value !== this.#settled.value;
     this.#settled = { option, value };
     if (!changed) return true;
     const token = this.#moves.record();
     if (fieldChanged) commitField(this.fieldTarget);
-    if (!this.#moves.isLatest(token)) return false;
+    if (generation !== this.#connectionGeneration || !this.#moves.isLatest(token)) return false;
     this.dispatch("change", { detail: { value, option, reason } });
     return this.#moves.isLatest(token);
   }
   #applySelection(option) {
     for (const candidate of this.optionTargets) {
-      setAttributeIfChanged(candidate, "aria-selected", candidate === option ? "true" : "false");
+      this.#writeSelection(candidate, candidate === option ? "true" : "false");
     }
-    this.#dropOwnRecords();
+    this.#flushMutations();
     const value = option ? this.#optionValue(option) : "";
     this.#renderLabel(option);
     const fieldChanged = this.hasFieldTarget && writeField(this.fieldTarget, value);
@@ -612,26 +803,16 @@ var ListboxController = class extends Controller {
   #renderLabel(option) {
     if (!this.hasValueTarget) return;
     const label = this.valueTarget;
-    const ownsLabel = `data-${this.identifier}-owns-label`;
-    const originalLabel = `data-${this.identifier}-original-label`;
-    const owned = label.getAttribute(ownsLabel) === label.textContent && label.childElementCount === 0;
-    if (option === void 0 && !owned && label.hasAttribute(ownsLabel)) return;
+    const owned = this.#labelText.owns(label);
+    if (option === void 0 && !owned && this.#labelText.hasRecord(label)) return;
     const text = option ? this.#optionLabel(option) : this.placeholderValue || null;
     if (text === null) {
-      if (!owned) return;
-      label.textContent = label.getAttribute(originalLabel) ?? "";
-      label.removeAttribute(ownsLabel);
-      label.removeAttribute(originalLabel);
+      this.#labelText.restore(label);
       return;
     }
-    if (!owned) {
-      const current = (label.textContent ?? "").trim();
-      if (option === void 0 || current !== text) {
-        setAttributeIfChanged(label, originalLabel, current);
-      }
-    }
-    if (label.textContent !== text) label.textContent = text;
-    setAttributeIfChanged(label, ownsLabel, text);
+    const current = (label.textContent ?? "").trim();
+    const original = owned ? void 0 : option === void 0 || current !== text ? current : this.#labelText.read(label)?.original ?? "";
+    this.#labelText.write(label, text, original);
   }
   #optionLabel(option) {
     return (option.textContent ?? "").trim();
@@ -640,22 +821,17 @@ var ListboxController = class extends Controller {
     return option.dataset.value ?? this.#optionLabel(option);
   }
   #observeOptions() {
-    const observer = new MutationObserver((records) => {
-      if (this.#concernsOptions(records)) this.#reconcile.schedule();
-    });
-    observer.observe(this.element, {
+    this.#observer.observe(this.element, {
       subtree: true,
-      attributes: true,
-      attributeFilter: OBSERVED_ATTRIBUTES
+      attributes: OBSERVED_ATTRIBUTES
     });
-    this.#observer = observer;
   }
   #concernsOptions(records) {
     const options = new Set(this.optionTargets);
     return records.some((record) => options.has(record.target));
   }
-  #dropOwnRecords() {
-    this.#observer?.takeRecords();
+  #flushMutations() {
+    if (this.#concernsOptions(this.#observer.take())) this.#reconcile.schedule();
   }
   #setActive(index) {
     const options = this.optionTargets;
@@ -728,6 +904,11 @@ var ListboxController = class extends Controller {
   get #isClosed() {
     return !this.hasListTarget || this.listTarget.hidden !== false;
   }
+  #writeSelection(target, value) {
+    setAttributeIfChanged(target, "aria-selected", value, () => {
+      this.#observer.claim(target, "aria-selected", value);
+    });
+  }
 };
 
 export { ListboxController };