@react-aria/focus 3.14.3 → 3.15.0

package/dist/import.mjs

@@ -1,5 +1,5 @@
 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 {useLayoutEffect as $6nfFC$useLayoutEffect, runAfterTransition as $6nfFC$runAfterTransition, focusWithoutScrolling as $6nfFC$focusWithoutScrolling, mergeProps as $6nfFC$mergeProps, useSyncRef as $6nfFC$useSyncRef, useObjectRef as $6nfFC$useObjectRef} 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";
 
@@ -86,8 +86,8 @@ const $9bf71ea28793e738$var$FocusContext = /*#__PURE__*/ (0, $6nfFC$react).creat
 let $9bf71ea28793e738$var$activeScope = null;
 function $9bf71ea28793e738$export$20e40289641fbbb6(props) {
     let { children: children, contain: contain, restoreFocus: restoreFocus, autoFocus: autoFocus } = props;
-    let startRef = (0, $6nfFC$useRef)();
-    let endRef = (0, $6nfFC$useRef)();
+    let startRef = (0, $6nfFC$useRef)(null);
+    let endRef = (0, $6nfFC$useRef)(null);
     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.
@@ -115,13 +115,14 @@ function $9bf71ea28793e738$export$20e40289641fbbb6(props) {
     ]);
     (0, $6nfFC$useLayoutEffect)(()=>{
         let node = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef);
-        node.contain = contain;
+        if (node) node.contain = !!contain;
     }, [
         contain
     ]);
     (0, $6nfFC$useLayoutEffect)(()=>{
+        var _startRef_current;
         // Find all rendered nodes between the sentinels and add them to the scope.
-        let node = startRef.current.nextSibling;
+        let node = (_startRef_current = startRef.current) === null || _startRef_current === void 0 ? void 0 : _startRef_current.nextSibling;
         let nodes = [];
         while(node && node !== endRef.current){
             nodes.push(node);
@@ -135,32 +136,34 @@ function $9bf71ea28793e738$export$20e40289641fbbb6(props) {
     $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
+    // 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, $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);
-            };
+        let activeElement = document.activeElement;
+        let scope = null;
+        if ($9bf71ea28793e738$var$isElementInScope(activeElement, scopeRef.current)) {
+            // 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 (node.scopeRef && $9bf71ea28793e738$var$isElementInScope(activeElement, node.scopeRef.current)) scope = node;
+            if (scope === $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef)) $9bf71ea28793e738$var$activeScope = scope.scopeRef;
         }
     }, [
         scopeRef
     ]);
+    // This layout effect cleanup is so that the tree node is removed synchronously with react before the RAF
+    // in useRestoreFocus cleanup runs.
+    (0, $6nfFC$useLayoutEffect)(()=>{
+        return ()=>{
+            var _focusScopeTree_getTreeNode_parent, _focusScopeTree_getTreeNode;
+            var _focusScopeTree_getTreeNode_parent_scopeRef;
+            // Scope may have been re-parented.
+            let parentScope = (_focusScopeTree_getTreeNode_parent_scopeRef = (_focusScopeTree_getTreeNode = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef)) === null || _focusScopeTree_getTreeNode === void 0 ? void 0 : (_focusScopeTree_getTreeNode_parent = _focusScopeTree_getTreeNode.parent) === null || _focusScopeTree_getTreeNode_parent === void 0 ? void 0 : _focusScopeTree_getTreeNode_parent.scopeRef) !== null && _focusScopeTree_getTreeNode_parent_scopeRef !== void 0 ? _focusScopeTree_getTreeNode_parent_scopeRef : null;
+            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
+    ]);
     let focusManager = (0, $6nfFC$useMemo)(()=>$9bf71ea28793e738$var$createFocusManagerForScope(scopeRef), []);
     let value = (0, $6nfFC$useMemo)(()=>({
             focusManager: focusManager,
@@ -192,7 +195,8 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
             let { from: from, tabbable: tabbable, wrap: wrap, accept: accept } = opts;
             let node = from || document.activeElement;
             let sentinel = scope[0].previousElementSibling;
-            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
+            let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
+            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
                 tabbable: tabbable,
                 accept: accept
             }, scope);
@@ -210,7 +214,8 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
             let { from: from, tabbable: tabbable, wrap: wrap, accept: accept } = opts;
             let node = from || document.activeElement;
             let sentinel = scope[scope.length - 1].nextElementSibling;
-            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
+            let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
+            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
                 tabbable: tabbable,
                 accept: accept
             }, scope);
