diff --git a/packages/dataviews/src/components/dataviews-view-config/index.tsx b/packages/dataviews/src/components/dataviews-view-config/index.tsx index c1b564994b7771..ef803c4180063f 100644 --- a/packages/dataviews/src/components/dataviews-view-config/index.tsx +++ b/packages/dataviews/src/components/dataviews-view-config/index.tsx @@ -268,7 +268,7 @@ function BaseFieldItem( { onToggleVisibility, onMoveUp, onMoveDown, - additionalActions, + children, }: { identifier: string; label: string; @@ -282,7 +282,7 @@ function BaseFieldItem( { onToggleVisibility?: () => void; onMoveUp?: () => void; onMoveDown?: () => void; - additionalActions?: ReactNode; + children?: ReactNode; } ) { const focusVisibilityField = () => { // Focus the visibility button to avoid focus loss. @@ -395,7 +395,7 @@ function BaseFieldItem( { } /> ) } - { additionalActions } + { children } @@ -541,8 +541,8 @@ function PreviewFieldItem( { canMove={ false } canHide isInteracting={ isChangingPreview } - additionalActions={ - isVisible && ( + > + { isVisible && ( - ) - } - /> + ) } + ); } diff --git a/packages/editor/src/dataviews/fields/content-preview/content-preview-view.tsx b/packages/editor/src/dataviews/fields/content-preview/content-preview-view.tsx index abe1256d21b8e8..0a5b8387163083 100644 --- a/packages/editor/src/dataviews/fields/content-preview/content-preview-view.tsx +++ b/packages/editor/src/dataviews/fields/content-preview/content-preview-view.tsx @@ -21,7 +21,7 @@ import { store as editorStore } from '../../../store'; const { useGlobalStyle } = unlock( blockEditorPrivateApis ); -function ContentPreviewContainer( { +function PostPreviewContainer( { template, post, }: { @@ -62,7 +62,7 @@ function ContentPreviewContainer( { ); } -export default function ContentPreviewView( { item }: { item: BasePost } ) { +export default function PostPreviewView( { item }: { item: BasePost } ) { const { settings, template } = useSelect( ( select ) => { const { canUser, getPostType, getTemplateId, getEntityRecord } = @@ -102,7 +102,7 @@ export default function ContentPreviewView( { item }: { item: BasePost } ) { settings={ settings } __unstableTemplate={ template } > - + ); } diff --git a/packages/editor/src/dataviews/fields/content-preview/index.tsx b/packages/editor/src/dataviews/fields/content-preview/index.tsx index 3c1d9386f4f544..9016ef22632ab9 100644 --- a/packages/editor/src/dataviews/fields/content-preview/index.tsx +++ b/packages/editor/src/dataviews/fields/content-preview/index.tsx @@ -8,15 +8,15 @@ import { __ } from '@wordpress/i18n'; /** * Internal dependencies */ -import ContentPreviewView from './content-preview-view'; +import PostPreviewView from './content-preview-view'; -const contentPreviewField: Field< BasePost > = { +const postPreviewField: Field< BasePost > = { type: 'text', id: 'content-preview', label: __( 'Content preview' ), - render: ContentPreviewView, + render: PostPreviewView, enableSorting: false, isPreviewField: true, }; -export default contentPreviewField; +export default postPreviewField; diff --git a/packages/editor/src/dataviews/store/private-actions.ts b/packages/editor/src/dataviews/store/private-actions.ts index d9e81311fd1c16..82c2c8911c7c96 100644 --- a/packages/editor/src/dataviews/store/private-actions.ts +++ b/packages/editor/src/dataviews/store/private-actions.ts @@ -38,7 +38,7 @@ import { * Internal dependencies */ import { store as editorStore } from '../../store'; -import contentPreviewField from '../fields/content-preview'; +import postPreviewField from '../fields/content-preview'; import { unlock } from '../../lock-unlock'; export function registerEntityAction< Item >( @@ -176,7 +176,9 @@ export const registerPostTypeSchema = postTypeConfig.supports?.comments && commentStatusField, templateField, passwordField, - contentPreviewField, + postTypeConfig.supports?.editor && + postTypeConfig.viewable && + postPreviewField, ].filter( Boolean ); if ( postTypeConfig.supports?.title ) { let _titleField; diff --git a/packages/fields/src/types.ts b/packages/fields/src/types.ts index 1b251d125b1be8..bff76206081053 100644 --- a/packages/fields/src/types.ts +++ b/packages/fields/src/types.ts @@ -100,6 +100,7 @@ export interface PostType { author?: string; thumbnail?: string; comments?: string; + editor?: boolean; }; }