@wordpress/core-data 7.52.0 → 7.53.0

package/src/test/rtc-rich-text-offset-space.test.js

@@ -1,6 +1,3 @@
-/**
- * External dependencies
- */
 import { act, render, waitFor } from '@testing-library/react';
 import {
 	afterEach,
@@ -10,10 +7,6 @@ import {
 	it,
 	jest,
 } from '@jest/globals';
-
-/**
- * WordPress dependencies
- */
 import {
 	getBlockTypes,
 	registerBlockType,
@@ -22,7 +15,6 @@ import {
 import { RichText } from '@wordpress/block-editor';
 import { createRegistry, RegistryProvider } from '@wordpress/data';
 import { Y } from '@wordpress/sync';
-
 /**
  * Mock sync manager accessor.
  */
@@ -31,10 +23,6 @@ jest.mock( '../sync', () => ( {
 	getSyncManager: jest.fn(),
 	LOCAL_EDITOR_ORIGIN: 'local-editor',
 } ) );
-
-/**
- * Internal dependencies
- */
 import { store as coreDataStore } from '../index';
 import { CRDT_RECORD_MAP_KEY, getSyncManager } from '../sync';
 import useEntityBlockEditor from '../hooks/use-entity-block-editor';

package/src/test/selectors.js

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import deepFreeze from 'deep-freeze';
-
-/**
- * Internal dependencies
- */
 import {
 	getEntityRecord,
 	hasEntityRecord,

package/src/test/store.js

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import triggerFetch from '@wordpress/api-fetch';
 import { createRegistry } from '@wordpress/data';
-
-/**
- * Internal dependencies
- */
 import { store as coreDataStore } from '../index';
 
 jest.mock( '@wordpress/api-fetch' );
@@ -277,6 +270,7 @@ describe( 'getRevisions', () => {
 	} );
 
 	it( 'preserves all revisions when getRevision resolves after getRevisions', async () => {
+		const revision = { id: 1 };
 		let resolveSlowFetch;
 		const slowFetchPromise = new Promise( ( resolve ) => {
 			resolveSlowFetch = resolve;
@@ -307,16 +301,15 @@ describe( 'getRevisions', () => {
 			1,
 			{ context: 'edit' }
 		);
-		await resolveSelectStore.getRevisions( KIND, NAME, RECORD_KEY, {
-			context: 'edit',
-		} );
+		await expect(
+			resolveSelectStore.getRevisions( KIND, NAME, RECORD_KEY, {
+				context: 'edit',
+			} )
+		).resolves.toEqual( REVISIONS );
 
 		// Now resolve the slow single-revision fetch.
-		resolveSlowFetch( REVISIONS[ 0 ] );
-		await revisionPromise;
-
-		// Wait for all pending thunks (receiveRevisions) to settle.
-		await new Promise( ( resolve ) => setTimeout( resolve, 0 ) );
+		resolveSlowFetch( revision );
+		await expect( revisionPromise ).resolves.toEqual( revision );
 
 		const allRevisions = registry
 			.select( coreDataStore )

package/src/types.ts

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import type { ConnectionStatusDisconnected, Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import type {
 	SelectionType,
 	SelectionDirection,
@@ -160,13 +153,22 @@ export type SelectionInOneBlock = {
 	selectionDirection?: SelectionDirection;
 };
 
+/**
+ * One end of a multi-block selection. Uses SelectionCursor when the endpoint
+ * lands inside a RichText field (character-level anchor) or SelectionWholeBlock
+ * when the entire block is selected (block-slot anchor). The type discriminant
+ * tells the receiver how to resolve this endpoint.
+ */
+export type SelectionEndpoint = SelectionCursor | SelectionWholeBlock;
+
 export type SelectionInMultipleBlocks = {
-	// The user has highlighted text over multiple blocks.
-	// The blocks are derived on the receiver side by navigating up from the
-	// resolved cursor positions via Y.AbstractType.parent.
+	// The user's selection spans more than one block. Each endpoint is resolved
+	// independently: text blocks carry a character-level CursorEndpoint while
+	// blocks without a RichText field (or selected as whole blocks) carry a
+	// WholeBlockEndpoint. Mixed combinations (e.g. paragraph → image) are valid.
 	type: SelectionType.SelectionInMultipleBlocks;
-	cursorStartPosition: CursorPosition;
-	cursorEndPosition: CursorPosition;
+	startEndpoint: SelectionEndpoint;
+	endEndpoint: SelectionEndpoint;
 	// The direction of the selection, indicating where the caret sits.
 	selectionDirection?: SelectionDirection;
 };

package/src/utils/block-selection-history.ts

@@ -1,14 +1,4 @@
-/**
- * External dependencies
- */
-/**
- * WordPress dependencies
- */
 import { Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import {
 	asRichTextOffset,
 	findBlockByClientIdInDoc,

package/src/utils/clear-unchanged-edits.ts

@@ -1,6 +1,3 @@
-/**
- * External dependencies
- */
 import fastDeepEqual from 'fast-deep-equal/es6/index.js';
 
 /**

package/src/utils/conservative-map-item.js

@@ -1,6 +1,3 @@
-/**
- * External dependencies
- */
 import fastDeepEqual from 'fast-deep-equal/es6/index.js';
 
 /**

package/src/utils/crdt-blocks.ts

@@ -1,19 +1,8 @@
-/**
- * External dependencies
- */
 import { v4 as uuidv4 } from 'uuid';
 import fastDeepEqual from 'fast-deep-equal/es6/index.js';
-
-/**
- * WordPress dependencies
- */
 import { getBlockTypes } from '@wordpress/blocks';
 import { RichTextData } from '@wordpress/rich-text';
 import { Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import {
 	asRichTextOffset,
 	createYMap,

package/src/utils/crdt-selection.ts

@@ -1,15 +1,8 @@
-/**
- * WordPress dependencies
- */
 import { dispatch, select } from '@wordpress/data';
 // @ts-expect-error No exported types.
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { isUnmodifiedBlock } from '@wordpress/blocks';
 import { type CRDTDoc, Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import {
 	createBlockSelectionHistory,
 	YSelectionType,

package/src/utils/crdt-text.ts

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import { RichTextData } from '@wordpress/rich-text';
 
 const RICH_TEXT_CACHE_MAX_SIZE = 500;

package/src/utils/crdt-user-selections.ts

@@ -1,14 +1,7 @@
-/**
- * WordPress dependencies
- */
 import { select } from '@wordpress/data';
 import { Y } from '@wordpress/sync';
-// @ts-ignore No exported types for block editor store selectors.
+// @ts-expect-error `@wordpress/block-editor` does not expose type declarations for its entry point.
 import { store as blockEditorStore } from '@wordpress/block-editor';
-
-/**
- * Internal dependencies
- */
 import { CRDT_RECORD_MAP_KEY } from '../sync';
 import type { YPostRecord } from './crdt';
 import type { YBlock, YBlocks } from './crdt-blocks';
@@ -28,6 +21,7 @@ import type {
 	SelectionInMultipleBlocks,
 	SelectionWholeBlock,
 	CursorPosition,
+	SelectionEndpoint,
 } from '../types';
 
 /**
@@ -145,18 +139,20 @@ export function getSelectionState(
 		};
 	}
 
-	// Case 5: Selection in multiple blocks
-	const cursorStartPosition = getCursorPosition( selectionStart, yBlocks );
-	const cursorEndPosition = getCursorPosition( selectionEnd, yBlocks );
-	if ( ! cursorStartPosition || ! cursorEndPosition ) {
-		// If we can't find the cursor positions in block text, treat it as a non-selection.
+	// Case 5: Selection in multiple blocks.
+	// Each endpoint is resolved independently — text fields get a CursorEndpoint
+	// (character-level anchor), everything else gets a WholeBlockEndpoint
+	// (block-slot anchor). Mixed combinations across block types are valid.
+	const startEndpoint = getSelectionEndpoint( selectionStart, yBlocks );
+	const endEndpoint = getSelectionEndpoint( selectionEnd, yBlocks );
+	if ( ! startEndpoint || ! endEndpoint ) {
 		return noSelection;
 	}
 
 	return {
 		type: SelectionType.SelectionInMultipleBlocks,
-		cursorStartPosition,
-		cursorEndPosition,
+		startEndpoint,
+		endEndpoint,
 		selectionDirection,
 	};
 }
@@ -207,6 +203,42 @@ function getCursorPosition(
 	};
 }
 
+/**
+ * Build a SelectionEndpoint for one side of a multi-block selection.
+ *
+ * WHY two shapes: Yjs relative positions must be anchored to the right node
+ * type. If the block has a RichText field with a known character offset, we
+ * anchor to a Y.Text position (CursorEndpoint) so the cursor survives
+ * concurrent text edits. If there is no text offset (whole-block selection,
+ * or a block type with no RichText), we anchor to the block's index slot in
+ * its parent Y.Array (WholeBlockEndpoint) so it survives block insertions and
+ * deletions above or below it.
+ *
+ * @param selection - The WPBlockSelection for this side.
+ * @param blocks    - The root-level Yjs blocks array.
+ * @return A SelectionEndpoint, or null if the block cannot be located in Yjs.
+ */
+function getSelectionEndpoint(
+	selection: WPBlockSelection,
+	blocks: YBlocks
+): SelectionEndpoint | null {
+	const cursorPosition = getCursorPosition( selection, blocks );
+	if ( cursorPosition ) {
+		return { type: SelectionType.Cursor, cursorPosition };
+	}
+
+	// No character offset available — anchor to the block's slot in its
+	// parent Y.Array instead.
+	const path = getBlockPathForLocalClientId( selection.clientId );
+	const blockPosition = path
+		? createRelativePositionForBlockPath( path, blocks )
+		: null;
+	if ( blockPosition ) {
+		return { type: SelectionType.WholeBlock, blockPosition };
+	}
+	return null;
+}
+
 /**
  * Resolves a local block-editor clientId to its index path relative to the
  * post content blocks. This allows finding the corresponding block in the Yjs
@@ -349,15 +381,13 @@ export function areSelectionsStatesEqual(
 
 		case SelectionType.SelectionInMultipleBlocks:
 			return (
-				areCursorPositionsEqual(
-					selection1.cursorStartPosition,
-					( selection2 as SelectionInMultipleBlocks )
-						.cursorStartPosition
+				areEndpointsEqual(
+					selection1.startEndpoint,
+					( selection2 as SelectionInMultipleBlocks ).startEndpoint
 				) &&
-				areCursorPositionsEqual(
-					selection1.cursorEndPosition,
-					( selection2 as SelectionInMultipleBlocks )
-						.cursorEndPosition
+				areEndpointsEqual(
+					selection1.endEndpoint,
+					( selection2 as SelectionInMultipleBlocks ).endEndpoint
 				) &&
 				selection1.selectionDirection ===
 					( selection2 as SelectionInMultipleBlocks )
@@ -374,6 +404,38 @@ export function areSelectionsStatesEqual(
 	}
 }
 
+/**
+ * Check if two SelectionEndpoints are equal.
+ *
+ * Endpoints of different kinds (cursor vs whole-block) are never equal.
+ *
+ * @param ep1 - First endpoint.
+ * @param ep2 - Second endpoint.
+ * @return True if the endpoints represent the same position.
+ */
+function areEndpointsEqual(
+	ep1: SelectionEndpoint,
+	ep2: SelectionEndpoint
+): boolean {
+	if ( ep1.type !== ep2.type ) {
+		return false;
+	}
+	if (
+		ep1.type === SelectionType.Cursor &&
+		ep2.type === SelectionType.Cursor
+	) {
+		return areCursorPositionsEqual(
+			ep1.cursorPosition,
+			ep2.cursorPosition
+		);
+	}
+	// Both SelectionType.WholeBlock.
+	return Y.compareRelativePositions(
+		( ep1 as SelectionWholeBlock ).blockPosition,
+		( ep2 as SelectionWholeBlock ).blockPosition
+	);
+}
+
 /**
  * Check if two cursor positions are equal.
  *

package/src/utils/crdt-utils.ts

@@ -1,12 +1,5 @@
-/**
- * WordPress dependencies
- */
 import { Y } from '@wordpress/sync';
 import { create, insert, toHTMLString } from '@wordpress/rich-text';
-
-/**
- * Internal dependencies
- */
 import type { YBlock, YBlocks } from './crdt-blocks';
 import type { YPostRecord } from './crdt';
 import { CRDT_RECORD_MAP_KEY } from '../sync';

package/src/utils/crdt.ts

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import fastDeepEqual from 'fast-deep-equal/es6/index.js';
-
-/**
- * WordPress dependencies
- */
 import {
 	__unstableSerializeAndClean,
 	parse,
@@ -19,10 +12,6 @@ import {
 	type SyncConfig,
 	Y,
 } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import { BaseAwareness } from '../awareness/base-awareness';
 import {
 	type Block,

package/src/utils/get-template-info.js

@@ -1,10 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { layout } from '@wordpress/icons';
-/**
- * Internal dependencies
- */
 import { getTemplatePartIcon } from './get-template-part-icon';
 const EMPTY_OBJECT = {};
 

package/src/utils/get-template-part-icon.js

@@ -1,6 +1,3 @@
-/**
- * WordPress dependencies
- */
 import {
 	header as headerIcon,
 	footer as footerIcon,

package/src/utils/log-entity-deprecation.ts

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
 import { deprecatedEntities } from '../entities';
 
 let loggedAlready = false;

package/src/utils/save-crdt-doc.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import apiFetch from '@wordpress/api-fetch';
-
-/**
- * Internal dependencies
- */
 import { getSyncManager } from '../sync';
 
 const SYNC_SAVE_API_PATH = '/wp-sync/v1/save';

package/src/utils/test/block-selection-history.test.ts

@@ -1,11 +1,4 @@
-/**
- * External dependencies
- */
 import { Y } from '@wordpress/sync';
-
-/**
- * Internal dependencies
- */
 import {
 	createBlockSelectionHistory,
 	YSelectionType,

package/src/utils/test/clear-unchanged-edits.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import clearUnchangedEdits from '../clear-unchanged-edits';
 
 describe( 'clearUnchangedEdits', () => {

package/src/utils/test/conservative-map-item.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import conservativeMapItem from '../conservative-map-item';
 
 describe( 'conservativeMapItem', () => {

package/src/utils/test/crdt-blocks.ts

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import { Y } from '@wordpress/sync';
-
-/**
- * External dependencies
- */
 import {
 	describe,
 	expect,
@@ -14,14 +7,12 @@ import {
 	beforeEach,
 	afterEach,
 } from '@jest/globals';
-
 /**
  * Mock uuid module
  */
 jest.mock( 'uuid', () => ( {
 	v4: () => 'mocked-uuid-' + Math.random(),
 } ) );
-
 /**
  * Mock @wordpress/blocks module
  */
@@ -101,15 +92,7 @@ jest.mock( '@wordpress/blocks', () => ( {
 		},
 	],
 } ) );
-
-/**
- * WordPress dependencies
- */
 import { RichTextData } from '@wordpress/rich-text';
-
-/**
- * Internal dependencies
- */
 import {
 	mergeCrdtBlocks,
 	mergeRichTextUpdate,