stimeo-ui 0.17.0 → 0.18.1

package/dist/controllers/character_counter_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);
   }
 };
 
@@ -169,63 +176,182 @@ var COMPOSITION_INPUT_TYPES = /* @__PURE__ */ new Set([
   "deleteCompositionText",
   "deleteByComposition"
 ]);
+function isCompositionInputType(inputType) {
+  return inputType !== void 0 && COMPOSITION_INPUT_TYPES.has(inputType);
+}
+var BEFORE_MORPH_ATTRIBUTE = "turbo:before-morph-attribute";
+var textOf = (element) => element.value;
+var holdsFocus = (element) => element instanceof Node && element.getRootNode().activeElement === element;
 var CompositionTracker = class {
   #observedTargets = /* @__PURE__ */ new Set();
-  #activeTargets = /* @__PURE__ */ new Set();
+  #composition = null;
   #onStart;
   #onEnd;
+  #onAbandon;
   #confirmedTarget = null;
+  #keyComposing = false;
+  #connected = false;
+  #abandoned = null;
   constructor(options = {}) {
     this.#onStart = options.onStart;
     this.#onEnd = options.onEnd;
+    this.#onAbandon = options.onAbandon;
   }
   observe(target) {
+    this.#connected = true;
     if (this.#observedTargets.has(target)) return;
     target.addEventListener("compositionstart", this.#handleStart);
     target.addEventListener("compositionend", this.#handleEnd);
-    target.addEventListener("keydown", this.#handleKeydown);
+    target.addEventListener("keydown", this.#handleKeydown, true);
+    target.addEventListener("beforeinput", this.#handleBeforeInput, true);
+    target.addEventListener("input", this.#handleInput, true);
+    target.addEventListener("blur", this.#handleBlur, true);
+    target.addEventListener(BEFORE_MORPH_ATTRIBUTE, this.#handleBeforeMorphAttribute);
     this.#observedTargets.add(target);
   }
   unobserve(target) {
     if (!this.#observedTargets.delete(target)) return;
-    target.removeEventListener("compositionstart", this.#handleStart);
-    target.removeEventListener("compositionend", this.#handleEnd);
-    target.removeEventListener("keydown", this.#handleKeydown);
-    this.#activeTargets.delete(target);
+    this.#release(target);
+    if (this.#composition?.target === target) this.#letGo();
     if (this.#confirmedTarget === target) this.#confirmedTarget = null;
   }
   disconnect() {
-    for (const target of this.#observedTargets) {
-      target.removeEventListener("compositionstart", this.#handleStart);
-      target.removeEventListener("compositionend", this.#handleEnd);
-      target.removeEventListener("keydown", this.#handleKeydown);
-    }
+    this.#connected = false;
+    for (const target of this.#observedTargets) this.#release(target);
     this.#observedTargets.clear();
-    this.#activeTargets.clear();
+    this.#letGo();
     this.#confirmedTarget = null;
+    this.#keyComposing = false;
+    this.#abandoned = null;
   }
   isComposing(event) {
-    return this.#activeTargets.size > 0 || event?.isComposing === true;
+    this.#settle();
+    return event?.isComposing === true || this.#composition !== null;
+  }
+  composingElement() {
+    this.#settle();
+    return this.#composition?.element ?? null;
+  }
+  owns(event) {
+    const element = this.composingElement();
+    return event.isComposing === true || element !== null && element === event.target;
   }
   consumesConfirmedInput(event) {
     const confirmed = this.#confirmedTarget;
     this.#confirmedTarget = null;
     if (confirmed === null || confirmed !== event.target) return false;
     const inputType = event.inputType;
-    return !inputType || COMPOSITION_INPUT_TYPES.has(inputType);
+    return !inputType || isCompositionInputType(inputType);
+  }
+  #release(target) {
+    target.removeEventListener("compositionstart", this.#handleStart);
+    target.removeEventListener("compositionend", this.#handleEnd);
+    target.removeEventListener("keydown", this.#handleKeydown, true);
+    target.removeEventListener("beforeinput", this.#handleBeforeInput, true);
+    target.removeEventListener("input", this.#handleInput, true);
+    target.removeEventListener("blur", this.#handleBlur, true);
+    target.removeEventListener(BEFORE_MORPH_ATTRIBUTE, this.#handleBeforeMorphAttribute);
+  }
+  #letGo() {
+    const composition = this.#composition;
+    if (composition === null) return;
+    if (!holdsFocus(composition.element)) {
+      this.#composition = null;
+      return;
+    }
+    queueMicrotask(() => {
+      if (this.#composition !== composition || this.#observedTargets.has(composition.target)) {
+        return;
+      }
+      this.#composition = null;
+      if (!this.#connected) return;
+      this.#abandoned = { element: composition.element, inPlace: true };
+      this.#runAbandon();
+    });
+  }
+  #settle() {
+    const composition = this.#composition;
+    if (composition === null) return;
+    const { target, element, text } = composition;
+    if (target instanceof Node && element instanceof Node && !target.contains(element)) {
+      this.#composition = null;
+    } else if (textOf(element) !== text) {
+      this.#abandon(false);
+    }
+  }
+  #abandon(inPlace) {
+    this.#owe(inPlace);
+    this.#composition = null;
+    queueMicrotask(this.#runAbandon);
   }
+  #owe(inPlace) {
+    const composition = this.#composition;
+    if (composition !== null) this.#abandoned = { element: composition.element, inPlace };
+  }
+  #runAbandon = () => {
+    const abandoned = this.#abandoned;
+    if (abandoned === null) return;
+    this.#abandoned = null;
+    this.#onAbandon?.(abandoned.element, abandoned.inPlace);
+  };
   #handleStart = (event) => {
     this.#confirmedTarget = null;
-    if (event.currentTarget) this.#activeTargets.add(event.currentTarget);
+    this.#settle();
+    this.#owe(true);
+    const target = event.currentTarget;
+    const element = event.target;
+    this.#composition = { target, element, text: textOf(element) };
+    this.#runAbandon();
     this.#onStart?.(event);
   };
   #handleEnd = (event) => {
-    if (event.currentTarget) this.#activeTargets.delete(event.currentTarget);
+    this.#runAbandon();
+    if (this.#composition?.target === event.currentTarget) this.#composition = null;
     this.#confirmedTarget = event.target;
     this.#onEnd?.(event);
   };
-  #handleKeydown = () => {
+  #handleKeydown = (event) => {
+    this.#settle();
+    this.#runAbandon();
     this.#confirmedTarget = null;
+    this.#keyComposing = event.isComposing === true;
+  };
+  #handleBeforeInput = (event) => {
+    const keyComposing = this.#keyComposing;
+    this.#keyComposing = false;
+    this.#settle();
+    const { isComposing, inputType } = event;
+    if (this.#composition !== null && !keyComposing && !isComposing && inputType && !isCompositionInputType(inputType)) {
+      this.#abandon(true);
+    }
+    this.#runAbandon();
+  };
+  #handleInput = (event) => {
+    const composition = this.#composition;
+    const { isTrusted, isComposing, inputType } = event;
+    if (composition !== null && event.target === composition.element && (isTrusted || isComposing || isCompositionInputType(inputType))) {
+      composition.text = textOf(composition.element);
+    } else {
+      this.#settle();
+    }
+    this.#runAbandon();
+  };
+  #handleBlur = (event) => {
+    this.#settle();
+    this.#runAbandon();
+    const composition = this.#composition;
+    if (composition === null || composition.target === composition.element) return;
+    const { element } = composition;
+    if (!(element instanceof Node) || event.target !== element) return;
+    const root = element.getRootNode();
+    if (root.activeElement !== element) this.#composition = null;
+  };
+  #handleBeforeMorphAttribute = (event) => {
+    this.#settle();
+    const composition = this.#composition;
+    if (composition?.target !== event.currentTarget || event.target !== composition.element) return;
+    const detail = event.detail;
+    if (detail?.attributeName === "value") event.preventDefault();
   };
 };
 
@@ -256,6 +382,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;
@@ -286,6 +415,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();
@@ -393,36 +525,57 @@ var CharacterCounterController = class _CharacterCounterController extends Contr
   );
   #repaint = new MorphRenderWatcher(() => this.#reconcile(true));
   #composition = new CompositionTracker({
-    onEnd: (event) => this.#commitFrom(event.currentTarget)
+    onStart: (event) => {
+      if (event.target === this.#acceptedOwed && this.#field === this.#boundField) {
+        this.#reconcileAccepted();
+      }
+    },
+    onEnd: (event) => this.#commitFrom(event.currentTarget),
+    onAbandon: () => {
+      const first = this.#field === this.#boundField;
+      if (this.#reconcileHeld && first) this.#recount(true, this.#owedField);
+      else if (first && !this.#repaint.pending) this.#reconcileAccepted();
+      else {
+        if (!this.#reconcileHeld) this.#acceptedOwed = this.#boundField;
+        this.#repaint.schedule();
+      }
+    }
   });
+  #acceptedOwed = null;
+  #reconcileHeld = false;
+  #accepted = /* @__PURE__ */ new WeakMap();
   #announceId = null;
   #boundField = null;
-  #lastLength = null;
+  #fieldListeners = new ListenerSet();
   #lastDetail = null;
   #reflectedOver = null;
   #onInput = (event) => {
     const field = this.#boundField;
     if (!field || event.currentTarget !== field || this.#field !== field) return;
     if (this.#composition.consumesConfirmedInput(event)) return;
-    if (this.#composition.isComposing(event)) return;
+    const composing = this.#composition.composingElement() === field;
+    if (composing || event.isComposing === true) return;
     this.#commit(field);
   };
   connect() {
+    this.#observeFields();
     this.#repaint.observe(this.element);
     this.#reconcile(false);
   }
   disconnect() {
     this.#repaint.disconnect();
-    this.#cancelAnnouncement();
     this.#bindField(null);
+    this.#composition.disconnect();
     this.#clearStateHooks();
-    this.#lastLength = null;
     this.#lastDetail = null;
   }
   inputTargetConnected() {
+    this.#observeFields();
     this.#repaint.schedule();
   }
-  inputTargetDisconnected() {
+  inputTargetDisconnected(element) {
+    this.#composition.unobserve(element);
+    if (element === this.#boundField) this.#composition.observe(element);
     this.#repaint.schedule();
   }
   outputTargetConnected() {
@@ -440,25 +593,33 @@ var CharacterCounterController = class _CharacterCounterController extends Contr
   modeValueChanged() {
     this.#repaint.schedule();
   }
-  announceTextValueChanged() {
-    this.#repaint.schedule();
-  }
   #reconcile(report) {
-    const previous = this.#lastDetail;
-    const owedField = this.#announceId === null ? null : this.#boundField;
-    this.#cancelAnnouncement();
+    const owedField = this.#owedField;
     this.#bindField(this.#field);
-    if (this.#composition.isComposing()) return;
+    this.#recount(report, owedField);
+  }
+  get #owedField() {
+    return this.#announceId === null ? null : this.#boundField;
+  }
+  #recount(report, owedField) {
+    const owed = this.#acceptedOwed;
+    this.#acceptedOwed = null;
+    const previous = this.#lastDetail;
     const field = this.#boundField;
+    if (field !== null && this.#composition.composingElement() === field) {
+      this.#reconcileHeld = this.#accepted.get(field)?.declared !== this.#declared;
+      this.#showAgain(field);
+      if (owed === field) this.#reconcileAccepted();
+      return;
+    }
+    this.#reconcileHeld = false;
     if (!field) {
       this.#renderEmpty();
-      this.#lastLength = null;
       this.#lastDetail = null;
       return;
     }
     const reading = this.#render(field);
     const detail = this.#detail(reading);
-    this.#lastLength = reading.length;
     this.#lastDetail = detail;
     if (owedField === field) this.#scheduleAnnouncement(reading);
     if (report && previous && this.#detailsDiffer(previous, detail)) {
@@ -471,20 +632,22 @@ var CharacterCounterController = class _CharacterCounterController extends Contr
     this.#commit(field);
   }
   #commit(field) {
+    const held = this.#reconcileHeld;
+    this.#reconcileHeld = false;
+    const previousLength = this.#accepted.get(field)?.length ?? null;
     const reading = this.#render(field);
-    const previousLength = this.#lastLength;
     const previousDetail = this.#lastDetail;
     const detail = this.#detail(reading);
-    this.#lastLength = reading.length;
     this.#lastDetail = detail;
     if (previousLength === reading.length) {
       if (previousDetail && this.#detailsDiffer(previousDetail, detail)) {
         this.dispatch("reconcile", { detail });
       }
+      if (held && this.#owedField === field) this.#scheduleAnnouncement(reading);
       return;
     }
     this.dispatch("change", { detail });
-    this.#scheduleAnnouncement(reading);
+    if (this.#boundField === field && this.#field === field) this.#scheduleAnnouncement(reading);
   }
   #detail(reading) {
     return {
@@ -508,26 +671,56 @@ var CharacterCounterController = class _CharacterCounterController extends Contr
     this.#reflectInvalid(field, over);
     const text = this.#format(length, remaining, max);
     this.#writeOutput(text);
+    this.#accepted.set(field, {
+      text,
+      over,
+      near,
+      length,
+      detail: { length, remaining, over },
+      declared: this.#declared
+    });
     return { length, remaining, over, max, text };
   }
+  #showAgain(field) {
+    const shown = this.#accepted.get(field);
+    if (shown === void 0) return;
+    this.#lastDetail ??= shown.detail;
+    this.#toggle("data-over-limit", shown.over);
+    this.#toggle("data-near-limit", shown.near);
+    this.#reflectInvalid(field, shown.over);
+    this.#writeOutput(shown.text);
+  }
+  #reconcileAccepted() {
+    const previous = this.#lastDetail;
+    const field = this.#boundField;
+    const accepted = field && this.#accepted.get(field)?.detail;
+    if (!previous || !accepted || !this.#detailsDiffer(previous, accepted)) return;
+    this.#lastDetail = accepted;
+    this.dispatch("reconcile", { detail: accepted });
+  }
   #renderEmpty() {
     this.#reflectedOver = null;
     this.#clearStateHooks();
     this.#writeOutput("");
   }
+  #observeFields() {
+    for (const input of this.inputTargets) this.#composition.observe(input);
+  }
   #bindField(field) {
     if (field === this.#boundField) return;
     const previous = this.#boundField;
     if (previous) {
-      previous.removeEventListener("input", this.#onInput);
-      this.#composition.unobserve(previous);
+      this.#fieldListeners.dispose();
+      if (previous !== this.element && !this.inputTargets.includes(previous)) {
+        this.#composition.unobserve(previous);
+      }
       this.#ariaInvalid.return(previous);
     }
+    this.#cancelAnnouncement();
     this.#boundField = field;
-    this.#lastLength = null;
     this.#reflectedOver = null;
     if (!field) return;
-    field.addEventListener("input", this.#onInput);
+    this.#fieldListeners.add(field, "input", this.#onInput);
     this.#composition.observe(field);
   }
   #reflectInvalid(field, over) {
@@ -549,16 +742,16 @@ var CharacterCounterController = class _CharacterCounterController extends Contr
   }
   #scheduleAnnouncement(reading) {
     this.#cancelAnnouncement();
-    const message = fillTemplate(this.announceTextValue, {
+    const message = () => fillTemplate(this.announceTextValue, {
       count: reading.text,
       length: reading.length,
       remaining: reading.remaining ?? "",
       max: reading.max,
       over: String(reading.over)
     });
-    if (message.trim().length === 0) return;
+    if (message().trim().length === 0) return;
     this.#announceId = this.#timeouts.set(() => {
-      announce(message);
+      announce(message());
       this.#announceId = null;
     }, _CharacterCounterController.#announceDelay);
   }
@@ -571,11 +764,7 @@ var CharacterCounterController = class _CharacterCounterController extends Contr
     this.outputTarget.textContent = text;
   }
   #toggle(name, on) {
-    if (on) {
-      if (this.element.getAttribute(name) !== "true") this.element.setAttribute(name, "true");
-    } else if (this.element.hasAttribute(name)) {
-      this.element.removeAttribute(name);
-    }
+    setAttributeIfChanged(this.element, name, on ? "true" : null);
   }
   #clearStateHooks() {
     this.#toggle("data-over-limit", false);
@@ -588,6 +777,13 @@ var CharacterCounterController = class _CharacterCounterController extends Contr
     if (this.modeValue === "used" || this.modeValue === "both") return this.modeValue;
     return "remaining";
   }
+  get #declared() {
+    return [
+      this.#normalizeCount(this.#safeMax),
+      this.#normalizeCount(this.#safeWarnAt),
+      this.#mode
+    ].join();
+  }
   get #field() {
     if (this.hasInputTarget) return this.inputTarget;
     const element = this.element;