From 6418738262492974758d4d4ba1ef5a44e03f5360 Mon Sep 17 00:00:00 2001 From: Aki Hamano Date: Tue, 11 Jun 2024 21:50:12 +0900 Subject: [PATCH] List View: Respect default shortcuts in modals --- .../block-editor/src/components/list-view/block.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/block-editor/src/components/list-view/block.js b/packages/block-editor/src/components/list-view/block.js index f93ae2a63787c2..4db12c4d8b77c2 100644 --- a/packages/block-editor/src/components/list-view/block.js +++ b/packages/block-editor/src/components/list-view/block.js @@ -181,6 +181,12 @@ function ListViewBlock( { return; } + // Do not handle events if it comes from modals; + // retain the default behavior for these keys. + if ( event.target.closest( '[role=dialog]' ) ) { + return; + } + const isDeleteKey = [ BACKSPACE, DELETE ].includes( event.keyCode ); // If multiple blocks are selected, deselect all blocks when the user @@ -196,12 +202,6 @@ function ListViewBlock( { isDeleteKey || isMatch( 'core/block-editor/remove', event ) ) { - // Do not handle single-key block deletion shortcuts when events come from modals; - // retain the default behavior for these keys. - if ( isDeleteKey && event.target.closest( '[role=dialog]' ) ) { - return; - } - const { blocksToUpdate: blocksToDelete, firstBlockClientId,