@react-motion-router/stack 2.0.0-beta.sha-4fafa70 → 2.0.0-beta.sha-7a69b61

package/build/index.js

@@ -1,14 +1,14 @@
-import { NavigationBase as dt, resolveBaseURLFromPattern as ft, includesRoute as ut, ScreenBase as vt, matchRoute as N, RouterBase as gt, cloneAndInject as pt, useNavigationBase as mt, useRouterBase as yt, useRouteBase as wt, useParamsBase as Et } from "@react-motion-router/core";
-import { createRef as Pt, startTransition as U, useDebugValue as C, useEffect as Y, useState as St, useRef as $, useCallback as bt } from "react";
+import { NavigationBase as ht, resolveBaseURLFromPattern as dt, matchRoute as Y, ScreenBase as ft, RouterBase as vt, cloneAndInject as gt, includesRoute as pt, useNavigationBase as mt, useRouterBase as yt, useRouteBase as wt, useParamsBase as Et } from "@react-motion-router/core";
+import { createRef as Pt, startTransition as N, useDebugValue as j, useEffect as C, useState as St, useRef as $, useCallback as bt } from "react";
 import { GestureTimeline as _t, springToLinear as Lt, easingToLinear as A } from "web-animations-extension";
-import { jsx as lt } from "react/jsx-runtime";
+import { jsx as ut } from "react/jsx-runtime";
 var g = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {}, Tt = {}, T = {};
 Object.defineProperty(T, "__esModule", { value: !0 });
 var rt;
 (function(n) {
   n[n.tap = 0] = "tap", n[n.longpress = 1] = "longpress", n[n.pinchstart = 2] = "pinchstart", n[n.pinch = 3] = "pinch", n[n.pinchend = 4] = "pinchend", n[n.rotatestart = 5] = "rotatestart", n[n.rotate = 6] = "rotate", n[n.rotateend = 7] = "rotateend", n[n.swipestart = 8] = "swipestart", n[n.swipe = 9] = "swipe", n[n.swipeend = 10] = "swipeend", n[n.panstart = 11] = "panstart", n[n.pan = 12] = "pan", n[n.panend = 13] = "panend", n[n.doubletap = 14] = "doubletap";
 })(rt || (rt = {}));
