@betterstart/cli 0.1.58 → 0.1.60

package/dist/cli.js

@@ -2664,7 +2664,6 @@ export function ${p7.pascal}Form() {
 ` : "";
   return `'use client'
 
-import { zodResolver } from '@hookform/resolvers/zod'
 import { ChevronLeft, ChevronRight${p7.hasListFields ? ", Trash2" : ""} } from 'lucide-react'
 import { parseAsInteger, useQueryState } from 'nuqs'
 import { useState } from 'react'
@@ -2708,8 +2707,6 @@ ${formComponentDecl}() {
   const [submitting, setSubmitting] = useState(false)
 
   const form = useForm<FormValues>({
-    resolver: zodResolver(formSchema),
-    mode: 'onSubmit',
     defaultValues: {
 ${p7.defaults}
     },
@@ -2740,9 +2737,17 @@ ${p7.fieldArraySetup}${p7.watchSetup}
   }
 
   async function onSubmit(values: FormValues) {
+    const validation = formSchema.safeParse(values)
+    if (!validation.success) {
+      for (const issue of validation.error.issues) {
+        const fieldName = issue.path[0] as keyof FormValues
+        form.setError(fieldName, { type: 'validate', message: issue.message })
+      }
+      return
+    }
     setSubmitting(true)
     try {
-      const result = await create${p7.pascal}Submission(values)
+      const result = await create${p7.pascal}Submission(validation.data)
       if (result.success) {
         setSubmitted(true)
       } else {
@@ -2766,7 +2771,7 @@ ${p7.fieldArraySetup}${p7.watchSetup}
 
   return (
     <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+      <form onSubmit={(e) => e.preventDefault()} className="space-y-8">
         {/* Step header */}
         <div>
           <h3 className="text-lg font-semibold">{STEPS[currentStep].label}</h3>
@@ -2801,7 +2806,7 @@ ${p7.stepContentBlocks}
               <ChevronRight className="ml-2 h-4 w-4" />
             </Button>
           ) : (
-            <Button type="submit" disabled={submitting}>
+            <Button type="button" disabled={submitting} onClick={() => onSubmit(form.getValues())}>
               {submitting ? 'Submitting...' : '${p7.submitText}'}
             </Button>
           )}