Remove 'layout' key from DataForms

WordPress · Sep 20, 2024 · 13f08a1 · 13f08a1
1 parent aae0488
commit 13f08a1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/packages/dataviews/src/components/dataform/stories/index.story.tsx b/packages/dataviews/src/components/dataform/stories/index.story.tsx
@@ -135,17 +135,15 @@ export const CombinedFields = ( { type }: { type: 'panel' | 'regular' } ) => {
 
 	const form = {
 		fields: [ 'title', 'status_and_visibility', 'order', 'author' ],
-		layout: {
-			combinedFields: [
-				{
-					id: 'status_and_visibility',
-					label: 'Status & Visibility',
-					children: [ 'status', 'password' ],
-					direction: 'vertical',
-					render: ( { item } ) => item.status,
-				},
-			] as CombinedFormField< any >[],
-		},
+		combinedFields: [
+			{
+				id: 'status_and_visibility',
+				label: 'Status & Visibility',
+				children: [ 'status', 'password' ],
+				direction: 'vertical',
+				render: ( { item } ) => item.status,
+			},
+		] as CombinedFormField< any >[],
 	};
 
 	return (

diff --git a/packages/dataviews/src/dataforms-layouts/panel/index.tsx b/packages/dataviews/src/dataforms-layouts/panel/index.tsx
@@ -148,10 +148,10 @@ export default function FormPanel< Item >( {
 				getVisibleFields< Item >(
 					fields,
 					form.fields,
-					form.layout?.combinedFields
+					form.combinedFields
 				)
 			),
-		[ fields, form.fields, form.layout?.combinedFields ]
+		[ fields, form.fields, form.combinedFields ]
 	);
 
 	return (

diff --git a/packages/dataviews/src/dataforms-layouts/regular/index.tsx b/packages/dataviews/src/dataforms-layouts/regular/index.tsx
@@ -23,10 +23,10 @@ export default function FormRegular< Item >( {
 				getVisibleFields< Item >(
 					fields,
 					form.fields,
-					form.layout?.combinedFields
+					form.combinedFields
 				)
 			),
-		[ fields, form.fields, form.layout?.combinedFields ]
+		[ fields, form.fields, form.combinedFields ]
 	);
 
 	return (

diff --git a/packages/dataviews/src/types.ts b/packages/dataviews/src/types.ts
@@ -538,12 +538,10 @@ export type NormalizedCombinedFormField< Item > = CombinedFormField< Item > & {
 export type Form< Item > = {
 	type?: 'regular' | 'panel';
 	fields?: string[];
-	layout?: {
-		/**
-		 * The fields to combine.
-		 */
-		combinedFields?: CombinedFormField< Item >[];
-	};
+	/**
+	 * The fields to combine.
+	 */
+	combinedFields?: CombinedFormField< Item >[];
 };
 
 export interface DataFormProps< Item > {