stimeo-ui 0.17.0 → 0.18.0

data/dist/controllers/switch_controller.js

@@ -1,5 +1,103 @@
 import { Controller } from '@hotwired/stimulus';
 
+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;
+}
+
+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;
+  }
+};
+
 function setDefaultAttribute(element, name, value) {
   if (element.hasAttribute(name)) return false;
   element.setAttribute(name, value);
@@ -41,6 +139,17 @@ function isInteractiveHost(element) {
   return false;
 }
 
+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;
@@ -57,6 +166,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;
@@ -69,6 +181,34 @@ var MicrotaskCoalescer = class {
   }
 };
 
+var MorphRenderWatcher = class {
+  #listeners = new ListenerSet();
+  #pass;
+  #element = null;
+  #onMorph = () => this.#pass.schedule();
+  constructor(run) {
+    this.#pass = new MicrotaskCoalescer(run);
+  }
+  observe(element) {
+    if (this.#element === element) return;
+    this.disconnect();
+    this.#element = element;
+    this.#pass.activate();
+    this.#listeners.add(element, "turbo:morph-element", this.#onMorph);
+  }
+  schedule() {
+    this.#pass.schedule();
+  }
+  get pending() {
+    return this.#pass.pending;
+  }
+  disconnect() {
+    this.#listeners.dispose();
+    this.#pass.cancel();
+    this.#element = null;
+  }
+};
+
 var MoveCounter = class {
   #sequence = 0;
   record() {
@@ -92,14 +232,14 @@ var OBSERVED_ATTRIBUTES = [
 var OBSERVED_ANCESTOR_ATTRIBUTES = ["contenteditable"];
 var SwitchController = class extends Controller {
   #moves = new MoveCounter();
+  #connectionGeneration = 0;
   static targets = ["field"];
   static actions = ["onKeydown", "toggle"];
   static events = ["change", "reconcile"];
   #ownedDefaults = /* @__PURE__ */ new Map();
-  #internalAttributeValues = /* @__PURE__ */ new Map();
-  #pass = new MicrotaskCoalescer(() => this.#reconcile());
+  #pass = new MorphRenderWatcher(() => this.#reconcile());
   #committedChecked = false;
-  #attributeObserver = new MutationObserver((records) => {
+  #attributeObserver = new AuthoredMutationWatcher((records) => {
     this.#releaseAuthoredDefaults(records);
     this.#pass.schedule();
   });
@@ -108,13 +248,14 @@ var SwitchController = class extends Controller {
     event.preventDefault();
     event.stopImmediatePropagation();
   };
+  #listeners = new ListenerSet();
   connect() {
     this.#releaseDefaultsRewrittenWhileAway();
     this.#reconcileDefaults();
     this.#mirrorField(false);
     this.#committedChecked = this.#checked;
-    this.element.addEventListener("click", this.#onClickCapture, true);
-    this.#pass.activate();
+    this.#listeners.add(this.element, "click", this.#onClickCapture, { capture: true });
+    this.#pass.observe(this.element);
     this.#observeAttributes();
   }
   fieldTargetConnected() {
@@ -124,10 +265,10 @@ var SwitchController = class extends Controller {
     this.#pass.schedule();
   }
   disconnect() {
-    this.#pass.cancel();
-    this.element.removeEventListener("click", this.#onClickCapture, true);
+    this.#connectionGeneration += 1;
+    this.#pass.disconnect();
+    this.#listeners.dispose();
     this.#attributeObserver.disconnect();
-    this.#internalAttributeValues.clear();
   }
   toggle() {
     if (!this.#isSupportedHost || this.#isActivationDisabled) return;
@@ -151,11 +292,12 @@ var SwitchController = class extends Controller {
     this.toggle();
   }
   #reconcile() {
-    this.#releaseAuthoredDefaults(this.#attributeObserver.takeRecords());
-    this.#attributeObserver.disconnect();
+    this.#releaseAuthoredDefaults(this.#attributeObserver.take());
     this.#reconcileDefaults();
     this.#mirrorField(false);
-    this.#observeAttributes();
+    const authored = this.#attributeObserver.take();
+    this.#releaseAuthoredDefaults(authored);
+    if (authored.length > 0) this.#pass.schedule();
     this.#reportMove();
   }
   #reportMove() {
@@ -181,7 +323,10 @@ var SwitchController = class extends Controller {
     if (moved && notify) commitField(this.fieldTarget);
   }
   #setOwnedDefault(name, value) {
-    if (setDefaultAttribute(this.element, name, value)) this.#ownedDefaults.set(name, value);
+    if (setDefaultAttribute(this.element, name, value)) {
+      this.#ownedDefaults.set(name, value);
+      this.#attributeObserver.claimCurrent(this.element, name);
+    }
   }
   #releaseDefaultsRewrittenWhileAway() {
     for (const [name, written] of this.#ownedDefaults) {
@@ -195,31 +340,22 @@ var SwitchController = class extends Controller {
         const name = record.attributeName;
         if (name && this.#ownedDefaults.has(name)) {
           const value = this.element.getAttribute(name);
-          if (value !== null && this.#internalAttributeValues.get(name) !== value) {
+          if (value !== null) {
             this.#ownedDefaults.delete(name);
           }
         }
       }
     }
-    this.#internalAttributeValues.clear();
   }
   #removeOwnedDefaults() {
-    for (const name of this.#ownedDefaults.keys()) this.element.removeAttribute(name);
+    for (const name of this.#ownedDefaults.keys()) this.#writeAttribute(name, null);
     this.#ownedDefaults.clear();
   }
   #observeAttributes() {
     this.#attributeObserver.observe(this.element, {
-      attributes: true,
-      attributeFilter: OBSERVED_ATTRIBUTES
+      attributes: OBSERVED_ATTRIBUTES,
+      ancestorAttributes: OBSERVED_ANCESTOR_ATTRIBUTES
     });
-    let ancestor = this.element.parentElement;
-    while (ancestor) {
-      this.#attributeObserver.observe(ancestor, {
-        attributes: true,
-        attributeFilter: OBSERVED_ANCESTOR_ATTRIBUTES
-      });
-      ancestor = ancestor.parentElement;
-    }
   }
   get #isSupportedHost() {
     if (this.element instanceof HTMLButtonElement) return this.element.type === "button";
@@ -238,10 +374,13 @@ var SwitchController = class extends Controller {
     return this.element.getAttribute("aria-checked") === "true";
   }
   #commit(value) {
+    const generation = this.#connectionGeneration;
     const reflected = value ? "true" : "false";
-    this.#internalAttributeValues.set("aria-checked", reflected);
+    const authored = this.#attributeObserver.take();
+    this.#releaseAuthoredDefaults(authored);
+    if (authored.length > 0) this.#pass.schedule();
     if (this.#ownedDefaults.has("aria-checked")) this.#ownedDefaults.set("aria-checked", reflected);
-    this.element.setAttribute("aria-checked", reflected);
+    this.#writeAttribute("aria-checked", reflected);
     const changed = value !== this.#committedChecked;
     this.#committedChecked = value;
     if (!changed) {
@@ -250,9 +389,14 @@ var SwitchController = class extends Controller {
     }
     const token = this.#moves.record();
     this.#mirrorField(true);
-    if (!this.#moves.isLatest(token)) return;
+    if (generation !== this.#connectionGeneration || !this.#moves.isLatest(token)) return;
     this.dispatch("change", { detail: { checked: value } });
   }
+  #writeAttribute(name, value) {
+    setAttributeIfChanged(this.element, name, value, () => {
+      this.#attributeObserver.claim(this.element, name, value);
+    });
+  }
 };
 
 export { SwitchController };

data/dist/controllers/tabs_controller.js

@@ -30,6 +30,9 @@ 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 targetSelector(identifier, name) {
   return `[data-${identifier}-target~="${name}"]`;
@@ -62,11 +65,13 @@ var TabsController = class extends Controller {
   onKeydown(event) {
     if (event.defaultPrevented) return;
     if (isReservedArrowChord(event)) return;
+    if ((event.key === "Home" || event.key === "End") && hasModifierChord(event)) return;
     const tabs = this.tabTargets;
     const currentIndex = tabs.indexOf(event.currentTarget);
     if (currentIndex === -1) return;
     let nextIndex = null;
-    const step = isRtl(this.element) ? -1 : 1;
+    const directionElement = this.hasListTarget ? this.listTarget : this.element;
+    const step = isRtl(directionElement) ? -1 : 1;
     switch (event.key) {
       case "ArrowRight":
         nextIndex = (currentIndex + step + tabs.length) % tabs.length;

data/dist/controllers/tags_input_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);
-  });
-}
 
 function isRtl(element) {
   return window.getComputedStyle(element).direction === "rtl";
@@ -67,7 +68,7 @@ var RovingTabindex = class {
 };
 
 var ChipRow = class {
-  #directionElement;
+  #getDirectionElement;
   #getItems;
   #getButton;
   #onRemove;
@@ -75,7 +76,7 @@ var ChipRow = class {
   #roving = new RovingTabindex(() => this.buttons);
   #container = null;
   constructor(options) {
-    this.#directionElement = options.directionElement;
+    this.#getDirectionElement = options.getDirectionElement;
     this.#getItems = options.getItems;
     this.#getButton = options.getButton ?? ((item) => matchingPart(item, "button"));
     this.#onRemove = options.onRemove;
@@ -156,7 +157,7 @@ var ChipRow = class {
     if (!entry) return;
     const buttons = entry.buttons;
     const index = entry.buttonIndex;
-    switch (logicalArrowKey(event.key, this.#directionElement)) {
+    switch (logicalArrowKey(event.key, this.#getDirectionElement())) {
       case "ArrowLeft":
         if (index > 0) {
           event.preventDefault();
@@ -186,63 +187,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();
   };
 };
 
@@ -295,6 +415,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;
@@ -325,6 +448,9 @@ var MorphRenderWatcher = class {
   schedule() {
     this.#pass.schedule();
   }
+  get pending() {
+    return this.#pass.pending;
+  }
   disconnect() {
     this.#listeners.dispose();
     this.#pass.cancel();
@@ -481,7 +607,7 @@ var TagsInputController = class _TagsInputController extends Controller {
   });
   #reconcile = new MorphRenderWatcher(() => this.#reconcileTags());
   #chipRow = new ChipRow({
-    directionElement: this.element,
+    getDirectionElement: () => this.#chipDirectionElement,
     getItems: () => this.tagTargets,
     getButton: (tag) => matchingPart(tag, `button${this.#rows.selector("remove")}`),
     onRemove: (index) => this.#removeAt(index),
@@ -554,7 +680,7 @@ var TagsInputController = class _TagsInputController extends Controller {
       }
       return;
     }
-    if (logicalArrowKey(event.key, this.element) === "ArrowLeft" && this.inputTarget.value === "") {
+    if (logicalArrowKey(event.key, this.#chipDirectionElement) === "ArrowLeft" && this.inputTarget.value === "") {
       if (this.#chipRow.length > 0) {
         event.preventDefault();
         this.#chipRow.focusLast();
@@ -607,6 +733,9 @@ var TagsInputController = class _TagsInputController extends Controller {
     }
     if (!this.#chipRow.focusAfterRemoval(index)) this.#focusInput();
   }
+  get #chipDirectionElement() {
+    return this.hasTagsTarget ? this.tagsTarget : this.element;
+  }
   #focusInput() {
     if (this.hasInputTarget) this.inputTarget.focus();
   }