flemo 1.1.3 → 1.1.4

package/dist/core/TaskManger.d.ts

@@ -6,12 +6,31 @@ interface TaskResult<T> {
     timestamp?: number;
     instanceId?: string;
 }
+type TaskStatus = "PENDING" | "MANUAL_PENDING" | "SIGNAL_PENDING" | "PROCESSING" | "COMPLETED" | "FAILED" | "ROLLEDBACK";
 interface Control {
     manual?: boolean;
     delay?: number;
     condition?: () => Promise<boolean>;
     signal?: string;
 }
+interface Task<T> {
+    id: string;
+    execute: (abortController: AbortController) => Promise<T>;
+    validate?: () => Promise<boolean>;
+    rollback?: () => Promise<void>;
+    control?: Control;
+    timestamp: number;
+    retryCount: number;
+    status: TaskStatus;
+    dependencies: string[];
+    instanceId: string;
+    abortController?: AbortController;
+    manualResolver?: {
+        resolve: (value: TaskResult<T>) => void;
+        reject: (error: Error) => void;
+        result: T;
+    };
+}
 declare class TaskManager {
     private tasks;
     private readonly instanceId;
@@ -28,7 +47,7 @@ declare class TaskManager {
     private processPendingTasks;
     private waitForPendingTasks;
     private onTaskStatusChange;
-    addTask<T>(execute: () => Promise<T>, options?: {
+    addTask<T>(execute: Task<T>["execute"], options?: {
         id?: string;
         delay?: number;
         validate?: () => Promise<boolean>;

package/dist/index.mjs

@@ -1,11 +1,11 @@
-import { jsx as E, jsxs as et } from "react/jsx-runtime";
-import { useEffect as G, createContext as X, useReducer as Pt, Children as nt, useContext as q, Suspense as Et, useImperativeHandle as St, useRef as N } from "react";
-import { d as A, c as _ } from "./vendor-C8cPYUOQ.js";
+import { jsx as w, jsxs as et } from "react/jsx-runtime";
+import { useEffect as G, createContext as X, useReducer as Pt, Children as nt, useContext as q, Suspense as Et, useImperativeHandle as St, useRef as I } from "react";
+import { d as x, c as _ } from "./vendor-C8cPYUOQ.js";
 import { animate as F } from "motion";
-import { animate as C, transform as st, useAnimate as at, motion as rt, useDragControls as wt } from "motion/react";
+import { animate as A, transform as st, useAnimate as at, motion as rt, useDragControls as wt } from "motion/react";
 function yt(s, e, t) {
-  const a = Array.isArray(s) ? s.find((o) => A.pathToRegexp(o).regexp.test(e)) || "" : A.pathToRegexp(s).regexp.test(e) ? s : "", n = A.match(a)(e), r = new URLSearchParams(t), c = Object.fromEntries(r.entries());
-  return n ? { ...n.params, ...c } : {};
+  const a = Array.isArray(s) ? s.find((c) => x.pathToRegexp(c).regexp.test(e)) || "" : x.pathToRegexp(s).regexp.test(e) ? s : "", n = x.match(a)(e), i = new URLSearchParams(t), o = Object.fromEntries(i.entries());
+  return n ? { ...n.params, ...o } : {};
 }
 function Z() {
   return typeof document > "u";
@@ -23,7 +23,7 @@ class Lt {
     for (let n = 0; n < 10; n++) {
       if (!this.isLocked)
         return this.isLocked = !0, this.currentTaskId = e, !0;
-      await new Promise((r) => setTimeout(r, 100));
+      await new Promise((i) => setTimeout(i, 100));
     }
     return !1;
   }
@@ -75,10 +75,10 @@ class Lt {
   }
   async addTask(e, t = {}) {
     const a = t.id || this.generateTaskId();
-    return new Promise((n, r) => {
+    return new Promise((n, i) => {
       this.taskQueue = this.taskQueue.then(async () => {
         try {
-          const { control: c, validate: o, rollback: u, dependencies: l = [], delay: f } = t, i = {
+          const { control: o, validate: c, rollback: u, dependencies: l = [], delay: p } = t, f = new AbortController(), r = {
             id: a,
             execute: e,
             timestamp: Date.now(),
@@ -86,64 +86,75 @@ class Lt {
             status: "PENDING",
             dependencies: l,
             instanceId: this.instanceId,
-            validate: o,
+            validate: c,
             rollback: u,
-            control: c
+            control: o,
+            abortController: f
           };
-          this.tasks.set(i.id, i), this.pendingTaskQueue.length > 0 && (this.pendingTaskQueue.push(i), await this.waitForPendingTasks(), this.pendingTaskQueue = this.pendingTaskQueue.filter((p) => p.id !== i.id));
+          this.tasks.set(r.id, r), this.pendingTaskQueue.length > 0 && (this.pendingTaskQueue.push(r), await this.waitForPendingTasks(), this.pendingTaskQueue = this.pendingTaskQueue.filter((P) => P.id !== r.id));
           try {
-            if (!await this.acquireLock(i.id))
-              throw i.status = "FAILED", new Error("FAILED");
+            if (!await this.acquireLock(r.id))
+              throw r.status = "FAILED", new Error("FAILED");
             try {
-              i.status = "PROCESSING";
-              for (const m of i.dependencies) {
-                const w = this.tasks.get(m);
-                if (!w || w.status !== "COMPLETED")
-                  throw i.status = "FAILED", new Error("FAILED");
+              r.status = "PROCESSING";
+              for (const h of r.dependencies) {
+                const m = this.tasks.get(h);
+                if (!m || m.status !== "COMPLETED")
+                  throw r.status = "FAILED", new Error("FAILED");
+              }
+              if (r.validate && !await r.validate())
+                throw r.status = "FAILED", new Error("FAILED");
+              p && p > 0 && await new Promise((h) => setTimeout(h, p));
+              const E = await r.execute(r.abortController);
+              if (r.abortController.signal.aborted) {
+                r.status = "COMPLETED", await this.onTaskStatusChange(r.id, "COMPLETED"), n({
+                  success: !0,
+                  result: void 0,
+                  taskId: r.id,
+                  timestamp: Date.now(),
+                  instanceId: this.instanceId
+                });
+                return;
               }
-              if (i.validate && !await i.validate())
-                throw i.status = "FAILED", new Error("FAILED");
-              f && f > 0 && await new Promise((m) => setTimeout(m, f));
-              const g = await i.execute();
               if (t.control) {
-                const m = t.control;
-                if (m.delay && m.delay > 0 && await new Promise((w) => setTimeout(w, m.delay)), m.manual) {
-                  i.status = "MANUAL_PENDING", i.manualResolver = { resolve: n, reject: r, result: g }, this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "MANUAL_PENDING");
+                const h = t.control;
+                if (h.delay && h.delay > 0 && await new Promise((m) => setTimeout(m, h.delay)), h.manual) {
+                  r.status = "MANUAL_PENDING", r.manualResolver = { resolve: n, reject: i, result: E }, this.pendingTaskQueue.push(r), await this.onTaskStatusChange(r.id, "MANUAL_PENDING");
                   return;
                 }
-                if (m.signal) {
-                  i.status = "SIGNAL_PENDING", i.manualResolver = { resolve: n, reject: r, result: g }, this.signalListeners.has(m.signal) || this.signalListeners.set(m.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(m.signal).add(i.id), this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "SIGNAL_PENDING");
+                if (h.signal) {
+                  r.status = "SIGNAL_PENDING", r.manualResolver = { resolve: n, reject: i, result: E }, this.signalListeners.has(h.signal) || this.signalListeners.set(h.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(h.signal).add(r.id), this.pendingTaskQueue.push(r), await this.onTaskStatusChange(r.id, "SIGNAL_PENDING");
                   return;
                 }
-                if (m.condition && !await m.condition()) {
-                  i.status = "MANUAL_PENDING", i.manualResolver = { resolve: n, reject: r, result: g }, this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "MANUAL_PENDING");
+                if (h.condition && !await h.condition()) {
+                  r.status = "MANUAL_PENDING", r.manualResolver = { resolve: n, reject: i, result: E }, this.pendingTaskQueue.push(r), await this.onTaskStatusChange(r.id, "MANUAL_PENDING");
                   return;
                 }
               }
-              i.status = "COMPLETED", await this.onTaskStatusChange(i.id, "COMPLETED"), n({
+              r.status = "COMPLETED", await this.onTaskStatusChange(r.id, "COMPLETED"), n({
                 success: !0,
-                result: g,
-                taskId: i.id,
+                result: E,
+                taskId: r.id,
                 timestamp: Date.now(),
                 instanceId: this.instanceId
               });
-            } catch (g) {
-              if (i.status = "FAILED", i.rollback)
+            } catch (E) {
+              if (r.status = "FAILED", r.rollback)
                 try {
-                  await i.rollback(), i.status = "ROLLEDBACK";
+                  await r.rollback(), r.status = "ROLLEDBACK";
                 } catch {
                 }
-              throw await this.onTaskStatusChange(i.id, i.status), g;
+              throw await this.onTaskStatusChange(r.id, r.status), E;
             } finally {
-              this.releaseLock(i.id);
+              this.releaseLock(r.id);
             }
-          } catch (p) {
-            r(p);
+          } catch (P) {
+            i(P);
           }
-        } catch (c) {
-          r(c);
+        } catch (o) {
+          i(o);
         }
-      }).catch(r);
+      }).catch(i);
     });
   }
   async resolveTask(e) {
@@ -161,7 +172,7 @@ class Lt {
         taskId: t.id,
         timestamp: Date.now(),
         instanceId: this.instanceId
-      }), delete t.manualResolver, !0;
+      }), delete t.manualResolver, await this.onTaskStatusChange(e, "COMPLETED"), !0;
     }
     return !1;
   }
@@ -172,7 +183,7 @@ class Lt {
     await Promise.all(e.map((t) => this.resolveTask(t.id)));
   }
 }
-const I = new Lt(), R = _((s) => ({
+const N = new Lt(), R = _((s) => ({
   index: -1,
   histories: [],
   addHistory: (e) => s((t) => ({
@@ -194,21 +205,28 @@ const I = new Lt(), R = _((s) => ({
 function Tt() {
   return G(() => {
     const s = async (e) => {
-      const t = e.state?.id, a = e.state?.index, n = e.state?.status, r = e.state?.params, c = e.state?.transitionName, o = T.getState().setStatus, { index: u, addHistory: l, popHistory: f } = R.getState(), i = a < u, h = n === "PUSHING" && a > u, p = n === "REPLACING" && a > u, g = window.location.pathname;
-      !i && !h && !p || (await I.addTask(
-        async () => (i ? o("POPPING") : h ? (o("PUSHING"), l({
-          id: t,
-          pathname: g,
-          params: r,
-          transitionName: c
-        })) : p && (o("REPLACING"), l({
-          id: t,
-          pathname: g,
-          params: r,
-          transitionName: c
-        })), async () => {
-          i && f(a + 1), o("COMPLETED");
-        }),
+      const t = e.state?.id;
+      (await N.addTask(
+        async (a) => {
+          const n = e.state?.index, i = e.state?.status, o = e.state?.params, c = e.state?.transitionName, u = T.getState().setStatus, { index: l, addHistory: p, popHistory: f } = R.getState(), r = n < l, g = i === "PUSHING" && n > l, P = i === "REPLACING" && n > l, E = window.location.pathname;
+          if (!r && !g && !P) {
+            a.abort();
+            return;
+          }
+          return r ? u("POPPING") : g ? (u("PUSHING"), p({
+            id: t,
+            pathname: E,
+            params: o,
+            transitionName: c
+          })) : P && (u("REPLACING"), p({
+            id: t,
+            pathname: E,
+            params: o,
+            transitionName: c
+          })), async () => {
+            r && f(n + 1), u("COMPLETED");
+          };
+        },
         {
           id: t,
           control: {
@@ -232,22 +250,22 @@ function Dt(s, e) {
       return s;
   }
 }
-function Nt({
+function It({
   children: s,
   active: e,
   params: t
 }) {
   const [a, n] = Pt(Dt, t);
   return G(() => {
-    const r = async (c) => {
-      c.state?.step && await I.addTask(async () => {
-        n({ type: "SET", params: c.state?.params || {} });
+    const i = async (o) => {
+      o.state?.step && await N.addTask(async () => {
+        n({ type: "SET", params: o.state?.params || {} });
       });
     };
-    return e && window.addEventListener("popstate", r), () => {
-      window.removeEventListener("popstate", r);
+    return e && window.addEventListener("popstate", i), () => {
+      window.removeEventListener("popstate", i);
     };
-  }, [e, n]), /* @__PURE__ */ E(ot.Provider, { value: n, children: /* @__PURE__ */ E(it.Provider, { value: a, children: s }) });
+  }, [e, n]), /* @__PURE__ */ w(ot.Provider, { value: n, children: /* @__PURE__ */ w(it.Provider, { value: a, children: s }) });
 }
 const ct = X({
   id: "",
@@ -260,15 +278,15 @@ const ct = X({
   transitionName: "none",
   prevTransitionName: "none"
 });
-function It({ children: s }) {
+function Nt({ children: s }) {
   const e = R((a) => a.index), t = R((a) => a.histories);
   return t.map(
     (a) => nt.toArray(s).filter(
-      (n) => A.pathToRegexp(n.props.path).regexp.test(
+      (n) => x.pathToRegexp(n.props.path).regexp.test(
         a.pathname
       )
     )
-  ).map(([a], n) => /* @__PURE__ */ E(
+  ).map(([a], n) => /* @__PURE__ */ w(
     ct.Provider,
     {
       value: {
@@ -282,7 +300,7 @@ function It({ children: s }) {
         transitionName: t[e].transitionName,
         prevTransitionName: t[e - 1]?.transitionName
       },
-      children: /* @__PURE__ */ E(Nt, { active: n === e, params: t[n].params, children: a })
+      children: /* @__PURE__ */ w(It, { active: n === e, params: t[n].params, children: a })
     },
     t[n].id
   ));
@@ -378,9 +396,9 @@ function j({
   idle: t,
   enter: a,
   enterBack: n,
-  exit: r,
-  exitBack: c,
-  options: o
+  exit: i,
+  exitBack: o,
+  options: c
 }) {
   return {
     name: s,
@@ -388,16 +406,16 @@ function j({
     variants: {
       "IDLE-true": t,
       "IDLE-false": t,
-      "PUSHING-false": r,
+      "PUSHING-false": i,
       "PUSHING-true": a,
-      "REPLACING-false": r,
+      "REPLACING-false": i,
       "REPLACING-true": a,
-      "POPPING-false": c,
+      "POPPING-false": o,
       "POPPING-true": n,
-      "COMPLETED-false": r,
+      "COMPLETED-false": i,
       "COMPLETED-true": a
     },
-    ...o
+    ...c
   };
 }
 const Mt = j({
@@ -457,29 +475,29 @@ const Mt = j({
     swipeDirection: "x",
     onSwipeStart: async () => !0,
     onSwipe: (s, e, { currentScreen: t, prevScreen: a, onProgress: n }) => {
-      const { offset: r } = e, c = r.x, o = st(c, [0, window.innerWidth], [0, 100]);
-      return n?.(!0, o), C(
+      const { offset: i } = e, o = i.x, c = st(o, [0, window.innerWidth], [0, 100]);
+      return n?.(!0, c), A(
         t,
         {
-          x: Math.max(0, c)
+          x: Math.max(0, o)
         },
         {
           duration: 0
         }
-      ), C(
+      ), A(
         a,
         {
-          x: -100 + o
+          x: -100 + c
         },
         {
           duration: 0
         }
-      ), o;
+      ), c;
     },
     onSwipeEnd: async (s, e, { currentScreen: t, prevScreen: a, onStart: n }) => {
-      const { offset: r, velocity: c } = e, u = r.x > 50 || c.x > 20;
+      const { offset: i, velocity: o } = e, u = i.x > 50 || o.x > 20;
       return n?.(u), await Promise.all([
-        C(
+        A(
           t,
           {
             x: u ? "100%" : 0
@@ -489,7 +507,7 @@ const Mt = j({
             ease: [0.32, 0.72, 0, 1]
           }
         ),
-        C(
+        A(
           a,
           {
             x: u ? 0 : -100
@@ -502,7 +520,7 @@ const Mt = j({
       ]), u;
     }
   }
-}), xt = j({
+}), Ct = j({
   name: "material",
   initial: {
     y: "100%",
@@ -564,29 +582,29 @@ const Mt = j({
     swipeDirection: "y",
     onSwipeStart: async () => !0,
     onSwipe: (s, e, { currentScreen: t, prevScreen: a, onProgress: n }) => {
-      const { offset: r } = e, c = r.y, o = Math.max(0, Math.min(56, c)), u = st(o, [0, 56], [1, 0.96]), l = Math.max(0, c - 56), f = Math.min(1, l / 160), i = Math.sqrt(f) * 12, h = Math.max(0, o + i), p = Math.min(56, h);
-      return n?.(!0, p), C(
+      const { offset: i } = e, o = i.y, c = Math.max(0, Math.min(56, o)), u = st(c, [0, 56], [1, 0.96]), l = Math.max(0, o - 56), p = Math.min(1, l / 160), f = Math.sqrt(p) * 12, r = Math.max(0, c + f), g = Math.min(56, r);
+      return n?.(!0, g), A(
         t,
         {
-          y: h,
+          y: r,
           opacity: u
         },
         {
           duration: 0
         }
-      ), C(
+      ), A(
         a,
         {
-          y: -56 + p,
-          opacity: p / 56
+          y: -56 + g,
+          opacity: g / 56
         },
         { duration: 0 }
-      ), p;
+      ), g;
     },
     onSwipeEnd: async (s, e, { currentScreen: t, prevScreen: a, onStart: n }) => {
-      const { offset: r, velocity: c } = e, u = r.y > 56 || c.y > 20;
+      const { offset: i, velocity: o } = e, u = i.y > 56 || o.y > 20;
       return n?.(u), await Promise.all([
-        C(
+        A(
           t,
           {
             y: u ? "100%" : 0,
@@ -597,7 +615,7 @@ const Mt = j({
             ease: u ? [0.4, 0, 1, 1] : [0, 0, 0.2, 1]
           }
         ),
-        C(
+        A(
           a,
           {
             y: u ? 0 : -56,
@@ -611,7 +629,7 @@ const Mt = j({
       ]), u;
     }
   }
-}), At = j({
+}), xt = j({
   name: "none",
   initial: {
     transition: {
@@ -649,10 +667,10 @@ const Mt = j({
     }
   }
 }), Q = /* @__PURE__ */ new Map([
-  ["none", At],
+  ["none", xt],
   ["cupertino", Mt],
-  ["material", xt]
-]), Ct = (() => {
+  ["material", Ct]
+]), At = (() => {
   const s = /* @__PURE__ */ Object.create(null), e = Object.prototype.hasOwnProperty;
   for (const t of Q.values()) {
     const a = t.variants["IDLE-true"].value;
@@ -668,7 +686,7 @@ function Yt({
   transitions: a = [],
   decorators: n = []
 }) {
-  const r = Z() ? e || "/" : window.location.pathname, c = Z() ? r.split("?")[1] || "" : window.location.search;
+  const i = Z() ? e || "/" : window.location.pathname, o = Z() ? i.split("?")[1] || "" : window.location.search;
   return B.setState({
     defaultTransitionName: t
   }), R.setState({
@@ -676,19 +694,19 @@ function Yt({
     histories: [
       {
         id: "root",
-        pathname: r,
+        pathname: i,
         params: yt(
-          nt.toArray(s).map((o) => o.props.path).flat(),
-          r,
-          c
+          nt.toArray(s).map((c) => c.props.path).flat(),
+          i,
+          o
         ),
         transitionName: t
       }
     ]
   }), G(() => {
-    a.forEach((o) => Q.set(o.name, o));
+    a.forEach((c) => Q.set(c.name, c));
   }, [a]), G(() => {
-    n.forEach((o) => K.set(o.name, o));
+    n.forEach((c) => K.set(c.name, c));
   }, [n]), /* @__PURE__ */ et(
     "div",
     {
@@ -700,8 +718,8 @@ function Yt({
         height: "100%"
       },
       children: [
-        /* @__PURE__ */ E(Tt, {}),
-        /* @__PURE__ */ E(It, { children: s })
+        /* @__PURE__ */ w(Tt, {}),
+        /* @__PURE__ */ w(Nt, { children: s })
       ]
     }
   );
@@ -711,86 +729,86 @@ function Xt({ element: s }) {
 }
 function qt() {
   return {
-    push: async (a, n, r = {}) => {
-      const { status: c, setStatus: o } = T.getState();
-      if (c !== "COMPLETED" && c !== "IDLE")
+    push: async (a, n, i = {}) => {
+      const { status: o, setStatus: c } = T.getState();
+      if (o !== "COMPLETED" && o !== "IDLE")
         return;
-      const { index: u, addHistory: l } = R.getState(), f = B.getState().defaultTransitionName, { transitionName: i = f } = r, h = I.generateTaskId();
-      (await I.addTask(
+      const { index: u, addHistory: l } = R.getState(), p = B.getState().defaultTransitionName, { transitionName: f = p } = i, r = N.generateTaskId();
+      (await N.addTask(
         async () => {
-          o("PUSHING");
-          const p = A.compile(a)(n), g = A.parse(a).tokens.filter((D) => D.type === "param").map((D) => D.name), m = Object.fromEntries(
-            Object.entries(n).filter(([D]) => !g.includes(D))
-          ), w = new URLSearchParams(m).toString(), y = `${p}${w ? `?${w}` : ""}`;
+          c("PUSHING");
+          const g = x.compile(a)(n), P = x.parse(a).tokens.filter((D) => D.type === "param").map((D) => D.name), E = Object.fromEntries(
+            Object.entries(n).filter(([D]) => !P.includes(D))
+          ), h = new URLSearchParams(E).toString(), m = `${g}${h ? `?${h}` : ""}`;
           return window.history.state?.id || window.history.replaceState(
             {
               id: "root",
               index: 0,
               status: "IDLE",
               params: {},
-              transitionName: i
+              transitionName: f
             },
             "",
             window.location.pathname
           ), window.history.pushState(
             {
-              id: h,
+              id: r,
               index: u + 1,
               status: "PUSHING",
               params: n,
-              transitionName: i
+              transitionName: f
             },
             "",
-            y
+            m
           ), l({
-            id: h,
-            pathname: p,
+            id: r,
+            pathname: g,
             params: n,
-            transitionName: i
+            transitionName: f
           }), () => {
-            o("COMPLETED");
+            c("COMPLETED");
           };
         },
         {
-          id: h,
+          id: r,
           control: {
             manual: !0
           }
         }
       )).result?.();
     },
-    replace: async (a, n, r = {}) => {
-      const { status: c, setStatus: o } = T.getState();
-      if (c !== "COMPLETED" && c !== "IDLE")
+    replace: async (a, n, i = {}) => {
+      const { status: o, setStatus: c } = T.getState();
+      if (o !== "COMPLETED" && o !== "IDLE")
         return;
-      const { index: u, addHistory: l } = R.getState(), f = R.getState().replaceHistory, i = B.getState().defaultTransitionName, { transitionName: h = i } = r, p = I.generateTaskId();
-      (await I.addTask(
+      const { index: u, addHistory: l } = R.getState(), p = R.getState().replaceHistory, f = B.getState().defaultTransitionName, { transitionName: r = f } = i, g = N.generateTaskId();
+      (await N.addTask(
         async () => {
-          o("REPLACING");
-          const g = A.compile(a)(n), m = A.parse(a).tokens.filter((L) => L.type === "param").map((L) => L.name), w = Object.fromEntries(
-            Object.entries(n).filter(([L]) => !m.includes(L))
-          ), y = new URLSearchParams(w).toString(), D = `${g}${y ? `?${y}` : ""}`;
+          c("REPLACING");
+          const P = x.compile(a)(n), E = x.parse(a).tokens.filter((L) => L.type === "param").map((L) => L.name), h = Object.fromEntries(
+            Object.entries(n).filter(([L]) => !E.includes(L))
+          ), m = new URLSearchParams(h).toString(), D = `${P}${m ? `?${m}` : ""}`;
           return window.history.replaceState(
             {
-              id: p,
+              id: g,
               index: u,
               status: "REPLACING",
               params: n,
-              transitionName: h
+              transitionName: r
             },
             "",
             D
           ), l({
-            id: p,
-            pathname: g,
+            id: g,
+            pathname: P,
             params: n,
-            transitionName: h
+            transitionName: r
           }), async () => {
-            f(u), o("COMPLETED");
+            p(u), c("COMPLETED");
           };
         },
         {
-          id: p,
+          id: g,
           control: {
             manual: !0
           }
@@ -807,9 +825,9 @@ function Kt() {
   const s = q(ot);
   return {
     pushStep: async (n) => {
-      const r = T.getState().status;
-      r !== "COMPLETED" && r !== "IDLE" || (await I.addTask(async () => {
-        const c = new URLSearchParams(n).toString(), o = `${window.location.pathname}${c ? `?${c}` : ""}`;
+      const i = T.getState().status;
+      i !== "COMPLETED" && i !== "IDLE" || (await N.addTask(async () => {
+        const o = new URLSearchParams(n).toString(), c = `${window.location.pathname}${o ? `?${o}` : ""}`;
         return window.history.state?.step || window.history.replaceState(
           {
             ...window.history.state,
@@ -824,14 +842,14 @@ function Kt() {
             params: n
           },
           "",
-          o
+          c
         ), async () => s({ type: "SET", params: n });
       })).result?.();
     },
     replaceStep: async (n) => {
-      const r = T.getState().status;
-      r !== "COMPLETED" && r !== "IDLE" || (await I.addTask(async () => {
-        const c = new URLSearchParams(n).toString(), o = `${window.location.pathname}${c ? `?${c}` : ""}`;
+      const i = T.getState().status;
+      i !== "COMPLETED" && i !== "IDLE" || (await N.addTask(async () => {
+        const o = new URLSearchParams(n).toString(), c = `${window.location.pathname}${o ? `?${o}` : ""}`;
         return window.history.replaceState(
           {
             ...window.history.state,
@@ -839,7 +857,7 @@ function Kt() {
             params: n
           },
           "",
-          o
+          c
         ), async () => s({ type: "SET", params: n });
       })).result?.();
     },
@@ -861,13 +879,13 @@ function Vt({
   idle: t,
   pushOnEnter: a,
   pushOnExit: n,
-  replaceOnEnter: r,
-  replaceOnExit: c,
-  popOnEnter: o,
+  replaceOnEnter: i,
+  replaceOnExit: o,
+  popOnEnter: c,
   popOnExit: u,
   completedOnExit: l,
-  completedOnEnter: f,
-  options: i
+  completedOnEnter: p,
+  options: f
 }) {
   return {
     name: s,
@@ -877,14 +895,14 @@ function Vt({
       "IDLE-false": t,
       "PUSHING-false": n,
       "PUSHING-true": a,
-      "REPLACING-false": c,
-      "REPLACING-true": r,
+      "REPLACING-false": o,
+      "REPLACING-true": i,
       "POPPING-false": u,
-      "POPPING-true": o,
+      "POPPING-true": c,
       "COMPLETED-false": l,
-      "COMPLETED-true": f
+      "COMPLETED-true": p
     },
-    ...i
+    ...f
   };
 }
 function Wt({
@@ -893,13 +911,13 @@ function Wt({
   idle: t,
   pushOnEnter: a,
   pushOnExit: n,
-  replaceOnEnter: r,
-  replaceOnExit: c,
-  popOnEnter: o,
+  replaceOnEnter: i,
+  replaceOnExit: o,
+  popOnEnter: c,
   popOnExit: u,
   completedOnEnter: l,
-  completedOnExit: f,
-  options: i
+  completedOnExit: p,
+  options: f
 }) {
   return {
     name: s,
@@ -909,14 +927,14 @@ function Wt({
       "IDLE-false": t,
       "PUSHING-false": n,
       "PUSHING-true": a,
-      "REPLACING-false": c,
-      "REPLACING-true": r,
+      "REPLACING-false": o,
+      "REPLACING-true": i,
       "POPPING-false": u,
-      "POPPING-true": o,
-      "COMPLETED-false": f,
+      "POPPING-true": c,
+      "COMPLETED-false": p,
       "COMPLETED-true": l
     },
-    ...i
+    ...f
   };
 }
 const Rt = { then() {
@@ -929,29 +947,29 @@ function Gt({
     throw Rt;
   return e;
 }
-function Ot({ freeze: s, children: e, placeholder: t }) {
-  return /* @__PURE__ */ E(Et, { fallback: t, children: /* @__PURE__ */ E(Gt, { freeze: s, children: e }) });
+function bt({ freeze: s, children: e, placeholder: t }) {
+  return /* @__PURE__ */ w(Et, { fallback: t, children: /* @__PURE__ */ w(Gt, { freeze: s, children: e }) });
 }
 function z(s, e) {
   const {
     direction: t = "x",
     markerSelector: a = "[data-swipe-at-edge]",
     depthLimit: n = 24,
-    verifyByScroll: r = !1
-  } = e ?? {}, c = bt(s);
-  if (!c) return { element: null, hasMarker: !1 };
-  const o = c.closest?.(a);
-  if (o instanceof HTMLElement && Y(o, t) && (!r || tt(o, t)))
-    return { element: o, hasMarker: !0 };
-  let u = c, l = 0;
+    verifyByScroll: i = !1
+  } = e ?? {}, o = Ot(s);
+  if (!o) return { element: null, hasMarker: !1 };
+  const c = o.closest?.(a);
+  if (c instanceof HTMLElement && Y(c, t) && (!i || tt(c, t)))
+    return { element: c, hasMarker: !0 };
+  let u = o, l = 0;
   for (; u && u !== document.body && l < n; ) {
-    if (Y(u, t) && (!r || tt(u, t)))
+    if (Y(u, t) && (!i || tt(u, t)))
       return { element: u, hasMarker: !1 };
     u = u.parentElement, l++;
   }
   return { element: null, hasMarker: !1 };
 }
-function bt(s) {
+function Ot(s) {
   if (!s) return null;
   const e = s, t = typeof e.composedPath == "function" ? e.composedPath() : void 0;
   if (t && t.length) {
@@ -982,18 +1000,18 @@ function tt(s, e) {
   }
 }
 function Ht({ children: s, ref: e, ...t }) {
-  const { isActive: a, transitionName: n } = V(), [r, c] = at();
-  St(e, () => r.current);
-  const o = T((h) => h.status), u = Q.get(n), { decoratorName: l } = u, { initial: f, variants: i } = K.get(l);
+  const { isActive: a, transitionName: n } = V(), [i, o] = at();
+  St(e, () => i.current);
+  const c = T((r) => r.status), u = Q.get(n), { decoratorName: l } = u, { initial: p, variants: f } = K.get(l);
   return G(() => {
-    if (!r.current) return;
-    const { value: h, options: p } = i[`${o}-${a}`];
-    c(r.current, h, p);
-  }, [o, a, c, i, r]), /* @__PURE__ */ E(
+    if (!i.current) return;
+    const { value: r, options: g } = f[`${c}-${a}`];
+    o(i.current, r, g);
+  }, [c, a, o, f, i]), /* @__PURE__ */ w(
     rt.div,
     {
-      ref: r,
-      initial: f,
+      ref: i,
+      initial: p,
       style: {
         position: "absolute",
         top: 0,
@@ -1007,7 +1025,7 @@ function Ht({ children: s, ref: e, ...t }) {
     }
   );
 }
-const b = _((s) => ({
+const O = _((s) => ({
   dragStatus: "IDLE",
   replaceTransitionStatus: "IDLE",
   setDragStatus: (e) => s({ dragStatus: e }),
@@ -1017,46 +1035,46 @@ function Ut({
   children: s,
   ...e
 }) {
-  const [t, a] = at(), { id: n, isActive: r, isRoot: c, transitionName: o, prevTransitionName: u } = V(), l = wt(), f = T((d) => d.status), i = b((d) => d.dragStatus), h = b.getState().setDragStatus, p = b.getState().setReplaceTransitionStatus, g = Q.get(o), { variants: m, initial: w, swipeDirection: y, decoratorName: D } = g, L = K.get(D), H = N(null), U = N(null), $ = N(null), k = N(!1), O = N(!1), v = N({
+  const [t, a] = at(), { id: n, isActive: i, isRoot: o, transitionName: c, prevTransitionName: u } = V(), l = wt(), p = T((d) => d.status), f = O((d) => d.dragStatus), r = O.getState().setDragStatus, g = O.getState().setReplaceTransitionStatus, P = Q.get(c), { variants: E, initial: h, swipeDirection: m, decoratorName: D } = P, L = K.get(D), H = I(null), U = I(null), $ = I(null), k = I(!1), b = I(!1), v = I({
     element: null,
     hasMarker: !1
-  }), M = N({ element: null, hasMarker: !1 }), W = N(0), J = N(0), ut = async (d, S) => {
-    if (!y)
+  }), M = I({ element: null, hasMarker: !1 }), W = I(0), J = I(0), ut = async (d, y) => {
+    if (!m)
       return;
     H.current = t.current?.previousSibling, $.current = t.current?.previousSibling?.querySelector("[data-decorator]");
-    const P = await g?.onSwipeStart(d, S, {
+    const S = await P?.onSwipeStart(d, y, {
       currentScreen: t.current,
       prevScreen: H.current,
       dragControls: l,
-      onStart: (x) => L?.onSwipeStart?.(x, {
+      onStart: (C) => L?.onSwipeStart?.(C, {
         currentDecorator: U.current,
         prevDecorator: $.current
       })
     });
-    h(P ? "PENDING" : "IDLE");
-  }, lt = (d, S) => {
-    !y || i !== "PENDING" || g?.onSwipe(d, S, {
+    r(S ? "PENDING" : "IDLE");
+  }, lt = (d, y) => {
+    !m || f !== "PENDING" || P?.onSwipe(d, y, {
       currentScreen: t.current,
       prevScreen: H.current,
       dragControls: l,
-      onProgress: (P, x) => L?.onSwipe?.(P, x, {
+      onProgress: (S, C) => L?.onSwipe?.(S, C, {
         currentDecorator: U.current,
         prevDecorator: $.current
       })
     });
-  }, dt = async (d, S) => {
-    if (!y || i !== "PENDING")
+  }, dt = async (d, y) => {
+    if (!m || f !== "PENDING")
       return;
-    await g?.onSwipeEnd(d, S, {
+    await P?.onSwipeEnd(d, y, {
       currentScreen: t.current,
       prevScreen: H.current,
-      onStart: (x) => L?.onSwipeEnd?.(x, {
+      onStart: (C) => L?.onSwipeEnd?.(C, {
         currentDecorator: U.current,
         prevDecorator: $.current
       })
-    }) ? window.history.back() : h("IDLE");
+    }) ? window.history.back() : r("IDLE");
   }, pt = (d) => {
-    if (!(!c && r && f === "COMPLETED" && i === "IDLE" && !!y))
+    if (!(!o && i && p === "COMPLETED" && f === "IDLE" && !!m))
       return;
     v.current = z(d.target, {
       direction: "x"
@@ -1064,52 +1082,52 @@ function Ut({
       direction: "y"
     }), W.current = d.clientX, J.current = d.clientY, (!v.current.element && !M.current.element || v.current.element || M.current.element) && (k.current = !0);
   }, ft = (d) => {
-    const S = !v.current.element && !M.current.element;
-    if (k.current && S)
-      k.current = !1, O.current = !0, l.start(d);
-    else if (k.current && !S) {
-      const P = d.clientX - W.current, x = d.clientY - J.current, mt = M.current.element && M.current.element.scrollTop <= 0 && M.current.hasMarker, gt = v.current.element && v.current.element.scrollLeft <= 0 && v.current.hasMarker;
-      (y === "y" && (mt || v.current.element) && x > 0 && Math.abs(P) < 4 || y === "x" && (gt || M.current.element) && P > 0 && Math.abs(x) < 4) && (k.current = !1, O.current = !0, l.start(d));
+    const y = !v.current.element && !M.current.element;
+    if (k.current && y)
+      k.current = !1, b.current = !0, l.start(d);
+    else if (k.current && !y) {
+      const S = d.clientX - W.current, C = d.clientY - J.current, gt = M.current.element && M.current.element.scrollTop <= 0 && M.current.hasMarker, mt = v.current.element && v.current.element.scrollLeft <= 0 && v.current.hasMarker;
+      (m === "y" && (gt || v.current.element) && C > 0 && Math.abs(S) < 4 || m === "x" && (mt || M.current.element) && S > 0 && Math.abs(C) < 4) && (k.current = !1, b.current = !0, l.start(d));
     }
   }, ht = () => {
-    k.current = !1, O.current = !1;
+    k.current = !1, b.current = !1;
   };
   return G(() => {
     const d = t.current;
     if (!d) return;
-    const S = (P) => {
-      O.current && P.preventDefault(), P.target?.dataset.swipeAtEdgeBar === "true" && P.preventDefault();
+    const y = (S) => {
+      b.current && S.preventDefault(), S.target?.dataset.swipeAtEdgeBar === "true" && S.preventDefault();
     };
-    return d.addEventListener("touchmove", S, {
+    return d.addEventListener("touchmove", y, {
       passive: !1
     }), () => {
-      d.removeEventListener("touchmove", S);
+      d.removeEventListener("touchmove", y);
     };
   }, [t]), G(() => {
     t.current && (async () => {
-      const { value: d, options: S } = m[`${f}-${r}`], P = u !== o;
-      !r && f === "REPLACING" && P && (p("PENDING"), await a(t.current, Ct, {
+      const { value: d, options: y } = E[`${p}-${i}`], S = u !== c;
+      !i && p === "REPLACING" && S && (g("PENDING"), await a(t.current, At, {
         duration: 0.1
-      })), await a(t.current, d, S), await I.resolveTask(n), !r && P && p("IDLE"), r && f === "COMPLETED" && h("IDLE");
+      })), await a(t.current, d, y), await N.resolveTask(n), !i && S && g("IDLE"), i && p === "COMPLETED" && r("IDLE");
     })();
   }, [
-    f,
-    r,
+    p,
+    i,
     n,
     u,
-    o,
+    c,
     a,
     t,
-    m,
-    h,
-    p
+    E,
+    r,
+    g
   ]), /* @__PURE__ */ et(
     rt.div,
     {
       ref: t,
       ...e,
-      initial: w,
-      drag: y,
+      initial: h,
+      drag: m,
       dragListener: !1,
       dragControls: l,
       onDragStart: ut,
@@ -1135,7 +1153,7 @@ function Ut({
         ...e.style
       },
       children: [
-        /* @__PURE__ */ E(
+        /* @__PURE__ */ w(
           "div",
           {
             "data-swipe-at-edge-bar": !0,
@@ -1149,7 +1167,7 @@ function Ut({
             }
           }
         ),
-        /* @__PURE__ */ E(
+        /* @__PURE__ */ w(
           "div",
           {
             style: {
@@ -1162,8 +1180,8 @@ function Ut({
             children: s
           }
         ),
-        L && /* @__PURE__ */ E(Ht, { ref: U }),
-        /* @__PURE__ */ E(
+        L && /* @__PURE__ */ w(Ht, { ref: U }),
+        /* @__PURE__ */ w(
           "div",
           {
             "data-swipe-at-edge-bar": !0,
@@ -1185,8 +1203,8 @@ function Jt({
   children: s,
   ...e
 }) {
-  const { isActive: t, isPrev: a } = V(), n = T((l) => l.status), r = b((l) => l.dragStatus), c = b((l) => l.replaceTransitionStatus);
-  return /* @__PURE__ */ E(Ot, { freeze: !t && (n === "COMPLETED" && r === "IDLE" && c === "IDLE" || a && c === "IDLE"), children: /* @__PURE__ */ E(Ut, { ...e, children: s }) });
+  const { isActive: t, isPrev: a } = V(), n = T((l) => l.status), i = O((l) => l.dragStatus), o = O((l) => l.replaceTransitionStatus);
+  return /* @__PURE__ */ w(bt, { freeze: !t && (n === "COMPLETED" && i === "IDLE" && o === "IDLE" || a && o === "IDLE"), children: /* @__PURE__ */ w(Ut, { ...e, children: s }) });
 }
 export {
   Xt as Route,

package/package.json

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