@wordpress/core-data 7.46.0 → 7.48.0

package/build-types/utils/crdt-utils.d.ts

@@ -86,6 +86,17 @@ export declare function asRichTextOffset(offset: number): RichTextOffset;
  * @return The branded HTML string index.
  */
 export declare function asHtmlStringIndex(index: number): HtmlStringIndex;
+/**
+ * Resolve a selection attribute key to a Y.Text value.
+ *
+ * RichText identifiers are normally top-level block attribute keys, but nested
+ * rich-text fields can provide a dot path such as `body.0.cells.0.content`.
+ *
+ * @param attributes   The block attributes map.
+ * @param attributeKey The top-level attribute key or nested attribute path.
+ * @return The matching Y.Text, or null if the path is not a rich-text field.
+ */
+export declare function getYTextByAttributeKey(attributes: Y.Map<unknown>, attributeKey: string): Y.Text | null;
 /**
  * Given a block ID and a Y.Doc, find the block in the document.
  *

package/build-types/utils/crdt-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crdt-utils.d.ts","sourceRoot":"","sources":["../../src/utils/crdt-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,iBAAiB,CAAC;AAGpC;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,eAAe,CAAC;AAIrD;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAE,MAAM,EAAE,OAAO,CAAE,CAAC;AAEnD;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,QAAQ,CAAE,CAAC,SAAS,UAAU,CAAG,SAAQ,CAAC,CAAC,YAAY,CAAE,CAAC,CAAE;IAC5E,MAAM,EAAE,CAAE,CAAC,SAAS,MAAM,CAAC,EAAI,GAAG,EAAE,CAAC,KAAM,IAAI,CAAC;IAChD,OAAO,EAAE,CACR,QAAQ,EAAE,CACT,KAAK,EAAE,CAAC,CAAE,MAAM,CAAC,CAAE,EACnB,GAAG,EAAE,MAAM,CAAC,EACZ,GAAG,EAAE,QAAQ,CAAE,CAAC,CAAE,KACd,IAAI,KACL,IAAI,CAAC;IACV,GAAG,EAAE,CAAE,CAAC,SAAS,MAAM,CAAC,EAAI,GAAG,EAAE,CAAC,KAAM,OAAO,CAAC;IAChD,GAAG,EAAE,CAAE,CAAC,SAAS,MAAM,CAAC,EAAI,GAAG,EAAE,CAAC,KAAM,CAAC,CAAE,CAAC,CAAE,GAAG,SAAS,CAAC;IAC3D,GAAG,EAAE,CAAE,CAAC,SAAS,MAAM,CAAC,EAAI,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAE,CAAC,CAAE,KAAM,IAAI,CAAC;IAC5D,MAAM,EAAE,MAAM,CAAC,CAAC;CAEhB;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAE,CAAC,SAAS,UAAU,EAC/C,GAAG,EAAE,CAAC,CAAC,GAAG,EACV,GAAG,EAAE,MAAM,GACT,QAAQ,CAAE,CAAC,CAAE,CAEf;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAE,CAAC,SAAS,UAAU,EAC/C,OAAO,GAAE,OAAO,CAAE,CAAC,CAAO,GACxB,QAAQ,CAAE,CAAC,CAAE,CAEf;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAE,CAAC,SAAS,UAAU,EAC3C,KAAK,EAAE,QAAQ,CAAE,CAAC,CAAE,GAAG,SAAS,GAC9B,KAAK,IAAI,QAAQ,CAAE,CAAC,CAAE,CAExB;AAED,OAAO,CAAC,MAAM,mBAAmB,EAAE,OAAO,MAAM,CAAC;AACjD,OAAO,CAAC,MAAM,oBAAoB,EAAE,OAAO,MAAM,CAAC;AAElD;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG;IACrC,QAAQ,CAAC,CAAE,mBAAmB,CAAE,EAAE,gBAAgB,CAAC;CACnD,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG;IACtC,QAAQ,CAAC,CAAE,oBAAoB,CAAE,EAAE,iBAAiB,CAAC;CACrD,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAE,MAAM,EAAE,MAAM,GAAI,cAAc,CAEjE;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAE,KAAK,EAAE,MAAM,GAAI,eAAe,CAElE;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,CAAC,CAAC,GAAG,GACT,MAAM,GAAG,IAAI,CASf;AA2BD;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,eAAe,GACxB,cAAc,CAiBhB;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,cAAc,GAC5B,eAAe,CA8BjB"}
+{"version":3,"file":"crdt-utils.d.ts","sourceRoot":"","sources":["../../src/utils/crdt-utils.ts"],"names":[],"mappings":"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"}

package/build-types/utils/crdt.d.ts

@@ -3,9 +3,12 @@ import { type Block, type YBlocks } from './crdt-blocks';
 import { type Post } from '../entity-types/post';
 import type { WPSelection } from '../types';
 import { type YMapRecord, type YMapWrap } from './crdt-utils';
+type ContentFromBlocksFn = (args?: {
+    blocks: Block[];
+}) => string;
 export type PostChanges = Partial<Post> & {
     blocks?: Block[];
-    content?: Post['content'] | string;
+    content?: Post['content'] | string | ContentFromBlocksFn;
     excerpt?: Post['excerpt'] | string;
     selection?: WPSelection;
     title?: Post['title'] | string;
@@ -63,4 +66,5 @@ export declare const defaultSyncConfig: SyncConfig;
  * when changes are detected.
  */
 export declare const defaultCollectionSyncConfig: SyncConfig;
