remix-validated-form 3.2.0 → 3.2.1

package/browser/internal/getInputProps.d.ts

@@ -14,15 +14,8 @@ export declare type CreateGetInputPropsOptions = {
     validationBehavior?: Partial<ValidationBehaviorOptions>;
     name: string;
 };
-export declare type MinimalInputProps = {
-    onChange?: (...args: any[]) => void;
-    onBlur?: (...args: any[]) => void;
-};
-export declare type MinimalResult = {
-    name: string;
-    onChange: (...args: any[]) => void;
-    onBlur: (...args: any[]) => void;
-    defaultValue?: any;
-};
-export declare type GetInputProps = <T extends {}>(props?: T & MinimalInputProps) => T & MinimalResult;
+declare type HandledProps = "name" | "defaultValue";
+declare type Callbacks = "onChange" | "onBlur";
+export declare type GetInputProps = <T extends Record<string, any>>(props?: Omit<T, HandledProps | Callbacks> & Partial<Pick<T, Callbacks>>) => T;
 export declare const createGetInputProps: ({ clearError, validate, defaultValue, touched, setTouched, hasBeenSubmitted, validationBehavior, name, }: CreateGetInputPropsOptions) => GetInputProps;
+export {};

package/browser/internal/getInputProps.js

@@ -14,7 +14,7 @@ export const createGetInputProps = ({ clearError, validate, defaultValue, touche
             : touched
                 ? validationBehaviors.whenTouched
                 : validationBehaviors.initial;
-        return {
+        const result = {
             ...props,
             onChange: (...args) => {
                 var _a;
@@ -34,5 +34,6 @@ export const createGetInputProps = ({ clearError, validate, defaultValue, touche
             defaultValue,
             name,
         };
+        return result;
     };
 };

package/build/internal/getInputProps.d.ts

@@ -14,15 +14,8 @@ export declare type CreateGetInputPropsOptions = {
     validationBehavior?: Partial<ValidationBehaviorOptions>;
     name: string;
 };
-export declare type MinimalInputProps = {
-    onChange?: (...args: any[]) => void;
-    onBlur?: (...args: any[]) => void;
-};
-export declare type MinimalResult = {
-    name: string;
-    onChange: (...args: any[]) => void;
-    onBlur: (...args: any[]) => void;
-    defaultValue?: any;
-};
-export declare type GetInputProps = <T extends {}>(props?: T & MinimalInputProps) => T & MinimalResult;
+declare type HandledProps = "name" | "defaultValue";
+declare type Callbacks = "onChange" | "onBlur";
+export declare type GetInputProps = <T extends Record<string, any>>(props?: Omit<T, HandledProps | Callbacks> & Partial<Pick<T, Callbacks>>) => T;
 export declare const createGetInputProps: ({ clearError, validate, defaultValue, touched, setTouched, hasBeenSubmitted, validationBehavior, name, }: CreateGetInputPropsOptions) => GetInputProps;
+export {};

package/build/internal/getInputProps.js

@@ -17,7 +17,7 @@ const createGetInputProps = ({ clearError, validate, defaultValue, touched, setT
             : touched
                 ? validationBehaviors.whenTouched
                 : validationBehaviors.initial;
-        return {
+        const result = {
             ...props,
             onChange: (...args) => {
                 var _a;
@@ -37,6 +37,7 @@ const createGetInputProps = ({ clearError, validate, defaultValue, touched, setT
             defaultValue,
             name,
         };
+        return result;
     };
 };
 exports.createGetInputProps = createGetInputProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remix-validated-form",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Form component and utils for easy form validation in remix",
   "browser": "./browser/index.js",
   "main": "./build/index.js",

package/src/internal/getInputProps.ts

@@ -17,21 +17,12 @@ export type CreateGetInputPropsOptions = {
   name: string;
 };
 
-export type MinimalInputProps = {
-  onChange?: (...args: any[]) => void;
-  onBlur?: (...args: any[]) => void;
-};
+type HandledProps = "name" | "defaultValue";
+type Callbacks = "onChange" | "onBlur";
 
-export type MinimalResult = {
-  name: string;
-  onChange: (...args: any[]) => void;
-  onBlur: (...args: any[]) => void;
-  defaultValue?: any;
-};
-
-export type GetInputProps = <T extends {}>(
-  props?: T & MinimalInputProps
-) => T & MinimalResult;
+export type GetInputProps = <T extends Record<string, any>>(
+  props?: Omit<T, HandledProps | Callbacks> & Partial<Pick<T, Callbacks>>
+) => T;
 
 const defaultValidationBehavior: ValidationBehaviorOptions = {
   initial: "onBlur",
@@ -54,20 +45,21 @@ export const createGetInputProps = ({
     ...validationBehavior,
   };
 
-  return (props = {} as any) => {
+  return <T extends Record<string, any>>(props = {} as any) => {
     const behavior = hasBeenSubmitted
       ? validationBehaviors.whenSubmitted
       : touched
       ? validationBehaviors.whenTouched
       : validationBehaviors.initial;
-    return {
+
+    const result: T = {
       ...props,
-      onChange: (...args) => {
+      onChange: (...args: unknown[]) => {
         if (behavior === "onChange") validate();
         else clearError();
         return props?.onChange?.(...args);
       },
-      onBlur: (...args) => {
+      onBlur: (...args: unknown[]) => {
         if (behavior === "onBlur") validate();
         setTouched(true);
         return props?.onBlur?.(...args);
@@ -75,5 +67,7 @@ export const createGetInputProps = ({
       defaultValue,
       name,
     };
+
+    return result;
   };
 };