fix: safari focus (#1005)

paypal · Oct 17, 2023 · 827a56d · 827a56d
1 parent fe91522
commit 827a56d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/components/modal/lib/utils.js b/src/components/modal/lib/utils.js
@@ -51,15 +51,16 @@ export function setupTabTrap() {
 
     function trapTabKey(e) {
         // Check for TAB key press
-        if (e.keyCode === 9) {
+        if (e.keyCode === 9 && !document.querySelector('.modal-closed')) {
             const tabArray = arrayFrom(document.querySelectorAll(focusableElementsString)).filter(
                 node => window.getComputedStyle(node).visibility === 'visible'
             );
+
             // SHIFT + TAB
             if (e.shiftKey && document.activeElement === tabArray[0]) {
                 e.preventDefault();
                 tabArray[tabArray.length - 1].focus();
-            } else if (!e.shiftKey && document.activeElement === tabArray[tabArray.length - 1]) {
+            } else if (document.activeElement === tabArray[tabArray.length - 1]) {
                 e.preventDefault();
                 tabArray[0].focus();
             }

diff --git a/src/components/modal/v2/lib/utils.js b/src/components/modal/v2/lib/utils.js
@@ -81,7 +81,7 @@ export function setupTabTrap() {
 
     function trapTabKey(e) {
         // Check for TAB key press
-        if (e.keyCode === 9) {
+        if (e.keyCode === 9 && !document.querySelector('.modal-closed')) {
             const tabArray = arrayFrom(document.querySelectorAll(focusableElementsString)).filter(
                 node => window.getComputedStyle(node).visibility === 'visible'
             );