@wordpress/block-editor 10.5.0 → 11.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "10.5.0",
+	"version": "11.0.0",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -33,37 +33,39 @@
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^3.22.0",
-		"@wordpress/api-fetch": "^6.19.0",
-		"@wordpress/blob": "^3.22.0",
-		"@wordpress/blocks": "^11.21.0",
-		"@wordpress/components": "^22.1.0",
-		"@wordpress/compose": "^5.20.0",
-		"@wordpress/data": "^7.6.0",
-		"@wordpress/date": "^4.22.0",
-		"@wordpress/deprecated": "^3.22.0",
-		"@wordpress/dom": "^3.22.0",
-		"@wordpress/element": "^4.20.0",
-		"@wordpress/hooks": "^3.22.0",
-		"@wordpress/html-entities": "^3.22.0",
-		"@wordpress/i18n": "^4.22.0",
-		"@wordpress/icons": "^9.13.0",
-		"@wordpress/is-shallow-equal": "^4.22.0",
-		"@wordpress/keyboard-shortcuts": "^3.20.0",
-		"@wordpress/keycodes": "^3.22.0",
-		"@wordpress/notices": "^3.22.0",
-		"@wordpress/rich-text": "^5.20.0",
-		"@wordpress/shortcode": "^3.22.0",
-		"@wordpress/style-engine": "^1.5.0",
-		"@wordpress/token-list": "^2.22.0",
-		"@wordpress/url": "^3.23.0",
-		"@wordpress/warning": "^2.22.0",
-		"@wordpress/wordcount": "^3.22.0",
+		"@wordpress/a11y": "^3.23.0",
+		"@wordpress/api-fetch": "^6.20.0",
+		"@wordpress/blob": "^3.23.0",
+		"@wordpress/blocks": "^12.0.0",
+		"@wordpress/components": "^23.0.0",
+		"@wordpress/compose": "^6.0.0",
+		"@wordpress/data": "^8.0.0",
+		"@wordpress/date": "^4.23.0",
+		"@wordpress/deprecated": "^3.23.0",
+		"@wordpress/dom": "^3.23.0",
+		"@wordpress/element": "^5.0.0",
+		"@wordpress/escape-html": "^2.23.0",
+		"@wordpress/hooks": "^3.23.0",
+		"@wordpress/html-entities": "^3.23.0",
+		"@wordpress/i18n": "^4.23.0",
+		"@wordpress/icons": "^9.14.0",
+		"@wordpress/is-shallow-equal": "^4.23.0",
+		"@wordpress/keyboard-shortcuts": "^4.0.0",
+		"@wordpress/keycodes": "^3.23.0",
+		"@wordpress/notices": "^3.23.0",
+		"@wordpress/rich-text": "^6.0.0",
+		"@wordpress/shortcode": "^3.23.0",
+		"@wordpress/style-engine": "^1.6.0",
+		"@wordpress/token-list": "^2.23.0",
+		"@wordpress/url": "^3.24.0",
+		"@wordpress/warning": "^2.23.0",
+		"@wordpress/wordcount": "^3.23.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.7.0",
 		"diff": "^4.0.2",
 		"dom-scroll-into-view": "^1.2.1",
+		"fast-deep-equal": "^3.1.3",
 		"inherits": "^2.0.3",
 		"lodash": "^4.17.21",
 		"react-autosize-textarea": "^7.1.0",
@@ -73,11 +75,11 @@
 		"traverse": "^0.6.6"
 	},
 	"peerDependencies": {
-		"react": "^17.0.0",
-		"react-dom": "^17.0.0"
+		"react": "^18.0.0",
+		"react-dom": "^18.0.0"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "7ac04f446242452d3cb24372f9ca58f0cae97715"
+	"gitHead": "1eb65aabe6738097f4c062e78f69ae8f05879848"
 }

package/src/autocompleters/block.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { orderBy } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -20,6 +15,7 @@ import { searchBlockItems } from '../components/inserter/search-items';
 import useBlockTypesState from '../components/inserter/hooks/use-block-types-state';
 import BlockIcon from '../components/block-icon';
 import { store as blockEditorStore } from '../store';
