@betterstart/cli 0.1.56 → 0.1.58

package/dist/cli.js

@@ -2667,7 +2667,7 @@ export function ${p7.pascal}Form() {
 import { zodResolver } from '@hookform/resolvers/zod'
 import { ChevronLeft, ChevronRight${p7.hasListFields ? ", Trash2" : ""} } from 'lucide-react'
 import { parseAsInteger, useQueryState } from 'nuqs'
-import { useEffect, useRef, useState } from 'react'
+import { useState } from 'react'
 ${p7.rhfImport}
 import { z } from 'zod/v3'${queryClientImport}
 import { create${p7.pascal}Submission } from '@cms/actions/${p7.kebab}-form'
@@ -2709,24 +2709,27 @@ ${formComponentDecl}() {
 
   const form = useForm<FormValues>({
     resolver: zodResolver(formSchema),
-    mode: 'onTouched',
+    mode: 'onSubmit',
     defaultValues: {
 ${p7.defaults}
     },
   })
 
-  const prevStep = useRef(currentStep)
-  useEffect(() => {
-    if (currentStep !== prevStep.current) {
-      form.clearErrors(STEPS[currentStep].fields as (keyof FormValues)[])
-      prevStep.current = currentStep
-    }
-  }, [currentStep, form])
 ${p7.fieldArraySetup}${p7.watchSetup}
   async function handleNext() {
-    const isValid = await form.trigger(
-      STEPS[currentStep].fields as (keyof FormValues)[]
-    )
+    const stepFields = STEPS[currentStep].fields as (keyof FormValues)[]
+    const values = form.getValues()
+    form.clearErrors(stepFields)
+    let isValid = true
+    for (const fieldName of stepFields) {
+      const fieldSchema = formSchema.shape[fieldName]
+      if (!fieldSchema) continue
+      const result = fieldSchema.safeParse(values[fieldName])
+      if (!result.success) {
+        form.setError(fieldName, { type: 'validate', message: result.error.issues[0].message })
+        isValid = false
+      }
+    }
     if (isValid) {
       setCurrentStep(currentStep + 1)
     }