attaform 0.27.3 → 0.27.5

package/dist/shared/{attaform.BqkFQ2B9.mjs → attaform.BypWgXRB.mjs}

@@ -1,5 +1,5 @@
 import { computed, ref, watchEffect, getCurrentScope, onScopeDispose, shallowReadonly, nextTick, warn, readonly, toRaw, reactive, toValue, watch, markRaw, triggerRef, shallowRef, getCurrentInstance, onServerPrefetch, provide, useId, inject, onBeforeMount, onBeforeUpdate, onMounted, effectScope } from 'vue';
-import { n as pathsEqual, k as isPathPrefix, _ as __DEV__, f as canonicalizePath, s as segmentsForPathKey, o as keyForSegments, b as ROOT_PATH_KEY, S as SubmitErrorHandlerError, t as toError, q as normalizeErrorInput, w as INTERACTIVE_TAG_NAMES, R as ROOT_PATH, x as normalizeErrorInputs, y as coerceToPathKey, a as InvalidUseFormConfigError, z as ensureAttaformInstalled, u as useRegistry, B as kFormContext, C as kFormInstanceId, d as ReservedFormKeyError, m as kAttaformWizardActiveStepResolver, E as kAttaformAncestorWizard } from './attaform.CgsQZdy1.mjs';
+import { n as pathsEqual, k as isPathPrefix, _ as __DEV__, f as canonicalizePath, s as segmentsForPathKey, o as keyForSegments, b as ROOT_PATH_KEY, S as SubmitErrorHandlerError, t as toError, q as normalizeErrorInput, w as INTERACTIVE_TAG_NAMES, R as ROOT_PATH, x as normalizeErrorInputs, y as coerceToPathKey, a as InvalidUseFormConfigError, z as ensureAttaformInstalled, u as useRegistry, B as kFormContext, C as kFormInstanceId, d as ReservedFormKeyError, m as kAttaformWizardActiveStepResolver, E as kAttaformAncestorWizard } from './attaform.nMaz2C5P.mjs';
 import { R as REGISTER_OWNER_MARKER, b as V_REGISTER_MARKER } from './attaform.KvlEedlF.mjs';
 
 function safeAssign(target, key, value) {
@@ -2507,8 +2507,8 @@ function buildRegister(state, formInstanceId, instanceConfig) {
       markConnectedOptimistically: () => {
         state.markConnectedOptimistically(segments);
       },
-      markHostConnected: (connected) => {
-        state.markHostConnected(segments, connected);
+      markHostConnected: (connected, hostEl) => {
+        state.markHostConnected(segments, connected, hostEl, formInstanceId);
       },
       markFocused: (focused) => {
         state.markFocused(
@@ -4066,6 +4066,25 @@ function mergeObjectKeys(target, source, path, schema) {
 }
 
 const isContainer = (value) => Array.isArray(value) || isPlainRecord(value);
+const HOST_FOCUS_TARGET_SELECTOR = [
+  'input:not([type="hidden"])',
+  "select",
+  "textarea",
+  "button",
+  "a[href]",
+  '[tabindex]:not([tabindex="-1"])',
+  '[contenteditable="true"]'
+].join(", ");
+function resolveHostFocusTarget(hostRoot) {
+  const candidates = hostRoot.querySelectorAll(HOST_FOCUS_TARGET_SELECTOR);
+  for (const el of candidates) {
+    if (!el.isConnected) continue;
+    if (el.offsetParent === null) continue;
+    if (el.matches(":disabled")) continue;
+    return el;
+  }
+  return hostRoot;
+}
 function isHydratedFieldRecord(value) {
   if (typeof value !== "object" || value === null) return false;
   const r = value;
@@ -4251,6 +4270,7 @@ function createFormStore(options) {
   const fields = reactive(/* @__PURE__ */ new Map());
   const elements = reactive(/* @__PURE__ */ new Map());
   const elementToFormInstance = /* @__PURE__ */ new WeakMap();
+  const hostTargets = /* @__PURE__ */ new Map();
   let sortedRegistrationsCache = null;
   const schemaErrors = reactive(/* @__PURE__ */ new Map());
   const userErrors = reactive(/* @__PURE__ */ new Map());
@@ -5123,6 +5143,7 @@ function createFormStore(options) {
       record.elements.add(raw);
     }
     elementToFormInstance.set(element, formInstanceId);
+    hostTargets.delete(key);
     sortedRegistrationsCache = null;
     const current = fields.get(key);
     touchFieldRecord(key, path, {
@@ -5160,10 +5181,14 @@ function createFormStore(options) {
       blurred: current?.blurred ?? true
     });
   }
-  function markHostConnected(path, connected) {
+  function markHostConnected(path, connected, hostEl, formInstanceId) {
     const { key } = canonicalizePath(path);
     const current = fields.get(key);
     if (connected) {
+      if (!elements.has(key)) {
+        hostTargets.set(key, { path, hostRoot: hostEl, formInstanceId });
+        sortedRegistrationsCache = null;
+      }
       if (current?.connected === true) return;
       touchFieldRecord(key, path, {
         connected: true,
@@ -5171,6 +5196,7 @@ function createFormStore(options) {
         blurred: current?.blurred ?? true
       });
     } else {
+      if (hostTargets.delete(key)) sortedRegistrationsCache = null;
       if (current?.connected !== true) return;
       touchFieldRecord(key, path, { connected: false, focused: null, blurred: null });
     }
@@ -5505,18 +5531,35 @@ function createFormStore(options) {
   function getFirstErrorElement(formInstanceId) {
     sortedRegistrationsCache ?? (sortedRegistrationsCache = rebuildSortedRegistrations());
     for (const entry of sortedRegistrationsCache) {
-      if (elementToFormInstance.get(entry.element) !== formInstanceId) continue;
+      if (entry.formInstanceId !== formInstanceId) continue;
       if (!entry.element.isConnected) continue;
       if (entry.element.offsetParent === null) continue;
       if (getErrorsForPath(entry.path).length === 0) continue;
-      return { path: entry.path, element: entry.element };
+      const element = entry.host ? resolveHostFocusTarget(entry.element) : entry.element;
+      return { path: entry.path, element };
     }
     return null;
   }
   function rebuildSortedRegistrations() {
     const flat = [];
     for (const [, record] of elements) {
-      for (const el of record.elements) flat.push({ path: record.path, element: el });
+      for (const el of record.elements) {
+        flat.push({
+          path: record.path,
+          element: el,
+          host: false,
+          formInstanceId: elementToFormInstance.get(el) ?? ""
+        });
+      }
+    }
+    for (const [key, target] of hostTargets) {
+      if (elements.has(key)) continue;
+      flat.push({
+        path: target.path,
+        element: target.hostRoot,
+        host: true,
+        formInstanceId: target.formInstanceId
+      });
     }
     flat.sort(
       (a, b) => a.element.compareDocumentPosition(b.element) & Node.DOCUMENT_POSITION_FOLLOWING ? -1 : 1
@@ -6687,24 +6730,6 @@ function useWizard(options) {
     (slot) => isGateMarker(slot) || isLazyMarker(slot) || typeof slot === "function"
   );
   const clearedGates = reactive(/* @__PURE__ */ new Set());
-  const seededSampled = /* @__PURE__ */ new Set();
-  function isGateVerdictSettled(key) {
-    const store = registry.forms.get(key);
-    if (store === void 0) return false;
-    return store.defaultsResolved.value === true && store.firstValidationDone.value === true && store.activeValidations.value === 0;
-  }
-  function isGateFormValid(key) {
-    const form = formsRecord.value[key] ?? formsAccumulator.get(key);
-    if (form === void 0) return false;
-    return asStatusSource(form).meta?.valid ?? false;
-  }
-  function sampleSeededGate(key) {
-    if (seededSampled.has(key)) return;
-    if (noopForms.has(key)) return;
-    if (!isGateVerdictSettled(key)) return;
-    seededSampled.add(key);
-    if (isGateFormValid(key)) clearedGates.add(key);
-  }
   const gateSubs = /* @__PURE__ */ new Map();
   function reconcileGates() {
     const gateKeys = /* @__PURE__ */ new Set();
@@ -6721,7 +6746,6 @@ function useWizard(options) {
           );
         }
       }
-      sampleSeededGate(key);
     }
     for (const [key, unsub] of gateSubs) {
       if (!gateKeys.has(key)) {
@@ -6779,8 +6803,7 @@ function useWizard(options) {
         for (const step of compiledSteps.value) {
           if (!step.isGate) continue;
           const store = registry.forms.get(step.key);
-          const settled = store !== void 0 && isGateVerdictSettled(step.key);
-          parts.push(`${step.key}:${store !== void 0 ? 1 : 0}:${settled ? 1 : 0}`);
+          parts.push(`${step.key}:${store !== void 0 ? 1 : 0}`);
         }
         return parts.join("|");
       },
@@ -6813,20 +6836,30 @@ function useWizard(options) {
       });
     }
   }
+  function applyGateSeed(map) {
+    if (map === void 0 || !mightGate) return;
+    const gates = gatePositions.value;
+    for (const key of Object.keys(map)) {
+      if (map[key]?.gate === "cleared" && gates.includes(key)) clearedGates.add(key);
+    }
+  }
   const seedRef = ref(void 0);
   const seedInput = options.defaultStatuses;
   if (seedInput !== void 0) {
     const resolved = resolveTrichotomy(seedInput);
     if (resolved.kind === "sync") {
       seedRef.value = resolved.value;
+      applyGateSeed(resolved.value);
     } else {
       const eager = resolved.factory();
       if (eager instanceof Promise) {
         void eager.then((value) => {
           seedRef.value = value;
+          applyGateSeed(value);
         });
       } else {
         seedRef.value = eager;
+        applyGateSeed(eager);
       }
     }
   }
@@ -6858,7 +6891,7 @@ function useWizard(options) {
         return locked || gate !== null ? { ...NOOP_VALID_STATUS, locked, gate } : NOOP_VALID_STATUS;
       }
       const seed = seedRef.value?.[form.key];
-      if (seed !== void 0) return { ...seed, locked, gate };
+      if (seed !== void 0) return { ...PENDING_STATUS, ...seed, locked, gate };
       return locked || gate !== null ? { ...PENDING_STATUS, locked, gate } : PENDING_STATUS;
     });
     statusCache.set(form.key, computedStatus);
@@ -7350,14 +7383,16 @@ function useWizard(options) {
     submitError.value = null;
     if (mightGate) {
       clearedGates.clear();
-      seededSampled.clear();
     }
     lazyEpoch.value += 1;
     for (const step of compiledSteps.value) {
       const full = asSubmissionSource(step.form);
       if (typeof full.reset === "function") full.reset();
     }
-    if (mightGate) reconcileGates();
+    if (mightGate) {
+      reconcileGates();
+      applyGateSeed(seedRef.value);
+    }
     const firstStep = compiledSteps.value[0];
     if (firstStep !== void 0) {
       const landing = commitActiveKey(firstStep.key);
@@ -7368,6 +7403,29 @@ function useWizard(options) {
       }
     }
   }
+  async function relock(key, commit) {
+    if (!mightGate || !gatePositions.value.includes(key)) {
+      if (__DEV__) {
+        console.warn(
+          `[attaform] useWizard.relock(${JSON.stringify(key)}): no gate at that key; nothing to re-lock.`
+        );
+      }
+      return false;
+    }
+    try {
+      await commit();
+    } catch (err) {
+      if (__DEV__) {
+        console.warn(
+          `[attaform] useWizard.relock(${JSON.stringify(key)}): commit threw, so the gate was not re-sealed.`,
+          err
+        );
+      }
+      return false;
+    }
+    clearedGates.delete(key);
+    return true;
+  }
   if (mightGate) {
     watchEffect(() => {
       const key = activeKey.value;
@@ -7393,6 +7451,7 @@ function useWizard(options) {
     tryNext,
     handleSubmit,
     reset,
+    relock,
     get currentStep() {
       return currentStep.value;
     },
@@ -7573,4 +7632,4 @@ function escapeForInlineScript(json) {
 }
 
 export { AttaformErrorCode as A, DEFAULT_TIMINGS as D, defaultDisplayState as a, defineCoercion as b, injectWizard as c, defaultCoercionRules as d, escapeForInlineScript as e, isUnset as f, gate as g, useAbstractForm as h, injectForm as i, useRegister as j, useWizard as k, lazy as l, makeDefaultDisplayState as m, isPlainRecord as n, safeAssign as o, slimKindOf as p, humanize as q, getAtPath as r, safeOwnRead as s, setAtPath as t, unset as u };
-//# sourceMappingURL=attaform.BqkFQ2B9.mjs.map
+//# sourceMappingURL=attaform.BypWgXRB.mjs.map