+export {};
 //# sourceMappingURL=crdt.d.ts.map

package/build-types/utils/crdt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crdt.d.ts","sourceRoot":"","sources":["../../src/utils/crdt.ts"],"names":[],"mappings":"AASA,OAAO,EACN,KAAK,OAAO,EAIZ,KAAK,UAAU,EACf,CAAC,EACD,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACN,KAAK,KAAK,EAMV,KAAK,OAAO,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAM5C,OAAO,EAKN,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,MAAM,cAAc,CAAC;AAGtB,MAAM,MAAM,WAAW,GAAG,OAAO,CAAE,IAAI,CAAE,GAAG;IAC3C,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAE,SAAS,CAAE,GAAG,MAAM,CAAC;IACrC,OAAO,CAAC,EAAE,IAAI,CAAE,SAAS,CAAE,GAAG,MAAM,CAAC;IACrC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,KAAK,CAAC,EAAE,IAAI,CAAE,OAAO,CAAE,GAAG,MAAM,CAAC;CACjC,CAAC;AAGF,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC9C,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAE,UAAU,CAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC;CACd;AAED,eAAO,MAAM,sCAAsC,mBAAmB,CAAC;AAsCvE;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,GAAG,CAAE,MAAM,CAAE,GAC7B,IAAI,CAqIN;AA6BD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,OAAO,EACb,YAAY,EAAE,IAAI,EAClB,gBAAgB,EAAE,GAAG,CAAE,MAAM,CAAE,GAC7B,WAAW,CAuJb;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,UAI/B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,EAAE,UAKzC,CAAC"}
+{"version":3,"file":"crdt.d.ts","sourceRoot":"","sources":["../../src/utils/crdt.ts"],"names":[],"mappings":"AAaA,OAAO,EACN,KAAK,OAAO,EAIZ,KAAK,UAAU,EACf,CAAC,EACD,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACN,KAAK,KAAK,EAMV,KAAK,OAAO,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAM5C,OAAO,EAKN,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,MAAM,cAAc,CAAC;AAMtB,KAAK,mBAAmB,GAAG,CAAE,IAAI,CAAC,EAAE;IAAE,MAAM,EAAE,KAAK,EAAE,CAAA;CAAE,KAAM,MAAM,CAAC;AAGpE,MAAM,MAAM,WAAW,GAAG,OAAO,CAAE,IAAI,CAAE,GAAG;IAC3C,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAE,SAAS,CAAE,GAAG,MAAM,GAAG,mBAAmB,CAAC;IAC3D,OAAO,CAAC,EAAE,IAAI,CAAE,SAAS,CAAE,GAAG,MAAM,CAAC;IACrC,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,KAAK,CAAC,EAAE,IAAI,CAAE,OAAO,CAAE,GAAG,MAAM,CAAC;CACjC,CAAC;AAGF,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC9C,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAE,UAAU,CAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC;CACd;AAED,eAAO,MAAM,sCAAsC,mBAAmB,CAAC;AAsCvE;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,GAAG,CAAE,MAAM,CAAE,GAC7B,IAAI,CAuJN;AA2DD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,OAAO,EACb,YAAY,EAAE,IAAI,EAClB,gBAAgB,EAAE,GAAG,CAAE,MAAM,CAAE,GAC7B,WAAW,CAsKb;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,UAI/B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,EAAE,UAKzC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "7.46.0",
+	"version": "7.48.0",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -49,22 +49,22 @@
 		"build-module/index.mjs"
 	],
 	"dependencies": {
-		"@wordpress/api-fetch": "^7.46.0",
-		"@wordpress/block-editor": "^15.19.0",
-		"@wordpress/blocks": "^15.19.0",
-		"@wordpress/compose": "^7.46.0",
-		"@wordpress/data": "^10.46.0",
-		"@wordpress/deprecated": "^4.46.0",
-		"@wordpress/element": "^6.46.0",
-		"@wordpress/html-entities": "^4.46.0",
-		"@wordpress/i18n": "^6.19.0",
-		"@wordpress/is-shallow-equal": "^5.46.0",
-		"@wordpress/private-apis": "^1.46.0",
-		"@wordpress/rich-text": "^7.46.0",
-		"@wordpress/sync": "^1.46.0",
-		"@wordpress/undo-manager": "^1.46.0",
-		"@wordpress/url": "^4.46.0",
-		"@wordpress/warning": "^3.46.0",
+		"@wordpress/api-fetch": "^7.48.0",
+		"@wordpress/block-editor": "^15.21.0",
+		"@wordpress/blocks": "^15.21.0",
+		"@wordpress/compose": "^8.1.0",
+		"@wordpress/data": "^10.48.0",
+		"@wordpress/deprecated": "^4.48.0",
+		"@wordpress/element": "^8.0.0",
+		"@wordpress/html-entities": "^4.48.0",
+		"@wordpress/i18n": "^6.21.0",
+		"@wordpress/is-shallow-equal": "^5.48.0",
+		"@wordpress/private-apis": "^1.48.0",
+		"@wordpress/rich-text": "^7.48.0",
+		"@wordpress/sync": "^1.48.0",
+		"@wordpress/undo-manager": "^1.48.0",
+		"@wordpress/url": "^4.48.0",
+		"@wordpress/warning": "^3.48.0",
 		"change-case": "^4.1.2",
 		"equivalent-key-map": "^0.2.2",
 		"fast-deep-equal": "^3.1.3",
@@ -84,5 +84,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "51264e33b95fadff9a06b68141e674ce9cde9675"
+	"gitHead": "e7856693aeb4e2522d13608cd32c994e4a97cb9c"
 }

