@effect-app/vue-components 1.6.5 → 1.6.7

package/dist/types/components/OmegaForm/createUseFormWithCustomInput.d.ts

@@ -1,3 +1,4 @@
 import { type Component } from "vue";
+import { type DefaultInputProps } from "./OmegaFormStuff";
 import { useOmegaForm } from "./useOmegaForm";
-export declare const createUseFormWithCustomInput: (CustomInputComponent: Component) => <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>>(...args: Parameters<typeof useOmegaForm<From, To>>) => import("./useOmegaForm").OmegaFormReturn<From, To, import("./OmegaFormStuff").DefaultInputProps<From>>;
+export declare const createUseFormWithCustomInput: (CustomInputComponent: Component) => <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Props = DefaultInputProps<From>>(...args: Parameters<typeof useOmegaForm<From, To>>) => import("./useOmegaForm").OmegaFormReturn<From, To, Props>;

package/dist/types/components/OmegaForm/index.d.ts

@@ -1,6 +1,7 @@
 export * as OmegaErrorsContext from "./OmegaErrorsContext";
 export * from "./OmegaFormStuff";
-export { type OmegaFormReturn, useOmegaForm } from "./useOmegaForm";
+export { type OmegaConfig, type OmegaFormReturn, useOmegaForm } from "./useOmegaForm";
+export { type InputProps, type MergedInputProps } from "./InputProps";
 export { default as OmegaInput } from "./OmegaInput.vue";
 export { default as OmegaVuetifyInput } from "./OmegaInternalInput.vue";
 export { useOnClose, usePreventClose } from "./blockDialog";

package/dist/vue-components.es10.js

@@ -1,25 +1,23 @@
-import { h as r } from "vue";
-import s from "./vue-components.es4.js";
-import { useOmegaForm as i } from "./vue-components.es7.js";
-const W = (e) => (...n) => {
-  const [m, o, a] = n;
-  return i(
-    m,
+import { h as t } from "vue";
+import i from "./vue-components.es4.js";
+import { useOmegaForm as f } from "./vue-components.es7.js";
+const g = (r) => (...e) => {
+  const [o, n, m] = e;
+  return f(
     o,
+    n,
     {
-      ...a,
+      ...m,
       input: {
         name: "WrappedInput",
         inheritAttrs: !1,
-        setup(f, { attrs: u, slots: p }) {
-          return () => r(s, {
-            ...f,
-            ...u
+        setup(p, { attrs: s }) {
+          return () => t(i, {
+            ...p,
+            ...s
           }, {
             // Override the default slot that OmegaInternalInput provides
-            default: (t) => t && "field" in t ? r(e, {
-              inputProps: t
-            }) : p.default?.(t)
+            default: ({ field: a, ...u }) => t(r, { field: a, inputProps: u })
           });
         }
       }
@@ -27,5 +25,5 @@ const W = (e) => (...n) => {
   );
 };
 export {
-  W as createUseFormWithCustomInput
+  g as createUseFormWithCustomInput
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.18.0",

package/src/components/OmegaForm/createUseFormWithCustomInput.ts

@@ -1,13 +1,15 @@
 import type { DeepKeys } from "@tanstack/vue-form"
 import { type Component, h } from "vue"
-import type { InputProps } from "./InputProps"
+import type { MergedInputProps } from "./InputProps"
+import { type DefaultInputProps } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import { useOmegaForm } from "./useOmegaForm"
 
 export const createUseFormWithCustomInput = (CustomInputComponent: Component) => {
   return <
     From extends Record<PropertyKey, any>,
-    To extends Record<PropertyKey, any>
+    To extends Record<PropertyKey, any>,
+    Props = DefaultInputProps<From>
   >(
     ...args: Parameters<typeof useOmegaForm<From, To>>
   ) => {
@@ -17,28 +19,21 @@ export const createUseFormWithCustomInput = (CustomInputComponent: Component) =>
     const WrappedInput = {
       name: "WrappedInput",
       inheritAttrs: false,
-      setup(props: any, { attrs, slots }: any) {
+      setup(props: any, { attrs }: any) {
         return () =>
           h(OmegaInput, {
             ...props,
             ...attrs
           }, {
             // Override the default slot that OmegaInternalInput provides
-            default: <TName extends DeepKeys<From>>(inputProps: InputProps<From, TName>) => {
-              // If we receive inputProps from OmegaInternalInput, use our custom component
-              if (inputProps && "field" in inputProps) {
-                return h(CustomInputComponent, {
-                  inputProps
-                })
-              }
-              // Otherwise, pass through the slot content
-              return slots.default?.(inputProps)
+            default: <TName extends DeepKeys<From>>({ field, ...inputProps }: MergedInputProps<From, TName>) => {
+              return h(CustomInputComponent, { field, inputProps })
             }
           })
       }
     }
 
-    const form = useOmegaForm<From, To>(
+    const form = useOmegaForm<From, To, Props>(
       schema,
       tanstackFormOptions,
       {

package/src/components/OmegaForm/index.ts

@@ -1,7 +1,8 @@
 export * as OmegaErrorsContext from "./OmegaErrorsContext"
 export * from "./OmegaFormStuff"
-export { type OmegaFormReturn, useOmegaForm } from "./useOmegaForm"
+export { type OmegaConfig, type OmegaFormReturn, useOmegaForm } from "./useOmegaForm"
 
+export { type InputProps, type MergedInputProps } from "./InputProps"
 export { default as OmegaInput } from "./OmegaInput.vue"
 export { default as OmegaVuetifyInput } from "./OmegaInternalInput.vue"