flemo 1.5.1 → 1.5.2

package/dist/index.mjs

@@ -24,21 +24,21 @@ function zt() {
   function o(i) {
     return i.replace(/[.+*?^${}()[\]|/\\]/g, "\\$&");
   }
-  class c {
+  class u {
     constructor(d, y) {
       this.tokens = d, this.originalPath = y;
     }
   }
-  H.TokenData = c;
-  class f extends TypeError {
+  H.TokenData = u;
+  class h extends TypeError {
     constructor(d, y) {
       let m = d;
       y && (m += `: ${y}`), m += "; visit https://git.new/pathToRegexpError for info", super(m), this.originalPath = y;
     }
   }
-  H.PathError = f;
+  H.PathError = h;
   function l(i, d = {}) {
-    const { encodePath: y = e } = d, m = [...i], h = [];
+    const { encodePath: y = e } = d, m = [...i], f = [];
     let p = 0, S = 0;
     function T() {
       let w = "";
@@ -56,27 +56,27 @@ function zt() {
           m[p] === "\\" && p++, w += m[p];
         }
         if (R)
-          throw new f(`Unterminated quote at index ${R}`, i);
+          throw new h(`Unterminated quote at index ${R}`, i);
       }
       if (!w)
-        throw new f(`Missing parameter name at index ${p}`, i);
+        throw new h(`Missing parameter name at index ${p}`, i);
       return w;
     }
     for (; p < m.length; ) {
       const w = m[p], R = r[w];
-      R ? h.push({ type: R, index: p++, value: w }) : w === "\\" ? h.push({ type: "escape", index: p++, value: m[p++] }) : w === ":" ? h.push({ type: "param", index: p++, value: T() }) : w === "*" ? h.push({ type: "wildcard", index: p++, value: T() }) : h.push({ type: "char", index: p++, value: 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 });
     }
-    h.push({ type: "end", index: p, value: "" });
+    f.push({ type: "end", index: p, value: "" });
     function C(w) {
       const R = [];
       for (; ; ) {
-        const N = h[S++];
+        const N = f[S++];
         if (N.type === w)
           break;
         if (N.type === "char" || N.type === "escape") {
-          let O = N.value, j = h[S];
+          let O = N.value, j = f[S];
           for (; j.type === "char" || j.type === "escape"; )
-            O += j.value, j = h[++S];
+            O += j.value, j = f[++S];
           R.push({
             type: "text",
             value: y(O)
@@ -97,14 +97,14 @@ function zt() {
           });
           continue;
         }
-        throw new f(`Unexpected ${N.type} at index ${N.index}, expected ${w}`, i);
+        throw new h(`Unexpected ${N.type} at index ${N.index}, expected ${w}`, i);
       }
       return R;
     }
-    return new c(C("end"), i);
+    return new u(C("end"), i);
   }
   function E(i, d = {}) {
-    const { encode: y = encodeURIComponent, delimiter: m = n } = d, h = typeof i == "object" ? i : l(i, d), p = g(h.tokens, m, y);
+    const { encode: y = encodeURIComponent, delimiter: m = n } = d, f = typeof i == "object" ? i : l(i, d), p = g(f.tokens, m, y);
     return function(T = {}) {
       const [C, ...w] = p(T);
       if (w.length)
@@ -113,29 +113,29 @@ function zt() {
     };
   }
   function g(i, d, y) {
-    const m = i.map((h) => u(h, d, y));
-    return (h) => {
+    const m = i.map((f) => c(f, d, y));
+    return (f) => {
       const p = [""];
       for (const S of m) {
-        const [T, ...C] = S(h);
+        const [T, ...C] = S(f);
         p[0] += T, p.push(...C);
       }
       return p;
     };
   }
-  function u(i, d, y) {
+  function c(i, d, y) {
     if (i.type === "text")
       return () => [i.value];
     if (i.type === "group") {
-      const h = g(i.tokens, d, y);
+      const f = g(i.tokens, d, y);
       return (p) => {
-        const [S, ...T] = h(p);
+        const [S, ...T] = f(p);
         return T.length ? [""] : [S];
       };
     }
     const m = y || e;
-    return i.type === "wildcard" && y !== !1 ? (h) => {
-      const p = h[i.name];
+    return i.type === "wildcard" && y !== !1 ? (f) => {
+      const p = f[i.name];
       if (p == null)
         return ["", i.name];
       if (!Array.isArray(p) || p.length === 0)
@@ -147,8 +147,8 @@ function zt() {
           return m(S);
         }).join(d)
       ];
-    } : (h) => {
-      const p = h[i.name];
+    } : (f) => {
+      const p = f[i.name];
       if (p == null)
         return ["", i.name];
       if (typeof p != "string")
@@ -157,9 +157,9 @@ function zt() {
     };
   }
   function L(i, d = {}) {
-    const { decode: y = decodeURIComponent, delimiter: m = n } = d, { regexp: h, keys: p } = D(i, d), S = p.map((T) => y === !1 ? e : T.type === "param" ? y : (C) => C.split(m).map(y));
+    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 = h.exec(C);
+      const w = f.exec(C);
       if (!w)
         return !1;
       const R = w[0], N = /* @__PURE__ */ Object.create(null);
@@ -173,7 +173,7 @@ function zt() {
     };
   }
   function D(i, d = {}) {
-    const { delimiter: y = n, end: m = !0, sensitive: h = !1, trailing: p = !0 } = d, S = [], T = h ? "" : "i", C = [];
+    const { delimiter: y = n, end: m = !0, sensitive: f = !1, trailing: p = !0 } = d, S = [], T = f ? "" : "i", C = [];
     for (const N of I(i, [])) {
       const O = typeof N == "object" ? N : l(N, d);
       for (const j of P(O.tokens, 0, []))
@@ -195,55 +195,55 @@ function zt() {
       return yield y;
     const m = i[d];
     if (m.type === "group")
-      for (const h of P(m.tokens, 0, y.slice()))
-        yield* P(i, d + 1, h);
+      for (const f of P(m.tokens, 0, y.slice()))
+        yield* P(i, d + 1, f);
     else
       y.push(m);
     yield* P(i, d + 1, y);
   }
   function M(i, d, y, m) {
-    let h = "", p = "", S = !0;
+    let f = "", p = "", S = !0;
     for (const T of i) {
       if (T.type === "text") {
-        h += o(T.value), p += T.value, S || (S = T.value.includes(d));
+        f += o(T.value), p += T.value, S || (S = T.value.includes(d));
         continue;
       }
       if (T.type === "param" || T.type === "wildcard") {
         if (!S && !p)
-          throw new f(`Missing text before "${T.name}" ${T.type}`, m);
-        T.type === "param" ? h += `(${W(d, S ? "" : p)}+)` : h += "([\\s\\S]+)", y.push(T), p = "", S = !1;
+          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;
         continue;
       }
     }
-    return h;
+    return f;
   }
   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 _(i) {
     let d = "", y = 0;
-    function m(h) {
-      return k(h) && b(i[y]) ? h : JSON.stringify(h);
+    function m(f) {
+      return k(f) && b(i[y]) ? f : JSON.stringify(f);
     }
     for (; y < i.length; ) {
-      const h = i[y++];
-      if (h.type === "text") {
-        d += a(h.value);
+      const f = i[y++];
+      if (f.type === "text") {
+        d += a(f.value);
         continue;
       }
-      if (h.type === "group") {
-        d += `{${_(h.tokens)}}`;
+      if (f.type === "group") {
+        d += `{${_(f.tokens)}}`;
         continue;
       }
-      if (h.type === "param") {
-        d += `:${m(h.name)}`;
+      if (f.type === "param") {
+        d += `:${m(f.name)}`;
         continue;
       }
-      if (h.type === "wildcard") {
-        d += `*${m(h.name)}`;
+      if (f.type === "wildcard") {
+        d += `*${m(f.name)}`;
         continue;
       }
-      throw new TypeError(`Unknown token type: ${h.type}`);
+      throw new TypeError(`Unknown token type: ${f.type}`);
     }
     return d;
   }
@@ -261,7 +261,7 @@ function zt() {
 }
 var K = zt();
 function Jt(n, e, t) {
-  const s = Array.isArray(n) ? n.find((c) => K.pathToRegexp(c).regexp.test(e)) || "" : K.pathToRegexp(n).regexp.test(e) ? n : "", r = K.match(s)(e), a = new URLSearchParams(t), o = Object.fromEntries(a.entries());
+  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());
   return r ? { ...r.params, ...o } : {};
 }
 function Dt() {
@@ -335,7 +335,7 @@ class Zt {
     return new Promise((r, a) => {
       this.taskQueue = this.taskQueue.then(async () => {
         try {
-          const { control: o, validate: c, rollback: f, dependencies: l = [], delay: E } = t, g = new AbortController(), u = {
+          const { control: o, validate: u, rollback: h, dependencies: l = [], delay: E } = t, g = new AbortController(), c = {
             id: s,
             execute: e,
             timestamp: Date.now(),
@@ -343,31 +343,31 @@ class Zt {
             status: "PENDING",
             dependencies: l,
             instanceId: this.instanceId,
-            validate: c,
-            rollback: f,
+            validate: u,
+            rollback: h,
             control: o,
             abortController: g
           };
-          this.tasks.set(u.id, u), this.pendingTaskQueue.length > 0 && (this.pendingTaskQueue.push(u), await this.waitForPendingTasks(), this.pendingTaskQueue = this.pendingTaskQueue.filter((D) => D.id !== u.id));
+          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 {
-            if (!await this.acquireLock(u.id))
-              throw u.status = "FAILED", new Error("FAILED");
+            if (!await this.acquireLock(c.id))
+              throw c.status = "FAILED", new Error("FAILED");
             try {
-              u.status = "PROCESSING";
-              for (const P of u.dependencies) {
+              c.status = "PROCESSING";
+              for (const P of c.dependencies) {
                 const M = this.tasks.get(P);
                 if (!M || M.status !== "COMPLETED")
-                  throw u.status = "FAILED", new Error("FAILED");
+                  throw c.status = "FAILED", new Error("FAILED");
               }
-              if (u.validate && !await u.validate())
-                throw u.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));
-              const I = await u.execute(u.abortController);
-              if (u.abortController.signal.aborted) {
-                u.status = "COMPLETED", await this.onTaskStatusChange(u.id, "COMPLETED"), r({
+              const I = await c.execute(c.abortController);
+              if (c.abortController.signal.aborted) {
+                c.status = "COMPLETED", await this.onTaskStatusChange(c.id, "COMPLETED"), r({
                   success: !0,
                   result: void 0,
-                  taskId: u.id,
+                  taskId: c.id,
                   timestamp: Date.now(),
                   instanceId: this.instanceId
                 });
@@ -376,34 +376,34 @@ class Zt {
               if (t.control) {
                 const P = t.control;
                 if (P.delay && P.delay > 0 && await new Promise((M) => setTimeout(M, P.delay)), P.manual) {
-                  u.status = "MANUAL_PENDING", u.manualResolver = { resolve: r, reject: a, result: I }, this.pendingTaskQueue.push(u), await this.onTaskStatusChange(u.id, "MANUAL_PENDING");
+                  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) {
-                  u.status = "SIGNAL_PENDING", u.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(u.id), this.pendingTaskQueue.push(u), await this.onTaskStatusChange(u.id, "SIGNAL_PENDING");
+                  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");
                   return;
                 }
                 if (P.condition && !await P.condition()) {
-                  u.status = "MANUAL_PENDING", u.manualResolver = { resolve: r, reject: a, result: I }, this.pendingTaskQueue.push(u), await this.onTaskStatusChange(u.id, "MANUAL_PENDING");
+                  c.status = "MANUAL_PENDING", c.manualResolver = { resolve: r, reject: a, result: I }, this.pendingTaskQueue.push(c), await this.onTaskStatusChange(c.id, "MANUAL_PENDING");
                   return;
                 }
               }
-              u.status = "COMPLETED", await this.onTaskStatusChange(u.id, "COMPLETED"), r({
+              c.status = "COMPLETED", await this.onTaskStatusChange(c.id, "COMPLETED"), r({
                 success: !0,
                 result: I,
-                taskId: u.id,
+                taskId: c.id,
                 timestamp: Date.now(),
                 instanceId: this.instanceId
               });
             } catch (I) {
-              if (u.status = "FAILED", u.rollback)
+              if (c.status = "FAILED", c.rollback)
                 try {
-                  await u.rollback(), u.status = "ROLLEDBACK";
+                  await c.rollback(), c.status = "ROLLEDBACK";
                 } catch {
                 }
-              throw await this.onTaskStatusChange(u.id, u.status), I;
+              throw await this.onTaskStatusChange(c.id, c.status), I;
             } finally {
-              this.releaseLock(u.id);
+              this.releaseLock(c.id);
             }
           } catch (D) {
             a(D);
@@ -445,11 +445,11 @@ const F = new Zt(), It = (n) => {
   const t = /* @__PURE__ */ new Set(), s = (l, E) => {
     const g = typeof l == "function" ? l(e) : l;
     if (!Object.is(g, e)) {
-      const u = e;
-      e = E ?? (typeof g != "object" || g === null) ? g : Object.assign({}, e, g), t.forEach((L) => L(e, u));
+      const c = e;
+      e = E ?? (typeof g != "object" || g === null) ? g : Object.assign({}, e, g), t.forEach((L) => L(e, c));
     }
-  }, r = () => e, c = { setState: s, getState: r, getInitialState: () => f, subscribe: (l) => (t.add(l), () => t.delete(l)) }, f = e = n(s, r, c);
-  return 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(
@@ -487,7 +487,7 @@ function re() {
       const t = e.state?.id;
       (await F.addTask(
         async (s) => {
-          const r = e.state?.index, a = e.state?.status, o = e.state?.params, c = e.state?.transitionName, f = e.state?.layoutId, l = U.getState().setStatus, { index: E, addHistory: g, popHistory: u } = 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 = 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;
           if (!L && !D && !I) {
             s.abort();
             return;
@@ -496,16 +496,16 @@ function re() {
             id: t,
             pathname: P,
             params: o,
-            transitionName: c,
-            layoutId: f
+            transitionName: u,
+            layoutId: h
           })) : I && (l("REPLACING"), g({
             id: t,
             pathname: P,
             params: o,
-            transitionName: c,
-            layoutId: f
+            transitionName: u,
+            layoutId: h
           })), async () => {
-            L && u(r + 1), l("COMPLETED");
+            L && c(r + 1), l("COMPLETED");
           };
         },
         {
@@ -672,7 +672,7 @@ function ct({
   enterBack: r,
   exit: a,
   exitBack: o,
-  options: c
+  options: u
 }) {
   return {
     name: n,
@@ -689,7 +689,7 @@ function ct({
       "COMPLETED-false": a,
       "COMPLETED-true": s
     },
-    ...c
+    ...u
   };
 }
 const ue = ct({
@@ -746,11 +746,11 @@ const ue = ct({
     swipeDirection: "x",
     onSwipeStart: async () => !0,
     onSwipe: (n, e, { animate: t, currentScreen: s, prevScreen: r, onProgress: a }) => {
-      const { offset: o } = e, c = o.x, f = bt(c, [0, window.innerWidth], [0, 100]);
-      return a?.(!0, f), t(
+      const { offset: o } = e, u = o.x, h = bt(u, [0, window.innerWidth], [0, 100]);
+      return a?.(!0, h), t(
         s,
         {
-          x: Math.max(0, c)
+          x: Math.max(0, u)
         },
         {
           duration: 0
@@ -758,15 +758,15 @@ const ue = ct({
       ), t(
         r,
         {
-          x: -100 + f
+          x: -100 + h
         },
         {
           duration: 0
         }
-      ), f;
+      ), h;
     },
     onSwipeEnd: async (n, e, { animate: t, currentScreen: s, prevScreen: r, onStart: a }) => {
-      const { offset: o, velocity: c } = e, l = o.x > 50 || c.x > 20;
+      const { offset: o, velocity: u } = e, l = o.x > 50 || u.x > 20;
       return a?.(l), await Promise.all([
         t(
           s,
@@ -841,12 +841,12 @@ const ue = ct({
     swipeDirection: "y",
     onSwipeStart: async () => !0,
     onSwipe: (n, e, { animate: t, currentScreen: s, onProgress: r }) => {
-      const { offset: a } = e, o = a.y, c = Math.max(0, Math.min(56, o)), f = bt(c, [0, 56], [1, 0.96]), l = Math.max(0, o - 56), E = Math.min(1, l / 160), g = Math.sqrt(E) * 12, u = Math.max(0, c + g), L = Math.min(56, u);
+      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);
       return r?.(!0, 100), t(
         s,
         {
-          y: u,
-          opacity: f
+          y: c,
+          opacity: h
         },
         {
           duration: 0
@@ -854,7 +854,7 @@ const ue = ct({
       ), L;
     },
     onSwipeEnd: async (n, e, { animate: t, currentScreen: s, prevScreen: r, onStart: a }) => {
-      const { offset: o, velocity: c } = e, l = o.y > 56 || c.y > 20;
+      const { offset: o, velocity: u } = e, l = o.y > 56 || u.y > 20;
       return a?.(l), await Promise.all([
         t(
           s,
@@ -932,11 +932,11 @@ const ue = ct({
     swipeDirection: "y",
     onSwipeStart: async () => !0,
     onSwipe: (n, e, { animate: t, currentScreen: s, prevScreen: r, onProgress: a }) => {
-      const { offset: o } = e, c = o.y, f = Math.max(0, Math.min(56, c)), l = Math.max(0, c - 56), E = Math.min(1, l / 160), g = Math.sqrt(E) * 12, u = Math.max(0, f + g), L = Math.min(56, u);
+      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);
       return a?.(!0, L), t(
         s,
         {
-          y: u
+          y: c
         },
         {
           duration: 0
@@ -950,7 +950,7 @@ const ue = ct({
       ), L;
     },
     onSwipeEnd: async (n, e, { animate: t, currentScreen: s, prevScreen: r, onStart: a }) => {
-      const { offset: o, velocity: c } = e, l = o.y > 56 || c.y > 20;
+      const { offset: o, velocity: u } = e, l = o.y > 56 || u.y > 20;
       return a?.(l), await Promise.all([
         t(
           s,
@@ -1039,7 +1039,7 @@ function Se({
         id: "root",
         pathname: a,
         params: Jt(
-          Mt.toArray(n).map((c) => c.props.path).flat(),
+          Mt.toArray(n).map((u) => u.props.path).flat(),
           a,
           o
         ),
@@ -1048,9 +1048,7 @@ function Se({
       }
     ]
   }), Y(() => {
-    if (window.history.state?.index) return;
-    const { pathname: c, search: f } = window.location;
-    window.history.replaceState(
+    window.history.state?.index || window.history.replaceState(
       {
         id: "root",
         index: 0,
@@ -1060,12 +1058,12 @@ function Se({
         layoutId: null
       },
       "",
-      `${c}${f}`
+      window.location.href
     );
   }, [t]), Y(() => {
-    s.forEach((c) => et.set(c.name, c));
+    s.forEach((u) => et.set(u.name, u));
   }, [s]), Y(() => {
-    r.forEach((c) => Pt.set(c.name, c));
+    r.forEach((u) => Pt.set(u.name, u));
   }, [r]), /* @__PURE__ */ yt(
     "div",
     {
@@ -1089,13 +1087,13 @@ function Pe({ element: n }) {
 function ve() {
   return {
     push: async (s, r, a = {}) => {
-      const { status: o, setStatus: c } = U.getState();
+      const { status: o, setStatus: u } = U.getState();
       if (o !== "COMPLETED" && o !== "IDLE")
         return;
-      const { index: f, addHistory: l } = q.getState(), E = mt.getState().defaultTransitionName, { transitionName: g = E, layoutId: u = null } = a, L = F.generateTaskId();
+      const { index: h, addHistory: l } = q.getState(), E = mt.getState().defaultTransitionName, { transitionName: g = E, layoutId: c = null } = a, L = F.generateTaskId();
       (await F.addTask(
         async () => {
-          c("PUSHING");
+          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(
@@ -1104,11 +1102,11 @@ function ve() {
           return window.history.pushState(
             {
               id: L,
-              index: f + 1,
+              index: h + 1,
               status: "PUSHING",
               params: r,
               transitionName: g,
-              layoutId: u
+              layoutId: c
             },
             "",
             Q
@@ -1117,9 +1115,9 @@ function ve() {
             pathname: P,
             params: r,
             transitionName: g,
-            layoutId: u
+            layoutId: c
           }), () => {
-            c("COMPLETED");
+            u("COMPLETED");
           };
         },
         {
@@ -1131,13 +1129,13 @@ function ve() {
       )).result?.();
     },
     replace: async (s, r, a = {}) => {
-      const { status: o, setStatus: c } = U.getState();
+      const { status: o, setStatus: u } = U.getState();
       if (o !== "COMPLETED" && o !== "IDLE")
         return;
-      const { index: f, addHistory: l } = q.getState(), E = q.getState().replaceHistory, g = mt.getState().defaultTransitionName, { transitionName: u = g, layoutId: L = null } = a, D = F.generateTaskId();
+      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();
       (await F.addTask(
         async () => {
-          c("REPLACING");
+          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(
@@ -1146,10 +1144,10 @@ function ve() {
           return window.history.replaceState(
             {
               id: D,
-              index: f,
+              index: h,
               status: "REPLACING",
               params: r,
-              transitionName: u,
+              transitionName: c,
               layoutId: L
             },
             "",
@@ -1158,10 +1156,10 @@ function ve() {
             id: D,
             pathname: M,
             params: r,
-            transitionName: u,
+            transitionName: c,
             layoutId: L
           }), async () => {
-            E(f), c("COMPLETED");
+            E(h), u("COMPLETED");
           };
         },
         {
@@ -1184,7 +1182,7 @@ function Te() {
     pushStep: async (r) => {
       const a = U.getState().status;
       a !== "COMPLETED" && a !== "IDLE" || (await F.addTask(async () => {
-        const o = new URLSearchParams(r).toString(), c = `${window.location.pathname}${o ? `?${o}` : ""}`;
+        const o = new URLSearchParams(r).toString(), u = `${window.location.pathname}${o ? `?${o}` : ""}`;
         return window.history.state?.step || window.history.replaceState(
           {
             ...window.history.state,
@@ -1199,14 +1197,14 @@ function Te() {
             params: r
           },
           "",
-          c
+          u
         ), async () => n({ type: "SET", params: r });
       })).result?.();
     },
     replaceStep: async (r) => {
       const a = U.getState().status;
       a !== "COMPLETED" && a !== "IDLE" || (await F.addTask(async () => {
-        const o = new URLSearchParams(r).toString(), c = `${window.location.pathname}${o ? `?${o}` : ""}`;
+        const o = new URLSearchParams(r).toString(), u = `${window.location.pathname}${o ? `?${o}` : ""}`;
         return window.history.replaceState(
           {
             ...window.history.state,
@@ -1214,7 +1212,7 @@ function Te() {
             params: r
           },
           "",
-          c
+          u
         ), async () => n({ type: "SET", params: r });
       })).result?.();
     },
@@ -1235,8 +1233,8 @@ function De({
   pushOnExit: r,
   replaceOnEnter: a,
   replaceOnExit: o,
-  popOnEnter: c,
-  popOnExit: f,
+  popOnEnter: u,
+  popOnExit: h,
   completedOnExit: l,
   completedOnEnter: E,
   options: g
@@ -1251,8 +1249,8 @@ function De({
       "PUSHING-true": s,
       "REPLACING-false": o,
       "REPLACING-true": a,
-      "POPPING-false": f,
-      "POPPING-true": c,
+      "POPPING-false": h,
+      "POPPING-true": u,
       "COMPLETED-false": l,
       "COMPLETED-true": E
     },
@@ -1267,8 +1265,8 @@ function Ie({
   pushOnExit: r,
   replaceOnEnter: a,
   replaceOnExit: o,
-  popOnEnter: c,
-  popOnExit: f,
+  popOnEnter: u,
+  popOnExit: h,
   completedOnEnter: l,
   completedOnExit: E,
   options: g
@@ -1283,8 +1281,8 @@ function Ie({
       "PUSHING-true": s,
       "REPLACING-false": o,
       "REPLACING-true": a,
-      "POPPING-false": f,
-      "POPPING-true": c,
+      "POPPING-false": h,
+      "POPPING-true": u,
       "COMPLETED-false": E,
       "COMPLETED-true": l
     },
@@ -1299,14 +1297,14 @@ function Nt(n, e) {
     verifyByScroll: a = !1
   } = e ?? {}, o = he(n);
   if (!o) return { element: null, hasMarker: !1 };
-  const c = o.closest?.(s);
-  if (c instanceof HTMLElement && wt(c, t) && (!a || kt(c, t)))
-    return { element: c, hasMarker: !0 };
-  let f = o, l = 0;
-  for (; f && f !== document.body && l < r; ) {
-    if (wt(f, t) && (!a || kt(f, t)))
-      return { element: f, hasMarker: !1 };
-    f = f.parentElement, l++;
+  const u = o.closest?.(s);
+  if (u instanceof HTMLElement && wt(u, t) && (!a || kt(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)))
+      return { element: h, hasMarker: !1 };
+    h = h.parentElement, l++;
   }
   return { element: null, hasMarker: !1 };
 }
@@ -1343,12 +1341,12 @@ function kt(n, e) {
 function ge({ children: n, ref: e, ...t }) {
   const { isActive: s, transitionName: r } = Z(), [a, o] = Rt();
   Bt(e, () => a.current);
-  const c = U((u) => u.status), f = et.get(r), { decoratorName: l } = f, { initial: E, variants: g } = Pt.get(l);
+  const u = U((c) => c.status), h = et.get(r), { decoratorName: l } = h, { initial: E, variants: g } = Pt.get(l);
   return Y(() => {
     if (!a.current) return;
-    const { value: u, options: L } = g[`${c}-${s}`];
-    o(a.current, u, L);
-  }, [c, s, o, g, a]), /* @__PURE__ */ x(
+    const { value: c, options: L } = g[`${u}-${s}`];
+    o(a.current, c, L);
+  }, [u, s, o, g, a]), /* @__PURE__ */ x(
     At.div,
     {
       ref: a,
@@ -1395,15 +1393,15 @@ function Ht({
   systemNavigationBarColor: r,
   sharedAppBar: a,
   sharedNavigationBar: o,
-  appBar: c,
-  navigationBar: f,
+  appBar: u,
+  navigationBar: h,
   hideStatusBar: l,
   hideSystemNavigationBar: E,
   backgroundColor: g = "white",
-  contentScrollable: u = !0,
+  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: h, 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] = 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 = $({
     element: null,
     hasMarker: !1
   }), z = $({ element: null, hasMarker: !1 }), lt = $(0), dt = $(0), pt = $(null), ft = $(null), Ut = async (v, G) => {
@@ -1486,7 +1484,7 @@ function Ht({
     };
   }, [D]), Y(() => {
     D.current && (async () => {
-      const { value: v, options: G } = h[`${b}-${M}`];
+      const { value: v, options: G } = f[`${b}-${M}`];
       !M && b === "REPLACING" && Q !== _ && (y("PENDING"), await I(D.current, fe, {
         duration: 0.1
       })), M && b === "COMPLETED" && (d("IDLE"), y("IDLE")), await I(D.current, v, G), await F.resolveTask(P);
@@ -1499,7 +1497,7 @@ function Ht({
     _,
     I,
     D,
-    h,
+    f,
     d,
     y
   ]), Tt(() => {
@@ -1576,7 +1574,7 @@ function Ht({
               flexDirection: "column",
               height: "100%",
               backgroundColor: g,
-              overflowY: u ? void 0 : "auto",
+              overflowY: c ? void 0 : "auto",
               ...L.style
             },
             children: [
@@ -1601,7 +1599,7 @@ function Ht({
                   }
                 }
               ),
-              c,
+              u,
               /* @__PURE__ */ x(
                 "div",
                 {
@@ -1609,12 +1607,12 @@ function Ht({
                     display: "flex",
                     flexDirection: "column",
                     flexGrow: 1,
-                    overflowY: u ? "auto" : void 0
+                    overflowY: c ? "auto" : void 0
                   },
                   children: n
                 }
               ),
-              f,
+              h,
               o && /* @__PURE__ */ x(
                 "div",
                 {
@@ -1682,11 +1680,11 @@ 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), c = J((g) => g.dragStatus), f = J((g) => g.replaceTransitionStatus), E = !t && (o === "COMPLETED" && c === "IDLE") || s && a - 2 <= r && f === "IDLE" || s && a - 2 > r;
+  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 Ne({ children: n, ...e }) {
-  const { isActive: t, isPrev: s, zIndex: r } = Z(), a = q((g) => g.index), o = U((g) => g.status), c = J((g) => g.dragStatus), f = J((g) => g.replaceTransitionStatus), E = !t && (o === "COMPLETED" && c === "IDLE") || s && a - 2 <= r && f === "IDLE" || s && a - 2 > r;
+  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,
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flemo",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "A modern React router library with built-in motion animations and smooth transitions",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",