@@ -226,7 +231,8 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
         focusFirst (opts = {}) {
             let scope = scopeRef.current;
             let { tabbable: tabbable, accept: accept } = opts;
-            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
+            let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
+            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
                 tabbable: tabbable,
                 accept: accept
             }, scope);
@@ -238,7 +244,8 @@ function $9bf71ea28793e738$var$createFocusManagerForScope(scopeRef) {
         focusLast (opts = {}) {
             let scope = scopeRef.current;
             let { tabbable: tabbable, accept: accept } = opts;
-            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
+            let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
+            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
                 tabbable: tabbable,
                 accept: accept
             }, scope);
@@ -280,14 +287,14 @@ function $9bf71ea28793e738$var$shouldContainFocus(scopeRef) {
 }
 function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
     let focusedNode = (0, $6nfFC$useRef)();
-    let raf = (0, $6nfFC$useRef)(null);
+    let raf = (0, $6nfFC$useRef)();
     (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) {
                 cancelAnimationFrame(raf.current);
-                raf.current = null;
+                raf.current = undefined;
             }
             return;
         }
@@ -296,10 +303,12 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
             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;
-            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
+            if (!scope || !$9bf71ea28793e738$var$isElementInScope(focusedElement, scope)) return;
+            let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
+            let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
                 tabbable: true
             }, scope);
+            if (!focusedElement) return;
             walker.currentNode = focusedElement;
             let nextElement = e.shiftKey ? walker.previousNode() : walker.nextNode();
             if (!nextElement) {
@@ -319,7 +328,7 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
                 // 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$focusFirstInScope($9bf71ea28793e738$var$activeScope.current);
+                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;
         };
         let onBlur = (e)=>{
@@ -327,24 +336,25 @@ function $9bf71ea28793e738$var$useFocusContainment(scopeRef, contain) {
             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)) {
+                if (document.activeElement && $9bf71ea28793e738$var$shouldContainFocus(scopeRef) && !$9bf71ea28793e738$var$isElementInChildScope(document.activeElement, scopeRef)) {
                     $9bf71ea28793e738$var$activeScope = scopeRef;
                     if (document.body.contains(e.target)) {
+                        var _focusedNode_current;
                         focusedNode.current = e.target;
-                        focusedNode.current.focus();
-                    } else if ($9bf71ea28793e738$var$activeScope) $9bf71ea28793e738$var$focusFirstInScope($9bf71ea28793e738$var$activeScope.current);
+                        (_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);
                 }
             });
         };
         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));
+        scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.addEventListener("focusin", onFocus, false));
+        scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.addEventListener("focusout", onBlur, false));
         return ()=>{
             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));
