@effect-app/vue-components 2.11.3 → 2.11.5

package/dist/vue-components.es6.js

@@ -1,9 +1,9 @@
-import { defineComponent as F, computed as o, useAttrs as M, inject as A, createBlock as u, openBlock as i, resolveDynamicComponent as S, withCtx as m, createCommentVNode as w, mergeProps as I, unref as L, createSlots as P, renderSlot as f, normalizeProps as c, guardReactiveProps as d } from "vue";
+import { defineComponent as M, computed as o, useAttrs as $, inject as k, createBlock as m, openBlock as i, resolveDynamicComponent as A, withCtx as s, createCommentVNode as S, mergeProps as w, unref as I, createSlots as P, renderSlot as u, normalizeProps as f, guardReactiveProps as c } from "vue";
 import { useIntl as j } from "./vue-components.es3.js";
 import { generateInputStandardSchemaFromFieldMeta as B } from "./vue-components.es12.js";
 import E from "./vue-components.es7.js";
 import { useErrorLabel as N } from "./vue-components.es10.js";
-const V = /* @__PURE__ */ F({
+const V = /* @__PURE__ */ M({
   inheritAttrs: !1,
   __name: "OmegaInput",
   props: {
@@ -13,55 +13,49 @@ const V = /* @__PURE__ */ F({
     name: {},
     inputClass: {}
   },
-  setup(a) {
-    const t = a, l = o(() => t.name), v = M(), p = o(() => {
-      if (t.inputClass !== null)
-        return t.inputClass !== void 0 ? t.inputClass : v.class;
-    }), g = A(
+  setup(r) {
+    const e = r, l = o(() => e.name), d = $(), p = o(() => {
+      if (e.inputClass !== null)
+        return e.inputClass !== void 0 ? e.inputClass : d.class;
+    }), v = k(
       "getMetaFromArray",
       null
-    ), n = o(() => {
-      const e = g?.value?.(t.name);
-      return e || t.form.meta[l.value];
-    }), $ = o(() => {
-      const e = n.value;
-      if (!e) return l.value;
-      const r = e;
-      return `${l.value}-${r.type}-${r.minLength ?? ""}-${r.maxLength ?? ""}-${r.minimum ?? ""}-${r.maximum ?? ""}`;
-    }), { trans: C } = j(), y = o(() => {
-      if (!n.value)
-        throw console.log(t.name, Object.keys(t.form.meta), t.form.meta), new Error("Meta is undefined");
-      return B(n.value, C);
-    }), b = N(t.form);
-    return (e, r) => (i(), u(S(a.form.Field), {
-      key: $.value,
-      name: a.name,
+    ), a = o(() => {
+      const t = v?.value?.(e.name);
+      return t || e.form.meta[l.value];
+    }), { trans: g } = j(), C = o(() => {
+      if (!a.value)
+        throw console.log(e.name, Object.keys(e.form.meta), e.form.meta), new Error("Meta is undefined");
+      return B(a.value, g);
+    }), b = N(e.form);
+    return (t, h) => (i(), m(A(r.form.Field), {
+      name: r.name,
       validators: {
-        onChange: y.value,
-        ...a.validators
+        onChange: C.value,
+        ...r.validators
       }
     }, {
-      default: m(({ field: h, state: k }) => [
-        n.value ? (i(), u(E, I({ key: 0 }, { ...e.$attrs, ...e.$props, inputClass: p.value }, {
-          field: h,
-          state: k,
-          register: a.form.registerField,
-          label: a.label ?? L(b)(l.value),
-          meta: n.value
+      default: s(({ field: y, state: F }) => [
+        a.value ? (i(), m(E, w({ key: 0 }, { ...t.$attrs, ...t.$props, inputClass: p.value }, {
+          field: y,
+          state: F,
+          register: r.form.registerField,
+          label: r.label ?? I(b)(l.value),
+          meta: a.value
         }), P({
-          default: m((s) => [
-            f(e.$slots, "default", c(d(s)))
+          default: s((n) => [
+            u(t.$slots, "default", f(c(n)))
           ]),
           _: 2
         }, [
-          e.$slots.label ? {
+          t.$slots.label ? {
             name: "label",
-            fn: m((s) => [
-              f(e.$slots, "label", c(d(s)))
+            fn: s((n) => [
+              u(t.$slots, "label", f(c(n)))
             ]),
             key: "0"
           } : void 0
-        ]), 1040, ["field", "state", "register", "label", "meta"])) : w("", !0)
+        ]), 1040, ["field", "state", "register", "label", "meta"])) : S("", !0)
       ]),
       _: 3
     }, 8, ["name", "validators"]));

package/dist/vue-components.es9.js

@@ -1,5 +1,5 @@
-import { defineComponent as s, watch as m, nextTick as i, renderSlot as o, createCommentVNode as r, normalizeProps as f, mergeProps as u } from "vue";
-const g = /* @__PURE__ */ s({
+import { defineComponent as r, watch as m, nextTick as o, renderSlot as u, createCommentVNode as i, normalizeProps as f, mergeProps as c } from "vue";
+const $ = /* @__PURE__ */ r({
   __name: "OmegaTaggedUnionInternal",
   props: {
     state: {},
@@ -10,18 +10,19 @@ const g = /* @__PURE__ */ s({
   setup(e) {
     const a = e;
     return m(() => a.state, (t, n) => {
-      t === null && a.field.setValue(null), t !== n && t && i(() => {
-        const l = {
-          ...a.form.unionDefaultValues?.[t] ?? {},
+      t === null && a.field.setValue(null), t !== n && t && o(() => {
+        const s = a.form.unionDefaultValues?.[t] ?? {}, l = {
+          ...a.form.state.values,
+          ...s,
           _tag: t
         };
         a.form.reset(l), setTimeout(() => {
           a.field.validate("change");
         }, 0);
       });
-    }, { immediate: !0 }), (t, n) => e.state ? o(t.$slots, `${e.name ? `${e.name}.` : ""}${e.state}`, f(u({ key: 0 }, { field: e.field, state: e.state }))) : r("", !0);
+    }, { immediate: !0 }), (t, n) => e.state ? u(t.$slots, `${e.name ? `${e.name}.` : ""}${e.state}`, f(c({ key: 0 }, { field: e.field, state: e.state }))) : i("", !0);
   }
 });
 export {
-  g as default
+  $ as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "2.11.3",
+  "version": "2.11.5",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.19.3",

package/src/components/OmegaForm/OmegaInput.vue

@@ -1,7 +1,6 @@
 <template>
   <component
     :is="form.Field"
-    :key="fieldKey"
     :name="name"
     :validators="{
       onChange: schema,
@@ -84,18 +83,6 @@ const meta = computed(() => {
   return formMeta
 })
 
-// Key to force Field re-mount when meta type changes (for TaggedUnion support)
-const fieldKey = computed(() => {
-  const m = meta.value
-  if (!m) return propsName.value
-  // Include type and key constraints in the key so Field re-mounts when validation rules change
-  // Cast to any since not all FieldMeta variants have these properties
-  const fm = m as any
-  return `${propsName.value}-${fm.type}-${fm.minLength ?? ""}-${fm.maxLength ?? ""}-${fm.minimum ?? ""}-${
-    fm.maximum ?? ""
-  }`
-})
-
 // Call useIntl during setup to avoid issues when computed re-evaluates
 const { trans } = useIntl()
 

package/src/components/OmegaForm/OmegaTaggedUnionInternal.vue

@@ -34,8 +34,11 @@ watch(() => props.state, (newTag, oldTag) => {
     nextTick(() => {
       // Get default values for the new tag to ensure correct types
       const tagDefaults = (props.form as any).unionDefaultValues?.[newTag as string] ?? {}
-      // Merge: keep _tag from current values, but use tag defaults for other fields
+      // Get current form values to preserve user's selections (e.g., carrier)
+      const currentValues = props.form.state.values
+      // Merge: keep current values, override with tag defaults for type correctness, set new _tag
       const resetValues = {
+        ...currentValues,
         ...tagDefaults,
         _tag: newTag
       }