@wordpress/core-data 7.40.2-next.v.202602241322.0 → 7.40.2

package/src/utils/test/crdt.ts

@@ -8,22 +8,117 @@ import { Y } from '@wordpress/sync';
  */
 import { describe, expect, it, jest, beforeEach } from '@jest/globals';
 
+/**
+ * Mock getBlockTypes so isRichTextAttribute can identify rich-text attrs.
+ */
+jest.mock( '@wordpress/blocks', () => {
+	const actual = jest.requireActual( '@wordpress/blocks' ) as Record<
+		string,
+		unknown
+	>;
+	return {
+		...actual,
+		getBlockTypes: () => [
+			{
+				name: 'core/paragraph',
+				attributes: { content: { type: 'rich-text' } },
+			},
+			{
+				name: 'core/table',
+				attributes: {
+					hasFixedLayout: { type: 'boolean' },
+					caption: { type: 'rich-text' },
+					body: {
+						type: 'array',
+						query: {
+							cells: {
+								type: 'array',
+								query: {
+									content: { type: 'rich-text' },
+									tag: { type: 'string' },
+								},
+							},
+						},
+					},
+				},
+			},
+		],
+	};
+} );
+
+/**
+ * WordPress dependencies
+ */
+import { RichTextData } from '@wordpress/rich-text';
+
 /**
  * Internal dependencies
  */
-import {
-	CRDT_RECORD_MAP_KEY,
-	WORDPRESS_META_KEY_FOR_CRDT_DOC_PERSISTENCE,
-} from '../../sync';
+import { CRDT_RECORD_MAP_KEY } from '../../sync';
 import {
 	applyPostChangesToCRDTDoc,
+	defaultCollectionSyncConfig,
 	getPostChangesFromCRDTDoc,
+	POST_META_KEY_FOR_CRDT_DOC_PERSISTENCE,
 	type PostChanges,
 	type YPostRecord,
 } from '../crdt';
-import type { YBlock, YBlocks } from '../crdt-blocks';
+import type { YBlock, YBlockRecord, YBlocks } from '../crdt-blocks';
+import { updateSelectionHistory } from '../crdt-selection';
 import { createYMap, getRootMap, type YMapWrap } from '../crdt-utils';