+import { orderBy } from '../utils/sorting';
 
 const noop = () => {};
 const SHOWN_BLOCK_TYPES = 9;
@@ -68,7 +64,7 @@ function createBlockCompleter() {
 							collections,
 							filterValue
 					  )
-					: orderBy( items, [ 'frecency' ], [ 'desc' ] );
+					: orderBy( items, 'frecency', 'desc' );
 
 				return initialFilteredItems
 					.filter( ( item ) => item.name !== selectedBlockName )

package/src/autocompleters/link.js

@@ -1,6 +1,8 @@
 /**
  * WordPress dependencies
  */
+// Disable Reason: Needs to be refactored.
+// eslint-disable-next-line no-restricted-imports
 import apiFetch from '@wordpress/api-fetch';
 import { addQueryArgs } from '@wordpress/url';
 import { Icon, page, post } from '@wordpress/icons';

package/src/components/alignment-control/test/index.js

@@ -52,7 +52,7 @@ describe( 'AlignmentUI', () => {
 			advanceTimers: jest.advanceTimersByTime,
 		} );
 
-		render(
+		const { unmount } = render(
 			<AlignmentUI
 				isToolbar
 				value={ alignment }
@@ -77,6 +77,9 @@ describe( 'AlignmentUI', () => {
 				name: /^Align text \w+$/,
 			} )
 		).toHaveLength( 3 );
+
+		// Cancel running effects, like delayed dropdown menu popover positioning.
+		unmount();
 	} );
 
 	test( 'should call on change with undefined when a control is already active', async () => {

package/src/components/block-alignment-control/test/index.js

@@ -47,7 +47,7 @@ describe( 'BlockAlignmentUI', () => {
 			advanceTimers: jest.advanceTimersByTime,
 		} );
 
-		render(
+		const { unmount } = render(
 			<BlockAlignmentUI
 				value={ alignment }
 				onChange={ onChange }
@@ -72,6 +72,9 @@ describe( 'BlockAlignmentUI', () => {
 				name: /^Align \w+$/,
 			} )
 		).toHaveLength( 3 );
+
+		// Cancel running effects, like delayed dropdown menu popover positioning.
+		unmount();
 	} );
 
 	test( 'should call onChange with undefined, when the control is already active', async () => {

package/src/components/block-card/index.js

@@ -1,14 +1,24 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
 import deprecated from '@wordpress/deprecated';
+import { Button } from '@wordpress/components';
+import { chevronLeft, chevronRight } from '@wordpress/icons';
+import { __, isRTL } from '@wordpress/i18n';
+import { useSelect, useDispatch } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import BlockIcon from '../block-icon';
+import { store as blockEditorStore } from '../../store';
 
-function BlockCard( { title, icon, description, blockType } ) {
+function BlockCard( { title, icon, description, blockType, className } ) {
 	if ( blockType ) {
 		deprecated( '`blockType` property in `BlockCard component`', {
 			since: '5.7',
@@ -16,8 +26,42 @@ function BlockCard( { title, icon, description, blockType } ) {
 		} );
 		( { title, icon, description } = blockType );
 	}
+
+	const isOffCanvasNavigationEditorEnabled =
+		window?.__experimentalEnableOffCanvasNavigationEditor === true;
+
+	const { parentNavBlockClientId } = useSelect( ( select ) => {
+		const { getSelectedBlockClientId, getBlockParentsByBlockName } =
+			select( blockEditorStore );
+
+		const _selectedBlockClientId = getSelectedBlockClientId();
+
+		return {
+			parentNavBlockClientId: getBlockParentsByBlockName(
+				_selectedBlockClientId,
+				'core/navigation',
+				true
+			)[ 0 ],
+		};
+	}, [] );
+
+	const { selectBlock } = useDispatch( blockEditorStore );
+
 	return (
-		<div className="block-editor-block-card">
+		<div className={ classnames( 'block-editor-block-card', className ) }>
+			{ isOffCanvasNavigationEditorEnabled && parentNavBlockClientId && (
+				<Button
+					onClick={ () => selectBlock( parentNavBlockClientId ) }
+					label={ __( 'Go to parent Navigation block' ) }
+					style={
+						// TODO: This style override is also used in ToolsPanelHeader.
+						// It should be supported out-of-the-box by Button.
+						{ minWidth: 24, padding: 0 }
+					}
+					icon={ isRTL() ? chevronRight : chevronLeft }
+					isSmall
+				/>
+			) }
 			<BlockIcon icon={ icon } showColors />
 			<div className="block-editor-block-card__content">
 				<h2 className="block-editor-block-card__title">{ title }</h2>

package/src/components/block-card/style.scss

@@ -28,3 +28,7 @@
 	width: $button-size-small;
 	height: $button-size-small;
 }
+
+.block-editor-block-card.is-synced .block-editor-block-icon {
+	color: var(--wp-block-synced-color);
+}

package/src/components/block-content-overlay/{style.scss → content.scss}

@@ -19,10 +19,16 @@
 	}
 
 	&:hover:not(.is-dragging-blocks)::before {
-		background: rgba(var(--wp-admin-theme-color--rgb), 0.3);
+		background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
 		box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color) inset;
 	}
 
+	&.is-reusable:hover:not(.is-dragging-blocks)::before,
+	&.wp-block-template-part:hover:not(.is-dragging-blocks)::before {
+		background: rgba(var(--wp-block-synced-color--rgb), 0.04);
+		box-shadow: 0 0 0 $border-width var(--wp-block-synced-color) inset;
+	}
+
 	&.is-selected:not(.is-dragging-blocks)::before {
 		box-shadow: 0 0 0 $border-width var(--wp-admin-theme-color) inset;
 	}

package/src/components/block-draggable/content.scss

@@ -0,0 +1,20 @@
+// This creates a "slot" where the block you're dragging appeared.
+// We use !important as one of the rules are meant to be overriden.
+.block-editor-block-list__layout .is-dragging {
+	background-color: currentColor !important;
+	opacity: 0.05 !important;
+	border-radius: $radius-block-ui !important;
+
+	// Disabling pointer events during the drag event is necessary,
+	// lest the block might affect your drag operation.
+	pointer-events: none !important;
+
+	// Hide the multi selection indicator when dragging.
+	&::selection {
+		background: transparent !important;
+	}
+
+	&::after {
+		content: none !important;
+	}
+}

package/src/components/block-draggable/index.native.js

@@ -285,6 +285,58 @@ const BlockDraggableWrapper = ( { children, isRTL } ) => {
 	);
 };
 
+function useIsScreenReaderEnabled() {
+	const [ isScreenReaderEnabled, setIsScreenReaderEnabled ] =
+		useState( false );
+
+	useEffect( () => {
+		let mounted = true;
+
+		const changeListener = AccessibilityInfo.addEventListener(
+			'screenReaderChanged',
+			( enabled ) => setIsScreenReaderEnabled( enabled )
+		);
+
+		AccessibilityInfo.isScreenReaderEnabled().then(
+			( screenReaderEnabled ) => {
+				if ( mounted && screenReaderEnabled ) {
+					setIsScreenReaderEnabled( screenReaderEnabled );
+				}
+			}
+		);
+
+		return () => {
+			mounted = false;
+
+			changeListener.remove();
+		};
+	}, [] );
+
+	return isScreenReaderEnabled;
+}
+
+function useIsEditingText() {
+	const [ isEditingText, setIsEditingText ] = useState( () =>
+		RCTAztecView.InputState.isFocused()
+	);
+
+	useEffect( () => {
+		const onFocusChangeAztec = ( { isFocused } ) => {
+			setIsEditingText( isFocused );
+		};
+
+		RCTAztecView.InputState.addFocusChangeListener( onFocusChangeAztec );
+
+		return () => {
+			RCTAztecView.InputState.removeFocusChangeListener(
+				onFocusChangeAztec
+			);
+		};
+	}, [] );
+
+	return isEditingText;
+}
+
 /**
  * Block draggable component
  *
@@ -308,9 +360,8 @@ const BlockDraggable = ( {
 	testID,
 } ) => {
 	const wasBeingDragged = useRef( false );
-	const [ isEditingText, setIsEditingText ] = useState( false );
-	const [ isScreenReaderEnabled, setIsScreenReaderEnabled ] =
-		useState( false );
+	const isEditingText = useIsEditingText();
+	const isScreenReaderEnabled = useIsScreenReaderEnabled();
 
 	const draggingAnimation = {
 		opacity: useSharedValue( 1 ),
@@ -365,43 +416,6 @@ const BlockDraggable = ( {
 		wasBeingDragged.current = isBeingDragged;
 	}, [ isBeingDragged ] );
 
-	const onFocusChangeAztec = useCallback( ( { isFocused } ) => {
-		setIsEditingText( isFocused );
-	}, [] );
-
-	useEffect( () => {
-		let mounted = true;
-
-		const isAnyAztecInputFocused = RCTAztecView.InputState.isFocused();
-		if ( isAnyAztecInputFocused ) {
-			setIsEditingText( isAnyAztecInputFocused );
-		}
-
-		RCTAztecView.InputState.addFocusChangeListener( onFocusChangeAztec );
-
-		const screenReaderChangedListener = AccessibilityInfo.addEventListener(
-			'screenReaderChanged',
-			setIsScreenReaderEnabled
-		);
-		AccessibilityInfo.isScreenReaderEnabled().then(
-			( screenReaderEnabled ) => {
-				if ( mounted ) {
-					setIsScreenReaderEnabled( screenReaderEnabled );
-				}
-			}
-		);
-
-		return () => {
-			mounted = false;
-
-			RCTAztecView.InputState.removeFocusChangeListener(
-				onFocusChangeAztec
-			);
-
-			screenReaderChangedListener.remove();
-		};
-	}, [] );
-
 	const onLongPressDraggable = useCallback( () => {
 		// Ensure that no text input is focused when starting the dragging gesture in order to prevent conflicts with text editing.
 		RCTAztecView.InputState.blurCurrentFocusedElement();

package/src/components/block-draggable/style.scss

@@ -44,24 +44,3 @@
 		font-size: $default-font-size;
 	}
 }
-
-// This creates a "slot" where the block you're dragging appeared.
-// We use !important as one of the rules are meant to be overriden.
-.block-editor-block-list__layout .is-dragging {
-	background-color: currentColor !important;
-	opacity: 0.05 !important;
-	border-radius: $radius-block-ui !important;
-
-	// Disabling pointer events during the drag event is necessary,
-	// lest the block might affect your drag operation.
-	pointer-events: none !important;
-
-	// Hide the multi selection indicator when dragging.
-	&::selection {
-		background: transparent !important;
-	}
-
-	&::after {
-		content: none !important;
-	}
-}

package/src/components/block-draggable/test/helpers.native.js

@@ -53,14 +53,14 @@ export const initializeWithBlocksLayouts = async ( blocks ) => {
 	const initialHtml = blocks.map( ( block ) => block.html ).join( '\n' );
 
 	const screen = await initializeEditor( { initialHtml } );
-	const { getByLabelText } = screen;
+	const { getAllByLabelText } = screen;
 
 	const waitPromises = [];
 	blocks.forEach( ( block, index ) => {
 		const a11yLabel = new RegExp(
 			`${ block.name } Block\\. Row ${ index + 1 }`
 		);
-		const element = getByLabelText( a11yLabel );
+		const [ element ] = getAllByLabelText( a11yLabel );
 		// "onLayout" event will populate the blocks layouts data.
 		fireEvent( element, 'layout', {
 			nativeEvent: { layout: block.layout },
@@ -91,13 +91,11 @@ export const initializeWithBlocksLayouts = async ( blocks ) => {
 				const nestedA11yLabel = new RegExp(
 					`${ nestedBlock.name } Block\\. Row ${ nestedIndex + 1 }`
 				);
-				fireEvent(
-					within( element ).getByLabelText( nestedA11yLabel ),
-					'layout',
-					{
-						nativeEvent: { layout: nestedBlock.layout },
-					}
-				);
+				const [ nestedElement ] =
+					within( element ).getAllByLabelText( nestedA11yLabel );
+				fireEvent( nestedElement, 'layout', {
+					nativeEvent: { layout: nestedBlock.layout },
+				} );
 			} );
 		}
 	} );

package/src/components/block-draggable/test/index.native.js

@@ -93,11 +93,13 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when unselected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
 
 					// Start dragging from block's content
+					const [ paragraphBlock ] = screen.getAllByLabelText(
+						/Paragraph Block\. Row 1/
+					);
 					fireLongPress(
-						getByLabelText( /Paragraph Block\. Row 1/ ),
+						paragraphBlock,
 						'draggable-trigger-content'
 					);
 					expect( getDraggableChip( screen ) ).toBeVisible();
@@ -112,12 +114,12 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when selected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
+
 					const blockDraggableWrapper = getByGestureTestId(
 						'block-draggable-wrapper'
 					);
 
-					const paragraphBlock = getByLabelText(
+					const [ paragraphBlock ] = screen.getAllByLabelText(
 						/Paragraph Block\. Row 1/
 					);
 					fireEvent.press( paragraphBlock );
@@ -146,9 +148,8 @@ describe( 'BlockDraggable', () => {
 			it( 'does not enable drag mode when selected and editing text', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
 
-					const paragraphBlock = getByLabelText(
+					const [ paragraphBlock ] = screen.getAllByLabelText(
 						/Paragraph Block\. Row 1/
 					);
 
@@ -178,13 +179,12 @@ describe( 'BlockDraggable', () => {
 			it( 'finishes editing text and enables drag mode when long-pressing over a different block', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
 
-					const paragraphBlock = getByLabelText(
+					const [ paragraphBlock ] = screen.getAllByLabelText(
 						/Paragraph Block\. Row 1/
 					);
-					const spacerBlock =
-						getByLabelText( /Spacer Block\. Row 3/ );
+					const [ spacerBlock ] =
+						screen.getAllByLabelText( /Spacer Block\. Row 3/ );
 
 					// Select Paragraph block and start editing text
 					fireEvent.press( paragraphBlock );
@@ -208,12 +208,11 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when unselected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getAllByLabelText } = screen;
 
 					// We select the first Image block as the Gallery block
 					// also contains Image blocks.
-					const imageBlock =
-						getAllByLabelText( /Image Block\. Row 2/ )[ 0 ];
+					const [ imageBlock ] =
+						screen.getAllByLabelText( /Image Block\. Row 2/ );
 					// Start dragging from block's content
 					fireLongPress( imageBlock, 'draggable-trigger-content' );
 					expect( getDraggableChip( screen ) ).toBeVisible();
@@ -228,15 +227,14 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when selected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getAllByLabelText } = screen;
 					const blockDraggableWrapper = getByGestureTestId(
 						'block-draggable-wrapper'
 					);
 
 					// We select the first Image block as the Gallery block
 					// also contains Image blocks.
-					const imageBlock =
-						getAllByLabelText( /Image Block\. Row 2/ )[ 0 ];
+					const [ imageBlock ] =
+						screen.getAllByLabelText( /Image Block\. Row 2/ );
 					fireEvent.press( imageBlock );
 
 					// Start dragging from block's content
@@ -262,15 +260,15 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when unselected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
 
 					// Start dragging from block's content, specifically the first
 					// trigger index, which corresponds to the Gallery block content.
-					fireLongPress(
-						getByLabelText( /Gallery Block\. Row 4/ ),
-						'draggable-trigger-content',
-						{ triggerIndex: 0 }
+					const [ galleryBlock ] = screen.getAllByLabelText(
+						/Gallery Block\. Row 4/
 					);
+					fireLongPress( galleryBlock, 'draggable-trigger-content', {
+						triggerIndex: 0,
+					} );
 					expect( getDraggableChip( screen ) ).toBeVisible();
 
 					// "firePanGesture" finishes the dragging gesture
@@ -283,12 +281,11 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when selected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
 					const blockDraggableWrapper = getByGestureTestId(
 						'block-draggable-wrapper'
 					);
 
-					const galleryBlock = getByLabelText(
+					const [ galleryBlock ] = screen.getAllByLabelText(
 						/Gallery Block\. Row 4/
 					);
 					await waitForStoreResolvers( () =>
@@ -319,16 +316,15 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when nested block is selected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
 					const blockDraggableWrapper = getByGestureTestId(
 						'block-draggable-wrapper'
 					);
 
-					const galleryBlock = getByLabelText(
+					const [ galleryBlock ] = screen.getAllByLabelText(
 						/Gallery Block\. Row 4/
 					);
-					const galleryItem =
-						within( galleryBlock ).getByLabelText(
+					const [ galleryItem ] =
+						within( galleryBlock ).getAllByLabelText(
 							/Image Block\. Row 2/
 						);
 					fireEvent.press( galleryBlock );
@@ -361,13 +357,11 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when unselected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
 
 					// Start dragging from block's content
-					fireLongPress(
-						getByLabelText( /Spacer Block\. Row 3/ ),
-						'draggable-trigger-content'
-					);
+					const [ spacerBlock ] =
+						screen.getAllByLabelText( /Spacer Block\. Row 3/ );
+					fireLongPress( spacerBlock, 'draggable-trigger-content' );
 					expect( getDraggableChip( screen ) ).toBeVisible();
 
 					// "firePanGesture" finishes the dragging gesture
@@ -380,13 +374,12 @@ describe( 'BlockDraggable', () => {
 			it( 'enables drag mode when selected', async () =>
 				withReanimatedTimer( async () => {
 					const screen = await initializeWithBlocksLayouts( BLOCKS );
-					const { getByLabelText } = screen;
 					const blockDraggableWrapper = getByGestureTestId(
 						'block-draggable-wrapper'
 					);
 
-					const spacerBlock =
-						getByLabelText( /Spacer Block\. Row 3/ );
+					const [ spacerBlock ] =
+						screen.getAllByLabelText( /Spacer Block\. Row 3/ );
 					await waitForStoreResolvers( () =>
 						fireEvent.press( spacerBlock )
 					);
@@ -413,9 +406,7 @@ describe( 'BlockDraggable', () => {
 
 	it( 'moves blocks', async () =>
 		withReanimatedTimer( async () => {
-			const { getByLabelText } = await initializeWithBlocksLayouts(
-				BLOCKS
-			);
+			const screen = await initializeWithBlocksLayouts( BLOCKS );
 			const blockDraggableWrapper = getByGestureTestId(
 				'block-draggable-wrapper'
 			);
@@ -423,10 +414,10 @@ describe( 'BlockDraggable', () => {
 			expect( getEditorHtml() ).toMatchSnapshot( 'Initial order' );
 
 			// Move Paragraph block from first to second position
-			fireLongPress(
-				getByLabelText( /Paragraph Block\. Row 1/ ),
-				'draggable-trigger-content'
+			const [ paragraphBlock ] = screen.getAllByLabelText(
+				/Paragraph Block\. Row 1/
 			);
+			fireLongPress( paragraphBlock, 'draggable-trigger-content' );
 			firePanGesture( blockDraggableWrapper, [
 				{
 					id: TOUCH_EVENT_ID,
@@ -453,10 +444,9 @@ describe( 'BlockDraggable', () => {
 			);
 
 			// Move Spacer block from third to first position
-			fireLongPress(
-				getByLabelText( /Spacer Block\. Row 3/ ),
-				'draggable-trigger-content'
-			);
+			const [ spacerBlock ] =
+				screen.getAllByLabelText( /Spacer Block\. Row 3/ );
+			fireLongPress( spacerBlock, 'draggable-trigger-content' );
 			firePanGesture( blockDraggableWrapper, [
 				{
 					id: TOUCH_EVENT_ID,