@react-aria/focus 3.10.0 → 3.11.0

package/dist/module.js

@@ -1,9 +1,41 @@
+import $6nfFC$swchelperssrc_define_propertymjs from "@swc/helpers/src/_define_property.mjs";
 import $6nfFC$react, {useRef as $6nfFC$useRef, useContext as $6nfFC$useContext, useMemo as $6nfFC$useMemo, useEffect as $6nfFC$useEffect, useState as $6nfFC$useState, useCallback as $6nfFC$useCallback} from "react";
 import {useLayoutEffect as $6nfFC$useLayoutEffect, runAfterTransition as $6nfFC$runAfterTransition, focusWithoutScrolling as $6nfFC$focusWithoutScrolling, mergeProps as $6nfFC$mergeProps, useSyncRef as $6nfFC$useSyncRef} from "@react-aria/utils";
 import {getInteractionModality as $6nfFC$getInteractionModality, isFocusVisible as $6nfFC$isFocusVisible, useFocusVisibleListener as $6nfFC$useFocusVisibleListener, useFocus as $6nfFC$useFocus, useFocusWithin as $6nfFC$useFocusWithin, useKeyboard as $6nfFC$useKeyboard} from "@react-aria/interactions";
 import $6nfFC$clsx from "clsx";
 
-
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ /*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
 
 function $6a99195332edec8b$export$80f3e147d781571c(element) {
     // If the user is interacting with a virtual cursor, e.g. screen reader, then
@@ -11,13 +43,13 @@ function $6a99195332edec8b$export$80f3e147d781571c(element) {
     // the page before shifting focus. This avoids issues with VoiceOver on iOS
     // causing the page to scroll when moving focus if the element is transitioning
     // from off the screen.
-    if ($6nfFC$getInteractionModality() === 'virtual') {
+    if ((0, $6nfFC$getInteractionModality)() === "virtual") {
         let lastFocusedElement = document.activeElement;
-        $6nfFC$runAfterTransition(()=>{
+        (0, $6nfFC$runAfterTransition)(()=>{
             // If focus did not move and the element is still in the document, focus it.
-            if (document.activeElement === lastFocusedElement && document.contains(element)) $6nfFC$focusWithoutScrolling(element);
+            if (document.activeElement === lastFocusedElement && document.contains(element)) (0, $6nfFC$focusWithoutScrolling)(element);
         });
-    } else $6nfFC$focusWithoutScrolling(element);
+    } else (0, $6nfFC$focusWithoutScrolling)(element);
 }
 
 
@@ -34,42 +66,62 @@ function $6a99195332edec8b$export$80f3e147d781571c(element) {
  */ function $645f2e67b85a24c9$var$isStyleVisible(element) {
     if (!(element instanceof HTMLElement) && !(element instanceof SVGElement)) return false;
     let { display: display , visibility: visibility  } = element.style;
-    let isVisible = display !== 'none' && visibility !== 'hidden' && visibility !== 'collapse';
+    let isVisible = display !== "none" && visibility !== "hidden" && visibility !== "collapse";
     if (isVisible) {
         const { getComputedStyle: getComputedStyle  } = element.ownerDocument.defaultView;
         let { display: computedDisplay , visibility: computedVisibility  } = getComputedStyle(element);
-        isVisible = computedDisplay !== 'none' && computedVisibility !== 'hidden' && computedVisibility !== 'collapse';
+        isVisible = computedDisplay !== "none" && computedVisibility !== "hidden" && computedVisibility !== "collapse";
     }
     return isVisible;
 }
 function $645f2e67b85a24c9$var$isAttributeVisible(element, childElement) {
-    return !element.hasAttribute('hidden') && (element.nodeName === 'DETAILS' && childElement && childElement.nodeName !== 'SUMMARY' ? element.hasAttribute('open') : true);
+    return !element.hasAttribute("hidden") && (element.nodeName === "DETAILS" && childElement && childElement.nodeName !== "SUMMARY" ? element.hasAttribute("open") : true);
 }
 function $645f2e67b85a24c9$export$e989c0fffaa6b27a(element, childElement) {
-    return element.nodeName !== '#comment' && $645f2e67b85a24c9$var$isStyleVisible(element) && $645f2e67b85a24c9$var$isAttributeVisible(element, childElement) && (!element.parentElement || $645f2e67b85a24c9$export$e989c0fffaa6b27a(element.parentElement, element));
+    return element.nodeName !== "#comment" && $645f2e67b85a24c9$var$isStyleVisible(element) && $645f2e67b85a24c9$var$isAttributeVisible(element, childElement) && (!element.parentElement || $645f2e67b85a24c9$export$e989c0fffaa6b27a(element.parentElement, element));
 }
 
 
 
 
