stimeo-ui 0.17.0 → 0.18.0

data/dist/controllers/empty_state_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();

data/dist/controllers/file_dropzone_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,11 +16,12 @@ 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);
-  });
+
+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) {
@@ -21,11 +29,15 @@ function sharedRegistry(key, create) {
   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";
 }
@@ -42,24 +54,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);
@@ -69,8 +103,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;
@@ -88,31 +122,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;
   }
@@ -121,7 +132,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,
@@ -151,15 +162,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);
   }
 };
 

data/dist/controllers/filter_controller.js

@@ -27,6 +27,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;
@@ -57,6 +60,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();
@@ -75,17 +81,18 @@ var FilterController = class extends Controller {
   #reported = null;
   #connected = false;
   #morphRender = new MorphRenderWatcher(() => this.#evaluate());
+  #listeners = new ListenerSet();
   connect() {
     this.#morphRender.observe(this.element);
     this.#reported = null;
     this.#evaluate();
-    this.element.addEventListener("change", this.#onChange);
+    this.#listeners.add(this.element, "change", this.#onChange);
     this.#connected = true;
   }
   disconnect() {
     this.#morphRender.disconnect();
     this.#connected = false;
-    this.element.removeEventListener("change", this.#onChange);
+    this.#listeners.dispose();
   }
   matchValueChanged() {
     if (!this.#connected) return;

data/dist/controllers/flash_controller.js

@@ -40,6 +40,59 @@ function ownerOf(candidates, node) {
   return candidates[ownerIndex(candidates, node)] ?? 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();
+  }
+};
+
+var HoverRecheck = class {
+  #document;
+  #release;
+  #listeners = new ListenerSet();
+  #pending = /* @__PURE__ */ new Set();
+  #tickets = /* @__PURE__ */ new WeakMap();
+  constructor(document2, release) {
+    this.#document = document2;
+    this.#release = release;
+  }
+  wait(element) {
+    this.#pending.add(element);
+    this.#tickets.set(element, /* @__PURE__ */ Symbol());
+    this.#listeners.add(this.#document, "pointermove", this.#onPointerMove, {
+      capture: true,
+      passive: true
+    });
+  }
+  cancel(element) {
+    this.#tickets.delete(element);
+    this.#pending.delete(element);
+    if (this.#pending.size === 0) this.#listeners.dispose();
+  }
+  dispose() {
+    this.#listeners.dispose();
+    this.#pending.clear();
+    this.#tickets = /* @__PURE__ */ new WeakMap();
+  }
+  #onPointerMove = () => {
+    this.#listeners.dispose();
+    const waiting = [...this.#pending].map(
+      (element) => [element, this.#tickets.get(element)]
+    );
+    this.#pending.clear();
+    for (const [element, ticket] of waiting) {
+      if (this.#tickets.get(element) !== ticket) continue;
+      if (element.matches(":hover")) continue;
+      this.#release(element);
+    }
+  };
+};
+
 var MAX_TIMER_DELAY_MS = 2147483647;
 
 var TimerRegistry = class {
@@ -100,17 +153,6 @@ var KeyedTimers = class {
   }
 };
 
-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 MicrotaskCoalescer = class {
   #run;
   #queued = false;
@@ -127,6 +169,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;
@@ -157,6 +202,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();
@@ -332,8 +380,10 @@ var FlashController = class _FlashController extends Controller {
   #fixedDismiss = new KeyedTimers();
   #reapply = new MorphRenderWatcher(() => this.#reapplyCap());
   #spared = [];
-  #pointer = new ListenerSet();
-  #awaitingPointer = /* @__PURE__ */ new Set();
+  #pointer = new HoverRecheck(
+    this.element.ownerDocument,
+    (message) => this.#resume(message, "hover", null)
+  );
   #observer = null;
   #connected = false;
   #arrivals = /* @__PURE__ */ new Set();
@@ -376,7 +426,6 @@ var FlashController = class _FlashController extends Controller {
     this.#reapply.disconnect();
     this.#spared = [];
     this.#pointer.dispose();
-    this.#awaitingPointer.clear();
     for (const message of this.#order) this.#unbindPause(message);
     this.#order.length = 0;
     this.#leaving.clear();
@@ -534,29 +583,14 @@ var FlashController = class _FlashController extends Controller {
   }
   #afterMove(message) {
     if (!message.contains(document.activeElement)) this.#resume(message, "focus", null);
-    if (this.#dismiss.isHeld(message)) this.#awaitPointer(message);
+    if (this.#dismiss.isHeld(message)) this.#pointer.wait(message);
   }
   #readHolds(message) {
     if (message.contains(document.activeElement)) this.#pause(message, "focus");
     if (!message.matches(":hover")) return;
     this.#pause(message, "hover");
-    this.#awaitPointer(message);
-  }
-  #awaitPointer(message) {
-    this.#awaitingPointer.add(message);
-    this.#pointer.add(document, "pointermove", this.#onPointerMove, {
-      capture: true,
-      passive: true
-    });
+    this.#pointer.wait(message);
   }
-  #onPointerMove = () => {
-    this.#pointer.dispose();
-    const waiting = [...this.#awaitingPointer];
-    this.#awaitingPointer.clear();
-    for (const message of waiting) {
-      if (!message.matches(":hover")) this.#resume(message, "hover", null);
-    }
-  };
   #forget(message) {
     if (this.#dismiss.isHeld(message)) this.#capLater(null);
     this.#dismiss.clear(message);
@@ -564,8 +598,7 @@ var FlashController = class _FlashController extends Controller {
     const index = this.#order.indexOf(message);
     if (index !== -1) this.#order.splice(index, 1);
     this.#unbindPause(message);
-    this.#awaitingPointer.delete(message);
-    if (this.#awaitingPointer.size === 0) this.#pointer.dispose();
+    this.#pointer.cancel(message);
   }
   #beginDismiss(message, reason) {
     if (!this.#order.includes(message)) return;

data/dist/controllers/focus_controller.js

@@ -330,6 +330,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;
@@ -358,6 +361,16 @@ function queryOpenDescendants(root, selector) {
   return matches;
 }
 
+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 holdsFocus(element) {
+  return element.matches(":focus") || deepActiveElement(element.ownerDocument) === element;
+}
 var TabindexLoan = class _TabindexLoan {
   static #registry = sharedRegistry(
     "stimeo-ui.tabindex-loan.registry.v1",
@@ -365,19 +378,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;
@@ -387,19 +403,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}]`)) {
@@ -423,26 +448,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);
     }
   }
 };