-class kt extends TouchEvent {
+class Rt extends TouchEvent {
   constructor(t, e) {
     if (super(t, {
       touches: Array.from(e.touches),
@@ -27,12 +27,12 @@ class kt extends TouchEvent {
     this.gestureTarget = e.touches[0].target, this.x = e.touches[0].clientX, this.y = e.touches[0].clientY;
   }
 }
-T.default = kt;
-var W = {}, Rt = g && g.__importDefault || function(n) {
+T.default = Rt;
+var W = {}, kt = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
 Object.defineProperty(W, "__esModule", { value: !0 });
-const It = Rt(T);
+const It = kt(T);
 class xt extends It.default {
   constructor(t, e) {
     super("longpress", t), this.duration = 0, this.duration = e;
@@ -43,13 +43,13 @@ var q = {}, Ft = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
 Object.defineProperty(q, "__esModule", { value: !0 });
-const Dt = Ft(T);
-class Ot extends Dt.default {
+const Ot = Ft(T);
+class Dt extends Ot.default {
   constructor(t) {
     super("tap", t), this.duration = 0;
   }
 }
-q.default = Ot;
+q.default = Dt;
 var G = {}, Kt = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
@@ -66,12 +66,12 @@ var F = {}, Yt = g && g.__importDefault || function(n) {
 };
 Object.defineProperty(F, "__esModule", { value: !0 });
 F.SwipeEndEvent = F.SwipeStartEvent = void 0;
-const Xt = Yt(T);
+const Ct = Yt(T);
 var st;
 (function(n) {
   n[n.start = 0] = "start", n[n.end = 1] = "end";
 })(st || (st = {}));
-class z extends Xt.default {
+class z extends Ct.default {
   constructor(t, e, r) {
     let s;
     switch (r) {
@@ -87,12 +87,12 @@ class z extends Xt.default {
     super(s, t), this.velocity = e.velocity, this.direction = e.direction;
   }
 }
-class Ct extends z {
+class Xt extends z {
   constructor(t, e) {
     super(t, e);
   }
 }
-F.default = Ct;
+F.default = Xt;
 class jt extends z {
   constructor(t, e) {
     super(t, e, "start");
@@ -105,11 +105,11 @@ class Ht extends z {
   }
 }
 F.SwipeEndEvent = Ht;
-var D = {}, Ut = g && g.__importDefault || function(n) {
+var O = {}, Ut = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
-Object.defineProperty(D, "__esModule", { value: !0 });
-D.PanEndEvent = D.PanStartEvent = void 0;
+Object.defineProperty(O, "__esModule", { value: !0 });
+O.PanEndEvent = O.PanStartEvent = void 0;
 const Nt = Ut(T);
 var it;
 (function(n) {
@@ -143,24 +143,24 @@ class Vt extends Z {
     super(t, e);
   }
 }
-D.default = Vt;
+O.default = Vt;
 class $t extends Z {
   constructor(t, e) {
     super(t, e, "start");
   }
 }
-D.PanStartEvent = $t;
+O.PanStartEvent = $t;
 class At extends Z {
   constructor(t, e) {
     super(t, e, "end");
   }
 }
-D.PanEndEvent = At;
-var O = {}, Wt = g && g.__importDefault || function(n) {
+O.PanEndEvent = At;
+var D = {}, Wt = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
-Object.defineProperty(O, "__esModule", { value: !0 });
-O.PinchEndEvent = O.PinchStartEvent = void 0;
+Object.defineProperty(D, "__esModule", { value: !0 });
+D.PinchEndEvent = D.PinchStartEvent = void 0;
 const qt = Wt(T);
 var at;
 (function(n) {
@@ -190,19 +190,19 @@ class Gt extends J {
     super(t, e);
   }
 }
-O.default = Gt;
+D.default = Gt;
 class zt extends J {
   constructor(t, e) {
     super(t, e, "start");
   }
 }
-O.PinchStartEvent = zt;
+D.PinchStartEvent = zt;
 class Zt extends J {
   constructor(t, e) {
     super(t, e, "end");
   }
 }
-O.PinchEndEvent = Zt;
+D.PinchEndEvent = Zt;
 var K = {}, Jt = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
@@ -255,14 +255,14 @@ class ne extends Q {
   }
 }
 K.RotateEndEvent = ne;
-var k = {};
-Object.defineProperty(k, "__esModule", { value: !0 });
-k.closest = k.Vec2 = k.assert = void 0;
+var R = {};
+Object.defineProperty(R, "__esModule", { value: !0 });
+R.closest = R.Vec2 = R.assert = void 0;
 function re(n, t) {
   if (!n)
     throw new Error(t);
 }
-k.assert = re;
+R.assert = re;
 class se {
   constructor(t, e) {
     this._x = 0, this._y = 0, this._clientX = 0, this._clientY = 0, this._clientX = t, this._clientY = e, this._x = this.translateX(t), this._y = this.translateY(e);
@@ -307,58 +307,58 @@ class se {
     return Math.sqrt(Math.pow(this._clientX, 2) + Math.pow(this._clientY, 2));
   }
 }
-k.Vec2 = se;
+R.Vec2 = se;
 function ie(n, t) {
   return t.reduce((e, r) => {
     let s = Math.abs(e - n), i = Math.abs(r - n);
     return s === i ? e > r ? e : r : i < s ? r : e;
   });
 }
-k.closest = ie;
+R.closest = ie;
 (function(n) {
-  var t = g && g.__createBinding || (Object.create ? function(c, a, l, m) {
-    m === void 0 && (m = l), Object.defineProperty(c, m, { enumerable: !0, get: function() {
-      return a[l];
+  var t = g && g.__createBinding || (Object.create ? function(u, a, h, m) {
+    m === void 0 && (m = h), Object.defineProperty(u, m, { enumerable: !0, get: function() {
+      return a[h];
     } });
-  } : function(c, a, l, m) {
-    m === void 0 && (m = l), c[m] = a[l];
-  }), e = g && g.__setModuleDefault || (Object.create ? function(c, a) {
-    Object.defineProperty(c, "default", { enumerable: !0, value: a });
-  } : function(c, a) {
-    c.default = a;
-  }), r = g && g.__importStar || function(c) {
-    if (c && c.__esModule)
-      return c;
+  } : function(u, a, h, m) {
+    m === void 0 && (m = h), u[m] = a[h];
+  }), e = g && g.__setModuleDefault || (Object.create ? function(u, a) {
+    Object.defineProperty(u, "default", { enumerable: !0, value: a });
+  } : function(u, a) {
+    u.default = a;
+  }), r = g && g.__importStar || function(u) {
+    if (u && u.__esModule)
+      return u;
     var a = {};
-    if (c != null)
-      for (var l in c)
-        l !== "default" && Object.prototype.hasOwnProperty.call(c, l) && t(a, c, l);
-    return e(a, c), a;
-  }, s = g && g.__importDefault || function(c) {
-    return c && c.__esModule ? c : { default: c };
+    if (u != null)
+      for (var h in u)
+        h !== "default" && Object.prototype.hasOwnProperty.call(u, h) && t(a, u, h);
+    return e(a, u), a;
+  }, s = g && g.__importDefault || function(u) {
+    return u && u.__esModule ? u : { default: u };
   };
   Object.defineProperty(n, "__esModule", { value: !0 }), n.RotateEndEvent = n.RotateEvent = n.RotateStartEvent = n.PinchEndEvent = n.PinchEvent = n.PinchStartEvent = n.PanEndEvent = n.PanEvent = n.PanStartEvent = n.SwipeEndEvent = n.SwipeEvent = n.SwipeStartEvent = n.DoubleTapEvent = n.LongPressEvent = n.GestureEvent = n.TapEvent = void 0;
   const i = s(T);
   n.GestureEvent = i.default;
   const o = s(W);
   n.LongPressEvent = o.default;
-  const u = s(q);
-  n.TapEvent = u.default;
-  const h = s(G);
-  n.DoubleTapEvent = h.default;
+  const c = s(q);
+  n.TapEvent = c.default;
+  const l = s(G);
+  n.DoubleTapEvent = l.default;
   const f = r(F);
   n.SwipeEvent = f.default, Object.defineProperty(n, "SwipeEndEvent", { enumerable: !0, get: function() {
     return f.SwipeEndEvent;
   } }), Object.defineProperty(n, "SwipeStartEvent", { enumerable: !0, get: function() {
     return f.SwipeStartEvent;
   } });
-  const d = r(D);
+  const d = r(O);
   n.PanEvent = d.default, Object.defineProperty(n, "PanEndEvent", { enumerable: !0, get: function() {
     return d.PanEndEvent;
   } }), Object.defineProperty(n, "PanStartEvent", { enumerable: !0, get: function() {
     return d.PanStartEvent;
   } });
-  const P = r(O);
+  const P = r(D);
   n.PinchEvent = P.default, Object.defineProperty(n, "PinchEndEvent", { enumerable: !0, get: function() {
     return P.PinchEndEvent;
   } }), Object.defineProperty(n, "PinchStartEvent", { enumerable: !0, get: function() {
@@ -370,10 +370,10 @@ k.closest = ie;
   } }), Object.defineProperty(n, "RotateStartEvent", { enumerable: !0, get: function() {
     return w.RotateStartEvent;
   } });
-  const v = k;
+  const v = R;
   var p;
-  (function(c) {
-    c[c.right = 0] = "right", c[c.up = 1] = "up", c[c.left = 2] = "left", c[c.down = 3] = "down";
+  (function(u) {
+    u[u.right = 0] = "right", u[u.up = 1] = "up", u[u.left = 2] = "left", u[u.down = 3] = "down";
   })(p || (p = {}));
   class y {
     constructor() {
@@ -396,34 +396,34 @@ k.closest = ie;
     onPointerLeave(a) {
       if (!a.touches.length) {
         if (this.isSwiping) {
-          const l = new f.SwipeEndEvent(a, {
+          const h = new f.SwipeEndEvent(a, {
             velocity: this.velocity,
             direction: p[(0, v.closest)(this.octant, [0, 1, 2, 3])]
           });
-          this.dispatchEvent(l), this.isSwiping = !1;
+          this.dispatchEvent(h), this.isSwiping = !1;
         }
         if (this.isPanning) {
-          const l = new d.PanEndEvent(a, {
+          const h = new d.PanEndEvent(a, {
             translation: this.dxDy,
             velocity: this.velocity
           });
-          this.dispatchEvent(l), this.isPanning = !1;
+          this.dispatchEvent(h), this.isPanning = !1;
         }
       }
       if (a.touches.length === 1) {
         if (this.scaleBase = 0, this.isPinching) {
-          const l = new P.PinchEndEvent(a, {
+          const h = new P.PinchEndEvent(a, {
             scale: this.scale
           });
-          this.dispatchEvent(l), this.isPinching = !1;
+          this.dispatchEvent(h), this.isPinching = !1;
         }
         if (this.isRotating) {
-          const l = new w.RotateEndEvent(a, {
+          const h = new w.RotateEndEvent(a, {
             rotation: this.rotation,
             rotationDeg: this.rotationDeg,
             anchor: this.anchor
           });
-          this.dispatchEvent(l), this.isRotating = !1;
+          this.dispatchEvent(h), this.isRotating = !1;
         }
       }
     }
@@ -434,8 +434,8 @@ k.closest = ie;
     }
     onTouchStart(a) {
       this.currentTarget !== a.touches[0].target && (this.clean(), this.unbind(this.currentTarget), this.pointers = this.touchEnd.touches.length, this.taps = 0), this.touchStart = a;
-      const l = parseInt(a.touches[0].target.dataset.minpointers || "0") || this.config.minPointers;
-      if (this.touchStart.touches.length < l) {
+      const h = parseInt(a.touches[0].target.dataset.minpointers || "0") || this.config.minPointers;
+      if (this.touchStart.touches.length < h) {
         this.shouldFire = !1;
         return;
       }
@@ -456,23 +456,23 @@ k.closest = ie;
       if (!this.shouldFire)
         return;
       if (this.touchMoved = !0, this.touchMove = a, a.touches.length > 1 && this.touchStart.touches.length > 1 && (a.touches[1].clientX !== this.touchStart.touches[1].clientX || a.touches[1].clientY !== this.touchStart.touches[1].clientY)) {
-        const _ = new v.Vec2(this.touchMove.touches[0].clientX, this.touchMove.touches[0].clientY), j = new v.Vec2(this.touchMove.touches[1].clientX, this.touchMove.touches[1].clientY), et = new v.Vec2(this.touchStart.touches[0].clientX, this.touchStart.touches[0].clientY), nt = _.substract(j);
+        const _ = new v.Vec2(this.touchMove.touches[0].clientX, this.touchMove.touches[0].clientY), H = new v.Vec2(this.touchMove.touches[1].clientX, this.touchMove.touches[1].clientY), et = new v.Vec2(this.touchStart.touches[0].clientX, this.touchStart.touches[0].clientY), nt = _.substract(H);
         if (this.scaleBase && Math.abs(this.scaleBase - nt.magnitude) > 10) {
           const I = nt.magnitude / this.scaleBase;
           if (this.scale = I, this.isPinching) {
-            const H = new P.default(a, {
+            const U = new P.default(a, {
               scale: I
             });
-            this.dispatchEvent(H);
+            this.dispatchEvent(U);
           } else {
-            const H = new P.PinchStartEvent(a, {
+            const U = new P.PinchStartEvent(a, {
               scale: I
             });
-            this.dispatchEvent(H), this.isPinching = !0;
+            this.dispatchEvent(U), this.isPinching = !0;
           }
         }
         this.anchor = _;
-        let B = Math.atan2(et.clientY - j.clientY, et.clientX - j.clientX);
+        let B = Math.atan2(et.clientY - H.clientY, et.clientX - H.clientX);
         if (B < 0 ? B += 1.5708 : B -= 1.5708, this.rotation = B, this.rotationDeg = B * 180 / Math.PI, this.anchor = this.anchor, this.isRotating) {
           const I = new w.default(a, {
             anchor: this.anchor,
@@ -489,10 +489,10 @@ k.closest = ie;
           this.dispatchEvent(I), this.isRotating = !0;
         }
       }
-      const l = new v.Vec2(this.touchStart.touches[0].clientX, this.touchStart.touches[0].clientY), E = new v.Vec2(this.touchMove.touches[0].clientX, this.touchMove.touches[0].clientY).substract(l), b = E.magnitude, R = {
+      const h = new v.Vec2(this.touchStart.touches[0].clientX, this.touchStart.touches[0].clientY), E = new v.Vec2(this.touchMove.touches[0].clientX, this.touchMove.touches[0].clientY).substract(h), b = E.magnitude, k = {
         x: E.x / b,
         y: E.y / b
-      }, S = Math.atan2(R.y, R.x);
+      }, S = Math.atan2(k.y, k.x);
       this.octant = Math.round(4 * S / (2 * Math.PI) + 4) % 4;
       const X = (a.timeStamp - this.touchStart.timeStamp) / 1e3, M = E.magnitude / X;
       if (this.isSwiping) {
@@ -523,17 +523,17 @@ k.closest = ie;
       }
     }
     onTouchEnd(a) {
-      const l = parseInt(this.currentTarget.dataset.numberoftaps || "0") || this.config.numberOfTaps;
-      if (this.taps++, this.shouldFire = this.taps > l, this.shouldFire) {
+      const h = parseInt(this.currentTarget.dataset.numberoftaps || "0") || this.config.numberOfTaps;
+      if (this.taps++, this.shouldFire = this.taps > h, this.shouldFire) {
         this.touchEnd = a, this.touchEndTime = a.timeStamp;
         const m = parseFloat(this.currentTarget.dataset.tapdelay || "0") || this.config.tapDelay;
         if (!this.touchMoved && !this.isLongPress)
           if (this.taps === 1 || this.touchEndTime - this.lastTouchTime < m) {
-            if (this.taps % 2 === l) {
-              const b = new h.default(a);
+            if (this.taps % 2 === h) {
+              const b = new l.default(a);
               this.dispatchEvent(b), this.taps = 0;
             }
-            const E = new u.default(a);
+            const E = new c.default(a);
             this.dispatchEvent(E);
           } else
             this.taps = 0;
@@ -554,8 +554,8 @@ class ae extends Event {
   signal;
   committed;
   transition;
-  constructor(t, e, r, s, i, o, u) {
-    super("navigate"), this.routerId = t, this.route = e, this.props = r, this.navigationType = s ?? "push", this.signal = i, this.committed = o, this.transition = u;
+  constructor(t, e, r, s, i, o, c) {
+    super("navigate"), this.routerId = t, this.route = e, this.props = r, this.navigationType = s ?? "push", this.signal = i, this.committed = o, this.transition = c;
   }
 }
 class oe extends Event {
@@ -634,7 +634,7 @@ class de {
     return this.#t.getState();
   }
 }
-class fe extends dt {
+class fe extends ht {
   router;
   constructor(t) {
     super(), this.router = t;
@@ -652,15 +652,15 @@ class fe extends dt {
     return window.navigation.reload({ state: t });
   }
   traverseTo(t, e = {}) {
-    const r = window.navigation.traverseTo(t), s = window.navigation.transition, i = s.from.index, o = window.navigation.entries().findIndex((f) => f.key === t), u = new AbortController();
-    u.signal.addEventListener("abort", () => this.traverseTo(s.from.key), { once: !0 }), e.signal?.addEventListener("abort", u.abort, { once: !0 });
-    let h;
-    return i > o ? h = this.createBackEvent(u.signal, r.committed, s) : h = this.createForwardEvent(u.signal, r.committed, s), this.dispatchEvent?.(h), r;
+    const r = window.navigation.traverseTo(t), s = window.navigation.transition, i = s.from.index, o = window.navigation.entries().findIndex((f) => f.key === t), c = new AbortController();
+    c.signal.addEventListener("abort", () => this.traverseTo(s.from.key), { once: !0 }), e.signal?.addEventListener("abort", c.abort, { once: !0 });
+    let l;
+    return i > o ? l = this.createBackEvent(c.signal, r.committed, s) : l = this.createForwardEvent(c.signal, r.committed, s), this.dispatchEvent?.(l), r;
   }
   navigate(t, e = {}, r = {}) {
-    const { type: s = "push" } = r, i = new URL(t, this.baseURL), o = window.navigation.navigate(i.href, { history: s, state: e }), u = window.navigation.transition, h = new AbortController();
-    h.signal.addEventListener("abort", () => this.goBack(), { once: !0 }), r.signal?.addEventListener("abort", h.abort, { once: !0 });
-    const f = this.createNavigateEvent(t, e, s, h.signal, o.committed, u);
+    const { type: s = "push" } = r, i = new URL(t, this.baseURL), o = window.navigation.navigate(i.href, { history: s, state: e }), c = window.navigation.transition, l = new AbortController();
+    l.signal.addEventListener("abort", () => this.goBack(), { once: !0 }), r.signal?.addEventListener("abort", l.abort, { once: !0 });
+    const f = this.createNavigateEvent(t, e, s, l.signal, o.committed, c);
     return this.dispatchEvent?.(f), o;
   }
   goBack(t = {}) {
@@ -712,14 +712,33 @@ class fe extends dt {
     return window.navigation.entries();
   }
   get entries() {
-    const t = this.router.pathPatterns.filter(({ pattern: r }) => r.endsWith("**"));
-    let e = !1;
-    return this.globalEntries.filter((r) => {
-      if (!r.url)
+    const t = this.router.pathPatterns.filter(({ pattern: s }) => s.endsWith("**"));
+    let e = null, r = !1;
+    return this.globalEntries.filter((s) => {
+      if (!s.url)
+        return !1;
+      const i = new URL(s.url), o = dt(this.baseURLPattern.pathname, i.pathname);
+      if (!o)
         return !1;
-      const s = new URL(r.url);
-      return ft(this.baseURLPattern.pathname, s.pathname) ? ut(t, s.pathname, this.baseURLPattern.pathname) ? e ? !1 : e = !0 : (e = !1, !0) : !1;
-    }).map((r, s) => new de(r, this.routerId, s));
+      if (e) {
+        const c = new URLPattern(e.pattern, o.href);
+        if (Y(
+          i.pathname,
+          i.pathname,
+          c.pathname,
+          e.caseSensitive
+        ) || r)
+          return r = !0, !1;
+      }
+      return e = t.find(
+        ({ pattern: c, caseSensitive: l }) => Y(
+          c,
+          i.pathname,
+          this.baseURLPattern.pathname,
+          l
+        )
+      ) ?? null, !0;
+    }).map((s, i) => new de(s, this.routerId, i));
   }
   get index() {
     const t = window.navigation.currentEntry?.index ?? -1, e = this.entries.at(0)?.globalIndex ?? -1, r = this.entries.at(-1)?.globalIndex ?? -1;
@@ -773,7 +792,7 @@ function V(n, t) {
       return !1;
   return !0;
 }
-class Je extends vt {
+class Je extends ft {
   #t;
   constructor(t, e) {
     super(t, e);
@@ -789,7 +808,26 @@ class Je extends vt {
     super.setParams(t), this.setHistoryState(({ params: e }) => ({ params: { ...e, ...t } }));
   }
   setConfig(t) {
-    super.setConfig(t), delete t.footer, delete t.header, delete t.onEnter, delete t.onEntered, delete t.onExit, delete t.onExited, this.setHistoryState(({ config: e }) => ({ config: { ...e, ...t } }));
+    super.setConfig(t), this.setHistoryState(({ config: e }) => {
+      const r = /* @__PURE__ */ new Set([
+        "footer",
+        "header",
+        "onEnter",
+        "onEntered",
+        "onExit",
+        "onExited",
+        "onLoad",
+        "animation"
+      ]);
+      return {
+        config: {
+          ...e,
+          ...Object.fromEntries(
+            Object.entries(t).filter(([s]) => !r.has(s))
+          )
+        }
+      };
+    });
   }
   get router() {
     return this.context;
@@ -803,7 +841,7 @@ class Je extends vt {
   get historyEntryState() {
     const t = this.#t;
     if (t?.url) {
-      const e = t.getState() ?? {}, r = ve(t.url.searchParams), s = N(
+      const e = t.getState() ?? {}, r = ve(t.url.searchParams), s = Y(
         this.props.path,
         t.url.pathname,
         this.context.baseURLPattern.pathname,
@@ -835,12 +873,12 @@ class Je extends vt {
     };
   }
   get routeProp() {
-    const t = this.setParams.bind(this), e = this.setConfig.bind(this), { path: r } = this.props, { focused: s } = this.state, { params: i, config: o, resolvedPathname: u } = this;
+    const t = this.setParams.bind(this), e = this.setConfig.bind(this), { path: r } = this.props, { focused: s } = this.state, { params: i, config: o, resolvedPathname: c } = this;
     return {
       setParams: t,
       setConfig: e,
       path: r,
-      resolvedPathname: u,
+      resolvedPathname: c,
       focused: s,
       params: i,
       config: o
@@ -924,7 +962,7 @@ class be {
     }), this.nativeReject?.(t);
   }
 }
-class Qe extends gt {
+class Qe extends vt {
   navigation = new fe(this);
   #t = null;
   constructor(t, e) {
@@ -934,7 +972,7 @@ class Qe extends gt {
       gestureDirection: s = L.gestureDirection,
       gestureDisabled: i = L.gestureDisabled,
       gestureHysteresis: o = L.gestureHysteresis,
-      gestureMinFlingVelocity: u = L.gestureMinFlingVelocity
+      gestureMinFlingVelocity: c = L.gestureMinFlingVelocity
     } = t.config?.screenConfig ?? {};
     this.state = {
       screenStack: [],
@@ -942,7 +980,7 @@ class Qe extends gt {
       gestureAreaWidth: r,
       gestureHysteresis: o,
       gestureDisabled: i,
-      gestureMinFlingVelocity: u,
+      gestureMinFlingVelocity: c,
       transition: null,
       documentTitle: document.title,
       fromKey: null,
@@ -1080,16 +1118,16 @@ class Qe extends gt {
     const { child: s, matchInfo: i } = this.screenChildFromPathname(t) ?? {};
     if (!s)
       return Promise.resolve(!1);
-    const { navigation: o } = this, { signal: u } = r, { path: h } = s.props;
+    const { navigation: o } = this, { signal: c } = r, { path: l } = s.props;
     return await Promise.all([
       this.preloadScreen(s),
       s.props.config?.onLoad?.({
         navigation: o,
-        signal: u,
+        signal: c,
         preloading: !0,
         route: {
           focused: !1,
-          path: h,
+          path: l,
           resolvedPathname: t,
           config: {
             ...this.props.config?.screenConfig,
@@ -1107,7 +1145,7 @@ class Qe extends gt {
   }
   cloneScreenChildFromPathname(t, e) {
     const { child: r } = this.screenChildFromPathname(t) ?? {};
-    return r ? (e ??= crypto.randomUUID(), pt(r, {
+    return r ? (e ??= crypto.randomUUID(), gt(r, {
       config: {
         title: document.title,
         ...this.props.config?.screenConfig,
@@ -1127,7 +1165,7 @@ class Qe extends gt {
   }
   canIntercept(t) {
     const e = new URL(t.destination.url).pathname, r = this.baseURLPattern.pathname;
-    return this.mounted && this.shouldIntercept(t) && ut(this.pathPatterns, e, r);
+    return this.mounted && this.shouldIntercept(t) && pt(this.pathPatterns, e, r);
   }
   shouldIntercept(t) {
     return t.canIntercept && !t.formData && !t.hashChange && !t.downloadRequest || !!this.props.config?.shouldIntercept?.(t);
@@ -1149,24 +1187,24 @@ class Qe extends gt {
   }
   handleLoad(t) {
     const e = () => {
-      const r = t.transition?.from?.key ?? null, s = t.destination.key, i = t.transition, o = [], u = this.navigation.entries;
-      return u.forEach((h) => {
-        if (!h.url)
+      const r = t.transition?.from?.key ?? null, s = t.destination.key, i = t.transition, o = [], c = this.navigation.entries;
+      return c.forEach((l) => {
+        if (!l.url)
           return null;
         const f = this.cloneScreenChildFromPathname(
-          h.url.pathname,
-          h.key
+          l.url.pathname,
+          l.key
         );
         if (!f)
           return null;
         o.push(f);
       }), new Promise(
-        (h, f) => U(() => {
+        (l, f) => N(() => {
           this.setState(
             { screenStack: o, fromKey: r, transition: i, destinationKey: s },
             async () => {
-              const { initialPathname: d } = this.props.config ?? {}, [P] = u;
-              if (d && u.length === 1 && P.url && !N(
+              const { initialPathname: d } = this.props.config ?? {}, [P] = c;
+              if (d && c.length === 1 && P.url && !Y(
                 d,
                 P.url.pathname,
                 this.baseURLPattern.pathname
@@ -1176,7 +1214,7 @@ class Qe extends gt {
                     const y = t.destination.getState() ?? {};
                     this.navigation.push(t.destination.url, y);
                   });
-                }), h();
+                }), l();
               const w = t.signal;
               this.navigation.current?.key === void 0 && f(new Error("Current key is undefined"));
               const v = this.getScreenRefByKey(
@@ -1188,7 +1226,7 @@ class Qe extends gt {
                 w
               ).catch(f), this.setState(
                 { destinationKey: null, fromKey: null, transition: null },
-                h
+                l
               );
             }
           );
@@ -1204,30 +1242,30 @@ class Qe extends gt {
     );
     if (!o)
       return t.preventDefault();
-    const u = () => {
-      const h = this.state.transition !== null, f = this.state.transition ?? window.navigation.transition, d = f?.from?.key ?? null, P = e.findIndex(
+    const c = () => {
+      const l = this.state.transition !== null, f = this.state.transition ?? window.navigation.transition, d = f?.from?.key ?? null, P = e.findIndex(
         (w) => w.key === this.navigation.current?.key
       );
       return e.splice(P, 1, o), new Promise(
-        (w, v) => U(() => {
+        (w, v) => N(() => {
           this.setState(
             { destinationKey: i, fromKey: d, transition: f, screenStack: e },
             async () => {
-              const p = t.signal, y = this.getScreenRefByKey(String(d)), c = this.getScreenRefByKey(
+              const p = t.signal, y = this.getScreenRefByKey(String(d)), u = this.getScreenRefByKey(
                 String(i)
               ), a = this.dispatchLifecycleHandlers(
-                c,
+                u,
                 null,
                 p
               ).catch(v);
-              if (h) {
-                const l = this.screenTransitionLayer.current?.animation.currentTime ?? 0;
+              if (l) {
+                const h = this.screenTransitionLayer.current?.animation.currentTime ?? 0;
                 this.screenTransitionLayer.current?.animation.cancel(), await new Promise(requestAnimationFrame);
                 const m = this.screenTransition(
-                  c,
+                  u,
                   y
                 );
-                m && (m.currentTime = l), m?.updatePlaybackRate(1), await m?.finished.catch(v);
+                m && (m.currentTime = h), m?.updatePlaybackRate(1), await m?.finished.catch(v);
               }
               await a, this.setState(
                 { destinationKey: null, fromKey: null, transition: null },
@@ -1238,7 +1276,7 @@ class Qe extends gt {
         })
       );
     };
-    t.intercept({ handler: u });
+    t.intercept({ handler: c });
   }
   handleDefault(t) {
     const e = this.state.screenStack, r = t.destination, s = new URL(r.url).pathname;
@@ -1247,17 +1285,17 @@ class Qe extends gt {
     const i = () => {
       if (me(t.info))
         return Promise.resolve();
-      const h = window.navigation.transition;
+      const l = window.navigation.transition;
       let f = e.findIndex(
-        (p) => p.key === h?.from.key
+        (p) => p.key === l?.from.key
       );
-      f === -1 && t.navigationType === "traverse" && (f = e.findIndex((p) => h?.from.url ? N(
+      f === -1 && t.navigationType === "traverse" && (f = e.findIndex((p) => l?.from.url ? Y(
         p.props.path,
-        new URL(h.from.url).pathname,
+        new URL(l.from.url).pathname,
         this.baseURLPattern.pathname,
         p.props.caseSensitive
       ) : !1));
-      const d = (e[f]?.key || h?.from.key) ?? null, P = e.findIndex(
+      const d = (e[f]?.key || l?.from.key) ?? null, P = e.findIndex(
         (p) => p.key === t.destination.key
       ), w = (e[P]?.key || window.navigation.currentEntry?.key) ?? null;
       if (t.navigationType === "push") {
@@ -1276,19 +1314,19 @@ class Qe extends gt {
       }
       const v = new AbortController();
       return new Promise(
-        (p, y) => U(() => {
+        (p, y) => N(() => {
           this.setState(
-            { controller: v, destinationKey: w, fromKey: d, transition: h, screenStack: e },
+            { controller: v, destinationKey: w, fromKey: d, transition: l, screenStack: e },
             async () => {
               v.signal.onabort = y;
-              const c = t.signal, a = this.getScreenRefByKey(String(d)), l = this.getScreenRefByKey(
+              const u = t.signal, a = this.getScreenRefByKey(String(d)), h = this.getScreenRefByKey(
                 String(w)
               ), m = this.dispatchLifecycleHandlers(
-                l,
+                h,
                 a,
-                c
+                u
               ).catch(y), E = this.screenTransition(
-                l,
+                h,
                 a
               );
               E?.updatePlaybackRate(1), E?.finished.catch(y), await m, this.setState(
@@ -1309,8 +1347,8 @@ class Qe extends gt {
     pe(t.info) ? (o = "after-transition", this.addEventListener("gesture-end", () => t.commit?.(), { once: !0 }), this.addEventListener("gesture-cancel", this.onGestureCancel, {
       once: !0
     })) : o = "immediate";
-    const u = { handler: i, commit: o };
-    t.intercept(u);
+    const c = { handler: i, commit: o };
+    t.intercept(c);
   }
   async dispatchLifecycleHandlers(t, e, r) {
     let s = !1;
@@ -1339,16 +1377,16 @@ class Qe extends gt {
   }
 }
 function _e() {
-  return C("Stack.Navigation"), mt();
+  return j("Stack.Navigation"), mt();
 }
 function tn() {
-  return C("Stack.Router"), yt();
+  return j("Stack.Router"), yt();
 }
 function en() {
-  return C("Stack.Route"), wt();
+  return j("Stack.Route"), wt();
 }
 function nn(n, t) {
-  return C("Stack.Params"), Et(n, t);
+  return j("Stack.Params"), Et(n, t);
 }
 function Le(n) {
   const t = _e();
@@ -1363,7 +1401,7 @@ function Te(n, t = {}) {
     },
     [n]
   );
-  return Y(() => {
+  return C(() => {
     const s = new IntersectionObserver(r, t), i = e.current;
     return i && s.observe(i), () => {
       i && s.unobserve(i);
@@ -1371,7 +1409,7 @@ function Te(n, t = {}) {
   }, [r, t]), e;
 }
 function ct(n, t, e, r) {
-  Y(() => {
+  C(() => {
     const s = n.current;
     if (s)
       return s.addEventListener(t, e, r), () => {
@@ -1379,7 +1417,7 @@ function ct(n, t, e, r) {
       };
   }, [n, t, e, r]);
 }
-function ke(n, { forceThreshold: t = Se } = {}) {
+function Re(n, { forceThreshold: t = Se } = {}) {
   const e = $(null), r = () => n(!0), s = (i) => {
     const o = i.touches[0];
     o && o.force >= t && n(!0);
@@ -1394,28 +1432,28 @@ function rn({
   href: s,
   navigation: i,
   onClick: o,
-  preloadBehaviour: u = {
+  preloadBehaviour: c = {
     type: "onsight"
   },
-  children: h,
+  children: l,
   ...f
 }) {
-  const d = Le(i), P = u?.type === "onsight", w = u?.type === "onhover", v = u?.type === "force", p = Te(
+  const d = Le(i), P = c?.type === "onsight", w = c?.type === "onhover", v = c?.type === "force", p = Te(
     (S) => {
       !S.isIntersecting || !n || d.preload(s, { params: e });
     },
-    P ? u : {}
-  ), y = ke(
+    P ? c : {}
+  ), y = Re(
     (S) => {
       !S || !n || d.preload(s, { params: e });
     },
-    w ? u : {}
+    w ? c : {}
   );
-  Y(() => {
+  C(() => {
     !n || !v || d.preload(s, { params: e });
   }, [n, s, d, v, e]);
-  const [c, a] = St(void 0), l = d?.routerId, E = !c?.includes(window.location.origin) ? "noopener noreferrer" : t ? "prev" : "next";
-  Y(() => {
+  const [u, a] = St(void 0), h = d?.routerId, E = !u?.includes(window.location.origin) ? "noopener noreferrer" : t ? "prev" : "next";
+  C(() => {
     if (t && d.canGoBack())
       a(d.previous.url?.href);
     else if (s) {
@@ -1426,27 +1464,27 @@ function rn({
   const b = (S) => {
     t ? (S.preventDefault(), d.goBack()) : r === "replace" && s && (S.preventDefault(), d.replace(s)), o?.(S);
   };
-  let R;
-  switch (u?.type) {
+  let k;
+  switch (c?.type) {
     case "onhover":
-      R = y;
+      k = y;
       break;
     case "onsight":
-      R = p;
+      k = p;
       break;
     default:
-      R = null;
+      k = null;
   }
-  return /* @__PURE__ */ lt(
+  return /* @__PURE__ */ ut(
     "a",
     {
-      href: c,
-      "data-router-id": l,
+      href: u,
+      "data-router-id": h,
       onClick: b,
       rel: E,
-      ref: R,
+      ref: k,
       ...f,
-      children: h
+      children: l
     }
   );
 }
@@ -1457,7 +1495,7 @@ const sn = [
   {
     transform: "translateX(0vw)"
   }
-], Re = [
+], ke = [
   {
     transform: "translateX(100vw)"
   },
@@ -1513,7 +1551,7 @@ const sn = [
   {
     transform: "translateY(0vh)"
   }
-], De = [
+], Oe = [
   {
     transform: "translateY(100vh)"
   },
@@ -1573,7 +1611,7 @@ const sn = [
   {
     opacity: 0
   }
-], Oe = [
+], De = [
   {
     opacity: 0,
     transform: "translateY(calc(100vh * 0.08))"
@@ -1622,7 +1660,7 @@ const sn = [
   {
     transform: "translateY(-2vh)"
   }
-], Xe = [
+], Ce = [
   {
     transform: "scale(0.85)",
     opacity: 0
@@ -1639,7 +1677,7 @@ const sn = [
     transform: "scale(1)",
     opacity: 1
   }
-], Ce = [
+], Xe = [
   {
     transform: "scale(1)",
     opacity: 1
@@ -1680,7 +1718,7 @@ const tt = {
     velocity: 0,
     steps: 200
   })
-}, ht = {
+}, lt = {
   duration: 350,
   easing: A(He(Ue(5)))
 }, Ne = {
@@ -1702,7 +1740,7 @@ const tt = {
 function mn({ ref: n, direction: t, playbackRate: e, index: r }) {
   let i = [
     Ie,
-    Re
+    ke
   ][r];
   const o = {
     playbackRate: e,
@@ -1724,7 +1762,7 @@ function yn({ ref: n, direction: t, playbackRate: e, index: r }) {
   return t === "reverse" && (i = i.toReversed()), new KeyframeEffect(n, i, o);
 }
 function wn({ ref: n, direction: t, playbackRate: e }) {
-  let r = De;
+  let r = Oe;
   const s = {
     playbackRate: e,
     fill: "forwards",
@@ -1733,11 +1771,11 @@ function wn({ ref: n, direction: t, playbackRate: e }) {
   return t === "reverse" && (r = r.toReversed()), new KeyframeEffect(n, r, s);
 }
 function En({ ref: n, direction: t, playbackRate: e }) {
-  let r = Oe;
+  let r = De;
   const s = {
     playbackRate: e,
     fill: "forwards",
-    ...ht
+    ...lt
   };
   return t === "reverse" && (r = r.toReversed()), new KeyframeEffect(n, r, s);
 }
@@ -1764,23 +1802,24 @@ function Sn({ ref: n, direction: t, index: e, playbackRate: r }) {
   return new KeyframeEffect(n, i, o);
 }
 function bn({ ref: n, direction: t, index: e, playbackRate: r }) {
-  let s = [
+  const s = [
     Me,
     Ke
-  ], i;
-  e === 0 ? i = Ne : i = ht;
+  ];
+  let i;
+  e === 0 ? i = Ne : i = lt;
   let o = s[e];
-  const u = {
+  const c = {
     playbackRate: r,
     fill: "forwards",
     ...i
   };
-  return t === "reverse" && (o = o.toReversed()), new KeyframeEffect(n, o, u);
+  return t === "reverse" && (o = o.toReversed()), new KeyframeEffect(n, o, c);
 }
 function _n({ ref: n, direction: t, index: e, playbackRate: r }) {
   const i = [
-    Ce,
-    Xe
+    Xe,
+    Ce
   ][e], o = {
     direction: t,
     playbackRate: r,
@@ -1791,7 +1830,7 @@ function _n({ ref: n, direction: t, index: e, playbackRate: r }) {
 }
 function Ln({ disabled: n, children: t, ...e }) {
   const r = $(null);
-  return Y(() => {
+  return C(() => {
     if (n)
       return;
     const s = (i) => {
@@ -1800,7 +1839,7 @@ function Ln({ disabled: n, children: t, ...e }) {
     return r.current?.addEventListener("swipestart", s), () => {
       r.current?.removeEventListener("swipestart", s);
     };
-  }, [r, n]), /* @__PURE__ */ lt(
+  }, [r, n]), /* @__PURE__ */ ut(
     "div",
     {
       ref: r,
@@ -1835,8 +1874,8 @@ export {
   We as androidBottomSheetSlideOutOptions,
   Ye as androidConcealToBottomKeyframes,
   En as androidFadeInFromBottom,
-  Oe as androidFadeInFromBottomKeyframes,
-  ht as androidFadeInFromBottomOptions,
+  De as androidFadeInFromBottomKeyframes,
+  lt as androidFadeInFromBottomOptions,
   Pn as androidFadeInFromBottomSheet,
   je as androidFadeInFromBottomSheetKeyframes,
   bn as androidFadeInFromRight,
@@ -1847,16 +1886,16 @@ export {
   Be as androidRevealFromBottomKeyframes,
   Ve as androidRevealFromBottomOptions,
   _n as androidScaleFromCentre,
-  Xe as androidScaleFromCentreKeyframes,
+  Ce as androidScaleFromCentreKeyframes,
   $e as androidScaleFromCentreOptions,
-  Ce as androidScaleToCentreKeyframes,
+  Xe as androidScaleToCentreKeyframes,
   tt as iOSKeyframeOptions,
   wn as iOSSlideInFromBottom,
-  De as iOSSlideInFromBottomKeyframes,
+  Oe as iOSSlideInFromBottomKeyframes,
   yn as iOSSlideInFromLeft,
   xe as iOSSlideInFromLeftKeyframes,
   mn as iOSSlideInFromRight,
-  Re as iOSSlideInFromRightKeyframes,
+  ke as iOSSlideInFromRightKeyframes,
   Ie as iOSSlideOutToLeftKeyframes,
   Fe as iOSSlideOutToRightKeyframes,
   _e as useNavigation,