-const $9bf71ea28793e738$var$FocusContext = /*#__PURE__*/ $6nfFC$react.createContext(null);
+const $9bf71ea28793e738$var$FocusContext = /*#__PURE__*/ (0, $6nfFC$react).createContext(null);
 let $9bf71ea28793e738$var$activeScope = null;
 function $9bf71ea28793e738$export$20e40289641fbbb6(props) {
     let { children: children , contain: contain , restoreFocus: restoreFocus , autoFocus: autoFocus  } = props;
-    let startRef = $6nfFC$useRef();
-    let endRef = $6nfFC$useRef();
-    let scopeRef = $6nfFC$useRef([]);
-    let ctx = $6nfFC$useContext($9bf71ea28793e738$var$FocusContext);
-    var ref;
-    // The parent scope is based on the JSX tree, using context.
-    // However, if a new scope mounts outside the active scope (e.g. DialogContainer launched from a menu),
-    // we want the parent scope to be the active scope instead.
-    let ctxParent = (ref = ctx === null || ctx === void 0 ? void 0 : ctx.scopeRef) !== null && ref !== void 0 ? ref : null;
-    let parentScope1 = $6nfFC$useMemo(()=>$9bf71ea28793e738$var$activeScope && $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode($9bf71ea28793e738$var$activeScope) && !$9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, ctxParent) ? $9bf71ea28793e738$var$activeScope : ctxParent
-    , [
-        ctxParent
+    let startRef = (0, $6nfFC$useRef)();
+    let endRef = (0, $6nfFC$useRef)();
+    let scopeRef = (0, $6nfFC$useRef)([]);
+    let { parentNode: parentNode  } = (0, $6nfFC$useContext)($9bf71ea28793e738$var$FocusContext) || {};
+    // Create a tree node here so we can add children to it even before it is added to the tree.
+    let node = (0, $6nfFC$useMemo)(()=>new $9bf71ea28793e738$var$TreeNode({
+            scopeRef: scopeRef
+        }), [
+        scopeRef
+    ]);
+    (0, $6nfFC$useLayoutEffect)(()=>{
+        // If a new scope mounts outside the active scope, (e.g. DialogContainer launched from a menu),
+        // use the active scope as the parent instead of the parent from context. Layout effects run bottom
+        // up, so if the parent is not yet added to the tree, don't do this. Only the outer-most FocusScope
+        // that is being added should get the activeScope as its parent.
+        let parent = parentNode || $9bf71ea28793e738$export$d06fae2ee68b101e.root;
+        if ($9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(parent.scopeRef) && $9bf71ea28793e738$var$activeScope && !$9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, parent.scopeRef)) {
+            let activeNode = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode($9bf71ea28793e738$var$activeScope);
+            if (activeNode) parent = activeNode;
+        }
+        // Add the node to the parent, and to the tree.
+        parent.addChild(node);
+        $9bf71ea28793e738$export$d06fae2ee68b101e.addNode(node);
+    }, [
+        node,
+        parentNode
+    ]);
+    (0, $6nfFC$useLayoutEffect)(()=>{
+        let node = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef);
+        node.contain = contain;
+    }, [
+        contain
     ]);
-    $6nfFC$useLayoutEffect(()=>{
+    (0, $6nfFC$useLayoutEffect)(()=>{
         // Find all rendered nodes between the sentinels and add them to the scope.
         let node = startRef.current.nextSibling;
         let nodes = [];
@@ -79,57 +131,65 @@ function $9bf71ea28793e738$export$20e40289641fbbb6(props) {
         }
         scopeRef.current = nodes;
     }, [
-        children,
-        parentScope1
+        children
     ]);
-    // add to the focus scope tree in render order because useEffects/useLayoutEffects run children first whereas render runs parent first
-    // which matters when constructing a tree
-    if ($9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(parentScope1) && !$9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef)) $9bf71ea28793e738$export$d06fae2ee68b101e.addTreeNode(scopeRef, parentScope1);
-    let node1 = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef);
-    node1.contain = contain;
     $9bf71ea28793e738$var$useActiveScopeTracker(scopeRef, restoreFocus, contain);
     $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain);
     $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain);
     $9bf71ea28793e738$var$useAutoFocus(scopeRef, autoFocus);
     // this layout effect needs to run last so that focusScopeTree cleanup happens at the last moment possible
