@wordpress/editor 14.41.1-next.v.202603102151.0 → 14.42.0

package/src/components/post-revisions-preview/revisions-canvas.js

@@ -7,14 +7,9 @@ import clsx from 'clsx';
  * WordPress dependencies
  */
 import { Spinner } from '@wordpress/components';
-import {
-	privateApis as blockEditorPrivateApis,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { createBlock, parse } from '@wordpress/blocks';
-import { EntityProvider } from '@wordpress/core-data';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
-import { useEffect, useMemo, useRef } from '@wordpress/element';
+import { useEffect } from '@wordpress/element';
 import { addFilter } from '@wordpress/hooks';
 
 /**
@@ -28,12 +23,8 @@ import {
 	unregisterDiffFormatTypes,
 } from './diff-format-types';
 import { useDiffMarkers } from './diff-markers';
-import { preserveClientIds } from './preserve-client-ids';
-import { diffRevisionContent } from './block-diff';
 
-const { ExperimentalBlockEditorProvider, usePrivateStyleOverride } = unlock(
-	blockEditorPrivateApis
-);
+const { usePrivateStyleOverride } = unlock( blockEditorPrivateApis );
 
 // SVG filter for removed blocks: grayscale + red tint
 const REVISION_REMOVED_FILTER_SVG = `
@@ -104,7 +95,7 @@ const REVISION_DIFF_STYLES = `
 function withRevisionDiffClasses( BlockListBlock ) {
 	return ( props ) => {
 		const { block, className } = props;
-		const diffStatus = block?.__revisionDiffStatus;
+		const diffStatus = block?.__revisionDiffStatus?.status;
 
 		const enhancedClassName = clsx( className, {
 			'is-revision-added': diffStatus === 'added',
@@ -151,12 +142,11 @@ function CanvasContent( { showDiff } ) {
 
 /**
  * Canvas component that renders a post revision in read-only mode.
+ * Block preparation and settings are handled by the parent EditorProvider.
  *
- * @param {Object}  props          Component props.
- * @param {boolean} props.showDiff Whether to show diff highlighting.
  * @return {React.JSX.Element} The revisions canvas component.
  */
-export default function RevisionsCanvas( { showDiff } ) {
+export default function RevisionsCanvas() {
 	useEffect( () => {
 		registerDiffFormatTypes();
 		return () => {
@@ -164,91 +154,23 @@ export default function RevisionsCanvas( { showDiff } ) {
 		};
 	}, [] );
 
-	const { revision, previousRevision, postType, blockEditorSettings } =
-		useSelect( ( select ) => {
-			const {
-				getCurrentRevision,
-				getPreviousRevision,
-				getCurrentPostType,
-			} = unlock( select( editorStore ) );
-			return {
-				revision: getCurrentRevision(),
-				previousRevision: getPreviousRevision(),
-				postType: getCurrentPostType(),
-				blockEditorSettings: select( blockEditorStore ).getSettings(),
-			};
-		}, [] );
-
-	// Track previously rendered blocks to preserve clientIds between renders.
-	const previousBlocksRef = useRef( [] );
-
-	const blocks = useMemo( () => {
-		const currentContent = revision?.content?.raw ?? '';
-
-		let parsedBlocks;
-		if ( showDiff ) {
-			const previousContent = previousRevision?.content?.raw || '';
-			// diffRevisionContent handles both normal diffing and the case
-			// where there's no previous revision (oldest revision shows all as added).
-			parsedBlocks = diffRevisionContent(
-				currentContent,
-				previousContent
-			);
-		} else {
-			// When diff is disabled, just parse the current revision content.
-			parsedBlocks = parse( currentContent );
-		}
-
-		if ( postType === 'wp_navigation' ) {
-			parsedBlocks = [
-				createBlock(
-					'core/navigation',
-					{ templateLock: false },
-					parsedBlocks
-				),
-			];
-		}
-
-		// Preserve clientIds from previous render to prevent React unmount/remount.
-		const blocksWithStableIds = preserveClientIds(
-			parsedBlocks,
-			previousBlocksRef.current
+	const { revision, showDiff } = useSelect( ( select ) => {
+		const { getCurrentRevision, isShowingRevisionDiff } = unlock(
+			select( editorStore )
 		);
-
-		// Update ref for next render.
-		previousBlocksRef.current = blocksWithStableIds;
-
-		return blocksWithStableIds;
-	}, [
-		revision?.content?.raw,
-		previousRevision?.content?.raw,
-		postType,
-		showDiff,
-	] );
-
-	const settings = useMemo(
-		() => ( {
-			...blockEditorSettings,
-			isPreviewMode: true,
-		} ),
-		[ blockEditorSettings ]
-	);
+		return {
+			revision: getCurrentRevision(),
+			showDiff: isShowingRevisionDiff(),
+		};
+	}, [] );
 
 	return revision ? (
-		// EntityProvider without kind/type/id inherits those from the
-		// parent context. Only revisionId is added so that useEntityProp
-		// reads from the revision record instead of the current entity.
-		<EntityProvider revisionId={ revision.id }>
-			<ExperimentalBlockEditorProvider
-				value={ blocks }
-				settings={ settings }
-			>
-				<DiffStyleOverrides showDiff={ showDiff } />
-				<div className="editor-revisions-canvas__content">
-					<CanvasContent showDiff={ showDiff } />
-				</div>
-			</ExperimentalBlockEditorProvider>
-		</EntityProvider>
+		<>
+			<DiffStyleOverrides showDiff={ showDiff } />
+			<div className="editor-revisions-canvas__content">
+				<CanvasContent showDiff={ showDiff } />
+			</div>
+		</>
 	) : (
 		<div className="editor-revisions-canvas__loading">
 			<Spinner />

package/src/components/post-revisions-preview/revisions-slider.js

@@ -35,7 +35,12 @@ function RevisionsSlider() {
 			}
 
 			const entityConfig = getEntityConfig( 'postType', postType );
-			const query = { per_page: -1, context: 'edit' };
+			const query = {
+				per_page: -1,
+				context: 'edit',
+				_fields:
+					'id,date,author,meta,title.raw,excerpt.raw,content.raw',
+			};
 			return {
 				revisions: getRevisions( 'postType', postType, postId, query ),
 				isLoading: isResolving( 'getRevisions', [

package/src/components/post-revisions-preview/test/block-diff.js

@@ -91,7 +91,7 @@ describe( 'diffRevisionContent', () => {
 				name: 'core/paragraph',
 				attributes: {
 					content: 'Hello',
-					__revisionDiffStatus: 'added',
+					__revisionDiffStatus: { status: 'added' },
 				},
 			},
 		] );
@@ -108,7 +108,7 @@ describe( 'diffRevisionContent', () => {
 				name: 'core/paragraph',
 				attributes: {
 					content: 'Hello',
-					__revisionDiffStatus: 'removed',
+					__revisionDiffStatus: { status: 'removed' },
 				},
 			},
 		] );
@@ -144,7 +144,9 @@ describe( 'diffRevisionContent', () => {
 			{
 				name: 'core/paragraph',
 				attributes: {
-					__revisionDiffStatus: 'modified',
+					__revisionDiffStatus: {
+						status: 'modified',
+					},
 				},
 			},
 		] );
@@ -167,7 +169,7 @@ describe( 'diffRevisionContent', () => {
 				name: 'core/paragraph',
 				attributes: {
 					content: 'NEW',
-					__revisionDiffStatus: 'added',
+					__revisionDiffStatus: { status: 'added' },
 				},
 			},
 			{
@@ -211,14 +213,14 @@ describe( 'diffRevisionContent', () => {
 				name: 'core/paragraph',
 				attributes: {
 					content: 'First new block',
-					__revisionDiffStatus: 'added',
+					__revisionDiffStatus: { status: 'added' },
 				},
 			},
 			{
 				name: 'core/paragraph',
 				attributes: {
 					content: 'Second new block',
-					__revisionDiffStatus: 'added',
+					__revisionDiffStatus: { status: 'added' },
 				},
 			},
 			{
@@ -227,7 +229,9 @@ describe( 'diffRevisionContent', () => {
 					// Inline diff: "existing" → "modified"
 					content:
 						'This is some <del title="Removed" class="revision-diff-removed">existing</del><ins title="Added" class="revision-diff-added">modified</ins> content',
-					__revisionDiffStatus: 'modified',
+					__revisionDiffStatus: {
+						status: 'modified',
+					},
 				},
 			},
 		] );
@@ -265,7 +269,7 @@ describe( 'diffRevisionContent', () => {
 						name: 'core/paragraph',
 						attributes: {
 							content: 'B',
-							__revisionDiffStatus: 'added',
+							__revisionDiffStatus: { status: 'added' },
 						},
 					},
 				],
@@ -305,7 +309,7 @@ describe( 'diffRevisionContent', () => {
 						name: 'core/paragraph',
 						attributes: {
 							content: 'B',
-							__revisionDiffStatus: 'removed',
+							__revisionDiffStatus: { status: 'removed' },
 						},
 					},
 				],
@@ -342,7 +346,7 @@ describe( 'diffRevisionContent', () => {
 				name: 'core/paragraph',
 				attributes: {
 					content: 'Second block content',
-					__revisionDiffStatus: 'added',
+					__revisionDiffStatus: { status: 'added' },
 				},
 			},
 			{
@@ -356,7 +360,7 @@ describe( 'diffRevisionContent', () => {
 				name: 'core/paragraph',
 				attributes: {
 					content: 'Second block content',
-					__revisionDiffStatus: 'removed',
+					__revisionDiffStatus: { status: 'removed' },
 				},
 			},
 		] );
@@ -381,7 +385,17 @@ describe( 'diffRevisionContent', () => {
 				attributes: {
 					content: 'Same content',
 					className: 'new-class',
-					__revisionDiffStatus: 'modified',
+					__revisionDiffStatus: {
+						status: 'modified',
+						changedAttributes: {
+							className: [
+								{
+									added: true,
+									value: 'new-class',
+								},
+							],
+						},
+					},
 				},
 			},
 		] );
@@ -410,7 +424,9 @@ describe( 'diffRevisionContent', () => {
 				attributes: {
 					content:
 						'Second block content<ins title="Added" class="revision-diff-added"> modified</ins>',
-					__revisionDiffStatus: 'modified',
+					__revisionDiffStatus: {
+						status: 'modified',
+					},
 				},
 			},
 			{
@@ -466,7 +482,9 @@ describe( 'diffRevisionContent', () => {
 									name: 'core/paragraph',
 									attributes: {
 										content: 'New',
-										__revisionDiffStatus: 'added',
+										__revisionDiffStatus: {
+											status: 'added',
+										},
 									},
 								},
 							],
@@ -490,7 +508,7 @@ describe( 'diffRevisionContent', () => {
 				{
 					name: 'core/group',
 					attributes: {
-						__revisionDiffStatus: 'added',
+						__revisionDiffStatus: { status: 'added' },
 					},
 					innerBlocks: [
 						{
@@ -526,7 +544,7 @@ describe( 'diffRevisionContent', () => {
 				{
 					name: 'core/group',
 					attributes: {
-						__revisionDiffStatus: 'removed',
+						__revisionDiffStatus: { status: 'removed' },
 					},
 					innerBlocks: [
 						{
@@ -577,7 +595,7 @@ describe( 'diffRevisionContent', () => {
 							name: 'core/paragraph',
 							attributes: {
 								content: 'NEW',
-								__revisionDiffStatus: 'added',
+								__revisionDiffStatus: { status: 'added' },
 							},
 						},
 						{
@@ -629,7 +647,9 @@ describe( 'diffRevisionContent', () => {
 						{
 							name: 'core/paragraph',
 							attributes: {
-								__revisionDiffStatus: 'modified',
+								__revisionDiffStatus: {
+									status: 'modified',
+								},
 							},
 						},
 					],
@@ -673,7 +693,7 @@ describe( 'diffRevisionContent', () => {
 							name: 'core/paragraph',
 							attributes: {
 								content: 'C',
-								__revisionDiffStatus: 'removed',
+								__revisionDiffStatus: { status: 'removed' },
 							},
 						},
 						{
@@ -682,7 +702,9 @@ describe( 'diffRevisionContent', () => {
 								// B→D modification with inline diff
 								content:
 									'<del title="Removed" class="revision-diff-removed">B</del><ins title="Added" class="revision-diff-added">D</ins>',
-								__revisionDiffStatus: 'modified',
+								__revisionDiffStatus: {
+									status: 'modified',
+								},
 							},
 						},
 					],
@@ -739,7 +761,7 @@ describe( 'diffRevisionContent', () => {
 							attributes: {
 								content:
 									'The quick brown fox jumps over the lazy dog near the riverbank',
-								__revisionDiffStatus: 'removed',
+								__revisionDiffStatus: { status: 'removed' },
 							},
 						},
 						{
@@ -747,7 +769,7 @@ describe( 'diffRevisionContent', () => {
 							attributes: {
 								content:
 									'Third paragraph also removed from this post',
-								__revisionDiffStatus: 'removed',
+								__revisionDiffStatus: { status: 'removed' },
 							},
 						},
 						{
@@ -755,7 +777,7 @@ describe( 'diffRevisionContent', () => {
 							attributes: {
 								content:
 									'Lorem ipsum dolor sit amet consectetur adipiscing elit sed do eiusmod',
-								__revisionDiffStatus: 'added',
+								__revisionDiffStatus: { status: 'added' },
 							},
 						},
 					],
@@ -803,7 +825,9 @@ describe( 'diffRevisionContent', () => {
 					attributes: {
 						content:
 							'Hello <strong><span title="1 format added" class="revision-diff-format-added">world</span></strong>',
-						__revisionDiffStatus: 'modified',
+						__revisionDiffStatus: {
+							status: 'modified',
+						},
 					},
 				},
 			] );
@@ -829,7 +853,9 @@ describe( 'diffRevisionContent', () => {
 					attributes: {
 						content:
 							'Hello <strong><del title="Removed" class="revision-diff-removed">world</del><ins title="Added" class="revision-diff-added">everyone</ins></strong>',
-						__revisionDiffStatus: 'modified',
+						__revisionDiffStatus: {
+							status: 'modified',
+						},
 					},
 				},
 			] );
@@ -879,7 +905,9 @@ describe( 'diffRevisionContent', () => {
 					attributes: {
 						content:
 							'Visit <a href="https://new-site.com"><span title="1 format changed" class="revision-diff-format-changed">our site</span></a> today',
-						__revisionDiffStatus: 'modified',
+						__revisionDiffStatus: {
+							status: 'modified',
+						},
 					},
 				},
 			] );
@@ -907,7 +935,9 @@ describe( 'diffRevisionContent', () => {
 					attributes: {
 						content:
 							'Visit <a href="https://example.com"><del title="Removed" class="revision-diff-removed">our</del><ins title="Added" class="revision-diff-added">the</ins> <del title="Removed" class="revision-diff-removed">site</del><ins title="Added" class="revision-diff-added">website</ins></a> today',
-						__revisionDiffStatus: 'modified',
+						__revisionDiffStatus: {
+							status: 'modified',
+						},
 					},
 				},
 			] );
@@ -955,7 +985,9 @@ describe( 'diffRevisionContent', () => {
 					attributes: {
 						content:
 							'<span title="1 format removed" class="revision-diff-format-removed">Bold</span> and <span title="1 format removed" class="revision-diff-format-removed">italic</span> text',
-						__revisionDiffStatus: 'modified',
+						__revisionDiffStatus: {
+							status: 'modified',
+						},
 					},
 				},
 			] );
@@ -981,7 +1013,9 @@ describe( 'diffRevisionContent', () => {
 					attributes: {
 						content:
 							'Hello <em><span title="1 format added, 1 format removed" class="revision-diff-format-changed">world</span></em>',
-						__revisionDiffStatus: 'modified',
+						__revisionDiffStatus: {
+							status: 'modified',
+						},
 					},
 				},
 			] );
@@ -1026,7 +1060,9 @@ describe( 'diffRevisionContent', () => {
 					attributes: {
 						content:
 							'<del title="Removed" class="revision-diff-removed">Hello</del><ins title="Added" class="revision-diff-added">Goodbye</ins> <strong>world</strong>!',
-						__revisionDiffStatus: 'modified',
+						__revisionDiffStatus: {
+							status: 'modified',
+						},
 					},
 				},
 			] );
@@ -1062,7 +1098,9 @@ describe( 'diffRevisionContent', () => {
 							attributes: {
 								content:
 									'<del title="Removed" class="revision-diff-removed">Hello</del><ins title="Added" class="revision-diff-added">Goodbye</ins> <strong><del title="Removed" class="revision-diff-removed">world</del><ins title="Added" class="revision-diff-added">everyone</ins></strong>',
-								__revisionDiffStatus: 'modified',
+								__revisionDiffStatus: {
+									status: 'modified',
+								},
 							},
 						},
 					],

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

@@ -25,18 +25,20 @@ import ResetDefaultTemplate from './reset-default-template';
 import { unlock } from '../../lock-unlock';
 import CreateNewTemplate from './create-new-template';
 
-export default function BlockThemeControl( { id } ) {
+export default function BlockThemeControl() {
 	const {
 		isTemplateHidden,
 		onNavigateToEntityRecord,
 		getEditorSettings,
 		hasGoBack,
 		hasSpecificTemplate,
+		id,
 	} = useSelect( ( select ) => {
 		const {
 			getRenderingMode,
 			getEditorSettings: _getEditorSettings,
 			getCurrentPost,
+			getCurrentTemplateId,
 		} = unlock( select( editorStore ) );
 		const editorSettings = _getEditorSettings();
 		const currentPost = getCurrentPost();
@@ -48,6 +50,7 @@ export default function BlockThemeControl( { id } ) {
 				'onNavigateToPreviousEntityRecord'
 			),
 			hasSpecificTemplate: !! currentPost.template,
+			id: getCurrentTemplateId(),
 		};
 	}, [] );
 

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

@@ -81,6 +81,48 @@ export function useAvailableTemplates( postType ) {
 	);
 }
 
+export function usePostTemplatePanelMode() {
+	return useSelect( ( select ) => {
+		const { getEditorSettings, getCurrentTemplateId, getCurrentPostType } =
+			select( editorStore );
+		const { getPostType, canUser } = select( coreStore );
+		const postTypeSlug = getCurrentPostType();
+		const postType = getPostType( postTypeSlug );
+		const settings = getEditorSettings();
+		const isBlockTheme = settings.__unstableIsBlockBasedTheme;
+		const hasTemplates =
+			!! settings.availableTemplates &&
+			Object.keys( settings.availableTemplates ).length > 0;
+		let isVisible;
+		if ( ! postType?.viewable ) {
+			isVisible = false;
+		} else if ( hasTemplates ) {
+			isVisible = true;
+		} else if ( ! settings.supportsTemplateMode ) {
+			isVisible = false;
+		} else {
+			isVisible =
+				canUser( 'create', {
+					kind: 'postType',
+					name: 'wp_template',
+				} ) ?? false;
+		}
+		const canViewTemplates = isVisible
+			? !! canUser( 'read', {
+					kind: 'postType',
+					name: 'wp_template',
+			  } )
+			: false;
+		if ( ( ! isBlockTheme || ! canViewTemplates ) && isVisible ) {
+			return 'classic';
+		}
+		if ( isBlockTheme && !! getCurrentTemplateId() ) {
+			return 'block-theme';
+		}
+		return null;
+	}, [] );
+}
+
 export function useCurrentTemplateSlug() {
 	const { postType, postId } = useEditedPostContext();
 	const templates = useTemplates( postType );

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

@@ -1,13 +1,7 @@
-/**
- * WordPress dependencies
- */
-import { useSelect } from '@wordpress/data';
-import { store as coreStore } from '@wordpress/core-data';
-
 /**
  * Internal dependencies
  */
-import { store as editorStore } from '../../store';
+import { usePostTemplatePanelMode } from './hooks';
 import ClassicThemeControl from './classic-theme';
 import BlockThemeControl from './block-theme';
 
@@ -17,60 +11,12 @@ import BlockThemeControl from './block-theme';
  * @return {React.ReactNode} The rendered PostTemplatePanel component.
  */
 export default function PostTemplatePanel() {
-	const { templateId, isBlockTheme } = useSelect( ( select ) => {
-		const { getCurrentTemplateId, getEditorSettings } =
-			select( editorStore );
-		return {
-			templateId: getCurrentTemplateId(),
-			isBlockTheme: getEditorSettings().__unstableIsBlockBasedTheme,
-		};
-	}, [] );
-
-	const isVisible = useSelect( ( select ) => {
-		const postTypeSlug = select( editorStore ).getCurrentPostType();
-		const postType = select( coreStore ).getPostType( postTypeSlug );
-		if ( ! postType?.viewable ) {
-			return false;
-		}
-
-		const settings = select( editorStore ).getEditorSettings();
-		const hasTemplates =
-			!! settings.availableTemplates &&
-			Object.keys( settings.availableTemplates ).length > 0;
-		if ( hasTemplates ) {
-			return true;
-		}
-
-		if ( ! settings.supportsTemplateMode ) {
-			return false;
-		}
-
-		const canCreateTemplates =
-			select( coreStore ).canUser( 'create', {
-				kind: 'postType',
-				name: 'wp_template',
-			} ) ?? false;
-		return canCreateTemplates;
-	}, [] );
-
-	const canViewTemplates = useSelect(
-		( select ) => {
-			return isVisible
-				? select( coreStore ).canUser( 'read', {
-						kind: 'postType',
-						name: 'wp_template',
-				  } )
-				: false;
-		},
-		[ isVisible ]
-	);
-
-	if ( ( ! isBlockTheme || ! canViewTemplates ) && isVisible ) {
+	const mode = usePostTemplatePanelMode();
+	if ( mode === 'classic' ) {
 		return <ClassicThemeControl />;
 	}
-
-	if ( isBlockTheme && !! templateId ) {
-		return <BlockThemeControl id={ templateId } />;
+	if ( mode === 'block-theme' ) {
+		return <BlockThemeControl />;
 	}
 	return null;
 }

package/src/components/preferences-modal/index.js

@@ -120,6 +120,24 @@ function PreferencesModalContents( { extraSections = {} } ) {
 									) }
 									label={ __( 'Show starter patterns' ) }
 								/>
+								<PreferenceToggleControl
+									scope="core"
+									featureName="showCollaborationCursor"
+									help={ __(
+										'Show your own avatar inside blocks during collaborative editing sessions.'
+									) }
+									label={ __( 'Show avatar in blocks' ) }
+								/>
+								<PreferenceToggleControl
+									scope="core"
+									featureName="showCollaborationNotifications"
+									help={ __(
+										'Show notifications when collaborators join, leave, or save the post.'
+									) }
+									label={ __(
+										'Show collaboration notifications'
+									) }
+								/>
 							</PreferencesModalSection>
 							<PreferencesModalSection
 								title={ __( 'Document settings' ) }