Fix issue where announcement for deselection was not occurring

WordPress · Sep 4, 2023 · 0397d33 · 0397d33
1 parent 068d08c
commit 0397d33
Showing 1 changed file with 38 additions and 32 deletions.
diff --git a/packages/block-editor/src/components/list-view/use-block-selection.js b/packages/block-editor/src/components/list-view/use-block-selection.js
@@ -5,7 +5,7 @@ import { speak } from '@wordpress/a11y';
 import { __, sprintf } from '@wordpress/i18n';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useCallback } from '@wordpress/element';
-import { UP, DOWN, HOME, END } from '@wordpress/keycodes';
+import { UP, DOWN, HOME, END, ESCAPE } from '@wordpress/keycodes';
 import { store as blocksStore } from '@wordpress/blocks';
 
 /**
@@ -30,7 +30,7 @@ export default function useBlockSelection() {
 
 	const updateBlockSelection = useCallback(
 		async ( event, clientId, destinationClientId, focusPosition ) => {
-			if ( ! event?.shiftKey ) {
+			if ( ! event?.shiftKey && event?.keyCode !== ESCAPE ) {
 				selectBlock( clientId, focusPosition );
 				return;
 			}
@@ -39,6 +39,8 @@ export default function useBlockSelection() {
 			// the browser default behavior of opening the link in a new window.
 			event.preventDefault();
 
+			const isOnlyDeselection =
+				event.type === 'keydown' && event.keyCode === ESCAPE;
 			const isKeyPress =
 				event.type === 'keydown' &&
 				( event.keyCode === UP ||
@@ -63,10 +65,11 @@ export default function useBlockSelection() {
 			];
 
 			if (
-				isKeyPress &&
-				! selectedBlocks.some( ( blockId ) =>
-					clientIdWithParents.includes( blockId )
-				)
+				isOnlyDeselection ||
+				( isKeyPress &&
+					! selectedBlocks.some( ( blockId ) =>
+						clientIdWithParents.includes( blockId )
+					) )
 			) {
 				// Ensure that shift-selecting blocks via the keyboard only
 				// expands the current selection if focusing over already
@@ -75,35 +78,38 @@ export default function useBlockSelection() {
 				await clearSelectedBlock();
 			}
 
-			let startTarget = getBlockSelectionStart();
-			let endTarget = clientId;
-
-			// Handle keyboard behavior for selecting multiple blocks.
-			if ( isKeyPress ) {
-				if ( ! hasSelectedBlock() && ! hasMultiSelection() ) {
-					// Set the starting point of the selection to the currently
-					// focused block, if there are no blocks currently selected.
-					// This ensures that as the selection is expanded or contracted,
-					// the starting point of the selection is anchored to that block.
-					startTarget = clientId;
+			// Update selection, if not only clearing the selection.
+			if ( ! isOnlyDeselection ) {
+				let startTarget = getBlockSelectionStart();
+				let endTarget = clientId;
+
+				// Handle keyboard behavior for selecting multiple blocks.
+				if ( isKeyPress ) {
+					if ( ! hasSelectedBlock() && ! hasMultiSelection() ) {
+						// Set the starting point of the selection to the currently
+						// focused block, if there are no blocks currently selected.
+						// This ensures that as the selection is expanded or contracted,
+						// the starting point of the selection is anchored to that block.
+						startTarget = clientId;
+					}
+					if ( destinationClientId ) {
+						// If the user presses UP or DOWN, we want to ensure that the block they're
+						// moving to is the target for selection, and not the currently focused one.
+						endTarget = destinationClientId;
+					}
 				}
-				if ( destinationClientId ) {
-					// If the user presses UP or DOWN, we want to ensure that the block they're
-					// moving to is the target for selection, and not the currently focused one.
-					endTarget = destinationClientId;
-				}
-			}
 
-			const startParents = getBlockParents( startTarget );
-			const endParents = getBlockParents( endTarget );
+				const startParents = getBlockParents( startTarget );
+				const endParents = getBlockParents( endTarget );
 
-			const { start, end } = getCommonDepthClientIds(
-				startTarget,
-				endTarget,
-				startParents,
-				endParents
-			);
-			await multiSelect( start, end, null );
+				const { start, end } = getCommonDepthClientIds(
+					startTarget,
+					endTarget,
+					startParents,
+					endParents
+				);
+				await multiSelect( start, end, null );
+			}
 
 			// Announce deselected block, or number of deselected blocks if
 			// the total number of blocks deselected is greater than one.