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

[minor] fix focus getting trapped on banner #BUX-2863 #966

Merged
merged 1 commit into from
Dec 11, 2023
Merged

[minor] fix focus getting trapped on banner #BUX-2863 #966

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 26 additions & 14 deletions src/journeys_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,31 +281,43 @@ journeys_utils.addHtmlToIframe = function(iframe, html, userAgent) {
var scriptTag = iframedoc.createElement('script');
scriptTag.type = 'text/javascript';
scriptTag.text = `
var focusableElements =
'button, [href], input, select, textarea, [role="button"], h1, [role="text"], .branch-banner-content';
var focusableElements = 'button, [href], input, select, textarea, [role="button"], h1, [role="text"], .branch-banner-content';
var modal = document.getElementById('branch-banner');
var focusableContent = modal.querySelectorAll(focusableElements);
var firstFocusableElement = focusableContent[0];
var lastFocusableElement = focusableContent[focusableContent.length - 1];
var focusElementIdx = 0;

document.addEventListener('keydown', function(e) {
function handleTabKey(e) {
var isTabPressed = e.key === 'Tab' || e.keyCode === 9;

if (!isTabPressed) {
return;
}

if (e.shiftKey) {
if (document.activeElement === firstFocusableElement) {
lastFocusableElement.focus();
e.preventDefault();
if (e.shifKey) {
if (focusElementIdx <= 0) {
focusElementIdx = focusableContent.length - 1;
} else {
focusElementIdx = focusElementIdx - 1;
}
} else {
if (focusElementIdx >= focusableContent.length - 1) {
focusElementIdx = 0;
} else {
focusElementIdx = focusElementIdx + 1;
}
} else if (document.activeElement === lastFocusableElement) {
firstFocusableElement.focus();
e.preventDefault();
}
});
setTimeout(function() { firstFocusableElement.focus() }, 100);

focusableContent[focusElementIdx].focus();
e.preventDefault();
}

function autoFocus(delay) {
setTimeout(function() { focusableContent[focusElementIdx].focus() }, delay);
}

document.addEventListener('keydown', handleTabKey);
autoFocus(100);

`;
iframedoc.querySelector('body').append(scriptTag);
}
Expand Down