package/src/actions.js

@@ -1114,32 +1114,3 @@ export const receiveRevisions =
 			invalidateCache,
 		} );
 	};
-
-/**
- * Returns an action object used to set the sync connection status for an entity or collection.
- *
- * @param {string}             kind   Kind of the entity.
- * @param {string}             name   Name of the entity.
- * @param {number|string|null} key    The entity key, or null for collections.
- * @param {Object|null}        status The connection state object or null on unload.
- *
- * @return {Object} Action object.
- */
-export function setSyncConnectionStatus( kind, name, key, status ) {
-	if ( ! status ) {
-		return {
-			type: 'CLEAR_SYNC_CONNECTION_STATUS',
-			kind,
-			name,
-			key,
-		};
-	}
-
-	return {
-		type: 'SET_SYNC_CONNECTION_STATUS',
-		kind,
-		name,
-		key,
-		status,
-	};
-}

package/src/awareness/block-lookup.ts

@@ -22,6 +22,40 @@ interface EditorStoreBlock {
 	innerBlocks: EditorStoreBlock[];
 }
 
+/**
+ * Find the block Y.Map that contains a nested Yjs type.
+ *
+ * Rich-text attributes are often stored directly at attributes.content, but
+ * blocks can also store rich text deeper inside object or array attributes.
+ * Walk upward until we find the block map instead of assuming a fixed parent
+ * depth.
+ *
+ * @param yType - The nested Yjs type to start from.
+ * @return The containing block Y.Map, or null if no block ancestor exists.
+ */
+export function getContainingBlockYMap(
+	yType: Y.AbstractType< any >
+): Y.Map< unknown > | null {
+	let current: Y.AbstractType< any > | null = yType;
+
+	while ( current ) {
+		const parent = current.parent;
+
+		if (
+			parent instanceof Y.Map &&
+			parent.parent instanceof Y.Array &&
+			parent.get( 'clientId' ) !== undefined &&
+			parent.get( 'innerBlocks' ) instanceof Y.Array
+		) {
+			return parent;
+		}
+
+		current = parent instanceof Y.AbstractType ? parent : null;
+	}
+
+	return null;
+}
+
 /**
  * Given a Y.Map within a Ydoc, traverse up the Yjs block tree to compute the
  * index path from the root.

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

@@ -10,7 +10,11 @@ import { store as blockEditorStore } from '@wordpress/block-editor';
  * Internal dependencies
  */
 import { BaseAwarenessState, baseEqualityFieldChecks } from './base-awareness';
