Avoid both events firing, and avoid modifying tab behavior when a reg…

…ion is focused
WordPress · Jun 25, 2021 · a48bb37 · a48bb37
1 parent eb25347
commit a48bb37
Showing 1 changed file with 9 additions and 0 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
@@ -146,6 +146,15 @@ export default function useTabNav() {
 			if ( event.keyCode !== TAB ) {
 				return;
 			}
+
+			if ( event.target?.getAttribute( 'role' ) === 'region' ) {
+				return;
+			}
+
+			if ( container.current === event.target ) {
+				return;
+			}
+
 			const isShift = event.shiftKey;
 			const direction = isShift ? 'findPrevious' : 'findNext';
 			const target = focus.tabbable[ direction ]( event.target );