Skip to content
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

Jump to bottom

[ISSUE#1881][MAS2.1.2][Keyboard Navigation- Welcome Tab screen] Focus gets trapped on first and last element of the page when user navigates through the page #2001

Merged
merged 16 commits into from
Nov 26, 2019
Merged

[ISSUE#1881][MAS2.1.2][Keyboard Navigation- Welcome Tab screen] Focus gets trapped on first and last element of the page when user navigates through the page #2001

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f0b7c81
Add focus cycle when Emulator is running in Mac OS
Bill7zz Nov 14, 2019
677526d
Update method to get all child nodes
Bill7zz Nov 15, 2019
6f31fe0
Update method to exclude the hide elements
Bill7zz Nov 15, 2019
1ff044d
Fix getLastDecendants when the last child is disabled
Bill7zz Nov 19, 2019
765d2ea
Merge branch 'refs/heads/master' into fix/focus-trap-in-mac-navigation
Bill7zz Nov 19, 2019
8a5b62c
Delete unnecessary initialization
Bill7zz Nov 19, 2019
74bbe1c
Remove aditional event listener in event handlers
Bill7zz Nov 20, 2019
e13c975
Add unit tests to cover Tab key event in macOS
ceciliaavila Nov 20, 2019
ac16cc7
Update conditional to be more decriptive
Bill7zz Nov 21, 2019
44c22de
Merge branch 'refs/heads/master' into fix/focus-trap-in-mac-navigation
Bill7zz Nov 21, 2019
dcba4c8
Add log entry
denscollo Nov 21, 2019
050296e
Merge branch 'master' into fix/focus-trap-in-mac-navigation
denscollo Nov 22, 2019
f837e55
Update changelog entry
denscollo Nov 22, 2019
04b93f6
Merge branch 'master' into fix/focus-trap-in-mac-navigation
corinagum Nov 22, 2019
175e511
Merge branch 'master' into fix/focus-trap-in-mac-navigation
denscollo Nov 26, 2019
50b4d5c
Apply feedback on tabPressed const
denscollo Nov 26, 2019
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
Prev Previous commit
Next Next commit
Fix getLastDecendants when the last child is disabled
  • Loading branch information
@Bill7zz
Bill7zz committed Nov 19, 2019
commit 1ff044dc36c2249ca62ee974349d69d77f2e3aa0
11 changes: 6 additions & 5 deletions packages/app/client/src/utils/eventHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,17 @@ class EventHandlers {
}
}

public static getAllDecendants(node, list = []) {
public static getLastDecendants(node, list = []) {
list = list || [];
if (node.children.length > 0) {
var child = this.getLastChildWithChildren(node);
if (child) {
list.push(child);
this.getAllDecendants(child, list);
this.getLastDecendants(child, list);
}
}
return list;

return [].filter.call(list[list.length - 1].children, element => !element.hasAttribute('disabled'));
}

public static async globalHandles(event: KeyboardEvent): Promise<any> {
Expand Down Expand Up @@ -148,8 +149,8 @@ class EventHandlers {
window.addEventListener('keydown', function(event) {
var KEYCODE_TAB = 9;
var firstElement = document.querySelector('nav').firstElementChild as HTMLElement;
var mainElement = EventHandlers.getAllDecendants(document.querySelector('main'));
var lastElement = mainElement[mainElement.length - 1].children[0] as HTMLElement;
var lastDecendants = EventHandlers.getLastDecendants(document.querySelector('main'));
var lastElement = lastDecendants[lastDecendants.length - 1];

if (event.key === 'Tab' || event.keyCode === KEYCODE_TAB) {
if (event.shiftKey) {
Expand Down