From e4e50a4d21fb4d5519e925ace15e7d05663e7e15 Mon Sep 17 00:00:00 2001
From: Only Hans <hans@onlyhans.dev>
Date: Tue, 2 Jun 2026 21:07:20 +0200
Subject: [PATCH] fix: correct form fields in next.js

---
 .../src/components/forms/DynamicForm.tsx      | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/cms/nextjs/src/components/forms/DynamicForm.tsx b/cms/nextjs/src/components/forms/DynamicForm.tsx
index 8c0a3f0a..091e8a9c 100644
--- a/cms/nextjs/src/components/forms/DynamicForm.tsx
+++ b/cms/nextjs/src/components/forms/DynamicForm.tsx
@@ -47,7 +47,6 @@ const DynamicForm = ({ fields, onSubmit, submitLabel, id }: DynamicFormProps) =>
 		<Form {...form}>
 			<form
 				onSubmit={form.handleSubmit(onSubmit)}
-				className="flex flex-wrap gap-4"
 				data-directus={setAttr({
 					collection: 'forms',
 					item: id,
@@ -55,21 +54,20 @@ const DynamicForm = ({ fields, onSubmit, submitLabel, id }: DynamicFormProps) =>
 					mode: 'popover',
 				})}
 			>
-				{sortedFields.map((field) => (
-					<div key={field.id} className="w-full">
-						<Field key={field.id} field={field} form={form} />
-					</div>
-				))}
-				<div className="w-full">
-					<div
-						data-directus={setAttr({
-							collection: 'forms',
-							item: id,
-							fields: 'submit_label',
-							mode: 'popover',
-						})}
-					>
-						<Button type="submit" label={submitLabel} icon="arrow" iconPosition="right" id={`submit-${id}`} />
+				<div className="flex flex-wrap gap-4">
+					{sortedFields.map((field) => <Field key={field.id} field={field} form={form} />)}
+
+					<div className="w-full">
+						<div
+							data-directus={setAttr({
+								collection: 'forms',
+								item: id,
+								fields: 'submit_label',
+								mode: 'popover',
+							})}
+						>
+							<Button type="submit" label={submitLabel} icon="arrow" iconPosition="right" id={`submit-${id}`} />
+						</div>
 					</div>
 				</div>
 			</form>