RTC: Fix collaborator cursor rendering in table cells

packages/block-library/src/table/edit.js

@@ -631,6 +631,7 @@ const Cell = memo( function ( {
 			) }
 		>
 			<RichText
+				identifier={ `${ name }[${ rowIndex }].cells[${ columnIndex }].content` }
 				value={ content }
 				onChange={ onChange }
 				onFocus={ () => {

packages/core-data/src/awareness/post-editor-awareness.ts

@@ -224,7 +224,7 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 	 * Resolve a selection state to a text index and block client ID.
 	 *
 	 * For text-based selections, navigates up from the resolved Y.Text via
-	 * AbstractType.parent to find the containing block, then resolves the
+	 * parent chain to find the containing block, then resolves the
 	 * local clientId via the block's tree path.
 	 * For WholeBlock selections, resolves the block's relative position and
 	 * then finds the local clientId via tree path.
@@ -234,14 +234,19 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 	 * clientIds (e.g. in "Show Template" mode where blocks are cloned).
 	 *
 	 * @param selection - The selection state.
-	 * @return The rich-text offset and block client ID, or nulls if not resolvable.
+	 * @return The rich-text offset, block client ID, and attribute key path.
 	 */
 	public convertSelectionStateToAbsolute( selection: SelectionState ): {
 		richTextOffset: number | null;
 		localClientId: string | null;
+		attributeKey: string | null;
 	} {
 		if ( selection.type === SelectionType.None ) {
-			return { richTextOffset: null, localClientId: null };
+			return {
+				richTextOffset: null,
+				localClientId: null,
+				attributeKey: null,
+			};
 		}
 
 		if ( selection.type === SelectionType.WholeBlock ) {
@@ -264,7 +269,7 @@ 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.
@@ -279,13 +284,57 @@ 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;
+		// Navigate up from Y.Text to find the block and its attribute path.
+		let current: Y.AbstractType< any > | null = absolutePosition.type;
+		let blockMap: Y.Map< unknown > | null = null;
+		const pathParts: string[] = [];
+		let pendingIndex: number | null = null;
+
+		while ( current && current.parent ) {
+			const parent = current.parent;
+			if ( parent instanceof Y.Map ) {
+				let foundKey: string | null = null;
+				for ( const key of parent.keys() ) {
+					if ( parent.get( key ) === current ) {
+						foundKey = key;
+						break;
+					}
+				}
+
+				if ( foundKey ) {
+					if (
+						foundKey === 'attributes' &&
+						parent.has( 'clientId' )
+					) {
+						blockMap = parent;
+						break;
+					}
+					let part = foundKey;
+					if ( pendingIndex !== null ) {
+						part += `[${ pendingIndex }]`;
+						pendingIndex = null;
+					}
+					pathParts.unshift( part );
+				}
+			} else if ( parent instanceof Y.Array ) {
+				for ( let i = 0; i < parent.length; i++ ) {
+					if ( parent.get( i ) === current ) {
+						pendingIndex = i;
+						break;
+					}
+				}
+			}
+			current = parent;
+		}
+
+		const path = blockMap ? getBlockPathInYdoc( blockMap ) : null;
 		const localClientId = path ? resolveBlockClientIdByPath( path ) : null;
 
 		return {
@@ -294,6 +343,7 @@ export class PostEditorAwareness extends BaseAwarenessState< PostEditorState > {
 				absolutePosition.index
 			),
 			localClientId,
+			attributeKey: pathParts.join( '.' ) || null,
 		};
 	}
 

packages/core-data/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',
 			} );
 		} );
 	} );

packages/core-data/src/hooks/use-post-editor-awareness-state.ts

