Skip to content

Constrained tabbing: fix unstable behavior in firefox #42653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-hamano merged 5 commits into from
Nov 24, 2022
+4 −6
Merged

Constrained tabbing: fix unstable behavior in firefox #42653

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
939a5dc
Constrained tabbing: fix unstable behavior in firefox
t-hamano Jul 23, 2022
739b7b4
Merge branch 'trunk' into fix/tabbing-on-firefox
t-hamano Sep 26, 2022
a12ad38
Remove itself when the trap loses focus.
t-hamano Sep 26, 2022
7de5265
Merge branch 'trunk' into fix/tabbing-on-firefox
t-hamano Nov 19, 2022
11a1cfa
Remove unnecessary variable declaration and clearTimeout
t-hamano Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions packages/compose/src/hooks/use-constrained-tabbing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ import useRefEffect from '../use-ref-effect';
*/
function useConstrainedTabbing() {
return useRefEffect( ( /** @type {HTMLElement} */ node ) => {
/** @type {number|undefined} */
let timeoutId;

function onKeyDown( /** @type {KeyboardEvent} */ event ) {
const { keyCode, shiftKey, target } = event;

Expand Down Expand Up @@ -62,15 +59,16 @@ 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 ) );
Copy link
Contributor

@afercia afercia Nov 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this timeout is not used any longer, the variable declaration at line 36 and the clearTimeout at line 75 should be removed as well.

Copy link
Contributor Author

@t-hamano t-hamano Nov 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed by 11a1cfa

}

node.addEventListener( 'keydown', onKeyDown );
return () => {
node.removeEventListener( 'keydown', onKeyDown );
clearTimeout( timeoutId );
};
}, [] );
}
Expand Down