@wordpress/block-library 10.1.1-next.v.202607070741.0 → 10.3.0

package/src/image/image.js

@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import clsx from 'clsx';
+
 /**
  * WordPress dependencies
  */
@@ -69,7 +74,6 @@ import {
 	getStyleStateKey,
 } from '../utils/style-state';
 import { useOpenImageMediaEditorModal } from './use-open-image-media-editor-modal';
-import AnimatedGifConvertControl from './animated-gif-convert-control';
 import {
 	MIN_SIZE,
 	ALLOWED_MEDIA_TYPES,
@@ -391,6 +395,12 @@ export default function Image( {
 	);
 	const { getBlock, getSettings } = useSelect( blockEditorStore );
 	const cropButtonRef = useRef();
+	// URL of a freshly generated file (crop/rotate result) from the media
+	// editor that the browser may not have finished loading; cleared by the
+	// <img> load/error handlers, or by the settle effect below when the
+	// rendered image already shows it.
+	const [ pendingSwapUrl, setPendingSwapUrl ] = useState();
+	const isSwappingMedia = !! pendingSwapUrl;
 	const handleMediaEditorModalClose = useCallback(
 		() => cropButtonRef.current?.focus(),
 		[]
@@ -399,6 +409,7 @@ export default function Image( {
 		attributes,
 		setAttributes,
 		onClose: handleMediaEditorModalClose,
+		onUrlChange: setPendingSwapUrl,
 	} );
 
 	const {
@@ -486,18 +497,34 @@ export default function Image( {
 		};
 	}, [ loadedNaturalWidth, loadedNaturalHeight, imageElement?.complete ] );
 
+	// A media editor update can be undone or superseded before its
+	// attributes land, leaving the rendered image untouched. No load event
+	// fires in that case, so clear the pending swap whenever the rendered
+	// image already shows the pending URL.
+	useEffect( () => {
+		if (
+			pendingSwapUrl &&
+			pendingSwapUrl === url &&
+			imageElement?.complete
+		) {
+			setPendingSwapUrl( undefined );
+		}
+	}, [ pendingSwapUrl, url, imageElement ] );
+
 	function onImageError() {
+		setPendingSwapUrl( undefined );
 		setHasImageErrored( true );
 
 		// Check if there's an embed block that handles this URL, e.g., instagram URL.
 		// See: https://github.com/WordPress/gutenberg/pull/11472
 		const embedBlock = createUpgradedEmbedBlock( { attributes: { url } } );
-		if ( undefined !== embedBlock ) {
+		if ( undefined !== embedBlock && onReplace ) {
 			onReplace( embedBlock );
 		}
 	}
 
 	function onImageLoad( event ) {
+		setPendingSwapUrl( undefined );
 		setHasImageErrored( false );
 		setLoadedNaturalSize( {
 			loadedNaturalWidth: event.target?.naturalWidth,
@@ -854,21 +881,23 @@ export default function Image( {
 
 	const showBlockControls = showUrlInput || allowCrop || showCoverControls;
 
-	const mediaReplaceFlow = isSingleSelected && ! lockUrlControls && (
-		// For contentOnly mode, put this button in its own area so it has borders around it.
-		<BlockControls group={ isContentOnlyMode ? 'inline' : 'other' }>
-			<MediaReplaceFlow
-				mediaId={ id }
-				mediaURL={ url }
-				allowedTypes={ ALLOWED_MEDIA_TYPES }
-				onSelect={ onSelectImage }
-				onSelectURL={ onSelectURL }
-				onError={ onUploadError }
-				name={ ! url ? __( 'Add image' ) : __( 'Replace' ) }
-				onReset={ () => onSelectImage( undefined ) }
-				variant="toolbar"
-			/>
-		</BlockControls>
+	const mediaControls = isSingleSelected && ! lockUrlControls && (
+		<>
+			{ /* For contentOnly mode, put this button in its own area so it has borders around it. */ }
+			<BlockControls group={ isContentOnlyMode ? 'inline' : 'other' }>
+				<MediaReplaceFlow
+					mediaId={ id }
+					mediaURL={ url }
+					allowedTypes={ ALLOWED_MEDIA_TYPES }
+					onSelect={ onSelectImage }
+					onSelectURL={ onSelectURL }
+					onError={ onUploadError }
+					name={ ! url ? __( 'Add image' ) : __( 'Replace' ) }
+					onReset={ () => onSelectImage( undefined ) }
+					variant="toolbar"
+				/>
+			</BlockControls>
+		</>
 	);
 
 	const hasDataFormBlockFields =
@@ -901,6 +930,10 @@ export default function Image( {
 							aria-haspopup="dialog"
 							icon={ crop }
 							label={ __( 'Crop' ) }
+							// Disable rather than hide while the edited image
+							// loads, so the button keeps focus when the modal
+							// closes instead of dropping it to the canvas.
+							disabled={ isSwappingMedia }
 						/>
 					) }
 					{ showCoverControls && (
@@ -1172,7 +1205,9 @@ export default function Image( {
 						onError={ onImageError }
 						onLoad={ onImageLoad }
 						ref={ setRefs }
-						className={ borderProps.className }
+						className={ clsx( borderProps.className, {
+							'is-swapping-media': isSwappingMedia,
+						} ) }
 						width={ naturalWidth }
 						height={ naturalHeight }
 						style={ {
@@ -1221,7 +1256,7 @@ export default function Image( {
 							...shadowProps.style,
 						} }
 					/>
-					{ isUploading && <Spinner /> }
+					{ ( isUploading || isSwappingMedia ) && <Spinner /> }
 				</>
 			) }
 		</ImageWrapper>
@@ -1355,7 +1390,7 @@ export default function Image( {
 	if ( ! url && ! temporaryURL ) {
 		return (
 			<>
-				{ mediaReplaceFlow }
+				{ mediaControls }
 				{ controls }
 			</>
 		);
@@ -1390,13 +1425,7 @@ export default function Image( {
 
 	return (
 		<>
-			{ isSingleSelected && ! lockUrlControls && (
-				<AnimatedGifConvertControl
-					attributes={ attributes }
-					clientId={ clientId }
-				/>
-			) }
-			{ mediaReplaceFlow }
+			{ mediaControls }
 			{ controls }
 			{ featuredImageControl }
 			{ img }

package/src/image/test/use-open-image-media-editor-modal.js

@@ -80,6 +80,7 @@ async function runModalUpdate( {
 	attributes,
 	registryOptions = {},
 	updatePayload = { id: attributes.id, url: 'updated.jpg' },
+	hookOptions = {},
 } ) {
 	const registry = createRegistry( registryOptions );
 	useRegistry.mockReturnValue( registry );
@@ -87,7 +88,11 @@ async function runModalUpdate( {
 	const openMediaEditorModal = jest.fn();
 	mockMediaEditorModalSetting( openMediaEditorModal );
 	const { result } = renderHook( () =>
-		useOpenImageMediaEditorModal( { attributes, setAttributes } )
+		useOpenImageMediaEditorModal( {
+			attributes,
+			setAttributes,
+			...hookOptions,
+		} )
 	);
 	await act( async () => {
 		await result.current();
@@ -105,6 +110,37 @@ describe( 'useOpenImageMediaEditorModal', () => {
 		jest.clearAllMocks();
 	} );
 
+	it( 'notifies onUrlChange when the update switches to a new attachment URL', async () => {
+		const onUrlChange = jest.fn();
+		await runModalUpdate( {
+			attributes: { id: 1, url: 'original.jpg', alt: '', caption: '' },
+			updatePayload: { id: 2, url: 'updated.jpg' },
+			hookOptions: { onUrlChange },
+		} );
+		expect( onUrlChange ).toHaveBeenCalledTimes( 1 );
+		expect( onUrlChange ).toHaveBeenCalledWith( 'updated.jpg' );
+	} );
+
+	it( 'does not notify onUrlChange for a same-attachment update', async () => {
+		const onUrlChange = jest.fn();
+		await runModalUpdate( {
+			attributes: { id: 1, url: 'original.jpg', alt: '', caption: '' },
+			updatePayload: { id: 1, url: 'original.jpg' },
+			hookOptions: { onUrlChange },
+		} );
+		expect( onUrlChange ).not.toHaveBeenCalled();
+	} );
+
+	it( 'does not notify onUrlChange when the update carries no URL', async () => {
+		const onUrlChange = jest.fn();
+		await runModalUpdate( {
+			attributes: { id: 1, url: 'original.jpg', alt: '', caption: '' },
+			updatePayload: { id: 2 },
+			hookOptions: { onUrlChange },
+		} );
+		expect( onUrlChange ).not.toHaveBeenCalled();
+	} );
+
 	it( 'returns no opener when the media editor modal setting is unavailable', () => {
 		useRegistry.mockReturnValue( createRegistry() );
 		mockMediaEditorModalSetting( undefined );

package/src/image/transforms.js

@@ -3,6 +3,95 @@
  */
 import { createBlobURL, isBlobURL } from '@wordpress/blob';
 import { createBlock, getBlockAttributes } from '@wordpress/blocks';
+import { select } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
+
+/**
+ * Returns the subset of block attributes that should be carried over when
+ * converting an animated-GIF Image block into its converted Video block.
+ *
+ * The conversion swaps one block for another via `createBlock`, which would
+ * otherwise drop everything the author set on the original block. This carries
+ * the attributes both blocks support: block alignment, the HTML anchor, custom
+ * class names, and margin spacing.
+ *
+ * Image-only attributes such as links (`href`/`linkDestination`), sizing
+ * (`sizeSlug`/`scale`), and `border`/`shadow` styles are intentionally not
+ * carried: the Video block has no equivalent, so copying them would leave
+ * attributes the target block cannot represent.
+ *
+ * @param {Object} attributes Source block attributes.
+ * @return {Object} Attributes to spread into the converted block.
+ */
+function getCarriedGifConversionAttributes( attributes ) {
+	const { align, anchor, className, style } = attributes;
+	const margin = style?.spacing?.margin;
+
+	return {
+		...( align && { align } ),
+		...( anchor && { anchor } ),
+		...( className && { className } ),
+		...( margin && { style: { spacing: { margin } } } ),
+	};
+}
+
+/**
+ * Returns the sideloaded video companion of an animated GIF image attachment,
+ * or `null` when the media is not a converted animated GIF.
+ *
+ * An animated GIF uploaded through the editor gets a muted, looping video
+ * transcode sideloaded next to it and recorded (as basenames) in the
+ * attachment's `media_details.animated_video` / `animated_video_poster`.
+ *
+ * Block transforms match and run synchronously, so this reads the attachment
+ * record straight from the core-data store: it only returns the companion once
+ * the record is resolved. The Image block resolves the record while the block
+ * is selected, which is also when the block switcher can offer the transform.
+ *
+ * @param {number} id  Image attachment ID.
+ * @param {string} url Image block URL, used to cheaply skip non-GIF media.
+ * @return {Object|null} Companion details (absolute `src`/`poster` URLs and
+ *                       the GIF's intrinsic `width`/`height`), or `null`.
+ */
+function getAnimatedGifVideoCompanion( id, url ) {
+	if ( ! id ) {
+		return null;
+	}
+	/*
+	 * Only animated GIFs have a video companion. Gate on the `.gif` extension
+	 * so an ordinary image never reaches into the attachment record just to
+	 * discover it has no companion. Strip any query string or fragment first
+	 * so a URL like `cat.gif?ver=2` still matches.
+	 */
+	const urlPath = url?.split( /[?#]/ )[ 0 ];
+	if ( ! urlPath?.toLowerCase().endsWith( '.gif' ) ) {
+		return null;
+	}
+	const record = select( coreStore ).getEntityRecord(
+		'postType',
+		'attachment',
+		id,
+		{ context: 'view' }
+	);
+	const details = record?.media_details;
+	if ( ! details?.animated_video || ! record?.source_url ) {
+		return null;
+	}
+	// Companion files are sideloaded next to the GIF, so they share its
+	// directory; build their URLs from the GIF's own source URL.
+	const dir = record.source_url.slice(
+		0,
+		record.source_url.lastIndexOf( '/' ) + 1
+	);
+	return {
+		src: dir + details.animated_video,
+		poster: details.animated_video_poster
+			? dir + details.animated_video_poster
+			: undefined,
+		width: details.width,
+		height: details.height,
+	};
+}
 
 export function stripFirstImage( attributes, { shortcode } ) {
 	const { body } = document.implementation.createHTMLDocument( '' );
@@ -253,6 +342,45 @@ const transforms = {
 			},
 		},
 	],
+	to: [
+		{
+			// Offer converting an animated GIF into the Video block's "GIF"
+			// variation: a muted, looping, autoplaying video transcoded from
+			// the GIF and sideloaded next to it when it was uploaded. Only
+			// matches when that companion video exists, so ordinary images
+			// never see this transform.
+			type: 'block',
+			blocks: [ 'core/video' ],
+			isMatch: ( { id, url } ) =>
+				!! getAnimatedGifVideoCompanion( id, url ),
+			transform( attributes ) {
+				const { id, url, caption } = attributes;
+				const companion = getAnimatedGifVideoCompanion( id, url );
+
+				return createBlock( 'core/video', {
+					...getCarriedGifConversionAttributes( attributes ),
+					id,
+					src: companion.src,
+					poster: companion.poster,
+					caption,
+					controls: false,
+					loop: true,
+					autoplay: true,
+					muted: true,
+					playsInline: true,
+					/*
+					 * Carry the GIF's intrinsic dimensions so the <video>
+					 * keeps its aspect ratio from the first paint. Without
+					 * them the element collapses to the browser-default size
+					 * and then jumps once the poster/metadata load, which
+					 * shows up as a brief duplicated image during the swap.
+					 */
+					width: companion.width,
+					height: companion.height,
+				} );
+			},
+		},
+	],
 };
 
 export default transforms;

package/src/image/use-open-image-media-editor-modal.js

@@ -137,6 +137,7 @@ export function useOpenImageMediaEditorModal( {
 	attributes,
 	setAttributes,
 	onClose,
+	onUrlChange,
 } ) {
 	// Keep this hook private to the Image block and pass the block attributes
 	// object so the callsite stays compact. Destructure only the attributes
@@ -246,6 +247,12 @@ export function useOpenImageMediaEditorModal( {
 			if ( newId !== currentBlockAttributes.id ) {
 				nextAttributes.id = newId;
 				nextAttributes.url = newUrl ?? currentBlockAttributes.url;
+				if ( nextAttributes.url !== currentBlockAttributes.url ) {
+					// The block is about to point at a freshly generated file
+					// the browser hasn't loaded yet; let the caller show a
+					// loading state until its <img> fires load/error.
+					onUrlChange?.( nextAttributes.url );
+				}
 				blockAttributesRef.current = {
 					...blockAttributesRef.current,
 					id: nextAttributes.id,
@@ -294,7 +301,7 @@ export function useOpenImageMediaEditorModal( {
 				setAttributes( nextAttributes );
 			}
 		},
-		[ resolveFreshAttachmentRecord, setAttributes ]
+		[ onUrlChange, resolveFreshAttachmentRecord, setAttributes ]
 	);
 
 	const openImageMediaEditorModal = useCallback( async () => {

package/src/index.js

@@ -197,6 +197,8 @@ const getAllBlocks = () => {
 		pageList,
 		pageListItem,
 		pattern,
+		playlist,
+		playlistTrack,
 		preformatted,
 		pullquote,
 		reusableBlock,
@@ -208,6 +210,10 @@ const getAllBlocks = () => {
 		socialLinks,
 		spacer,
 		table,
+		tabs,
+		tabList,
+		tabPanels,
+		tabPanel,
 		tagCloud,
 		textColumns,
 		verse,
@@ -281,12 +287,8 @@ const getAllBlocks = () => {
 	}
 
 	if ( window?.__experimentalEnableBlockExperiments ) {
-		blocks.push( tabList );
-		blocks.push( tabs );
-		blocks.push( tabPanel );
-		blocks.push( tabPanels );
-		blocks.push( playlist );
-		blocks.push( playlistTrack );
+		// Blocks added here are only registered when the "Block experiments"
+		// option is enabled in the Gutenberg > Experiments settings page.
 	}
 
 	blocks.push( classic );
@@ -343,13 +345,23 @@ export const registerCoreBlocks = (
 				...( ( bootstrappedBlockType?.apiVersion ?? 0 ) < 3 && {
 					apiVersion: 3,
 				} ),
+				// Always pass the postId context so the server-side render can
+				// reproduce the same output as the front end, while preserving
+				// any context declared in the block's PHP registration.
+				usesContext: Array.from(
+					new Set( [
+						...( bootstrappedBlockType?.usesContext ?? [] ),
+						'postId',
+					] )
+				),
 				// Inspector controls are rendered by the auto-register hook in block-editor
-				edit: function Edit( { attributes } ) {
+				edit: function Edit( { attributes, context } ) {
 					const disabledRef = useDisabled();
 					const blockProps = useBlockProps( { ref: disabledRef } );
 					const { content, status, error } = useServerSideRender( {
 						block: blockName,
 						attributes,
+						urlQueryArgs: { post_id: context?.postId },
 					} );
 
 					if ( status === 'loading' ) {

package/src/latest-posts/edit.js

@@ -162,13 +162,10 @@ function Controls( { attributes, setAttributes } ) {
 			label: name,
 		} ) );
 	const categorySuggestions =
-		categoriesList?.reduce(
-			( accumulator, category ) => ( {
-				...accumulator,
-				[ category.name ]: category,
-			} ),
-			{}
-		) ?? {};
+		categoriesList?.reduce( ( accumulator, category ) => {
+			accumulator[ category.name ] = category;
+			return accumulator;
+		}, {} ) ?? {};
 	const selectCategories = ( tokens ) => {
 		const hasNoSuggestion = tokens.some(
 			( token ) =>
@@ -807,7 +804,7 @@ export default function LatestPostsEdit( {
 									<div
 										className="wp-block-latest-posts__post-full-content"
 										dangerouslySetInnerHTML={ {
-											__html: post.content.raw.trim(),
+											__html: post.content.rendered.trim(),
 										} }
 									/>
 								) }

package/src/latest-posts/index.php

@@ -44,6 +44,7 @@ function block_core_latest_posts_get_excerpt_length() {
  */
 function render_block_core_latest_posts( $attributes ) {
 	global $post, $block_core_latest_posts_excerpt_length;
+	static $rendering_stack = array();
 
 	$args = array(
 		'posts_per_page'      => $attributes['postsToShow'],
@@ -57,25 +58,31 @@ function render_block_core_latest_posts( $attributes ) {
 	$block_core_latest_posts_excerpt_length = $attributes['excerptLength'];
 	add_filter( 'excerpt_length', 'block_core_latest_posts_get_excerpt_length', 20 );
 
-	if ( ! empty( $attributes['categories'] ) ) {
-		$args['category__in'] = array_column( $attributes['categories'], 'id' );
+	$categories = $attributes['categories'] ?? null;
+	if ( ! empty( $categories ) && is_array( $categories ) ) {
+		$args['category__in'] = array_column( $categories, 'id' );
 	}
 	if ( isset( $attributes['selectedAuthor'] ) ) {
 		$args['author'] = $attributes['selectedAuthor'];
 	}
 
-	$query        = new WP_Query();
-	$recent_posts = $query->query( $args );
+	$query = new WP_Query( $args );
 
 	if ( isset( $attributes['displayFeaturedImage'] ) && $attributes['displayFeaturedImage'] ) {
 		update_post_thumbnail_cache( $query );
 	}
 
 	$list_items_markup = '';
+	// Snapshot the current global post so it can be restored after the loop.
+	// We use have_posts()/the_post() rather than foreach so that setup_postdata()
+	// is called for each post, establishing the correct global context for
+	// do_blocks() and other filters that run during full-content rendering.
+	$previous_post = $post ?? null;
 
-	foreach ( $recent_posts as $post ) {
-		$post_link = esc_url( get_permalink( $post ) );
-		$title     = get_the_title( $post );
+	while ( $query->have_posts() ) {
+		$query->the_post();
+		$post_link = esc_url( get_permalink() );
+		$title     = get_the_title();
 
 		if ( ! $title ) {
 			$title = __( '(no title)' );
@@ -83,7 +90,7 @@ function render_block_core_latest_posts( $attributes ) {
 
 		$list_items_markup .= '<li>';
 
-		if ( $attributes['displayFeaturedImage'] && has_post_thumbnail( $post ) ) {
+		if ( $attributes['displayFeaturedImage'] && has_post_thumbnail() ) {
 			$image_style = '';
 			if ( isset( $attributes['featuredImageSizeWidth'] ) ) {
 				$image_style .= sprintf( 'max-width:%spx;', $attributes['featuredImageSizeWidth'] );
@@ -98,7 +105,7 @@ function render_block_core_latest_posts( $attributes ) {
 			}
 
 			$featured_image = get_the_post_thumbnail(
-				$post,
+				null,
 				$attributes['featuredImageSizeSlug'],
 				array(
 					'style' => esc_attr( $image_style ),
@@ -126,7 +133,7 @@ function render_block_core_latest_posts( $attributes ) {
 		);
 
 		if ( isset( $attributes['displayAuthor'] ) && $attributes['displayAuthor'] ) {
-			$author_display_name = get_the_author_meta( 'display_name', $post->post_author );
+			$author_display_name = get_the_author_meta( 'display_name' );
 
 			/* translators: byline. %s: author. */
 			$byline = sprintf( __( 'by %s' ), $author_display_name );
@@ -142,15 +149,15 @@ function render_block_core_latest_posts( $attributes ) {
 		if ( isset( $attributes['displayPostDate'] ) && $attributes['displayPostDate'] ) {
 			$list_items_markup .= sprintf(
 				'<time datetime="%1$s" class="wp-block-latest-posts__post-date">%2$s</time>',
-				esc_attr( get_the_date( 'c', $post ) ),
-				get_the_date( '', $post )
+				esc_attr( get_the_date( 'c' ) ),
+				get_the_date( '' )
 			);
 		}
 
 		if ( isset( $attributes['displayPostContent'] ) && $attributes['displayPostContent']
 			&& isset( $attributes['displayPostContentRadio'] ) && 'excerpt' === $attributes['displayPostContentRadio'] ) {
 
-			$trimmed_excerpt = get_the_excerpt( $post );
+			$trimmed_excerpt = get_the_excerpt();
 
 			/*
 			 * Adds a "Read more" link with screen reader text.
@@ -170,7 +177,7 @@ function render_block_core_latest_posts( $attributes ) {
 				}
 			}
 
-			if ( post_password_required( $post ) ) {
+			if ( post_password_required() ) {
 				$trimmed_excerpt = __( 'This content is password protected.' );
 			}
 
@@ -183,21 +190,45 @@ function render_block_core_latest_posts( $attributes ) {
 		if ( isset( $attributes['displayPostContent'] ) && $attributes['displayPostContent']
 			&& isset( $attributes['displayPostContentRadio'] ) && 'full_post' === $attributes['displayPostContentRadio'] ) {
 
-			$post_content = html_entity_decode( $post->post_content, ENT_QUOTES, get_option( 'blog_charset' ) );
-
-			if ( post_password_required( $post ) ) {
+			if ( post_password_required() ) {
 				$post_content = __( 'This content is password protected.' );
+			} else {
+				$post_id      = get_the_ID();
+				$post_content = get_post_field( 'post_content', $post_id, 'raw' );
+				// Check if we're already rendering this post to prevent infinite recursion.
+				if ( in_array( $post_id, $rendering_stack, true ) ) {
+					$post_content = '';
+				} else {
+					$rendering_stack[] = $post_id;
+
+					try {
+						// Run through the actions that are typically taken on the_content.
+						$post_content = _wp_apply_block_content_filters( $post_content, 'latest-posts' );
+					} finally {
+						array_pop( $rendering_stack );
+					}
+				}
 			}
 
+			$post_content       = str_replace( ']]>', ']]&gt;', $post_content );
 			$list_items_markup .= sprintf(
 				'<div class="wp-block-latest-posts__post-full-content">%1$s</div>',
-				wp_kses_post( $post_content )
+				$post_content
 			);
 		}
 
 		$list_items_markup .= "</li>\n";
 	}
 
+	// Restore the post context that was active before this secondary query.
+	// wp_reset_postdata() is intentionally not used here: when this block is
+	// rendered inside another post's content (e.g. via do_blocks()), it would
+	// restore to the main query post rather than the outer rendering post.
+	$post = $previous_post;
+	if ( $previous_post instanceof WP_Post ) {
+		setup_postdata( $previous_post );
+	}
+
 	remove_filter( 'excerpt_length', 'block_core_latest_posts_get_excerpt_length', 20 );
 
 	$layout             = $attributes['layout'] ?? array();

package/src/list-item/edit.js

@@ -83,7 +83,7 @@ export default function ListItemEdit( {
 		renderAppender: false,
 		__unstableDisableDropZone: true,
 	} );
-	const useEnterRef = useEnter( { content, clientId } );
+	const useEnterRef = useEnter( clientId );
 	const useSpaceRef = useSpace( clientId );
 	const onMerge = useMerge( clientId, mergeBlocks );
 	return (