@wordpress/editor 14.41.2-next.v.202603161435.0 → 14.43.0

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

@@ -28,6 +28,22 @@ import { unlock } from '../../lock-unlock';
 
 const { parseRawBlock } = unlock( blocksPrivateApis );
 
+/**
+ * Safely stringifies a value for display and comparison.
+ *
+ * @param {*} value The value to stringify.
+ * @return {string} The stringified value.
+ */
+function stringifyValue( value ) {
+	if ( value === null || value === undefined ) {
+		return '';
+	}
+	if ( typeof value === 'object' ) {
+		return JSON.stringify( value, null, 2 );
+	}
+	return String( value );
+}
+
 /**
  * Calculate text similarity using word diff (semantically meaningful).
  * Returns ratio of unchanged words to total words.
@@ -65,7 +81,7 @@ function pairSimilarBlocks( blocks ) {
 
 	// Separate blocks by status, tracking original indices.
 	blocks.forEach( ( block, index ) => {
-		const status = block.__revisionDiffStatus;
+		const status = block.__revisionDiffStatus?.status;
 		if ( status === 'removed' ) {
 			removed.push( { block, index } );
 		} else if ( status === 'added' ) {
@@ -120,7 +136,7 @@ function pairSimilarBlocks( blocks ) {
 			// Create modified block with previous content stored.
 			modifications.set( bestMatch.index, {
 				...bestMatch.block,
-				__revisionDiffStatus: 'modified',
+				__revisionDiffStatus: { status: 'modified' },
 				__previousRawBlock: rem.block,
 			} );
 		}
@@ -176,14 +192,14 @@ function diffRawBlocks( currentRaw, previousRaw ) {
 			for ( let i = 0; i < part.count; i++ ) {
 				result.push( {
 					...currentRaw[ currIdx++ ],
-					__revisionDiffStatus: 'added',
+					__revisionDiffStatus: { status: 'added' },
 				} );
 			}
 		} else if ( part.removed ) {
 			for ( let i = 0; i < part.count; i++ ) {
 				result.push( {
 					...previousRaw[ prevIdx++ ],
-					__revisionDiffStatus: 'removed',
+					__revisionDiffStatus: { status: 'removed' },
 				} );
 			}
 		} else {
@@ -481,26 +497,28 @@ function applyRichTextDiff( currentRichText, previousRichText ) {
 }
 
 /**
- * Apply rich text diff to all rich-text attributes of a block.
- * Compares each rich-text attribute between current and previous parsed blocks.
+ * Apply diffs to a modified block's attributes.
+ * - Rich-text attributes: applies inline diff formatting (ins/del marks).
+ * - Other attributes: computes word-level diffs for the sidebar panel.
  *
  * @param {Object} currentBlock  Current parsed block.
  * @param {Object} previousBlock Previous parsed block.
+ * @param {Object} diffStatus    The __revisionDiffStatus object to attach changedAttributes to.
  */
