@saas-ui/forms 2.3.10 → 2.3.12

package/dist/zod/index.d.ts

@@ -170,16 +170,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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saas-ui/forms",
-  "version": "2.3.10",
+  "version": "2.3.12",
   "description": "Fully functional forms for Chakra UI.",
   "source": "src/index.ts",
   "exports": {
@@ -103,9 +103,9 @@
   "dependencies": {
     "@chakra-ui/react-utils": "^2.0.12",
     "@chakra-ui/utils": "^2.0.15",
-    "@hookform/resolvers": "^3.3.1",
-    "@saas-ui/core": "2.3.5",
-    "react-hook-form": "^7.46.1"
+    "@hookform/resolvers": "^3.3.4",
+    "@saas-ui/core": "2.3.6",
+    "react-hook-form": "^7.50.1"
   },
   "peerDependencies": {
     "@chakra-ui/react": ">=2.4.9",
@@ -116,13 +116,13 @@
     "react-dom": ">=18.0.0"
   },
   "devDependencies": {
-    "@types/json-schema": "^7.0.12",
+    "@types/json-schema": "^7.0.15",
     "ajv": "^8.12.0",
     "ajv-errors": "^3.0.0",
-    "json-schema-to-ts": "^2.9.2",
+    "json-schema-to-ts": "^2.12.0",
     "tsd": "^0.28.1",
-    "yup": "^1.2.0",
-    "zod": "^3.22.2"
+    "yup": "^1.3.3",
+    "zod": "^3.22.4"
   },
   "tsd": {
     "directory": "tests"

package/src/submit-button.tsx

@@ -8,16 +8,10 @@ import { useFieldProps } from './form-context'
 export 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
 }
@@ -31,21 +25,31 @@ export const SubmitButton = forwardRef<SubmitButtonProps, 'button'>(
     const {
       variant = 'primary',
       children = 'Submit',
-      disableIfUntouched = false,
-      disableIfInvalid = false,
+      disableIfUntouched: disableIfUntouchedProp = false,
+      disableIfInvalid: disableIfInvalidProp = false,
       isDisabled: isDisabledProp,
       isLoading,
       ...rest
     } = props
     const { formState } = useFormContext()
 
+    const field = useFieldProps('submit') as SubmitButtonProps
+
+    const {
+      disableIfUntouched: disableIfUntouchedOverride,
+      disableIfInvalid: disableIfInvalidOverride,
+      ...fieldProps
+    } = field
+
+    const disableIfUntouched =
+      disableIfUntouchedOverride ?? disableIfUntouchedProp
+    const disableIfInvalid = disableIfInvalidOverride ?? disableIfInvalidProp
+
     const isDisabled =
       (disableIfUntouched && !formState.isDirty) ||
       (disableIfInvalid && !formState.isValid) ||
       isDisabledProp
 
-    const field = useFieldProps('submit') as any
-
     return (
       <Button
         ref={ref}
@@ -53,11 +57,10 @@ export const SubmitButton = forwardRef<SubmitButtonProps, 'button'>(
         type="submit"
         isLoading={formState.isSubmitting || isLoading}
         isDisabled={isDisabled}
+        children={children}
         {...rest}
-        {...field}
-      >
-        {children}
-      </Button>
+        {...fieldProps}
+      />
     )
   }
 )