@saas-ui/forms 2.3.10 → 2.3.12

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @saas-ui/forms
 
+## 2.3.12
+
+### Patch Changes
+
+- 2e7da38: Updated dependencies
+- da5167a: Fixed issue where submit field props were not passed down correctly
+- Updated dependencies [2e7da38]
+  - @saas-ui/core@2.3.6
+
+## 2.3.11
+
+### Patch Changes
+
+- 29e5c317: Fixed issue where submit label could not be overwritten using the fields prop
+
 ## 2.3.10
 
 ### Patch Changes
@@ -1090,12 +1105,12 @@
   Add this somewhere in the root of your project.
 
   ```ts
-  import { Form } from "@saas-ui/react";
-  import { yupResolver, yupFieldResolver } from "@saas-ui/forms/yup"; // yupResolver is exported from here as well for convenience.
-  import { AnyObjectSchema } from "yup";
+  import { Form } from '@saas-ui/react'
+  import { yupResolver, yupFieldResolver } from '@saas-ui/forms/yup' // yupResolver is exported from here as well for convenience.
+  import { AnyObjectSchema } from 'yup'
 
-  Form.getResolver = (schema: AnyObjectSchema) => yupResolver(schema); // @hookform/resolvers
-  Form.getFieldResolver = (schema: AnyObjectSchema) => yupFieldResolver(schema); // AutoForm field resolver
+  Form.getResolver = (schema: AnyObjectSchema) => yupResolver(schema) // @hookform/resolvers
+  Form.getFieldResolver = (schema: AnyObjectSchema) => yupFieldResolver(schema) // AutoForm field resolver
   ```
 
 - 9391c44: Fixed peer dependency issues.

package/dist/index.d.ts

@@ -197,16 +197,10 @@ type DefaultFields = typeof defaultFieldTypes;
 interface SubmitButtonProps extends ButtonProps {
     /**
      * Disable the submit button if the form is untouched.
-     *
-     * Change the default behavior by updating
-     * `SubmitButton.defaultProps.disableIfUntouched`
      */
     disableIfUntouched?: boolean;
     /**
      * Disable the submit button if the form is invalid.
-     *
-     * Change the default behavior by updating
-     * `SubmitButton.defaultProps.disableIfInvalid`
      */
     disableIfInvalid?: boolean;
 }
@@ -818,9 +812,9 @@ declare const useFormContext: <TFieldValues extends FieldValues = FieldValues, T
     formState: react_hook_form.FormState<FieldValues>;
     resetField: react_hook_form.UseFormResetField<FieldValues>;
     reset: react_hook_form.UseFormReset<FieldValues>;
-    handleSubmit: react_hook_form.UseFormHandleSubmit<FieldValues, undefined>;
+    handleSubmit: react_hook_form.UseFormHandleSubmit<FieldValues, FieldValues>;
     unregister: react_hook_form.UseFormUnregister<FieldValues>;
-    control: react_hook_form.Control<FieldValues, any>;
+    control: react_hook_form.Control<FieldValues, any, FieldValues>;
     register: react_hook_form.UseFormRegister<FieldValues>;
     setFocus: react_hook_form.UseFormSetFocus<FieldValues>;
 };

package/dist/index.js

@@ -1080,15 +1080,22 @@ var SubmitButton = (0, import_react18.forwardRef)(
     const {
       variant = "primary",
       children = "Submit",
-      disableIfUntouched = false,
-      disableIfInvalid = false,
+      disableIfUntouched: disableIfUntouchedProp = false,
+      disableIfInvalid: disableIfInvalidProp = false,
       isDisabled: isDisabledProp,
       isLoading,
       ...rest
     } = props;
     const { formState } = (0, import_react_hook_form5.useFormContext)();
-    const isDisabled = disableIfUntouched && !formState.isDirty || disableIfInvalid && !formState.isValid || isDisabledProp;
     const field = useFieldProps("submit");
+    const {
+      disableIfUntouched: disableIfUntouchedOverride,
+      disableIfInvalid: disableIfInvalidOverride,
+      ...fieldProps
+    } = field;
+    const disableIfUntouched = disableIfUntouchedOverride != null ? disableIfUntouchedOverride : disableIfUntouchedProp;
+    const disableIfInvalid = disableIfInvalidOverride != null ? disableIfInvalidOverride : disableIfInvalidProp;
+    const isDisabled = disableIfUntouched && !formState.isDirty || disableIfInvalid && !formState.isValid || isDisabledProp;
     return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
       import_react18.Button,
       {
@@ -1097,9 +1104,9 @@ var SubmitButton = (0, import_react18.forwardRef)(
         type: "submit",
         isLoading: formState.isSubmitting || isLoading,
         isDisabled,
+        children,
         ...rest,
-        ...field,
-        children
+        ...fieldProps
       }
     );
   }