@wordpress/editor 14.48.0 → 14.48.2-next.v.202606191442.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "14.48.0",
+	"version": "14.48.2-next.v.202606191442.0+17fe7db8a",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -40,7 +40,6 @@
 		},
 		"./package.json": "./package.json"
 	},
-	"react-native": "src/index",
 	"wpScript": true,
 	"types": "build-types",
 	"sideEffects": [
@@ -60,71 +59,81 @@
 		"build-module/bindings/**"
 	],
 	"dependencies": {
-		"@wordpress/a11y": "^4.48.0",
-		"@wordpress/api-fetch": "^7.48.0",
-		"@wordpress/base-styles": "^9.1.0",
-		"@wordpress/blob": "^4.48.0",
-		"@wordpress/block-editor": "^15.21.0",
-		"@wordpress/block-serialization-default-parser": "^5.48.0",
-		"@wordpress/blocks": "^15.21.0",
-		"@wordpress/commands": "^1.48.0",
-		"@wordpress/components": "^35.0.0",
-		"@wordpress/compose": "^8.1.0",
-		"@wordpress/core-data": "^7.48.0",
-		"@wordpress/data": "^10.48.0",
-		"@wordpress/dataviews": "^16.0.0",
-		"@wordpress/date": "^5.48.0",
-		"@wordpress/deprecated": "^4.48.0",
-		"@wordpress/dom": "^4.48.0",
-		"@wordpress/element": "^8.0.0",
-		"@wordpress/fields": "^0.40.0",
-		"@wordpress/global-styles-engine": "^1.15.0",
-		"@wordpress/global-styles-ui": "^1.15.0",
-		"@wordpress/hooks": "^4.48.0",
-		"@wordpress/html-entities": "^4.48.0",
-		"@wordpress/i18n": "^6.21.0",
-		"@wordpress/icons": "^13.3.0",
-		"@wordpress/interface": "^9.33.0",
-		"@wordpress/keyboard-shortcuts": "^5.48.0",
-		"@wordpress/keycodes": "^4.48.0",
-		"@wordpress/media-editor": "^0.11.0",
-		"@wordpress/media-fields": "^0.13.0",
-		"@wordpress/media-utils": "^5.48.0",
-		"@wordpress/notices": "^5.48.0",
-		"@wordpress/patterns": "^2.48.0",
-		"@wordpress/plugins": "^7.48.0",
-		"@wordpress/preferences": "^4.48.0",
-		"@wordpress/private-apis": "^1.48.0",
-		"@wordpress/reusable-blocks": "^5.48.0",
-		"@wordpress/rich-text": "^7.48.0",
-		"@wordpress/server-side-render": "^6.24.0",
-		"@wordpress/ui": "^0.15.0",
-		"@wordpress/upload-media": "^0.33.0",
-		"@wordpress/url": "^4.48.0",
-		"@wordpress/views": "^1.15.0",
-		"@wordpress/warning": "^3.48.0",
-		"@wordpress/wordcount": "^4.48.0",
+		"@wordpress/a11y": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/api-fetch": "^7.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/base-styles": "^10.0.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/blob": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/block-editor": "^15.22.1-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/block-serialization-default-parser": "^5.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/blocks": "^15.21.3-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/commands": "^1.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/components": "^35.1.1-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/compose": "^8.1.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/core-data": "^7.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/data": "^10.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/dataviews": "^17.0.1-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/date": "^5.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/deprecated": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/dom": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/element": "^8.0.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/fields": "^0.40.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/global-styles-engine": "^1.15.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/global-styles-ui": "^1.15.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/hooks": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/html-entities": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/i18n": "^6.21.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/icons": "^14.0.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/interface": "^9.33.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/keyboard-shortcuts": "^5.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/keycodes": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/media-editor": "^0.11.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/media-fields": "^0.13.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/media-utils": "^5.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/notices": "^5.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/patterns": "^2.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/plugins": "^7.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/preferences": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/private-apis": "^1.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/reusable-blocks": "^5.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/rich-text": "^7.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/server-side-render": "^6.24.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/ui": "^0.16.1-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/upload-media": "^0.34.1-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/url": "^4.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/views": "^1.15.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/warning": "^3.48.2-next.v.202606191442.0+17fe7db8a",
+		"@wordpress/wordcount": "^4.48.2-next.v.202606191442.0+17fe7db8a",
 		"change-case": "^4.1.2",
 		"client-zip": "^2.4.5",
 		"clsx": "^2.1.1",
-		"colord": "^2.7.0",
+		"colord": "^2.9.3",
 		"date-fns": "^4.1.0",
-		"diff": "^4.0.2",
+		"diff": "^8.0.3",
 		"fast-deep-equal": "^3.1.3",
 		"memize": "^2.1.0",
 		"react-autosize-textarea": "^7.1.0",
+		"redux": "^5.0.1",
 		"remove-accents": "^0.5.0",
 		"uuid": "^14.0.0"
 	},
 	"devDependencies": {
-		"deep-freeze": "0.0.1"
+		"@testing-library/dom": "^10.4.1",
+		"@testing-library/react": "^16.3.2",
+		"@testing-library/user-event": "^14.6.1",
+		"deep-freeze": "^0.0.1"
 	},
 	"peerDependencies": {
+		"@types/react": "^18.3.27",
 		"react": "^18.0.0",
 		"react-dom": "^18.0.0"
 	},
