From 2c5f0ac32a7f30a3f74bdda5dc488fb20c6bde6b Mon Sep 17 00:00:00 2001 From: Mayank-Tripathi32 Date: Thu, 6 Feb 2025 18:19:40 +0530 Subject: [PATCH 1/3] revert: added back checks that were removed in PR #33630, to fix the focus ts error --- .../block-editor/src/components/writing-flow/use-tab-nav.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/block-editor/src/components/writing-flow/use-tab-nav.js b/packages/block-editor/src/components/writing-flow/use-tab-nav.js index 46c40d56fe96d9..83063ee9e3f9b7 100644 --- a/packages/block-editor/src/components/writing-flow/use-tab-nav.js +++ b/packages/block-editor/src/components/writing-flow/use-tab-nav.js @@ -111,7 +111,10 @@ export default function useTabNav() { const ref = useRefEffect( ( node ) => { function onKeyDown( event ) { - if ( event.defaultPrevented ) { + if ( + event.defaultPrevented || + ( ! hasMultiSelection() && ! getSelectedBlockClientId() ) + ) { return; } From 5496dbbc50103e8f786979acab525a83aa23aed1 Mon Sep 17 00:00:00 2001 From: Mayank-Tripathi32 Date: Tue, 11 Feb 2025 22:19:01 +0530 Subject: [PATCH 2/3] Revert "revert: added back checks that were removed in PR #33630, to fix the focus ts error" This reverts commit 2c5f0ac32a7f30a3f74bdda5dc488fb20c6bde6b. --- .../block-editor/src/components/writing-flow/use-tab-nav.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/block-editor/src/components/writing-flow/use-tab-nav.js b/packages/block-editor/src/components/writing-flow/use-tab-nav.js index 83063ee9e3f9b7..46c40d56fe96d9 100644 --- a/packages/block-editor/src/components/writing-flow/use-tab-nav.js +++ b/packages/block-editor/src/components/writing-flow/use-tab-nav.js @@ -111,10 +111,7 @@ export default function useTabNav() { const ref = useRefEffect( ( node ) => { function onKeyDown( event ) { - if ( - event.defaultPrevented || - ( ! hasMultiSelection() && ! getSelectedBlockClientId() ) - ) { + if ( event.defaultPrevented ) { return; } From 71d084e4b8b5611cb383c9ca776788f5e336e553 Mon Sep 17 00:00:00 2001 From: Mayank-Tripathi32 Date: Tue, 11 Feb 2025 22:30:24 +0530 Subject: [PATCH 3/3] feat: fixed console error due to focus loss --- .../block-editor/src/components/writing-flow/use-tab-nav.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/block-editor/src/components/writing-flow/use-tab-nav.js b/packages/block-editor/src/components/writing-flow/use-tab-nav.js index 46c40d56fe96d9..7f06cfe651db3e 100644 --- a/packages/block-editor/src/components/writing-flow/use-tab-nav.js +++ b/packages/block-editor/src/components/writing-flow/use-tab-nav.js @@ -125,6 +125,10 @@ export default function useTabNav() { return; } + if ( ! hasMultiSelection() && ! getSelectedBlockClientId() ) { + return; + } + const isShift = event.shiftKey; const direction = isShift ? 'findPrevious' : 'findNext'; const nextTabbable = focus.tabbable[ direction ]( event.target );