-import { getBlockPathInYdoc, resolveBlockClientIdByPath } from './block-lookup';
+import {
+	getBlockPathInYdoc,
+	getContainingBlockYMap,
+	resolveBlockClientIdByPath,
+} from './block-lookup';
 import {
 	AWARENESS_CURSOR_UPDATE_THROTTLE_IN_MS,
 	LOCAL_CURSOR_UPDATE_DEBOUNCE_IN_MS,
@@ -24,10 +28,14 @@ import {
 	areSelectionsStatesEqual,
 	getSelectionState,
 	SelectionType,
+	SelectionDirection,
 } from '../utils/crdt-user-selections';
 
-import { SelectionDirection } from '../types';
-import type { SelectionState, WPBlockSelection } from '../types';
+import type {
+	ResolvedSelection,
+	SelectionState,
+	WPBlockSelection,
+} from '../types';
 import type { YBlocks } from '../utils/crdt-blocks';
 import type {
 	DebugCollaboratorData,
@@ -239,12 +247,15 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 	 * @param selection - The selection state.
 	 * @return The rich-text offset and block client ID, or nulls if not resolvable.
 	 */
-	public convertSelectionStateToAbsolute( selection: SelectionState ): {
-		richTextOffset: number | null;
-		localClientId: string | null;
-	} {
+	public convertSelectionStateToAbsolute(
+		selection: SelectionState
+	): ResolvedSelection {
 		if ( selection.type === SelectionType.None ) {
-			return { richTextOffset: null, localClientId: null };
+			return {
+				richTextOffset: null,
+				localClientId: null,
+				attributeKey: null,
+			};
 		}
 
 		if ( selection.type === SelectionType.WholeBlock ) {
@@ -267,7 +278,11 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 				}
 			}
 
-			return { richTextOffset: null, localClientId };
+			return {
+				richTextOffset: null,
+				localClientId,
+				attributeKey: null,
+			};
 		}
 
 		// Text-based selections: resolve cursor position and navigate up.
@@ -282,13 +297,15 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 		);
 
 		if ( ! absolutePosition ) {
-			return { richTextOffset: null, localClientId: null };
+			return {
+				richTextOffset: null,
+				localClientId: null,
+				attributeKey: null,
+			};
 		}
 
-		// Navigate up: Y.Text -> attributes Y.Map -> block Y.Map
-		const yType = absolutePosition.type.parent?.parent;
-		const path =
-			yType instanceof Y.Map ? getBlockPathInYdoc( yType ) : null;
+		const yType = getContainingBlockYMap( absolutePosition.type );
+		const path = yType ? getBlockPathInYdoc( yType ) : null;
 		const localClientId = path ? resolveBlockClientIdByPath( path ) : null;
 
 		return {
@@ -297,6 +314,7 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 				asHtmlStringIndex( absolutePosition.index )
 			),
 			localClientId,
+			attributeKey: cursorPos.attributeKey ?? null,
 		};
 	}
 

package/src/awareness/test/block-lookup.ts

@@ -9,6 +9,7 @@ import { select } from '@wordpress/data';
  */
 import {
 	getBlockPathInYdoc,
+	getContainingBlockYMap,
 	resolveBlockClientIdByPath,
 } from '../block-lookup';
 
@@ -242,6 +243,75 @@ describe( 'getBlockPathInYdoc', () => {
 	} );
 } );
 
