@react-motion-router/stack 2.0.0-beta.sha-48fbc5e → 2.0.0-beta.sha-679879e

package/build/index.js

@@ -1,14 +1,14 @@
 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 Lt, springToLinear as _t, easingToLinear as A } from "web-animations-extension";
+import { GestureTimeline as _t, springToLinear as Lt, easingToLinear as A } from "web-animations-extension";
 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 g = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {}, Rt = {}, R = {};
+Object.defineProperty(R, "__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 Rt extends TouchEvent {
+class kt extends TouchEvent {
   constructor(t, e) {
     if (super(t, {
       touches: Array.from(e.touches),
@@ -27,12 +27,12 @@ class Rt extends TouchEvent {
     this.gestureTarget = e.touches[0].target, this.x = e.touches[0].clientX, this.y = e.touches[0].clientY;
   }
 }
-T.default = Rt;
-var W = {}, kt = g && g.__importDefault || function(n) {
+R.default = kt;
+var W = {}, Tt = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
 Object.defineProperty(W, "__esModule", { value: !0 });
-const It = kt(T);
+const It = Tt(R);
 class xt extends It.default {
   constructor(t, e) {
     super("longpress", t), this.duration = 0, this.duration = e;
@@ -43,19 +43,19 @@ var q = {}, Ft = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
 Object.defineProperty(q, "__esModule", { value: !0 });
-const Ot = Ft(T);
+const Ot = Ft(R);
 class Dt extends Ot.default {
   constructor(t) {
     super("tap", t), this.duration = 0;
   }
 }
 q.default = Dt;
-var G = {}, Kt = g && g.__importDefault || function(n) {
+var G = {}, Mt = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
 Object.defineProperty(G, "__esModule", { value: !0 });
-const Mt = Kt(T);
-class Bt extends Mt.default {
+const Kt = Mt(R);
+class Bt extends Kt.default {
   constructor(t) {
     super("doubletap", t);
   }
@@ -66,7 +66,7 @@ var F = {}, Yt = g && g.__importDefault || function(n) {
 };
 Object.defineProperty(F, "__esModule", { value: !0 });
 F.SwipeEndEvent = F.SwipeStartEvent = void 0;
-const Ct = Yt(T);
+const Ct = Yt(R);
 var st;
 (function(n) {
   n[n.start = 0] = "start", n[n.end = 1] = "end";
@@ -110,7 +110,7 @@ var O = {}, Ht = g && g.__importDefault || function(n) {
 };
 Object.defineProperty(O, "__esModule", { value: !0 });
 O.PanEndEvent = O.PanStartEvent = void 0;
-const Nt = Ht(T);
+const Nt = Ht(R);
 var it;
 (function(n) {
   n[n.start = 0] = "start", n[n.end = 1] = "end";
@@ -161,7 +161,7 @@ var D = {}, Wt = g && g.__importDefault || function(n) {
 };
 Object.defineProperty(D, "__esModule", { value: !0 });
 D.PinchEndEvent = D.PinchStartEvent = void 0;
-const qt = Wt(T);
+const qt = Wt(R);
 var at;
 (function(n) {
   n[n.start = 0] = "start", n[n.end = 1] = "end";
@@ -203,12 +203,12 @@ class Zt extends J {
   }
 }
 D.PinchEndEvent = Zt;
-var K = {}, Jt = g && g.__importDefault || function(n) {
+var M = {}, Jt = g && g.__importDefault || function(n) {
   return n && n.__esModule ? n : { default: n };
 };
-Object.defineProperty(K, "__esModule", { value: !0 });
-K.RotateEndEvent = K.RotateStartEvent = void 0;
-const Qt = Jt(T);
+Object.defineProperty(M, "__esModule", { value: !0 });
+M.RotateEndEvent = M.RotateStartEvent = void 0;
+const Qt = Jt(R);
 var ot;
 (function(n) {
   n[n.start = 0] = "start", n[n.end = 1] = "end";
@@ -242,27 +242,27 @@ class te extends Q {
     super(t, e);
   }
 }
-K.default = te;
+M.default = te;
 class ee extends Q {
   constructor(t, e) {
     super(t, e, "start");
   }
 }
-K.RotateStartEvent = ee;
+M.RotateStartEvent = ee;
 class ne extends Q {
   constructor(t, e) {
     super(t, e, "end");
   }
 }
-K.RotateEndEvent = ne;
-var R = {};
-Object.defineProperty(R, "__esModule", { value: !0 });
-R.closest = R.Vec2 = R.assert = void 0;
+M.RotateEndEvent = ne;
+var k = {};
+Object.defineProperty(k, "__esModule", { value: !0 });
+k.closest = k.Vec2 = k.assert = void 0;
 function re(n, t) {
   if (!n)
     throw new Error(t);
 }
-R.assert = re;
+k.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,21 +307,21 @@ class se {
     return Math.sqrt(Math.pow(this._clientX, 2) + Math.pow(this._clientY, 2));
   }
 }
-R.Vec2 = se;
+k.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;
   });
 }
-R.closest = ie;
+k.closest = ie;
 (function(n) {
-  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() {
+  var t = g && g.__createBinding || (Object.create ? function(u, a, h, P) {
+    P === void 0 && (P = h), Object.defineProperty(u, P, { enumerable: !0, get: function() {
       return a[h];
     } });
-  } : function(u, a, h, m) {
-    m === void 0 && (m = h), u[m] = a[h];
+  } : function(u, a, h, P) {
+    P === void 0 && (P = h), u[P] = a[h];
   }), e = g && g.__setModuleDefault || (Object.create ? function(u, a) {
     Object.defineProperty(u, "default", { enumerable: !0, value: a });
   } : function(u, a) {
@@ -338,7 +338,7 @@ R.closest = ie;
     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);
+  const i = s(R);
   n.GestureEvent = i.default;
   const o = s(W);
   n.LongPressEvent = o.default;
@@ -358,31 +358,31 @@ R.closest = ie;
   } }), Object.defineProperty(n, "PanStartEvent", { enumerable: !0, get: function() {
     return d.PanStartEvent;
   } });
-  const P = r(D);
-  n.PinchEvent = P.default, Object.defineProperty(n, "PinchEndEvent", { enumerable: !0, get: function() {
-    return P.PinchEndEvent;
+  const w = r(D);
+  n.PinchEvent = w.default, Object.defineProperty(n, "PinchEndEvent", { enumerable: !0, get: function() {
+    return w.PinchEndEvent;
   } }), Object.defineProperty(n, "PinchStartEvent", { enumerable: !0, get: function() {
-    return P.PinchStartEvent;
+    return w.PinchStartEvent;
   } });
-  const w = r(K);
-  n.RotateEvent = w.default, Object.defineProperty(n, "RotateEndEvent", { enumerable: !0, get: function() {
-    return w.RotateEndEvent;
+  const E = r(M);
+  n.RotateEvent = E.default, Object.defineProperty(n, "RotateEndEvent", { enumerable: !0, get: function() {
+    return E.RotateEndEvent;
   } }), Object.defineProperty(n, "RotateStartEvent", { enumerable: !0, get: function() {
-    return w.RotateStartEvent;
+    return E.RotateStartEvent;
   } });
-  const v = R;
+  const v = k;
   var p;
   (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 {
+  class m {
     constructor() {
       this.touchStart = new TouchEvent("touchstart") || {}, this.touchMove = new TouchEvent("touchmove") || {}, this.touchEnd = new TouchEvent("touchend") || {}, this.touchCancel = new TouchEvent("touchcancel") || {}, this.velocity = 0, this.dxDy = new v.Vec2(0, 0), this.scale = 1, this.rotation = 0, this.rotationDeg = 0, this.anchor = new v.Vec2(0, 0), this.octant = 0, this.isPanning = !1, this.isPinching = !1, this.isSwiping = !1, this.isRotating = !1, this.touchStartTime = 0, this.touchEndTime = 0, this.lastTouchTime = 0, this.taps = 0, this.scaleBase = 0, this.touchMoved = !1, this.touchDown = !1, this.shouldFire = !1, this.pointers = 0, this.isLongPress = !1, this.longPressTimeout = 0, this.touchStartListener = this.onTouchStart.bind(this), this.touchMoveListener = this.onTouchMove.bind(this), this.touchEndListener = this.onTouchEnd.bind(this), this.touchCancelListener = this.onTouchCancel.bind(this), this.currentTarget = window, this.config = {
         longPressDuration: 500,
         tapDelay: 500,
         minPointers: 1,
         numberOfTaps: 0
-      }, y.listening || (TouchEvent && window.addEventListener("touchstart", this.touchStartListener, !0), y.listening = !0);
+      }, m.listening || (TouchEvent && window.addEventListener("touchstart", this.touchStartListener, !0), m.listening = !0);
     }
     bind(a) {
       this.unbind(this.currentTarget), a.addEventListener("touchmove", this.touchMoveListener, !0), a.addEventListener("touchend", this.touchEndListener, !0), a.addEventListener("touchcancel", this.touchCancelListener, !0), this.currentTarget = a;
@@ -412,13 +412,13 @@ R.closest = ie;
       }
       if (a.touches.length === 1) {
         if (this.scaleBase = 0, this.isPinching) {
-          const h = new P.PinchEndEvent(a, {
+          const h = new w.PinchEndEvent(a, {
             scale: this.scale
           });
           this.dispatchEvent(h), this.isPinching = !1;
         }
         if (this.isRotating) {
-          const h = new w.RotateEndEvent(a, {
+          const h = new E.RotateEndEvent(a, {
             rotation: this.rotation,
             rotationDeg: this.rotationDeg,
             anchor: this.anchor
@@ -440,15 +440,15 @@ R.closest = ie;
         return;
       }
       this.shouldFire = !0, this.touchStartTime = a.timeStamp, this.touchDown = !0, this.pointers || this.bind(a.touches[0].target), this.pointers = this.touchStart.touches.length;
-      const m = parseFloat(this.currentTarget.dataset.longpressduration || "0") || this.config.longPressDuration;
+      const P = parseFloat(this.currentTarget.dataset.longpressduration || "0") || this.config.longPressDuration;
       if (this.longPressTimeout || (this.longPressTimeout = setTimeout(() => {
         if (!this.touchMoved && this.touchDown) {
-          const E = Date.now() - this.touchStartTime, b = new o.default(this.touchStart, E);
+          const y = Date.now() - this.touchStartTime, b = new o.default(this.touchStart, y);
           this.dispatchEvent(b), this.isLongPress = !0, this.longPressTimeout = 0;
         }
-      }, m)), this.touchStart.touches.length > 1) {
-        const E = new v.Vec2(this.touchStart.touches[0].clientX, this.touchStart.touches[0].clientY), b = new v.Vec2(this.touchStart.touches[1].clientX, this.touchStart.touches[1].clientY);
-        this.scaleBase = E.substract(b).magnitude;
+      }, P)), this.touchStart.touches.length > 1) {
+        const y = new v.Vec2(this.touchStart.touches[0].clientX, this.touchStart.touches[0].clientY), b = new v.Vec2(this.touchStart.touches[1].clientX, this.touchStart.touches[1].clientY);
+        this.scaleBase = y.substract(b).magnitude;
       } else
         this.scaleBase = 0;
     }
@@ -456,32 +456,32 @@ R.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 L = new v.Vec2(this.touchMove.touches[0].clientX, this.touchMove.touches[0].clientY), U = 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 = L.substract(U);
+        const _ = new v.Vec2(this.touchMove.touches[0].clientX, this.touchMove.touches[0].clientY), U = 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(U);
         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 H = new w.default(a, {
               scale: I
             });
             this.dispatchEvent(H);
           } else {
-            const H = new P.PinchStartEvent(a, {
+            const H = new w.PinchStartEvent(a, {
               scale: I
             });
             this.dispatchEvent(H), this.isPinching = !0;
           }
         }
-        this.anchor = L;
+        this.anchor = _;
         let B = Math.atan2(et.clientY - U.clientY, et.clientX - U.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, {
+          const I = new E.default(a, {
             anchor: this.anchor,
             rotation: this.rotation,
             rotationDeg: this.rotationDeg
           });
           this.dispatchEvent(I);
         } else {
-          const I = new w.RotateStartEvent(a, {
+          const I = new E.RotateStartEvent(a, {
             anchor: this.anchor,
             rotation: this.rotation,
             rotationDeg: this.rotationDeg
@@ -489,52 +489,52 @@ R.closest = ie;
           this.dispatchEvent(I), this.isRotating = !0;
         }
       }
-      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(k.y, k.x);
+      const h = new v.Vec2(this.touchStart.touches[0].clientX, this.touchStart.touches[0].clientY), y = new v.Vec2(this.touchMove.touches[0].clientX, this.touchMove.touches[0].clientY).substract(h), b = y.magnitude, T = {
+        x: y.x / b,
+        y: y.y / b
+      }, S = Math.atan2(T.y, T.x);
       this.octant = Math.round(4 * S / (2 * Math.PI) + 4) % 4;
-      const X = (a.timeStamp - this.touchStart.timeStamp) / 1e3, M = E.magnitude / X;
+      const X = (a.timeStamp - this.touchStart.timeStamp) / 1e3, K = y.magnitude / X;
       if (this.isSwiping) {
-        const L = new f.default(a, {
+        const _ = new f.default(a, {
           direction: p[(0, v.closest)(this.octant, [0, 1, 2, 3])],
-          velocity: M
+          velocity: K
         });
-        this.dispatchEvent(L);
+        this.dispatchEvent(_);
       } else {
-        const L = new f.SwipeStartEvent(a, {
+        const _ = new f.SwipeStartEvent(a, {
           direction: p[(0, v.closest)(this.octant, [0, 1, 2, 3])],
-          velocity: M
+          velocity: K
         });
-        this.dispatchEvent(L), this.isSwiping = !0;
+        this.dispatchEvent(_), this.isSwiping = !0;
       }
-      if (this.dxDy = E, this.velocity = M, this.isPanning) {
-        const L = new d.default(a, {
-          translation: E,
-          velocity: M
+      if (this.dxDy = y, this.velocity = K, this.isPanning) {
+        const _ = new d.default(a, {
+          translation: y,
+          velocity: K
         });
-        this.dispatchEvent(L);
+        this.dispatchEvent(_);
       } else {
-        const L = new d.PanStartEvent(a, {
-          translation: E,
-          velocity: M
+        const _ = new d.PanStartEvent(a, {
+          translation: y,
+          velocity: K
         });
-        this.dispatchEvent(L), this.isPanning = !0;
+        this.dispatchEvent(_), this.isPanning = !0;
       }
     }
     onTouchEnd(a) {
       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;
+        const P = 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 === 1 || this.touchEndTime - this.lastTouchTime < P) {
             if (this.taps % 2 === h) {
               const b = new l.default(a);
               this.dispatchEvent(b), this.taps = 0;
             }
-            const E = new c.default(a);
-            this.dispatchEvent(E);
+            const y = new c.default(a);
+            this.dispatchEvent(y);
           } else
             this.taps = 0;
       }
@@ -544,8 +544,8 @@ R.closest = ie;
       this.shouldFire && (this.touchCancel = a, this.unbind(this.currentTarget), this.clean());
     }
   }
-  n.default = y, y.listening = !1, TouchEvent && (window.gestureProvider = new y());
-})(Tt);
+  n.default = m, m.listening = !1, TouchEvent && (window.gestureProvider = new m());
+})(Rt);
 class ae extends Event {
   routerId;
   route;
@@ -938,7 +938,7 @@ function Ee(n, { x: t, y: e }, r, s) {
 function Pe(n) {
   return n === "left" || n === "right" || n === "horizontal";
 }
-const _ = {
+const L = {
   gestureHysteresis: 0.5,
   gestureMinFlingVelocity: 400,
   gestureAreaWidth: 100,
@@ -969,11 +969,11 @@ class Qe extends vt {
   constructor(t, e) {
     super(t, e);
     const {
-      gestureAreaWidth: r = _.gestureAreaWidth,
-      gestureDirection: s = _.gestureDirection,
-      gestureDisabled: i = _.gestureDisabled,
-      gestureHysteresis: o = _.gestureHysteresis,
-      gestureMinFlingVelocity: c = _.gestureMinFlingVelocity
+      gestureAreaWidth: r = L.gestureAreaWidth,
+      gestureDirection: s = L.gestureDirection,
+      gestureDisabled: i = L.gestureDisabled,
+      gestureHysteresis: o = L.gestureHysteresis,
+      gestureMinFlingVelocity: c = L.gestureMinFlingVelocity
     } = t.config?.screenConfig ?? {};
     this.state = {
       screenStack: [],
@@ -994,11 +994,11 @@ class Qe extends vt {
       (s) => x(s.ref) && s.ref.current?.focused
     )?.props.config;
     return document.title = r?.title ?? document.title, {
-      gestureDirection: r?.gestureDirection ?? _.gestureDirection,
-      gestureAreaWidth: r?.gestureAreaWidth ?? _.gestureAreaWidth,
-      gestureMinFlingVelocity: r?.gestureMinFlingVelocity ?? _.gestureMinFlingVelocity,
-      gestureHysteresis: r?.gestureHysteresis ?? _.gestureHysteresis,
-      gestureDisabled: r?.gestureDisabled ?? _.gestureDisabled,
+      gestureDirection: r?.gestureDirection ?? L.gestureDirection,
+      gestureAreaWidth: r?.gestureAreaWidth ?? L.gestureAreaWidth,
+      gestureMinFlingVelocity: r?.gestureMinFlingVelocity ?? L.gestureMinFlingVelocity,
+      gestureHysteresis: r?.gestureHysteresis ?? L.gestureHysteresis,
+      gestureDisabled: r?.gestureDisabled ?? L.gestureDisabled,
       documentTitle: r?.title
     };
   }
@@ -1070,7 +1070,7 @@ class Qe extends vt {
         s = this.ref.current.clientHeight, i = 0;
         break;
     }
-    this.screenTransitionLayer.current.animation.timeline = new Lt(
+    this.screenTransitionLayer.current.animation.timeline = new _t(
       {
         source: this.ref.current,
         type: "swipe",
@@ -1204,19 +1204,19 @@ class Qe extends vt {
           this.setState(
             { screenStack: o, fromKey: r, transition: i, destinationKey: s },
             async () => {
-              const { initialPathname: d } = this.props.config ?? {}, [P] = c;
-              if (d && c.length === 1 && P.url && !Y(
+              const { initialPathname: d } = this.props.config ?? {}, [w] = c;
+              if (d && c.length === 1 && w.url && !Y(
                 d,
-                P.url.pathname,
+                w.url.pathname,
                 this.baseURLPattern.pathname
               ))
                 return (window.navigation.transition?.finished ?? Promise.resolve()).then(() => {
                   this.navigation.replace(d).finished.then(() => {
-                    const y = t.destination.getState() ?? {};
-                    this.navigation.push(t.destination.url, y);
+                    const m = t.destination.getState() ?? {};
+                    this.navigation.push(t.destination.url, m);
                   });
                 }), l();
-              const w = t.signal;
+              const E = t.signal;
               this.navigation.current?.key === void 0 && f(new Error("Current key is undefined"));
               const v = this.getScreenRefByKey(
                 this.navigation.current.key
@@ -1224,7 +1224,7 @@ class Qe extends vt {
               await this.dispatchLifecycleHandlers(
                 v,
                 null,
-                w
+                E
               ).catch(f), this.setState(
                 { destinationKey: null, fromKey: null, transition: null },
                 l
@@ -1244,31 +1244,22 @@ class Qe extends vt {
     if (!o)
       return t.preventDefault();
     const c = () => {
-      const l = this.state.transition !== null, f = this.state.transition ?? window.navigation.transition, d = f?.from?.key ?? null, P = e.findIndex(
+      const l = this.state.transition ?? window.navigation.transition, f = l?.from?.key ?? null, d = e.findIndex(
         (w) => w.key === this.navigation.current?.key
       );
-      return e.splice(P, 1, o), new Promise(
-        (w, v) => N(() => {
+      return e.splice(d, 1, o), new Promise(
+        (w, E) => N(() => {
           this.setState(
-            { destinationKey: i, fromKey: d, transition: f, screenStack: e },
+            { destinationKey: i, fromKey: f, transition: l, screenStack: e },
             async () => {
-              const p = t.signal, y = this.getScreenRefByKey(String(d)), u = this.getScreenRefByKey(
+              const v = t.signal, p = this.getScreenRefByKey(
                 String(i)
-              ), a = this.dispatchLifecycleHandlers(
-                u,
+              );
+              await this.dispatchLifecycleHandlers(
+                p,
                 null,
-                p
-              ).catch(v);
-              if (l) {
-                const h = this.screenTransitionLayer.current?.animation.currentTime ?? 0;
-                this.screenTransitionLayer.current?.animation.cancel(), await new Promise(requestAnimationFrame);
-                const m = this.screenTransition(
-                  u,
-                  y
-                );
-                m && (m.currentTime = h), m?.updatePlaybackRate(1), await m?.finished.catch(v);
-              }
-              await a, this.setState(
+                v
+              ).catch(E), this.setState(
                 { destinationKey: null, fromKey: null, transition: null },
                 w
               );
@@ -1296,41 +1287,41 @@ class Qe extends vt {
         this.baseURLPattern.pathname,
         p.props.caseSensitive
       ) : !1));
-      const d = (e[f]?.key || l?.from.key) ?? null, P = e.findIndex(
+      const d = (e[f]?.key || l?.from.key) ?? null, w = e.findIndex(
         (p) => p.key === t.destination.key
-      ), w = (e[P]?.key || window.navigation.currentEntry?.key) ?? null;
+      ), E = (e[w]?.key || window.navigation.currentEntry?.key) ?? null;
       if (t.navigationType === "push") {
-        const p = new URL(r.url).pathname, y = this.cloneScreenChildFromPathname(
+        const p = new URL(r.url).pathname, m = this.cloneScreenChildFromPathname(
           p,
-          w
+          E
         );
-        if (!y)
+        if (!m)
           return Promise.resolve();
         e.splice(
           f + 1,
           1 / 0,
           // Remove all screens after current
-          y
+          m
         );
       }
       const v = new AbortController();
       return new Promise(
-        (p, y) => N(() => {
+        (p, m) => N(() => {
           this.setState(
-            { controller: v, destinationKey: w, fromKey: d, transition: l, screenStack: e },
+            { controller: v, destinationKey: E, fromKey: d, transition: l, screenStack: e },
             async () => {
-              v.signal.onabort = y;
+              v.signal.onabort = m;
               const u = t.signal, a = this.getScreenRefByKey(String(d)), h = this.getScreenRefByKey(
-                String(w)
-              ), m = this.dispatchLifecycleHandlers(
+                String(E)
+              ), P = this.dispatchLifecycleHandlers(
                 h,
                 a,
                 u
-              ).catch(y), E = this.screenTransition(
+              ).catch(m), y = this.screenTransition(
                 h,
                 a
               );
-              E?.updatePlaybackRate(1), E?.finished.catch(y), await m, this.setState(
+              y?.updatePlaybackRate(1), y?.finished.catch(m), await P, this.setState(
                 {
                   destinationKey: null,
                   fromKey: null,
@@ -1377,7 +1368,7 @@ class Qe extends vt {
     }
   }
 }
-function Le() {
+function _e() {
   return j("Stack.Navigation"), mt();
 }
 function tn() {
@@ -1389,11 +1380,11 @@ function en() {
 function nn(n, t) {
   return j("Stack.Params"), Et(n, t);
 }
-function _e(n) {
-  const t = Le();
+function Le(n) {
+  const t = _e();
   return n ?? t;
 }
-function Te(n, t = {}) {
+function Re(n, t = {}) {
   const e = $(null), r = bt(
     (s) => {
       s.forEach((i) => {
@@ -1418,7 +1409,7 @@ function ct(n, t, e, r) {
       };
   }, [n, t, e, r]);
 }
-function Re(n, { forceThreshold: t = Se } = {}) {
+function ke(n, { forceThreshold: t = Se } = {}) {
   const e = $(null), r = () => n(!0), s = (i) => {
     const o = i.touches[0];
     o && o.force >= t && n(!0);
@@ -1439,21 +1430,21 @@ function rn({
   children: l,
   ...f
 }) {
-  const d = _e(i), P = c?.type === "onsight", w = c?.type === "onhover", v = c?.type === "force", p = Te(
+  const d = Le(i), w = c?.type === "onsight", E = c?.type === "onhover", v = c?.type === "force", p = Re(
     (S) => {
       !S.isIntersecting || !n || d.preload(s, { params: e });
     },
-    P ? c : {}
-  ), y = Re(
+    w ? c : {}
+  ), m = ke(
     (S) => {
       !S || !n || d.preload(s, { params: e });
     },
-    w ? c : {}
+    E ? c : {}
   );
   C(() => {
     !n || !v || d.preload(s, { params: e });
   }, [n, s, d, v, e]);
-  const [u, a] = St(void 0), h = d?.routerId, E = !u?.includes(window.location.origin) ? "noopener noreferrer" : t ? "prev" : "next";
+  const [u, a] = St(void 0), h = d?.routerId, y = !u?.includes(window.location.origin) ? "noopener noreferrer" : t ? "prev" : "next";
   C(() => {
     if (t && d.canGoBack())
       a(d.previous.url?.href);
@@ -1465,16 +1456,16 @@ function rn({
   const b = (S) => {
     t ? (S.preventDefault(), d.goBack()) : r === "replace" && s && (S.preventDefault(), d.replace(s)), o?.(S);
   };
-  let k;
+  let T;
   switch (c?.type) {
     case "onhover":
-      k = y;
+      T = m;
       break;
     case "onsight":
-      k = p;
+      T = p;
       break;
     default:
-      k = null;
+      T = null;
   }
   return /* @__PURE__ */ ut(
     "a",
@@ -1482,8 +1473,8 @@ function rn({
       href: u,
       "data-router-id": h,
       onClick: b,
-      rel: E,
-      ref: k,
+      rel: y,
+      ref: T,
       ...f,
       children: l
     }
@@ -1496,7 +1487,7 @@ const sn = [
   {
     transform: "translateX(0vw)"
   }
-], ke = [
+], Te = [
   {
     transform: "translateX(100vw)"
   },
@@ -1629,7 +1620,7 @@ const sn = [
     opacity: 1,
     transform: "translateY(0vh)"
   }
-], Ke = [
+], Me = [
   {
     opacity: 0,
     transform: "translateY(96vw)"
@@ -1638,7 +1629,7 @@ const sn = [
     opacity: 1,
     transform: "translateY(0vw)"
   }
-], Me = [
+], Ke = [
   {
     opacity: 0,
     transform: "translateY(0vw)"
@@ -1712,7 +1703,7 @@ function He(n) {
   return (t) => Math.pow(t, n);
 }
 const tt = {
-  ..._t({
+  ...Lt({
     mass: 3,
     stiffness: 1e3,
     damping: 500,
@@ -1741,7 +1732,7 @@ const tt = {
 function mn({ ref: n, direction: t, playbackRate: e, index: r }) {
   let i = [
     Ie,
-    ke
+    Te
   ][r];
   const o = {
     playbackRate: e,
@@ -1804,8 +1795,8 @@ function Sn({ ref: n, direction: t, index: e, playbackRate: r }) {
 }
 function bn({ ref: n, direction: t, index: e, playbackRate: r }) {
   const s = [
-    Me,
-    Ke
+    Ke,
+    Me
   ];
   let i;
   e === 0 ? i = Ne : i = lt;
@@ -1817,7 +1808,7 @@ function bn({ ref: n, direction: t, index: e, playbackRate: r }) {
   };
   return t === "reverse" && (o = o.toReversed()), new KeyframeEffect(n, o, c);
 }
-function Ln({ ref: n, direction: t, index: e, playbackRate: r }) {
+function _n({ ref: n, direction: t, index: e, playbackRate: r }) {
   const i = [
     Xe,
     Ce
@@ -1829,7 +1820,7 @@ function Ln({ ref: n, direction: t, index: e, playbackRate: r }) {
   };
   return new KeyframeEffect(n, i, o);
 }
-function _n({ disabled: n, children: t, ...e }) {
+function Ln({ disabled: n, children: t, ...e }) {
   const r = $(null);
   return C(() => {
     if (n)
@@ -1856,7 +1847,7 @@ export {
   rn as Anchor,
   gn as FadeInKeyframes,
   pn as FadeOutKeyframes,
-  _n as GestureRegion,
+  Ln as GestureRegion,
   de as HistoryEntry,
   fe as Navigation,
   Qe as Router,
@@ -1880,13 +1871,13 @@ export {
   Pn as androidFadeInFromBottomSheet,
   je as androidFadeInFromBottomSheetKeyframes,
   bn as androidFadeInFromRight,
-  Ke as androidFadeInFromRightKeyframes,
+  Me as androidFadeInFromRightKeyframes,
   Ne as androidFadeOutToBottomOptions,
-  Me as androidFadeOutToLeftKeyframes,
+  Ke as androidFadeOutToLeftKeyframes,
   Sn as androidRevealFromBottom,
   Be as androidRevealFromBottomKeyframes,
   Ve as androidRevealFromBottomOptions,
-  Ln as androidScaleFromCentre,
+  _n as androidScaleFromCentre,
   Ce as androidScaleFromCentreKeyframes,
   $e as androidScaleFromCentreOptions,
   Xe as androidScaleToCentreKeyframes,
@@ -1896,14 +1887,14 @@ export {
   yn as iOSSlideInFromLeft,
   xe as iOSSlideInFromLeftKeyframes,
   mn as iOSSlideInFromRight,
-  ke as iOSSlideInFromRightKeyframes,
+  Te as iOSSlideInFromRightKeyframes,
   Ie as iOSSlideOutToLeftKeyframes,
   Fe as iOSSlideOutToRightKeyframes,
   Pe as isHorizontalDirection,
   Ee as isOutOfBounds,
   x as isRefObject,
   we as isSupportedDirection,
-  Le as useNavigation,
+  _e as useNavigation,
   nn as useParams,
   en as useRoute,
   tn as useRouter