attaform 0.27.4 → 0.27.5

package/dist/shared/{attaform.Ib2seKUE.cjs → attaform.Cg1rUfcF.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 const vue = require('vue');
-const devtoolsShared = require('./attaform.BBaMFa-k.cjs');
+const devtoolsShared = require('./attaform.Biytrv0-.cjs');
 const registerProtocol = require('./attaform.yUrz7C2z.cjs');
 
 function safeAssign(target, key, value) {
@@ -2509,8 +2509,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(
@@ -4068,6 +4068,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;
@@ -4253,6 +4272,7 @@ function createFormStore(options) {
   const fields = vue.reactive(/* @__PURE__ */ new Map());
   const elements = vue.reactive(/* @__PURE__ */ new Map());
   const elementToFormInstance = /* @__PURE__ */ new WeakMap();
+  const hostTargets = /* @__PURE__ */ new Map();
   let sortedRegistrationsCache = null;
   const schemaErrors = vue.reactive(/* @__PURE__ */ new Map());
   const userErrors = vue.reactive(/* @__PURE__ */ new Map());
@@ -5125,6 +5145,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, {
@@ -5162,10 +5183,14 @@ function createFormStore(options) {
       blurred: current?.blurred ?? true
     });
   }
-  function markHostConnected(path, connected) {
+  function markHostConnected(path, connected, hostEl, formInstanceId) {
     const { key } = devtoolsShared.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,
@@ -5173,6 +5198,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 });
     }
@@ -5507,18 +5533,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
@@ -7613,4 +7656,4 @@ exports.unset = unset;
 exports.useAbstractForm = useAbstractForm;
 exports.useRegister = useRegister;
 exports.useWizard = useWizard;
-//# sourceMappingURL=attaform.Ib2seKUE.cjs.map
+//# sourceMappingURL=attaform.Cg1rUfcF.cjs.map