@wordpress/editor 13.27.2 → 13.28.1

package/src/components/post-template/classic-theme.js

@@ -44,6 +44,7 @@ function PostTemplateToggle( { isOpen, onClick } ) {
 
 	return (
 		<Button
+			__next40pxDefaultSize
 			className="edit-post-post-template__toggle"
 			variant="tertiary"
 			aria-expanded={ isOpen }
@@ -64,7 +65,7 @@ function PostTemplateDropdownContent( { onClose } ) {
 		canCreate,
 		canEdit,
 		currentTemplateId,
-		getPostLinkProps,
+		onNavigateToEntityRecord,
 		getEditorSettings,
 	} = useSelect(
 		( select ) => {
@@ -94,21 +95,14 @@ function PostTemplateDropdownContent( { onClose } ) {
 					editorSettings.supportsTemplateMode &&
 					!! _currentTemplateId,
 				currentTemplateId: _currentTemplateId,
-				getPostLinkProps: editorSettings.getPostLinkProps,
+				onNavigateToEntityRecord:
+					editorSettings.onNavigateToEntityRecord,
 				getEditorSettings: select( editorStore ).getEditorSettings,
 			};
 		},
 		[ allowSwitchingTemplate ]
 	);
 
-	const editTemplate =
-		getPostLinkProps && currentTemplateId
-			? getPostLinkProps( {
-					postId: currentTemplateId,
-					postType: 'wp_template',
-			  } )
-			: {};
-
 	const options = useMemo(
 		() =>
 			Object.entries( {
@@ -168,12 +162,15 @@ function PostTemplateDropdownContent( { onClose } ) {
 					}
 				/>
 			) }
-			{ canEdit && (
+			{ canEdit && onNavigateToEntityRecord && (
 				<p>
 					<Button
 						variant="link"
 						onClick={ () => {
-							editTemplate.onClick();
+							onNavigateToEntityRecord( {
+								postId: currentTemplateId,
+								postType: 'wp_template',
+							} );
 							onClose();
 							createSuccessNotice(
 								__(
@@ -185,7 +182,7 @@ function PostTemplateDropdownContent( { onClose } ) {
 										{
 											label: __( 'Go back' ),
 											onClick: () =>
-												getEditorSettings().goBack(),
+												getEditorSettings().onNavigateToPreviousEntityRecord(),
 										},
 									],
 								}

package/src/components/post-template/create-new-template-modal.js

@@ -23,13 +23,14 @@ import { store as editorStore } from '../../store';
 const DEFAULT_TITLE = __( 'Custom Template' );
 
 export default function CreateNewTemplateModal( { onClose } ) {
-	const { defaultBlockTemplate, getPostLinkProps } = useSelect(
+	const { defaultBlockTemplate, onNavigateToEntityRecord } = useSelect(
 		( select ) => {
 			const { getEditorSettings, getCurrentTemplateId } =
 				select( editorStore );
 			return {
 				defaultBlockTemplate: getEditorSettings().defaultBlockTemplate,
-				getPostLinkProps: getEditorSettings().getPostLinkProps,
+				onNavigateToEntityRecord:
+					getEditorSettings().onNavigateToEntityRecord,
 				getTemplateId: getCurrentTemplateId,
 			};
 		}
@@ -97,13 +98,10 @@ export default function CreateNewTemplateModal( { onClose } ) {
 		} );
 
 		setIsBusy( false );
-		const editTemplate = getPostLinkProps
-			? getPostLinkProps( {
-					postId: newTemplate.id,
-					postType: 'wp_template',
-			  } )
-			: {};
-		editTemplate.onClick();
+		onNavigateToEntityRecord( {
+			postId: newTemplate.id,
+			postType: 'wp_template',
+		} );
 		cancel();
 	};
 

package/src/components/post-template/panel.js

@@ -47,7 +47,11 @@ export default function PostTemplatePanel() {
 		return canCreateTemplates;
 	}, [] );
 
-	if ( ! isBlockTheme && isVisible ) {
+	const canViewTemplates = useSelect( ( select ) => {
+		return select( coreStore ).canUser( 'read', 'templates' ) ?? false;
+	}, [] );
+
+	if ( ( ! isBlockTheme || ! canViewTemplates ) && isVisible ) {
 		return (
 			<PostPanelRow label={ __( 'Template' ) }>
 				<ClassicThemeControl />

package/src/components/post-trash/index.js

@@ -38,6 +38,7 @@ export default function PostTrash() {
 	return (
 		<>
 			<Button
+				__next40pxDefaultSize
 				className="editor-post-trash"
 				isDestructive
 				variant="secondary"

package/src/components/post-url/panel.js

@@ -47,6 +47,7 @@ function PostURLToggle( { isOpen, onClick } ) {
 	const label = usePostURLLabel();
 	return (
 		<Button
+			__next40pxDefaultSize
 			className="editor-post-url__panel-toggle"
 			variant="tertiary"
 			aria-expanded={ isOpen }

package/src/components/provider/index.js

@@ -29,6 +29,19 @@ const { PatternsMenuItems } = unlock( editPatternsPrivateApis );
 
 const noop = () => {};
 
+/**
+ * These are global entities that are only there to split blocks into logical units
+ * They don't provide a "context" for the current post/page being rendered.
+ * So we should not use their ids as post context. This is important to allow post blocks
+ * (post content, post title) to be used within them without issues.
+ */
+const NON_CONTEXTUAL_POST_TYPES = [
+	'wp_block',
+	'wp_template',
+	'wp_navigation',
+	'wp_template_part',
+];
+
 /**
  * Depending on the post, template and template mode,
  * returns the appropriate blocks and change handlers for the block editor provider.
@@ -113,7 +126,8 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 		const rootLevelPost = shouldRenderTemplate ? template : post;
 		const defaultBlockContext = useMemo( () => {
 			const postContext =
-				rootLevelPost.type !== 'wp_template' || shouldRenderTemplate
+				! NON_CONTEXTUAL_POST_TYPES.includes( rootLevelPost.type ) ||
+				shouldRenderTemplate
 					? { postId: post.id, postType: post.type }
 					: {};
 
@@ -124,7 +138,13 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 						? rootLevelPost.slug
 						: undefined,
 			};
-		}, [ post.id, post.type, rootLevelPost.type, rootLevelPost.slug ] );
+		}, [
+			shouldRenderTemplate,
+			post.id,
+			post.type,
+			rootLevelPost.type,
+			rootLevelPost.slug,
+		] );
 		const { editorSettings, selection, isReady } = useSelect(
 			( select ) => {
 				const {

package/src/components/provider/use-block-editor-settings.js

@@ -51,7 +51,7 @@ const BLOCK_EDITOR_SETTINGS = [
 	'fontSizes',
 	'gradients',
 	'generateAnchors',
-	'getPostLinkProps',
+	'onNavigateToEntityRecord',
 	'hasInlineToolbar',
 	'imageDefaultSize',
 	'imageDimensions',

package/src/hooks/pattern-partial-syncing.js

@@ -15,6 +15,7 @@ import { unlock } from '../lock-unlock';
 
 const {
 	PartialSyncingControls,
+	ResetOverridesControl,
 	PATTERN_TYPES,
 	PARTIAL_SYNCING_SUPPORTED_BLOCKS,
 } = unlock( patternsPrivateApis );
@@ -54,12 +55,30 @@ function ControlsWithStoreSubscription( props ) {
 			select( editorStore ).getCurrentPostType() === PATTERN_TYPES.user,
 		[]
 	);
+	const bindings = props.attributes.metadata?.bindings;
+	const hasPatternBindings =
+		!! bindings &&
+		Object.values( bindings ).some(
+			( binding ) => binding.source === 'core/pattern-overrides'
+		);
+
+	const shouldShowPartialSyncingControls =
+		isEditingPattern && blockEditingMode === 'default';
+	const shouldShowResetOverridesControl =
+		! isEditingPattern &&
+		!! props.attributes.metadata?.id &&
+		blockEditingMode !== 'disabled' &&
+		hasPatternBindings;
 
 	return (
-		isEditingPattern &&
-		blockEditingMode === 'default' && (
-			<PartialSyncingControls { ...props } />
-		)
+		<>
+			{ shouldShowPartialSyncingControls && (
+				<PartialSyncingControls { ...props } />
+			) }
+			{ shouldShowResetOverridesControl && (
+				<ResetOverridesControl { ...props } />
+			) }
+		</>
 	);
 }
 

package/src/store/actions.js

@@ -585,7 +585,7 @@ export function updateEditorSettings( settings ) {
  * -   `post-only`: This mode extracts the post blocks from the template and renders only those. The idea is to allow the user to edit the post/page in isolation without the wrapping template.
  * -   `template-locked`: This mode renders both the template and the post blocks but the template blocks are locked and can't be edited. The post blocks are editable.
  *
- * @param {string} mode Mode (one of 'post-only', 'template-locked' or 'all').
+ * @param {string} mode Mode (one of 'post-only' or 'template-locked').
  */
 export const setRenderingMode =
 	( mode ) =>

package/src/store/reducer.js

@@ -266,7 +266,7 @@ export function editorSettings( state = EDITOR_SETTINGS_DEFAULTS, action ) {
 	return state;
 }
 
-export function renderingMode( state = 'all', action ) {
+export function renderingMode( state = 'post-only', action ) {
 	switch ( action.type ) {
 		case 'SET_RENDERING_MODE':
 			return action.mode;