+describe( 'getContainingBlockYMap', () => {
+	it( 'should find the containing block for direct rich text content', () => {
+		const block = createTestYBlock( 'block' );
+		const attributes = new Y.Map< any >();
+		const text = new Y.Text( 'Direct text' );
+		attributes.set( 'content', text );
+		block.set( 'attributes', attributes );
+
+		const ydoc = new Y.Doc();
+		const rootMap = ydoc.getMap( 'test' );
+		const blocks = new Y.Array< Y.Map< any > >();
+		rootMap.set( 'blocks', blocks );
+		blocks.push( [ block ] );
+
+		expect( getContainingBlockYMap( text ) ).toBe( block );
+	} );
+
+	it( 'should find the containing block for deeply nested rich text attributes', () => {
+		const block = createTestYBlock( 'block' );
+		const attributes = new Y.Map< any >();
+		const cards = new Y.Array< Y.Map< any > >();
+		const card = new Y.Map< any >();
+		const meta = new Y.Map< any >();
+		const caption = new Y.Text( 'Nested caption' );
+
+		meta.set( 'caption', caption );
+		card.set( 'meta', meta );
+		cards.push( [ card ] );
+		attributes.set( 'cards', cards );
+		block.set( 'attributes', attributes );
+
+		const ydoc = new Y.Doc();
+		const rootMap = ydoc.getMap( 'test' );
+		const blocks = new Y.Array< Y.Map< any > >();
+		rootMap.set( 'blocks', blocks );
+		blocks.push( [ block ] );
+
+		expect( getContainingBlockYMap( caption ) ).toBe( block );
+	} );
+
+	it( 'should return null when no block ancestor exists', () => {
+		const orphanAttributes = new Y.Map< any >();
+		const text = new Y.Text( 'Orphan text' );
+		orphanAttributes.set( 'content', text );
+
+		expect( getContainingBlockYMap( text ) ).toBeNull();
+	} );
+
+	it( 'should skip nested attribute maps that look like blocks', () => {
+		const block = createTestYBlock( 'block' );
+		const attributes = new Y.Map< any >();
+		const blockLikeAttribute = new Y.Map< any >();
+		const text = new Y.Text( 'Nested text' );
+		blockLikeAttribute.set( 'clientId', 'attribute-client-id' );
+		blockLikeAttribute.set( 'innerBlocks', new Y.Array() );
+		blockLikeAttribute.set( 'content', text );
+		attributes.set( 'nested', blockLikeAttribute );
+		block.set( 'attributes', attributes );
+
+		const ydoc = new Y.Doc();
+		const rootMap = ydoc.getMap( 'test' );
+		const blocks = new Y.Array< Y.Map< any > >();
+		rootMap.set( 'blocks', blocks );
+		blocks.push( [ block ] );
+
+		expect( getContainingBlockYMap( text ) ).toBe( block );
+	} );
+} );
+
 describe( 'resolveBlockClientIdByPath', () => {
 	afterEach( () => {
 		jest.restoreAllMocks();

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

@@ -69,6 +69,65 @@ interface MockBlockEditorOverrides {
 	getSelectionEnd?: jest.Mock;
 }
 
+type SeededRandom = {
+	bool: ( probability?: number ) => boolean;
+	int: ( maxExclusive: number ) => number;
+	intBetween: ( minInclusive: number, maxInclusive: number ) => number;
+	pick: < T >( values: readonly T[] ) => T;
+};
+
+/* eslint-disable no-bitwise */
+function createSeededRandom( seed: number ): SeededRandom {
+	let state = seed >>> 0;
+
+	if ( state === 0 ) {
+		state = 0x9e3779b9;
+	}
+
+	function nextUint32(): number {
+		state += 0x6d2b79f5;
+		let value = state;
+		value = Math.imul( value ^ ( value >>> 15 ), value | 1 );
+		value ^= value + Math.imul( value ^ ( value >>> 7 ), value | 61 );
+		return ( value ^ ( value >>> 14 ) ) >>> 0;
+	}
+
+	function next(): number {
+		return nextUint32() / 0x100000000;
+	}
+
+	function int( maxExclusive: number ): number {
+		if ( maxExclusive <= 0 ) {
+			return 0;
+		}
+
+		return Math.floor( next() * maxExclusive );
+	}
+
+	return {
+		bool( probability = 0.5 ) {
+			return next() < probability;
+		},
+		int,
+		intBetween( minInclusive, maxInclusive ) {
+			return minInclusive + int( maxInclusive - minInclusive + 1 );
+		},
+		pick< T >( values: readonly T[] ): T {
+			if ( values.length === 0 ) {
+				throw new Error( 'Cannot pick from an empty array.' );
+			}
+
+			return values[ int( values.length ) ];
+		},
+	};
+}
+/* eslint-enable no-bitwise */
+
+const NESTED_SELECTION_SEEDS = Array.from(
+	{ length: 8 },
+	( _value, index ) => 1401 + index
+);
+
 /**
  * Mock the block-editor store selectors returned by `select( blockEditorStore )`.
  *
@@ -170,6 +229,66 @@ function createTestDocWithBlocks( blocks?: Y.Map< any >[] ) {
 	return ydoc;
 }
 
+type NestedTextTarget = {
+	label: string;
+	text: Y.Text;
+};
+
+function createNestedAttributeBlock(
+	clientId: string,
+	seed: number
+): {
+	block: Y.Map< any >;
+	targets: NestedTextTarget[];
+} {
+	const block = new Y.Map();
+	block.set( 'clientId', clientId );
+	block.set( 'name', 'test/nested-rich-text' );
+
+	const attrs = new Y.Map();
+	const hero = new Y.Map();
+	const headline = new Y.Text( `Headline ${ seed } alpha beta` );
+	const caption = new Y.Text( `Caption ${ seed } gamma delta` );
+	hero.set( 'headline', headline );
+	hero.set( 'caption', caption );
+
+	const cards = new Y.Array();
+	const card0 = new Y.Map();
+	const card0Title = new Y.Text( `Card ${ seed } title one` );
+	const card0Body = new Y.Text( `Card ${ seed } body one two` );
+	const card0Meta = new Y.Map();
+	const card0Caption = new Y.Text( `Meta ${ seed } caption` );
+	card0.set( 'title', card0Title );
+	card0.set( 'body', card0Body );
+	card0Meta.set( 'caption', card0Caption );
+	card0.set( 'meta', card0Meta );
+
+	const card1 = new Y.Map();
+	const card1Title = new Y.Text( `Card ${ seed } title two` );
+	const card1Body = new Y.Text( `Card ${ seed } body three four` );
+	card1.set( 'title', card1Title );
+	card1.set( 'body', card1Body );
+	cards.push( [ card0, card1 ] );
+
+	attrs.set( 'hero', hero );
+	attrs.set( 'cards', cards );
+	block.set( 'attributes', attrs );
+	block.set( 'innerBlocks', new Y.Array() );
+
+	return {
+		block,
+		targets: [
+			{ label: 'hero.headline', text: headline },
+			{ label: 'hero.caption', text: caption },
+			{ label: 'cards.0.title', text: card0Title },
+			{ label: 'cards.0.body', text: card0Body },
+			{ label: 'cards.0.meta.caption', text: card0Caption },
+			{ label: 'cards.1.title', text: card1Title },
+			{ label: 'cards.1.body', text: card1Body },
+		],
+	};
+}
+
 describe( 'PostEditorAwareness', () => {
 	let doc: Y.Doc;
 	let subscribeCallback: ( () => void ) | null = null;
@@ -528,6 +647,7 @@ describe( 'PostEditorAwareness', () => {
 				cursorPosition: {
 					relativePosition,
 					absoluteOffset: 5,
+					attributeKey: 'content',
 				},
 			};
 
@@ -536,6 +656,7 @@ describe( 'PostEditorAwareness', () => {
 
 			expect( result.richTextOffset ).toBe( 5 );
 			expect( result.localClientId ).toBe( 'block-1' );
+			expect( result.attributeKey ).toBe( 'content' );
 		} );
 
 		test( 'should resolve WholeBlock selection to block client ID', () => {
@@ -568,6 +689,58 @@ describe( 'PostEditorAwareness', () => {
 
 			expect( result.richTextOffset ).toBeNull();
 			expect( result.localClientId ).toBe( 'block-1' );
+			expect( result.attributeKey ).toBeNull();
+		} );
+
+		test( 'should return null attributeKey for SelectionType.None', () => {
+			const awareness = new PostEditorAwareness(
+				doc,
+				'postType',
+				'post',
+				123
+			);
+
+			const result = awareness.convertSelectionStateToAbsolute( {
+				type: SelectionType.None,
+			} );
+
+			expect( result.attributeKey ).toBeNull();
+		} );
+
+		test( 'should pass through nested attributeKey for a cursor selection', () => {
+			const awareness = new PostEditorAwareness(
+				doc,
+				'postType',
+				'post',
+				123
+			);
+
+			const documentMap = doc.getMap( CRDT_RECORD_MAP_KEY );
+			const blocks = documentMap.get( 'blocks' ) as Y.Array<
+				Y.Map< any >
+			>;
+			const block = blocks.get( 0 );
+			const attrs = block.get( 'attributes' ) as Y.Map< Y.Text >;
+			const yText = attrs.get( 'content' );
+
+			const relativePosition = Y.createRelativePositionFromTypeIndex(
+				yText as Y.Text,
+				3
+			);
+
+			const selection: SelectionCursor = {
+				type: SelectionType.Cursor,
+				cursorPosition: {
+					relativePosition,
+					absoluteOffset: 3,
+					attributeKey: 'body.0.cells.0.content',
+				},
+			};
+
+			const result =
+				awareness.convertSelectionStateToAbsolute( selection );
+
+			expect( result.attributeKey ).toBe( 'body.0.cells.0.content' );
 		} );
 	} );
 
@@ -1001,6 +1174,76 @@ describe( 'PostEditorAwareness', () => {
 		} );
 	} );
 
+	describe( 'convertSelectionStateToAbsolute with nested rich-text attributes', () => {
+		test.each( NESTED_SELECTION_SEEDS )(
+			'resolves fuzzed nested rich-text cursor (seed %i)',
+			( seed ) => {
+				const rng = createSeededRandom( seed );
+				const { block, targets } = createNestedAttributeBlock(
+					'yjs-nested-attrs',
+					seed
+				);
+				const nestedDoc = createTestDocWithBlocks( [ block ] );
+
+				mockBlockEditorStore( {
+					blocks: [
+						{
+							clientId: 'local-nested-attrs',
+							innerBlocks: [],
+						},
+					],
+				} );
+
+				const target = rng.pick( targets );
+				const initialOffset = rng.intBetween(
+					1,
+					Math.max( 1, target.text.length - 1 )
+				);
+				const relativePosition = Y.createRelativePositionFromTypeIndex(
+					target.text,
+					initialOffset
+				);
+				let expectedOffset = initialOffset;
+
+				if ( rng.bool() ) {
+					const prefix = `p${ seed % 97 } `;
+					target.text.insert( 0, prefix );
+					expectedOffset += prefix.length;
+				} else {
+					const deleteLength = Math.min(
+						initialOffset,
+						rng.intBetween( 1, 3 )
+					);
+					target.text.delete( 0, deleteLength );
+					expectedOffset -= deleteLength;
+				}
+
+				const awareness = new PostEditorAwareness(
+					nestedDoc,
+					'postType',
+					'post',
+					123
+				);
+
+				const selection: SelectionCursor = {
+					type: SelectionType.Cursor,
+					cursorPosition: {
+						relativePosition,
+						absoluteOffset: initialOffset,
+					},
+				};
+
+				const result =
+					awareness.convertSelectionStateToAbsolute( selection );
+
+				expect( result.richTextOffset ).toBe( expectedOffset );
+				expect( result.localClientId ).toBe( 'local-nested-attrs' );
+
+				nestedDoc.destroy();
+			}
+		);
+	} );
+
 	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)

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

@@ -295,6 +295,7 @@ describe( 'use-post-editor-awareness-state hooks', () => {
 			expect( result.current( mockSelection ) ).toEqual( {
 				richTextOffset: null,
 				localClientId: null,
+				attributeKey: null,
 			} );
 		} );
 
@@ -309,6 +310,7 @@ describe( 'use-post-editor-awareness-state hooks', () => {
 			mockAwareness.convertSelectionStateToAbsolute.mockReturnValue( {
 				richTextOffset: 10,
 				localClientId: 'block-1',
+				attributeKey: 'content',
 			} );
 
 			const { result } = renderHook( () =>
@@ -323,6 +325,7 @@ describe( 'use-post-editor-awareness-state hooks', () => {
 			expect( position ).toEqual( {
 				richTextOffset: 10,
 				localClientId: 'block-1',
+				attributeKey: 'content',
 			} );
 		} );
 	} );