+	"peerDependenciesMeta": {
+		"@types/react": {
+			"optional": true
+		}
+	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "e7856693aeb4e2522d13608cd32c994e4a97cb9c"
+	"gitHead": "1b6a19222df5a88f161880b5789efb3171d8f425"
 }

package/src/bindings/pattern-overrides.js

@@ -26,7 +26,7 @@ export default {
 			// Check undefined because empty string is a valid value.
 			if ( overridableValue === undefined ) {
 				overridesValues[ attributeName ] =
-					currentBlockAttributes[ attributeName ];
+					currentBlockAttributes?.[ attributeName ];
 				continue;
 			} else {
 				overridesValues[ attributeName ] =

package/src/bindings/test/pattern-overrides.js

@@ -0,0 +1,65 @@
+/**
+ * Internal dependencies
+ */
+import patternOverridesBindings from '../pattern-overrides';
+
+describe( 'pattern-overrides bindings', () => {
+	const blockAttributes = {
+		content: 'original content',
+		metadata: {
+			name: 'Editable Paragraph',
+			bindings: {
+				content: { source: 'core/pattern-overrides' },
+			},
+		},
+	};
+
+	const makeSelect = ( attributes ) => () => ( {
+		getBlockAttributes: () => attributes,
+	} );
+
+	describe( 'getValues', () => {
+		it( 'returns the current attribute value when there is no override', () => {
+			const values = patternOverridesBindings.getValues( {
+				select: makeSelect( blockAttributes ),
+				clientId: 'block-1',
+				context: {},
+				bindings: {
+					content: { source: 'core/pattern-overrides' },
+				},
+			} );
+
+			expect( values ).toEqual( { content: 'original content' } );
+		} );
+
+		it( 'returns the override value when the context provides one', () => {
+			const values = patternOverridesBindings.getValues( {
+				select: makeSelect( blockAttributes ),
+				clientId: 'block-1',
+				context: {
+					'pattern/overrides': {
+						'Editable Paragraph': { content: 'overridden' },
+					},
+				},
+				bindings: {
+					content: { source: 'core/pattern-overrides' },
+				},
+			} );
+
+			expect( values ).toEqual( { content: 'overridden' } );
+		} );
+
+		it( 'does not throw when block attributes are unavailable', () => {
+			expect( () =>
+				patternOverridesBindings.getValues( {
+					select: makeSelect( null ),
+					clientId: 'missing-client-id',
+					context: {},
+					bindings: {
+						__default: { source: 'core/pattern-overrides' },
+					},
+				} )
+			).not.toThrow();
+		} );
+	} );
+} );

package/src/components/README.md

@@ -1,7 +1,7 @@
 # Editor Components
 
 This folder holds reusable editor components exported by the `editor` module.
-These components combined as children of the `EditorProvider` component can be use to build alternative Editor Layouts.
+These components, combined as children of the `EditorProvider` component, can be used to build alternative Editor Layouts.
 
 ## Which components should live in this folder?
 

package/src/components/block-removal-warnings/index.js

@@ -95,13 +95,6 @@ export default function BlockRemovalWarnings() {
 		[ currentPostType ]
 	);
 
-	// `BlockRemovalWarnings` is rendered in the editor provider, a shared component
-	// across react native and web. However, `BlockRemovalWarningModal` is web only.
-	// Check it exists before trying to render it.
-	if ( ! BlockRemovalWarningModal ) {
-		return null;
-	}
-
 	if ( ! removalRulesForPostType ) {
 		return null;
 	}

package/src/components/collab-sidebar/note-byline.js

@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-// eslint-disable-next-line @wordpress/use-recommended-components -- `Tooltip` is not yet on the recommended `@wordpress/ui` allow-list; landing as a migration step ahead of the wider rollout.
 import { Stack, Tooltip } from '@wordpress/ui';
 import { __, _x } from '@wordpress/i18n';
 import {

package/src/components/collab-sidebar/note-indicator-toolbar.js

@@ -5,7 +5,11 @@ import { ToolbarButton } from '@wordpress/components';
 import { Stack } from '@wordpress/ui';
 import { __, sprintf } from '@wordpress/i18n';
 import { useMemo } from '@wordpress/element';
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import {
+	privateApis as blockEditorPrivateApis,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -15,52 +19,24 @@ import { getAvatarBorderColor } from './utils';
 
 const { NoteIconToolbarSlotFill } = unlock( blockEditorPrivateApis );
 
-export function NoteAvatarIndicator( { onClick, note } ) {
-	const threadParticipants = useMemo( () => {
-		if ( ! note ) {
-			return [];
-		}
-
-		const participantsMap = new Map();
-		const allNotes = [ note, ...note.reply ];
-
-		// Sort by date to show participants in chronological order.
-		allNotes.sort( ( a, b ) => new Date( a.date ) - new Date( b.date ) );
-
-		allNotes.forEach( ( entry ) => {
-			// Track thread participants (original author + repliers).
-			if ( entry.author_name && entry.author_avatar_urls ) {
-				if ( ! participantsMap.has( entry.author ) ) {
-					participantsMap.set( entry.author, {
-						name: entry.author_name,
-						avatar:
-							entry.author_avatar_urls?.[ '48' ] ||
-							entry.author_avatar_urls?.[ '96' ],
-						id: entry.author,
-						date: entry.date,
-					} );
-				}
-			}
-		} );
-
-		return Array.from( participantsMap.values() );
-	}, [ note ] );
-
-	if ( ! threadParticipants.length ) {
-		return null;
-	}
+function ThreadParticipants( { participants } ) {
+	const defaultAvatar = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+		const { __experimentalDiscussionSettings } = getSettings();
+		return __experimentalDiscussionSettings?.avatarURL;
+	}, [] );
 
 	// If there are more than 3 participants, show 2 avatars and a "+n" number.
 	const maxAvatars = 3;
-	const isOverflow = threadParticipants.length > maxAvatars;
+	const isOverflow = participants.length > maxAvatars;
 	const visibleParticipants = isOverflow
-		? threadParticipants.slice( 0, maxAvatars - 1 )
-		: threadParticipants;
+		? participants.slice( 0, maxAvatars - 1 )
+		: participants;
 	const overflowCount = Math.max(
 		0,
-		threadParticipants.length - visibleParticipants.length
+		participants.length - visibleParticipants.length
 	);
-	const threadHasMoreParticipants = threadParticipants.length > 100;
+	const threadHasMoreParticipants = participants.length > 100;
 
 	// If we hit the note limit, show "100+" instead of exact overflow count.
 	const overflowText =
@@ -72,6 +48,62 @@ export function NoteAvatarIndicator( { onClick, note } ) {
 					overflowCount
 			  );
 
+	return (
+		<Stack direction="row" align="center" gap="xs">
+			{ visibleParticipants.map( ( participant ) => (
+				<img
+					key={ participant.id }
+					src={ participant.avatar || defaultAvatar }
+					alt={ participant.name }
+					className="editor-note-indicator__avatar"
+					style={ {
+						borderColor: getAvatarBorderColor( participant.id ),
+					} }
+				/>
+			) ) }
+			{ overflowCount > 0 && (
+				<span className="editor-note-indicator__overflow">
+					{ overflowText }
+				</span>
+			) }
+		</Stack>
+	);
+}
+
+export function NoteAvatarIndicator( { onClick, note } ) {
+	const threadParticipants = useMemo( () => {
+		if ( ! note ) {
+			return [];
+		}
+
+		// Track thread participants (original author + repliers), sorted by
+		// date so they appear in chronological order.
+		const participantsMap = new Map();
+		const allNotes = [ note, ...note.reply ].sort(
+			( a, b ) => new Date( a.date ) - new Date( b.date )
+		);
+
+		for ( const entry of allNotes ) {
+			if ( ! entry.author_name || participantsMap.has( entry.author ) ) {
+				continue;
+			}
+
+			participantsMap.set( entry.author, {
+				id: entry.author,
+				name: entry.author_name,
+				avatar:
+					entry.author_avatar_urls?.[ '48' ] ||
+					entry.author_avatar_urls?.[ '96' ],
+			} );
+		}
+
+		return Array.from( participantsMap.values() );
+	}, [ note ] );
+
+	if ( ! threadParticipants.length ) {
+		return null;
+	}
+
 	return (
 		<NoteIconToolbarSlotFill.Fill>
 			<ToolbarButton
@@ -80,26 +112,7 @@ export function NoteAvatarIndicator( { onClick, note } ) {
 				onClick={ () => onClick() }
 				showTooltip
 			>
-				<Stack direction="row" align="center" gap="xs">
-					{ visibleParticipants.map( ( participant ) => (
-						<img
-							key={ participant.id }
-							src={ participant.avatar }
-							alt={ participant.name }
-							className="editor-note-indicator__avatar"
-							style={ {
-								borderColor: getAvatarBorderColor(
-									participant.id
-								),
-							} }
-						/>
-					) ) }
-					{ overflowCount > 0 && (
-						<span className="editor-note-indicator__overflow">
-							{ overflowText }
-						</span>
-					) }
-				</Stack>
+				<ThreadParticipants participants={ threadParticipants } />
 			</ToolbarButton>
 		</NoteIconToolbarSlotFill.Fill>
 	);

package/src/components/collab-sidebar/note.js

@@ -6,12 +6,14 @@ import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
-import { RawHTML, useRef, useState } from '@wordpress/element';
+import { useRef, useState, useLayoutEffect } from '@wordpress/element';
 import {
 	__experimentalConfirmDialog as ConfirmDialog,
 	Button,
 	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
+// eslint-disable-next-line @wordpress/use-recommended-components
+import { Button as UIButton } from '@wordpress/ui';
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { moreVertical, published } from '@wordpress/icons';
 
@@ -66,6 +68,28 @@ export function Note( {
 	const [ actionState, setActionState ] = useState( null );
 	const actionButtonRef = useRef( null );
 
+	const commentRef = useRef( null );
+	const rawContent = note?.content?.raw;
+	const [ prevContent, setPrevContent ] = useState( rawContent );
+	const [ isExpanded, setIsExpanded ] = useState( false );
+	const [ isOverflowing, setIsOverflowing ] = useState( false );
+
+	// Collapse whenever the content changes so it can be re-measured.
+	if ( prevContent !== rawContent ) {
+		setPrevContent( rawContent );
+		setIsExpanded( false );
+	}
+
+	// Measure the (clamped) content to decide whether the toggle is needed.
+	useLayoutEffect( () => {
+		const commentElement = commentRef.current;
+		if ( commentElement ) {
+			setIsOverflowing(
+				commentElement.scrollHeight > commentElement.clientHeight
+			);
+		}
+	}, [ rawContent ] );
+
 	const canResolve = note.parent === 0;
 	const isResolutionNote =
 		note.type === 'note' &&
@@ -132,36 +156,37 @@ export function Note( {
 				} }
 			/>
 		);
-	} else if ( isResolutionNote ) {
-		const actionText =
-			note.meta._wp_note_status === 'resolved'
-				? __( 'Marked as resolved' )
-				: __( 'Reopened' );
-		const raw = note?.content?.raw;
-		const text =
-			raw && typeof raw === 'string' && raw.trim() !== ''
-				? sprintf(
-						// translators: %1$s: action label ("Marked as resolved" or "Reopened"); %2$s: note text.
-						__( '%1$s: %2$s' ),
-						actionText,
-						raw
-				  )
-				: actionText;
-		body = (
-			<RawHTML
-				className={ clsx(
-					'editor-collab-sidebar-panel__note-content',
-					'editor-collab-sidebar-panel__resolution-text'
-				) }
-			>
-				{ text }
-			</RawHTML>
-		);
 	} else {
+		let content;
+		if ( isResolutionNote ) {
+			const actionText =
+				note.meta._wp_note_status === 'resolved'
+					? __( 'Marked as resolved' )
+					: __( 'Reopened' );
+			const raw = note?.content?.raw;
+			content =
+				raw && typeof raw === 'string' && raw.trim() !== ''
+					? sprintf(
+							// translators: %1$s: action label ("Marked as resolved" or "Reopened"); %2$s: note text.
+							__( '%1$s: %2$s' ),
+							actionText,
+							raw
+					  )
+					: actionText;
+		} else {
+			content = note?.content?.rendered;
+		}
+
 		body = (
-			<RawHTML className="editor-collab-sidebar-panel__note-content">
-				{ note?.content?.rendered }
-			</RawHTML>
+			<div
+				ref={ commentRef }
+				className={ clsx( 'editor-collab-sidebar-panel__note-content', {
+					'editor-collab-sidebar-panel__resolution-text':
+						isResolutionNote,
+					'is-collapsed': ! isExpanded,
+				} ) }
+				dangerouslySetInnerHTML={ { __html: content ?? '' } }
+			/>
 		);
 	}
 
@@ -204,6 +229,16 @@ export function Note( {
 					{ deleteConfirmMessage }
 				</ConfirmDialog>
 			) }
+			{ isOverflowing && 'edit' !== actionState && (
+				<UIButton
+					className="editor-collab-sidebar-panel__show-more-button"
+					variant="unstyled"
+					size="small"
+					onClick={ () => setIsExpanded( ! isExpanded ) }
+				>
+					{ ! isExpanded ? __( 'Show more' ) : __( 'Show less' ) }
+				</UIButton>
+			) }
 		</NoteCard>
 	);
 }

package/src/components/collab-sidebar/style.scss

@@ -75,10 +75,30 @@
 	color: $gray-700;
 }
 
+.editor-collab-sidebar-panel__show-more-button {
+	width: fit-content;
+	color: var(--wpds-color-foreground-interactive-brand);
+	cursor: var(--wpds-cursor-control);
+
+	&:hover,
+	&:focus,
+	&:active {
+		color: var(--wpds-color-foreground-interactive-brand-active);
+	}
+}
+
 .editor-collab-sidebar-panel__note-content {
 	p:last-child {
 		margin-bottom: 0;
 	}
+
+	&.is-collapsed {
+		-webkit-line-clamp: 3;
+		line-clamp: 3;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		overflow: hidden;
+	}
 }
 
 .editor-collab-sidebar-panel__user-avatar {

package/src/components/collaborators-overlay/use-block-highlighting.ts

@@ -1,14 +1,11 @@
 /**
  * WordPress dependencies
  */
-// @ts-expect-error No exported types
-import { store as blockEditorStore } from '@wordpress/block-editor';
 import {
 	privateApis as coreDataPrivateApis,
 	type CoreDataPrivateApis,
 	type PostEditorAwarenessState as ActiveCollaborator,
 } from '@wordpress/core-data';
-import { useSelect } from '@wordpress/data';
 import { useEffect, useRef, useState } from '@wordpress/element';
 
 /**
@@ -74,11 +71,6 @@ export function useBlockHighlighting(
 	const [ recomputeToken, rerenderHighlightsAfterDelay ] =
 		useDebouncedRecompute( delayMs );
 
-	const blockClientIds = useSelect(
-		( select ) => select( blockEditorStore ).getClientIdsWithDescendants(),
-		[]
-	);
-
 	// All DOM mutations and position computations live inside useEffect.
 	useEffect( () => {
 		if ( ! blockEditorDocument ) {
@@ -215,7 +207,6 @@ export function useBlockHighlighting(
 		overlayElement,
 		recomputeToken,
 		resolveSelection,
-		blockClientIds,
 	] );
 
 	return { highlights, rerenderHighlightsAfterDelay };

package/src/components/collaborators-overlay/use-render-cursors.ts

@@ -1,5 +1,3 @@
-// @ts-expect-error No exported types
-import { store as blockEditorStore } from '@wordpress/block-editor';
 import { privateApis as coreDataPrivateApis } from '@wordpress/core-data';
 import type {
 	CoreDataPrivateApis,
@@ -70,11 +68,6 @@ export function useRenderCursors(
 		[]
 	);
 
-	const blockClientIds = useSelect(
-		( select ) => select( blockEditorStore ).getClientIdsWithDescendants(),
-		[]
-	);
-
 	const [ cursorPositions, setCursorPositions ] = useState< CursorData[] >(
 		[]
 	);
@@ -186,7 +179,6 @@ export function useRenderCursors(
 		sortedUsers,
 		showOwnCursor,
 		recomputeToken,
-		blockClientIds,
 	] );
 
 	return { cursors: cursorPositions, rerenderCursorsAfterDelay };

package/src/components/collaborators-presence/avatar/component.tsx

@@ -12,7 +12,6 @@ extend( [ a11yPlugin ] );
  */
 import { Icon as WCIcon } from '@wordpress/components';
 import { useMemo } from '@wordpress/element';
-// eslint-disable-next-line @wordpress/use-recommended-components -- `Tooltip` is not yet on the recommended `@wordpress/ui` allow-list; landing as a migration step ahead of the wider rollout.
 import { Tooltip } from '@wordpress/ui';
 
 /**