stimeo-ui 0.17.0 → 0.18.1

data/dist/controllers/dirty_form_controller.js

@@ -1,5 +1,35 @@
 import { Controller } from '@hotwired/stimulus';
 
+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;
+}
+
+var PREFIX = "__stimeo_raw_v1_";
+sharedRegistry(
+  "stimeo-ui.form-data-projection.registry.v1",
+  () => /* @__PURE__ */ new WeakMap()
+);
+function decodedName(key) {
+  if (!key.startsWith(PREFIX)) return null;
+  const separator = PREFIX.length + 32;
+  if (key[separator] !== ":") return null;
+  try {
+    const name = JSON.parse(key.slice(separator + 1));
+    return typeof name === "string" ? name : null;
+  } catch {
+    return null;
+  }
+}
+function projectedFieldName(name) {
+  return decodedName(name) ?? name;
+}
+
 var ListenerSet = class {
   #abort = new AbortController();
   add(target, type, handler, options) {
@@ -45,15 +75,29 @@ var SafeTimeout = class extends TimerRegistry {
   }
 };
 
-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;
-}
+var SubmissionOwner = class {
+  #synthetic = /* @__PURE__ */ Symbol("synthetic submission");
+  #active = null;
+  begin(event) {
+    this.#active = { source: event.target, token: this.#tokenOf(event) };
+  }
+  resolve(event) {
+    if (this.#active === null || this.#active.source !== event.target || this.#active.token !== this.#tokenOf(event)) {
+      return null;
+    }
+    this.clear();
+    return this.#detailOf(event)?.success === true;
+  }
+  clear() {
+    this.#active = null;
+  }
+  #tokenOf(event) {
+    return this.#detailOf(event)?.formSubmission ?? this.#synthetic;
+  }
+  #detailOf(event) {
+    return event.detail;
+  }
+};
 
 var TransientHooks = class {
   #attributes;
@@ -135,13 +179,13 @@ var DirtyFormController = class extends Controller {
   static events = ["dirty", "guard"];
   #baseline = "";
   #dirty = false;
-  #beforeunloadBound = false;
   #timeouts = new SafeTimeout();
   #listeners = new ListenerSet();
+  #unloadListeners = new ListenerSet();
+  #submission = new SubmissionOwner();
   #submitting = false;
   #submitAttempt = null;
   #submittedBaseline = null;
-  #activeSubmission = null;
   #unregisterVisit = null;
   #onFieldChange = () => {
     this.#submitting = false;
@@ -161,26 +205,19 @@ var DirtyFormController = class extends Controller {
     this.#submitAttempt.snapshot = this.#serialize();
   };
   #onSubmitStart = (event) => {
-    const detail = event.detail;
-    this.#activeSubmission = detail?.formSubmission ?? event;
+    if (!this.#ownsSource(event.target)) return;
+    this.#submission.begin(event);
     this.#submittedBaseline = this.#submitAttempt?.snapshot ?? this.#serialize();
     this.#submitAttempt = null;
     this.#submitting = this.#serialize() === this.#submittedBaseline;
   };
   #onSubmitEnd = (event) => {
-    const detail = event.detail;
-    if (detail?.formSubmission !== void 0 && (this.#activeSubmission === null || detail.formSubmission !== this.#activeSubmission)) {
-      return;
-    }
+    const success = this.#submission.resolve(event);
+    if (success === null) return;
     const submittedBaseline = this.#submittedBaseline;
     this.#submitting = false;
     this.#submittedBaseline = null;
-    this.#activeSubmission = null;
-    if (detail?.success === false) return;
-    if (submittedBaseline === null) {
-      this.markClean();
-      return;
-    }
+    if (!success || submittedBaseline === null) return;
     this.#baseline = submittedBaseline;
     this.#evaluate();
   };
@@ -199,6 +236,7 @@ var DirtyFormController = class extends Controller {
     this.#listeners.add(this.element, "formdata", this.#onFormData);
     this.#listeners.add(this.element, "turbo:submit-start", this.#onSubmitStart);
     this.#listeners.add(this.element, "turbo:submit-end", this.#onSubmitEnd);
+    this.#unregisterVisit?.();
     this.#unregisterVisit = registerVisitParticipant(this.element.ownerDocument, {
       form: this.element,
       evaluate: (event) => this.#evaluateVisit(event)
@@ -243,14 +281,10 @@ var DirtyFormController = class extends Controller {
     return { kind: "confirm", message: this.messageValue };
   }
   #bindBeforeUnload() {
-    if (this.#beforeunloadBound) return;
-    window.addEventListener("beforeunload", this.#onBeforeUnload);
-    this.#beforeunloadBound = true;
+    this.#unloadListeners.add(window, "beforeunload", this.#onBeforeUnload);
   }
   #unbindBeforeUnload() {
-    if (!this.#beforeunloadBound) return;
-    window.removeEventListener("beforeunload", this.#onBeforeUnload);
-    this.#beforeunloadBound = false;
+    this.#unloadListeners.dispose();
   }
   #guardSuppressed() {
     return this.#submitting && (this.#submitAttempt === null || !this.#submitAttempt.event.defaultPrevented);
@@ -260,7 +294,10 @@ var DirtyFormController = class extends Controller {
     this.#submitting = false;
     this.#submitAttempt = null;
     this.#submittedBaseline = null;
-    this.#activeSubmission = null;
+    this.#submission.clear();
+  }
+  #ownsSource(target) {
+    return target === this.element || target instanceof Element && target.closest("form") === this.element;
   }
   #serialize() {
     const parts = [];
@@ -280,7 +317,7 @@ var DirtyFormController = class extends Controller {
   }
   #nameOf(el) {
     if (el instanceof HTMLInputElement || el instanceof HTMLTextAreaElement || el instanceof HTMLSelectElement) {
-      return el.name || el.id || "";
+      return projectedFieldName(el.name) || el.id || "";
     }
     return null;
   }

data/dist/controllers/dismissible_controller.js

@@ -1,15 +1,26 @@
 import { Controller } from '@hotwired/stimulus';
 
+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";
 }
@@ -26,24 +37,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);
@@ -53,8 +86,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;
@@ -72,31 +105,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;
   }
