react-magma-dom 4.12.1-next.4 → 4.12.1-next.5

package/dist/esm/index.js

@@ -11238,7 +11238,7 @@ function useFocusLock(active, header, body) {
     var _rootNode$current;
     focusableItems.current = Array.from(((_rootNode$current = rootNode.current) == null ? void 0 : _rootNode$current.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"]), video')) || []).filter(function (element) {
       var style = window.getComputedStyle(element);
-      return element instanceof HTMLElement && style.display !== 'none' && style.visibility !== 'hidden' && !element.hasAttribute('disabled') && element.tabIndex !== -1;
+      return element instanceof HTMLElement && style.display !== 'none' && style.visibility !== 'hidden' && !element.hasAttribute('disabled');
     });
   };
   useEffect(function () {
@@ -11277,13 +11277,7 @@ function useFocusLock(active, header, body) {
         firstItem = _focusableItems$curre[0],
         lastItem = _focusableItems$curre[length - 1];
       if (active && key === 'Tab') {
-        // Only handle Tab if focus is inside this focus lock's root.
-        // This prevents nested modals from interfering with each other.
-        var activeEl = document.activeElement;
-        if (rootNode.current && !rootNode.current.contains(activeEl) && activeEl !== (header == null ? void 0 : header.current)) {
-          return;
-        }
-        // If no focusable items, prevent tabbing entirely
+        // If no focusable items are
         if (length === 0) {
           event.preventDefault();
           return;
@@ -11291,36 +11285,22 @@ function useFocusLock(active, header, body) {
         // If only one item then prevent tabbing when locked
         if (length === 1) {
           event.preventDefault();
-          if (firstItem !== activeEl) {
+          if (firstItem !== document.activeElement) {
             firstItem.focus();
           }
           return;
         }
-        // Explicitly manage all Tab navigation so focus never escapes
-        // the trap (Safari does not respect aria-modal for containment)
-        event.preventDefault();
-        var currentIndex = focusableItems.current.indexOf(activeEl);
-        if (currentIndex === -1) {
-          // Focus is on an untracked element (e.g. the header)
-          if (shiftKey) {
-            lastItem.focus();
-          } else {
-            firstItem.focus();
-          }
+        // If focused on last item then focus on first item when tab is pressed
+        if (!shiftKey && document.activeElement === lastItem) {
+          event.preventDefault();
+          firstItem.focus();
           return;
         }
-        if (shiftKey) {
-          if (currentIndex === 0) {
-            lastItem.focus();
-          } else {
-            focusableItems.current[currentIndex - 1].focus();
-          }
-        } else {
-          if (currentIndex === length - 1) {
-            firstItem.focus();
-          } else {
-            focusableItems.current[currentIndex + 1].focus();
-          }
+        // If focused on first item then focus on last item when shift + tab is pressed
+        if (shiftKey && (document.activeElement === firstItem || document.activeElement === (header == null ? void 0 : header.current))) {
+          event.preventDefault();
+          lastItem.focus();
+          return;
         }
       }
     };