@wordpress/core-data 7.47.0 → 7.48.1

package/src/awareness/test/post-editor-awareness.ts

@@ -584,6 +584,14 @@ describe( 'PostEditorAwareness', () => {
 	} );
 
 	describe( 'convertSelectionStateToAbsolute', () => {
+		const defaultEditorBlocks = [
+			{
+				clientId: 'block-1',
+				name: 'core/paragraph',
+				innerBlocks: [],
+			},
+		];
+
 		test( 'should return nulls when relative position cannot be resolved', () => {
 			const awareness = new PostEditorAwareness(
 				doc,
@@ -611,8 +619,10 @@ describe( 'PostEditorAwareness', () => {
 				},
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				defaultEditorBlocks
+			);
 
 			// Should return nulls when the relative position's type cannot be found
 			expect( result.richTextOffset ).toBeNull();
@@ -651,8 +661,10 @@ describe( 'PostEditorAwareness', () => {
 				},
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				defaultEditorBlocks
+			);
 
 			expect( result.richTextOffset ).toBe( 5 );
 			expect( result.localClientId ).toBe( 'block-1' );
@@ -684,8 +696,10 @@ describe( 'PostEditorAwareness', () => {
 				blockPosition,
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				defaultEditorBlocks
+			);
 
 			expect( result.richTextOffset ).toBeNull();
 			expect( result.localClientId ).toBe( 'block-1' );
@@ -700,9 +714,10 @@ describe( 'PostEditorAwareness', () => {
 				123
 			);
 
-			const result = awareness.convertSelectionStateToAbsolute( {
-				type: SelectionType.None,
-			} );
+			const result = awareness.convertSelectionStateToAbsolute(
+				{ type: SelectionType.None },
+				[]
+			);
 
 			expect( result.attributeKey ).toBeNull();
 		} );
@@ -737,8 +752,10 @@ describe( 'PostEditorAwareness', () => {
 				},
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				defaultEditorBlocks
+			);
 
 			expect( result.attributeKey ).toBe( 'body.0.cells.0.content' );
 		} );
@@ -905,13 +922,23 @@ describe( 'PostEditorAwareness', () => {
 				} ),
 			] );
 
-			mockBlockEditorStore( {
-				blocks: [
-					{ clientId: 'local-0', innerBlocks: [] },
-					{ clientId: 'local-1', innerBlocks: [] },
-					{ clientId: 'local-2', innerBlocks: [] },
-				],
-			} );
+			const editorBlocks = [
+				{
+					clientId: 'local-0',
+					name: 'core/paragraph',
+					innerBlocks: [],
+				},
+				{
+					clientId: 'local-1',
+					name: 'core/paragraph',
+					innerBlocks: [],
+				},
+				{
+					clientId: 'local-2',
+					name: 'core/paragraph',
+					innerBlocks: [],
+				},
+			];
 
 			const awareness = new PostEditorAwareness(
 				nestedDoc,
@@ -942,8 +969,10 @@ describe( 'PostEditorAwareness', () => {
 				},
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				editorBlocks
+			);
 
 			expect( result.richTextOffset ).toBe( 2 );
 			expect( result.localClientId ).toBe( 'local-2' );
@@ -968,17 +997,24 @@ describe( 'PostEditorAwareness', () => {
 
 			const nestedDoc = createTestDocWithBlocks( [ outerColumn ] );
 
-			mockBlockEditorStore( {
-				blocks: [
-					{
-						clientId: 'local-outer',
-						innerBlocks: [
-							{ clientId: 'local-inner-0', innerBlocks: [] },
-							{ clientId: 'local-inner-1', innerBlocks: [] },
-						],
-					},
-				],
-			} );
+			const editorBlocks = [
+				{
+					clientId: 'local-outer',
+					name: 'core/column',
+					innerBlocks: [
+						{
+							clientId: 'local-inner-0',
+							name: 'core/paragraph',
+							innerBlocks: [],
+						},
+						{
+							clientId: 'local-inner-1',
+							name: 'core/paragraph',
+							innerBlocks: [],
+						},
+					],
+				},
+			];
 
 			const awareness = new PostEditorAwareness(
 				nestedDoc,
@@ -1015,8 +1051,10 @@ describe( 'PostEditorAwareness', () => {
 				},
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				editorBlocks
+			);
 
 			expect( result.richTextOffset ).toBe( 5 );
 			expect( result.localClientId ).toBe( 'local-inner-1' );
@@ -1032,16 +1070,19 @@ describe( 'PostEditorAwareness', () => {
 
 			const nestedDoc = createTestDocWithBlocks( [ outerColumn ] );
 
-			mockBlockEditorStore( {
-				blocks: [
-					{
-						clientId: 'local-col',
-						innerBlocks: [
-							{ clientId: 'local-img', innerBlocks: [] },
-						],
-					},
-				],
-			} );
+			const editorBlocks = [
+				{
+					clientId: 'local-col',
+					name: 'core/column',
+					innerBlocks: [
+						{
+							clientId: 'local-img',
+							name: 'core/image',
+							innerBlocks: [],
+						},
+					],
+				},
+			];
 
 			const awareness = new PostEditorAwareness(
 				nestedDoc,
@@ -1070,8 +1111,10 @@ describe( 'PostEditorAwareness', () => {
 				blockPosition,
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				editorBlocks
+			);
 
 			expect( result.richTextOffset ).toBeNull();
 			expect( result.localClientId ).toBe( 'local-img' );
@@ -1103,29 +1146,35 @@ describe( 'PostEditorAwareness', () => {
 				outerColumns1,
 			] );
 
-			mockBlockEditorStore( {
-				blocks: [
-					{ clientId: 'local-outer-0', innerBlocks: [] },
-					{
-						clientId: 'local-outer-1',
-						innerBlocks: [
-							{
-								clientId: 'local-mid',
-								innerBlocks: [
-									{
-										clientId: 'local-deep-0',
-										innerBlocks: [],
-									},
-									{
-										clientId: 'local-deep-1',
-										innerBlocks: [],
-									},
-								],
-							},
-						],
-					},
-				],
-			} );
+			const editorBlocks = [
+				{
+					clientId: 'local-outer-0',
+					name: 'core/columns',
+					innerBlocks: [],
+				},
+				{
+					clientId: 'local-outer-1',
+					name: 'core/columns',
+					innerBlocks: [
+						{
+							clientId: 'local-mid',
+							name: 'core/column',
+							innerBlocks: [
+								{
+									clientId: 'local-deep-0',
+									name: 'core/paragraph',
+									innerBlocks: [],
+								},
+								{
+									clientId: 'local-deep-1',
+									name: 'core/paragraph',
+									innerBlocks: [],
+								},
+							],
+						},
+					],
+				},
+			];
 
 			const awareness = new PostEditorAwareness(
 				nestedDoc,
@@ -1164,8 +1213,10 @@ describe( 'PostEditorAwareness', () => {
 				},
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				editorBlocks
+			);
 
 			expect( result.richTextOffset ).toBe( 7 );
 			expect( result.localClientId ).toBe( 'local-deep-1' );
@@ -1175,6 +1226,14 @@ describe( 'PostEditorAwareness', () => {
 	} );
 
 	describe( 'convertSelectionStateToAbsolute with nested rich-text attributes', () => {
+		const editorBlocks = [
+			{
+				clientId: 'local-nested-attrs',
+				name: 'test/nested-rich-text',
+				innerBlocks: [],
+			},
+		];
+
 		test.each( NESTED_SELECTION_SEEDS )(
 			'resolves fuzzed nested rich-text cursor (seed %i)',
 			( seed ) => {
@@ -1185,15 +1244,6 @@ describe( 'PostEditorAwareness', () => {
 				);
 				const nestedDoc = createTestDocWithBlocks( [ block ] );
 
-				mockBlockEditorStore( {
-					blocks: [
-						{
-							clientId: 'local-nested-attrs',
-							innerBlocks: [],
-						},
-					],
-				} );
-
 				const target = rng.pick( targets );
 				const initialOffset = rng.intBetween(
 					1,
@@ -1233,8 +1283,10 @@ describe( 'PostEditorAwareness', () => {
 					},
 				};
 
-				const result =
-					awareness.convertSelectionStateToAbsolute( selection );
+				const result = awareness.convertSelectionStateToAbsolute(
+					selection,
+					editorBlocks
+				);
 
 				expect( result.richTextOffset ).toBe( expectedOffset );
 				expect( result.localClientId ).toBe( 'local-nested-attrs' );
@@ -1244,9 +1296,8 @@ describe( 'PostEditorAwareness', () => {
 		);
 	} );
 
-	describe( 'template mode (core/post-content handling)', () => {
-		test( 'should resolve cursor when getBlocks returns template tree with core/post-content', () => {
-			// Yjs doc has only the post content blocks (no template wrapper)
+	describe( 'post content blocks resolution', () => {
+		test( 'should resolve cursor with post content blocks', () => {
 			const templateDoc = createTestDocWithBlocks( [
 				createYBlock( 'yjs-para-0', 'core/paragraph', {
 					textContent: 'Post paragraph 1',
@@ -1256,55 +1307,20 @@ describe( 'PostEditorAwareness', () => {
 				} ),
 			] );
 
-			// In template mode, getBlocks() returns the full template tree.
-			// The Yjs paths are relative to post content, so the receiver needs
-			// to find core/post-content and navigate from there.
-			const postContentClientId = 'local-post-content';
-			const mockGetBlocks = jest
-				.fn()
-				.mockImplementation( ( rootClientId?: string ) => {
-					if ( rootClientId === postContentClientId ) {
-						// Controlled inner blocks of core/post-content
-						return [
-							{
-								clientId: 'local-para-0',
-								name: 'core/paragraph',
-								innerBlocks: [],
-							},
-							{
-								clientId: 'local-para-1',
-								name: 'core/paragraph',
-								innerBlocks: [],
-							},
-						];
-					}
-					// Full template tree
-					return [
-						{
-							clientId: 'local-header',
-							name: 'core/template-part',
-							innerBlocks: [],
-						},
-						{
-							clientId: 'local-group',
-							name: 'core/group',
-							innerBlocks: [
-								{
-									clientId: postContentClientId,
-									name: 'core/post-content',
-									innerBlocks: [], // empty because they're controlled inner blocks
-								},
-							],
-						},
-						{
-							clientId: 'local-footer',
-							name: 'core/template-part',
-							innerBlocks: [],
-						},
-					];
-				} );
-
-			mockBlockEditorStore( { getBlocks: mockGetBlocks } );
+			// The caller provides post content blocks directly
+			// (template detection is handled by usePostContentBlocks).
+			const postContentBlocks = [
+				{
+					clientId: 'local-para-0',
+					name: 'core/paragraph',
+					innerBlocks: [],
+				},
+				{
+					clientId: 'local-para-1',
+					name: 'core/paragraph',
+					innerBlocks: [],
+				},
+			];
 
 			const awareness = new PostEditorAwareness(
 				templateDoc,
@@ -1335,55 +1351,29 @@ describe( 'PostEditorAwareness', () => {
 				},
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				postContentBlocks
+			);
 
 			expect( result.richTextOffset ).toBe( 4 );
-			// Should resolve to the post-content inner block, not a template block
 			expect( result.localClientId ).toBe( 'local-para-1' );
-			// Verify getBlocks was called with the post-content clientId
-			expect( mockGetBlocks ).toHaveBeenCalledWith( postContentClientId );
 
 			templateDoc.destroy();
 		} );
 
-		test( 'should resolve WholeBlock in template mode', () => {
+		test( 'should resolve WholeBlock with post content blocks', () => {
 			const templateDoc = createTestDocWithBlocks( [
 				createYBlock( 'yjs-img', 'core/image' ),
 			] );
 
-			const postContentClientId = 'local-post-content';
-			const mockGetBlocks = jest
-				.fn()
-				.mockImplementation( ( rootClientId?: string ) => {
-					if ( rootClientId === postContentClientId ) {
-						return [
-							{
-								clientId: 'local-img',
-								name: 'core/image',
-								innerBlocks: [],
-							},
-						];
-					}
-					return [
-						{
-							clientId: 'local-group',
-							name: 'core/group',
-							innerBlocks: [
-								{
-									clientId: postContentClientId,
-									name: 'core/post-content',
-									innerBlocks: [],
-								},
-							],
-						},
-					];
-				} );
-
-			mockBlockEditorStore( {
-				getBlocks: mockGetBlocks,
-				getBlockName: 'core/image',
-			} );
+			const postContentBlocks = [
+				{
+					clientId: 'local-img',
+					name: 'core/image',
+					innerBlocks: [],
+				},
+			];
 
 			const awareness = new PostEditorAwareness(
 				templateDoc,
@@ -1407,8 +1397,10 @@ describe( 'PostEditorAwareness', () => {
 				blockPosition,
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				postContentBlocks
+			);
 
 			expect( result.richTextOffset ).toBeNull();
 			expect( result.localClientId ).toBe( 'local-img' );
@@ -1416,17 +1408,20 @@ describe( 'PostEditorAwareness', () => {
 			templateDoc.destroy();
 		} );
 
-		test( 'should fall back to root blocks when no core/post-content exists', () => {
-			// Normal mode (no template) — should use root blocks directly
+		test( 'should resolve with root blocks directly', () => {
 			const normalDoc = createTestDocWithBlocks( [
 				createYBlock( 'yjs-para', 'core/paragraph', {
 					textContent: 'Normal mode',
 				} ),
 			] );
 
-			mockBlockEditorStore( {
-				blocks: [ { clientId: 'local-para', innerBlocks: [] } ],
-			} );
+			const editorBlocks = [
+				{
+					clientId: 'local-para',
+					name: 'core/paragraph',
+					innerBlocks: [],
+				},
+			];
 
 			const awareness = new PostEditorAwareness(
 				normalDoc,
@@ -1456,8 +1451,10 @@ describe( 'PostEditorAwareness', () => {
 				},
 			};
 
-			const result =
-				awareness.convertSelectionStateToAbsolute( selection );
+			const result = awareness.convertSelectionStateToAbsolute(
+				selection,
+				editorBlocks
+			);
 
 			expect( result.richTextOffset ).toBe( 3 );
 			expect( result.localClientId ).toBe( 'local-para' );

package/src/entities.js

@@ -44,7 +44,7 @@ export const rootEntitiesConfig = [
 		baseURL: '/',
 		baseURLParams: {
 			// Please also change the preload path when changing this.
-			// @see lib/compat/wordpress-7.0/preload.php
+			// @see lib/compat/wordpress-7.1/preload.php
 			_fields: [
 				'description',
 				'gmt_offset',
@@ -306,11 +306,14 @@ export const prePersistPostType = async (
 		}
 	}
 
-	// Add meta for persisted CRDT document.
+	// Add meta for the persisted CRDT document during real post saves so the
+	// saved post and CRDT snapshot are committed in the same request. We don't
+	// want a post save to fail but a CRDT update to succeed or vice versa.
+	// CRDT repair uses /wp-sync/v1/save to avoid post-save side effects.
 	if ( persistedRecord ) {
 		const objectType = `postType/${ name }`;
 		const objectId = persistedRecord.id;
-		const serializedDoc = await getSyncManager()?.createPersistedCRDTDoc(
+		const serializedDoc = getSyncManager()?.createPersistedCRDTDoc(
 			objectType,
 			objectId
 		);
@@ -406,6 +409,9 @@ async function loadPostTypeEntities() {
 		 * @type {import('@wordpress/sync').SyncConfig}
 		 */
 		entity.syncConfig = {
+			// Save a CRDT document with this entity
+			supportsPersistence: true,
+
 			/**
 			 * Apply changes from the local editor to the local CRDT document so
 			 * that those changes can be synced to other peers (via the provider).

package/src/hooks/test/use-post-editor-awareness-state.ts

@@ -28,6 +28,14 @@ jest.mock( '../../sync', () => ( {
 	getSyncManager: jest.fn(),
 } ) );
 
+const mockPostContentBlocks = [
+	{ clientId: 'block-1', name: 'core/paragraph', innerBlocks: [] },
+];
+
+jest.mock( '../../awareness/block-lookup', () => ( {
+	usePostContentBlocks: jest.fn( () => mockPostContentBlocks ),
+} ) );
+
 const mockAvatarUrls = {
 	'24': 'https://example.com/avatar-24.png',
 	'48': 'https://example.com/avatar-48.png',
@@ -299,7 +307,7 @@ describe( 'use-post-editor-awareness-state hooks', () => {
 			} );
 		} );
 
-		test( 'should call awareness.convertSelectionStateToAbsolute with selection', () => {
+		test( 'should call awareness.convertSelectionStateToAbsolute with selection and blocks', () => {
 			const mockSelection: SelectionCursor = {
 				type: SelectionType.Cursor,
 				cursorPosition: {
@@ -321,7 +329,7 @@ describe( 'use-post-editor-awareness-state hooks', () => {
 
 			expect(
 				mockAwareness.convertSelectionStateToAbsolute
-			).toHaveBeenCalledWith( mockSelection );
+			).toHaveBeenCalledWith( mockSelection, mockPostContentBlocks );
 			expect( position ).toEqual( {
 				richTextOffset: 10,
 				localClientId: 'block-1',

package/src/hooks/use-post-editor-awareness-state.ts

@@ -2,13 +2,15 @@
  * External dependencies
  */
 import { usePrevious } from '@wordpress/compose';
-import { useEffect, useState } from '@wordpress/element';
+import { useEffect, useState, useCallback } from '@wordpress/element';
 import type { Y } from '@wordpress/sync';
 
 /**
  * Internal dependencies
  */
 import { getSyncManager } from '../sync';
+import { usePostContentBlocks } from '../awareness/block-lookup';
+import type { EditorStoreBlock } from '../awareness/block-lookup';
 import type {
 	PostEditorAwarenessState as ActiveCollaborator,
 	PostSaveEvent,
@@ -19,7 +21,10 @@ import type { PostEditorAwareness } from '../awareness/post-editor-awareness';
 
 interface AwarenessState {
 	activeCollaborators: ActiveCollaborator[];
-	resolveSelection: ( selection: SelectionState ) => ResolvedSelection;
+	resolveSelection: (
+		selection: SelectionState,
+		blocks: EditorStoreBlock[]
+	) => ResolvedSelection;
 	getDebugData: () => YDocDebugData;
 	isCurrentCollaboratorDisconnected: boolean;
 }
@@ -49,8 +54,10 @@ function getAwarenessState(
 
 	return {
 		activeCollaborators,
-		resolveSelection: ( selection: SelectionState ) =>
-			awareness.convertSelectionStateToAbsolute( selection ),
+		resolveSelection: (
+			selection: SelectionState,
+			blocks: EditorStoreBlock[]
+		) => awareness.convertSelectionStateToAbsolute( selection, blocks ),
 		getDebugData: () => awareness.getDebugData(),
 		isCurrentCollaboratorDisconnected:
 			activeCollaborators.find( ( collaborator ) => collaborator.isMe )
@@ -124,7 +131,13 @@ export function useResolvedSelection(
 	postId: number | null,
 	postType: string | null
 ): ( selection: SelectionState ) => ResolvedSelection {
-	return usePostEditorAwarenessState( postId, postType ).resolveSelection;
+	const blocks = usePostContentBlocks();
+	const awarenessState = usePostEditorAwarenessState( postId, postType );
+	return useCallback(
+		( selection: SelectionState ) =>
+			awarenessState.resolveSelection( selection, blocks ),
+		[ blocks, awarenessState ]
+	);
 }
 
 /**
@@ -158,8 +171,8 @@ export function useIsDisconnected(
 
 /**
  * Hook that subscribes to the CRDT state map and returns the most recent
- * save event (timestamp + client ID). The state map is updated by
- * `markEntityAsSaved` in `@wordpress/sync`
+ * user-facing post save event (timestamp + client ID). The state map is
+ * updated by `markEntityAsSaved` in `@wordpress/sync`.
  *
  * @param postId   The ID of the post.
  * @param postType The type of the post.

package/src/private-actions.js

@@ -197,6 +197,24 @@ export function receiveViewConfig( kind, name, config ) {
 	};
 }
 
+/**
+ * Returns an action object used to notify core-data that the sync undo manager
+ * state changed outside of the core-data reducer, e.g. The Yjs UndoManager
+ * captured an undo level.
+ *
+ * @param {Object}  state         The sync undo stack state.
+ * @param {boolean} state.hasRedo Whether there are changes to redo.
+ * @param {boolean} state.hasUndo Whether there are changes to undo.
+ *
+ * @return {Object} Action object.
+ */
+export function __unstableNotifySyncUndoManagerChange( state ) {
+	return {
+		type: 'SYNC_UNDO_MANAGER_CHANGE',
+		...state,
+	};
+}
+
 /**
  * Returns an action object used to set the sync connection status for an entity or collection.
  *