Update submission.ts

edmundhung · Aug 30, 2024 · 8088117 · 8088117
1 parent 3a09eb0
commit 8088117
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/packages/conform-dom/submission.ts b/packages/conform-dom/submission.ts
@@ -247,6 +247,21 @@ export function replySubmission<FormError>(
 		(context.intent?.type === 'reset' &&
 			(context.intent.payload.name ?? '') === '')
 	) {
+		const extraError =
+			'formErrors' in options || 'fieldErrors' in options
+				? normalize<Record<string, FormError | null>>({
+						'': options.formErrors ?? null,
+						...options.fieldErrors,
+					})
+				: null;
+		const error =
+			context.error || extraError
+				? {
+						...context.error,
+						...extraError,
+					}
+				: undefined;
+
 		return { 
 			initialValue: null,
 			status: context.intent ? undefined : error ? 'error' : 'success'