Skip to content

fix: focus manager use with grid manager #1228

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
merged 2 commits into from
Oct 1, 2020
Merged

fix: focus manager use with grid manager #1228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb31275
fallback and check for target inside tabbable nodes
prsdthkr Sep 30, 2020
fb5857e
revert unrelated
prsdthkr Sep 30, 2020
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
14 changes: 13 additions & 1 deletion src/utils/focusManager/focusManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,19 @@ export default class FocusManager {
}

this.tabbableNodes = tabbable(this.container);
const currentIndex = this.tabbableNodes.indexOf(e.target);
let currentIndex = this.tabbableNodes.indexOf(e.target);
if (currentIndex === -1 ) {
// if the event target is not within the tabbable nodes, then
// chances are it is a nested descendent of one of the tabbable node.
// For example, it could be button within a grid cell, where that grid cell is tabbable
// Hence we should check if any of the tabbable nodes contain our target.
this.tabbableNodes.forEach((eachNode, index) => {
if (eachNode?.contains(e.target)) {
// if a tabbable node contains our target, that was the node with the current index.
currentIndex = index;
}
});
}
const lastNode = this.tabbableNodes[this.tabbableNodes.length - 1];
const firstNode = this.tabbableNodes[0];

Expand Down