Small tweaks per review

WordPress · Dec 5, 2024 · e6f61cd · e6f61cd
1 parent 5d4862a
commit e6f61cd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 23 deletions.
diff --git a/packages/dataviews/src/components/dataviews-view-config/index.tsx b/packages/dataviews/src/components/dataviews-view-config/index.tsx
@@ -83,9 +83,13 @@ function ViewTypeMenu( {
 								case 'list':
 								case 'grid':
 								case 'table':
+									const viewWithoutLayout = { ...view };
+									if ( 'layout' in viewWithoutLayout ) {
+										delete viewWithoutLayout.layout;
+									}
 									// @ts-expect-error
 									return onChangeView( {
-										...view,
+										...viewWithoutLayout,
 										type: e.target.value,
 										...defaultLayouts[ e.target.value ],
 									} );

diff --git a/packages/edit-site/src/components/page-patterns/index.js b/packages/edit-site/src/components/page-patterns/index.js
@@ -61,9 +61,9 @@ const DEFAULT_VIEW = {
 	perPage: 20,
 	titleField: 'title',
 	mediaField: 'preview',
-	layout: defaultLayouts[ LAYOUT_GRID ].layout,
 	fields: [ 'sync-status' ],
 	filters: [],
+	...defaultLayouts[ LAYOUT_GRID ],
 };
 
 export default function DataviewsPatterns() {

diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
@@ -37,10 +37,6 @@ const defaultLayouts = {
 		showMedia: false,
 		layout: {
 			styles: {
-				__primary: {
-					maxWidth: 400,
-					minWidth: 320,
-				},
 				author: {
 					width: '1%',
 				},
@@ -49,11 +45,9 @@ const defaultLayouts = {
 	},
 	[ LAYOUT_GRID ]: {
 		showMedia: true,
-		layout: {},
 	},
 	[ LAYOUT_LIST ]: {
 		showMedia: false,
-		layout: {},
 	},
 };
 

diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
@@ -27,21 +27,9 @@ import {
 } from '../../utils/constants';
 
 export const defaultLayouts = {
-	[ LAYOUT_TABLE ]: {
-		layout: {
-			styles: {
-				__primary: {
-					maxWidth: 300,
-				},
-			},
-		},
-	},
-	[ LAYOUT_GRID ]: {
-		layout: {},
-	},
-	[ LAYOUT_LIST ]: {
-		layout: {},
-	},
+	[ LAYOUT_TABLE ]: {},
+	[ LAYOUT_GRID ]: {},
+	[ LAYOUT_LIST ]: {},
 };
 
 const DEFAULT_POST_BASE = {