Remove itself when the trap loses focus.

WordPress · Sep 26, 2022 · a12ad38 · a12ad38
1 parent 739b7b4
commit a12ad38
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/compose/src/hooks/use-constrained-tabbing/index.js b/packages/compose/src/hooks/use-constrained-tabbing/index.js
@@ -62,9 +62,11 @@ function useConstrainedTabbing() {
 
 			trap.tabIndex = -1;
 			node[ domAction ]( trap );
+
+			// Remove itself when the trap loses focus.
+			trap.addEventListener( 'blur', () => node.removeChild( trap ) );
+
 			trap.focus();
-			// Remove after the browser moves focus to the next element.
-			timeoutId = setTimeout( () => node.removeChild( trap ), 10 );
 		}
 
 		node.addEventListener( 'keydown', onKeyDown );