flemo 1.5.2 → 1.5.3

package/dist/index.mjs

@@ -1,10 +1,10 @@
-import { jsx as x, jsxs as yt } from "react/jsx-runtime";
-import at, { useEffect as Y, createContext as Et, useContext as St, useReducer as qt, Children as Mt, useImperativeHandle as Bt, useState as ot, useRef as $, useLayoutEffect as Tt, Activity as Ct } from "react";
-import { transform as bt, useAnimate as Rt, motion as At, useDragControls as Xt, AnimatePresence as Kt, MotionConfig as Wt } from "motion/react";
-var H = {}, Lt;
-function zt() {
-  if (Lt) return H;
-  Lt = 1, Object.defineProperty(H, "__esModule", { value: !0 }), H.PathError = H.TokenData = void 0, H.parse = l, H.compile = E, H.match = L, H.pathToRegexp = D, H.stringify = Q;
+import { jsx as x, jsxs as mt, Fragment as Xt } from "react/jsx-runtime";
+import st, { useEffect as V, createContext as St, useContext as Pt, useReducer as Kt, Children as Ct, useRef as O, useImperativeHandle as zt, useState as at, useLayoutEffect as Dt } from "react";
+import { transform as Rt, useAnimate as At, motion as bt, useDragControls as Wt, AnimatePresence as Jt, MotionConfig as Zt } from "motion/react";
+var G = {}, Lt;
+function te() {
+  if (Lt) return G;
+  Lt = 1, Object.defineProperty(G, "__esModule", { value: !0 }), G.PathError = G.TokenData = void 0, G.parse = l, G.compile = w, G.match = L, G.pathToRegexp = D, G.stringify = tt;
   const n = "/", e = (i) => i, t = /^[$_\p{ID_Start}]$/u, s = /^[$\u200c\u200d\p{ID_Continue}]$/u, r = {
     // Groups.
     "{": "{",
@@ -25,249 +25,252 @@ function zt() {
     return i.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
   }
   class u {
-    constructor(d, y) {
-      this.tokens = d, this.originalPath = y;
+    constructor(p, y) {
+      this.tokens = p, this.originalPath = y;
     }
   }
-  H.TokenData = u;
+  G.TokenData = u;
   class h extends TypeError {
-    constructor(d, y) {
-      let m = d;
+    constructor(p, y) {
+      let m = p;
       y && (m += `: ${y}`), m += "; visit https://git.new/pathToRegexpError for info", super(m), this.originalPath = y;
     }
   }
-  H.PathError = h;
-  function l(i, d = {}) {
-    const { encodePath: y = e } = d, m = [...i], f = [];
-    let p = 0, S = 0;
+  G.PathError = h;
+  function l(i, p = {}) {
+    const { encodePath: y = e } = p, m = [...i], g = [];
+    let f = 0, S = 0;
     function T() {
-      let w = "";
-      if (t.test(m[p]))
+      let E = "";
+      if (t.test(m[f]))
         do
-          w += m[p++];
-        while (s.test(m[p]));
-      else if (m[p] === '"') {
-        let R = p;
-        for (; p++ < m.length; ) {
-          if (m[p] === '"') {
-            p++, R = 0;
+          E += m[f++];
+        while (s.test(m[f]));
+      else if (m[f] === '"') {
+        let M = f;
+        for (; f++ < m.length; ) {
+          if (m[f] === '"') {
+            f++, M = 0;
             break;
           }
-          m[p] === "\\" && p++, w += m[p];
+          m[f] === "\\" && f++, E += m[f];
         }
-        if (R)
-          throw new h(`Unterminated quote at index ${R}`, i);
+        if (M)
+          throw new h(`Unterminated quote at index ${M}`, i);
       }
-      if (!w)
-        throw new h(`Missing parameter name at index ${p}`, i);
-      return w;
+      if (!E)
+        throw new h(`Missing parameter name at index ${f}`, i);
+      return E;
     }
-    for (; p < m.length; ) {
-      const w = m[p], R = r[w];
-      R ? f.push({ type: R, index: p++, value: w }) : w === "\\" ? f.push({ type: "escape", index: p++, value: m[p++] }) : w === ":" ? f.push({ type: "param", index: p++, value: T() }) : w === "*" ? f.push({ type: "wildcard", index: p++, value: T() }) : f.push({ type: "char", index: p++, value: w });
+    for (; f < m.length; ) {
+      const E = m[f], M = r[E];
+      M ? g.push({ type: M, index: f++, value: E }) : E === "\\" ? g.push({ type: "escape", index: f++, value: m[f++] }) : E === ":" ? g.push({ type: "param", index: f++, value: T() }) : E === "*" ? g.push({ type: "wildcard", index: f++, value: T() }) : g.push({ type: "char", index: f++, value: E });
     }
-    f.push({ type: "end", index: p, value: "" });
-    function C(w) {
-      const R = [];
+    g.push({ type: "end", index: f, value: "" });
+    function k(E) {
+      const M = [];
       for (; ; ) {
-        const N = f[S++];
-        if (N.type === w)
+        const N = g[S++];
+        if (N.type === E)
           break;
         if (N.type === "char" || N.type === "escape") {
-          let O = N.value, j = f[S];
-          for (; j.type === "char" || j.type === "escape"; )
-            O += j.value, j = f[++S];
-          R.push({
+          let R = N.value, H = g[S];
+          for (; H.type === "char" || H.type === "escape"; )
+            R += H.value, H = g[++S];
+          M.push({
             type: "text",
-            value: y(O)
+            value: y(R)
           });
           continue;
         }
         if (N.type === "param" || N.type === "wildcard") {
-          R.push({
+          M.push({
             type: N.type,
             name: N.value
           });
           continue;
         }
         if (N.type === "{") {
-          R.push({
+          M.push({
             type: "group",
-            tokens: C("}")
+            tokens: k("}")
           });
           continue;
         }
-        throw new h(`Unexpected ${N.type} at index ${N.index}, expected ${w}`, i);
+        throw new h(`Unexpected ${N.type} at index ${N.index}, expected ${E}`, i);
       }
-      return R;
+      return M;
     }
-    return new u(C("end"), i);
+    return new u(k("end"), i);
   }
-  function E(i, d = {}) {
-    const { encode: y = encodeURIComponent, delimiter: m = n } = d, f = typeof i == "object" ? i : l(i, d), p = g(f.tokens, m, y);
+  function w(i, p = {}) {
+    const { encode: y = encodeURIComponent, delimiter: m = n } = p, g = typeof i == "object" ? i : l(i, p), f = d(g.tokens, m, y);
     return function(T = {}) {
-      const [C, ...w] = p(T);
-      if (w.length)
-        throw new TypeError(`Missing parameters: ${w.join(", ")}`);
-      return C;
+      const [k, ...E] = f(T);
+      if (E.length)
+        throw new TypeError(`Missing parameters: ${E.join(", ")}`);
+      return k;
     };
   }
-  function g(i, d, y) {
-    const m = i.map((f) => c(f, d, y));
-    return (f) => {
-      const p = [""];
+  function d(i, p, y) {
+    const m = i.map((g) => c(g, p, y));
+    return (g) => {
+      const f = [""];
       for (const S of m) {
-        const [T, ...C] = S(f);
-        p[0] += T, p.push(...C);
+        const [T, ...k] = S(g);
+        f[0] += T, f.push(...k);
       }
-      return p;
+      return f;
     };
   }
-  function c(i, d, y) {
+  function c(i, p, y) {
     if (i.type === "text")
       return () => [i.value];
     if (i.type === "group") {
-      const f = g(i.tokens, d, y);
-      return (p) => {
-        const [S, ...T] = f(p);
+      const g = d(i.tokens, p, y);
+      return (f) => {
+        const [S, ...T] = g(f);
         return T.length ? [""] : [S];
       };
     }
     const m = y || e;
-    return i.type === "wildcard" && y !== !1 ? (f) => {
-      const p = f[i.name];
-      if (p == null)
+    return i.type === "wildcard" && y !== !1 ? (g) => {
+      const f = g[i.name];
+      if (f == null)
         return ["", i.name];
-      if (!Array.isArray(p) || p.length === 0)
+      if (!Array.isArray(f) || f.length === 0)
         throw new TypeError(`Expected "${i.name}" to be a non-empty array`);
       return [
-        p.map((S, T) => {
+        f.map((S, T) => {
           if (typeof S != "string")
             throw new TypeError(`Expected "${i.name}/${T}" to be a string`);
           return m(S);
-        }).join(d)
+        }).join(p)
       ];
-    } : (f) => {
-      const p = f[i.name];
-      if (p == null)
+    } : (g) => {
+      const f = g[i.name];
+      if (f == null)
         return ["", i.name];
-      if (typeof p != "string")
+      if (typeof f != "string")
         throw new TypeError(`Expected "${i.name}" to be a string`);
-      return [m(p)];
+      return [m(f)];
     };
   }
-  function L(i, d = {}) {
-    const { decode: y = decodeURIComponent, delimiter: m = n } = d, { regexp: f, keys: p } = D(i, d), S = p.map((T) => y === !1 ? e : T.type === "param" ? y : (C) => C.split(m).map(y));
-    return function(C) {
-      const w = f.exec(C);
-      if (!w)
+  function L(i, p = {}) {
+    const { decode: y = decodeURIComponent, delimiter: m = n } = p, { regexp: g, keys: f } = D(i, p), S = f.map((T) => y === !1 ? e : T.type === "param" ? y : (k) => k.split(m).map(y));
+    return function(k) {
+      const E = g.exec(k);
+      if (!E)
         return !1;
-      const R = w[0], N = /* @__PURE__ */ Object.create(null);
-      for (let O = 1; O < w.length; O++) {
-        if (w[O] === void 0)
+      const M = E[0], N = /* @__PURE__ */ Object.create(null);
+      for (let R = 1; R < E.length; R++) {
+        if (E[R] === void 0)
           continue;
-        const j = p[O - 1], ut = S[O - 1];
-        N[j.name] = ut(w[O]);
+        const H = f[R - 1], lt = S[R - 1];
+        N[H.name] = lt(E[R]);
       }
-      return { path: R, params: N };
+      return { path: M, params: N };
     };
   }
-  function D(i, d = {}) {
-    const { delimiter: y = n, end: m = !0, sensitive: f = !1, trailing: p = !0 } = d, S = [], T = f ? "" : "i", C = [];
+  function D(i, p = {}) {
+    const { delimiter: y = n, end: m = !0, sensitive: g = !1, trailing: f = !0 } = p, S = [], T = g ? "" : "i", k = [];
     for (const N of I(i, [])) {
-      const O = typeof N == "object" ? N : l(N, d);
-      for (const j of P(O.tokens, 0, []))
-        C.push(M(j, y, S, O.originalPath));
+      const R = typeof N == "object" ? N : l(N, p);
+      for (const H of v(R.tokens, 0, []))
+        k.push(b(H, y, S, R.originalPath));
     }
-    let w = `^(?:${C.join("|")})`;
-    return p && (w += `(?:${o(y)}$)?`), w += m ? "$" : `(?=${o(y)}|$)`, { regexp: new RegExp(w, T), keys: S };
+    let E = `^(?:${k.join("|")})`;
+    return f && (E += `(?:${o(y)}$)?`), E += m ? "$" : `(?=${o(y)}|$)`, { regexp: new RegExp(E, T), keys: S };
   }
-  function I(i, d) {
+  function I(i, p) {
     if (Array.isArray(i))
       for (const y of i)
-        I(y, d);
+        I(y, p);
     else
-      d.push(i);
-    return d;
+      p.push(i);
+    return p;
   }
-  function* P(i, d, y) {
-    if (d === i.length)
+  function* v(i, p, y) {
+    if (p === i.length)
       return yield y;
-    const m = i[d];
+    const m = i[p];
     if (m.type === "group")
-      for (const f of P(m.tokens, 0, y.slice()))
-        yield* P(i, d + 1, f);
+      for (const g of v(m.tokens, 0, y.slice()))
+        yield* v(i, p + 1, g);
     else
       y.push(m);
-    yield* P(i, d + 1, y);
+    yield* v(i, p + 1, y);
   }
-  function M(i, d, y, m) {
-    let f = "", p = "", S = !0;
+  function b(i, p, y, m) {
+    let g = "", f = "", S = !0;
     for (const T of i) {
       if (T.type === "text") {
-        f += o(T.value), p += T.value, S || (S = T.value.includes(d));
+        g += o(T.value), f += T.value, S || (S = T.value.includes(p));
         continue;
       }
       if (T.type === "param" || T.type === "wildcard") {
-        if (!S && !p)
+        if (!S && !f)
           throw new h(`Missing text before "${T.name}" ${T.type}`, m);
-        T.type === "param" ? f += `(${W(d, S ? "" : p)}+)` : f += "([\\s\\S]+)", y.push(T), p = "", S = !1;
+        T.type === "param" ? g += `(${ut(p, S ? "" : f)}+)` : g += "([\\s\\S]+)", y.push(T), f = "", S = !1;
         continue;
       }
     }
-    return f;
+    return g;
   }
-  function W(i, d) {
-    return d.length < 2 ? i.length < 2 ? `[^${o(i + d)}]` : `(?:(?!${o(i)})[^${o(d)}])` : i.length < 2 ? `(?:(?!${o(d)})[^${o(i)}])` : `(?:(?!${o(d)}|${o(i)})[\\s\\S])`;
+  function ut(i, p) {
+    return p.length < 2 ? i.length < 2 ? `[^${o(i + p)}]` : `(?:(?!${o(i)})[^${o(p)}])` : i.length < 2 ? `(?:(?!${o(p)})[^${o(i)}])` : `(?:(?!${o(p)}|${o(i)})[\\s\\S])`;
   }
-  function _(i) {
-    let d = "", y = 0;
-    function m(f) {
-      return k(f) && b(i[y]) ? f : JSON.stringify(f);
+  function W(i) {
+    let p = "", y = 0;
+    function m(g) {
+      return _(g) && q(i[y]) ? g : JSON.stringify(g);
     }
     for (; y < i.length; ) {
-      const f = i[y++];
-      if (f.type === "text") {
-        d += a(f.value);
+      const g = i[y++];
+      if (g.type === "text") {
+        p += a(g.value);
         continue;
       }
-      if (f.type === "group") {
-        d += `{${_(f.tokens)}}`;
+      if (g.type === "group") {
+        p += `{${W(g.tokens)}}`;
         continue;
       }
-      if (f.type === "param") {
-        d += `:${m(f.name)}`;
+      if (g.type === "param") {
+        p += `:${m(g.name)}`;
         continue;
       }
-      if (f.type === "wildcard") {
-        d += `*${m(f.name)}`;
+      if (g.type === "wildcard") {
+        p += `*${m(g.name)}`;
         continue;
       }
-      throw new TypeError(`Unknown token type: ${f.type}`);
+      throw new TypeError(`Unknown token type: ${g.type}`);
     }
-    return d;
+    return p;
   }
-  function Q(i) {
-    return _(i.tokens);
+  function tt(i) {
+    return W(i.tokens);
   }
-  function k(i) {
-    const [d, ...y] = i;
-    return t.test(d) && y.every((m) => s.test(m));
+  function _(i) {
+    const [p, ...y] = i;
+    return t.test(p) && y.every((m) => s.test(m));
   }
-  function b(i) {
+  function q(i) {
     return i && i.type === "text" ? !s.test(i.value[0]) : !0;
   }
-  return H;
+  return G;
+}
+var J = te();
+function Ot(n, e) {
+  return Array.isArray(n) ? n.find((t) => J.pathToRegexp(t).regexp.test(e)) ?? "" : J.pathToRegexp(n).regexp.test(e) ? n : "";
 }
-var K = zt();
-function Jt(n, e, t) {
-  const s = Array.isArray(n) ? n.find((u) => K.pathToRegexp(u).regexp.test(e)) || "" : K.pathToRegexp(n).regexp.test(e) ? n : "", r = K.match(s)(e), a = new URLSearchParams(t), o = Object.fromEntries(a.entries());
+function ee(n, e, t) {
+  const s = Ot(n, e), r = J.match(s)(e), a = new URLSearchParams(t), o = Object.fromEntries(a.entries());
   return r ? { ...r.params, ...o } : {};
 }
-function Dt() {
+function It() {
   return typeof document > "u";
 }
-class Zt {
+class ne {
   tasks = /* @__PURE__ */ new Map();
   instanceId = Date.now().toString();
   isLocked = !1;
@@ -335,7 +338,7 @@ class Zt {
     return new Promise((r, a) => {
       this.taskQueue = this.taskQueue.then(async () => {
         try {
-          const { control: o, validate: u, rollback: h, dependencies: l = [], delay: E } = t, g = new AbortController(), c = {
+          const { control: o, validate: u, rollback: h, dependencies: l = [], delay: w } = t, d = new AbortController(), c = {
             id: s,
             execute: e,
             timestamp: Date.now(),
@@ -346,7 +349,7 @@ class Zt {
             validate: u,
             rollback: h,
             control: o,
-            abortController: g
+            abortController: d
           };
           this.tasks.set(c.id, c), this.pendingTaskQueue.length > 0 && (this.pendingTaskQueue.push(c), await this.waitForPendingTasks(), this.pendingTaskQueue = this.pendingTaskQueue.filter((D) => D.id !== c.id));
           try {
@@ -354,14 +357,14 @@ class Zt {
               throw c.status = "FAILED", new Error("FAILED");
             try {
               c.status = "PROCESSING";
-              for (const P of c.dependencies) {
-                const M = this.tasks.get(P);
-                if (!M || M.status !== "COMPLETED")
+              for (const v of c.dependencies) {
+                const b = this.tasks.get(v);
+                if (!b || b.status !== "COMPLETED")
                   throw c.status = "FAILED", new Error("FAILED");
               }
               if (c.validate && !await c.validate())
                 throw c.status = "FAILED", new Error("FAILED");
-              E && E > 0 && await new Promise((P) => setTimeout(P, E));
+              w && w > 0 && await new Promise((v) => setTimeout(v, w));
               const I = await c.execute(c.abortController);
               if (c.abortController.signal.aborted) {
                 c.status = "COMPLETED", await this.onTaskStatusChange(c.id, "COMPLETED"), r({
@@ -374,16 +377,16 @@ class Zt {
                 return;
               }
               if (t.control) {
-                const P = t.control;
-                if (P.delay && P.delay > 0 && await new Promise((M) => setTimeout(M, P.delay)), P.manual) {
+                const v = t.control;
+                if (v.delay && v.delay > 0 && await new Promise((b) => setTimeout(b, v.delay)), v.manual) {
                   c.status = "MANUAL_PENDING", c.manualResolver = { resolve: r, reject: a, result: I }, this.pendingTaskQueue.push(c), await this.onTaskStatusChange(c.id, "MANUAL_PENDING");
                   return;
                 }
-                if (P.signal) {
-                  c.status = "SIGNAL_PENDING", c.manualResolver = { resolve: r, reject: a, result: I }, this.signalListeners.has(P.signal) || this.signalListeners.set(P.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(P.signal).add(c.id), this.pendingTaskQueue.push(c), await this.onTaskStatusChange(c.id, "SIGNAL_PENDING");
+                if (v.signal) {
+                  c.status = "SIGNAL_PENDING", c.manualResolver = { resolve: r, reject: a, result: I }, this.signalListeners.has(v.signal) || this.signalListeners.set(v.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(v.signal).add(c.id), this.pendingTaskQueue.push(c), await this.onTaskStatusChange(c.id, "SIGNAL_PENDING");
                   return;
                 }
-                if (P.condition && !await P.condition()) {
+                if (v.condition && !await v.condition()) {
                   c.status = "MANUAL_PENDING", c.manualResolver = { resolve: r, reject: a, result: I }, this.pendingTaskQueue.push(c), await this.onTaskStatusChange(c.id, "MANUAL_PENDING");
                   return;
                 }
@@ -440,29 +443,29 @@ class Zt {
     await Promise.all(e.map((t) => this.resolveTask(t.id)));
   }
 }
-const F = new Zt(), It = (n) => {
+const F = new ne(), xt = (n) => {
   let e;
-  const t = /* @__PURE__ */ new Set(), s = (l, E) => {
-    const g = typeof l == "function" ? l(e) : l;
-    if (!Object.is(g, e)) {
+  const t = /* @__PURE__ */ new Set(), s = (l, w) => {
+    const d = typeof l == "function" ? l(e) : l;
+    if (!Object.is(d, e)) {
       const c = e;
-      e = E ?? (typeof g != "object" || g === null) ? g : Object.assign({}, e, g), t.forEach((L) => L(e, c));
+      e = w ?? (typeof d != "object" || d === null) ? d : Object.assign({}, e, d), t.forEach((L) => L(e, c));
     }
   }, r = () => e, u = { setState: s, getState: r, getInitialState: () => h, subscribe: (l) => (t.add(l), () => t.delete(l)) }, h = e = n(s, r, u);
   return u;
-}, te = ((n) => n ? It(n) : It), ee = (n) => n;
-function ne(n, e = ee) {
-  const t = at.useSyncExternalStore(
+}, re = ((n) => n ? xt(n) : xt), se = (n) => n;
+function ae(n, e = se) {
+  const t = st.useSyncExternalStore(
     n.subscribe,
-    at.useCallback(() => e(n.getState()), [n, e]),
-    at.useCallback(() => e(n.getInitialState()), [n, e])
+    st.useCallback(() => e(n.getState()), [n, e]),
+    st.useCallback(() => e(n.getInitialState()), [n, e])
   );
-  return at.useDebugValue(t), t;
+  return st.useDebugValue(t), t;
 }
-const xt = (n) => {
-  const e = te(n), t = (s) => ne(e, s);
+const Nt = (n) => {
+  const e = re(n), t = (s) => ae(e, s);
   return Object.assign(t, e), t;
-}, it = ((n) => n ? xt(n) : xt), q = it((n) => ({
+}, it = ((n) => n ? Nt(n) : Nt), Q = it((n) => ({
   index: -1,
   histories: [],
   addHistory: (e) => n((t) => ({
@@ -477,30 +480,30 @@ const xt = (n) => {
     index: t.index - 1,
     histories: t.histories.filter((s, r) => r !== e)
   }))
-})), U = it((n) => ({
+})), $ = it((n) => ({
   status: "IDLE",
   setStatus: (e) => n({ status: e })
 }));
-function re() {
-  return Y(() => {
+function oe() {
+  return V(() => {
     const n = async (e) => {
       const t = e.state?.id;
       (await F.addTask(
         async (s) => {
-          const r = e.state?.index, a = e.state?.status, o = e.state?.params, u = e.state?.transitionName, h = e.state?.layoutId, l = U.getState().setStatus, { index: E, addHistory: g, popHistory: c } = q.getState(), L = r < E, D = a === "PUSHING" && r > E, I = a === "REPLACING" && r > E, P = window.location.pathname;
+          const r = e.state?.index, a = e.state?.status, o = e.state?.params, u = e.state?.transitionName, h = e.state?.layoutId, l = $.getState().setStatus, { index: w, addHistory: d, popHistory: c } = Q.getState(), L = r < w, D = a === "PUSHING" && r > w, I = a === "REPLACING" && r > w, v = window.location.pathname;
           if (!L && !D && !I) {
             s.abort();
             return;
           }
-          return L ? l("POPPING") : D ? (l("PUSHING"), g({
+          return L ? l("POPPING") : D ? (l("PUSHING"), d({
             id: t,
-            pathname: P,
+            pathname: v,
             params: o,
             transitionName: u,
             layoutId: h
-          })) : I && (l("REPLACING"), g({
+          })) : I && (l("REPLACING"), d({
             id: t,
-            pathname: P,
+            pathname: v,
             params: o,
             transitionName: u,
             layoutId: h
@@ -521,12 +524,12 @@ function re() {
     };
   }, []), null;
 }
-const Ot = Et({}), Gt = Et(() => {
+const Gt = St({}), $t = St(() => {
 });
-function se(n, e) {
+function ie(n, e) {
   return e.type === "SET" ? e.params : n;
 }
-const $t = Et({
+const Ht = St({
   id: "",
   isActive: !1,
   isRoot: !0,
@@ -536,14 +539,15 @@ const $t = Et({
   params: {},
   transitionName: "none",
   prevTransitionName: "none",
-  layoutId: null
+  layoutId: null,
+  routePath: ""
 });
-function Z() {
-  return St($t);
+function z() {
+  return Pt(Ht);
 }
-function ae({ children: n }) {
-  const { isActive: e, params: t } = Z(), [s, r] = qt(se, t);
-  return Y(() => {
+function ce({ children: n }) {
+  const { isActive: e, params: t } = z(), [s, r] = Kt(ie, t);
+  return V(() => {
     const a = async (o) => {
       o.state?.step && await F.addTask(async () => {
         r({ type: "SET", params: o.state?.params || {} });
@@ -552,18 +556,18 @@ function ae({ children: n }) {
     return e && window.addEventListener("popstate", a), () => {
       window.removeEventListener("popstate", a);
     };
-  }, [e, r]), /* @__PURE__ */ x(Gt.Provider, { value: r, children: /* @__PURE__ */ x(Ot.Provider, { value: s, children: n }) });
+  }, [e, r]), /* @__PURE__ */ x($t.Provider, { value: r, children: /* @__PURE__ */ x(Gt.Provider, { value: s, children: n }) });
 }
-function oe({ children: n }) {
-  const e = q((s) => s.index), t = q((s) => s.histories);
+function ue({ children: n }) {
+  const e = Q((s) => s.index), t = Q((s) => s.histories);
   return t.map(
-    (s) => Mt.toArray(n).filter(
-      (r) => K.pathToRegexp(r.props.path).regexp.test(
+    (s) => Ct.toArray(n).filter(
+      (r) => J.pathToRegexp(r.props.path).regexp.test(
         s.pathname
       )
     )
   ).map(([s], r) => /* @__PURE__ */ x(
-    $t.Provider,
+    Ht.Provider,
     {
       value: {
         id: t[r].id,
@@ -575,14 +579,18 @@ function oe({ children: n }) {
         params: t[r].params,
         transitionName: t[e].transitionName,
         prevTransitionName: t[e - 1]?.transitionName,
-        layoutId: t[r].layoutId
+        layoutId: t[r].layoutId,
+        routePath: Ot(
+          s.props.path,
+          t[r].pathname
+        )
       },
-      children: /* @__PURE__ */ x(ae, { children: s })
+      children: /* @__PURE__ */ x(ce, { children: s })
     },
     t[r].id
   ));
 }
-function ie({
+function le({
   name: n,
   initial: e,
   enter: t,
@@ -607,7 +615,7 @@ function ie({
     ...r
   };
 }
-const ce = ie({
+const de = le({
   name: "overlay",
   initial: {
     opacity: 0,
@@ -660,7 +668,7 @@ const ce = ie({
       }
     )
   }
-}), Pt = /* @__PURE__ */ new Map([["overlay", ce]]), mt = it((n) => ({
+}), vt = /* @__PURE__ */ new Map([["overlay", de]]), wt = it((n) => ({
   defaultTransitionName: "cupertino",
   setDefaultTransitionName: (e) => n({ defaultTransitionName: e })
 }));
@@ -692,7 +700,7 @@ function ct({
     ...u
   };
 }
-const ue = ct({
+const pe = ct({
   name: "cupertino",
   initial: {
     x: "100%"
@@ -710,7 +718,7 @@ const ue = ct({
       x: 0
     },
     options: {
-      duration: 0.3,
+      duration: 0.7,
       ease: [0.32, 0.72, 0, 1]
     }
   },
@@ -719,7 +727,7 @@ const ue = ct({
       x: "100%"
     },
     options: {
-      duration: 0.3,
+      duration: 0.6,
       ease: [0.32, 0.72, 0, 1]
     }
   },
@@ -728,7 +736,7 @@ const ue = ct({
       x: -100
     },
     options: {
-      duration: 0.3,
+      duration: 0.7,
       ease: [0.32, 0.72, 0, 1]
     }
   },
@@ -737,7 +745,7 @@ const ue = ct({
       x: 0
     },
     options: {
-      duration: 0.3,
+      duration: 0.6,
       ease: [0.32, 0.72, 0, 1]
     }
   },
@@ -746,7 +754,7 @@ const ue = ct({
     swipeDirection: "x",
     onSwipeStart: async () => !0,
     onSwipe: (n, e, { animate: t, currentScreen: s, prevScreen: r, onProgress: a }) => {
-      const { offset: o } = e, u = o.x, h = bt(u, [0, window.innerWidth], [0, 100]);
+      const { offset: o } = e, u = o.x, h = Rt(u, [0, window.innerWidth], [0, 100]);
       return a?.(!0, h), t(
         s,
         {
@@ -791,7 +799,7 @@ const ue = ct({
       ]), l;
     }
   }
-}), le = ct({
+}), fe = ct({
   name: "layout",
   initial: {
     opacity: 0.97
@@ -841,7 +849,7 @@ const ue = ct({
     swipeDirection: "y",
     onSwipeStart: async () => !0,
     onSwipe: (n, e, { animate: t, currentScreen: s, onProgress: r }) => {
-      const { offset: a } = e, o = a.y, u = Math.max(0, Math.min(56, o)), h = bt(u, [0, 56], [1, 0.96]), l = Math.max(0, o - 56), E = Math.min(1, l / 160), g = Math.sqrt(E) * 12, c = Math.max(0, u + g), L = Math.min(56, c);
+      const { offset: a } = e, o = a.y, u = Math.max(0, Math.min(56, o)), h = Rt(u, [0, 56], [1, 0.96]), l = Math.max(0, o - 56), w = Math.min(1, l / 160), d = Math.sqrt(w) * 12, c = Math.max(0, u + d), L = Math.min(56, c);
       return r?.(!0, 100), t(
         s,
         {
@@ -879,7 +887,7 @@ const ue = ct({
       ]), l;
     }
   }
-}), de = ct({
+}), he = ct({
   name: "material",
   initial: {
     y: "100%"
@@ -897,7 +905,7 @@ const ue = ct({
       y: 0
     },
     options: {
-      duration: 0.24,
+      duration: 0.35,
       ease: [0, 0, 0.2, 1]
     }
   },
@@ -906,7 +914,7 @@ const ue = ct({
       y: "100%"
     },
     options: {
-      duration: 0.22,
+      duration: 0.25,
       ease: [0.4, 0, 1, 1]
     }
   },
@@ -915,7 +923,7 @@ const ue = ct({
       y: -56
     },
     options: {
-      duration: 0.22,
+      duration: 0.35,
       ease: [0.4, 0, 1, 1]
     }
   },
@@ -924,7 +932,7 @@ const ue = ct({
       y: 0
     },
     options: {
-      duration: 0.24,
+      duration: 0.25,
       ease: [0, 0, 0.2, 1]
     }
   },
@@ -932,7 +940,7 @@ const ue = ct({
     swipeDirection: "y",
     onSwipeStart: async () => !0,
     onSwipe: (n, e, { animate: t, currentScreen: s, prevScreen: r, onProgress: a }) => {
-      const { offset: o } = e, u = o.y, h = Math.max(0, Math.min(56, u)), l = Math.max(0, u - 56), E = Math.min(1, l / 160), g = Math.sqrt(E) * 12, c = Math.max(0, h + g), L = Math.min(56, c);
+      const { offset: o } = e, u = o.y, h = Math.max(0, Math.min(56, u)), l = Math.max(0, u - 56), w = Math.min(1, l / 160), d = Math.sqrt(w) * 12, c = Math.max(0, h + d), L = Math.min(56, c);
       return a?.(!0, L), t(
         s,
         {
@@ -975,7 +983,7 @@ const ue = ct({
       ]), l;
     }
   }
-}), pe = ct({
+}), ge = ct({
   name: "none",
   initial: {},
   idle: {
@@ -1008,38 +1016,38 @@ const ue = ct({
       duration: 0
     }
   }
-}), et = /* @__PURE__ */ new Map([
-  ["none", pe],
-  ["cupertino", ue],
-  ["material", de],
-  ["layout", le]
-]), fe = (() => {
+}), K = /* @__PURE__ */ new Map([
+  ["none", ge],
+  ["cupertino", pe],
+  ["material", he],
+  ["layout", fe]
+]), ye = (() => {
   const n = /* @__PURE__ */ Object.create(null), e = Object.prototype.hasOwnProperty;
-  for (const t of et.values()) {
+  for (const t of K.values()) {
     const s = t.variants["IDLE-true"].value;
     for (const r in s)
       e.call(s, r) && (n[r] = s[r]);
   }
   return n;
 })();
-function Se({
+function Te({
   children: n,
   initPath: e = "/",
   defaultTransitionName: t = "cupertino",
   transitions: s = [],
   decorators: r = []
 }) {
-  const a = Dt() ? e || "/" : window.location.pathname, o = Dt() ? a.split("?")[1] || "" : window.location.search;
-  return mt.setState({
+  const a = It() ? e || "/" : window.location.pathname, o = It() ? a.split("?")[1] || "" : window.location.search;
+  return wt.setState({
     defaultTransitionName: t
-  }), q.setState({
+  }), Q.setState({
     index: 0,
     histories: [
       {
         id: "root",
         pathname: a,
-        params: Jt(
-          Mt.toArray(n).map((u) => u.props.path).flat(),
+        params: ee(
+          Ct.toArray(n).map((u) => u.props.path).flat(),
           a,
           o
         ),
@@ -1047,7 +1055,7 @@ function Se({
         layoutId: null
       }
     ]
-  }), Y(() => {
+  }), V(() => {
     window.history.state?.index || window.history.replaceState(
       {
         id: "root",
@@ -1060,61 +1068,53 @@ function Se({
       "",
       window.location.href
     );
-  }, [t]), Y(() => {
-    s.forEach((u) => et.set(u.name, u));
-  }, [s]), Y(() => {
-    r.forEach((u) => Pt.set(u.name, u));
-  }, [r]), /* @__PURE__ */ yt(
-    "div",
-    {
-      style: {
-        position: "fixed",
-        top: 0,
-        left: 0,
-        width: "100%",
-        height: "100%"
-      },
-      children: [
-        /* @__PURE__ */ x(re, {}),
-        /* @__PURE__ */ x(oe, { children: n })
-      ]
-    }
-  );
+  }, [t]), V(() => {
+    s.forEach((u) => K.set(u.name, u));
+  }, [s]), V(() => {
+    r.forEach((u) => vt.set(u.name, u));
+  }, [r]), /* @__PURE__ */ mt(Xt, { children: [
+    /* @__PURE__ */ x(oe, {}),
+    /* @__PURE__ */ x(ue, { children: n })
+  ] });
 }
-function Pe({ element: n }) {
+function De({ element: n }) {
   return n;
 }
-function ve() {
+function ot(n, e) {
+  const t = e ?? {}, s = J.compile(n), r = Object.fromEntries(
+    Object.entries(t).map(([d, c]) => [d, String(c)])
+  ), a = s(r), u = (typeof n == "string" ? J.parse(n) : n).tokens.filter((d) => d.type === "param").map((d) => d.name), h = Object.fromEntries(
+    Object.entries(t).filter(([d]) => !u.includes(d))
+  ), l = new URLSearchParams(h).toString();
+  return { pathname: `${a}${l ? `?${l}` : ""}`, toPathname: a };
+}
+function Le() {
   return {
     push: async (s, r, a = {}) => {
-      const { status: o, setStatus: u } = U.getState();
+      const { status: o, setStatus: u } = $.getState();
       if (o !== "COMPLETED" && o !== "IDLE")
         return;
-      const { index: h, addHistory: l } = q.getState(), E = mt.getState().defaultTransitionName, { transitionName: g = E, layoutId: c = null } = a, L = F.generateTaskId();
+      const { index: h, addHistory: l } = Q.getState(), w = wt.getState().defaultTransitionName, { transitionName: d = w, layoutId: c = null } = a, L = F.generateTaskId();
       (await F.addTask(
         async () => {
           u("PUSHING");
-          const D = K.compile(s), I = Object.fromEntries(
-            Object.entries(r).map(([k, b]) => [k, String(b)])
-          ), P = D(I), M = K.parse(s).tokens.filter((k) => k.type === "param").map((k) => k.name), W = Object.fromEntries(
-            Object.entries(r).filter(([k]) => !M.includes(k))
-          ), _ = new URLSearchParams(W).toString(), Q = `${P}${_ ? `?${_}` : ""}`;
+          const { pathname: D, toPathname: I } = ot(s, r);
           return window.history.pushState(
             {
               id: L,
               index: h + 1,
               status: "PUSHING",
               params: r,
-              transitionName: g,
+              transitionName: d,
               layoutId: c
             },
             "",
-            Q
+            D
           ), l({
             id: L,
-            pathname: P,
+            pathname: I,
             params: r,
-            transitionName: g,
+            transitionName: d,
             layoutId: c
           }), () => {
             u("COMPLETED");
@@ -1129,18 +1129,14 @@ function ve() {
       )).result?.();
     },
     replace: async (s, r, a = {}) => {
-      const { status: o, setStatus: u } = U.getState();
+      const { status: o, setStatus: u } = $.getState();
       if (o !== "COMPLETED" && o !== "IDLE")
         return;
-      const { index: h, addHistory: l } = q.getState(), E = q.getState().replaceHistory, g = mt.getState().defaultTransitionName, { transitionName: c = g, layoutId: L = null } = a, D = F.generateTaskId();
+      const { index: h, addHistory: l } = Q.getState(), w = Q.getState().replaceHistory, d = wt.getState().defaultTransitionName, { transitionName: c = d, layoutId: L = null } = a, D = F.generateTaskId();
       (await F.addTask(
         async () => {
           u("REPLACING");
-          const I = K.compile(s), P = Object.fromEntries(
-            Object.entries(r).map(([b, i]) => [b, String(i)])
-          ), M = I(P), W = K.parse(s).tokens.filter((b) => b.type === "param").map((b) => b.name), _ = Object.fromEntries(
-            Object.entries(r).filter(([b]) => !W.includes(b))
-          ), Q = new URLSearchParams(_).toString(), k = `${M}${Q ? `?${Q}` : ""}`;
+          const { pathname: I, toPathname: v } = ot(s, r);
           return window.history.replaceState(
             {
               id: D,
@@ -1151,15 +1147,15 @@ function ve() {
               layoutId: L
             },
             "",
-            k
+            I
           ), l({
             id: D,
-            pathname: M,
+            pathname: v,
             params: r,
             transitionName: c,
             layoutId: L
           }), async () => {
-            E(h), u("COMPLETED");
+            w(h), u("COMPLETED");
           };
         },
         {
@@ -1171,18 +1167,18 @@ function ve() {
       )).result?.();
     },
     pop: () => {
-      const s = U.getState().status;
+      const s = $.getState().status;
       s !== "COMPLETED" && s !== "IDLE" || window.history.back();
     }
   };
 }
-function Te() {
-  const n = St(Gt);
+function Ie() {
+  const { routePath: n } = z(), e = Pt($t);
   return {
-    pushStep: async (r) => {
-      const a = U.getState().status;
-      a !== "COMPLETED" && a !== "IDLE" || (await F.addTask(async () => {
-        const o = new URLSearchParams(r).toString(), u = `${window.location.pathname}${o ? `?${o}` : ""}`;
+    pushStep: async (a) => {
+      const o = $.getState().status;
+      o !== "COMPLETED" && o !== "IDLE" || (await F.addTask(async () => {
+        const { pathname: u } = ot(n, a);
         return window.history.state?.step || window.history.replaceState(
           {
             ...window.history.state,
@@ -1194,38 +1190,38 @@ function Te() {
           {
             ...window.history.state,
             step: !0,
-            params: r
+            params: a
           },
           "",
           u
-        ), async () => n({ type: "SET", params: r });
+        ), async () => e({ type: "SET", params: a });
       })).result?.();
     },
-    replaceStep: async (r) => {
-      const a = U.getState().status;
-      a !== "COMPLETED" && a !== "IDLE" || (await F.addTask(async () => {
-        const o = new URLSearchParams(r).toString(), u = `${window.location.pathname}${o ? `?${o}` : ""}`;
+    replaceStep: async (a) => {
+      const o = $.getState().status;
+      o !== "COMPLETED" && o !== "IDLE" || (await F.addTask(async () => {
+        const { pathname: u } = ot(n, a);
         return window.history.replaceState(
           {
             ...window.history.state,
             step: !0,
-            params: r
+            params: a
           },
           "",
           u
-        ), async () => n({ type: "SET", params: r });
+        ), async () => e({ type: "SET", params: a });
       })).result?.();
     },
     popStep: () => {
-      const r = U.getState().status;
-      r !== "COMPLETED" && r !== "IDLE" || window.history.back();
+      const a = $.getState().status;
+      a !== "COMPLETED" && a !== "IDLE" || window.history.back();
     }
   };
 }
-function Le() {
-  return St(Ot);
+function xe() {
+  return Pt(Gt);
 }
-function De({
+function Ne({
   name: n,
   initial: e,
   idle: t,
@@ -1236,8 +1232,8 @@ function De({
   popOnEnter: u,
   popOnExit: h,
   completedOnExit: l,
-  completedOnEnter: E,
-  options: g
+  completedOnEnter: w,
+  options: d
 }) {
   return {
     name: n,
@@ -1252,12 +1248,12 @@ function De({
       "POPPING-false": h,
       "POPPING-true": u,
       "COMPLETED-false": l,
-      "COMPLETED-true": E
+      "COMPLETED-true": w
     },
-    ...g
+    ...d
   };
 }
-function Ie({
+function ke({
   name: n,
   initial: e,
   idle: t,
@@ -1268,8 +1264,8 @@ function Ie({
   popOnEnter: u,
   popOnExit: h,
   completedOnEnter: l,
-  completedOnExit: E,
-  options: g
+  completedOnExit: w,
+  options: d
 }) {
   return {
     name: n,
@@ -1283,32 +1279,44 @@ function Ie({
       "REPLACING-true": a,
       "POPPING-false": h,
       "POPPING-true": u,
-      "COMPLETED-false": E,
+      "COMPLETED-false": w,
       "COMPLETED-true": l
     },
-    ...g
+    ...d
   };
 }
-function Nt(n, e) {
+function Ut({ freeze: n, children: e }) {
+  const t = O(e);
+  return n || (t.current = e), /* @__PURE__ */ x(
+    "div",
+    {
+      style: {
+        display: n ? "none" : void 0
+      },
+      children: t.current
+    }
+  );
+}
+function kt(n, e) {
   const {
     direction: t = "x",
     markerSelector: s = "[data-swipe-at-edge]",
     depthLimit: r = 24,
     verifyByScroll: a = !1
-  } = e ?? {}, o = he(n);
+  } = e ?? {}, o = me(n);
   if (!o) return { element: null, hasMarker: !1 };
   const u = o.closest?.(s);
-  if (u instanceof HTMLElement && wt(u, t) && (!a || kt(u, t)))
+  if (u instanceof HTMLElement && Et(u, t) && (!a || Mt(u, t)))
     return { element: u, hasMarker: !0 };
   let h = o, l = 0;
   for (; h && h !== document.body && l < r; ) {
-    if (wt(h, t) && (!a || kt(h, t)))
+    if (Et(h, t) && (!a || Mt(h, t)))
       return { element: h, hasMarker: !1 };
     h = h.parentElement, l++;
   }
   return { element: null, hasMarker: !1 };
 }
-function he(n) {
+function me(n) {
   if (!n) return null;
   const e = n, t = typeof e.composedPath == "function" ? e.composedPath() : void 0;
   if (t && t.length) {
@@ -1317,11 +1325,11 @@ function he(n) {
   }
   return n;
 }
-function wt(n, e) {
+function Et(n, e) {
   return e === "y" ? n.scrollHeight - n.clientHeight > 1 : n.scrollWidth - n.clientWidth > 1;
 }
-function kt(n, e) {
-  if (!wt(n, e)) return !1;
+function Mt(n, e) {
+  if (!Et(n, e)) return !1;
   if (e === "y") {
     const t = n.scrollTop;
     if (n.scrollTop = t + 1, n.scrollTop !== t)
@@ -1338,19 +1346,19 @@ function kt(n, e) {
     return n.scrollLeft = t, r;
   }
 }
-function ge({ children: n, ref: e, ...t }) {
-  const { isActive: s, transitionName: r } = Z(), [a, o] = Rt();
-  Bt(e, () => a.current);
-  const u = U((c) => c.status), h = et.get(r), { decoratorName: l } = h, { initial: E, variants: g } = Pt.get(l);
-  return Y(() => {
+function we({ children: n, ref: e, ...t }) {
+  const { isActive: s, transitionName: r } = z(), [a, o] = At();
+  zt(e, () => a.current);
+  const u = $((c) => c.status), h = K.get(r) ?? K.get("none"), { decoratorName: l } = h, { initial: w, variants: d } = vt.get(l);
+  return V(() => {
     if (!a.current) return;
-    const { value: c, options: L } = g[`${u}-${s}`];
+    const { value: c, options: L } = d[`${u}-${s}`];
     o(a.current, c, L);
-  }, [u, s, o, g, a]), /* @__PURE__ */ x(
-    At.div,
+  }, [u, s, o, d, a]), /* @__PURE__ */ x(
+    bt.div,
     {
       ref: a,
-      initial: E,
+      initial: w,
       style: {
         position: "absolute",
         top: 0,
@@ -1364,28 +1372,28 @@ function ge({ children: n, ref: e, ...t }) {
     }
   );
 }
-const J = it((n) => ({
+const X = it((n) => ({
   dragStatus: "IDLE",
   replaceTransitionStatus: "IDLE",
   setDragStatus: (e) => n({ dragStatus: e }),
   setReplaceTransitionStatus: (e) => n({ replaceTransitionStatus: e })
 }));
-let gt = 0;
-function ye() {
-  const [n, e] = ot(0), [t, s] = ot(0);
-  return Y(() => {
+let yt = 0;
+function Ee() {
+  const [n, e] = at(0), [t, s] = at(0);
+  return V(() => {
     const r = () => {
       let a = document.documentElement.scrollHeight - (window.visualViewport?.height || 0);
       a = a < 0 ? 0 : a;
-      let o = a - gt;
-      o = o < 0 ? 0 : o, gt || (gt = a), s(o), e(a);
+      let o = a - yt;
+      o = o < 0 ? 0 : o, yt || (yt = a), s(o), e(a);
     };
     return window.visualViewport?.addEventListener("resize", r), window.visualViewport?.addEventListener("scroll", r), () => {
       window.visualViewport?.removeEventListener("resize", r), window.visualViewport?.removeEventListener("scroll", r);
     };
   }, []), { viewportScrollHeight: n, changedViewportScrollHeight: t };
 }
-function Ht({
+function _t({
   children: n,
   statusBarHeight: e,
   statusBarColor: t,
@@ -1396,129 +1404,128 @@ function Ht({
   appBar: u,
   navigationBar: h,
   hideStatusBar: l,
-  hideSystemNavigationBar: E,
-  backgroundColor: g = "white",
+  hideSystemNavigationBar: w,
+  backgroundColor: d = "white",
   contentScrollable: c = !0,
   ...L
 }) {
-  const [D, I] = Rt(), { id: P, isActive: M, isRoot: W, transitionName: _, prevTransitionName: Q } = Z(), k = Xt(), b = U((v) => v.status), i = J((v) => v.dragStatus), d = J.getState().setDragStatus, y = J.getState().setReplaceTransitionStatus, m = et.get(_), { variants: f, initial: p, swipeDirection: S, decoratorName: T } = m, C = Pt.get(T), { viewportScrollHeight: w } = ye(), R = w > 0, [N, O] = ot(0), [j, ut] = ot(0), vt = $(null), nt = $(null), rt = $(null), st = $(null), B = $(!1), tt = $(!1), X = $({
+  const [D, I] = At(), { id: v, isActive: b, isRoot: ut, transitionName: W, prevTransitionName: tt } = z(), _ = Wt(), q = $((P) => P.status), i = X((P) => P.dragStatus), p = X.getState().setDragStatus, y = X.getState().setReplaceTransitionStatus, m = K.get(W) ?? K.get("none"), { variants: g, initial: f, swipeDirection: S, decoratorName: T } = m, k = vt.get(T), { viewportScrollHeight: E } = Ee(), M = E > 0, [N, R] = at(0), [H, lt] = at(0), Tt = O(null), et = O(null), nt = O(null), rt = O(null), j = O(!1), Z = O(!1), Y = O({
     element: null,
     hasMarker: !1
-  }), z = $({ element: null, hasMarker: !1 }), lt = $(0), dt = $(0), pt = $(null), ft = $(null), Ut = async (v, G) => {
-    if (!S || w > 10)
+  }), B = O({ element: null, hasMarker: !1 }), dt = O(0), pt = O(0), ft = O(null), ht = O(null), Ft = async (P, A) => {
+    if (!S || E > 10)
       return;
-    const A = vt.current?.previousSibling;
-    nt.current = A?.querySelector("[data-screen]"), st.current = A?.querySelector("[data-decorator]");
-    const V = await m?.onSwipeStart(v, G, {
+    const C = Tt.current?.parentElement?.previousElementSibling;
+    et.current = C?.querySelector("[data-screen]"), rt.current = C?.querySelector("[data-decorator]");
+    const U = await m?.onSwipeStart(P, A, {
       animate: I,
       currentScreen: D.current,
-      prevScreen: nt.current,
-      dragControls: k,
-      onStart: (ht) => C?.onSwipeStart?.(ht, {
+      prevScreen: et.current,
+      dragControls: _,
+      onStart: (gt) => k?.onSwipeStart?.(gt, {
         animate: I,
-        currentDecorator: rt.current,
-        prevDecorator: st.current
+        currentDecorator: nt.current,
+        prevDecorator: rt.current
       })
     });
-    d(V ? "PENDING" : "IDLE");
-  }, _t = (v, G) => {
-    !S || i !== "PENDING" || w > 10 || m?.onSwipe(v, G, {
+    p(U ? "PENDING" : "IDLE");
+  }, Vt = (P, A) => {
+    !S || i !== "PENDING" || E > 10 || m.onSwipe(P, A, {
       animate: I,
       currentScreen: D.current,
-      prevScreen: nt.current,
-      dragControls: k,
-      onProgress: (A, V) => C?.onSwipe?.(A, V, {
+      prevScreen: et.current,
+      dragControls: _,
+      onProgress: (C, U) => k?.onSwipe?.(C, U, {
         animate: I,
-        currentDecorator: rt.current,
-        prevDecorator: st.current
+        currentDecorator: nt.current,
+        prevDecorator: rt.current
       })
     });
-  }, jt = async (v, G) => {
-    if (!S || i !== "PENDING" || w > 10)
+  }, Qt = async (P, A) => {
+    if (!S || i !== "PENDING" || E > 10)
       return;
-    await m?.onSwipeEnd(v, G, {
+    await m?.onSwipeEnd(P, A, {
       animate: I,
       currentScreen: D.current,
-      prevScreen: nt.current,
-      onStart: (V) => C?.onSwipeEnd?.(V, {
+      prevScreen: et.current,
+      onStart: (U) => k?.onSwipeEnd?.(U, {
         animate: I,
-        currentDecorator: rt.current,
-        prevDecorator: st.current
+        currentDecorator: nt.current,
+        prevDecorator: rt.current
       })
-    }) ? window.history.back() : d("IDLE");
-  }, Vt = (v) => {
-    if (!(!W && M && b === "COMPLETED" && i === "IDLE" && !!S && w < 10))
+    }) ? window.history.back() : p("IDLE");
+  }, jt = (P) => {
+    if (!(!ut && b && q === "COMPLETED" && i === "IDLE" && !!S && E < 10))
       return;
-    X.current = Nt(v.target, {
+    Y.current = kt(P.target, {
       direction: "x",
       verifyByScroll: !0
-    }), z.current = Nt(v.target, {
+    }), B.current = kt(P.target, {
       direction: "y",
       verifyByScroll: !0
-    }), lt.current = v.clientX, dt.current = v.clientY, (!X.current.element && !z.current.element || X.current.element || z.current.element) && (B.current = !0);
-  }, Qt = (v) => {
-    if (w > 10)
+    }), dt.current = P.clientX, pt.current = P.clientY, (!Y.current.element && !B.current.element || Y.current.element || B.current.element) && (j.current = !0);
+  }, Yt = (P) => {
+    if (E > 10)
       return;
-    const G = !X.current.element && !z.current.element;
-    if (B.current && G) {
-      B.current = !1, tt.current = !0;
-      const A = v.clientY - dt.current, V = v.clientX - lt.current;
-      (S === "y" && A > 0 || S === "x" && V > 0) && k.start(v);
-    } else if (B.current && !G) {
-      const A = v.clientX - lt.current, V = v.clientY - dt.current, ht = z.current.element && z.current.element.scrollTop <= 0, Yt = X.current.element && X.current.element.scrollLeft <= 0 && X.current.hasMarker;
-      (S === "y" && (ht || X.current.element) && V > 0 && Math.abs(A) < 2 || S === "x" && (Yt || z.current.element) && A > 0 && Math.abs(V) < 2) && (B.current = !1, tt.current = !0, k.start(v));
+    const A = !Y.current.element && !B.current.element;
+    if (j.current && A) {
+      j.current = !1, Z.current = !0;
+      const C = P.clientY - pt.current, U = P.clientX - dt.current;
+      (S === "y" && C > 0 || S === "x" && U > 0) && _.start(P);
+    } else if (j.current && !A) {
+      const C = P.clientX - dt.current, U = P.clientY - pt.current, gt = B.current.element && B.current.element.scrollTop <= 0, Bt = Y.current.element && Y.current.element.scrollLeft <= 0 && Y.current.hasMarker;
+      (S === "y" && (gt || Y.current.element) && U > 0 && Math.abs(C) < 2 || S === "x" && (Bt || B.current.element) && C > 0 && Math.abs(U) < 2) && (j.current = !1, Z.current = !0, _.start(P));
     }
-  }, Ft = () => {
-    B.current = !1, tt.current = !1;
+  }, qt = () => {
+    j.current = !1, Z.current = !1;
   };
-  return Y(() => {
-    const v = D.current;
-    if (!v) return;
-    const G = (A) => {
-      tt.current && A.preventDefault(), A.target?.dataset.swipeAtEdgeBar === "true" && A.preventDefault();
+  return V(() => {
+    const P = D.current;
+    if (!P) return;
+    const A = (C) => {
+      Z.current && C.preventDefault(), C.target?.dataset.swipeAtEdgeBar === "true" && C.preventDefault();
     };
-    return v.addEventListener("touchmove", G, {
+    return P.addEventListener("touchmove", A, {
       passive: !1
     }), () => {
-      v.removeEventListener("touchmove", G);
+      P.removeEventListener("touchmove", A);
     };
-  }, [D]), Y(() => {
+  }, [D]), V(() => {
     D.current && (async () => {
-      const { value: v, options: G } = f[`${b}-${M}`];
-      !M && b === "REPLACING" && Q !== _ && (y("PENDING"), await I(D.current, fe, {
+      const { value: P, options: A } = g[`${q}-${b}`];
+      !b && q === "REPLACING" && tt !== W && (y("PENDING"), await I(D.current, ye, {
         duration: 0.1
-      })), M && b === "COMPLETED" && (d("IDLE"), y("IDLE")), await I(D.current, v, G), await F.resolveTask(P);
+      })), b && q === "COMPLETED" && (p("IDLE"), y("IDLE")), await I(D.current, P, A), await F.resolveTask(v);
     })();
   }, [
+    q,
     b,
-    M,
-    P,
-    Q,
-    _,
+    v,
+    tt,
+    W,
     I,
     D,
-    f,
-    d,
+    g,
+    p,
     y
-  ]), Tt(() => {
-    pt.current && O(pt.current.offsetHeight);
-  }, [a]), Tt(() => {
-    ft.current && ut(ft.current.offsetHeight);
-  }, [o]), /* @__PURE__ */ yt(
+  ]), Dt(() => {
+    ft.current && R(ft.current.offsetHeight);
+  }, [a]), Dt(() => {
+    ht.current && lt(ht.current.offsetHeight);
+  }, [o]), /* @__PURE__ */ mt(
     "div",
     {
-      ref: vt,
+      ref: Tt,
       style: {
-        position: "absolute",
+        position: "fixed",
         top: 0,
         left: 0,
         width: "100%",
         height: "100%",
         display: "flex",
+        contain: "strict",
         flexDirection: "column",
         boxSizing: "border-box",
-        isolation: "isolate",
-        contain: "strict",
         overscrollBehavior: "contain"
       },
       children: [
@@ -1527,7 +1534,7 @@ function Ht({
           {
             "data-swipe-at-edge-bar": !0,
             style: {
-              position: "absolute",
+              position: "fixed",
               top: 0,
               left: 0,
               width: 8,
@@ -1539,9 +1546,9 @@ function Ht({
         a && /* @__PURE__ */ x(
           "div",
           {
-            ref: pt,
+            ref: ft,
             style: {
-              position: "absolute",
+              position: "fixed",
               top: l ? 0 : e,
               left: 0,
               width: "100%"
@@ -1549,31 +1556,27 @@ function Ht({
             children: a
           }
         ),
-        /* @__PURE__ */ yt(
-          At.div,
+        /* @__PURE__ */ mt(
+          bt.div,
           {
             ref: D,
             ...L,
-            initial: p,
+            initial: f,
             drag: S,
             dragListener: !1,
-            dragControls: k,
-            onDragStart: Ut,
-            onDrag: _t,
-            onDragEnd: jt,
-            onPointerDown: Vt,
-            onPointerMove: Qt,
-            onPointerUp: Ft,
-            transition: {
-              inherit: !0,
-              ...L.transition
-            },
+            dragControls: _,
+            onDragStart: Ft,
+            onDrag: Vt,
+            onDragEnd: Qt,
+            onPointerDown: jt,
+            onPointerMove: Yt,
+            onPointerUp: qt,
             "data-screen": !0,
             style: {
               display: "flex",
               flexDirection: "column",
               height: "100%",
-              backgroundColor: g,
+              backgroundColor: d,
               overflowY: c ? void 0 : "auto",
               ...L.style
             },
@@ -1617,17 +1620,17 @@ function Ht({
                 "div",
                 {
                   style: {
-                    display: R ? "none" : void 0,
+                    display: M ? "none" : void 0,
                     width: "100%",
-                    minHeight: j
+                    minHeight: H
                   }
                 }
               ),
-              !E && s && /* @__PURE__ */ x(
+              !w && s && /* @__PURE__ */ x(
                 "div",
                 {
                   style: {
-                    display: R ? "none" : void 0,
+                    display: M ? "none" : void 0,
                     minHeight: s
                   },
                   children: /* @__PURE__ */ x(
@@ -1650,23 +1653,23 @@ function Ht({
         o && /* @__PURE__ */ x(
           "div",
           {
-            ref: ft,
+            ref: ht,
             style: {
-              position: "absolute",
-              bottom: E ? 0 : s,
+              position: "fixed",
+              bottom: w ? 0 : s,
               left: 0,
               width: "100%"
             },
             children: o
           }
         ),
-        C && /* @__PURE__ */ x(ge, { ref: rt }),
+        k && /* @__PURE__ */ x(we, { ref: nt }),
         /* @__PURE__ */ x(
           "div",
           {
             "data-swipe-at-edge-bar": !0,
             style: {
-              position: "absolute",
+              position: "fixed",
               top: 0,
               right: 0,
               width: 8,
@@ -1679,28 +1682,28 @@ function Ht({
     }
   );
 }
-function xe({ children: n, ...e }) {
-  const { isActive: t, isPrev: s, zIndex: r } = Z(), a = q((g) => g.index), o = U((g) => g.status), u = J((g) => g.dragStatus), h = J((g) => g.replaceTransitionStatus), E = !t && (o === "COMPLETED" && u === "IDLE") || s && a - 2 <= r && h === "IDLE" || s && a - 2 > r;
-  return /* @__PURE__ */ x(Ht, { ...e, children: /* @__PURE__ */ x(Ct, { mode: E ? "hidden" : "visible", children: n }) });
+function Me({ children: n, ...e }) {
+  const { isActive: t, isPrev: s, zIndex: r } = z(), a = Q((d) => d.index), o = $((d) => d.status), u = X((d) => d.dragStatus), h = X((d) => d.replaceTransitionStatus), w = !t && (o === "COMPLETED" && u === "IDLE") || s && a - 2 <= r && h === "IDLE" || s && a - 2 > r;
+  return /* @__PURE__ */ x(Ut, { freeze: w, children: /* @__PURE__ */ x(_t, { ...e, children: n }) });
 }
-function Ne({ children: n, ...e }) {
-  const { isActive: t, isPrev: s, zIndex: r } = Z(), a = q((g) => g.index), o = U((g) => g.status), u = J((g) => g.dragStatus), h = J((g) => g.replaceTransitionStatus), E = !t && (o === "COMPLETED" && u === "IDLE") || s && a - 2 <= r && h === "IDLE" || s && a - 2 > r;
-  return /* @__PURE__ */ x(
-    Ht,
+function Ce({ children: n, ...e }) {
+  const { isActive: t, isPrev: s, zIndex: r } = z(), a = Q((d) => d.index), o = $((d) => d.status), u = X((d) => d.dragStatus), h = X((d) => d.replaceTransitionStatus), w = !t && (o === "COMPLETED" && u === "IDLE") || s && a - 2 <= r && h === "IDLE" || s && a - 2 > r;
+  return /* @__PURE__ */ x(Ut, { freeze: w, children: /* @__PURE__ */ x(
+    _t,
     {
       ...e,
       style: {
         backgroundColor: "transparent",
         ...e.style
       },
-      children: /* @__PURE__ */ x(Kt, { children: /* @__PURE__ */ x(Ct, { mode: E ? "hidden" : "visible", children: n }) })
+      children: /* @__PURE__ */ x(Jt, { children: n })
     }
-  );
+  ) });
 }
-function ke({ children: n, ...e }) {
-  const { isActive: t, transitionName: s } = Z(), r = U((o) => o.status), a = et.get(s);
+function Re({ children: n, ...e }) {
+  const { isActive: t, transitionName: s } = z(), r = $((o) => o.status), a = K.get(s);
   return /* @__PURE__ */ x(
-    Wt,
+    Zt,
     {
       transition: a?.variants[`${r}-${t}`]?.options,
       ...e,
@@ -1709,18 +1712,18 @@ function ke({ children: n, ...e }) {
   );
 }
 export {
-  ke as LayoutConfig,
-  Ne as LayoutScreen,
-  Pe as Route,
-  Se as Router,
-  xe as Screen,
-  ie as createDecorator,
-  Ie as createRawDecorator,
-  De as createRawTransition,
+  Re as LayoutConfig,
+  Ce as LayoutScreen,
+  De as Route,
+  Te as Router,
+  Me as Screen,
+  le as createDecorator,
+  ke as createRawDecorator,
+  Ne as createRawTransition,
   ct as createTransition,
-  ve as useNavigate,
-  Le as useParams,
-  Z as useScreen,
-  Te as useStep,
-  ye as useViewportScrollHeight
+  Le as useNavigate,
+  xe as useParams,
+  z as useScreen,
+  Ie as useStep,
+  Ee as useViewportScrollHeight
 };