+            scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.removeEventListener("focusin", onFocus, false));
+            scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.removeEventListener("focusout", onBlur, false));
         };
     }, [
         scopeRef,
@@ -364,6 +374,8 @@ function $9bf71ea28793e738$var$isElementInAnyScope(element) {
     return $9bf71ea28793e738$var$isElementInChildScope(element);
 }
 function $9bf71ea28793e738$var$isElementInScope(element, scope) {
+    if (!element) return false;
+    if (!scope) return false;
     return scope.some((node)=>node.contains(element));
 }
 function $9bf71ea28793e738$var$isElementInChildScope(element, scope = null) {
@@ -372,7 +384,7 @@ function $9bf71ea28793e738$var$isElementInChildScope(element, scope = null) {
     // 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))){
-        if ($9bf71ea28793e738$var$isElementInScope(element, s.current)) return true;
+        if (s && $9bf71ea28793e738$var$isElementInScope(element, s.current)) return true;
     }
     return false;
 }
@@ -402,14 +414,16 @@ function $9bf71ea28793e738$var$focusElement(element, scroll = false) {
 }
 function $9bf71ea28793e738$var$focusFirstInScope(scope, tabbable = true) {
     let sentinel = scope[0].previousElementSibling;
-    let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
+    let scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
+    let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
         tabbable: tabbable
     }, scope);
     walker.currentNode = sentinel;
     let nextNode = walker.nextNode();
     // If the scope does not contain a tabbable element, use the first focusable element.
     if (tabbable && !nextNode) {
-        walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa($9bf71ea28793e738$var$getScopeRoot(scope), {
+        scopeRoot = $9bf71ea28793e738$var$getScopeRoot(scope);
+        walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(scopeRoot, {
             tabbable: false
         }, scope);
         walker.currentNode = sentinel;
@@ -422,7 +436,7 @@ function $9bf71ea28793e738$var$useAutoFocus(scopeRef, 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);
+            if (!$9bf71ea28793e738$var$isElementInScope(document.activeElement, $9bf71ea28793e738$var$activeScope.current) && scopeRef.current) $9bf71ea28793e738$var$focusFirstInScope(scopeRef.current);
         }
         autoFocusRef.current = false;
     }, [
@@ -441,10 +455,10 @@ function $9bf71ea28793e738$var$useActiveScopeTracker(scopeRef, restore, contain)
             else if (!$9bf71ea28793e738$var$isElementInAnyScope(target)) $9bf71ea28793e738$var$activeScope = null;
         };
         document.addEventListener("focusin", onFocus, false);
-        scope.forEach((element)=>element.addEventListener("focusin", onFocus, false));
+        scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.addEventListener("focusin", onFocus, false));
         return ()=>{
             document.removeEventListener("focusin", onFocus, false);
-            scope.forEach((element)=>element.removeEventListener("focusin", onFocus, false));
+            scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.removeEventListener("focusin", onFocus, false));
         };
     }, [
         scopeRef,
@@ -474,10 +488,10 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
             if ((!$9bf71ea28793e738$var$activeScope || $9bf71ea28793e738$var$isAncestorScope($9bf71ea28793e738$var$activeScope, scopeRef)) && $9bf71ea28793e738$var$isElementInScope(document.activeElement, scopeRef.current)) $9bf71ea28793e738$var$activeScope = scopeRef;
         };
         document.addEventListener("focusin", onFocus, false);
-        scope.forEach((element)=>element.addEventListener("focusin", onFocus, false));
+        scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.addEventListener("focusin", onFocus, false));
         return ()=>{
             document.removeEventListener("focusin", onFocus, false);
-            scope.forEach((element)=>element.removeEventListener("focusin", onFocus, false));
+            scope === null || scope === void 0 ? void 0 : scope.forEach((element)=>element.removeEventListener("focusin", onFocus, false));
         };
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
@@ -494,7 +508,9 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
             if (e.key !== "Tab" || e.altKey || e.ctrlKey || e.metaKey || !$9bf71ea28793e738$var$shouldContainFocus(scopeRef)) return;
             let focusedElement = document.activeElement;
             if (!$9bf71ea28793e738$var$isElementInScope(focusedElement, scopeRef.current)) return;
