flemo 1.0.0 → 1.1.1

package/dist/index.mjs

@@ -1,16 +1,16 @@
-import { jsx as P, jsxs as q, Fragment as tt } from "react/jsx-runtime";
-import { useEffect as I, createContext as O, useReducer as et, Children as Y, useContext as b, Suspense as nt, useImperativeHandle as at, useRef as R } from "react";
-import { d as N, c as M } from "./vendor-C8cPYUOQ.js";
-import { animate as st } from "motion";
-import { animate as w, transform as X, useAnimate as j, motion as K, useDragControls as rt } from "motion/react";
-function it(r, e, t) {
-  const a = Array.isArray(r) ? r.find((i) => N.pathToRegexp(i).regexp.test(e)) || "" : N.pathToRegexp(r).regexp.test(e) ? r : "", n = N.match(a)(e), s = new URLSearchParams(t), c = Object.fromEntries(s.entries());
-  return n ? { ...n.params, ...c } : {};
+import { jsx as P, jsxs as tt } from "react/jsx-runtime";
+import { useEffect as R, createContext as X, useReducer as gt, Children as et, useContext as q, Suspense as Pt, useImperativeHandle as yt, useRef as L } from "react";
+import { d as I, c as U } from "./vendor-C8cPYUOQ.js";
+import { animate as F } from "motion";
+import { animate as M, transform as nt, useAnimate as rt, motion as at, useDragControls as wt } from "motion/react";
+function St(n, e, t) {
+  const a = Array.isArray(n) ? n.find((i) => I.pathToRegexp(i).regexp.test(e)) || "" : I.pathToRegexp(n).regexp.test(e) ? n : "", r = I.match(a)(e), s = new URLSearchParams(t), o = Object.fromEntries(s.entries());
+  return r ? { ...r.params, ...o } : {};
 }
-function B() {
+function J() {
   return typeof document > "u";
 }
-class ot {
+class Et {
   tasks = /* @__PURE__ */ new Map();
   instanceId = Date.now().toString();
   isLocked = !1;
@@ -19,7 +19,7 @@ class ot {
   signalListeners = /* @__PURE__ */ new Map();
   // 신호 리스너
   async acquireLock(e) {
-    for (let n = 0; n < 10; n++) {
+    for (let r = 0; r < 10; r++) {
       if (!this.isLocked)
         return this.isLocked = !0, this.currentTaskId = e, !0;
       await new Promise((s) => setTimeout(s, 100));
@@ -40,72 +40,72 @@ class ot {
   }
   async addTask(e, t = {}) {
     const a = t.id || this.generateTaskId();
-    return new Promise((n, s) => {
+    return new Promise((r, s) => {
       this.taskQueue = this.taskQueue.then(async () => {
         try {
-          const { control: c, validate: i, rollback: p, dependencies: h = [] } = t, o = {
+          const { control: o, validate: i, rollback: c, dependencies: p = [] } = t, u = {
             id: a,
             execute: e,
             timestamp: Date.now(),
             retryCount: 0,
             status: "PENDING",
-            dependencies: h,
+            dependencies: p,
             instanceId: this.instanceId,
             validate: i,
-            rollback: p,
-            control: c
+            rollback: c,
+            control: o
           };
-          this.tasks.set(o.id, o);
+          this.tasks.set(u.id, u);
           try {
-            if (!await this.acquireLock(o.id))
-              throw o.status = "FAILED", new Error("FAILED");
+            if (!await this.acquireLock(u.id))
+              throw u.status = "FAILED", new Error("FAILED");
             try {
-              o.status = "PROCESSING";
-              for (const l of o.dependencies) {
-                const g = this.tasks.get(l);
-                if (!g || g.status !== "COMPLETED")
-                  throw o.status = "FAILED", new Error("FAILED");
+              u.status = "PROCESSING";
+              for (const l of u.dependencies) {
+                const w = this.tasks.get(l);
+                if (!w || w.status !== "COMPLETED")
+                  throw u.status = "FAILED", new Error("FAILED");
               }
-              if (o.validate && !await o.validate())
-                throw o.status = "FAILED", new Error("FAILED");
-              const u = await o.execute();
+              if (u.validate && !await u.validate())
+                throw u.status = "FAILED", new Error("FAILED");
+              const d = await u.execute();
               if (t.control) {
                 const l = t.control;
-                if (l.delay && l.delay > 0 && await new Promise((g) => setTimeout(g, l.delay)), l.manual) {
-                  o.status = "MANUAL_PENDING", o.manualResolver = { resolve: n, reject: s, result: u };
+                if (l.delay && l.delay > 0 && await new Promise((w) => setTimeout(w, l.delay)), l.manual) {
+                  u.status = "MANUAL_PENDING", u.manualResolver = { resolve: r, reject: s, result: d };
                   return;
                 }
                 if (l.signal) {
-                  o.status = "MANUAL_PENDING", o.manualResolver = { resolve: n, reject: s, result: u }, this.signalListeners.has(l.signal) || this.signalListeners.set(l.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(l.signal).add(o.id);
+                  u.status = "MANUAL_PENDING", u.manualResolver = { resolve: r, reject: s, result: d }, this.signalListeners.has(l.signal) || this.signalListeners.set(l.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(l.signal).add(u.id);
                   return;
                 }
                 if (l.condition && !await l.condition()) {
-                  o.status = "MANUAL_PENDING", o.manualResolver = { resolve: n, reject: s, result: u };
+                  u.status = "MANUAL_PENDING", u.manualResolver = { resolve: r, reject: s, result: d };
                   return;
                 }
               }
-              o.status = "COMPLETED", n({
+              u.status = "COMPLETED", r({
                 success: !0,
-                result: u,
-                taskId: o.id,
+                result: d,
+                taskId: u.id,
                 timestamp: Date.now(),
                 instanceId: this.instanceId
               });
-            } catch (u) {
-              if (o.status = "FAILED", o.rollback)
+            } catch (d) {
+              if (u.status = "FAILED", u.rollback)
                 try {
-                  await o.rollback(), o.status = "ROLLEDBACK";
+                  await u.rollback(), u.status = "ROLLEDBACK";
                 } catch {
                 }
-              throw u;
+              throw d;
             } finally {
-              this.releaseLock(o.id);
+              this.releaseLock(u.id);
             }
-          } catch (d) {
-            s(d);
+          } catch (h) {
+            s(h);
           }
-        } catch (c) {
-          s(c);
+        } catch (o) {
+          s(o);
         }
       }).catch(s);
     });
@@ -139,103 +139,103 @@ class ot {
     return Array.from(this.tasks.values()).filter((e) => e.status === "MANUAL_PENDING");
   }
 }
-const f = new ot(), T = M((r) => ({
+const m = new Et(), x = U((n) => ({
   index: -1,
   histories: [],
-  addHistory: (e) => r((t) => ({
+  addHistory: (e) => n((t) => ({
     index: t.index + 1,
     histories: t.histories.concat(e)
   })),
-  replaceHistory: (e) => r((t) => (t.histories.splice(e, 1), {
+  replaceHistory: (e) => n((t) => (t.histories.splice(e, 1), {
     index: t.index - 1,
     histories: t.histories
   })),
-  popHistory: (e) => r((t) => ({
+  popHistory: (e) => n((t) => ({
     index: t.index - 1,
-    histories: t.histories.filter((a, n) => n !== e)
+    histories: t.histories.filter((a, r) => r !== e)
   }))
-})), k = M((r) => ({
+})), C = U((n) => ({
   status: "IDLE",
-  setStatus: (e) => r({ status: e })
+  setStatus: (e) => n({ status: e })
 }));
-function ct() {
-  return I(() => {
-    const r = async (e) => {
-      await f.resolveAllPending();
-      const { index: t, addHistory: a, popHistory: n } = T.getState(), s = k.getState().setStatus, c = e.state?.id, i = e.state?.index, p = e.state?.status, h = e.state?.params, o = e.state?.transitionName, d = i < t, u = p === "PUSHING" && i > t, l = p === "REPLACING" && i > t;
-      d ? (await f.addTask(
+function vt() {
+  return R(() => {
+    const n = async (e) => {
+      await m.resolveAllPending();
+      const { index: t, addHistory: a, popHistory: r } = x.getState(), s = C.getState().setStatus, o = e.state?.id, i = e.state?.index, c = e.state?.status, p = e.state?.params, u = e.state?.transitionName, h = i < t, d = c === "PUSHING" && i > t, l = c === "REPLACING" && i > t;
+      h ? (await m.addTask(
         async () => (s("POPPING"), async () => {
-          n(i + 1), f.getManualPendingTasks().length || s("COMPLETED");
+          r(i + 1), m.getManualPendingTasks().length || s("COMPLETED");
         }),
         {
-          id: c,
+          id: o,
           control: {
             manual: !0
           }
         }
-      ))?.result?.() : u ? (await f.addTask(
+      ))?.result?.() : d ? (await m.addTask(
         async () => (s("PUSHING"), a({
-          id: c,
+          id: o,
           pathname: window.location.pathname,
-          params: h,
-          transitionName: o
+          params: p,
+          transitionName: u
         }), async () => {
-          f.getManualPendingTasks().length || s("COMPLETED");
+          m.getManualPendingTasks().length || s("COMPLETED");
         }),
         {
-          id: c,
+          id: o,
           control: {
             manual: !0
           }
         }
-      ))?.result?.() : l && (await f.addTask(
+      ))?.result?.() : l && (await m.addTask(
         async () => (s("REPLACING"), a({
-          id: c,
+          id: o,
           pathname: window.location.pathname,
-          params: h,
-          transitionName: o
+          params: p,
+          transitionName: u
         }), async () => {
-          f.getManualPendingTasks().length || s("COMPLETED");
+          m.getManualPendingTasks().length || s("COMPLETED");
         }),
         {
-          id: c,
+          id: o,
           control: {
             manual: !0
           }
         }
       ))?.result?.();
     };
-    return window.addEventListener("popstate", r), () => {
-      window.removeEventListener("popstate", r);
+    return window.addEventListener("popstate", n), () => {
+      window.removeEventListener("popstate", n);
     };
   }, []), null;
 }
-const Q = O({}), V = O(() => {
+const st = X({}), ot = X(() => {
 });
-function ut(r, e) {
+function Lt(n, e) {
   switch (e.type) {
     case "SET":
       return e.params;
     default:
-      return r;
+      return n;
   }
 }
-function lt({
-  children: r,
+function Tt({
+  children: n,
   active: e,
   params: t
 }) {
-  const [a, n] = et(ut, t);
-  return I(() => {
-    const s = (c) => {
-      c.state?.step && n({ type: "SET", params: c.state?.params || {} });
+  const [a, r] = gt(Lt, t);
+  return R(() => {
+    const s = (o) => {
+      o.state?.step && r({ type: "SET", params: o.state?.params || {} });
     };
     return e && window.addEventListener("popstate", s), () => {
       window.removeEventListener("popstate", s);
     };
-  }, [e, n]), /* @__PURE__ */ P(V.Provider, { value: n, children: /* @__PURE__ */ P(Q.Provider, { value: a, children: r }) });
+  }, [e, r]), /* @__PURE__ */ P(ot.Provider, { value: r, children: /* @__PURE__ */ P(st.Provider, { value: a, children: n }) });
 }
-const W = O({
+const it = X({
   id: "",
   isActive: !1,
   isRoot: !0,
@@ -246,42 +246,42 @@ const W = O({
   transitionName: "none",
   prevTransitionName: "none"
 });
-function dt({ children: r }) {
-  const e = T((a) => a.index), t = T((a) => a.histories);
+function Dt({ children: n }) {
+  const e = x((a) => a.index), t = x((a) => a.histories);
   return t.map(
-    (a) => Y.toArray(r).filter(
-      (n) => N.pathToRegexp(n.props.path).regexp.test(
+    (a) => et.toArray(n).filter(
+      (r) => I.pathToRegexp(r.props.path).regexp.test(
         a.pathname
       )
     )
-  ).map(([a], n) => /* @__PURE__ */ P(
-    W.Provider,
+  ).map(([a], r) => /* @__PURE__ */ P(
+    it.Provider,
     {
       value: {
-        id: t[n].id,
-        isActive: n === e,
-        isRoot: n === 0,
-        isPrev: n < e - 1,
-        zIndex: n,
-        pathname: t[n].pathname,
-        params: t[n].params,
+        id: t[r].id,
+        isActive: r === e,
+        isRoot: r === 0,
+        isPrev: r < e - 1,
+        zIndex: r,
+        pathname: t[r].pathname,
+        params: t[r].params,
         transitionName: t[e].transitionName,
         prevTransitionName: t[e - 1]?.transitionName
       },
-      children: /* @__PURE__ */ P(lt, { active: n === e, params: t[n].params, children: a })
+      children: /* @__PURE__ */ P(Tt, { active: r === e, params: t[r].params, children: a })
     },
-    t[n].id
+    t[r].id
   ));
 }
-function pt({
-  name: r,
+function Nt({
+  name: n,
   initial: e,
   enter: t,
   exit: a,
-  options: n
+  options: r
 }) {
   return {
-    name: r,
+    name: n,
     initial: e,
     variants: {
       "IDLE-true": t,
@@ -295,10 +295,10 @@ function pt({
       "COMPLETED-false": a,
       "COMPLETED-true": t
     },
-    ...n
+    ...r
   };
 }
-const ft = pt({
+const kt = Nt({
   name: "overlay",
   initial: {
     opacity: 0,
@@ -326,32 +326,50 @@ const ft = pt({
     }
   },
   options: {
-    onSwipe: (r, { prevDecorator: e }) => st(
+    onSwipeStart: (n, { prevDecorator: e }) => F(
       e,
       {
-        opacity: Math.max(0, 1 - r / 100)
+        opacity: n ? 1 : 0
+      },
+      {
+        duration: 0.3
+      }
+    ),
+    onSwipe: (n, e, { prevDecorator: t }) => F(
+      t,
+      {
+        opacity: Math.max(0, 1 - e / 100)
       },
       {
         duration: 0
       }
+    ),
+    onSwipeEnd: (n, { prevDecorator: e }) => F(
+      e,
+      {
+        opacity: n ? 0 : 1
+      },
+      {
+        duration: 0.3
+      }
     )
   }
-}), H = /* @__PURE__ */ new Map([["overlay", ft]]), C = M((r) => ({
+}), j = /* @__PURE__ */ new Map([["overlay", kt]]), _ = U((n) => ({
   defaultTransitionName: "cupertino",
-  setDefaultTransitionName: (e) => r({ defaultTransitionName: e })
+  setDefaultTransitionName: (e) => n({ defaultTransitionName: e })
 }));
-function U({
-  name: r,
+function K({
+  name: n,
   initial: e,
   idle: t,
   enter: a,
-  enterBack: n,
+  enterBack: r,
   exit: s,
-  exitBack: c,
+  exitBack: o,
   options: i
 }) {
   return {
-    name: r,
+    name: n,
     initial: e,
     variants: {
       "IDLE-true": t,
@@ -360,15 +378,15 @@ function U({
       "PUSHING-true": a,
       "REPLACING-false": s,
       "REPLACING-true": a,
-      "POPPING-false": c,
-      "POPPING-true": n,
+      "POPPING-false": o,
+      "POPPING-true": r,
       "COMPLETED-false": s,
       "COMPLETED-true": a
     },
     ...i
   };
 }
-const ht = U({
+const It = K({
   name: "cupertino",
   initial: {
     x: "100%",
@@ -423,62 +441,54 @@ const ht = U({
   options: {
     decoratorName: "overlay",
     swipeDirection: "x",
-    onSwipeStart: async (r, e, { currentScreen: t, dragControls: a }) => {
-      const { offset: n } = e;
-      n.x < 0 && (a.stop(), w(
-        t,
-        {
-          x: 0
-        },
-        {
-          duration: 0.3
-        }
-      ));
-    },
-    onSwipe: (r, e, { currentScreen: t, prevScreen: a }) => {
-      const { offset: n } = e, s = n.x, c = X(s, [0, window.innerWidth], [0, 100]);
-      return w(
+    onSwipeStart: async () => !0,
+    onSwipe: (n, e, { currentScreen: t, prevScreen: a, onProgress: r }) => {
+      const { offset: s } = e, o = s.x, i = nt(o, [0, window.innerWidth], [0, 100]);
+      return r?.(!0, i), M(
         t,
         {
-          x: Math.max(0, s)
+          x: Math.max(0, o)
         },
         {
           duration: 0
         }
-      ), w(
+      ), M(
         a,
         {
-          x: -100 + c
+          x: -100 + i
         },
         {
           duration: 0
         }
-      ), c;
-    },
-    onSwipeEnd: async (r, e, { currentScreen: t, prevScreen: a }) => {
-      const { offset: n, velocity: s } = e, i = n.x > 50 || s.x > 20;
-      return w(
-        t,
-        {
-          x: i ? "100%" : 0
-        },
-        {
-          duration: 0.3,
-          ease: [0.32, 0.72, 0, 1]
-        }
-      ), w(
-        a,
-        {
-          x: i ? 0 : -100
-        },
-        {
-          duration: 0.3,
-          ease: [0.32, 0.72, 0, 1]
-        }
       ), i;
+    },
+    onSwipeEnd: async (n, e, { currentScreen: t, prevScreen: a, onStart: r }) => {
+      const { offset: s, velocity: o } = e, c = s.x > 50 || o.x > 20;
+      return r?.(c), await Promise.all([
+        M(
+          t,
+          {
+            x: c ? "100%" : 0
+          },
+          {
+            duration: 0.3,
+            ease: [0.32, 0.72, 0, 1]
+          }
+        ),
+        M(
+          a,
+          {
+            x: c ? 0 : -100
+          },
+          {
+            duration: 0.3,
+            ease: [0.32, 0.72, 0, 1]
+          }
+        )
+      ]), c;
     }
   }
-}), mt = U({
+}), Mt = K({
   name: "material",
   initial: {
     y: "100%",
@@ -538,68 +548,56 @@ const ht = U({
   },
   options: {
     swipeDirection: "y",
-    onSwipeStart: async (r, e, { currentScreen: t, dragControls: a }) => {
-      const { offset: n } = e;
-      n.y < 0 && (a.stop(), w(
-        t,
-        {
-          y: 0,
-          opacity: 1
-        },
-        {
-          duration: 0.24
-        }
-      ));
-    },
-    onSwipe: (r, e, { currentScreen: t, prevScreen: a }) => {
-      const { offset: n } = e, s = n.y, c = Math.max(0, Math.min(56, s)), i = X(c, [0, 56], [1, 0.96]), p = Math.max(0, s - 56), h = Math.min(1, p / 160), o = Math.sqrt(h) * 12, d = Math.max(0, c + o), u = Math.min(56, d);
-      return w(
+    onSwipeStart: async () => !0,
+    onSwipe: (n, e, { currentScreen: t, prevScreen: a, onProgress: r }) => {
+      const { offset: s } = e, o = s.y, i = Math.max(0, Math.min(56, o)), c = nt(i, [0, 56], [1, 0.96]), p = Math.max(0, o - 56), u = Math.min(1, p / 160), h = Math.sqrt(u) * 12, d = Math.max(0, i + h), l = Math.min(56, d);
+      return r?.(!0, l), M(
         t,
         {
           y: d,
-          opacity: i
+          opacity: c
         },
         {
           duration: 0
         }
-      ), w(
+      ), M(
         a,
         {
-          y: -56 + u,
-          opacity: u / 56
+          y: -56 + l,
+          opacity: l / 56
         },
         { duration: 0 }
-      ), u;
+      ), l;
     },
-    onSwipeEnd: async (r, e, { currentScreen: t, prevScreen: a }) => {
-      const { offset: n, velocity: s } = e, i = n.y > 56 || s.y > 20;
-      return await Promise.all([
-        w(
+    onSwipeEnd: async (n, e, { currentScreen: t, prevScreen: a, onStart: r }) => {
+      const { offset: s, velocity: o } = e, c = s.y > 56 || o.y > 20;
+      return r?.(c), await Promise.all([
+        M(
           t,
           {
-            y: i ? "100%" : 0,
-            opacity: i ? 0.96 : 1
+            y: c ? "100%" : 0,
+            opacity: c ? 0.96 : 1
           },
           {
-            duration: i ? 0.22 : 0.24,
-            ease: i ? [0.4, 0, 1, 1] : [0, 0, 0.2, 1]
+            duration: c ? 0.22 : 0.24,
+            ease: c ? [0.4, 0, 1, 1] : [0, 0, 0.2, 1]
           }
         ),
-        w(
+        M(
           a,
           {
-            y: i ? 0 : -56,
-            opacity: i ? 1 : 0.96
+            y: c ? 0 : -56,
+            opacity: c ? 1 : 0.96
           },
           {
-            duration: i ? 0.22 : 0.24,
-            ease: i ? [0, 0, 0.2, 1] : [0.4, 0, 1, 1]
+            duration: c ? 0.22 : 0.24,
+            ease: c ? [0, 0, 0.2, 1] : [0.4, 0, 1, 1]
           }
         )
-      ]), i;
+      ]), c;
     }
   }
-}), Pt = U({
+}), xt = K({
   name: "none",
   initial: {
     transition: {
@@ -636,135 +634,147 @@ const ht = U({
       duration: 0
     }
   }
-}), A = /* @__PURE__ */ new Map([
-  ["none", Pt],
-  ["cupertino", ht],
-  ["material", mt]
-]), gt = (() => {
-  const r = /* @__PURE__ */ Object.create(null), e = Object.prototype.hasOwnProperty;
-  for (const t of A.values()) {
+}), $ = /* @__PURE__ */ new Map([
+  ["none", xt],
+  ["cupertino", It],
+  ["material", Mt]
+]), Rt = (() => {
+  const n = /* @__PURE__ */ Object.create(null), e = Object.prototype.hasOwnProperty;
+  for (const t of $.values()) {
     const a = t.variants["IDLE-true"].value;
-    for (const n in a)
-      e.call(a, n) && (r[n] = a[n]);
+    for (const r in a)
+      e.call(a, r) && (n[r] = a[r]);
   }
-  return r;
+  return n;
 })();
-function kt({
-  children: r,
+function Yt({
+  children: n,
   initPath: e = "/",
   defaultTransitionName: t = "cupertino",
   transitions: a = [],
-  decorators: n = []
+  decorators: r = []
 }) {
-  const s = B() ? e || "/" : window.location.pathname, c = B() ? s.split("?")[1] || "" : window.location.search;
-  return C.setState({
+  const s = J() ? e || "/" : window.location.pathname, o = J() ? s.split("?")[1] || "" : window.location.search;
+  return _.setState({
     defaultTransitionName: t
-  }), T.setState({
+  }), x.setState({
     index: 0,
     histories: [
       {
         id: "root",
         pathname: s,
-        params: it(
-          Y.toArray(r).map((i) => i.props.path).flat(),
+        params: St(
+          et.toArray(n).map((i) => i.props.path).flat(),
           s,
-          c
+          o
         ),
         transitionName: t
       }
     ]
-  }), I(() => {
-    a.forEach((i) => A.set(i.name, i));
-  }, [a]), I(() => {
-    n.forEach((i) => H.set(i.name, i));
-  }, [n]), /* @__PURE__ */ q(tt, { children: [
-    /* @__PURE__ */ P(ct, {}),
-    /* @__PURE__ */ P(dt, { children: r })
-  ] });
+  }), R(() => {
+    a.forEach((i) => $.set(i.name, i));
+  }, [a]), R(() => {
+    r.forEach((i) => j.set(i.name, i));
+  }, [r]), /* @__PURE__ */ tt(
+    "div",
+    {
+      style: {
+        position: "fixed",
+        top: 0,
+        left: 0,
+        width: "100%",
+        height: "100%"
+      },
+      children: [
+        /* @__PURE__ */ P(vt, {}),
+        /* @__PURE__ */ P(Dt, { children: n })
+      ]
+    }
+  );
 }
-function xt({ element: r }) {
-  return r;
+function Xt({ element: n }) {
+  return n;
 }
-function Mt() {
+function qt() {
   return {
-    push: async (a, n, s = {}) => {
-      if (f.getManualPendingTasks().length)
+    push: async (a, r, s = {}) => {
+      if (m.getManualPendingTasks().length)
         return;
-      const { index: c, addHistory: i } = T.getState(), p = k.getState().setStatus, h = C.getState().defaultTransitionName, { transitionName: o = h } = s, d = f.generateTaskId();
-      (await f.addTask(
+      const { index: o, addHistory: i } = x.getState(), c = C.getState().setStatus, p = _.getState().defaultTransitionName, { transitionName: u = p } = s, h = m.generateTaskId();
+      (await m.addTask(
         async () => {
-          p("PUSHING");
-          const u = N.compile(a)(n), l = N.parse(a).tokens.filter((E) => E.type === "param").map((E) => E.name), g = Object.fromEntries(
-            Object.entries(n).filter(([E]) => !l.includes(E))
-          ), D = new URLSearchParams(g).toString(), S = `${u}${D ? `?${D}` : ""}`;
+          c("PUSHING");
+          const d = I.compile(a)(r), l = I.parse(a).tokens.filter((v) => v.type === "param").map((v) => v.name), w = Object.fromEntries(
+            Object.entries(r).filter(([v]) => !l.includes(v))
+          ), A = new URLSearchParams(w).toString(), S = `${d}${A ? `?${A}` : ""}`;
           return window.history.state?.id || window.history.replaceState(
             {
               id: "root",
               index: 0,
               status: "IDLE",
               params: {},
-              transitionName: o
+              transitionName: u
             },
             "",
             window.location.pathname
           ), window.history.pushState(
             {
-              id: d,
-              index: c + 1,
+              id: h,
+              index: o + 1,
               status: "PUSHING",
-              params: n,
-              transitionName: o
+              params: r,
+              transitionName: u
             },
             "",
             S
           ), i({
-            id: d,
-            pathname: u,
-            params: n,
-            transitionName: o
+            id: h,
+            pathname: d,
+            params: r,
+            transitionName: u
           }), () => {
-            f.getManualPendingTasks().length || p("COMPLETED");
+            m.getManualPendingTasks().length || c("COMPLETED");
           };
         },
         {
-          id: d,
+          id: h,
           control: {
             manual: !0
           }
         }
       )).result?.();
     },
-    replace: async (a, n, s = {}) => {
-      if (f.getManualPendingTasks().length)
+    replace: async (a, r, s = {}) => {
+      if (m.getManualPendingTasks().length)
         return;
-      const { index: c, addHistory: i } = T.getState(), p = T.getState().replaceHistory, h = k.getState().setStatus, o = C.getState().defaultTransitionName, { transitionName: d = o } = s, u = f.generateTaskId();
-      (await f.addTask(
+      const { index: o, addHistory: i } = x.getState(), c = x.getState().replaceHistory, p = C.getState().setStatus, u = _.getState().defaultTransitionName, { transitionName: h = u } = s, d = m.generateTaskId();
+      (await m.addTask(
         async () => {
-          h("REPLACING");
-          const l = N.compile(a)(n), g = N.parse(a).tokens.filter((v) => v.type === "param").map((v) => v.name), D = Object.fromEntries(
-            Object.entries(n).filter(([v]) => !g.includes(v))
-          ), S = new URLSearchParams(D).toString(), E = `${l}${S ? `?${S}` : ""}`;
+          p("REPLACING");
+          const l = I.compile(a)(r), w = I.parse(a).tokens.filter((E) => E.type === "param").map((E) => E.name), A = Object.fromEntries(
+            Object.entries(r).filter(([E]) => !w.includes(E))
+          ), S = new URLSearchParams(A).toString(), v = `${l}${S ? `?${S}` : ""}`;
           return window.history.replaceState(
             {
-              id: u,
-              index: c,
+              id: d,
+              index: o,
               status: "REPLACING",
-              params: n,
-              transitionName: d
+              params: r,
+              transitionName: h
             },
             "",
-            E
+            v
           ), i({
-            id: u,
+            id: d,
             pathname: l,
-            params: n,
-            transitionName: d
+            params: r,
+            transitionName: h
           }), async () => {
-            await f.addTask(async () => p(c)), f.getManualPendingTasks().length || h("COMPLETED");
+            await m.addTask(async () => c(o)), m.getManualPendingTasks().length || p("COMPLETED");
           };
         },
         {
-          id: u,
+          id: d,
           control: {
             manual: !0
           }
@@ -772,16 +782,16 @@ function Mt() {
       )).result?.();
     },
     pop: () => {
-      f.getManualPendingTasks().length || window.history.back();
+      m.getManualPendingTasks().length || window.history.back();
     }
   };
 }
-function At() {
-  const r = b(V);
+function jt() {
+  const n = q(ot);
   return {
-    pushStep: async (n) => {
-      f.getManualPendingTasks().length || (await f.addTask(async () => {
-        const s = new URLSearchParams(n).toString(), c = `${window.location.pathname}${s ? `?${s}` : ""}`;
+    pushStep: async (r) => {
+      m.getManualPendingTasks().length || (await m.addTask(async () => {
+        const s = new URLSearchParams(r).toString(), o = `${window.location.pathname}${s ? `?${s}` : ""}`;
         return window.history.state?.step || window.history.replaceState(
           {
             ...window.history.state,
@@ -793,128 +803,177 @@ function At() {
           {
             ...window.history.state,
             step: !0,
-            params: n
+            params: r
           },
           "",
-          c
-        ), async () => r({ type: "SET", params: n });
+          o
+        ), async () => n({ type: "SET", params: r });
       })).result?.();
     },
-    replaceStep: async (n) => {
-      f.getManualPendingTasks().length || (await f.addTask(async () => {
-        const s = new URLSearchParams(n).toString(), c = `${window.location.pathname}${s ? `?${s}` : ""}`;
+    replaceStep: async (r) => {
+      m.getManualPendingTasks().length || (await m.addTask(async () => {
+        const s = new URLSearchParams(r).toString(), o = `${window.location.pathname}${s ? `?${s}` : ""}`;
         return window.history.replaceState(
           {
             ...window.history.state,
             step: !0,
-            params: n
+            params: r
           },
           "",
-          c
-        ), async () => r({ type: "SET", params: n });
+          o
+        ), async () => n({ type: "SET", params: r });
       })).result?.();
     },
     popStep: () => {
-      f.getManualPendingTasks().length || window.history.back();
+      m.getManualPendingTasks().length || window.history.back();
     }
   };
 }
-function $() {
-  return b(W);
+function Q() {
+  return q(it);
 }
-function Rt() {
-  return b(Q);
+function Kt() {
+  return q(st);
 }
-function Ct({
-  name: r,
+function Qt({
+  name: n,
   initial: e,
   idle: t,
   pushOnEnter: a,
-  pushOnExit: n,
+  pushOnExit: r,
   replaceOnEnter: s,
-  replaceOnExit: c,
+  replaceOnExit: o,
   popOnEnter: i,
-  popOnExit: p,
-  completedOnExit: h,
-  completedOnEnter: o,
-  options: d
+  popOnExit: c,
+  completedOnExit: p,
+  completedOnEnter: u,
+  options: h
 }) {
   return {
-    name: r,
+    name: n,
     initial: e,
     variants: {
       "IDLE-true": t,
       "IDLE-false": t,
-      "PUSHING-false": n,
+      "PUSHING-false": r,
       "PUSHING-true": a,
-      "REPLACING-false": c,
+      "REPLACING-false": o,
       "REPLACING-true": s,
-      "POPPING-false": p,
+      "POPPING-false": c,
       "POPPING-true": i,
-      "COMPLETED-false": h,
-      "COMPLETED-true": o
+      "COMPLETED-false": p,
+      "COMPLETED-true": u
     },
-    ...d
+    ...h
   };
 }
-function Gt({
-  name: r,
+function Vt({
+  name: n,
   initial: e,
   idle: t,
   pushOnEnter: a,
-  pushOnExit: n,
+  pushOnExit: r,
   replaceOnEnter: s,
-  replaceOnExit: c,
+  replaceOnExit: o,
   popOnEnter: i,
-  popOnExit: p,
-  completedOnEnter: h,
-  completedOnExit: o,
-  options: d
+  popOnExit: c,
+  completedOnEnter: p,
+  completedOnExit: u,
+  options: h
 }) {
   return {
-    name: r,
+    name: n,
     initial: e,
     variants: {
       "IDLE-true": t,
       "IDLE-false": t,
-      "PUSHING-false": n,
+      "PUSHING-false": r,
       "PUSHING-true": a,
-      "REPLACING-false": c,
+      "REPLACING-false": o,
       "REPLACING-true": s,
-      "POPPING-false": p,
+      "POPPING-false": c,
       "POPPING-true": i,
-      "COMPLETED-false": o,
-      "COMPLETED-true": h
+      "COMPLETED-false": u,
+      "COMPLETED-true": p
     },
-    ...d
+    ...h
   };
 }
-const yt = { then() {
+const At = { then() {
 } };
-function wt({
-  freeze: r,
+function Ct({
+  freeze: n,
   children: e
 }) {
-  if (r)
-    throw yt;
+  if (n)
+    throw At;
   return e;
 }
-function St({ freeze: r, children: e, placeholder: t }) {
-  return /* @__PURE__ */ P(nt, { fallback: t, children: /* @__PURE__ */ P(wt, { freeze: r, children: e }) });
+function Gt({ freeze: n, children: e, placeholder: t }) {
+  return /* @__PURE__ */ P(Pt, { fallback: t, children: /* @__PURE__ */ P(Ct, { freeze: n, children: e }) });
+}
+function Z(n, e) {
+  const {
+    direction: t = "x",
+    markerSelector: a = "[data-swipe-at-edge]",
+    depthLimit: r = 24,
+    verifyByScroll: s = !1
+  } = e ?? {}, o = bt(n);
+  if (!o) return { element: null, hasMarker: !1 };
+  const i = o.closest?.(a);
+  if (i instanceof HTMLElement && B(i, t) && (!s || z(i, t)))
+    return { element: i, hasMarker: !0 };
+  let c = o, p = 0;
+  for (; c && c !== document.body && p < r; ) {
+    if (B(c, t) && (!s || z(c, t)))
+      return { element: c, hasMarker: !1 };
+    c = c.parentElement, p++;
+  }
+  return { element: null, hasMarker: !1 };
+}
+function bt(n) {
+  if (!n) return null;
+  const e = n, t = typeof e.composedPath == "function" ? e.composedPath() : void 0;
+  if (t && t.length) {
+    for (const a of t)
+      if (a instanceof HTMLElement) return a;
+  }
+  return n;
+}
+function B(n, e) {
+  return e === "y" ? n.scrollHeight - n.clientHeight > 1 : n.scrollWidth - n.clientWidth > 1;
+}
+function z(n, e) {
+  if (!B(n, e)) return !1;
+  if (e === "y") {
+    const t = n.scrollTop;
+    if (n.scrollTop = t + 1, n.scrollTop !== t)
+      return n.scrollTop = t, !0;
+    n.scrollTop = t - 1;
+    const r = n.scrollTop !== t;
+    return n.scrollTop = t, r;
+  } else {
+    const t = n.scrollLeft;
+    if (n.scrollLeft = t + 1, n.scrollLeft !== t)
+      return n.scrollLeft = t, !0;
+    n.scrollLeft = t - 1;
+    const r = n.scrollLeft !== t;
+    return n.scrollLeft = t, r;
+  }
 }
-function Et({ children: r, ref: e, ...t }) {
-  const { isActive: a, transitionName: n } = $(), [s, c] = j();
-  at(e, () => s.current);
-  const i = k((u) => u.status), p = A.get(n), { decoratorName: h } = p, { initial: o, variants: d } = H.get(h);
-  return I(() => {
+function Ot({ children: n, ref: e, ...t }) {
+  const { isActive: a, transitionName: r } = Q(), [s, o] = rt();
+  yt(e, () => s.current);
+  const i = C((d) => d.status), c = $.get(r), { decoratorName: p } = c, { initial: u, variants: h } = j.get(p);
+  return R(() => {
     if (!s.current) return;
-    const { value: u, options: l } = d[`${i}-${a}`];
-    c(s.current, u, l);
-  }, [i, a, c, d, s]), /* @__PURE__ */ P(
-    K.div,
+    const { value: d, options: l } = h[`${i}-${a}`];
+    o(s.current, d, l);
+  }, [i, a, o, h, s]), /* @__PURE__ */ P(
+    at.div,
     {
       ref: s,
-      initial: o,
+      initial: u,
       style: {
         position: "absolute",
         top: 0,
@@ -928,82 +987,144 @@ function Et({ children: r, ref: e, ...t }) {
     }
   );
 }
-const G = M((r) => ({
+const Y = U((n) => ({
   transitionStatus: "IDLE",
-  setTransitionStatus: (e) => r({ transitionStatus: e })
+  setTransitionStatus: (e) => n({ transitionStatus: e })
 }));
-function vt({ children: r, ...e }) {
-  const [t, a] = j(), { id: n, isActive: s, isRoot: c, transitionName: i, prevTransitionName: p } = $(), h = rt(), o = k((m) => m.status), d = G((m) => m.transitionStatus), u = G.getState().setTransitionStatus, l = A.get(i), { variants: g, initial: D, swipeDirection: S, decoratorName: E } = l, v = H.get(E), x = R(null), _ = R(null), F = R(null), J = async (m, y) => {
-    S && (x.current = t.current?.previousSibling, F.current = t.current?.previousSibling?.querySelector("& > [data-decorator]"), l?.onSwipeStart(m, y, {
-      currentScreen: t.current,
-      prevScreen: x.current,
-      dragControls: h
-    }), u("PENDING"));
-  }, Z = (m, y) => {
-    if (!S || d !== "PENDING")
+function Ht({
+  children: n,
+  ...e
+}) {
+  const [t, a] = rt(), { id: r, isActive: s, isRoot: o, transitionName: i, prevTransitionName: c } = Q(), p = wt(), u = C((f) => f.status), h = Y((f) => f.transitionStatus), d = Y.getState().setTransitionStatus, l = $.get(i), { variants: w, initial: A, swipeDirection: S, decoratorName: v } = l, E = j.get(v), b = L(null), O = L(null), H = L(null), T = L(!1), G = L(!1), D = L({
+    element: null,
+    hasMarker: !1
+  }), N = L({ element: null, hasMarker: !1 }), V = L(0), W = L(0), ct = async (f, y) => {
+    if (!S)
       return;
-    const L = l?.onSwipe(m, y, {
+    b.current = t.current?.previousSibling, H.current = t.current?.previousSibling?.querySelector("[data-decorator]");
+    const g = await l?.onSwipeStart(f, y, {
       currentScreen: t.current,
-      prevScreen: x.current,
-      dragControls: h
+      prevScreen: b.current,
+      dragControls: p,
+      onStart: (k) => E?.onSwipeStart?.(k, {
+        currentDecorator: O.current,
+        prevDecorator: H.current
+      })
     });
-    v?.onSwipe?.(L, {
-      currentDecorator: _.current,
-      prevDecorator: F.current
+    d(g ? "PENDING" : "IDLE");
+  }, ut = (f, y) => {
+    !S || h !== "PENDING" || l?.onSwipe(f, y, {
+      currentScreen: t.current,
+      prevScreen: b.current,
+      dragControls: p,
+      onProgress: (g, k) => E?.onSwipe?.(g, k, {
+        currentDecorator: O.current,
+        prevDecorator: H.current
+      })
     });
-  }, z = async (m, y) => {
-    if (!S || d !== "PENDING")
+  }, lt = async (f, y) => {
+    if (!S || h !== "PENDING")
       return;
-    await l?.onSwipeEnd(m, y, {
+    await l?.onSwipeEnd(f, y, {
       currentScreen: t.current,
-      prevScreen: x.current
-    }) ? window.history.back() : u("IDLE");
+      prevScreen: b.current,
+      onStart: (k) => E?.onSwipeEnd?.(k, {
+        currentDecorator: O.current,
+        prevDecorator: H.current
+      })
+    }) ? window.history.back() : d("IDLE");
+  }, dt = (f) => {
+    if (!(!o && s && u === "COMPLETED" && h === "IDLE" && !!S))
+      return;
+    D.current = Z(f.target, {
+      direction: "x"
+    }), N.current = Z(f.target, {
+      direction: "y"
+    }), V.current = f.clientX, W.current = f.clientY, (!D.current.element && !N.current.element || D.current.element || N.current.element) && (T.current = !0);
+  }, pt = (f) => {
+    const y = !D.current.element && !N.current.element;
+    if (T.current && y)
+      T.current = !1, G.current = !0, p.start(f);
+    else if (T.current && !y) {
+      const g = f.clientX - V.current, k = f.clientY - W.current, ht = N.current.element && N.current.element.scrollTop <= 0 && N.current.hasMarker, mt = D.current.element && D.current.element.scrollLeft <= 0 && D.current.hasMarker;
+      (S === "y" && (ht || D.current.element) && k > 0 && g < 2 || S === "x" && (mt || N.current.element) && g > 0 && k < 2) && (T.current = !1, G.current = !0, p.start(f));
+    }
+  }, ft = () => {
+    T.current = !1, G.current = !1;
   };
-  return I(() => {
-    const m = t.current;
-    if (!m) return;
-    const y = (L) => L.preventDefault();
-    return m.addEventListener("touchmove", y), () => {
-      m.removeEventListener("touchmove", y);
+  return R(() => {
+    const f = t.current;
+    if (!f) return;
+    const y = (g) => {
+      G.current && g.preventDefault(), g.target?.dataset.swipeAtEdgeBar === "true" && g.preventDefault();
     };
-  }, [t]), I(() => {
+    return f.addEventListener("touchmove", y, {
+      passive: !1
+    }), () => {
+      f.removeEventListener("touchmove", y);
+    };
+  }, [t]), R(() => {
     t.current && (async () => {
-      const { value: m, options: y } = g[`${o}-${s}`], L = o === "REPLACING" && p !== i;
-      !s && L && (u("PENDING"), await a(t.current, gt, {
+      const { value: f, options: y } = w[`${u}-${s}`], g = u === "REPLACING" && c !== i;
+      !s && g && (d("PENDING"), await a(t.current, Rt, {
         duration: 0.01
-      })), await a(t.current, m, y), await f.resolveTask(n), !s && !L && u("IDLE");
+      })), await a(t.current, f, y), await m.resolveTask(r), !s && !g && d("IDLE");
     })();
   }, [
-    o,
+    u,
     s,
-    n,
-    p,
+    r,
+    c,
     i,
     a,
     t,
-    u,
-    g
-  ]), /* @__PURE__ */ q(
-    K.div,
+    d,
+    w
+  ]), /* @__PURE__ */ tt(
+    at.div,
     {
       ref: t,
-      initial: D,
+      ...e,
+      initial: A,
       drag: S,
-      dragListener: !c && s && o === "COMPLETED" && d === "IDLE",
-      dragControls: h,
-      onDragStart: J,
-      onDrag: Z,
-      onDragEnd: z,
+      dragListener: !1,
+      dragControls: p,
+      onDragStart: ct,
+      onDrag: ut,
+      onDragEnd: lt,
+      onPointerDown: dt,
+      onPointerMove: pt,
+      onPointerUp: ft,
       style: {
         position: "absolute",
         top: 0,
         left: 0,
         width: "100%",
         height: "100%",
+        display: "flex",
+        flexDirection: "column",
         backgroundColor: "white",
+        boxSizing: "border-box",
+        touchAction: "none",
+        isolation: "isolate",
+        contain: "strict",
         ...e.style
       },
       children: [
+        /* @__PURE__ */ P(
+          "div",
+          {
+            "data-swipe-at-edge-bar": !0,
+            style: {
+              position: "absolute",
+              top: 0,
+              left: 0,
+              width: 8,
+              height: "100%",
+              zIndex: 1
+            }
+          }
+        ),
         /* @__PURE__ */ P(
           "div",
           {
@@ -1014,28 +1135,45 @@ function vt({ children: r, ...e }) {
               width: "100%",
               height: "100%"
             },
-            children: r
+            children: n
           }
         ),
-        v && /* @__PURE__ */ P(Et, { ref: _ })
+        E && /* @__PURE__ */ P(Ot, { ref: O }),
+        /* @__PURE__ */ P(
+          "div",
+          {
+            "data-swipe-at-edge-bar": !0,
+            style: {
+              position: "absolute",
+              top: 0,
+              right: 0,
+              width: 8,
+              height: "100%",
+              zIndex: 1
+            }
+          }
+        )
       ]
     }
   );
 }
-function Ot({ children: r, ...e }) {
-  const { isActive: t, isPrev: a } = $(), n = k((p) => p.status), s = G((p) => p.transitionStatus);
-  return /* @__PURE__ */ P(St, { freeze: !t && (n === "COMPLETED" && s === "IDLE" || a), children: /* @__PURE__ */ P(vt, { ...e, children: r }) });
+function Wt({
+  children: n,
+  ...e
+}) {
+  const { isActive: t, isPrev: a } = Q(), r = C((c) => c.status), s = Y((c) => c.transitionStatus);
+  return /* @__PURE__ */ P(Gt, { freeze: !t && (r === "COMPLETED" && s === "IDLE" || a), children: /* @__PURE__ */ P(Ht, { ...e, children: n }) });
 }
 export {
-  xt as Route,
-  kt as Router,
-  Ot as Screen,
-  pt as createDecorator,
-  Gt as createRawDecorator,
-  Ct as createRawTransition,
-  U as createTransition,
-  Mt as useNavigate,
-  Rt as useParams,
-  $ as useScreen,
-  At as useStep
+  Xt as Route,
+  Yt as Router,
+  Wt as Screen,
+  Nt as createDecorator,
+  Vt as createRawDecorator,
+  Qt as createRawTransition,
+  K as createTransition,
+  qt as useNavigate,
+  Kt as useParams,
+  Q as useScreen,
+  jt as useStep
 };