-function applyRichTextDiffToBlock( currentBlock, previousBlock ) {
+function applyDiffToBlock( currentBlock, previousBlock, diffStatus ) {
 	const blockType = getBlockType( currentBlock.name );
 	if ( ! blockType ) {
 		return;
 	}
 
-	// Find rich-text attributes and compare
+	const changedAttributes = {};
+
 	for ( const [ attrName, attrDef ] of Object.entries(
 		blockType.attributes
 	) ) {
 		if ( attrDef.source === 'rich-text' ) {
 			const currentRichText = currentBlock.attributes[ attrName ];
 			const previousRichText = previousBlock.attributes[ attrName ];
-
 			if (
 				currentRichText instanceof RichTextData &&
 				previousRichText instanceof RichTextData
@@ -510,8 +528,22 @@ function applyRichTextDiffToBlock( currentBlock, previousBlock ) {
 					previousRichText
 				);
 			}
+		} else {
+			const currStr = stringifyValue(
+				currentBlock.attributes[ attrName ]
+			);
+			const prevStr = stringifyValue(
+				previousBlock.attributes[ attrName ]
+			);
+			if ( currStr !== prevStr ) {
+				changedAttributes[ attrName ] = diffWords( prevStr, currStr );
+			}
 		}
 	}
+
+	if ( Object.keys( changedAttributes ).length > 0 ) {
+		diffStatus.changedAttributes = changedAttributes;
+	}
 }
 
 /**
@@ -525,18 +557,25 @@ function applyRichTextDiffToBlock( currentBlock, previousBlock ) {
 function applyDiffRecursively( parsedBlock, rawBlock ) {
 	// Copy diff status from raw block to parsed block.
 	if ( rawBlock.__revisionDiffStatus ) {
-		parsedBlock.__revisionDiffStatus = rawBlock.__revisionDiffStatus;
-	}
-
-	// Apply rich text diff if this block is modified and has a previous raw block.
-	if (
-		rawBlock.__revisionDiffStatus === 'modified' &&
-		rawBlock.__previousRawBlock
-	) {
-		const previousParsed = parseRawBlock( rawBlock.__previousRawBlock );
-		if ( previousParsed ) {
-			applyRichTextDiffToBlock( parsedBlock, previousParsed );
+		// Apply diffs if this block is modified and has a previous raw block.
+		if (
+			rawBlock.__revisionDiffStatus.status === 'modified' &&
+			rawBlock.__previousRawBlock
+		) {
+			const previousParsed = parseRawBlock( rawBlock.__previousRawBlock );
+			if ( previousParsed ) {
+				applyDiffToBlock(
+					parsedBlock,
+					previousParsed,
+					rawBlock.__revisionDiffStatus
+				);
+			}
 		}
+
+		parsedBlock.__revisionDiffStatus = rawBlock.__revisionDiffStatus;
+		// Also store in attributes so it survives block-editor store normalization.
+		parsedBlock.attributes.__revisionDiffStatus =
+			rawBlock.__revisionDiffStatus;
 	}
 
 	// Recursively process inner blocks.

package/src/components/post-revisions-preview/diff-markers.js

@@ -32,10 +32,10 @@ const { useBlockElementRef } = unlock( blockEditorPrivateApis );
 function collectDiffBlocks( blocks ) {
 	const result = [];
 	for ( const block of blocks ) {
-		if ( block.__revisionDiffStatus ) {
+		if ( block.__revisionDiffStatus?.status ) {
 			result.push( {
 				clientId: block.clientId,
-				status: block.__revisionDiffStatus,
+				status: block.__revisionDiffStatus.status,
 			} );
 		}
 		if ( block.innerBlocks?.length ) {

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

@@ -95,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',

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

@@ -35,11 +35,23 @@ function RevisionsSlider() {
 			}
 
 			const entityConfig = getEntityConfig( 'postType', postType );
+			const _revisionKey = entityConfig?.revisionKey || 'id';
 			const query = {
 				per_page: -1,
 				context: 'edit',
-				_fields:
-					'id,date,author,meta,title.raw,excerpt.raw,content.raw',
+				_fields: [
+					...new Set( [
+						'id',
+						'date',
+						'modified',
+						'author',
+						'meta',
+						'title.raw',
+						'excerpt.raw',
+						'content.raw',
+						_revisionKey,
+					] ),
+				].join(),
 			};
 			return {
 				revisions: getRevisions( 'postType', postType, postId, query ),
@@ -52,7 +64,7 @@ function RevisionsSlider() {
 				currentRevisionId: unlock(
 					select( editorStore )
 				).getCurrentRevisionId(),
-				revisionKey: entityConfig?.revisionKey || 'id',
+				revisionKey: _revisionKey,
 			};
 		},
 		[]
@@ -60,14 +72,21 @@ function RevisionsSlider() {
 
 	const { setCurrentRevisionId } = unlock( useDispatch( editorStore ) );
 
+	// Template revisions use the template REST API format, which exposes
+	// 'modified' instead of 'date'.
+	const revisionDateField = revisionKey === 'wp_id' ? 'modified' : 'date';
+
 	const sortedRevisions = useMemo( () => {
 		return (
 			revisions
 				?.slice()
-				.sort( ( a, b ) => new Date( a.date ) - new Date( b.date ) ) ??
-			[]
+				.sort(
+					( a, b ) =>
+						new Date( a[ revisionDateField ] ) -
+						new Date( b[ revisionDateField ] )
+				) ?? []
 		);
-	}, [ revisions ] );
+	}, [ revisions, revisionDateField ] );
 
 	const selectedIndex = sortedRevisions.findIndex(
 		( r ) => r[ revisionKey ] === currentRevisionId
@@ -87,7 +106,10 @@ function RevisionsSlider() {
 		if ( ! revision ) {
 			return index;
 		}
-		return dateI18n( dateSettings.formats.datetime, revision.date );
+		return dateI18n(
+			dateSettings.formats.datetime,
+			revision[ revisionDateField ]
+		);
 	};
 
 	if ( isLoading ) {

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/create-new-template-modal.js

@@ -118,10 +118,7 @@ export default function CreateNewTemplateModal( { onClose } ) {
 			size="small"
 			overlayClassName="editor-post-template__create-template-modal"
 		>
-			<form
-				className="editor-post-template__create-form"
-				onSubmit={ submit }
-			>
+			<form onSubmit={ submit }>
 				<VStack spacing="3">
 					<TextControl
 						__next40pxDefaultSize