flemo 1.3.5 → 1.3.7

package/dist/index.mjs

@@ -1,10 +1,10 @@
 import { jsx as D, jsxs as ct } from "react/jsx-runtime";
-import nt, { useEffect as K, createContext as dt, useContext as pt, useReducer as Ht, Children as It, Suspense as _t, useImperativeHandle as Ft, useState as mt, useRef as H, useLayoutEffect as Et } from "react";
-import { transform as ft, useAnimate as Lt, motion as z, useDragControls as Qt, AnimatePresence as jt, MotionConfig as qt } from "motion/react";
+import nt, { useEffect as z, createContext as dt, useContext as pt, useReducer as Ht, Children as It, Suspense as _t, useImperativeHandle as jt, useState as mt, useRef as H, useLayoutEffect as Et } from "react";
+import { transform as ft, useAnimate as Lt, motion as J, useDragControls as Ft, AnimatePresence as Qt, MotionConfig as qt } from "motion/react";
 var _ = {}, wt;
 function Yt() {
   if (wt) return _;
-  wt = 1, Object.defineProperty(_, "__esModule", { value: !0 }), _.PathError = _.TokenData = void 0, _.parse = l, _.compile = m, _.match = P, _.pathToRegexp = I, _.stringify = $;
+  wt = 1, Object.defineProperty(_, "__esModule", { value: !0 }), _.PathError = _.TokenData = void 0, _.parse = l, _.compile = m, _.match = P, _.pathToRegexp = L, _.stringify = U;
   const n = "/", e = (i) => i, t = /^[$_\p{ID_Start}]$/u, r = /^[$\u200c\u200d\p{ID_Continue}]$/u, s = {
     // Groups.
     "{": "{",
@@ -39,7 +39,7 @@ function Yt() {
   _.PathError = h;
   function l(i, y = {}) {
     const { encodePath: g = e } = y, E = [...i], p = [];
-    let f = 0, L = 0;
+    let f = 0, I = 0;
     function T() {
       let S = "";
       if (t.test(E[f]))
@@ -67,16 +67,16 @@ function Yt() {
       M ? p.push({ type: M, index: f++, value: S }) : S === "\\" ? p.push({ type: "escape", index: f++, value: E[f++] }) : S === ":" ? p.push({ type: "param", index: f++, value: T() }) : S === "*" ? p.push({ type: "wildcard", index: f++, value: T() }) : p.push({ type: "char", index: f++, value: S });
     }
     p.push({ type: "end", index: f, value: "" });
-    function R(S) {
+    function O(S) {
       const M = [];
       for (; ; ) {
-        const x = p[L++];
+        const x = p[I++];
         if (x.type === S)
           break;
         if (x.type === "char" || x.type === "escape") {
-          let C = x.value, A = p[L];
-          for (; A.type === "char" || A.type === "escape"; )
-            C += A.value, A = p[++L];
+          let C = x.value, b = p[I];
+          for (; b.type === "char" || b.type === "escape"; )
+            C += b.value, b = p[++I];
           M.push({
             type: "text",
             value: g(C)
@@ -93,7 +93,7 @@ function Yt() {
         if (x.type === "{") {
           M.push({
             type: "group",
-            tokens: R("}")
+            tokens: O("}")
           });
           continue;
         }
@@ -101,24 +101,24 @@ function Yt() {
       }
       return M;
     }
-    return new c(R("end"), i);
+    return new c(O("end"), i);
   }
   function m(i, y = {}) {
     const { encode: g = encodeURIComponent, delimiter: E = n } = y, p = typeof i == "object" ? i : l(i, y), f = d(p.tokens, E, g);
     return function(T = {}) {
-      const [R, ...S] = f(T);
+      const [O, ...S] = f(T);
       if (S.length)
         throw new TypeError(`Missing parameters: ${S.join(", ")}`);
-      return R;
+      return O;
     };
   }
   function d(i, y, g) {
     const E = i.map((p) => u(p, y, g));
     return (p) => {
       const f = [""];
-      for (const L of E) {
-        const [T, ...R] = L(p);
-        f[0] += T, f.push(...R);
+      for (const I of E) {
+        const [T, ...O] = I(p);
+        f[0] += T, f.push(...O);
       }
       return f;
     };
@@ -129,8 +129,8 @@ function Yt() {
     if (i.type === "group") {
       const p = d(i.tokens, y, g);
       return (f) => {
-        const [L, ...T] = p(f);
-        return T.length ? [""] : [L];
+        const [I, ...T] = p(f);
+        return T.length ? [""] : [I];
       };
     }
     const E = g || e;
@@ -141,10 +141,10 @@ function Yt() {
       if (!Array.isArray(f) || f.length === 0)
         throw new TypeError(`Expected "${i.name}" to be a non-empty array`);
       return [
-        f.map((L, T) => {
-          if (typeof L != "string")
+        f.map((I, T) => {
+          if (typeof I != "string")
             throw new TypeError(`Expected "${i.name}/${T}" to be a string`);
-          return E(L);
+          return E(I);
         }).join(y)
       ];
     } : (p) => {
@@ -157,30 +157,30 @@ function Yt() {
     };
   }
   function P(i, y = {}) {
-    const { decode: g = decodeURIComponent, delimiter: E = n } = y, { regexp: p, keys: f } = I(i, y), L = f.map((T) => g === !1 ? e : T.type === "param" ? g : (R) => R.split(E).map(g));
-    return function(R) {
-      const S = p.exec(R);
+    const { decode: g = decodeURIComponent, delimiter: E = n } = y, { regexp: p, keys: f } = L(i, y), I = f.map((T) => g === !1 ? e : T.type === "param" ? g : (O) => O.split(E).map(g));
+    return function(O) {
+      const S = p.exec(O);
       if (!S)
         return !1;
       const M = S[0], x = /* @__PURE__ */ Object.create(null);
       for (let C = 1; C < S.length; C++) {
         if (S[C] === void 0)
           continue;
-        const A = f[C - 1], V = L[C - 1];
-        x[A.name] = V(S[C]);
+        const b = f[C - 1], W = I[C - 1];
+        x[b.name] = W(S[C]);
       }
       return { path: M, params: x };
     };
   }
-  function I(i, y = {}) {
-    const { delimiter: g = n, end: E = !0, sensitive: p = !1, trailing: f = !0 } = y, L = [], T = p ? "" : "i", R = [];
+  function L(i, y = {}) {
+    const { delimiter: g = n, end: E = !0, sensitive: p = !1, trailing: f = !0 } = y, I = [], T = p ? "" : "i", O = [];
     for (const x of N(i, [])) {
       const C = typeof x == "object" ? x : l(x, y);
-      for (const A of w(C.tokens, 0, []))
-        R.push(k(A, g, L, C.originalPath));
+      for (const b of w(C.tokens, 0, []))
+        O.push(k(b, g, I, C.originalPath));
     }
-    let S = `^(?:${R.join("|")})`;
-    return f && (S += `(?:${o(g)}$)?`), S += E ? "$" : `(?=${o(g)}|$)`, { regexp: new RegExp(S, T), keys: L };
+    let S = `^(?:${O.join("|")})`;
+    return f && (S += `(?:${o(g)}$)?`), S += E ? "$" : `(?=${o(g)}|$)`, { regexp: new RegExp(S, T), keys: I };
   }
   function N(i, y) {
     if (Array.isArray(i))
@@ -202,28 +202,28 @@ function Yt() {
     yield* w(i, y + 1, g);
   }
   function k(i, y, g, E) {
-    let p = "", f = "", L = !0;
+    let p = "", f = "", I = !0;
     for (const T of i) {
       if (T.type === "text") {
-        p += o(T.value), f += T.value, L || (L = T.value.includes(y));
+        p += o(T.value), f += T.value, I || (I = T.value.includes(y));
         continue;
       }
       if (T.type === "param" || T.type === "wildcard") {
-        if (!L && !f)
+        if (!I && !f)
           throw new h(`Missing text before "${T.name}" ${T.type}`, E);
-        T.type === "param" ? p += `(${U(y, L ? "" : f)}+)` : p += "([\\s\\S]+)", g.push(T), f = "", L = !1;
+        T.type === "param" ? p += `(${F(y, I ? "" : f)}+)` : p += "([\\s\\S]+)", g.push(T), f = "", I = !1;
         continue;
       }
     }
     return p;
   }
-  function U(i, y) {
+  function F(i, y) {
     return y.length < 2 ? i.length < 2 ? `[^${o(i + y)}]` : `(?:(?!${o(i)})[^${o(y)}])` : i.length < 2 ? `(?:(?!${o(y)})[^${o(i)}])` : `(?:(?!${o(y)}|${o(i)})[\\s\\S])`;
   }
-  function b(i) {
+  function Q(i) {
     let y = "", g = 0;
     function E(p) {
-      return tt(p) && J(i[g]) ? p : JSON.stringify(p);
+      return R(p) && A(i[g]) ? p : JSON.stringify(p);
     }
     for (; g < i.length; ) {
       const p = i[g++];
@@ -232,7 +232,7 @@ function Yt() {
         continue;
       }
       if (p.type === "group") {
-        y += `{${b(p.tokens)}}`;
+        y += `{${Q(p.tokens)}}`;
         continue;
       }
       if (p.type === "param") {
@@ -247,21 +247,21 @@ function Yt() {
     }
     return y;
   }
-  function $(i) {
-    return b(i.tokens);
+  function U(i) {
+    return Q(i.tokens);
   }
-  function tt(i) {
+  function R(i) {
     const [y, ...g] = i;
     return t.test(y) && g.every((E) => r.test(E));
   }
-  function J(i) {
+  function A(i) {
     return i && i.type === "text" ? !r.test(i.value[0]) : !0;
   }
   return _;
 }
-var X = Yt();
+var V = Yt();
 function Bt(n, e, t) {
-  const r = Array.isArray(n) ? n.find((c) => X.pathToRegexp(c).regexp.test(e)) || "" : X.pathToRegexp(n).regexp.test(e) ? n : "", s = X.match(r)(e), a = new URLSearchParams(t), o = Object.fromEntries(a.entries());
+  const r = Array.isArray(n) ? n.find((c) => V.pathToRegexp(c).regexp.test(e)) || "" : V.pathToRegexp(n).regexp.test(e) ? n : "", s = V.match(r)(e), a = new URLSearchParams(t), o = Object.fromEntries(a.entries());
   return s ? { ...s.params, ...o } : {};
 }
 function St() {
@@ -348,7 +348,7 @@ class Xt {
             control: o,
             abortController: d
           };
-          this.tasks.set(u.id, u), this.pendingTaskQueue.length > 0 && (this.pendingTaskQueue.push(u), await this.waitForPendingTasks(), this.pendingTaskQueue = this.pendingTaskQueue.filter((I) => I.id !== u.id));
+          this.tasks.set(u.id, u), this.pendingTaskQueue.length > 0 && (this.pendingTaskQueue.push(u), await this.waitForPendingTasks(), this.pendingTaskQueue = this.pendingTaskQueue.filter((L) => L.id !== u.id));
           try {
             if (!await this.acquireLock(u.id))
               throw u.status = "FAILED", new Error("FAILED");
@@ -405,8 +405,8 @@ class Xt {
             } finally {
               this.releaseLock(u.id);
             }
-          } catch (I) {
-            a(I);
+          } catch (L) {
+            a(L);
           }
         } catch (o) {
           a(o);
@@ -440,7 +440,7 @@ class Xt {
     await Promise.all(e.map((t) => this.resolveTask(t.id)));
   }
 }
-const Q = new Xt(), Pt = (n) => {
+const q = new Xt(), Pt = (n) => {
   let e;
   const t = /* @__PURE__ */ new Set(), r = (l, m) => {
     const d = typeof l == "function" ? l(e) : l;
@@ -462,7 +462,7 @@ function zt(n, e = Vt) {
 const Tt = (n) => {
   const e = Kt(n), t = (r) => zt(e, r);
   return Object.assign(t, e), t;
-}, st = ((n) => n ? Tt(n) : Tt), j = st((n) => ({
+}, st = ((n) => n ? Tt(n) : Tt), Y = st((n) => ({
   index: -1,
   histories: [],
   addHistory: (e) => n((t) => ({
@@ -477,22 +477,22 @@ const Tt = (n) => {
     index: t.index - 1,
     histories: t.histories.filter((r, s) => s !== e)
   }))
-})), F = st((n) => ({
+})), j = st((n) => ({
   status: "IDLE",
   setStatus: (e) => n({ status: e })
 }));
 function Wt() {
-  return K(() => {
+  return z(() => {
     const n = async (e) => {
       const t = e.state?.id;
-      (await Q.addTask(
+      (await q.addTask(
         async (r) => {
-          const s = e.state?.index, a = e.state?.status, o = e.state?.params, c = e.state?.transitionName, h = e.state?.layoutId, l = F.getState().setStatus, { index: m, addHistory: d, popHistory: u } = j.getState(), P = s < m, I = a === "PUSHING" && s > m, N = a === "REPLACING" && s > m, w = window.location.pathname;
-          if (!P && !I && !N) {
+          const s = e.state?.index, a = e.state?.status, o = e.state?.params, c = e.state?.transitionName, h = e.state?.layoutId, l = j.getState().setStatus, { index: m, addHistory: d, popHistory: u } = Y.getState(), P = s < m, L = a === "PUSHING" && s > m, N = a === "REPLACING" && s > m, w = window.location.pathname;
+          if (!P && !L && !N) {
             r.abort();
             return;
           }
-          return P ? l("POPPING") : I ? (l("PUSHING"), d({
+          return P ? l("POPPING") : L ? (l("PUSHING"), d({
             id: t,
             pathname: w,
             params: o,
@@ -543,14 +543,14 @@ const kt = dt({
   prevTransitionName: "none",
   layoutId: null
 });
-function Z() {
+function tt() {
   return pt(kt);
 }
 function Zt({ children: n }) {
-  const { isActive: e, params: t } = Z(), [r, s] = Ht(Jt, t);
-  return K(() => {
+  const { isActive: e, params: t } = tt(), [r, s] = Ht(Jt, t);
+  return z(() => {
     const a = async (o) => {
-      o.state?.step && await Q.addTask(async () => {
+      o.state?.step && await q.addTask(async () => {
         s({ type: "SET", params: o.state?.params || {} });
       });
     };
@@ -560,10 +560,10 @@ function Zt({ children: n }) {
   }, [e, s]), /* @__PURE__ */ D(Nt.Provider, { value: s, children: /* @__PURE__ */ D(xt.Provider, { value: r, children: n }) });
 }
 function te({ children: n }) {
-  const e = j((r) => r.index), t = j((r) => r.histories);
+  const e = Y((r) => r.index), t = Y((r) => r.histories);
   return t.map(
     (r) => It.toArray(n).filter(
-      (s) => X.pathToRegexp(s.props.path).regexp.test(
+      (s) => V.pathToRegexp(s.props.path).regexp.test(
         r.pathname
       )
     )
@@ -943,8 +943,8 @@ const se = rt({
     swipeDirection: "y",
     onSwipeStart: async () => !0,
     onSwipe: (n, e, { animate: t, currentScreen: r, prevScreen: s, onProgress: a }) => {
-      const { offset: o } = e, c = o.y, h = Math.max(0, Math.min(56, c)), l = ft(h, [0, 56], [1, 0.96]), m = Math.max(0, c - 56), d = Math.min(1, m / 160), u = Math.sqrt(d) * 12, P = Math.max(0, h + u), I = Math.min(56, P);
-      return a?.(!0, I), t(
+      const { offset: o } = e, c = o.y, h = Math.max(0, Math.min(56, c)), l = ft(h, [0, 56], [1, 0.96]), m = Math.max(0, c - 56), d = Math.min(1, m / 160), u = Math.sqrt(d) * 12, P = Math.max(0, h + u), L = Math.min(56, P);
+      return a?.(!0, L), t(
         r,
         {
           y: P,
@@ -956,11 +956,11 @@ const se = rt({
       ), t(
         s,
         {
-          y: -56 + I,
-          opacity: I / 56
+          y: -56 + L,
+          opacity: L / 56
         },
         { duration: 0 }
-      ), I;
+      ), L;
     },
     onSwipeEnd: async (n, e, { animate: t, currentScreen: r, prevScreen: s, onStart: a }) => {
       const { offset: o, velocity: c } = e, l = o.y > 56 || c.y > 20;
@@ -1047,7 +1047,7 @@ function ye({
   const a = St() ? e || "/" : window.location.pathname, o = St() ? a.split("?")[1] || "" : window.location.search;
   return ut.setState({
     defaultTransitionName: t
-  }), j.setState({
+  }), Y.setState({
     index: 0,
     histories: [
       {
@@ -1062,7 +1062,7 @@ function ye({
         layoutId: null
       }
     ]
-  }), K(() => {
+  }), z(() => {
     window.history.state?.index || window.history.replaceState(
       {
         id: "root",
@@ -1075,9 +1075,9 @@ function ye({
       "",
       window.location.pathname
     );
-  }, [t]), K(() => {
+  }, [t]), z(() => {
     r.forEach((c) => et.set(c.name, c));
-  }, [r]), K(() => {
+  }, [r]), z(() => {
     s.forEach((c) => ht.set(c.name, c));
   }, [s]), /* @__PURE__ */ ct(
     "div",
@@ -1102,16 +1102,18 @@ function ge({ element: n }) {
 function me() {
   return {
     push: async (r, s, a = {}) => {
-      const { status: o, setStatus: c } = F.getState();
+      const { status: o, setStatus: c } = j.getState();
       if (o !== "COMPLETED" && o !== "IDLE")
         return;
-      const { index: h, addHistory: l } = j.getState(), m = ut.getState().defaultTransitionName, { transitionName: d = m, layoutId: u = null } = a, P = Q.generateTaskId();
-      (await Q.addTask(
+      const { index: h, addHistory: l } = Y.getState(), m = ut.getState().defaultTransitionName, { transitionName: d = m, layoutId: u = null } = a, P = q.generateTaskId();
+      (await q.addTask(
         async () => {
           c("PUSHING");
-          const I = X.compile(r)(s), N = X.parse(r).tokens.filter((b) => b.type === "param").map((b) => b.name), w = Object.fromEntries(
-            Object.entries(s).filter(([b]) => !N.includes(b))
-          ), k = new URLSearchParams(w).toString(), U = `${I}${k ? `?${k}` : ""}`;
+          const L = V.compile(r), N = Object.fromEntries(
+            Object.entries(s).map(([R, A]) => [R, String(A)])
+          ), w = L(N), k = V.parse(r).tokens.filter((R) => R.type === "param").map((R) => R.name), F = Object.fromEntries(
+            Object.entries(s).filter(([R]) => !k.includes(R))
+          ), Q = new URLSearchParams(F).toString(), U = `${w}${Q ? `?${Q}` : ""}`;
           return window.history.pushState(
             {
               id: P,
@@ -1125,7 +1127,7 @@ function me() {
             U
           ), l({
             id: P,
-            pathname: I,
+            pathname: w,
             params: s,
             transitionName: d,
             layoutId: u
@@ -1142,19 +1144,21 @@ function me() {
       )).result?.();
     },
     replace: async (r, s, a = {}) => {
-      const { status: o, setStatus: c } = F.getState();
+      const { status: o, setStatus: c } = j.getState();
       if (o !== "COMPLETED" && o !== "IDLE")
         return;
-      const { index: h, addHistory: l } = j.getState(), m = j.getState().replaceHistory, d = ut.getState().defaultTransitionName, { transitionName: u = d, layoutId: P = null } = a, I = Q.generateTaskId();
-      (await Q.addTask(
+      const { index: h, addHistory: l } = Y.getState(), m = Y.getState().replaceHistory, d = ut.getState().defaultTransitionName, { transitionName: u = d, layoutId: P = null } = a, L = q.generateTaskId();
+      (await q.addTask(
         async () => {
           c("REPLACING");
-          const N = X.compile(r)(s), w = X.parse(r).tokens.filter(($) => $.type === "param").map(($) => $.name), k = Object.fromEntries(
-            Object.entries(s).filter(([$]) => !w.includes($))
-          ), U = new URLSearchParams(k).toString(), b = `${N}${U ? `?${U}` : ""}`;
+          const N = V.compile(r), w = Object.fromEntries(
+            Object.entries(s).map(([A, i]) => [A, String(i)])
+          ), k = N(w), F = V.parse(r).tokens.filter((A) => A.type === "param").map((A) => A.name), Q = Object.fromEntries(
+            Object.entries(s).filter(([A]) => !F.includes(A))
+          ), U = new URLSearchParams(Q).toString(), R = `${k}${U ? `?${U}` : ""}`;
           return window.history.replaceState(
             {
-              id: I,
+              id: L,
               index: h,
               status: "REPLACING",
               params: s,
@@ -1162,10 +1166,10 @@ function me() {
               layoutId: P
             },
             "",
-            b
+            R
           ), l({
-            id: I,
-            pathname: N,
+            id: L,
+            pathname: k,
             params: s,
             transitionName: u,
             layoutId: P
@@ -1174,7 +1178,7 @@ function me() {
           };
         },
         {
-          id: I,
+          id: L,
           control: {
             manual: !0
           }
@@ -1182,7 +1186,7 @@ function me() {
       )).result?.();
     },
     pop: () => {
-      const r = F.getState().status;
+      const r = j.getState().status;
       r !== "COMPLETED" && r !== "IDLE" || window.history.back();
     }
   };
@@ -1191,8 +1195,8 @@ function Ee() {
   const n = pt(Nt);
   return {
     pushStep: async (s) => {
-      const a = F.getState().status;
-      a !== "COMPLETED" && a !== "IDLE" || (await Q.addTask(async () => {
+      const a = j.getState().status;
+      a !== "COMPLETED" && a !== "IDLE" || (await q.addTask(async () => {
         const o = new URLSearchParams(s).toString(), c = `${window.location.pathname}${o ? `?${o}` : ""}`;
         return window.history.state?.step || window.history.replaceState(
           {
@@ -1213,8 +1217,8 @@ function Ee() {
       })).result?.();
     },
     replaceStep: async (s) => {
-      const a = F.getState().status;
-      a !== "COMPLETED" && a !== "IDLE" || (await Q.addTask(async () => {
+      const a = j.getState().status;
+      a !== "COMPLETED" && a !== "IDLE" || (await q.addTask(async () => {
         const o = new URLSearchParams(s).toString(), c = `${window.location.pathname}${o ? `?${o}` : ""}`;
         return window.history.replaceState(
           {
@@ -1228,7 +1232,7 @@ function Ee() {
       })).result?.();
     },
     popStep: () => {
-      const s = F.getState().status;
+      const s = j.getState().status;
       s !== "COMPLETED" && s !== "IDLE" || window.history.back();
     }
   };
@@ -1363,15 +1367,15 @@ function Dt(n, e) {
   }
 }
 function de({ children: n, ref: e, ...t }) {
-  const { isActive: r, transitionName: s } = Z(), [a, o] = Lt();
-  Ft(e, () => a.current);
-  const c = F((u) => u.status), h = et.get(s), { decoratorName: l } = h, { initial: m, variants: d } = ht.get(l);
-  return K(() => {
+  const { isActive: r, transitionName: s } = tt(), [a, o] = Lt();
+  jt(e, () => a.current);
+  const c = j((u) => u.status), h = et.get(s), { decoratorName: l } = h, { initial: m, variants: d } = ht.get(l);
+  return z(() => {
     if (!a.current) return;
     const { value: u, options: P } = d[`${c}-${r}`];
     o(a.current, u, P);
   }, [c, r, o, d, a]), /* @__PURE__ */ D(
-    z.div,
+    J.div,
     {
       ref: a,
       initial: m,
@@ -1388,7 +1392,7 @@ function de({ children: n, ref: e, ...t }) {
     }
   );
 }
-const W = st((n) => ({
+const Z = st((n) => ({
   dragStatus: "IDLE",
   replaceTransitionStatus: "IDLE",
   setDragStatus: (e) => n({ dragStatus: e }),
@@ -1406,15 +1410,15 @@ function Ct({
   hideSystemNavigationBar: h,
   ...l
 }) {
-  const [m, d] = Lt(), { id: u, isActive: P, isRoot: I, transitionName: N, prevTransitionName: w } = Z(), k = Qt(), U = F((v) => v.status), b = W((v) => v.dragStatus), $ = W.getState().setDragStatus, tt = W.getState().setReplaceTransitionStatus, J = et.get(N), { variants: i, initial: y, swipeDirection: g, decoratorName: E } = J, p = ht.get(E), [f, L] = mt(0), [T, R] = mt(0), S = H(null), M = H(null), x = H(null), C = H(null), A = H(!1), V = H(!1), q = H({
+  const [m, d] = Lt(), { id: u, isActive: P, isRoot: L, transitionName: N, prevTransitionName: w } = tt(), k = Ft(), F = j((v) => v.status), Q = Z((v) => v.dragStatus), U = Z.getState().setDragStatus, R = Z.getState().setReplaceTransitionStatus, A = et.get(N), { variants: i, initial: y, swipeDirection: g, decoratorName: E } = A, p = ht.get(E), [f, I] = mt(0), [T, O] = mt(0), S = H(null), M = H(null), x = H(null), C = H(null), b = H(!1), W = H(!1), B = H({
     element: null,
     hasMarker: !1
-  }), Y = H({ element: null, hasMarker: !1 }), yt = H(0), gt = H(0), at = H(null), ot = H(null), At = async (v, O) => {
+  }), X = H({ element: null, hasMarker: !1 }), yt = H(0), gt = H(0), at = H(null), ot = H(null), bt = async (v, G) => {
     if (!g)
       return;
-    const G = S.current?.previousSibling;
-    M.current = G?.querySelector("[data-screen]"), C.current = G?.querySelector("[data-decorator]");
-    const B = await J?.onSwipeStart(v, O, {
+    const $ = S.current?.previousSibling;
+    M.current = $?.querySelector("[data-screen]"), C.current = $?.querySelector("[data-decorator]");
+    const K = await A?.onSwipeStart(v, G, {
       animate: d,
       currentScreen: m.current,
       prevScreen: M.current,
@@ -1425,73 +1429,73 @@ function Ct({
         prevDecorator: C.current
       })
     });
-    $(B ? "PENDING" : "IDLE");
-  }, Rt = (v, O) => {
-    !g || b !== "PENDING" || J?.onSwipe(v, O, {
+    U(K ? "PENDING" : "IDLE");
+  }, At = (v, G) => {
+    !g || Q !== "PENDING" || A?.onSwipe(v, G, {
       animate: d,
       currentScreen: m.current,
       prevScreen: M.current,
       dragControls: k,
-      onProgress: (G, B) => p?.onSwipe?.(G, B, {
+      onProgress: ($, K) => p?.onSwipe?.($, K, {
         animate: d,
         currentDecorator: x.current,
         prevDecorator: C.current
       })
     });
-  }, bt = async (v, O) => {
-    if (!g || b !== "PENDING")
+  }, Rt = async (v, G) => {
+    if (!g || Q !== "PENDING")
       return;
-    await J?.onSwipeEnd(v, O, {
+    await A?.onSwipeEnd(v, G, {
       animate: d,
       currentScreen: m.current,
       prevScreen: M.current,
-      onStart: (B) => p?.onSwipeEnd?.(B, {
+      onStart: (K) => p?.onSwipeEnd?.(K, {
         animate: d,
         currentDecorator: x.current,
         prevDecorator: C.current
       })
-    }) ? window.history.back() : $("IDLE");
+    }) ? window.history.back() : U("IDLE");
   }, Ot = (v) => {
-    if (!(!I && P && U === "COMPLETED" && b === "IDLE" && !!g))
+    if (!(!L && P && F === "COMPLETED" && Q === "IDLE" && !!g))
       return;
-    q.current = vt(v.target, {
+    B.current = vt(v.target, {
       direction: "x",
       verifyByScroll: !0
-    }), Y.current = vt(v.target, {
+    }), X.current = vt(v.target, {
       direction: "y",
       verifyByScroll: !0
-    }), yt.current = v.clientX, gt.current = v.clientY, (!q.current.element && !Y.current.element || q.current.element || Y.current.element) && (A.current = !0);
+    }), yt.current = v.clientX, gt.current = v.clientY, (!B.current.element && !X.current.element || B.current.element || X.current.element) && (b.current = !0);
   }, Gt = (v) => {
-    const O = !q.current.element && !Y.current.element;
-    if (A.current && O)
-      A.current = !1, V.current = !0, k.start(v);
-    else if (A.current && !O) {
-      const G = v.clientX - yt.current, B = v.clientY - gt.current, it = Y.current.element && Y.current.element.scrollTop <= 0 && Y.current.hasMarker, Ut = q.current.element && q.current.element.scrollLeft <= 0 && q.current.hasMarker;
-      (g === "y" && (it || q.current.element) && B > 0 && Math.abs(G) < 4 || g === "x" && (Ut || Y.current.element) && G > 0 && Math.abs(B) < 4) && (A.current = !1, V.current = !0, k.start(v));
+    const G = !B.current.element && !X.current.element;
+    if (b.current && G)
+      b.current = !1, W.current = !0, k.start(v);
+    else if (b.current && !G) {
+      const $ = v.clientX - yt.current, K = v.clientY - gt.current, it = X.current.element && X.current.element.scrollTop <= 0 && X.current.hasMarker, Ut = B.current.element && B.current.element.scrollLeft <= 0 && B.current.hasMarker;
+      (g === "y" && (it || B.current.element) && K > 0 && Math.abs($) < 4 || g === "x" && (Ut || X.current.element) && $ > 0 && Math.abs(K) < 4) && (b.current = !1, W.current = !0, k.start(v));
     }
   }, $t = () => {
-    A.current = !1, V.current = !1;
+    b.current = !1, W.current = !1;
   };
-  return K(() => {
+  return z(() => {
     const v = m.current;
     if (!v) return;
-    const O = (G) => {
-      V.current && G.preventDefault(), G.target?.dataset.swipeAtEdgeBar === "true" && G.preventDefault();
+    const G = ($) => {
+      W.current && $.preventDefault(), $.target?.dataset.swipeAtEdgeBar === "true" && $.preventDefault();
     };
-    return v.addEventListener("touchmove", O, {
+    return v.addEventListener("touchmove", G, {
       passive: !1
     }), () => {
-      v.removeEventListener("touchmove", O);
+      v.removeEventListener("touchmove", G);
     };
-  }, [m]), K(() => {
+  }, [m]), z(() => {
     m.current && (async () => {
-      const { value: v, options: O } = i[`${U}-${P}`];
-      !P && U === "REPLACING" && w !== N && (tt("PENDING"), await d(m.current, ie, {
+      const { value: v, options: G } = i[`${F}-${P}`];
+      !P && F === "REPLACING" && w !== N && (R("PENDING"), await d(m.current, ie, {
         duration: 0.1
-      })), P && U === "COMPLETED" && ($("IDLE"), tt("IDLE")), await d(m.current, v, O), await Q.resolveTask(u);
+      })), P && F === "COMPLETED" && (U("IDLE"), R("IDLE")), await d(m.current, v, G), await q.resolveTask(u);
     })();
   }, [
-    U,
+    F,
     P,
     u,
     w,
@@ -1499,14 +1503,14 @@ function Ct({
     d,
     m,
     i,
-    $,
-    tt
+    U,
+    R
   ]), Et(() => {
-    at.current && L(at.current.offsetHeight);
+    at.current && I(at.current.offsetHeight);
   }, [a]), Et(() => {
-    ot.current && R(ot.current.offsetHeight);
+    ot.current && O(ot.current.offsetHeight);
   }, [o]), /* @__PURE__ */ ct(
-    z.div,
+    J.div,
     {
       ref: S,
       style: {
@@ -1538,7 +1542,7 @@ function Ct({
           }
         ),
         a && /* @__PURE__ */ D(
-          z.div,
+          J.div,
           {
             ref: at,
             style: {
@@ -1551,7 +1555,7 @@ function Ct({
           }
         ),
         /* @__PURE__ */ ct(
-          z.div,
+          J.div,
           {
             ref: m,
             ...l,
@@ -1559,9 +1563,9 @@ function Ct({
             drag: g,
             dragListener: !1,
             dragControls: k,
-            onDragStart: At,
-            onDrag: Rt,
-            onDragEnd: bt,
+            onDragStart: bt,
+            onDrag: At,
+            onDragEnd: Rt,
             onPointerDown: Ot,
             onPointerMove: Gt,
             onPointerUp: $t,
@@ -1577,7 +1581,7 @@ function Ct({
             },
             children: [
               !c && e && /* @__PURE__ */ D(
-                z.div,
+                J.div,
                 {
                   animate: {
                     backgroundColor: t
@@ -1608,7 +1612,7 @@ function Ct({
                 }
               ),
               !h && r && /* @__PURE__ */ D(
-                z.div,
+                J.div,
                 {
                   animate: {
                     backgroundColor: s
@@ -1623,7 +1627,7 @@ function Ct({
           }
         ),
         o && /* @__PURE__ */ D(
-          z.div,
+          J.div,
           {
             ref: ot,
             style: {
@@ -1655,11 +1659,11 @@ function Ct({
   );
 }
 function Te({ children: n, ...e }) {
-  const { isActive: t, isPrev: r, zIndex: s } = Z(), a = j((d) => d.index), o = F((d) => d.status), c = W((d) => d.dragStatus), h = W((d) => d.replaceTransitionStatus), m = !t && (o === "COMPLETED" && c === "IDLE") || r && a - 2 <= s && h === "IDLE" || r && a - 2 > s;
+  const { isActive: t, isPrev: r, zIndex: s } = tt(), a = Y((d) => d.index), o = j((d) => d.status), c = Z((d) => d.dragStatus), h = Z((d) => d.replaceTransitionStatus), m = !t && (o === "COMPLETED" && c === "IDLE") || r && a - 2 <= s && h === "IDLE" || r && a - 2 > s;
   return /* @__PURE__ */ D(Mt, { freeze: m, children: /* @__PURE__ */ D(Ct, { ...e, children: n }) });
 }
 function ve({ children: n, ...e }) {
-  const { isActive: t, isPrev: r, zIndex: s } = Z(), a = j((d) => d.index), o = F((d) => d.status), c = W((d) => d.dragStatus), h = W((d) => d.replaceTransitionStatus), m = !t && (o === "COMPLETED" && c === "IDLE") || r && a - 2 <= s && h === "IDLE" || r && a - 2 > s;
+  const { isActive: t, isPrev: r, zIndex: s } = tt(), a = Y((d) => d.index), o = j((d) => d.status), c = Z((d) => d.dragStatus), h = Z((d) => d.replaceTransitionStatus), m = !t && (o === "COMPLETED" && c === "IDLE") || r && a - 2 <= s && h === "IDLE" || r && a - 2 > s;
   return /* @__PURE__ */ D(Mt, { freeze: m, children: /* @__PURE__ */ D(
     Ct,
     {
@@ -1668,12 +1672,12 @@ function ve({ children: n, ...e }) {
         backgroundColor: "transparent",
         ...e.style
       },
-      children: /* @__PURE__ */ D(jt, { children: n })
+      children: /* @__PURE__ */ D(Qt, { children: n })
     }
   ) });
 }
 function De({ children: n, ...e }) {
-  const { isActive: t, transitionName: r } = Z(), s = F((o) => o.status), a = et.get(r);
+  const { isActive: t, transitionName: r } = tt(), s = j((o) => o.status), a = et.get(r);
   return /* @__PURE__ */ D(
     qt,
     {
@@ -1695,6 +1699,6 @@ export {
   rt as createTransition,
   me as useNavigate,
   we as useParams,
-  Z as useScreen,
+  tt as useScreen,
   Ee as useStep
 };

package/package.json

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