-    $6nfFC$useLayoutEffect(()=>{
-        if (scopeRef) return ()=>{
-            // Scope may have been re-parented.
-            let parentScope = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).parent.scopeRef;
-            // Restore the active scope on unmount if this scope or a descendant scope is active.
-            // Parent effect cleanups run before children, so we need to check if the
-            // parent scope actually still exists before restoring the active scope to it.
-            if ((scopeRef === $9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope(scopeRef, $9bf71ea28793e738$var$activeScope)) && (!parentScope || $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(parentScope))) $9bf71ea28793e738$var$activeScope = parentScope;
-            $9bf71ea28793e738$export$d06fae2ee68b101e.removeTreeNode(scopeRef);
-        };
+    (0, $6nfFC$useEffect)(()=>{
+        if (scopeRef) {
+            let activeElement = document.activeElement;
+            let scope = null;
+            // In strict mode, active scope is incorrectly updated since cleanup will run even though scope hasn't unmounted.
+            // To fix this, we need to update the actual activeScope here
+            if ($9bf71ea28793e738$var$isElementInScope(activeElement, scopeRef.current)) {
+                // Since useLayoutEffect runs for children first, we need to traverse the focusScope tree and find the bottom most scope that
+                // contains the active element and set that as the activeScope
+                for (let node of $9bf71ea28793e738$export$d06fae2ee68b101e.traverse())if ($9bf71ea28793e738$var$isElementInScope(activeElement, node.scopeRef.current)) scope = node;
+                if (scope === $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef)) $9bf71ea28793e738$var$activeScope = scope.scopeRef;
+            }
+            return ()=>{
+                // Scope may have been re-parented.
+                let parentScope = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).parent.scopeRef;
+                // Restore the active scope on unmount if this scope or a descendant scope is active.
+                // Parent effect cleanups run before children, so we need to check if the
+                // parent scope actually still exists before restoring the active scope to it.
+                if ((scopeRef === $9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope(scopeRef, $9bf71ea28793e738$var$activeScope)) && (!parentScope || $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(parentScope))) $9bf71ea28793e738$var$activeScope = parentScope;
+                $9bf71ea28793e738$export$d06fae2ee68b101e.removeTreeNode(scopeRef);
+            };
+        }
     }, [
-        scopeRef,
-        parentScope1
+        scopeRef
     ]);
