@effect-app/vue-components 0.18.4 → 0.18.6

package/dist/types/components/OmegaForm/OmegaWrapper.vue.d.ts

@@ -13,11 +13,11 @@ declare const _default: <From extends Record<PropertyKey, any>, To extends Recor
         form?: undefined;
         schema: S.Schema<To, From, never>;
     }) & ({
-        isLoading: undefined;
-        onSubmit?: FormProps<From, To>["onSubmit"];
-    } | {
         isLoading: boolean;
         onSubmit: (data: To) => void;
+    } | {
+        isLoading?: undefined;
+        onSubmit?: FormProps<From, To>["onSubmit"];
     }))) & {}> & import("vue").PublicProps;
     expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
     attrs: any;

package/dist/vue-components.es12.js

@@ -1,8 +1,8 @@
-(function(){"use strict";try{if(typeof document<"u"){var n=document.createElement("style");if(n.appendChild(document.createTextNode("fieldset[data-v-ea4af766]{display:contents}fieldset[disabled][data-v-ea4af766]>*{pointer-events:none}")),document.head.appendChild(n),window.customElements){const e=window.customElements.define;window.customElements.define=function(a,t){const d=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(d&&d.call(this),this.shadowRoot){const o=document.createElement("style");o.appendChild(document.createTextNode("fieldset[data-v-ea4af766]{display:contents}fieldset[disabled][data-v-ea4af766]>*{pointer-events:none}")),this.shadowRoot.appendChild(o)}},e.call(window.customElements,a,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
-import a from "./vue-components.es20.js";
+(function(){"use strict";try{if(typeof document<"u"){var n=document.createElement("style");if(n.appendChild(document.createTextNode("fieldset[data-v-63452e71]{display:contents}fieldset[disabled][data-v-63452e71]>*{pointer-events:none}")),document.head.appendChild(n),window.customElements){const e=window.customElements.define;window.customElements.define=function(i,t){const d=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(d&&d.call(this),this.shadowRoot){const o=document.createElement("style");o.appendChild(document.createTextNode("fieldset[data-v-63452e71]{display:contents}fieldset[disabled][data-v-63452e71]>*{pointer-events:none}")),this.shadowRoot.appendChild(o)}},e.call(window.customElements,i,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
+import o from "./vue-components.es20.js";
 
-import o from "./vue-components.es17.js";
-const e = /* @__PURE__ */ o(a, [["__scopeId", "data-v-ea4af766"]]);
+import r from "./vue-components.es17.js";
+const e = /* @__PURE__ */ r(o, [["__scopeId", "data-v-63452e71"]]);
 export {
   e as default
 };

package/dist/vue-components.es20.js

@@ -1,9 +1,9 @@
-import { defineComponent as M, getCurrentInstance as F, computed as p, onBeforeMount as B, watch as b, createElementBlock as v, openBlock as g, withModifiers as C, createElementVNode as I, unref as m, renderSlot as c, createCommentVNode as L, Fragment as V } from "vue";
-import { useStore as O } from "@tanstack/vue-form";
-import { getOmegaStore as k } from "./vue-components.es26.js";
-import { provideOmegaErrors as $ } from "./vue-components.es8.js";
-import { useOmegaForm as A } from "./vue-components.es9.js";
-const K = ["disabled"], W = /* @__PURE__ */ M({
+import { defineComponent as F, getCurrentInstance as B, computed as v, onBeforeMount as C, watch as g, createElementBlock as O, openBlock as S, withModifiers as I, createElementVNode as L, unref as m, renderSlot as d, createCommentVNode as V, Fragment as k } from "vue";
+import { useStore as h } from "@tanstack/vue-form";
+import { getOmegaStore as $ } from "./vue-components.es26.js";
+import { provideOmegaErrors as A } from "./vue-components.es8.js";
+import { useOmegaForm as K } from "./vue-components.es9.js";
+const _ = ["disabled"], D = /* @__PURE__ */ F({
   __name: "OmegaWrapper",
   props: {
     omegaConfig: {},
@@ -22,21 +22,21 @@ const K = ["disabled"], W = /* @__PURE__ */ M({
     isLoading: { type: Boolean, default: void 0 },
     onSubmit: {}
   },
-  setup(S) {
-    const o = S, h = F(), y = ({ value: e }) => new Promise((r) => {
-      h.emit("submit", e);
-      const n = b(() => o.isLoading, (t) => {
+  setup(y) {
+    const o = y, w = B(), E = ({ value: e }) => new Promise((r) => {
+      w.emit("submit", e);
+      const n = g(() => o.isLoading, (t) => {
         t || (r(), n.stop());
       });
-    }), u = o.form || !o.schema ? void 0 : A(
+    }), u = typeof o.isLoading < "u" ? E : typeof o.onSubmit < "u" ? o.onSubmit : void 0, l = o.form || !o.schema ? void 0 : K(
       o.schema,
       {
         ...o,
-        onSubmit: typeof o.isLoading < "u" ? y : o.onSubmit
+        onSubmit: u
       },
       o.omegaConfig
-    ), s = p(() => o.form ?? u);
-    B(() => {
+    ), s = v(() => o.form ?? l);
+    C(() => {
       if (!o.form) return;
       const e = Object.keys(o.form.options || {}), r = /* @__PURE__ */ new Set([
         "omegaConfig",
@@ -47,7 +47,7 @@ const K = ["disabled"], W = /* @__PURE__ */ M({
         "schema"
       ]), n = Object.fromEntries(
         Object.entries(o).filter(
-          ([a, f]) => a === "isLoading" ? !1 : !r.has(a) && f !== void 0
+          ([a, c]) => a === "isLoading" ? !1 : !r.has(a) && c !== void 0
         )
       ), t = Object.keys(n), i = e.filter(
         (a) => t.includes(a) && n[a] !== void 0
@@ -60,31 +60,31 @@ ${i.join(
         )}.
 Props will overwrite existing form options. This might indicate a configuration issue.`
       );
-      const j = {
+      const b = {
         ...s.value.options,
         ...n
       };
-      s.value.options = Object.fromEntries(
+      u && (b.onSubmit = u), s.value.options = Object.fromEntries(
         // TODO
-        Object.entries(j).filter(
-          ([a, f]) => f !== void 0
+        Object.entries(b).filter(
+          ([a, c]) => c !== void 0
         )
       );
     });
-    const w = O(
+    const j = h(
       s.value.store,
       (e) => e.isSubmitting
-    ), d = k(
+    ), p = $(
       s.value,
       o.subscribe
-    ), E = O(
+    ), M = h(
       s.value.store,
       (e) => e.submissionAttempts
-    ), l = p(() => s.value.useStore((e) => e.errors));
-    return b(
-      () => [s.value.filterItems, l.value.value],
+    ), f = v(() => s.value.useStore((e) => e.errors));
+    return g(
+      () => [s.value.filterItems, f.value.value],
       () => {
-        const e = s.value.filterItems, r = l.value.value;
+        const e = s.value.filterItems, r = f.value.value;
         return e ? r ? (Object.values(r).filter(
           (t) => !!t
         ).flatMap(
@@ -101,23 +101,23 @@ Props will overwrite existing form options. This might indicate a configuration
           });
         }), {}) : {} : {};
       }
-    ), $(E, l.value, o.showErrorsOn), (e, r) => (g(), v("form", {
+    ), A(M, f.value, o.showErrorsOn), (e, r) => (S(), O("form", {
       novalidate: "",
-      onSubmit: r[0] || (r[0] = C((n) => s.value.handleSubmit(), ["prevent", "stop"]))
+      onSubmit: r[0] || (r[0] = I((n) => s.value.handleSubmit(), ["prevent", "stop"]))
     }, [
-      I("fieldset", { disabled: m(w) }, [
-        o.form ? (g(), v(V, { key: 0 }, [
-          c(e.$slots, "externalForm", { subscribedValues: m(d) }, void 0, !0),
-          c(e.$slots, "default", {}, void 0, !0)
-        ], 64)) : m(u) ? c(e.$slots, "internalForm", {
+      L("fieldset", { disabled: m(j) }, [
+        o.form ? (S(), O(k, { key: 0 }, [
+          d(e.$slots, "externalForm", { subscribedValues: m(p) }, void 0, !0),
+          d(e.$slots, "default", {}, void 0, !0)
+        ], 64)) : m(l) ? d(e.$slots, "internalForm", {
           key: 1,
-          form: m(u),
-          subscribedValues: m(d)
-        }, void 0, !0) : L("", !0)
-      ], 8, K)
+          form: m(l),
+          subscribedValues: m(p)
+        }, void 0, !0) : V("", !0)
+      ], 8, _)
     ], 32));
   }
 });
 export {
-  W as default
+  D as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "0.18.4",
+  "version": "0.18.6",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "@tanstack/vue-form": "1.2.4",

package/src/components/OmegaForm/OmegaWrapper.vue

@@ -91,14 +91,14 @@ type OmegaWrapperProps =
     }
   )
   & (
-    | {
-      isLoading: undefined
-      onSubmit?: FormProps<From, To>["onSubmit"]
-    }
     | {
       isLoading: boolean
       onSubmit: (data: To) => void
     }
+    | {
+      isLoading?: undefined
+      onSubmit?: FormProps<From, To>["onSubmit"]
+    }
   )
 
 const props = withDefaults(defineProps<OmegaWrapperProps>(), {
@@ -122,15 +122,19 @@ const eventOnSubmit: FormProps<From, To>["onSubmit"] = ({ value }) =>
     })
   })
 
+const onSubmit = typeof props.isLoading !== "undefined"
+  ? eventOnSubmit
+  : typeof props.onSubmit !== "undefined"
+  ? props.onSubmit
+  : undefined
+
 const localForm = props.form || !props.schema
   ? undefined
   : useOmegaForm<From, To>(
     props.schema,
     {
       ...props,
-      onSubmit: typeof props.isLoading !== "undefined"
-        ? eventOnSubmit
-        : props.onSubmit
+      onSubmit
     },
     props.omegaConfig
   )
@@ -184,6 +188,7 @@ onBeforeMount(() => {
     ...formToUse.value.options,
     ...filteredProps
   }
+  if (onSubmit) mergedOptions.onSubmit = onSubmit
 
   formToUse.value.options = Object.fromEntries(
     // TODO