@@ -27,6 +27,7 @@ interface AwarenessState {
 const defaultResolvedSelection: ResolvedSelection = {
 	richTextOffset: null,
 	localClientId: null,
+	attributeKey: null,
 };
 
 const defaultState: AwarenessState = {

packages/core-data/src/types.ts

@@ -135,4 +135,5 @@ export type SelectionState =
 export interface ResolvedSelection {
 	richTextOffset: number | null;
 	localClientId: string | null;
+	attributeKey: string | null;
 }

packages/core-data/src/utils/crdt-user-selections.ts

@@ -147,6 +147,52 @@ export function getSelectionState(
 	};
 }
 
+/**
+ * Navigate a Yjs type hierarchy by a string path, supporting both Map keys
+ * and Array indices.
+ *
+ * Example: "body[0].cells[0].content"
+ *
+ * @param root - The starting Yjs type.
+ * @param path - The string path to navigate.
+ * @return The Yjs type at the path, or undefined if not found.
+ */
+function getYjsValueByPath(
+	root: Y.AbstractType< any >,
+	path: string
+): Y.AbstractType< any > | undefined {
+	const parts = path.split( '.' );
+	let current: any = root;
+
+	for ( const part of parts ) {
+		// Handle array access like "body[0]"
+		const arrayMatch = part.match( /^(.+)\[(\d+)\]$/ );
+		if ( arrayMatch ) {
+			const [ , key, index ] = arrayMatch;
+			if ( ! ( current instanceof Y.Map ) ) {
+				return undefined;
+			}
+			current = current.get( key );
+			if ( ! ( current instanceof Y.Array ) ) {
+				return undefined;
+			}
+			current = current.get( parseInt( index, 10 ) );
+		} else {
+			// Handle simple Map key
+			if ( ! ( current instanceof Y.Map ) ) {
+				return undefined;
+			}
+			current = current.get( part );
+		}
+
+		if ( ! current ) {
+			return undefined;
+		}
+	}
+
+	return current instanceof Y.AbstractType ? current : undefined;
+}
+
 /**
  * Get the cursor position from a selection.
  *
@@ -169,7 +215,14 @@ function getCursorPosition(
 	}
 
 	const attributes = block.get( 'attributes' );
-	const currentYText = attributes?.get( selection.attributeKey );
+	if ( ! attributes ) {
+		return null;
+	}
+
+	const currentYText = getYjsValueByPath(
+		attributes,
+		selection.attributeKey
+	);
 
 	// If the attribute is not a Y.Text, return null.
 	if ( ! ( currentYText instanceof Y.Text ) ) {

packages/editor/src/components/collaborators-overlay/compute-selection.ts

@@ -92,7 +92,8 @@ function computeCursorOnly(
 			start.richTextOffset,
 			blockElement,
 			overlayContext.editorDocument,
-			overlayContext.overlayRect
+			overlayContext.overlayRect,
+			start.attributeKey
 		),
 	};
 }
@@ -150,7 +151,8 @@ function computeTextSelection(
 				activeEnd.richTextOffset,
 				activeEndBlock,
 				overlayContext.editorDocument,
-				overlayContext.overlayRect
+				overlayContext.overlayRect,
+				activeEnd.attributeKey
 			),
 			selectionRects: allRects,
 		};
@@ -167,7 +169,8 @@ function computeTextSelection(
 			start.richTextOffset,
 			startBlock,
 			overlayContext.editorDocument,
-			overlayContext.overlayRect
+			overlayContext.overlayRect,
+			start.attributeKey
 		),
 	};
 }
@@ -203,7 +206,8 @@ function computeSingleBlockRects(
 				start.richTextOffset,
 				end.richTextOffset,
 				overlayContext.editorDocument,
-				overlayContext.overlayRect
+				overlayContext.overlayRect,
+				start.attributeKey
 			) ?? [],
 		blockElement,
 	};
@@ -265,7 +269,8 @@ function computeMultiBlockRects(
 		docFirst.richTextOffset,
 		Number.MAX_SAFE_INTEGER,
 		overlayContext.editorDocument,
-		overlayContext.overlayRect
+		overlayContext.overlayRect,
+		docFirst.attributeKey
 	);
 	if ( startRects ) {
 		allRects.push( ...startRects );
@@ -292,7 +297,8 @@ function computeMultiBlockRects(
 		0,
 		docLast.richTextOffset,
 		overlayContext.editorDocument,
-		overlayContext.overlayRect
+		overlayContext.overlayRect,
+		docLast.attributeKey
 	);
 	if ( endRects ) {
 		allRects.push( ...endRects );