@saas-ui/forms 2.3.10 → 2.3.12

package/dist/index.mjs

@@ -1047,15 +1047,22 @@ var SubmitButton = forwardRef12(
     const {
       variant = "primary",
       children = "Submit",
-      disableIfUntouched = false,
-      disableIfInvalid = false,
+      disableIfUntouched: disableIfUntouchedProp = false,
+      disableIfInvalid: disableIfInvalidProp = false,
       isDisabled: isDisabledProp,
       isLoading,
       ...rest
     } = props;
     const { formState } = useFormContext2();
-    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__ */ jsx18(
       Button4,
       {
@@ -1064,9 +1071,9 @@ var SubmitButton = forwardRef12(
         type: "submit",
         isLoading: formState.isSubmitting || isLoading,
         isDisabled,
+        children,
         ...rest,
-        ...field,
-        children
+        ...fieldProps
       }
     );
   }