@react-aria/focus 3.19.0 → 3.20.0

package/dist/FocusScope.mjs

@@ -1,6 +1,6 @@
-import {focusSafely as $6a99195332edec8b$export$80f3e147d781571c} from "./focusSafely.mjs";
 import {isElementVisible as $645f2e67b85a24c9$export$e989c0fffaa6b27a} from "./isElementVisible.mjs";
-import {useLayoutEffect as $cgawC$useLayoutEffect, getOwnerDocument as $cgawC$getOwnerDocument} from "@react-aria/utils";
+import {useLayoutEffect as $cgawC$useLayoutEffect, getActiveElement as $cgawC$getActiveElement, getOwnerDocument as $cgawC$getOwnerDocument, getEventTarget as $cgawC$getEventTarget, isAndroid as $cgawC$isAndroid, isChrome as $cgawC$isChrome, isTabbable as $cgawC$isTabbable, isFocusable as $cgawC$isFocusable, createShadowTreeWalker as $cgawC$createShadowTreeWalker} from "@react-aria/utils";
+import {getInteractionModality as $cgawC$getInteractionModality, focusSafely as $cgawC$focusSafely} from "@react-aria/interactions";
 import $cgawC$react, {useRef as $cgawC$useRef, useContext as $cgawC$useContext, useMemo as $cgawC$useMemo, useEffect as $cgawC$useEffect} from "react";
 
 /*
@@ -81,7 +81,7 @@ function $9bf71ea28793e738$export$20e40289641fbbb6(props) {
     // This needs to be an effect so that activeScope is updated after the FocusScope tree is complete.
     // It cannot be a useLayoutEffect because the parent of this node hasn't been attached in the tree yet.
     (0, $cgawC$useEffect)(()=>{
-        const activeElement = (0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined).activeElement;
+        const activeElement = (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined));
         let scope = null;
         if ($9bf71ea28793e738$var$isElementInScope(activeElement, scopeRef.current)) {
             // We need to traverse the focusScope tree and find the bottom most scope that
@@ -135,7 +135,8 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
         focusNext (opts = {}) {
             let scope = scopeRef.current;
             let { from: from, tabbable: tabbable, wrap: wrap, accept: accept } = opts;
-            let node = from || (0, $cgawC$getOwnerDocument)(scope[0]).activeElement;
+            var _scope_;
+            let node = from || (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)((_scope_ = scope[0]) !== null && _scope_ !== void 0 ? _scope_ : undefined));
             let sentinel = scope[0].previousElementSibling;
             let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
@@ -154,7 +155,8 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
         focusPrevious (opts = {}) {
             let scope = scopeRef.current;
             let { from: from, tabbable: tabbable, wrap: wrap, accept: accept } = opts;
-            let node = from || (0, $cgawC$getOwnerDocument)(scope[0]).activeElement;
+            var _scope_;
+            let node = from || (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)((_scope_ = scope[0]) !== null && _scope_ !== void 0 ? _scope_ : undefined));
             let sentinel = scope[scope.length - 1].nextElementSibling;
             let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
@@ -198,27 +200,6 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
         }
     };
 }
-const $9bf71ea28793e738$var$focusableElements = [
-    'input:not([disabled]):not([type=hidden])',
-    'select:not([disabled])',
-    'textarea:not([disabled])',
-    'button:not([disabled])',
-    'a[href]',
-    'area[href]',
-    'summary',
-    'iframe',
-    'object',
-    'embed',
-    'audio[controls]',
-    'video[controls]',
-    '[contenteditable]'
-];
-const $9bf71ea28793e738$var$FOCUSABLE_ELEMENT_SELECTOR = $9bf71ea28793e738$var$focusableElements.join(':not([hidden]),') + ',[tabindex]:not([disabled]):not([hidden])';
-$9bf71ea28793e738$var$focusableElements.push('[tabindex]:not([tabindex="-1"]):not([disabled])');
-const $9bf71ea28793e738$var$TABBABLE_ELEMENT_SELECTOR = $9bf71ea28793e738$var$focusableElements.join(':not([hidden]):not([tabindex="-1"]),');
-function $9bf71ea28793e738$export$4c063cf1350e6fed(element) {
-    return element.matches($9bf71ea28793e738$var$FOCUSABLE_ELEMENT_SELECTOR);
-}
 function $9bf71ea28793e738$var$getScopeRoot(scope) {
     return scope[0].parentElement;
 }
@@ -247,7 +228,7 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
         // Handle the Tab key to contain focus within the scope
         let onKeyDown = (e)=>{
             if (e.key !== 'Tab' || e.altKey || e.ctrlKey || e.metaKey || !$9bf71ea28793e738$var$shouldContainFocus(scopeRef) || e.isComposing) return;
-            let focusedElement = ownerDocument.activeElement;
+            let focusedElement = (0, $cgawC$getActiveElement)(ownerDocument);
             let scope = scopeRef.current;
             if (!scope || !$9bf71ea28793e738$var$isElementInScope(focusedElement, scope)) return;
             let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
@@ -267,26 +248,33 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
         let onFocus = (e)=>{
             // If focusing an element in a child scope of the currently active scope, the child becomes active.
             // Moving out of the active scope to an ancestor is not allowed.
-            if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope(e.target, scopeRef.current)) {
+            if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope((0, $cgawC$getEventTarget)(e), scopeRef.current)) {
                 $9bf71ea28793e738$var$activeScope = scopeRef;
-                focusedNode.current = e.target;
-            } else if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(e.target, scopeRef)) {
+                focusedNode.current = (0, $cgawC$getEventTarget)(e);
+            } else if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope((0, $cgawC$getEventTarget)(e), scopeRef)) {
                 // If a focus event occurs outside the active scope (e.g. user tabs from browser location bar),
                 // restore focus to the previously focused node or the first tabbable element in the active scope.
                 if (focusedNode.current) focusedNode.current.focus();
                 else if ($9bf71ea28793e738$var$activeScope && $9bf71ea28793e738$var$activeScope.current) $9bf71ea28793e738$var$focusFirstInScope($9bf71ea28793e738$var$activeScope.current);
-            } else if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef)) focusedNode.current = e.target;
+            } else if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef)) focusedNode.current = (0, $cgawC$getEventTarget)(e);
         };
         let onBlur = (e)=>{
             // Firefox doesn't shift focus back to the Dialog properly without this
             if (raf.current) cancelAnimationFrame(raf.current);
             raf.current = requestAnimationFrame(()=>{
+                // Patches infinite focus coersion loop for Android Talkback where the user isn't able to move the virtual cursor
+                // if within a containing focus scope. Bug filed against Chrome: https://issuetracker.google.com/issues/384844019.
+                // Note that this means focus can leave focus containing modals due to this, but it is isolated to Chrome Talkback.
+                let modality = (0, $cgawC$getInteractionModality)();
+                let shouldSkipFocusRestore = (modality === 'virtual' || modality === null) && (0, $cgawC$isAndroid)() && (0, $cgawC$isChrome)();
                 // Use document.activeElement instead of e.relatedTarget so we can tell if user clicked into iframe
-                if (ownerDocument.activeElement && $9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(ownerDocument.activeElement, scopeRef)) {
+                let activeElement = (0, $cgawC$getActiveElement)(ownerDocument);
+                if (!shouldSkipFocusRestore && activeElement && $9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(activeElement, scopeRef)) {
                     $9bf71ea28793e738$var$activeScope = scopeRef;
-                    if (ownerDocument.body.contains(e.target)) {
+                    let target = (0, $cgawC$getEventTarget)(e);
+                    if (target && target.isConnected) {
                         var _focusedNode_current;
-                        focusedNode.current = e.target;
+                        focusedNode.current = target;
                         (_focusedNode_current = focusedNode.current) === null || _focusedNode_current === void 0 ? void 0 : _focusedNode_current.focus();
                     } else if ($9bf71ea28793e738$var$activeScope.current) $9bf71ea28793e738$var$focusFirstInScope($9bf71ea28793e738$var$activeScope.current);
                 }
@@ -347,7 +335,7 @@ function $9bf71ea28793e738$var$isAncestorScope(ancestor, scope) {
 }
 function $9bf71ea28793e738$var$focusElement(element, scroll = false) {
     if (element != null && !scroll) try {
-        (0, $6a99195332edec8b$export$80f3e147d781571c)(element);
+        (0, $cgawC$focusSafely)(element);
     } catch  {
     // ignore
     }
@@ -385,7 +373,7 @@ function $9bf71ea28793e738$var$useAutoFocus(scopeRef, autoFocus) {
         if (autoFocusRef.current) {
             $9bf71ea28793e738$var$activeScope = scopeRef;
             const ownerDocument = (0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined);
-            if (!$9bf71ea28793e738$var$isElementInScope(ownerDocument.activeElement, $9bf71ea28793e738$var$activeScope.current) && scopeRef.current) $9bf71ea28793e738$var$focusFirstInScope(scopeRef.current);
+            if (!$9bf71ea28793e738$var$isElementInScope((0, $cgawC$getActiveElement)(ownerDocument), $9bf71ea28793e738$var$activeScope.current) && scopeRef.current) $9bf71ea28793e738$var$focusFirstInScope(scopeRef.current);
         }
         autoFocusRef.current = false;
     }, [
@@ -400,7 +388,7 @@ function $9bf71ea28793e738$var$useActiveScopeTracker(scopeRef, restore, contain)
         let scope = scopeRef.current;
         const ownerDocument = (0, $cgawC$getOwnerDocument)(scope ? scope[0] : undefined);
         let onFocus = (e)=>{
-            let target = e.target;
+            let target = (0, $cgawC$getEventTarget)(e);
             if ($9bf71ea28793e738$var$isElementInScope(target, scopeRef.current)) $9bf71ea28793e738$var$activeScope = scopeRef;
             else if (!$9bf71ea28793e738$var$isElementInAnyScope(target)) $9bf71ea28793e738$var$activeScope = null;
         };
@@ -427,7 +415,7 @@ function $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef) {
 function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain) {
     // create a ref during render instead of useLayoutEffect so the active element is saved before a child with autoFocus=true mounts.
     // eslint-disable-next-line no-restricted-globals
-    const nodeToRestoreRef = (0, $cgawC$useRef)(typeof document !== 'undefined' ? (0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined).activeElement : null);
+    const nodeToRestoreRef = (0, $cgawC$useRef)(typeof document !== 'undefined' ? (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined)) : null);
     // restoring scopes should all track if they are active regardless of contain, but contain already tracks it plus logic to contain the focus
     // restoring-non-containing scopes should only care if they become active so they can perform the restore
     (0, $cgawC$useLayoutEffect)(()=>{
@@ -437,7 +425,7 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
         let onFocus = ()=>{
             // If focusing an element in a child scope of the currently active scope, the child becomes active.
             // Moving out of the active scope to an ancestor is not allowed.
-            if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope(ownerDocument.activeElement, scopeRef.current)) $9bf71ea28793e738$var$activeScope = scopeRef;
+            if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope((0, $cgawC$getActiveElement)(ownerDocument), scopeRef.current)) $9bf71ea28793e738$var$activeScope = scopeRef;
         };
         ownerDocument.addEventListener('focusin', onFocus, false);
         scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.addEventListener('focusin', onFocus, false));
@@ -471,7 +459,7 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
             // Find the next tabbable element after the currently focused element
             walker.currentNode = focusedElement;
             let nextElement = e.shiftKey ? walker.previousNode() : walker.nextNode();
-            if (!nodeToRestore || !ownerDocument.body.contains(nodeToRestore) || nodeToRestore === ownerDocument.body) {
+            if (!nodeToRestore || !nodeToRestore.isConnected || nodeToRestore === ownerDocument.body) {
                 nodeToRestore = undefined;
                 treeNode.nodeToRestore = undefined;
             }
@@ -514,7 +502,8 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
             if (!treeNode) return;
             let nodeToRestore = treeNode.nodeToRestore;
             // if we already lost focus to the body and this was the active scope, then we should attempt to restore
-            if (restoreFocus && nodeToRestore && (ownerDocument.activeElement && $9bf71ea28793e738$var$isElementInChildScope(ownerDocument.activeElement, scopeRef) || ownerDocument.activeElement === ownerDocument.body && $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef))) {
+            let activeElement = (0, $cgawC$getActiveElement)(ownerDocument);
+            if (restoreFocus && nodeToRestore && (activeElement && $9bf71ea28793e738$var$isElementInChildScope(activeElement, scopeRef) || activeElement === ownerDocument.body && $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef))) {
                 // freeze the focusScopeTree so it persists after the raf, otherwise during unmount nodes are removed from it
                 let clonedTree = $9bf71ea28793e738$export$d06fae2ee68b101e.clone();
                 requestAnimationFrame(()=>{
@@ -559,13 +548,18 @@ function $9bf71ea28793e738$var$restoreFocusToElement(node) {
     }))) $9bf71ea28793e738$var$focusElement(node);
 }
 function $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, opts, scope) {
-    let selector = (opts === null || opts === void 0 ? void 0 : opts.tabbable) ? $9bf71ea28793e738$var$TABBABLE_ELEMENT_SELECTOR : $9bf71ea28793e738$var$FOCUSABLE_ELEMENT_SELECTOR;
-    let walker = (0, $cgawC$getOwnerDocument)(root).createTreeWalker(root, NodeFilter.SHOW_ELEMENT, {
+    let filter = (opts === null || opts === void 0 ? void 0 : opts.tabbable) ? (0, $cgawC$isTabbable) : (0, $cgawC$isFocusable);
+    // Ensure that root is an Element or fall back appropriately
+    let rootElement = (root === null || root === void 0 ? void 0 : root.nodeType) === Node.ELEMENT_NODE ? root : null;
+    // Determine the document to use
+    let doc = (0, $cgawC$getOwnerDocument)(rootElement);
+    // Create a TreeWalker, ensuring the root is an Element or Document
+    let walker = (0, $cgawC$createShadowTreeWalker)(doc, root || doc, NodeFilter.SHOW_ELEMENT, {
         acceptNode (node) {
             var _opts_from;
             // Skip nodes inside the starting node.
             if (opts === null || opts === void 0 ? void 0 : (_opts_from = opts.from) === null || _opts_from === void 0 ? void 0 : _opts_from.contains(node)) return NodeFilter.FILTER_REJECT;
-            if (node.matches(selector) && (0, $645f2e67b85a24c9$export$e989c0fffaa6b27a)(node) && (!scope || $9bf71ea28793e738$var$isElementInScope(node, scope)) && (!(opts === null || opts === void 0 ? void 0 : opts.accept) || opts.accept(node))) return NodeFilter.FILTER_ACCEPT;
+            if (filter(node) && (0, $645f2e67b85a24c9$export$e989c0fffaa6b27a)(node) && (!scope || $9bf71ea28793e738$var$isElementInScope(node, scope)) && (!(opts === null || opts === void 0 ? void 0 : opts.accept) || opts.accept(node))) return NodeFilter.FILTER_ACCEPT;
             return NodeFilter.FILTER_SKIP;
         }
     });
@@ -578,7 +572,7 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
             let root = ref.current;
             if (!root) return null;
             let { from: from, tabbable: tabbable = defaultOptions.tabbable, wrap: wrap = defaultOptions.wrap, accept: accept = defaultOptions.accept } = opts;
-            let node = from || (0, $cgawC$getOwnerDocument)(root).activeElement;
+            let node = from || (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)(root));
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, {
                 tabbable: tabbable,
                 accept: accept
@@ -596,7 +590,7 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
             let root = ref.current;
             if (!root) return null;
             let { from: from, tabbable: tabbable = defaultOptions.tabbable, wrap: wrap = defaultOptions.wrap, accept: accept = defaultOptions.accept } = opts;
-            let node = from || (0, $cgawC$getOwnerDocument)(root).activeElement;
+            let node = from || (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)(root));
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, {
                 tabbable: tabbable,
                 accept: accept
@@ -728,5 +722,5 @@ class $9bf71ea28793e738$var$TreeNode {
 let $9bf71ea28793e738$export$d06fae2ee68b101e = new $9bf71ea28793e738$var$Tree();
 
 
-export {$9bf71ea28793e738$export$20e40289641fbbb6 as FocusScope, $9bf71ea28793e738$export$d06fae2ee68b101e as focusScopeTree, $9bf71ea28793e738$export$10c5169755ce7bd7 as useFocusManager, $9bf71ea28793e738$export$2d6ec8fc375ceafa as getFocusableTreeWalker, $9bf71ea28793e738$export$4c063cf1350e6fed as isFocusable, $9bf71ea28793e738$export$1258395f99bf9cbf as isElementInChildOfActiveScope, $9bf71ea28793e738$export$c5251b9e124bf29 as createFocusManager};
+export {$9bf71ea28793e738$export$20e40289641fbbb6 as FocusScope, $9bf71ea28793e738$export$d06fae2ee68b101e as focusScopeTree, $9bf71ea28793e738$export$10c5169755ce7bd7 as useFocusManager, $9bf71ea28793e738$export$2d6ec8fc375ceafa as getFocusableTreeWalker, $9bf71ea28793e738$export$1258395f99bf9cbf as isElementInChildOfActiveScope, $9bf71ea28793e738$export$c5251b9e124bf29 as createFocusManager};
 //# sourceMappingURL=FocusScope.module.js.map

package/dist/FocusScope.module.js

@@ -1,6 +1,6 @@
-import {focusSafely as $6a99195332edec8b$export$80f3e147d781571c} from "./focusSafely.module.js";
 import {isElementVisible as $645f2e67b85a24c9$export$e989c0fffaa6b27a} from "./isElementVisible.module.js";
-import {useLayoutEffect as $cgawC$useLayoutEffect, getOwnerDocument as $cgawC$getOwnerDocument} from "@react-aria/utils";
+import {useLayoutEffect as $cgawC$useLayoutEffect, getActiveElement as $cgawC$getActiveElement, getOwnerDocument as $cgawC$getOwnerDocument, getEventTarget as $cgawC$getEventTarget, isAndroid as $cgawC$isAndroid, isChrome as $cgawC$isChrome, isTabbable as $cgawC$isTabbable, isFocusable as $cgawC$isFocusable, createShadowTreeWalker as $cgawC$createShadowTreeWalker} from "@react-aria/utils";
+import {getInteractionModality as $cgawC$getInteractionModality, focusSafely as $cgawC$focusSafely} from "@react-aria/interactions";
 import $cgawC$react, {useRef as $cgawC$useRef, useContext as $cgawC$useContext, useMemo as $cgawC$useMemo, useEffect as $cgawC$useEffect} from "react";
 
 /*
@@ -81,7 +81,7 @@ function $9bf71ea28793e738$export$20e40289641fbbb6(props) {
     // This needs to be an effect so that activeScope is updated after the FocusScope tree is complete.
     // It cannot be a useLayoutEffect because the parent of this node hasn't been attached in the tree yet.
     (0, $cgawC$useEffect)(()=>{
-        const activeElement = (0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined).activeElement;
+        const activeElement = (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined));
         let scope = null;
         if ($9bf71ea28793e738$var$isElementInScope(activeElement, scopeRef.current)) {
             // We need to traverse the focusScope tree and find the bottom most scope that
@@ -135,7 +135,8 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
         focusNext (opts = {}) {
             let scope = scopeRef.current;
             let { from: from, tabbable: tabbable, wrap: wrap, accept: accept } = opts;
-            let node = from || (0, $cgawC$getOwnerDocument)(scope[0]).activeElement;
+            var _scope_;
+            let node = from || (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)((_scope_ = scope[0]) !== null && _scope_ !== void 0 ? _scope_ : undefined));
             let sentinel = scope[0].previousElementSibling;
             let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
@@ -154,7 +155,8 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
         focusPrevious (opts = {}) {
             let scope = scopeRef.current;
             let { from: from, tabbable: tabbable, wrap: wrap, accept: accept } = opts;
-            let node = from || (0, $cgawC$getOwnerDocument)(scope[0]).activeElement;
+            var _scope_;
+            let node = from || (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)((_scope_ = scope[0]) !== null && _scope_ !== void 0 ? _scope_ : undefined));
             let sentinel = scope[scope.length - 1].nextElementSibling;
             let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
@@ -198,27 +200,6 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
         }
     };
 }
-const $9bf71ea28793e738$var$focusableElements = [
-    'input:not([disabled]):not([type=hidden])',
-    'select:not([disabled])',
-    'textarea:not([disabled])',
-    'button:not([disabled])',
-    'a[href]',
-    'area[href]',
-    'summary',
-    'iframe',
-    'object',
-    'embed',
-    'audio[controls]',
-    'video[controls]',
-    '[contenteditable]'
-];
-const $9bf71ea28793e738$var$FOCUSABLE_ELEMENT_SELECTOR = $9bf71ea28793e738$var$focusableElements.join(':not([hidden]),') + ',[tabindex]:not([disabled]):not([hidden])';
-$9bf71ea28793e738$var$focusableElements.push('[tabindex]:not([tabindex="-1"]):not([disabled])');
-const $9bf71ea28793e738$var$TABBABLE_ELEMENT_SELECTOR = $9bf71ea28793e738$var$focusableElements.join(':not([hidden]):not([tabindex="-1"]),');
-function $9bf71ea28793e738$export$4c063cf1350e6fed(element) {
-    return element.matches($9bf71ea28793e738$var$FOCUSABLE_ELEMENT_SELECTOR);
-}
 function $9bf71ea28793e738$var$getScopeRoot(scope) {
     return scope[0].parentElement;
 }
@@ -247,7 +228,7 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
         // Handle the Tab key to contain focus within the scope
         let onKeyDown = (e)=>{
             if (e.key !== 'Tab' || e.altKey || e.ctrlKey || e.metaKey || !$9bf71ea28793e738$var$shouldContainFocus(scopeRef) || e.isComposing) return;
-            let focusedElement = ownerDocument.activeElement;
+            let focusedElement = (0, $cgawC$getActiveElement)(ownerDocument);
             let scope = scopeRef.current;
             if (!scope || !$9bf71ea28793e738$var$isElementInScope(focusedElement, scope)) return;
             let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
@@ -267,26 +248,33 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
         let onFocus = (e)=>{
             // If focusing an element in a child scope of the currently active scope, the child becomes active.
             // Moving out of the active scope to an ancestor is not allowed.
-            if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope(e.target, scopeRef.current)) {
+            if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope((0, $cgawC$getEventTarget)(e), scopeRef.current)) {
                 $9bf71ea28793e738$var$activeScope = scopeRef;
-                focusedNode.current = e.target;
-            } else if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(e.target, scopeRef)) {
+                focusedNode.current = (0, $cgawC$getEventTarget)(e);
+            } else if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope((0, $cgawC$getEventTarget)(e), scopeRef)) {
                 // If a focus event occurs outside the active scope (e.g. user tabs from browser location bar),
                 // restore focus to the previously focused node or the first tabbable element in the active scope.
                 if (focusedNode.current) focusedNode.current.focus();
                 else if ($9bf71ea28793e738$var$activeScope && $9bf71ea28793e738$var$activeScope.current) $9bf71ea28793e738$var$focusFirstInScope($9bf71ea28793e738$var$activeScope.current);
-            } else if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef)) focusedNode.current = e.target;
+            } else if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef)) focusedNode.current = (0, $cgawC$getEventTarget)(e);
         };
         let onBlur = (e)=>{
             // Firefox doesn't shift focus back to the Dialog properly without this
             if (raf.current) cancelAnimationFrame(raf.current);
             raf.current = requestAnimationFrame(()=>{
+                // Patches infinite focus coersion loop for Android Talkback where the user isn't able to move the virtual cursor
+                // if within a containing focus scope. Bug filed against Chrome: https://issuetracker.google.com/issues/384844019.
+                // Note that this means focus can leave focus containing modals due to this, but it is isolated to Chrome Talkback.
+                let modality = (0, $cgawC$getInteractionModality)();
+                let shouldSkipFocusRestore = (modality === 'virtual' || modality === null) && (0, $cgawC$isAndroid)() && (0, $cgawC$isChrome)();
                 // Use document.activeElement instead of e.relatedTarget so we can tell if user clicked into iframe
-                if (ownerDocument.activeElement && $9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(ownerDocument.activeElement, scopeRef)) {
+                let activeElement = (0, $cgawC$getActiveElement)(ownerDocument);
+                if (!shouldSkipFocusRestore && activeElement && $9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(activeElement, scopeRef)) {
                     $9bf71ea28793e738$var$activeScope = scopeRef;
-                    if (ownerDocument.body.contains(e.target)) {
+                    let target = (0, $cgawC$getEventTarget)(e);
+                    if (target && target.isConnected) {
                         var _focusedNode_current;
-                        focusedNode.current = e.target;
+                        focusedNode.current = target;
                         (_focusedNode_current = focusedNode.current) === null || _focusedNode_current === void 0 ? void 0 : _focusedNode_current.focus();
                     } else if ($9bf71ea28793e738$var$activeScope.current) $9bf71ea28793e738$var$focusFirstInScope($9bf71ea28793e738$var$activeScope.current);
                 }
@@ -347,7 +335,7 @@ function $9bf71ea28793e738$var$isAncestorScope(ancestor, scope) {
 }
 function $9bf71ea28793e738$var$focusElement(element, scroll = false) {
     if (element != null && !scroll) try {
-        (0, $6a99195332edec8b$export$80f3e147d781571c)(element);
+        (0, $cgawC$focusSafely)(element);
     } catch  {
     // ignore
     }
@@ -385,7 +373,7 @@ function $9bf71ea28793e738$var$useAutoFocus(scopeRef, autoFocus) {
         if (autoFocusRef.current) {
             $9bf71ea28793e738$var$activeScope = scopeRef;
             const ownerDocument = (0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined);
-            if (!$9bf71ea28793e738$var$isElementInScope(ownerDocument.activeElement, $9bf71ea28793e738$var$activeScope.current) && scopeRef.current) $9bf71ea28793e738$var$focusFirstInScope(scopeRef.current);
+            if (!$9bf71ea28793e738$var$isElementInScope((0, $cgawC$getActiveElement)(ownerDocument), $9bf71ea28793e738$var$activeScope.current) && scopeRef.current) $9bf71ea28793e738$var$focusFirstInScope(scopeRef.current);
         }
         autoFocusRef.current = false;
     }, [
@@ -400,7 +388,7 @@ function $9bf71ea28793e738$var$useActiveScopeTracker(scopeRef, restore, contain)
         let scope = scopeRef.current;
         const ownerDocument = (0, $cgawC$getOwnerDocument)(scope ? scope[0] : undefined);
         let onFocus = (e)=>{
-            let target = e.target;
+            let target = (0, $cgawC$getEventTarget)(e);
             if ($9bf71ea28793e738$var$isElementInScope(target, scopeRef.current)) $9bf71ea28793e738$var$activeScope = scopeRef;
             else if (!$9bf71ea28793e738$var$isElementInAnyScope(target)) $9bf71ea28793e738$var$activeScope = null;
         };
@@ -427,7 +415,7 @@ function $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef) {
 function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain) {
     // create a ref during render instead of useLayoutEffect so the active element is saved before a child with autoFocus=true mounts.
     // eslint-disable-next-line no-restricted-globals
-    const nodeToRestoreRef = (0, $cgawC$useRef)(typeof document !== 'undefined' ? (0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined).activeElement : null);
+    const nodeToRestoreRef = (0, $cgawC$useRef)(typeof document !== 'undefined' ? (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)(scopeRef.current ? scopeRef.current[0] : undefined)) : null);
     // restoring scopes should all track if they are active regardless of contain, but contain already tracks it plus logic to contain the focus
     // restoring-non-containing scopes should only care if they become active so they can perform the restore
     (0, $cgawC$useLayoutEffect)(()=>{
@@ -437,7 +425,7 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
         let onFocus = ()=>{
             // If focusing an element in a child scope of the currently active scope, the child becomes active.
             // Moving out of the active scope to an ancestor is not allowed.
-            if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope(ownerDocument.activeElement, scopeRef.current)) $9bf71ea28793e738$var$activeScope = scopeRef;
+            if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope((0, $cgawC$getActiveElement)(ownerDocument), scopeRef.current)) $9bf71ea28793e738$var$activeScope = scopeRef;
         };
         ownerDocument.addEventListener('focusin', onFocus, false);
         scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.addEventListener('focusin', onFocus, false));
@@ -471,7 +459,7 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
             // Find the next tabbable element after the currently focused element
             walker.currentNode = focusedElement;
             let nextElement = e.shiftKey ? walker.previousNode() : walker.nextNode();
-            if (!nodeToRestore || !ownerDocument.body.contains(nodeToRestore) || nodeToRestore === ownerDocument.body) {
+            if (!nodeToRestore || !nodeToRestore.isConnected || nodeToRestore === ownerDocument.body) {
                 nodeToRestore = undefined;
                 treeNode.nodeToRestore = undefined;
             }
@@ -514,7 +502,8 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
             if (!treeNode) return;
             let nodeToRestore = treeNode.nodeToRestore;
             // if we already lost focus to the body and this was the active scope, then we should attempt to restore
-            if (restoreFocus && nodeToRestore && (ownerDocument.activeElement && $9bf71ea28793e738$var$isElementInChildScope(ownerDocument.activeElement, scopeRef) || ownerDocument.activeElement === ownerDocument.body && $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef))) {
+            let activeElement = (0, $cgawC$getActiveElement)(ownerDocument);
+            if (restoreFocus && nodeToRestore && (activeElement && $9bf71ea28793e738$var$isElementInChildScope(activeElement, scopeRef) || activeElement === ownerDocument.body && $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef))) {
                 // freeze the focusScopeTree so it persists after the raf, otherwise during unmount nodes are removed from it
                 let clonedTree = $9bf71ea28793e738$export$d06fae2ee68b101e.clone();
                 requestAnimationFrame(()=>{
@@ -559,13 +548,18 @@ function $9bf71ea28793e738$var$restoreFocusToElement(node) {
     }))) $9bf71ea28793e738$var$focusElement(node);
 }
 function $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, opts, scope) {
-    let selector = (opts === null || opts === void 0 ? void 0 : opts.tabbable) ? $9bf71ea28793e738$var$TABBABLE_ELEMENT_SELECTOR : $9bf71ea28793e738$var$FOCUSABLE_ELEMENT_SELECTOR;
-    let walker = (0, $cgawC$getOwnerDocument)(root).createTreeWalker(root, NodeFilter.SHOW_ELEMENT, {
+    let filter = (opts === null || opts === void 0 ? void 0 : opts.tabbable) ? (0, $cgawC$isTabbable) : (0, $cgawC$isFocusable);
+    // Ensure that root is an Element or fall back appropriately
+    let rootElement = (root === null || root === void 0 ? void 0 : root.nodeType) === Node.ELEMENT_NODE ? root : null;
+    // Determine the document to use
+    let doc = (0, $cgawC$getOwnerDocument)(rootElement);
+    // Create a TreeWalker, ensuring the root is an Element or Document
+    let walker = (0, $cgawC$createShadowTreeWalker)(doc, root || doc, NodeFilter.SHOW_ELEMENT, {
         acceptNode (node) {
             var _opts_from;
             // Skip nodes inside the starting node.
             if (opts === null || opts === void 0 ? void 0 : (_opts_from = opts.from) === null || _opts_from === void 0 ? void 0 : _opts_from.contains(node)) return NodeFilter.FILTER_REJECT;
-            if (node.matches(selector) && (0, $645f2e67b85a24c9$export$e989c0fffaa6b27a)(node) && (!scope || $9bf71ea28793e738$var$isElementInScope(node, scope)) && (!(opts === null || opts === void 0 ? void 0 : opts.accept) || opts.accept(node))) return NodeFilter.FILTER_ACCEPT;
+            if (filter(node) && (0, $645f2e67b85a24c9$export$e989c0fffaa6b27a)(node) && (!scope || $9bf71ea28793e738$var$isElementInScope(node, scope)) && (!(opts === null || opts === void 0 ? void 0 : opts.accept) || opts.accept(node))) return NodeFilter.FILTER_ACCEPT;
             return NodeFilter.FILTER_SKIP;
         }
     });
@@ -578,7 +572,7 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
             let root = ref.current;
             if (!root) return null;
             let { from: from, tabbable: tabbable = defaultOptions.tabbable, wrap: wrap = defaultOptions.wrap, accept: accept = defaultOptions.accept } = opts;
-            let node = from || (0, $cgawC$getOwnerDocument)(root).activeElement;
+            let node = from || (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)(root));
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, {
                 tabbable: tabbable,
                 accept: accept
@@ -596,7 +590,7 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
             let root = ref.current;
             if (!root) return null;
             let { from: from, tabbable: tabbable = defaultOptions.tabbable, wrap: wrap = defaultOptions.wrap, accept: accept = defaultOptions.accept } = opts;
-            let node = from || (0, $cgawC$getOwnerDocument)(root).activeElement;
+            let node = from || (0, $cgawC$getActiveElement)((0, $cgawC$getOwnerDocument)(root));
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, {
                 tabbable: tabbable,
                 accept: accept
@@ -728,5 +722,5 @@ class $9bf71ea28793e738$var$TreeNode {
 let $9bf71ea28793e738$export$d06fae2ee68b101e = new $9bf71ea28793e738$var$Tree();
 
 
-export {$9bf71ea28793e738$export$20e40289641fbbb6 as FocusScope, $9bf71ea28793e738$export$d06fae2ee68b101e as focusScopeTree, $9bf71ea28793e738$export$10c5169755ce7bd7 as useFocusManager, $9bf71ea28793e738$export$2d6ec8fc375ceafa as getFocusableTreeWalker, $9bf71ea28793e738$export$4c063cf1350e6fed as isFocusable, $9bf71ea28793e738$export$1258395f99bf9cbf as isElementInChildOfActiveScope, $9bf71ea28793e738$export$c5251b9e124bf29 as createFocusManager};
+export {$9bf71ea28793e738$export$20e40289641fbbb6 as FocusScope, $9bf71ea28793e738$export$d06fae2ee68b101e as focusScopeTree, $9bf71ea28793e738$export$10c5169755ce7bd7 as useFocusManager, $9bf71ea28793e738$export$2d6ec8fc375ceafa as getFocusableTreeWalker, $9bf71ea28793e738$export$1258395f99bf9cbf as isElementInChildOfActiveScope, $9bf71ea28793e738$export$c5251b9e124bf29 as createFocusManager};
 //# sourceMappingURL=FocusScope.module.js.map