-            let nodeToRestore = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).nodeToRestore;
+            let treeNode = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef);
+            if (!treeNode) return;
+            let nodeToRestore = treeNode.nodeToRestore;
             // Create a DOM tree walker that matches all tabbable elements
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(document.body, {
                 tabbable: true
@@ -502,9 +518,9 @@ 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 (!document.body.contains(nodeToRestore) || nodeToRestore === document.body) {
-                nodeToRestore = null;
-                $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).nodeToRestore = null;
+            if (!nodeToRestore || !document.body.contains(nodeToRestore) || nodeToRestore === document.body) {
+                nodeToRestore = undefined;
+                treeNode.nodeToRestore = undefined;
             }
             // If there is no next element, or it is outside the current scope, move focus to the
             // next element after the node to restore to instead.
@@ -535,9 +551,14 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
     // useLayoutEffect instead of useEffect so the active element is saved synchronously instead of asynchronously.
     (0, $6nfFC$useLayoutEffect)(()=>{
         if (!restoreFocus) return;
-        $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).nodeToRestore = nodeToRestoreRef.current;
+        let treeNode = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef);
+        if (!treeNode) return;
+        var _nodeToRestoreRef_current;
+        treeNode.nodeToRestore = (_nodeToRestoreRef_current = nodeToRestoreRef.current) !== null && _nodeToRestoreRef_current !== void 0 ? _nodeToRestoreRef_current : undefined;
         return ()=>{
-            let nodeToRestore = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef).nodeToRestore;
+            let treeNode = $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(scopeRef);
+            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 && // eslint-disable-next-line react-hooks/exhaustive-deps
             ($9bf71ea28793e738$var$isElementInScope(document.activeElement, scopeRef.current) || document.activeElement === document.body && $9bf71ea28793e738$var$shouldRestoreFocus(scopeRef))) {
@@ -559,7 +580,7 @@ function $9bf71ea28793e738$var$useRestoreFocus(scopeRef, restoreFocus, contain)
                         // ancestor scope that is still in the tree.
                         treeNode = clonedTree.getTreeNode(scopeRef);
                         while(treeNode){
-                            if (treeNode.scopeRef && $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(treeNode.scopeRef)) {
+                            if (treeNode.scopeRef && treeNode.scopeRef.current && $9bf71ea28793e738$export$d06fae2ee68b101e.getTreeNode(treeNode.scopeRef)) {
                                 $9bf71ea28793e738$var$focusFirstInScope(treeNode.scopeRef.current, true);
                                 return;
                             }
@@ -592,7 +613,7 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
     return {
         focusNext (opts = {}) {
             let root = ref.current;
-            if (!root) return;
+            if (!root) return null;
             let { from: from, tabbable: tabbable = defaultOptions.tabbable, wrap: wrap = defaultOptions.wrap, accept: accept = defaultOptions.accept } = opts;
             let node = from || document.activeElement;
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, {
@@ -610,7 +631,7 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
         },
         focusPrevious (opts = defaultOptions) {
             let root = ref.current;
-            if (!root) return;
+            if (!root) return null;
             let { from: from, tabbable: tabbable = defaultOptions.tabbable, wrap: wrap = defaultOptions.wrap, accept: accept = defaultOptions.accept } = opts;
             let node = from || document.activeElement;
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, {
@@ -621,19 +642,22 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
             else {
                 let next = $9bf71ea28793e738$var$last(walker);
                 if (next) $9bf71ea28793e738$var$focusElement(next, true);
-                return next;
+                return next !== null && next !== void 0 ? next : null;
             }
             let previousNode = walker.previousNode();
             if (!previousNode && wrap) {
                 walker.currentNode = root;
-                previousNode = $9bf71ea28793e738$var$last(walker);
+                let lastNode = $9bf71ea28793e738$var$last(walker);
+                if (!lastNode) // couldn't wrap
+                return null;
+                previousNode = lastNode;
             }
             if (previousNode) $9bf71ea28793e738$var$focusElement(previousNode, true);
-            return previousNode;
+            return previousNode !== null && previousNode !== void 0 ? previousNode : null;
         },
         focusFirst (opts = defaultOptions) {
             let root = ref.current;
-            if (!root) return;
+            if (!root) return null;
             let { tabbable: tabbable = defaultOptions.tabbable, accept: accept = defaultOptions.accept } = opts;
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, {
                 tabbable: tabbable,
@@ -645,7 +669,7 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
         },
         focusLast (opts = defaultOptions) {
             let root = ref.current;
-            if (!root) return;
+            if (!root) return null;
             let { tabbable: tabbable = defaultOptions.tabbable, accept: accept = defaultOptions.accept } = opts;
             let walker = $9bf71ea28793e738$export$2d6ec8fc375ceafa(root, {
                 tabbable: tabbable,
@@ -653,12 +677,12 @@ function $9bf71ea28793e738$export$c5251b9e124bf29(ref, defaultOptions = {}) {
             });
             let next = $9bf71ea28793e738$var$last(walker);
             if (next) $9bf71ea28793e738$var$focusElement(next, true);
-            return next;
+            return next !== null && next !== void 0 ? next : null;
         }
     };
 }
 function $9bf71ea28793e738$var$last(walker) {
-    let next;
+    let next = undefined;
     let last;
     do {
         last = walker.lastChild();
@@ -675,6 +699,7 @@ class $9bf71ea28793e738$var$Tree {
     }
     addTreeNode(scopeRef, parent, nodeToRestore) {
         let parentNode = this.fastMap.get(parent !== null && parent !== void 0 ? parent : null);
+        if (!parentNode) return;
         let node = new $9bf71ea28793e738$var$TreeNode({
             scopeRef: scopeRef
         });
@@ -690,13 +715,16 @@ class $9bf71ea28793e738$var$Tree {
         // never remove the root
         if (scopeRef === null) return;
         let node = this.fastMap.get(scopeRef);
+        if (!node) return;
         let parentNode = node.parent;
         // when we remove a scope, check if any sibling scopes are trying to restore focus to something inside the scope we're removing
         // if we are, then replace the siblings restore with the restore from the scope we're removing
-        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;
+        for (let current of this.traverse())if (current !== node && node.nodeToRestore && current.nodeToRestore && node.scopeRef && node.scopeRef.current && $9bf71ea28793e738$var$isElementInScope(current.nodeToRestore, node.scopeRef.current)) current.nodeToRestore = node.nodeToRestore;
         let children = node.children;
-        parentNode.removeChild(node);
-        if (children.size > 0) children.forEach((child)=>parentNode.addChild(child));
+        if (parentNode) {
+            parentNode.removeChild(node);
+            if (children.size > 0) children.forEach((child)=>parentNode && parentNode.addChild(child));
+        }
         this.fastMap.delete(node.scopeRef);
     }
     // Pre Order Depth First
@@ -705,8 +733,10 @@ class $9bf71ea28793e738$var$Tree {
         if (node.children.size > 0) for (let child of node.children)yield* this.traverse(child);
     }
     clone() {
+        var _node_parent;
         let newTree = new $9bf71ea28793e738$var$Tree();
-        for (let node of this.traverse())newTree.addTreeNode(node.scopeRef, node.parent.scopeRef, node.nodeToRestore);
+        var _node_parent_scopeRef;
+        for (let node of this.traverse())newTree.addTreeNode(node.scopeRef, (_node_parent_scopeRef = (_node_parent = node.parent) === null || _node_parent === void 0 ? void 0 : _node_parent.scopeRef) !== null && _node_parent_scopeRef !== void 0 ? _node_parent_scopeRef : null, node.nodeToRestore);
         return newTree;
     }
     constructor(){
@@ -828,9 +858,10 @@ function $e6afbd83fe6ebbd2$var$useFocusableContext(ref) {
  * Provides DOM props to the nearest focusable child.
  */ function $e6afbd83fe6ebbd2$var$FocusableProvider(props, ref) {
     let { children: children, ...otherProps } = props;
+    let objRef = (0, $6nfFC$useObjectRef)(ref);
     let context = {
         ...otherProps,
-        ref: ref
+        ref: objRef
     };
     return /*#__PURE__*/ (0, $6nfFC$react).createElement($e6afbd83fe6ebbd2$var$FocusableContext.Provider, {
         value: context