-    let focusManager = $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef);
-    return(/*#__PURE__*/ $6nfFC$react.createElement($9bf71ea28793e738$var$FocusContext.Provider, {
-        value: {
-            scopeRef: scopeRef,
-            focusManager: focusManager
-        }
-    }, /*#__PURE__*/ $6nfFC$react.createElement("span", {
+    let focusManager = (0, $6nfFC$useMemo)(()=>$9bf71ea28793e738$var$createFocusManagerForScope(scopeRef), []);
+    let value = (0, $6nfFC$useMemo)(()=>({
+            focusManager: focusManager,
+            parentNode: node
+        }), [
+        node,
+        focusManager
+    ]);
+    return /*#__PURE__*/ (0, $6nfFC$react).createElement($9bf71ea28793e738$var$FocusContext.Provider, {
+        value: value
+    }, /*#__PURE__*/ (0, $6nfFC$react).createElement("span", {
         "data-focus-scope-start": true,
         hidden: true,
         ref: startRef
-    }), children, /*#__PURE__*/ $6nfFC$react.createElement("span", {
+    }), children, /*#__PURE__*/ (0, $6nfFC$react).createElement("span", {
         "data-focus-scope-end": true,
         hidden: true,
         ref: endRef
-    })));
+    }));
 }
 function $9bf71ea28793e738$export$10c5169755ce7bd7() {
-    var ref;
-    return (ref = $6nfFC$useContext($9bf71ea28793e738$var$FocusContext)) === null || ref === void 0 ? void 0 : ref.focusManager;
+    var _useContext;
+    return (_useContext = (0, $6nfFC$useContext)($9bf71ea28793e738$var$FocusContext)) === null || _useContext === void 0 ? void 0 : _useContext.focusManager;
 }
 function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
     return {
-        focusNext (opts = {
-        }) {
+        focusNext (opts = {}) {
             let scope = scopeRef.current;
             let { from: from , tabbable: tabbable , wrap: wrap , accept: accept  } = opts;
             let node = from || document.activeElement;
@@ -147,8 +207,7 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
             if (nextNode) $9bf71ea28793e738$var$focusElement(nextNode, true);
             return nextNode;
         },
-        focusPrevious (opts = {
-        }) {
+        focusPrevious (opts = {}) {
             let scope = scopeRef.current;
             let { from: from , tabbable: tabbable , wrap: wrap , accept: accept  } = opts;
             let node = from || document.activeElement;
@@ -166,8 +225,7 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
             if (previousNode) $9bf71ea28793e738$var$focusElement(previousNode, true);
             return previousNode;
         },
-        focusFirst (opts = {
-        }) {
+        focusFirst (opts = {}) {
             let scope = scopeRef.current;
             let { tabbable: tabbable , accept: accept  } = opts;
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
@@ -179,8 +237,7 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
             if (nextNode) $9bf71ea28793e738$var$focusElement(nextNode, true);
             return nextNode;
         },
-        focusLast (opts = {
-        }) {
+        focusLast (opts = {}) {
             let scope = scopeRef.current;
             let { tabbable: tabbable , accept: accept  } = opts;
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
@@ -195,21 +252,21 @@ 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]'
+    "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])';
+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$var$getScopeRoot(scope) {
@@ -224,10 +281,10 @@ function $9bf71ea28793e738$var$shouldContainFocus(scopeRef) {
     return true;
 }
 function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
-    let focusedNode = $6nfFC$useRef();
-    let raf = $6nfFC$useRef(null);
-    $6nfFC$useLayoutEffect(()=>{
-        let scope1 = scopeRef.current;
+    let focusedNode = (0, $6nfFC$useRef)();
+    let raf = (0, $6nfFC$useRef)(null);
+    (0, $6nfFC$useLayoutEffect)(()=>{
+        let scope = scopeRef.current;
         if (!contain) {
             // if contain was changed, then we should cancel any ongoing waits to pull focus back into containment
             if (raf.current) {
@@ -238,7 +295,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)) return;
+            if (e.key !== "Tab" || e.altKey || e.ctrlKey || e.metaKey || !$9bf71ea28793e738$var$shouldContainFocus(scopeRef)) return;
             let focusedElement = document.activeElement;
             let scope = scopeRef.current;
             if (!$9bf71ea28793e738$var$isElementInScope(focusedElement, scope)) return;
@@ -269,6 +326,7 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
         };
         let onBlur = (e)=>{
             // Firefox doesn't shift focus back to the Dialog properly without this
+            if (raf.current) cancelAnimationFrame(raf.current);
             raf.current = requestAnimationFrame(()=>{
                 // Use document.activeElement instead of e.relatedTarget so we can tell if user clicked into iframe
                 if ($9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(document.activeElement, scopeRef)) {
@@ -280,26 +338,22 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
                 }
             });
         };
-        document.addEventListener('keydown', onKeyDown, false);
-        document.addEventListener('focusin', onFocus, false);
-        scope1.forEach((element)=>element.addEventListener('focusin', onFocus, false)
-        );
-        scope1.forEach((element)=>element.addEventListener('focusout', onBlur, false)
-        );
+        document.addEventListener("keydown", onKeyDown, false);
+        document.addEventListener("focusin", onFocus, false);
+        scope.forEach((element)=>element.addEventListener("focusin", onFocus, false));
+        scope.forEach((element)=>element.addEventListener("focusout", onBlur, false));
         return ()=>{
-            document.removeEventListener('keydown', onKeyDown, false);
-            document.removeEventListener('focusin', onFocus, false);
-            scope1.forEach((element)=>element.removeEventListener('focusin', onFocus, false)
-            );
-            scope1.forEach((element)=>element.removeEventListener('focusout', onBlur, false)
-            );
+            document.removeEventListener("keydown", onKeyDown, false);
+            document.removeEventListener("focusin", onFocus, false);
+            scope.forEach((element)=>element.removeEventListener("focusin", onFocus, false));
+            scope.forEach((element)=>element.removeEventListener("focusout", onBlur, false));
         };
     }, [
         scopeRef,
         contain
     ]);
     // eslint-disable-next-line arrow-body-style
-    $6nfFC$useEffect(()=>{
+    (0, $6nfFC$useEffect)(()=>{
         return ()=>{
             if (raf.current) cancelAnimationFrame(raf.current);
         };
@@ -311,10 +365,11 @@ function $9bf71ea28793e738$var$isElementInAnyScope(element) {
     return $9bf71ea28793e738$var$isElementInChildScope(element);
 }
 function $9bf71ea28793e738$var$isElementInScope(element, scope) {
-    return scope.some((node)=>node.contains(element)
-    );
+    return scope.some((node)=>node.contains(element));
 }
 function $9bf71ea28793e738$var$isElementInChildScope(element, scope = null) {
+    // If the element is within a top layer element (e.g. toasts), always allow moving focus there.
+    if (element instanceof Element && element.closest("[data-react-aria-top-layer]")) return true;
     // node.contains in isElementInScope covers child scopes that are also DOM children,
     // but does not cover child scopes in portals.
     for (let { scopeRef: s  } of $9bf71ea28793e738$export$d06fae2ee68b101e.traverse($9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scope))){
@@ -326,8 +381,8 @@ function $9bf71ea28793e738$export$1258395f99bf9cbf(element) {
     return $9bf71ea28793e738$var$isElementInChildScope(element, $9bf71ea28793e738$var$activeScope);
 }
 function $9bf71ea28793e738$var$isAncestorScope(ancestor, scope) {
-    var ref;
-    let parent = (ref = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scope)) === null || ref === void 0 ? void 0 : ref.parent;
+    var _focusScopeTree_getTreeNode;
+    let parent = (_focusScopeTree_getTreeNode = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scope)) === null || _focusScopeTree_getTreeNode === void 0 ? void 0 : _focusScopeTree_getTreeNode.parent;
     while(parent){
         if (parent.scopeRef === ancestor) return true;
         parent = parent.parent;
@@ -336,7 +391,7 @@ function $9bf71ea28793e738$var$isAncestorScope(ancestor, scope) {
 }
 function $9bf71ea28793e738$var$focusElement(element, scroll = false) {
     if (element != null && !scroll) try {
-        $6a99195332edec8b$export$80f3e147d781571c(element);
+        (0, $6a99195332edec8b$export$80f3e147d781571c)(element);
     } catch (err) {
     // ignore
     }
@@ -364,8 +419,8 @@ function $9bf71ea28793e738$var$focusFirstInScope(scope, tabbable = true) {
     $9bf71ea28793e738$var$focusElement(nextNode);
 }
 function $9bf71ea28793e738$var$useAutoFocus(scopeRef, autoFocus) {
-    const autoFocusRef = $6nfFC$react.useRef(autoFocus);
-    $6nfFC$useEffect(()=>{
+    const autoFocusRef = (0, $6nfFC$react).useRef(autoFocus);
+    (0, $6nfFC$useEffect)(()=>{
         if (autoFocusRef.current) {
             $9bf71ea28793e738$var$activeScope = scopeRef;
             if (!$9bf71ea28793e738$var$isElementInScope(document.activeElement, $9bf71ea28793e738$var$activeScope.current)) $9bf71ea28793e738$var$focusFirstInScope(scopeRef.current);
@@ -378,7 +433,7 @@ function $9bf71ea28793e738$var$useAutoFocus(scopeRef, autoFocus) {
 function $9bf71ea28793e738$var$useActiveScopeTracker(scopeRef, restore, contain) {
     // tracks the active scope, in case restore and contain are both false.
     // if either are true, this is tracked in useRestoreFocus or useFocusContainment.
-    $6nfFC$useLayoutEffect(()=>{
+    (0, $6nfFC$useLayoutEffect)(()=>{
         if (restore || contain) return;
         let scope = scopeRef.current;
         let onFocus = (e)=>{
@@ -386,13 +441,11 @@ function $9bf71ea28793e738$var$useActiveScopeTracker(scopeRef, restore, contain)
             if ($9bf71ea28793e738$var$isElementInScope(target, scopeRef.current)) $9bf71ea28793e738$var$activeScope = scopeRef;
             else if (!$9bf71ea28793e738$var$isElementInAnyScope(target)) $9bf71ea28793e738$var$activeScope = null;
         };
-        document.addEventListener('focusin', onFocus, false);
-        scope.forEach((element)=>element.addEventListener('focusin', onFocus, false)
-        );
+        document.addEventListener("focusin", onFocus, false);
+        scope.forEach((element)=>element.addEventListener("focusin", onFocus, false));
         return ()=>{
-            document.removeEventListener('focusin', onFocus, false);
-            scope.forEach((element)=>element.removeEventListener('focusin', onFocus, false)
-            );
+            document.removeEventListener("focusin", onFocus, false);
+            scope.forEach((element)=>element.removeEventListener("focusin", onFocus, false));
         };
     }, [
         scopeRef,
@@ -410,10 +463,10 @@ 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.
-    const nodeToRestoreRef = $6nfFC$useRef(typeof document !== 'undefined' ? document.activeElement : null);
+    const nodeToRestoreRef = (0, $6nfFC$useRef)(typeof document !== "undefined" ? document.activeElement : 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
-    $6nfFC$useLayoutEffect(()=>{
+    (0, $6nfFC$useLayoutEffect)(()=>{
         let scope = scopeRef.current;
         if (!restoreFocus || contain) return;
         let onFocus = ()=>{
@@ -421,13 +474,11 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
             // 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$activeScope = scopeRef;
         };
-        document.addEventListener('focusin', onFocus, false);
-        scope.forEach((element)=>element.addEventListener('focusin', onFocus, false)
-        );
+        document.addEventListener("focusin", onFocus, false);
+        scope.forEach((element)=>element.addEventListener("focusin", onFocus, false));
         return ()=>{
-            document.removeEventListener('focusin', onFocus, false);
-            scope.forEach((element)=>element.removeEventListener('focusin', onFocus, false)
-            );
+            document.removeEventListener("focusin", onFocus, false);
+            scope.forEach((element)=>element.removeEventListener("focusin", onFocus, false));
         };
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
@@ -435,7 +486,7 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
         contain
     ]);
     // useLayoutEffect instead of useEffect so the active element is saved synchronously instead of asynchronously.
-    $6nfFC$useLayoutEffect(()=>{
+    (0, $6nfFC$useLayoutEffect)(()=>{
         if (!restoreFocus) return;
         $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).nodeToRestore = nodeToRestoreRef.current;
         // Handle the Tab key so that tabbing out of the scope goes to the next element
@@ -443,7 +494,7 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
         // using portals for overlays, so that focus goes to the expected element when
         // tabbing out of the overlay.
         let onKeyDown = (e)=>{
-            if (e.key !== 'Tab' || e.altKey || e.ctrlKey || e.metaKey) return;
+            if (e.key !== "Tab" || e.altKey || e.ctrlKey || e.metaKey) return;
             let focusedElement = document.activeElement;
             if (!$9bf71ea28793e738$var$isElementInScope(focusedElement, scopeRef.current)) return;
             let nodeToRestore = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).nodeToRestore;
@@ -464,7 +515,7 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
                 walker.currentNode = nodeToRestore;
                 // Skip over elements within the scope, in case the scope immediately follows the node to restore.
                 do nextElement = e.shiftKey ? walker.previousNode() : walker.nextNode();
-                while ($9bf71ea28793e738$var$isElementInScope(nextElement, scopeRef.current))
+                while ($9bf71ea28793e738$var$isElementInScope(nextElement, scopeRef.current));
                 e.preventDefault();
                 e.stopPropagation();
                 if (nextElement) $9bf71ea28793e738$var$focusElement(nextElement, true);
@@ -475,9 +526,9 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
                 else $9bf71ea28793e738$var$focusElement(nodeToRestore, true);
             }
         };
-        if (!contain) document.addEventListener('keydown', onKeyDown, true);
+        if (!contain) document.addEventListener("keydown", onKeyDown, true);
         return ()=>{
-            if (!contain) document.removeEventListener('keydown', onKeyDown, true);
+            if (!contain) document.removeEventListener("keydown", onKeyDown, true);
             let nodeToRestore = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).nodeToRestore;
             // if we already lost focus to the body and this was the active scope, then we should attempt to restore
             if (restoreFocus && nodeToRestore && // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -520,21 +571,19 @@ 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 = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, {
         acceptNode (node) {
-            var ref;
+            var _opts_from;
             // Skip nodes inside the starting node.
-            if (opts === null || opts === void 0 ? void 0 : (ref = opts.from) === null || ref === void 0 ? void 0 : ref.contains(node)) return NodeFilter.FILTER_REJECT;
-            if (node.matches(selector) && $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 (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;
             return NodeFilter.FILTER_SKIP;
         }
     });
     if (opts === null || opts === void 0 ? void 0 : opts.from) walker.currentNode = opts.from;
     return walker;
 }
-function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {
-}) {
+function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
     return {
-        focusNext (opts = {
-        }) {
+        focusNext (opts = {}) {
             let root = ref.current;
             if (!root) return;
             let { from: from , tabbable: tabbable = defaultOptions.tabbable , wrap: wrap = defaultOptions.wrap , accept: accept = defaultOptions.accept  } = opts;
@@ -607,7 +656,7 @@ function $9bf71ea28793e738$var$last(walker) {
     do {
         last = walker.lastChild();
         if (last) next = last;
-    }while (last)
+    }while (last);
     return next;
 }
 class $9bf71ea28793e738$var$Tree {
@@ -627,6 +676,9 @@ class $9bf71ea28793e738$var$Tree {
         this.fastMap.set(scopeRef, node);
         if (nodeToRestore) node.nodeToRestore = nodeToRestore;
     }
+    addNode(node) {
+        this.fastMap.set(node.scopeRef, node);
+    }
     removeTreeNode(scopeRef) {
         // never remove the root
         if (scopeRef === null) return;
@@ -637,14 +689,13 @@ class $9bf71ea28793e738$var$Tree {
         for (let current of this.traverse())if (current !== node && node.nodeToRestore && current.nodeToRestore && node.scopeRef.current && $9bf71ea28793e738$var$isElementInScope(current.nodeToRestore, node.scopeRef.current)) current.nodeToRestore = node.nodeToRestore;
         let children = node.children;
         parentNode.removeChild(node);
-        if (children.length > 0) children.forEach((child)=>parentNode.addChild(child)
-        );
+        if (children.size > 0) children.forEach((child)=>parentNode.addChild(child));
         this.fastMap.delete(node.scopeRef);
     }
     // Pre Order Depth First
     *traverse(node = this.root) {
         if (node.scopeRef != null) yield node;
-        if (node.children.length > 0) for (let child of node.children)yield* this.traverse(child);
+        if (node.children.size > 0) for (let child of node.children)yield* this.traverse(child);
     }
     clone() {
         let newTree = new $9bf71ea28793e738$var$Tree();
@@ -652,7 +703,7 @@ class $9bf71ea28793e738$var$Tree {
         return newTree;
     }
     constructor(){
-        this.fastMap = new Map();
+        (0, $6nfFC$swchelperssrc_define_propertymjs)(this, "fastMap", new Map());
         this.root = new $9bf71ea28793e738$var$TreeNode({
             scopeRef: null
         });
@@ -661,63 +712,70 @@ class $9bf71ea28793e738$var$Tree {
 }
 class $9bf71ea28793e738$var$TreeNode {
     addChild(node) {
-        this.children.push(node);
+        this.children.add(node);
         node.parent = this;
     }
     removeChild(node) {
-        this.children.splice(this.children.indexOf(node), 1);
+        this.children.delete(node);
         node.parent = undefined;
     }
     constructor(props){
-        this.children = [];
-        this.contain = false;
+        (0, $6nfFC$swchelperssrc_define_propertymjs)(this, "children", new Set());
+        (0, $6nfFC$swchelperssrc_define_propertymjs)(this, "contain", false);
         this.scopeRef = props.scopeRef;
     }
 }
 let $9bf71ea28793e738$export$d06fae2ee68b101e = new $9bf71ea28793e738$var$Tree();
 
 
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
 
 
 
 
 
-
-function $f7dceffc5ad7768b$export$4e328f61c538687f(props = {
-}) {
+function $f7dceffc5ad7768b$export$4e328f61c538687f(props = {}) {
     let { autoFocus: autoFocus = false , isTextInput: isTextInput , within: within  } = props;
-    let state = $6nfFC$useRef({
+    let state = (0, $6nfFC$useRef)({
         isFocused: false,
-        isFocusVisible: autoFocus || $6nfFC$isFocusVisible()
+        isFocusVisible: autoFocus || (0, $6nfFC$isFocusVisible)()
     });
-    let [isFocused1, setFocused] = $6nfFC$useState(false);
-    let [isFocusVisibleState, setFocusVisible] = $6nfFC$useState(()=>state.current.isFocused && state.current.isFocusVisible
-    );
-    let updateState = $6nfFC$useCallback(()=>setFocusVisible(state.current.isFocused && state.current.isFocusVisible)
-    , []);
-    let onFocusChange = $6nfFC$useCallback((isFocused)=>{
+    let [isFocused, setFocused] = (0, $6nfFC$useState)(false);
+    let [isFocusVisibleState, setFocusVisible] = (0, $6nfFC$useState)(()=>state.current.isFocused && state.current.isFocusVisible);
+    let updateState = (0, $6nfFC$useCallback)(()=>setFocusVisible(state.current.isFocused && state.current.isFocusVisible), []);
+    let onFocusChange = (0, $6nfFC$useCallback)((isFocused)=>{
         state.current.isFocused = isFocused;
         setFocused(isFocused);
         updateState();
     }, [
         updateState
     ]);
-    $6nfFC$useFocusVisibleListener((isFocusVisible)=>{
+    (0, $6nfFC$useFocusVisibleListener)((isFocusVisible)=>{
         state.current.isFocusVisible = isFocusVisible;
         updateState();
     }, [], {
         isTextInput: isTextInput
     });
-    let { focusProps: focusProps  } = $6nfFC$useFocus({
+    let { focusProps: focusProps  } = (0, $6nfFC$useFocus)({
         isDisabled: within,
         onFocusChange: onFocusChange
     });
-    let { focusWithinProps: focusWithinProps  } = $6nfFC$useFocusWithin({
+    let { focusWithinProps: focusWithinProps  } = (0, $6nfFC$useFocusWithin)({
         isDisabled: !within,
         onFocusWithinChange: onFocusChange
     });
     return {
-        isFocused: isFocused1,
+        isFocused: isFocused,
         isFocusVisible: state.current.isFocused && isFocusVisibleState,
         focusProps: within ? focusWithinProps : focusProps
     };
@@ -726,27 +784,36 @@ function $f7dceffc5ad7768b$export$4e328f61c538687f(props = {
 
 function $907718708eab68af$export$1a38b4ad7f578e1d(props) {
     let { children: children , focusClass: focusClass , focusRingClass: focusRingClass  } = props;
-    let { isFocused: isFocused , isFocusVisible: isFocusVisible , focusProps: focusProps  } = $f7dceffc5ad7768b$export$4e328f61c538687f(props);
-    let child = $6nfFC$react.Children.only(children);
-    return(/*#__PURE__*/ $6nfFC$react.cloneElement(child, $6nfFC$mergeProps(child.props, {
+    let { isFocused: isFocused , isFocusVisible: isFocusVisible , focusProps: focusProps  } = (0, $f7dceffc5ad7768b$export$4e328f61c538687f)(props);
+    let child = (0, $6nfFC$react).Children.only(children);
+    return /*#__PURE__*/ (0, $6nfFC$react).cloneElement(child, (0, $6nfFC$mergeProps)(child.props, {
         ...focusProps,
-        className: $6nfFC$clsx({
-            [focusClass || '']: isFocused,
-            [focusRingClass || '']: isFocusVisible
+        className: (0, $6nfFC$clsx)({
+            [focusClass || ""]: isFocused,
+            [focusRingClass || ""]: isFocusVisible
         })
-    })));
+    }));
 }
 
 
+/*
+ * Copyright 2020 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */ 
 
 
 
-
-let $e6afbd83fe6ebbd2$var$FocusableContext = /*#__PURE__*/ $6nfFC$react.createContext(null);
+let $e6afbd83fe6ebbd2$var$FocusableContext = /*#__PURE__*/ (0, $6nfFC$react).createContext(null);
 function $e6afbd83fe6ebbd2$var$useFocusableContext(ref) {
-    let context = $6nfFC$useContext($e6afbd83fe6ebbd2$var$FocusableContext) || {
-    };
-    $6nfFC$useSyncRef(context, ref);
+    let context = (0, $6nfFC$useContext)($e6afbd83fe6ebbd2$var$FocusableContext) || {};
+    (0, $6nfFC$useSyncRef)(context, ref);
     // eslint-disable-next-line
     let { ref: _ , ...otherProps } = context;
     return otherProps;
@@ -759,27 +826,26 @@ function $e6afbd83fe6ebbd2$var$useFocusableContext(ref) {
         ...otherProps,
         ref: ref
     };
-    return(/*#__PURE__*/ $6nfFC$react.createElement($e6afbd83fe6ebbd2$var$FocusableContext.Provider, {
+    return /*#__PURE__*/ (0, $6nfFC$react).createElement($e6afbd83fe6ebbd2$var$FocusableContext.Provider, {
         value: context
-    }, children));
+    }, children);
 }
-let $e6afbd83fe6ebbd2$export$13f3202a3e5ddd5 = /*#__PURE__*/ $6nfFC$react.forwardRef($e6afbd83fe6ebbd2$var$FocusableProvider);
+let $e6afbd83fe6ebbd2$export$13f3202a3e5ddd5 = /*#__PURE__*/ (0, $6nfFC$react).forwardRef($e6afbd83fe6ebbd2$var$FocusableProvider);
 function $e6afbd83fe6ebbd2$export$4c014de7c8940b4c(props, domRef) {
-    let { focusProps: focusProps  } = $6nfFC$useFocus(props);
-    let { keyboardProps: keyboardProps  } = $6nfFC$useKeyboard(props);
-    let interactions = $6nfFC$mergeProps(focusProps, keyboardProps);
+    let { focusProps: focusProps  } = (0, $6nfFC$useFocus)(props);
+    let { keyboardProps: keyboardProps  } = (0, $6nfFC$useKeyboard)(props);
+    let interactions = (0, $6nfFC$mergeProps)(focusProps, keyboardProps);
     let domProps = $e6afbd83fe6ebbd2$var$useFocusableContext(domRef);
-    let interactionProps = props.isDisabled ? {
-    } : domProps;
-    let autoFocusRef = $6nfFC$useRef(props.autoFocus);
-    $6nfFC$useEffect(()=>{
-        if (autoFocusRef.current && domRef.current) $6a99195332edec8b$export$80f3e147d781571c(domRef.current);
+    let interactionProps = props.isDisabled ? {} : domProps;
+    let autoFocusRef = (0, $6nfFC$useRef)(props.autoFocus);
+    (0, $6nfFC$useEffect)(()=>{
+        if (autoFocusRef.current && domRef.current) (0, $6a99195332edec8b$export$80f3e147d781571c)(domRef.current);
         autoFocusRef.current = false;
     }, [
         domRef
     ]);
     return {
-        focusableProps: $6nfFC$mergeProps({
+        focusableProps: (0, $6nfFC$mergeProps)({
             ...interactions,
             tabIndex: props.excludeFromTabOrder && !props.isDisabled ? -1 : undefined
         }, interactionProps)