@@ -105,7 +115,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,
@@ -135,15 +145,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);
   }
 };
 
@@ -231,6 +237,17 @@ function tabStopsWithin(root) {
   );
 }
 
+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 DismissibleController = class extends Controller {
   static targets = ["root", "fallback"];
   static values = {
@@ -241,6 +258,7 @@ var DismissibleController = class extends Controller {
   static events = ["dismiss"];
   #openDefault = new AttributeLease("data-state", this.identifier);
   #connected = false;
+  #escapeListeners = new ListenerSet();
   connect() {
     this.#establishOpen(this.#root);
     this.#syncEscapeListener();
@@ -248,7 +266,7 @@ var DismissibleController = class extends Controller {
   }
   disconnect() {
     this.#connected = false;
-    this.element.removeEventListener("keydown", this.#onKeydown);
+    this.#escapeListeners.dispose();
   }
   rootTargetConnected(root) {
     if (!this.#connected) return;
@@ -274,9 +292,9 @@ var DismissibleController = class extends Controller {
     this.#performDismiss();
   };
   #syncEscapeListener() {
-    this.element.removeEventListener("keydown", this.#onKeydown);
+    this.#escapeListeners.dispose();
     if (this.closeOnEscapeValue) {
-      this.element.addEventListener("keydown", this.#onKeydown);
+      this.#escapeListeners.add(this.element, "keydown", this.#onKeydown);
     }
   }
   #establishOpen(root) {
@@ -305,6 +323,8 @@ var DismissibleController = class extends Controller {
       if (document.activeElement === candidate) return;
     }
     document.body.focus();
+    const remaining = document.activeElement;
+    if (remaining instanceof HTMLElement && root.contains(remaining)) remaining.blur();
   }
   *#focusFallbacks(root) {
     const explicitFallback = this.hasFallbackTarget ? this.fallbackTarget : null;