@new-black/lyra 0.1.16 → 0.1.19

package/dist/lyra62.js

@@ -1,138 +1,139 @@
-import N, { useRef as x, useState as k, useCallback as I, useContext as D, useMemo as L, useEffect as M } from "react";
-import { useLayoutEffect as E, mergeProps as K, runAfterTransition as q, focusWithoutScrolling as V, useSyncRef as G } from "./lyra61.js";
-import { isFocusVisible as U, useFocusVisibleListener as J, useFocus as W, useFocusWithin as Y, useKeyboard as Q, getInteractionModality as X } from "./lyra63.js";
+import T, { useRef as x, useState as _, useCallback as I, useContext as W, useMemo as R, useEffect as P } from "react";
+import { useLayoutEffect as E, useObjectRef as G, mergeProps as K, runAfterTransition as U, focusWithoutScrolling as V, useSyncRef as J } from "./lyra61.js";
+import { isFocusVisible as Y, useFocusVisibleListener as Q, useFocus as j, useFocusWithin as X, useKeyboard as Z, getInteractionModality as O } from "./lyra63.js";
 function B(t) {
-  if (X() === "virtual") {
+  if (O() === "virtual") {
     let e = document.activeElement;
-    q(() => {
+    U(() => {
       document.activeElement === e && document.contains(t) && V(t);
     });
   } else
     V(t);
 }
-function Z(t) {
+function ee(t) {
   if (!(t instanceof HTMLElement) && !(t instanceof SVGElement))
     return !1;
   let { display: e, visibility: r } = t.style, n = e !== "none" && r !== "hidden" && r !== "collapse";
   if (n) {
-    const { getComputedStyle: c } = t.ownerDocument.defaultView;
-    let { display: o, visibility: a } = c(t);
-    n = o !== "none" && a !== "hidden" && a !== "collapse";
+    const { getComputedStyle: o } = t.ownerDocument.defaultView;
+    let { display: a, visibility: c } = o(t);
+    n = a !== "none" && c !== "hidden" && c !== "collapse";
   }
   return n;
 }
-function O(t, e) {
+function te(t, e) {
   return !t.hasAttribute("hidden") && (t.nodeName === "DETAILS" && e && e.nodeName !== "SUMMARY" ? t.hasAttribute("open") : !0);
 }
 function z(t, e) {
-  return t.nodeName !== "#comment" && Z(t) && O(t, e) && (!t.parentElement || z(t.parentElement, t));
+  return t.nodeName !== "#comment" && ee(t) && te(t, e) && (!t.parentElement || z(t.parentElement, t));
 }
-const _ = /* @__PURE__ */ N.createContext(null);
-let d = null;
-function be(t) {
-  let { children: e, contain: r, restoreFocus: n, autoFocus: c } = t, o = x(), a = x(), i = x([]), { parentNode: u } = D(_) || {}, l = L(() => new P({
-    scopeRef: i
+const D = /* @__PURE__ */ T.createContext(null);
+let v = null;
+function $e(t) {
+  let { children: e, contain: r, restoreFocus: n, autoFocus: o } = t, a = x(null), c = x(null), l = x([]), { parentNode: u } = W(D) || {}, i = R(() => new k({
+    scopeRef: l
   }), [
-    i
+    l
   ]);
   E(() => {
-    let f = u || b.root;
-    if (b.getTreeNode(f.scopeRef) && d && !w(d, f.scopeRef)) {
-      let p = b.getTreeNode(d);
-      p && (f = p);
+    let s = u || $.root;
+    if ($.getTreeNode(s.scopeRef) && v && !w(v, s.scopeRef)) {
+      let b = $.getTreeNode(v);
+      b && (s = b);
     }
-    f.addChild(l), b.addNode(l);
+    s.addChild(i), $.addNode(i);
   }, [
-    l,
+    i,
     u
   ]), E(() => {
-    let f = b.getTreeNode(i);
-    f.contain = r;
+    let s = $.getTreeNode(l);
+    s && (s.contain = !!r);
   }, [
     r
   ]), E(() => {
-    let f = o.current.nextSibling, p = [];
-    for (; f && f !== a.current; )
-      p.push(f), f = f.nextSibling;
-    i.current = p;
+    var s;
+    let b = (s = a.current) === null || s === void 0 ? void 0 : s.nextSibling, N = [];
+    for (; b && b !== c.current; )
+      N.push(b), b = b.nextSibling;
+    l.current = N;
   }, [
     e
-  ]), ae(i, n, r), ne(i, r), ie(i, n, r), oe(i, c), M(() => {
-    if (i) {
-      let f = document.activeElement, p = null;
-      if ($(f, i.current)) {
-        for (let F of b.traverse())
-          $(f, F.scopeRef.current) && (p = F);
-        p === b.getTreeNode(i) && (d = p.scopeRef);
-      }
-      return () => {
-        let F = b.getTreeNode(i).parent.scopeRef;
-        (i === d || w(i, d)) && (!F || b.getTreeNode(F)) && (d = F), b.removeTreeNode(i);
-      };
+  ]), ie(l, n, r), ae(l, r), ce(l, n, r), le(l, o), P(() => {
+    let s = document.activeElement, b = null;
+    if (p(s, l.current)) {
+      for (let N of $.traverse())
+        N.scopeRef && p(s, N.scopeRef.current) && (b = N);
+      b === $.getTreeNode(l) && (v = b.scopeRef);
     }
   }, [
-    i
+    l
+  ]), E(() => () => {
+    var s, b, N;
+    let L = (N = (b = $.getTreeNode(l)) === null || b === void 0 || (s = b.parent) === null || s === void 0 ? void 0 : s.scopeRef) !== null && N !== void 0 ? N : null;
+    (l === v || w(l, v)) && (!L || $.getTreeNode(L)) && (v = L), $.removeTreeNode(l);
+  }, [
+    l
   ]);
-  let s = L(() => ee(i), []), v = L(() => ({
-    focusManager: s,
-    parentNode: l
+  let d = R(() => re(l), []), f = R(() => ({
+    focusManager: d,
+    parentNode: i
   }), [
-    l,
-    s
+    i,
+    d
   ]);
-  return /* @__PURE__ */ N.createElement(_.Provider, {
-    value: v
-  }, /* @__PURE__ */ N.createElement("span", {
+  return /* @__PURE__ */ T.createElement(D.Provider, {
+    value: f
+  }, /* @__PURE__ */ T.createElement("span", {
     "data-focus-scope-start": !0,
     hidden: !0,
-    ref: o
-  }), e, /* @__PURE__ */ N.createElement("span", {
+    ref: a
+  }), e, /* @__PURE__ */ T.createElement("span", {
     "data-focus-scope-end": !0,
     hidden: !0,
-    ref: a
+    ref: c
   }));
 }
-function ee(t) {
+function re(t) {
   return {
     focusNext(e = {}) {
-      let r = t.current, { from: n, tabbable: c, wrap: o, accept: a } = e, i = n || document.activeElement, u = r[0].previousElementSibling, l = h(T(r), {
-        tabbable: c,
-        accept: a
+      let r = t.current, { from: n, tabbable: o, wrap: a, accept: c } = e, l = n || document.activeElement, u = r[0].previousElementSibling, i = F(r), d = h(i, {
+        tabbable: o,
+        accept: c
       }, r);
-      l.currentNode = $(i, r) ? i : u;
-      let s = l.nextNode();
-      return !s && o && (l.currentNode = u, s = l.nextNode()), s && m(s, !0), s;
+      d.currentNode = p(l, r) ? l : u;
+      let f = d.nextNode();
+      return !f && a && (d.currentNode = u, f = d.nextNode()), f && m(f, !0), f;
     },
     focusPrevious(e = {}) {
-      let r = t.current, { from: n, tabbable: c, wrap: o, accept: a } = e, i = n || document.activeElement, u = r[r.length - 1].nextElementSibling, l = h(T(r), {
-        tabbable: c,
-        accept: a
+      let r = t.current, { from: n, tabbable: o, wrap: a, accept: c } = e, l = n || document.activeElement, u = r[r.length - 1].nextElementSibling, i = F(r), d = h(i, {
+        tabbable: o,
+        accept: c
       }, r);
-      l.currentNode = $(i, r) ? i : u;
-      let s = l.previousNode();
-      return !s && o && (l.currentNode = u, s = l.previousNode()), s && m(s, !0), s;
+      d.currentNode = p(l, r) ? l : u;
+      let f = d.previousNode();
+      return !f && a && (d.currentNode = u, f = d.previousNode()), f && m(f, !0), f;
     },
     focusFirst(e = {}) {
-      let r = t.current, { tabbable: n, accept: c } = e, o = h(T(r), {
+      let r = t.current, { tabbable: n, accept: o } = e, a = F(r), c = h(a, {
         tabbable: n,
-        accept: c
+        accept: o
       }, r);
-      o.currentNode = r[0].previousElementSibling;
-      let a = o.nextNode();
-      return a && m(a, !0), a;
+      c.currentNode = r[0].previousElementSibling;
+      let l = c.nextNode();
+      return l && m(l, !0), l;
     },
     focusLast(e = {}) {
-      let r = t.current, { tabbable: n, accept: c } = e, o = h(T(r), {
+      let r = t.current, { tabbable: n, accept: o } = e, a = F(r), c = h(a, {
         tabbable: n,
-        accept: c
+        accept: o
       }, r);
-      o.currentNode = r[r.length - 1].nextElementSibling;
-      let a = o.previousNode();
-      return a && m(a, !0), a;
+      c.currentNode = r[r.length - 1].nextElementSibling;
+      let l = c.previousNode();
+      return l && m(l, !0), l;
     }
   };
 }
-const A = [
+const M = [
   "input:not([disabled]):not([type=hidden])",
   "select:not([disabled])",
   "textarea:not([disabled])",
@@ -146,14 +147,14 @@ const A = [
   "audio[controls]",
   "video[controls]",
   "[contenteditable]"
-], te = A.join(":not([hidden]),") + ",[tabindex]:not([disabled]):not([hidden])";
-A.push('[tabindex]:not([tabindex="-1"]):not([disabled])');
-const re = A.join(':not([hidden]):not([tabindex="-1"]),');
-function T(t) {
+], ne = M.join(":not([hidden]),") + ",[tabindex]:not([disabled]):not([hidden])";
+M.push('[tabindex]:not([tabindex="-1"]):not([disabled])');
+const oe = M.join(':not([hidden]):not([tabindex="-1"]),');
+function F(t) {
   return t[0].parentElement;
 }
 function g(t) {
-  let e = b.getTreeNode(d);
+  let e = $.getTreeNode(v);
   for (; e && e.scopeRef !== t; ) {
     if (e.contain)
       return !1;
@@ -161,35 +162,42 @@ function g(t) {
   }
   return !0;
 }
-function ne(t, e) {
-  let r = x(), n = x(null);
+function ae(t, e) {
+  let r = x(), n = x();
   E(() => {
-    let c = t.current;
+    let o = t.current;
     if (!e) {
-      n.current && (cancelAnimationFrame(n.current), n.current = null);
+      n.current && (cancelAnimationFrame(n.current), n.current = void 0);
       return;
     }
-    let o = (u) => {
+    let a = (u) => {
       if (u.key !== "Tab" || u.altKey || u.ctrlKey || u.metaKey || !g(t))
         return;
-      let l = document.activeElement, s = t.current;
-      if (!$(l, s))
+      let i = document.activeElement, d = t.current;
+      if (!d || !p(i, d))
         return;
-      let v = h(T(s), {
+      let f = F(d), s = h(f, {
         tabbable: !0
-      }, s);
-      v.currentNode = l;
-      let f = u.shiftKey ? v.previousNode() : v.nextNode();
-      f || (v.currentNode = u.shiftKey ? s[s.length - 1].nextElementSibling : s[0].previousElementSibling, f = u.shiftKey ? v.previousNode() : v.nextNode()), u.preventDefault(), f && m(f, !0);
-    }, a = (u) => {
-      (!d || w(d, t)) && $(u.target, t.current) ? (d = t, r.current = u.target) : g(t) && !y(u.target, t) ? r.current ? r.current.focus() : d && S(d.current) : g(t) && (r.current = u.target);
-    }, i = (u) => {
+      }, d);
+      if (!i)
+        return;
+      s.currentNode = i;
+      let b = u.shiftKey ? s.previousNode() : s.nextNode();
+      b || (s.currentNode = u.shiftKey ? d[d.length - 1].nextElementSibling : d[0].previousElementSibling, b = u.shiftKey ? s.previousNode() : s.nextNode()), u.preventDefault(), b && m(b, !0);
+    }, c = (u) => {
+      (!v || w(v, t)) && p(u.target, t.current) ? (v = t, r.current = u.target) : g(t) && !y(u.target, t) ? r.current ? r.current.focus() : v && v.current && S(v.current) : g(t) && (r.current = u.target);
+    }, l = (u) => {
       n.current && cancelAnimationFrame(n.current), n.current = requestAnimationFrame(() => {
-        g(t) && !y(document.activeElement, t) && (d = t, document.body.contains(u.target) ? (r.current = u.target, r.current.focus()) : d && S(d.current));
+        if (document.activeElement && g(t) && !y(document.activeElement, t))
+          if (v = t, document.body.contains(u.target)) {
+            var i;
+            r.current = u.target, (i = r.current) === null || i === void 0 || i.focus();
+          } else
+            v.current && S(v.current);
       });
     };
-    return document.addEventListener("keydown", o, !1), document.addEventListener("focusin", a, !1), c.forEach((u) => u.addEventListener("focusin", a, !1)), c.forEach((u) => u.addEventListener("focusout", i, !1)), () => {
-      document.removeEventListener("keydown", o, !1), document.removeEventListener("focusin", a, !1), c.forEach((u) => u.removeEventListener("focusin", a, !1)), c.forEach((u) => u.removeEventListener("focusout", i, !1));
+    return document.addEventListener("keydown", a, !1), document.addEventListener("focusin", c, !1), o == null || o.forEach((u) => u.addEventListener("focusin", c, !1)), o == null || o.forEach((u) => u.addEventListener("focusout", l, !1)), () => {
+      document.removeEventListener("keydown", a, !1), document.removeEventListener("focusin", c, !1), o == null || o.forEach((u) => u.removeEventListener("focusin", c, !1)), o == null || o.forEach((u) => u.removeEventListener("focusout", l, !1));
     };
   }, [
     t,
@@ -203,23 +211,23 @@ function ne(t, e) {
 function H(t) {
   return y(t);
 }
-function $(t, e) {
-  return e.some((r) => r.contains(t));
+function p(t, e) {
+  return !t || !e ? !1 : e.some((r) => r.contains(t));
 }
 function y(t, e = null) {
   if (t instanceof Element && t.closest("[data-react-aria-top-layer]"))
     return !0;
-  for (let { scopeRef: r } of b.traverse(b.getTreeNode(e)))
-    if ($(t, r.current))
+  for (let { scopeRef: r } of $.traverse($.getTreeNode(e)))
+    if (r && p(t, r.current))
       return !0;
   return !1;
 }
-function $e(t) {
-  return y(t, d);
+function pe(t) {
+  return y(t, v);
 }
 function w(t, e) {
   var r;
-  let n = (r = b.getTreeNode(e)) === null || r === void 0 ? void 0 : r.parent;
+  let n = (r = $.getTreeNode(e)) === null || r === void 0 ? void 0 : r.parent;
   for (; n; ) {
     if (n.scopeRef === t)
       return !0;
@@ -240,33 +248,33 @@ function m(t, e = !1) {
     }
 }
 function S(t, e = !0) {
-  let r = t[0].previousElementSibling, n = h(T(t), {
+  let r = t[0].previousElementSibling, n = F(t), o = h(n, {
     tabbable: e
   }, t);
-  n.currentNode = r;
-  let c = n.nextNode();
-  e && !c && (n = h(T(t), {
+  o.currentNode = r;
+  let a = o.nextNode();
+  e && !a && (n = F(t), o = h(n, {
     tabbable: !1
-  }, t), n.currentNode = r, c = n.nextNode()), m(c);
+  }, t), o.currentNode = r, a = o.nextNode()), m(a);
 }
-function oe(t, e) {
-  const r = N.useRef(e);
-  M(() => {
-    r.current && (d = t, $(document.activeElement, d.current) || S(t.current)), r.current = !1;
+function le(t, e) {
+  const r = T.useRef(e);
+  P(() => {
+    r.current && (v = t, !p(document.activeElement, v.current) && t.current && S(t.current)), r.current = !1;
   }, [
     t
   ]);
 }
-function ae(t, e, r) {
+function ie(t, e, r) {
   E(() => {
     if (e || r)
       return;
-    let n = t.current, c = (o) => {
-      let a = o.target;
-      $(a, t.current) ? d = t : H(a) || (d = null);
+    let n = t.current, o = (a) => {
+      let c = a.target;
+      p(c, t.current) ? v = t : H(c) || (v = null);
     };
-    return document.addEventListener("focusin", c, !1), n.forEach((o) => o.addEventListener("focusin", c, !1)), () => {
-      document.removeEventListener("focusin", c, !1), n.forEach((o) => o.removeEventListener("focusin", c, !1));
+    return document.addEventListener("focusin", o, !1), n == null || n.forEach((a) => a.addEventListener("focusin", o, !1)), () => {
+      document.removeEventListener("focusin", o, !1), n == null || n.forEach((a) => a.removeEventListener("focusin", o, !1));
     };
   }, [
     t,
@@ -274,8 +282,8 @@ function ae(t, e, r) {
     r
   ]);
 }
-function ce(t) {
-  let e = b.getTreeNode(d);
+function ue(t) {
+  let e = $.getTreeNode(v);
   for (; e && e.scopeRef !== t; ) {
     if (e.nodeToRestore)
       return !1;
@@ -283,17 +291,17 @@ function ce(t) {
   }
   return (e == null ? void 0 : e.scopeRef) === t;
 }
-function ie(t, e, r) {
+function ce(t, e, r) {
   const n = x(typeof document < "u" ? document.activeElement : null);
   E(() => {
-    let c = t.current;
+    let o = t.current;
     if (!e || r)
       return;
-    let o = () => {
-      (!d || w(d, t)) && $(document.activeElement, t.current) && (d = t);
+    let a = () => {
+      (!v || w(v, t)) && p(document.activeElement, t.current) && (v = t);
     };
-    return document.addEventListener("focusin", o, !1), c.forEach((a) => a.addEventListener("focusin", o, !1)), () => {
-      document.removeEventListener("focusin", o, !1), c.forEach((a) => a.removeEventListener("focusin", o, !1));
+    return document.addEventListener("focusin", a, !1), o == null || o.forEach((c) => c.addEventListener("focusin", a, !1)), () => {
+      document.removeEventListener("focusin", a, !1), o == null || o.forEach((c) => c.removeEventListener("focusin", a, !1));
     };
   }, [
     t,
@@ -301,124 +309,142 @@ function ie(t, e, r) {
   ]), E(() => {
     if (!e)
       return;
-    let c = (o) => {
-      if (o.key !== "Tab" || o.altKey || o.ctrlKey || o.metaKey || !g(t))
+    let o = (a) => {
+      if (a.key !== "Tab" || a.altKey || a.ctrlKey || a.metaKey || !g(t))
+        return;
+      let c = document.activeElement;
+      if (!p(c, t.current))
         return;
-      let a = document.activeElement;
-      if (!$(a, t.current))
+      let l = $.getTreeNode(t);
+      if (!l)
         return;
-      let i = b.getTreeNode(t).nodeToRestore, u = h(document.body, {
+      let u = l.nodeToRestore, i = h(document.body, {
         tabbable: !0
       });
-      u.currentNode = a;
-      let l = o.shiftKey ? u.previousNode() : u.nextNode();
-      if ((!document.body.contains(i) || i === document.body) && (i = null, b.getTreeNode(t).nodeToRestore = null), (!l || !$(l, t.current)) && i) {
-        u.currentNode = i;
+      i.currentNode = c;
+      let d = a.shiftKey ? i.previousNode() : i.nextNode();
+      if ((!u || !document.body.contains(u) || u === document.body) && (u = void 0, l.nodeToRestore = void 0), (!d || !p(d, t.current)) && u) {
+        i.currentNode = u;
         do
-          l = o.shiftKey ? u.previousNode() : u.nextNode();
-        while ($(l, t.current));
-        o.preventDefault(), o.stopPropagation(), l ? m(l, !0) : H(i) ? m(i, !0) : a.blur();
+          d = a.shiftKey ? i.previousNode() : i.nextNode();
+        while (p(d, t.current));
+        a.preventDefault(), a.stopPropagation(), d ? m(d, !0) : H(u) ? m(u, !0) : c.blur();
       }
     };
-    return r || document.addEventListener("keydown", c, !0), () => {
-      r || document.removeEventListener("keydown", c, !0);
+    return r || document.addEventListener("keydown", o, !0), () => {
+      r || document.removeEventListener("keydown", o, !0);
     };
   }, [
     t,
     e,
     r
   ]), E(() => {
-    if (e)
-      return b.getTreeNode(t).nodeToRestore = n.current, () => {
-        let c = b.getTreeNode(t).nodeToRestore;
-        if (e && c && // eslint-disable-next-line react-hooks/exhaustive-deps
-        ($(document.activeElement, t.current) || document.activeElement === document.body && ce(t))) {
-          let o = b.clone();
+    if (!e)
+      return;
+    let o = $.getTreeNode(t);
+    if (o) {
+      var a;
+      return o.nodeToRestore = (a = n.current) !== null && a !== void 0 ? a : void 0, () => {
+        let c = $.getTreeNode(t);
+        if (!c)
+          return;
+        let l = c.nodeToRestore;
+        if (e && l && // eslint-disable-next-line react-hooks/exhaustive-deps
+        (p(document.activeElement, t.current) || document.activeElement === document.body && ue(t))) {
+          let u = $.clone();
           requestAnimationFrame(() => {
             if (document.activeElement === document.body) {
-              let a = o.getTreeNode(t);
-              for (; a; ) {
-                if (a.nodeToRestore && document.body.contains(a.nodeToRestore)) {
-                  m(a.nodeToRestore);
+              let i = u.getTreeNode(t);
+              for (; i; ) {
+                if (i.nodeToRestore && document.body.contains(i.nodeToRestore)) {
+                  m(i.nodeToRestore);
                   return;
                 }
-                a = a.parent;
+                i = i.parent;
               }
-              for (a = o.getTreeNode(t); a; ) {
-                if (a.scopeRef && b.getTreeNode(a.scopeRef)) {
-                  S(a.scopeRef.current, !0);
+              for (i = u.getTreeNode(t); i; ) {
+                if (i.scopeRef && i.scopeRef.current && $.getTreeNode(i.scopeRef)) {
+                  S(i.scopeRef.current, !0);
                   return;
                 }
-                a = a.parent;
+                i = i.parent;
               }
             }
           });
         }
       };
+    }
   }, [
     t,
     e
   ]);
 }
 function h(t, e, r) {
-  let n = e != null && e.tabbable ? re : te, c = document.createTreeWalker(t, NodeFilter.SHOW_ELEMENT, {
-    acceptNode(o) {
-      var a;
-      return !(e == null || (a = e.from) === null || a === void 0) && a.contains(o) ? NodeFilter.FILTER_REJECT : o.matches(n) && z(o) && (!r || $(o, r)) && (!(e != null && e.accept) || e.accept(o)) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
+  let n = e != null && e.tabbable ? oe : ne, o = document.createTreeWalker(t, NodeFilter.SHOW_ELEMENT, {
+    acceptNode(a) {
+      var c;
+      return !(e == null || (c = e.from) === null || c === void 0) && c.contains(a) ? NodeFilter.FILTER_REJECT : a.matches(n) && z(a) && (!r || p(a, r)) && (!(e != null && e.accept) || e.accept(a)) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
     }
   });
-  return e != null && e.from && (c.currentNode = e.from), c;
+  return e != null && e.from && (o.currentNode = e.from), o;
 }
-function ve(t, e = {}) {
+function me(t, e = {}) {
   return {
     focusNext(r = {}) {
       let n = t.current;
       if (!n)
-        return;
-      let { from: c, tabbable: o = e.tabbable, wrap: a = e.wrap, accept: i = e.accept } = r, u = c || document.activeElement, l = h(n, {
-        tabbable: o,
-        accept: i
+        return null;
+      let { from: o, tabbable: a = e.tabbable, wrap: c = e.wrap, accept: l = e.accept } = r, u = o || document.activeElement, i = h(n, {
+        tabbable: a,
+        accept: l
       });
-      n.contains(u) && (l.currentNode = u);
-      let s = l.nextNode();
-      return !s && a && (l.currentNode = n, s = l.nextNode()), s && m(s, !0), s;
+      n.contains(u) && (i.currentNode = u);
+      let d = i.nextNode();
+      return !d && c && (i.currentNode = n, d = i.nextNode()), d && m(d, !0), d;
     },
     focusPrevious(r = e) {
       let n = t.current;
       if (!n)
-        return;
-      let { from: c, tabbable: o = e.tabbable, wrap: a = e.wrap, accept: i = e.accept } = r, u = c || document.activeElement, l = h(n, {
-        tabbable: o,
-        accept: i
+        return null;
+      let { from: o, tabbable: a = e.tabbable, wrap: c = e.wrap, accept: l = e.accept } = r, u = o || document.activeElement, i = h(n, {
+        tabbable: a,
+        accept: l
       });
       if (n.contains(u))
-        l.currentNode = u;
+        i.currentNode = u;
       else {
-        let v = C(l);
-        return v && m(v, !0), v;
+        let f = C(i);
+        return f && m(f, !0), f ?? null;
+      }
+      let d = i.previousNode();
+      if (!d && c) {
+        i.currentNode = n;
+        let f = C(i);
+        if (!f)
+          return null;
+        d = f;
       }
-      let s = l.previousNode();
-      return !s && a && (l.currentNode = n, s = C(l)), s && m(s, !0), s;
+      return d && m(d, !0), d ?? null;
     },
     focusFirst(r = e) {
       let n = t.current;
       if (!n)
-        return;
-      let { tabbable: c = e.tabbable, accept: o = e.accept } = r, i = h(n, {
-        tabbable: c,
-        accept: o
+        return null;
+      let { tabbable: o = e.tabbable, accept: a = e.accept } = r, l = h(n, {
+        tabbable: o,
+        accept: a
       }).nextNode();
-      return i && m(i, !0), i;
+      return l && m(l, !0), l;
     },
     focusLast(r = e) {
       let n = t.current;
       if (!n)
-        return;
-      let { tabbable: c = e.tabbable, accept: o = e.accept } = r, a = h(n, {
-        tabbable: c,
-        accept: o
-      }), i = C(a);
-      return i && m(i, !0), i;
+        return null;
+      let { tabbable: o = e.tabbable, accept: a = e.accept } = r, c = h(n, {
+        tabbable: o,
+        accept: a
+      }), l = C(c);
+      return l && m(l, !0), l ?? null;
     }
   };
 }
@@ -429,7 +455,7 @@ function C(t) {
   while (r);
   return e;
 }
-class R {
+class A {
   get size() {
     return this.fastMap.size;
   }
@@ -437,10 +463,13 @@ class R {
     return this.fastMap.get(e);
   }
   addTreeNode(e, r, n) {
-    let c = this.fastMap.get(r ?? null), o = new P({
+    let o = this.fastMap.get(r ?? null);
+    if (!o)
+      return;
+    let a = new k({
       scopeRef: e
     });
-    c.addChild(o), o.parent = c, this.fastMap.set(e, o), n && (o.nodeToRestore = n);
+    o.addChild(a), a.parent = o, this.fastMap.set(e, a), n && (a.nodeToRestore = n);
   }
   addNode(e) {
     this.fastMap.set(e.scopeRef, e);
@@ -448,11 +477,14 @@ class R {
   removeTreeNode(e) {
     if (e === null)
       return;
-    let r = this.fastMap.get(e), n = r.parent;
-    for (let o of this.traverse())
-      o !== r && r.nodeToRestore && o.nodeToRestore && r.scopeRef.current && $(o.nodeToRestore, r.scopeRef.current) && (o.nodeToRestore = r.nodeToRestore);
-    let c = r.children;
-    n.removeChild(r), c.size > 0 && c.forEach((o) => n.addChild(o)), this.fastMap.delete(r.scopeRef);
+    let r = this.fastMap.get(e);
+    if (!r)
+      return;
+    let n = r.parent;
+    for (let a of this.traverse())
+      a !== r && r.nodeToRestore && a.nodeToRestore && r.scopeRef && r.scopeRef.current && p(a.nodeToRestore, r.scopeRef.current) && (a.nodeToRestore = r.nodeToRestore);
+    let o = r.children;
+    n && (n.removeChild(r), o.size > 0 && o.forEach((a) => n && n.addChild(a))), this.fastMap.delete(r.scopeRef);
   }
   // Pre Order Depth First
   *traverse(e = this.root) {
@@ -461,18 +493,20 @@ class R {
         yield* this.traverse(r);
   }
   clone() {
-    let e = new R();
-    for (let r of this.traverse())
-      e.addTreeNode(r.scopeRef, r.parent.scopeRef, r.nodeToRestore);
-    return e;
+    var e;
+    let r = new A();
+    var n;
+    for (let o of this.traverse())
+      r.addTreeNode(o.scopeRef, (n = (e = o.parent) === null || e === void 0 ? void 0 : e.scopeRef) !== null && n !== void 0 ? n : null, o.nodeToRestore);
+    return r;
   }
   constructor() {
-    this.fastMap = /* @__PURE__ */ new Map(), this.root = new P({
+    this.fastMap = /* @__PURE__ */ new Map(), this.root = new k({
       scopeRef: null
     }), this.fastMap.set(null, this.root);
   }
 }
-class P {
+class k {
   addChild(e) {
     this.children.add(e), e.parent = this;
   }
@@ -483,79 +517,79 @@ class P {
     this.children = /* @__PURE__ */ new Set(), this.contain = !1, this.scopeRef = e.scopeRef;
   }
 }
-let b = new R();
-function pe(t = {}) {
-  let { autoFocus: e = !1, isTextInput: r, within: n } = t, c = x({
+let $ = new A();
+function he(t = {}) {
+  let { autoFocus: e = !1, isTextInput: r, within: n } = t, o = x({
     isFocused: !1,
-    isFocusVisible: e || U()
-  }), [o, a] = k(!1), [i, u] = k(() => c.current.isFocused && c.current.isFocusVisible), l = I(() => u(c.current.isFocused && c.current.isFocusVisible), []), s = I((p) => {
-    c.current.isFocused = p, a(p), l();
+    isFocusVisible: e || Y()
+  }), [a, c] = _(!1), [l, u] = _(() => o.current.isFocused && o.current.isFocusVisible), i = I(() => u(o.current.isFocused && o.current.isFocusVisible), []), d = I((b) => {
+    o.current.isFocused = b, c(b), i();
   }, [
-    l
+    i
   ]);
-  J((p) => {
-    c.current.isFocusVisible = p, l();
+  Q((b) => {
+    o.current.isFocusVisible = b, i();
   }, [], {
     isTextInput: r
   });
-  let { focusProps: v } = W({
+  let { focusProps: f } = j({
     isDisabled: n,
-    onFocusChange: s
-  }), { focusWithinProps: f } = Y({
+    onFocusChange: d
+  }), { focusWithinProps: s } = X({
     isDisabled: !n,
-    onFocusWithinChange: s
+    onFocusWithinChange: d
   });
   return {
-    isFocused: o,
-    isFocusVisible: i,
-    focusProps: n ? f : v
+    isFocused: a,
+    isFocusVisible: l,
+    focusProps: n ? s : f
   };
 }
-let j = /* @__PURE__ */ N.createContext(null);
-function ue(t) {
-  let e = D(j) || {};
-  G(e, t);
+let q = /* @__PURE__ */ T.createContext(null);
+function de(t) {
+  let e = W(q) || {};
+  J(e, t);
   let { ref: r, ...n } = e;
   return n;
 }
-function le(t, e) {
-  let { children: r, ...n } = t, c = {
+function se(t, e) {
+  let { children: r, ...n } = t, o = G(e), a = {
     ...n,
-    ref: e
+    ref: o
   };
-  return /* @__PURE__ */ N.createElement(j.Provider, {
-    value: c
+  return /* @__PURE__ */ T.createElement(q.Provider, {
+    value: a
   }, r);
 }
-let me = /* @__PURE__ */ N.forwardRef(le);
-function he(t, e) {
-  let { focusProps: r } = W(t), { keyboardProps: n } = Q(t), c = K(r, n), o = ue(e), a = t.isDisabled ? {} : o, i = x(t.autoFocus);
-  return M(() => {
-    i.current && e.current && B(e.current), i.current = !1;
+let Ee = /* @__PURE__ */ T.forwardRef(se);
+function Ne(t, e) {
+  let { focusProps: r } = j(t), { keyboardProps: n } = Z(t), o = K(r, n), a = de(e), c = t.isDisabled ? {} : a, l = x(t.autoFocus);
+  return P(() => {
+    l.current && e.current && B(e.current), l.current = !1;
   }, [
     e
   ]), {
     focusableProps: K({
-      ...c,
+      ...o,
       tabIndex: t.excludeFromTabOrder && !t.isDisabled ? -1 : void 0
-    }, a)
+    }, c)
   };
 }
-function Ee(t, e) {
-  let r = e == null ? void 0 : e.isDisabled, [n, c] = k(!1);
+function Te(t, e) {
+  let r = e == null ? void 0 : e.isDisabled, [n, o] = _(!1);
   return E(() => {
     if (t != null && t.current && !r) {
-      let o = () => {
+      let a = () => {
         if (t.current) {
-          let i = h(t.current, {
+          let l = h(t.current, {
             tabbable: !0
           });
-          c(!!i.nextNode());
+          o(!!l.nextNode());
         }
       };
-      o();
-      let a = new MutationObserver(o);
-      return a.observe(t.current, {
+      a();
+      let c = new MutationObserver(a);
+      return c.observe(t.current, {
         subtree: !0,
         childList: !0,
         attributes: !0,
@@ -564,19 +598,19 @@ function Ee(t, e) {
           "disabled"
         ]
       }), () => {
-        a.disconnect();
+        c.disconnect();
       };
     }
   }), r ? !1 : n;
 }
 export {
-  be as FocusScope,
-  me as FocusableProvider,
-  ve as createFocusManager,
+  $e as FocusScope,
+  Ee as FocusableProvider,
+  me as createFocusManager,
   B as focusSafely,
   h as getFocusableTreeWalker,
-  $e as isElementInChildOfActiveScope,
-  pe as useFocusRing,
-  he as useFocusable,
-  Ee as useHasTabbableChild
+  pe as isElementInChildOfActiveScope,
+  he as useFocusRing,
+  Ne as useFocusable,
+  Te as useHasTabbableChild
 };