@wordpress/editor 14.45.0 → 14.45.2-next.v.202605131006.0

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

@@ -206,7 +206,9 @@ 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( [
 			{
@@ -674,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',
@@ -689,6 +692,17 @@ 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: {
@@ -696,22 +710,137 @@ describe( 'diffRevisionContent', () => {
 								__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>',
+									'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' },
+							},
+						},
 					],
 				},
 			] );
 		} );
 
+		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', {}, [

package/src/components/post-template/style.scss

@@ -13,7 +13,7 @@
 		padding: $grid-unit-20 0;
 		transform: translateY(- $grid-unit-05); // Offsets the top padding on the modal content container
 		margin-bottom: - $grid-unit-05;
-		z-index: z-index(".editor-post-template__swap-template-search");
+		z-index: 2; // Above the BlockPreview z-index: 1 overlay in the scrolling list.
 	}
 }
 

package/src/components/start-page-options/style.scss

@@ -1,7 +1,6 @@
 @use "@wordpress/base-styles/colors" as *;
 @use "@wordpress/base-styles/mixins" as *;
 @use "@wordpress/base-styles/variables" as *;
-@use "@wordpress/base-styles/z-index" as *;
 
 $actions-height: 72px;
 
@@ -17,7 +16,8 @@ $actions-height: 72px;
 		padding-left: $grid-unit-40;
 		padding-right: $grid-unit-40;
 		border-top: 1px solid $gray-300;
