@wordpress/editor 14.40.2-next.v.202602241322.0 → 14.40.2

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' },
 				},
 			},
 			{
@@ -204,21 +206,23 @@ describe( 'diffRevisionContent', () => {
 		const normalized = normalizeBlockTree( blocks );
 
 		// Post-LCS pairing detects similar blocks and marks them as modified.
-		// The removed block is filtered out, modified block shows inline diff.
+		// Added blocks between the removed and added positions mean the
+		// modified block stays at the added position to preserve the
+		// current revision's layout.
 		expect( normalized ).toHaveLength( 3 );
 		expect( normalized ).toMatchObject( [
 			{
 				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 +231,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 +271,7 @@ describe( 'diffRevisionContent', () => {
 						name: 'core/paragraph',
 						attributes: {
 							content: 'B',
-							__revisionDiffStatus: 'added',
+							__revisionDiffStatus: { status: 'added' },
 						},
 					},
 				],
@@ -305,7 +311,7 @@ describe( 'diffRevisionContent', () => {
 						name: 'core/paragraph',
 						attributes: {
 							content: 'B',
-							__revisionDiffStatus: 'removed',
+							__revisionDiffStatus: { status: 'removed' },
 						},
 					},
 				],
@@ -342,7 +348,7 @@ describe( 'diffRevisionContent', () => {
 				name: 'core/paragraph',
 				attributes: {
 					content: 'Second block content',
-					__revisionDiffStatus: 'added',
+					__revisionDiffStatus: { status: 'added' },
 				},
 			},
 			{
@@ -356,7 +362,7 @@ describe( 'diffRevisionContent', () => {
 				name: 'core/paragraph',
 				attributes: {
 					content: 'Second block content',
-					__revisionDiffStatus: 'removed',
+					__revisionDiffStatus: { status: 'removed' },
 				},
 			},
 		] );
@@ -381,7 +387,17 @@ describe( 'diffRevisionContent', () => {
 				attributes: {
 					content: 'Same content',
 					className: 'new-class',
-					__revisionDiffStatus: 'modified',
+					__revisionDiffStatus: {
+						status: 'modified',
+						changedAttributes: {
+							className: [
+								{
+									added: true,
+									value: 'new-class',
+								},
+							],
+						},
+					},
 				},
 			},
 		] );
@@ -410,7 +426,9 @@ describe( 'diffRevisionContent', () => {
 				attributes: {
 					content:
 						'Second block content<ins title="Added" class="revision-diff-added"> modified</ins>',
-					__revisionDiffStatus: 'modified',
+					__revisionDiffStatus: {
+						status: 'modified',
+					},
 				},
 			},
 			{
@@ -466,7 +484,9 @@ describe( 'diffRevisionContent', () => {
 									name: 'core/paragraph',
 									attributes: {
 										content: 'New',
-										__revisionDiffStatus: 'added',
+										__revisionDiffStatus: {
+											status: 'added',
+										},
 									},
 								},
 							],
@@ -490,7 +510,7 @@ describe( 'diffRevisionContent', () => {
 				{
 					name: 'core/group',
 					attributes: {
-						__revisionDiffStatus: 'added',
+						__revisionDiffStatus: { status: 'added' },
 					},
 					innerBlocks: [
 						{
@@ -526,7 +546,7 @@ describe( 'diffRevisionContent', () => {
 				{
 					name: 'core/group',
 					attributes: {
-						__revisionDiffStatus: 'removed',
+						__revisionDiffStatus: { status: 'removed' },
 					},
 					innerBlocks: [
 						{
@@ -577,7 +597,7 @@ describe( 'diffRevisionContent', () => {
 							name: 'core/paragraph',
 							attributes: {
 								content: 'NEW',
-								__revisionDiffStatus: 'added',
+								__revisionDiffStatus: { status: 'added' },
 							},
 						},
 						{
@@ -629,7 +649,9 @@ describe( 'diffRevisionContent', () => {
 						{
 							name: 'core/paragraph',
 							attributes: {
-								__revisionDiffStatus: 'modified',
+								__revisionDiffStatus: {
+									status: 'modified',
+								},
 							},
 						},
 					],
@@ -654,7 +676,8 @@ describe( 'diffRevisionContent', () => {
 			const blocks = diffRevisionContent( current, previous );
 
 			// Post-LCS pairing matches B with D (same block type, high HTML similarity).
-			// C remains removed since it has no matching added block.
+			// Post-LCS pairing matches B with D. Modified block appears at
+			// B's position (earlier than D), C removed after.
 			expect( normalizeBlockTree( blocks ) ).toMatchObject( [
 				{
 					name: 'core/group',
@@ -669,20 +692,81 @@ describe( 'diffRevisionContent', () => {
 								__revisionDiffStatus: undefined,
 							},
 						},
+						{
+							name: 'core/paragraph',
+							attributes: {
+								// 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: {
+									status: 'modified',
+								},
+							},
+						},
 						{
 							name: 'core/paragraph',
 							attributes: {
 								content: 'C',
-								__revisionDiffStatus: 'removed',
+								__revisionDiffStatus: { status: 'removed' },
 							},
 						},
+					],
+				},
+			] );
+		} );
+
+		it( 'handles multiple inner block changes at once (similar content)', () => {
+			const previous = serialize( [
+				createBlock( 'core/group', {}, [
+					createBlock( 'core/paragraph', { content: 'A' } ),
+					createBlock( 'core/paragraph', {
+						content: 'The quick brown fox jumps over the lazy dog',
+					} ),
+					createBlock( 'core/paragraph', { content: 'C' } ),
+				] ),
+			] );
+			const current = serialize( [
+				createBlock( 'core/group', {}, [
+					createBlock( 'core/paragraph', { content: 'A' } ),
+					createBlock( 'core/paragraph', {
+						content: 'The quick brown fox leaps over the lazy dog',
+					} ),
+				] ),
+			] );
+			const blocks = diffRevisionContent( current, previous );
+
+			// Post-LCS pairing matches the fox sentences (high word overlap).
+			// Modified block at fox's original position, C removed after.
+			expect( normalizeBlockTree( blocks ) ).toMatchObject( [
+				{
+					name: 'core/group',
+					attributes: {
+						__revisionDiffStatus: undefined,
+					},
+					innerBlocks: [
 						{
 							name: 'core/paragraph',
 							attributes: {
-								// B→D modification with inline diff
+								content: 'A',
+								__revisionDiffStatus: undefined,
+							},
+						},
+						{
+							name: 'core/paragraph',
+							attributes: {
+								// jumps→leaps 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',
+									'The quick brown fox <del title="Removed" class="revision-diff-removed">jumps</del><ins title="Added" class="revision-diff-added">leaps</ins> over the lazy dog',
+								__revisionDiffStatus: {
+									status: 'modified',
+								},
+							},
+						},
+						{
+							name: 'core/paragraph',
+							attributes: {
+								content: 'C',
+								__revisionDiffStatus: { status: 'removed' },
 							},
 						},
 					],
@@ -690,6 +774,73 @@ describe( 'diffRevisionContent', () => {
 			] );
 		} );
 
+		it( 'pairs paragraphs in order when section is condensed', () => {
+			// Four paragraphs condensed into two. The first paragraph
+			// should pair and appear first, not after the removed blocks.
+			const previous = serialize( [
+				createBlock( 'core/paragraph', {
+					content:
+						'The International Space Station is the largest structure ever built in space. Assembled over more than a decade from modules launched by the United States, Russia, Europe, Japan, and Canada, it spans the area of a football field and weighs nearly a million pounds. It orbits Earth every ninety minutes at an altitude of roughly 250 miles, traveling at 17,500 miles per hour.',
+				} ),
+				createBlock( 'core/paragraph', {
+					content:
+						'The station has been continuously occupied since November 2, 2000 — the longest unbroken human presence in space. More than 270 people from twenty-one countries have visited. Its laboratories have hosted thousands of experiments in biology, physics, materials science, and medicine. Research on the ISS has advanced our understanding of protein crystallization, combustion, fluid dynamics, and the long-term effects of microgravity on the human body.',
+				} ),
+				createBlock( 'core/paragraph', {
+					content:
+						'But the ISS is also a lesson in the costs of international cooperation. Originally estimated at $8 billion, the total cost has exceeded $150 billion, making it by far the most expensive single object ever constructed. Its scientific output, while significant, has been modest relative to that investment. Critics argue that the same money spent on robotic missions and ground-based research would have yielded far greater scientific returns.',
+				} ),
+				createBlock( 'core/paragraph', {
+					content:
+						"The station's supporters counter that its value lies beyond pure science. The ISS demonstrated that former Cold War adversaries could work together on a project of extraordinary complexity. It kept human spaceflight alive during a period when no alternative destination existed. And it served as a testbed for the technologies and operational experience needed for future deep-space missions — life support systems, spacewalk procedures, crew psychology, and the logistics of sustaining humans far from Earth.",
+				} ),
+			] );
+			const current = serialize( [
+				createBlock( 'core/paragraph', {
+					content:
+						'The International Space Station is the largest structure ever built in space. Assembled over more than a decade from modules launched by the United States, Russia, Europe, Japan, and Canada, it spans the area of a football field. It has been continuously occupied since November 2000.',
+				} ),
+				createBlock( 'core/paragraph', {
+					content:
+						'More than 270 people from twenty-one countries have visited. Its laboratories have hosted thousands of experiments. The total cost has exceeded $150 billion, making it the most expensive single object ever constructed.',
+				} ),
+			] );
+			const blocks = diffRevisionContent( current, previous );
+			const normalized = normalizeBlockTree( blocks );
+
+			const statuses = normalized.map(
+				( b ) =>
+					b.attributes.__revisionDiffStatus?.status || 'unchanged'
+			);
+
+			// Pairings must not cross: if prev P1 pairs with curr P1,
+			// then prev P2 can only pair with curr P2 (not curr P1).
+			// Verify no crossing by checking modified blocks appear
+			// in a consistent order.
+			const modifiedIndices = [];
+			const removedIndices = [];
+			statuses.forEach( ( s, i ) => {
+				if ( s === 'modified' ) {
+					modifiedIndices.push( i );
+				}
+				if ( s === 'removed' ) {
+					removedIndices.push( i );
+				}
+			} );
+
+			// Prev P1 pairs with Curr P1 (high overlap — same opening,
+			// condensed ending). Prev P2-P4 are too different from
+			// Curr P2 to pair (score below 0.5 threshold), so they
+			// appear as separate removed + added blocks.
+			expect( statuses ).toEqual( [
+				'modified',
+				'removed',
+				'removed',
+				'removed',
+				'added',
+			] );
+		} );
+
 		it( 'does not pair blocks with completely different content', () => {
 			const previous = serialize( [
 				createBlock( 'core/group', {}, [
@@ -739,7 +890,7 @@ describe( 'diffRevisionContent', () => {
 							attributes: {
 								content:
 									'The quick brown fox jumps over the lazy dog near the riverbank',
-								__revisionDiffStatus: 'removed',
+								__revisionDiffStatus: { status: 'removed' },
 							},
 						},
 						{
@@ -747,7 +898,7 @@ describe( 'diffRevisionContent', () => {
 							attributes: {
 								content:
 									'Third paragraph also removed from this post',
-								__revisionDiffStatus: 'removed',
+								__revisionDiffStatus: { status: 'removed' },
 							},
 						},
 						{
@@ -755,7 +906,7 @@ describe( 'diffRevisionContent', () => {
 							attributes: {
 								content:
 									'Lorem ipsum dolor sit amet consectetur adipiscing elit sed do eiusmod',
-								__revisionDiffStatus: 'added',
+								__revisionDiffStatus: { status: 'added' },
 							},
 						},
 					],
@@ -803,7 +954,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 +982,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 +1034,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 +1064,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 +1114,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 +1142,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 +1189,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 +1227,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/preferences-modal/index.js

@@ -55,20 +55,25 @@ export default function EditorPreferencesModal( { extraSections = {} } ) {
 
 function PreferencesModalContents( { extraSections = {} } ) {
 	const isLargeViewport = useViewportMatch( 'medium' );
-	const showBlockBreadcrumbsOption = useSelect(
+	const { showBlockBreadcrumbsOption, showCollaborationOptions } = useSelect(
 		( select ) => {
-			const { getEditorSettings } = select( editorStore );
+			const { getEditorSettings, isCollaborationEnabledForCurrentPost } =
+				unlock( select( editorStore ) );
 			const { get } = select( preferencesStore );
 			const isRichEditingEnabled = getEditorSettings().richEditingEnabled;
 			const isDistractionFreeEnabled = get( 'core', 'distractionFree' );
-			return (
-				! isDistractionFreeEnabled &&
-				isLargeViewport &&
-				isRichEditingEnabled
-			);
+			return {
+				showBlockBreadcrumbsOption:
+					! isDistractionFreeEnabled &&
+					isLargeViewport &&
+					isRichEditingEnabled,
+				showCollaborationOptions:
+					isCollaborationEnabledForCurrentPost(),
+			};
 		},
 		[ isLargeViewport ]
 	);
+
 	const { setIsListViewOpened, setIsInserterOpened } =
 		useDispatch( editorStore );
 	const { set: setPreference } = useDispatch( preferencesStore );
@@ -120,6 +125,30 @@ function PreferencesModalContents( { extraSections = {} } ) {
 									) }
 									label={ __( 'Show starter patterns' ) }
 								/>
+								{ showCollaborationOptions && (
+									<>
+										<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' ) }
@@ -332,6 +361,7 @@ function PreferencesModalContents( { extraSections = {} } ) {
 			].filter( Boolean ),
 		[
 			showBlockBreadcrumbsOption,
+			showCollaborationOptions,
 			extraSections,
 			setIsInserterOpened,
 			setIsListViewOpened,

package/src/components/provider/disable-non-page-content-blocks.js

@@ -8,21 +8,33 @@ import { useEffect } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import usePostContentBlocks from './use-post-content-blocks';
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+import usePostContentBlockTypes from './use-post-content-block-types';
 
 /**
  * Component that when rendered, makes it so that the site editor allows only
  * page content to be edited.
  */
 export default function DisableNonPageContentBlocks() {
-	const contentOnlyIds = usePostContentBlocks();
-	const { templateParts } = useSelect( ( select ) => {
-		const { getBlocksByName } = select( blockEditorStore );
-		return {
-			templateParts: getBlocksByName( 'core/template-part' ),
-		};
-	}, [] );
-	const disabledIds = useSelect(
+	const postContentBlockTypes = usePostContentBlockTypes();
+	const { contentOnlyIds, templateParts } = useSelect(
+		( select ) => {
+			const { getPostBlocksByName } = unlock( select( editorStore ) );
+			const { getBlocksByName } = select( blockEditorStore );
+			return {
+				contentOnlyIds: getPostBlocksByName( postContentBlockTypes ),
+				templateParts: getBlocksByName( 'core/template-part' ),
+			};
+		},
+		[ postContentBlockTypes ]
+	);
+	// This is a separate `useSelect` because `templatePartChildren` is
+	// derived via flatMap, which always produces a new array. Combining it
+	// with the above subscription causes an infinite render loop: the new
+	// array fails useSelect's shallow equality check → re-render → effect
+	// fires setBlockEditingMode → store changes → useSelect re-runs → …
+	const templatePartChildren = useSelect(
 		( select ) => {
 			const { getBlockOrder } = select( blockEditorStore );
 			return templateParts.flatMap( ( clientId ) =>
@@ -34,14 +46,11 @@ export default function DisableNonPageContentBlocks() {
 
 	const registry = useRegistry();
 
-	// The code here is split into multiple `useEffects` calls.
-	// This is done to avoid setting/unsetting block editing modes multiple times unnecessarily.
-	//
-	// For example, the block editing mode of the root block (clientId: '') only
-	// needs to be set once, not when `contentOnlyIds` or `disabledIds` change.
-	//
-	// It's also unlikely that these different types of blocks are being inserted
-	// or removed at the same time, so using different effects reflects that.
+	// The effects below are split so that changes to one group of blocks
+	// don't cause unnecessary set/unset cycles for the others. For example,
+	// the root block ('') editing mode only needs to be set once.
+	// Child blocks of templates and templateParts are also loaded separately,
+	// so these are kept in separate effects.
 	useEffect( () => {
 		const { setBlockEditingMode, unsetBlockEditingMode } =
 			registry.dispatch( blockEditorStore );
@@ -53,25 +62,6 @@ export default function DisableNonPageContentBlocks() {
 		};
 	}, [ registry ] );
 
-	useEffect( () => {
-		const { setBlockEditingMode, unsetBlockEditingMode } =
-			registry.dispatch( blockEditorStore );
-
-		registry.batch( () => {
-			for ( const clientId of contentOnlyIds ) {
-				setBlockEditingMode( clientId, 'contentOnly' );
-			}
-		} );
-
-		return () => {
-			registry.batch( () => {
-				for ( const clientId of contentOnlyIds ) {
-					unsetBlockEditingMode( clientId );
-				}
-			} );
-		};
-	}, [ contentOnlyIds, registry ] );
-
 	useEffect( () => {
 		const { setBlockEditingMode, unsetBlockEditingMode } =
 			registry.dispatch( blockEditorStore );
@@ -95,20 +85,32 @@ export default function DisableNonPageContentBlocks() {
 		const { setBlockEditingMode, unsetBlockEditingMode } =
 			registry.dispatch( blockEditorStore );
 
+		const contentOnlySet = new Set( contentOnlyIds );
+
 		registry.batch( () => {
-			for ( const clientId of disabledIds ) {
-				setBlockEditingMode( clientId, 'disabled' );
+			for ( const clientId of contentOnlyIds ) {
+				setBlockEditingMode( clientId, 'contentOnly' );
+			}
+			for ( const clientId of templatePartChildren ) {
+				if ( ! contentOnlySet.has( clientId ) ) {
+					setBlockEditingMode( clientId, 'disabled' );
+				}
 			}
 		} );
 
 		return () => {
 			registry.batch( () => {
-				for ( const clientId of disabledIds ) {
+				for ( const clientId of contentOnlyIds ) {
 					unsetBlockEditingMode( clientId );
 				}
+				for ( const clientId of templatePartChildren ) {
+					if ( ! contentOnlySet.has( clientId ) ) {
+						unsetBlockEditingMode( clientId );
+					}
+				}
 			} );
 		};
-	}, [ disabledIds, registry ] );
+	}, [ contentOnlyIds, templatePartChildren, registry ] );
 
 	return null;
 }