-import type { Post, Type } from '../../entity-types';
+import type { Post } from '../../entity-types';
+
+// Default synced properties matching the base set built in entities.js,
+// plus 'categories' and 'tags' as example taxonomy rest_base values.
+const defaultSyncedProperties = new Set< string >( [
+	'blocks',
+	'categories',
+	'content',
+	'date',
+	'excerpt',
+	'meta',
+	'slug',
+	'status',
+	'tags',
+	'title',
+] );
+
+describe( 'defaultCollectionSyncConfig', () => {
+	it( 'has no-op applyChangesToCRDTDoc', () => {
+		const doc = new Y.Doc();
+		// Should not throw and return undefined.
+		expect(
+			defaultCollectionSyncConfig.applyChangesToCRDTDoc( doc, {
+				title: 'test',
+			} )
+		).toBeUndefined();
+		doc.destroy();
+	} );
+
+	it( 'has getChangesFromCRDTDoc that returns empty object', () => {
+		const doc = new Y.Doc();
+		const result = defaultCollectionSyncConfig.getChangesFromCRDTDoc( doc, {
+			title: 'test',
+		} );
+		expect( result ).toEqual( {} );
+		doc.destroy();
+	} );
+
+	it( 'shouldSync returns true when objectId is null (collection)', () => {
+		expect(
+			defaultCollectionSyncConfig.shouldSync?.( 'comment', null )
+		).toBe( true );
+	} );
+
+	it( 'shouldSync returns false when objectId is provided (individual record)', () => {
+		expect(
+			defaultCollectionSyncConfig.shouldSync?.( 'comment', '123' )
+		).toBe( false );
+		expect(
+			defaultCollectionSyncConfig.shouldSync?.( 'comment', 'foo' )
+		).toBe( false );
+	} );
+} );
 
 describe( 'crdt', () => {
 	let doc: Y.Doc;
@@ -38,8 +133,6 @@ describe( 'crdt', () => {
 	} );
 
 	describe( 'applyPostChangesToCRDTDoc', () => {
-		const mockPostType = {} as Type;
-
 		let map: YMapWrap< YPostRecord >;
 
 		beforeEach( () => {
@@ -51,7 +144,7 @@ describe( 'crdt', () => {
 				title: 'New Title',
 			} as PostChanges;
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			const title = map.get( 'title' );
 			expect( title ).toBeInstanceOf( Y.Text );
@@ -64,7 +157,7 @@ describe( 'crdt', () => {
 				unsyncedProperty: 'value',
 			} as unknown as PostChanges;
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			expect( map.has( 'unsyncedProperty' ) ).toBe( false );
 			expect( map.get( 'title' )?.toString() ).toBe( 'New Title' );
@@ -75,7 +168,7 @@ describe( 'crdt', () => {
 				title: () => 'function value',
 			} as unknown as PostChanges;
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			expect( map.has( 'title' ) ).toBe( false );
 		} );
@@ -85,7 +178,7 @@ describe( 'crdt', () => {
 				title: { raw: 'Raw Title', rendered: 'Rendered Title' },
 			};
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			const title = map.get( 'title' );
 			expect( title ).toBeInstanceOf( Y.Text );
@@ -97,7 +190,7 @@ describe( 'crdt', () => {
 				title: 'Auto Draft',
 			} as PostChanges;
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			const title = map.get( 'title' );
 			expect( title ).toBeInstanceOf( Y.Text );
@@ -109,7 +202,7 @@ describe( 'crdt', () => {
 			applyPostChangesToCRDTDoc(
 				doc,
 				{ title: '' } as PostChanges,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			const title = map.get( 'title' );
@@ -120,7 +213,7 @@ describe( 'crdt', () => {
 			applyPostChangesToCRDTDoc(
 				doc,
 				{ title: 'Auto Draft' } as PostChanges,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( map.get( 'title' )?.toString() ).toBe( '' );
@@ -135,7 +228,7 @@ describe( 'crdt', () => {
 				},
 			};
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			const excerpt = map.get( 'excerpt' );
 			expect( excerpt ).toBeInstanceOf( Y.Text );
@@ -147,7 +240,7 @@ describe( 'crdt', () => {
 				slug: '',
 			};
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			expect( map.has( 'slug' ) ).toBe( false );
 		} );
@@ -157,7 +250,7 @@ describe( 'crdt', () => {
 				slug: 'my-post-slug',
 			};
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			expect( map.get( 'slug' ) ).toBe( 'my-post-slug' );
 		} );
@@ -175,7 +268,7 @@ describe( 'crdt', () => {
 				],
 			};
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			expect( ( map.get( 'blocks' ) as YBlocks ).toJSON() ).toEqual(
 				changes.blocks
@@ -187,7 +280,7 @@ describe( 'crdt', () => {
 				blocks: [],
 			};
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			const blocks = map.get( 'blocks' );
 			expect( blocks ).toBeInstanceOf( Y.Array );
@@ -201,7 +294,7 @@ describe( 'crdt', () => {
 				blocks: undefined,
 			};
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			// The key should still exist, but the value should be undefined.
 			expect( map.has( 'blocks' ) ).toBe( true );
@@ -213,7 +306,7 @@ describe( 'crdt', () => {
 				content: 'Hello, world!',
 			} as PostChanges;
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			const content = map.get( 'content' );
 			expect( content ).toBeInstanceOf( Y.Text );
@@ -228,7 +321,7 @@ describe( 'crdt', () => {
 				},
 			} as PostChanges;
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			const content = map.get( 'content' );
 			expect( content ).toBeInstanceOf( Y.Text );
@@ -242,7 +335,7 @@ describe( 'crdt', () => {
 			applyPostChangesToCRDTDoc(
 				doc,
 				{ title: 'Old Title' } as PostChanges,
-				mockPostType
+				defaultSyncedProperties
 			);
 			const titleRef = map.get( 'title' );
 
@@ -250,7 +343,7 @@ describe( 'crdt', () => {
 			applyPostChangesToCRDTDoc(
 				doc,
 				{ title: 'New Title' } as PostChanges,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( map.get( 'title' ) ).toBe( titleRef );
@@ -262,7 +355,7 @@ describe( 'crdt', () => {
 			applyPostChangesToCRDTDoc(
 				doc,
 				{ content: 'Old content' } as PostChanges,
-				mockPostType
+				defaultSyncedProperties
 			);
 			const contentRef = map.get( 'content' );
 
@@ -270,7 +363,7 @@ describe( 'crdt', () => {
 			applyPostChangesToCRDTDoc(
 				doc,
 				{ content: 'New content' } as PostChanges,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( map.get( 'content' ) ).toBe( contentRef );
@@ -282,7 +375,7 @@ describe( 'crdt', () => {
 			applyPostChangesToCRDTDoc(
 				doc,
 				{ excerpt: 'Old excerpt' } as PostChanges,
-				mockPostType
+				defaultSyncedProperties
 			);
 			const excerptRef = map.get( 'excerpt' );
 
@@ -290,7 +383,7 @@ describe( 'crdt', () => {
 			applyPostChangesToCRDTDoc(
 				doc,
 				{ excerpt: 'New excerpt' } as PostChanges,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( map.get( 'excerpt' ) ).toBe( excerptRef );
@@ -308,7 +401,7 @@ describe( 'crdt', () => {
 			metaMap.set( 'some_meta', 'old value' );
 			map.set( 'meta', metaMap );
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			expect( metaMap.get( 'some_meta' ) ).toBe( 'new value' );
 		} );
@@ -324,7 +417,7 @@ describe( 'crdt', () => {
 			metaMap.set( 'some_meta', 'old value' );
 			map.set( 'meta', metaMap );
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			expect( metaMap.get( 'some_meta' ) ).toStrictEqual( [
 				'value',
@@ -339,23 +432,40 @@ describe( 'crdt', () => {
 				},
 			};
 
-			applyPostChangesToCRDTDoc( doc, changes, mockPostType );
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
 
 			const metaMap = map.get( 'meta' );
 			expect( metaMap ).toBeInstanceOf( Y.Map );
 			expect( metaMap?.get( 'custom_field' ) ).toBe( 'value' );
 		} );
+
+		it( 'syncs taxonomy rest_base values included in syncedProperties', () => {
+			const changes = {
+				categories: [ 1, 2, 3 ],
+				genre: [ 10, 20 ], // should be ignored
+				tags: [ 4, 5 ],
+			} as unknown as PostChanges;
+
+			applyPostChangesToCRDTDoc( doc, changes, defaultSyncedProperties );
+
+			expect( map.get( 'categories' ) ).toEqual( [ 1, 2, 3 ] );
+			expect( map.get( 'genre' ) ).toBeUndefined();
+			expect( map.get( 'tags' ) ).toEqual( [ 4, 5 ] );
+
+			const customSyncedProperties = new Set( [
+				...defaultSyncedProperties,
+				'genre', // now included
+			] );
+
+			applyPostChangesToCRDTDoc( doc, changes, customSyncedProperties );
+
+			expect( map.get( 'categories' ) ).toEqual( [ 1, 2, 3 ] );
+			expect( map.get( 'genre' ) ).toEqual( [ 10, 20 ] );
+			expect( map.get( 'tags' ) ).toEqual( [ 4, 5 ] );
+		} );
 	} );
 
 	describe( 'getPostChangesFromCRDTDoc', () => {
-		const mockPostType = {
-			slug: 'post',
-			supports: {
-				title: true,
-				editor: true,
-			},
-		} as unknown as Type;
-
 		let map: YMapWrap< YPostRecord >;
 
 		beforeEach( () => {
@@ -374,7 +484,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes.title ).toBe( 'CRDT Title' );
@@ -389,7 +499,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes ).not.toHaveProperty( 'unsyncedProp' );
@@ -406,7 +516,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes ).not.toHaveProperty( 'status' );
@@ -425,7 +535,7 @@ describe( 'crdt', () => {
 			const changesWithEmptyDate = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changesWithEmptyDate ).not.toHaveProperty( 'date' );
@@ -435,7 +545,7 @@ describe( 'crdt', () => {
 			const changesWithDefinedDate = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changesWithDefinedDate ).not.toHaveProperty( 'date' );
@@ -454,7 +564,7 @@ describe( 'crdt', () => {
 			const changesWithEmptyDate = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changesWithEmptyDate ).not.toHaveProperty( 'date' );
@@ -464,7 +574,7 @@ describe( 'crdt', () => {
 			const changesWithDefinedDate = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changesWithDefinedDate ).not.toHaveProperty( 'date' );
@@ -480,12 +590,74 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes ).toHaveProperty( 'blocks' );
 		} );
 
+		it( 'returns rich-text block attributes as RichTextData, not strings', () => {
+			// Simulate User A writing a paragraph block into the CRDT doc.
+			addBlockToDoc( map, 'block-1', 'Hello world' );
+
+			// Simulate User B reading the CRDT doc with no local blocks.
+			const editedRecord = { blocks: [] } as unknown as Post;
+
+			const changes = getPostChangesFromCRDTDoc(
+				doc,
+				editedRecord,
+				defaultSyncedProperties
+			);
+
+			const block = ( changes.blocks as any[] )?.[ 0 ];
+			expect( block ).toBeDefined();
+			expect( block.attributes.content ).toBeInstanceOf( RichTextData );
+			expect( block.attributes.content.text ).toBe( 'Hello world' );
+		} );
+
+		it( 'returns nested rich-text in array attributes as RichTextData', () => {
+			// Add a table block to the CRDT doc with nested cell content
+			// stored as plain strings.
+			let blocks = map.get( 'blocks' );
+			if ( ! ( blocks instanceof Y.Array ) ) {
+				blocks = new Y.Array< YBlock >();
+				map.set( 'blocks', blocks );
+			}
+
+			const tableBlock = createYMap< YBlockRecord >();
+			tableBlock.set( 'name', 'core/table' );
+			tableBlock.set( 'clientId', 'table-1' );
+			const attrs = new Y.Map();
+			attrs.set( 'body', [
+				{
+					cells: [
+						{ content: '<strong>Cell</strong>', tag: 'td' },
+						{ content: 'Plain', tag: 'td' },
+					],
+				},
+			] );
+			tableBlock.set( 'attributes', attrs );
+			tableBlock.set( 'innerBlocks', new Y.Array() );
+			( blocks as YBlocks ).push( [ tableBlock ] );
+
+			const editedRecord = { blocks: [] } as unknown as Post;
+
+			const changes = getPostChangesFromCRDTDoc(
+				doc,
+				editedRecord,
+				defaultSyncedProperties
+			);
+
+			const block = ( changes.blocks as any[] )?.[ 0 ];
+			expect( block ).toBeDefined();
+
+			const cell = block.attributes.body[ 0 ].cells[ 0 ];
+			expect( cell.content ).toBeInstanceOf( RichTextData );
+			expect( ( cell.content as RichTextData ).toHTMLString() ).toBe(
+				'<strong>Cell</strong>'
+			);
+		} );
+
 		it( 'includes undefined blocks in changes', () => {
 			map.set( 'blocks', undefined );
 
@@ -502,7 +674,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes ).toHaveProperty( 'blocks' );
@@ -519,7 +691,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes.content ).toBe( 'New content' );
@@ -535,7 +707,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes.content ).toBe( 'New content' );
@@ -551,7 +723,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes ).not.toHaveProperty( 'content' );
@@ -571,7 +743,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes.meta ).toEqual( {
@@ -593,7 +765,7 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes.meta ).toEqual( {
@@ -601,13 +773,34 @@ describe( 'crdt', () => {
 			} );
 		} );
 
+		it( 'excludes orphaned meta keys not present on the edited record', () => {
+			// If post meta is registered, saved (landing in a CRDT doc),
+			// then unregistered, it can permanently mark the record dirty.
+			// Orphaned values should not show up as a change.
+			const metaMap = createYMap();
+			metaMap.set( 'registered_meta', 'value' );
+			metaMap.set( 'orphaned_meta', 'stale value' );
+			map.set( 'meta', metaMap );
+
+			const editedRecord = {
+				meta: {
+					registered_meta: 'value',
+				},
+			} as unknown as Post;
+
+			const changes = getPostChangesFromCRDTDoc(
+				doc,
+				editedRecord,
+				defaultSyncedProperties
+			);
+
+			expect( changes ).not.toHaveProperty( 'meta' );
+		} );
+
 		it( 'excludes disallowed meta keys in changes', () => {
 			const metaMap = createYMap();
 			metaMap.set( 'public_meta', 'new value' );
-			metaMap.set(
-				WORDPRESS_META_KEY_FOR_CRDT_DOC_PERSISTENCE,
-				'exclude me'
-			);
+			metaMap.set( POST_META_KEY_FOR_CRDT_DOC_PERSISTENCE, 'exclude me' );
 			map.set( 'meta', metaMap );
 
 			const editedRecord = {
@@ -619,15 +812,185 @@ describe( 'crdt', () => {
 			const changes = getPostChangesFromCRDTDoc(
 				doc,
 				editedRecord,
-				mockPostType
+				defaultSyncedProperties
 			);
 
 			expect( changes.meta ).toEqual( {
 				public_meta: 'new value', // from CRDT
 			} );
 			expect( changes.meta ).not.toHaveProperty(
-				WORDPRESS_META_KEY_FOR_CRDT_DOC_PERSISTENCE
+				POST_META_KEY_FOR_CRDT_DOC_PERSISTENCE
 			);
 		} );
+
+		it( 'returns taxonomy rest_base changes when in syncedProperties', () => {
+			map.set( 'categories', [ 1, 2 ] );
+			map.set( 'genre', [ 10, 20 ] );
+			map.set( 'tags', [ 3 ] );
+
+			const editedRecord = {
+				categories: [ 1 ],
+				genre: [ 10 ], // should be ignored
+				tags: [],
+			} as unknown as Post;
+
+			const changes = getPostChangesFromCRDTDoc(
+				doc,
+				editedRecord,
+				defaultSyncedProperties
+			) as Record< string, unknown >;
+
+			expect( changes.categories ).toEqual( [ 1, 2 ] );
+			expect( changes.genre ).toBeUndefined();
+			expect( changes.tags ).toEqual( [ 3 ] );
+
+			const customSyncedProperties = new Set( [
+				...defaultSyncedProperties,
+				'genre', // now included
+			] );
+
+			const changes2 = getPostChangesFromCRDTDoc(
+				doc,
+				editedRecord,
+				customSyncedProperties
+			) as Record< string, unknown >;
+
+			expect( changes2.categories ).toEqual( [ 1, 2 ] );
+			expect( changes2.genre ).toEqual( [ 10, 20 ] );
+			expect( changes2.tags ).toEqual( [ 3 ] );
+		} );
+
+		describe( 'selection recalculation', () => {
+			it( 'includes recalculated selection when text is inserted before cursor', () => {
+				const ytext = addBlockToDoc( map, 'block-1', 'Hello world' );
+
+				// Record a selection at offset 5 (cursor between "Hello" and " world").
+				updateSelectionHistory( doc, {
+					selectionStart: {
+						clientId: 'block-1',
+						attributeKey: 'content',
+						offset: 5,
+					},
+					selectionEnd: {
+						clientId: 'block-1',
+						attributeKey: 'content',
+						offset: 5,
+					},
+				} );
+
+				// Simulate remote insertion: insert "XXX" at position 0.
+				ytext.insert( 0, 'XXX' );
+
+				const editedRecord = {
+					title: 'CRDT Title',
+					status: 'draft',
+					blocks: [],
+				} as unknown as Post;
+
+				const changes = getPostChangesFromCRDTDoc(
+					doc,
+					editedRecord,
+					defaultSyncedProperties
+				);
+
+				expect( changes.selection ).toBeDefined();
+				expect( changes.selection?.selectionStart.offset ).toBe( 8 ); // 5 + 3
+				expect( changes.selection?.selectionStart.clientId ).toBe(
+					'block-1'
+				);
+				expect( changes.selection?.selectionStart.attributeKey ).toBe(
+					'content'
+				);
+				expect( changes.selection?.selectionEnd.offset ).toBe( 8 );
+			} );
+
+			it( 'includes recalculated selection when text is deleted before cursor', () => {
+				const ytext = addBlockToDoc( map, 'block-1', 'Hello world' );
+
+				// Record a selection at offset 8 (cursor between "Hello wo" and "rld").
+				updateSelectionHistory( doc, {
+					selectionStart: {
+						clientId: 'block-1',
+						attributeKey: 'content',
+						offset: 8,
+					},
+					selectionEnd: {
+						clientId: 'block-1',
+						attributeKey: 'content',
+						offset: 8,
+					},
+				} );
+
+				// Simulate remote deletion: delete "Hello" (5 chars at position 0).
+				ytext.delete( 0, 5 );
+
+				const editedRecord = {
+					title: 'CRDT Title',
+					status: 'draft',
+					blocks: [],
+				} as unknown as Post;
+
+				const changes = getPostChangesFromCRDTDoc(
+					doc,
+					editedRecord,
+					defaultSyncedProperties
+				);
+
+				expect( changes.selection ).toBeDefined();
+				expect( changes.selection?.selectionStart.offset ).toBe( 3 ); // 8 - 5
+			} );
+
+			it( 'does not include selection when selection history is empty', () => {
+				addBlockToDoc( map, 'block-1', 'Hello world' );
+
+				const editedRecord = {
+					title: 'CRDT Title',
+					status: 'draft',
+					blocks: [],
+				} as unknown as Post;
+
+				const changes = getPostChangesFromCRDTDoc(
+					doc,
+					editedRecord,
+					defaultSyncedProperties
+				);
+
+				expect( changes.selection ).toBeUndefined();
+			} );
+		} );
 	} );
 } );
+
+/**
+ * Helper to create a block with a Y.Text content attribute
+ * in the CRDT document.
+ *
+ * @param map
+ * @param clientId Block client ID.
+ * @param content  Initial text content.
+ * @param name     Block name (default: 'core/paragraph').
+ */
+function addBlockToDoc(
+	map: YMapWrap< YPostRecord >,
+	clientId: string,
+	content: string,
+	name = 'core/paragraph'
+): Y.Text {
+	let blocks = map.get( 'blocks' );
+	if ( ! ( blocks instanceof Y.Array ) ) {
+		blocks = new Y.Array< YBlock >();
+		map.set( 'blocks', blocks );
+	}
+
+	const block = createYMap< YBlockRecord >();
+	block.set( 'name', name );
+	block.set( 'clientId', clientId );
+	const attrs = new Y.Map();
+	const ytext = new Y.Text( content );
+	attrs.set( 'content', ytext );
+	block.set( 'attributes', attrs );
+	block.set( 'innerBlocks', new Y.Array() );
+	( blocks as YBlocks ).push( [ block ] );
+
+	return ytext;
+}