-		z-index: z-index(".editor-start-page-options__modal__actions");
+		// Ensure modal footer actions appear above the modal's scrolling content.
+		z-index: 1;
 	}
 
 	.block-editor-block-patterns-list {

package/src/components/start-template-options/style.scss

@@ -1,7 +1,6 @@
 @use "@wordpress/base-styles/colors" as *;
 @use "@wordpress/base-styles/mixins" as *;
 @use "@wordpress/base-styles/variables" as *;
-@use "@wordpress/base-styles/z-index" as *;
 
 $actions-height: 92px;
 
@@ -17,7 +16,8 @@ $actions-height: 92px;
 		padding-left: $grid-unit-40;
 		padding-right: $grid-unit-40;
 		border-top: 1px solid $gray-300;
-		z-index: z-index(".editor-start-template-options__modal__actions");
+		// Ensure modal footer actions appear above the modal's scrolling content.
+		z-index: 1;
 	}
 
 	.block-editor-block-patterns-list {

package/src/store/private-actions.js

@@ -16,6 +16,7 @@ import { dateI18n, getSettings as getDateSettings } from '@wordpress/date';
  * Internal dependencies
  */
 import isTemplateRevertable from './utils/is-template-revertable';
+import { buildRevisionsPageQuery } from './private-selectors';
 export * from '../dataviews/store/private-actions';
 
 /**
@@ -589,6 +590,39 @@ export function setCurrentRevisionId( revisionId ) {
 	};
 }
 
+/**
+ * Set the current revisions page number and select the newest
+ * revision on that page once it loads.
+ *
+ * @param {number} page The page number.
+ */
+export const setRevisionPage =
+	( page ) =>
+	async ( { dispatch, select, registry } ) => {
+		const postType = select.getCurrentPostType();
+		const postId = select.getCurrentPostId();
+		const entityConfig = registry
+			.select( coreStore )
+			.getEntityConfig( 'postType', postType );
+		const revisionKey = entityConfig?.revisionKey || 'id';
+
+		const revisions = await registry
+			.resolveSelect( coreStore )
+			.getRevisions(
+				'postType',
+				postType,
+				postId,
+				buildRevisionsPageQuery( revisionKey, page )
+			);
+
+		registry.batch( () => {
+			dispatch( { type: 'SET_REVISION_PAGE', page } );
+			if ( revisions?.length ) {
+				dispatch.setCurrentRevisionId( revisions[ 0 ][ revisionKey ] );
+			}
+		} );
+	};
+
 /**
  * Set whether the revision diff highlighting is shown.
  *

package/src/store/private-selectors.js

@@ -21,7 +21,12 @@ import { store as preferencesStore } from '@wordpress/preferences';
 /**
  * Internal dependencies
  */
-import { getRenderingMode, getCurrentPost } from './selectors';
+import {
+	getRenderingMode,
+	getCurrentPost,
+	getEditorSettings,
+	getCurrentPostRevisionsCount,
+} from './selectors';
 import {
 	getEntityActions as _getEntityActions,
 	getEntityFields as _getEntityFields,
@@ -297,6 +302,11 @@ export const getDefaultRenderingMode = createRegistrySelector(
 			'core',
 			'renderingModes'
 		)?.[ theme ]?.[ postType ];
+
+		if ( RENDERING_MODES.includes( defaultModePreference ) ) {
+			return defaultModePreference;
+		}
+
 		const postTypeDefaultMode = Array.isArray(
 			postTypeEntity?.supports?.editor
 		)
@@ -305,14 +315,18 @@ export const getDefaultRenderingMode = createRegistrySelector(
 			  )?.[ 'default-mode' ]
 			: undefined;
 
-		const defaultMode = defaultModePreference || postTypeDefaultMode;
+		if ( RENDERING_MODES.includes( postTypeDefaultMode ) ) {
+			return postTypeDefaultMode;
+		}
+
+		const settingsDefaultMode =
+			getEditorSettings( state ).defaultRenderingMode;
 
-		// Fallback gracefully to 'post-only' when rendering mode is not supported.
-		if ( ! RENDERING_MODES.includes( defaultMode ) ) {
-			return 'post-only';
+		if ( RENDERING_MODES.includes( settingsDefaultMode ) ) {
+			return settingsDefaultMode;
 		}
 
-		return defaultMode;
+		return 'post-only';
 	}
 );
 
@@ -336,6 +350,85 @@ export function getShowStylebook( state ) {
 	return state.showStylebook ?? false;
 }
 
+/**
+ * Returns the current revisions page number.
+ *
+ * @param {Object} state Global application state.
+ * @return {number} The page number.
+ */
+export function getRevisionPage( state ) {
+	return state.revisionPage;
+}
+
+/**
+ * Builds the query object for fetching a page of revisions.
+ *
+ * @param {string} revisionKey The entity's revision key.
+ * @param {number} page        The 1-based page number (page 1 = newest).
+ * @return {Object} Query object for getRevisions.
+ */
+export function buildRevisionsPageQuery( revisionKey, page ) {
+	return {
+		per_page: REVISIONS_PER_PAGE,
+		page,
+		context: 'edit',
+		orderby: 'date',
+		order: 'desc',
+		_fields: [
+			...new Set( [
+				'id',
+				'date',
+				'modified',
+				'author',
+				'meta',
+				'title.raw',
+				'excerpt.raw',
+				'content.raw',
+				revisionKey,
+			] ),
+		].join(),
+	};
+}
+
+const REVISIONS_PER_PAGE = 100;
+
+export function getRevisionsPerPage() {
+	return REVISIONS_PER_PAGE;
+}
+
+/**
+ * Returns revisions for the given page number.
+ *
+ * @param {Object} state Global application state.
+ * @param {number} page  The 1-based page number (page 1 = newest).
+ * @return {Array|null} The revisions array, or null if not yet loaded.
+ */
+export const getPageRevisions = createRegistrySelector(
+	( select ) => ( state, page ) => {
+		if ( ! page ) {
+			return null;
+		}
+
+		const { type: postType, id: postId } = getCurrentPost( state );
+		if ( ! postType || ! postId ) {
+			return null;
+		}
+
+		const entityConfig = select( coreStore ).getEntityConfig(
+			'postType',
+			postType
+		);
+		const revisionKey = entityConfig?.revisionKey || 'id';
+
+		return select( coreStore ).getRevisions(
+			'postType',
+			postType,
+			postId,
+			buildRevisionsPageQuery( revisionKey, page )
+		);
+	}
+);
+
 /**
  * Returns whether the editor is in revisions preview mode.
  *
@@ -379,40 +472,22 @@ export const getCurrentRevision = createRegistrySelector(
 			return undefined;
 		}
 
+		const page = getRevisionPage( state );
+		if ( ! page ) {
+			return null;
+		}
+
 		const { type: postType, id: postId } = getCurrentPost( state );
 		const entityConfig = select( coreStore ).getEntityConfig(
 			'postType',
 			postType
 		);
 		const revisionKey = entityConfig?.revisionKey || 'id';
-		// - Use getRevisions (plural) instead of getRevision (singular) to
-		//   avoid a race condition where both API calls complete around the
-		//   same time and the single revision fetch overwrites the list in the
-		//   store.
-		// - getRevision also needs to be updated to check if there's any
-		//   received revisions from the collection API call to avoid unnecessary
-		//   API calls.
 		const revisions = select( coreStore ).getRevisions(
 			'postType',
 			postType,
 			postId,
-			{
-				per_page: -1,
-				context: 'edit',
-				_fields: [
-					...new Set( [
-						'id',
-						'date',
-						'modified',
-						'author',
-						'meta',
-						'title.raw',
-						'excerpt.raw',
-						'content.raw',
-						revisionKey,
-					] ),
-				].join(),
-			}
+			buildRevisionsPageQuery( revisionKey, page )
 		);
 		if ( ! revisions ) {
 			return null;
@@ -459,35 +534,23 @@ export const getPreviousRevision = createRegistrySelector(
 			return undefined;
 		}
 
+		const page = getRevisionPage( state );
+		if ( ! page ) {
+			return null;
+		}
+
 		const { type: postType, id: postId } = getCurrentPost( state );
 		const entityConfig = select( coreStore ).getEntityConfig(
 			'postType',
 			postType
 		);
 		const revisionKey = entityConfig?.revisionKey || 'id';
+		const query = buildRevisionsPageQuery( revisionKey, page );
 		const revisions = select( coreStore ).getRevisions(
 			'postType',
 			postType,
 			postId,
-			{
-				per_page: -1,
-				context: 'edit',
-				orderby: 'date',
-				order: 'asc',
-				_fields: [
-					...new Set( [
-						'id',
-						'date',
-						'modified',
-						'author',
-						'meta',
-						'title.raw',
-						'excerpt.raw',
-						'content.raw',
-						revisionKey,
-					] ),
-				].join(),
-			}
+			query
 		);
 		if ( ! revisions ) {
 			return null;
@@ -499,8 +562,21 @@ export const getPreviousRevision = createRegistrySelector(
 		);
 
 		// Return the previous revision (older one) if it exists.
-		if ( currentIndex > 0 ) {
-			return revisions[ currentIndex - 1 ];
+		if ( currentIndex >= 0 && currentIndex < revisions.length - 1 ) {
+			return revisions[ currentIndex + 1 ];
+		}
+
+		// At page boundary: fetch the first revision from the next page.
+		const totalRevisions = getCurrentPostRevisionsCount( state );
+		const totalPages = Math.ceil( totalRevisions / query.per_page ) || 1;
+		if ( currentIndex === revisions.length - 1 && page < totalPages ) {
+			const nextPageRevisions = select( coreStore ).getRevisions(
+				'postType',
+				postType,
+				postId,
+				buildRevisionsPageQuery( revisionKey, page + 1 )
+			);
+			return nextPageRevisions?.[ 0 ] ?? null;
 		}
 
 		return null;

package/src/store/reducer.js

@@ -434,6 +434,26 @@ export function revisionId( state = null, action ) {
 	return state;
 }
 
+/**
+ * Reducer for the current revisions page number.
+ *
+ * @param {number} state  Current page number.
+ * @param {Object} action Dispatched action.
+ * @return {number} Updated state.
+ */
+export function revisionPage( state = 1, action ) {
+	switch ( action.type ) {
+		case 'SET_REVISION_PAGE':
+			return action.page;
+		case 'SET_CURRENT_REVISION_ID':
+			if ( ! action.revisionId ) {
+				return 1;
+			}
+			return state;
+	}
+	return state;
+}
+
 /**
  * Reducer for whether the revision diff is shown.
  * Resets to true when entering/exiting revisions mode.
@@ -490,6 +510,7 @@ export default combineReducers( {
 	stylesPath,
 	showStylebook,
 	revisionId,
+	revisionPage,
 	showRevisionDiff,
 	selectedNote,
 	dataviews: dataviewsReducer,

package/src/store/selectors.js

@@ -1253,6 +1253,12 @@ export const isEditorPanelOpened = createRegistrySelector(
 /**
  * A block selection object.
  *
+ * This type is duplicated to avoid creating circular dependencies.
+ *
+ * @see {import("@wordpress/block-editor/src/store/actions").WPBlockSelection}
+ * @see {import("@wordpress/block-editor/src/store/selectors").WPBlockSelection}
+ * @see {import("@wordpress/core-data/src/types").WPBlockSelection}
+ *
  * @typedef {Object} WPBlockSelection
  *
  * @property {string} clientId     A block client ID.

package/src/store/test/private-selectors.js

@@ -1,7 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { store as coreStore } from '@wordpress/core-data';
+import { store as preferencesStore } from '@wordpress/preferences';
+
 /**
  * Internal dependencies
  */
-import { getPostBlocksByName } from '../private-selectors';
+import {
+	getDefaultRenderingMode,
+	getPostBlocksByName,
+} from '../private-selectors';
 
 describe( 'getPostBlocksByName', () => {
 	const state = {
@@ -76,3 +85,100 @@ describe( 'getPostBlocksByName', () => {
 		expect( result ).toEqual( [ 'block1', 'block2', 'block3' ] );
 	} );
 } );
+
+describe( 'getDefaultRenderingMode', () => {
+	function setupRegistry( {
+		supportsEditor = true,
+		theme = 'twentytwentyfive',
+		renderingModes = null,
+	} = {} ) {
+		getDefaultRenderingMode.registry = {
+			select: ( store ) => {
+				if ( store === coreStore ) {
+					return {
+						getPostType: () => ( {
+							supports: { editor: supportsEditor },
+						} ),
+						getCurrentTheme: () => ( { stylesheet: theme } ),
+						hasFinishedResolution: () => true,
+					};
+				}
+				if ( store === preferencesStore ) {
+					return {
+						get: () => renderingModes,
+					};
+				}
+			},
+		};
+	}
+
+	describe( 'editor.default-mode post type support', () => {
+		it( 'default-mode from post type support should be respected when no user preference is saved', () => {
+			setupRegistry( {
+				supportsEditor: [ { 'default-mode': 'template-locked' } ],
+			} );
+			const state = {
+				editorSettings: { defaultRenderingMode: 'post-only' },
+			};
+
+			expect( getDefaultRenderingMode( state, 'post' ) ).toBe(
+				'template-locked'
+			);
+		} );
+
+		it( 'user preference should take priority over post type supports registered default-mode support', () => {
+			setupRegistry( {
+				theme: 'twentytwentyfive',
+				supportsEditor: [ { 'default-mode': 'template-locked' } ],
+				renderingModes: { twentytwentyfive: { post: 'post-only' } },
+			} );
+			const state = {
+				editorSettings: { defaultRenderingMode: 'post-only' },
+			};
+
+			expect( getDefaultRenderingMode( state, 'post' ) ).toBe(
+				'post-only'
+			);
+		} );
+	} );
+
+	describe( 'defaultRenderingMode from editor settings', () => {
+		it( 'uses defaultRenderingMode from editor settings when no user preference is saved', () => {
+			setupRegistry( { renderingModes: null } );
+			const state = {
+				editorSettings: { defaultRenderingMode: 'template-locked' },
+			};
+
+			expect( getDefaultRenderingMode( state, 'post' ) ).toBe(
+				'template-locked'
+			);
+		} );
+
+		it( 'user preference takes priority over defaultRenderingMode from editor settings', () => {
+			setupRegistry( {
+				theme: 'twentytwentyfive',
+				renderingModes: {
+					twentytwentyfive: { post: 'template-locked' },
+				},
+			} );
+			const state = {
+				editorSettings: { defaultRenderingMode: 'post-only' },
+			};
+
+			expect( getDefaultRenderingMode( state, 'post' ) ).toBe(
+				'template-locked'
+			);
+		} );
+
+		it( 'falls back to post-only when defaultRenderingMode in settings is the default', () => {
+			setupRegistry( { renderingModes: null } );
+			const state = {
+				editorSettings: { defaultRenderingMode: 'post-only' },
+			};
+
+			expect( getDefaultRenderingMode( state, 'post' ) ).toBe(
+				'post-only'
+			);
+		} );
+	} );
+} );