@betterstart/cli 0.1.55 → 0.1.57

package/dist/cli.js

@@ -2714,15 +2714,24 @@ ${formComponentDecl}() {
 ${p7.defaults}
     },
   })
+
 ${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) {
-      const next = currentStep + 1
-      form.clearErrors(STEPS[next].fields as (keyof FormValues)[])
-      setCurrentStep(next)
+      setCurrentStep(currentStep + 1)
     }
   }