@flemo/core 1.12.0 → 1.13.0

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import { createStore as e } from "zustand/vanilla";
 import { compile as t, match as n, parse as r, pathToRegexp as i } from "path-to-regexp";
-var a = new class {
+//#region src/core/TaskManger.ts
+var a = 1200, o = new class {
 	tasks = /* @__PURE__ */ new Map();
 	instanceId = Date.now().toString();
 	isLocked = !1;
@@ -8,6 +9,9 @@ var a = new class {
 	taskQueue = Promise.resolve();
 	signalListeners = /* @__PURE__ */ new Map();
 	pendingTaskQueue = [];
+	get pendingTaskIds() {
+		return this.pendingTaskQueue.map((e) => e.id);
+	}
 	isProcessingPending = !1;
 	async acquireLock(e) {
 		for (let t = 0; t < 10; t++) {
@@ -45,16 +49,20 @@ var a = new class {
 			}
 		}
 	}
+	pendingWaiters = /* @__PURE__ */ new Set();
+	notifyPendingWaiters() {
+		for (let e of [...this.pendingWaiters]) e();
+	}
 	async waitForPendingTasks() {
 		return new Promise((e) => {
-			let t = () => {
-				this.pendingTaskQueue.filter((e) => e.status === "MANUAL_PENDING" || e.status === "SIGNAL_PENDING").length === 0 ? e() : setTimeout(t, 100);
+			let t = null, n = () => {
+				this.pendingTaskQueue.filter((e) => e.status === "MANUAL_PENDING" || e.status === "SIGNAL_PENDING").length === 0 ? (this.pendingWaiters.delete(n), t && clearTimeout(t), e()) : (t && clearTimeout(t), t = setTimeout(n, 100));
 			};
-			t();
+			this.pendingWaiters.add(n), n();
 		});
 	}
 	async onTaskStatusChange(e, t) {
-		(t === "COMPLETED" || t === "FAILED" || t === "ROLLEDBACK") && (this.pendingTaskQueue = this.pendingTaskQueue.filter((t) => t.id !== e), await this.processPendingTasks());
+		(t === "COMPLETED" || t === "FAILED" || t === "ROLLEDBACK") && (this.pendingTaskQueue = this.pendingTaskQueue.filter((t) => t.id !== e), await this.processPendingTasks(), this.notifyPendingWaiters());
 	}
 	async addTask(e, t = {}) {
 		let n = t.id || this.generateTaskId();
@@ -103,7 +111,7 @@ var a = new class {
 										resolve: r,
 										reject: i,
 										result: e
-									}, this.pendingTaskQueue.push(d), await this.onTaskStatusChange(d.id, "MANUAL_PENDING");
+									}, this.pendingTaskQueue.push(d), this.armBackstop(d), await this.onTaskStatusChange(d.id, "MANUAL_PENDING");
 									return;
 								}
 								if (n.signal) {
@@ -111,7 +119,7 @@ var a = new class {
 										resolve: r,
 										reject: i,
 										result: e
-									}, this.signalListeners.has(n.signal) || this.signalListeners.set(n.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(n.signal).add(d.id), this.pendingTaskQueue.push(d), await this.onTaskStatusChange(d.id, "SIGNAL_PENDING");
+									}, this.signalListeners.has(n.signal) || this.signalListeners.set(n.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(n.signal).add(d.id), this.pendingTaskQueue.push(d), this.armBackstop(d), await this.onTaskStatusChange(d.id, "SIGNAL_PENDING");
 									return;
 								}
 								if (n.condition && !await n.condition()) {
@@ -119,7 +127,7 @@ var a = new class {
 										resolve: r,
 										reject: i,
 										result: e
-									}, this.pendingTaskQueue.push(d), await this.onTaskStatusChange(d.id, "MANUAL_PENDING");
+									}, this.pendingTaskQueue.push(d), this.armBackstop(d), await this.onTaskStatusChange(d.id, "MANUAL_PENDING");
 									return;
 								}
 							}
@@ -147,9 +155,15 @@ var a = new class {
 			}).catch(i);
 		});
 	}
+	armBackstop(e) {
+		let t = e.control?.maxLifetimeMs;
+		!t || t <= 0 || typeof setTimeout > "u" || (e.backstopTimer = setTimeout(() => {
+			delete e.backstopTimer, this.resolveTask(e.id);
+		}, t));
+	}
 	async resolveTask(e) {
 		let t = this.tasks.get(e);
-		if (!t || t.status !== "MANUAL_PENDING" && t.status !== "SIGNAL_PENDING") return !1;
+		if (t?.backstopTimer && (clearTimeout(t.backstopTimer), delete t.backstopTimer), !t || t.status !== "MANUAL_PENDING" && t.status !== "SIGNAL_PENDING") return !1;
 		if (t.manualResolver) {
 			if (t.control?.condition && !await t.control.condition()) return !1;
 			t.status = "COMPLETED";
@@ -175,7 +189,7 @@ var a = new class {
 }();
 //#endregion
 //#region src/history/store.ts
-function o(t = [], n = -1) {
+function s(t = [], n = -1) {
 	return e((e) => ({
 		index: n,
 		pendingIndex: n,
@@ -227,13 +241,13 @@ function o(t = [], n = -1) {
 }
 //#endregion
 //#region src/utils/getMatchedPathPattern.ts
-function s(e, t) {
+function c(e, t) {
 	return Array.isArray(e) ? e.find((e) => i(e).regexp.test(t)) ?? "" : i(e).regexp.test(t) ? e : "";
 }
 //#endregion
 //#region src/utils/getParams.ts
-function c(e, t, r) {
-	let i = n(s(e, t))(t), a = new URLSearchParams(r), o = Object.fromEntries(a.entries());
+function l(e, t, r) {
+	let i = n(c(e, t))(t), a = new URLSearchParams(r), o = Object.fromEntries(a.entries());
 	return i ? {
 		...i.params,
 		...o
@@ -241,24 +255,24 @@ function c(e, t, r) {
 }
 //#endregion
 //#region src/history/seedInitialHistory.ts
-function l(e, t, n, r) {
+function u(e, t, n, r) {
 	return {
 		id: "root",
 		pathname: t,
-		params: c(e, t, n),
+		params: l(e, t, n),
 		transitionName: r,
 		layoutId: null
 	};
 }
 //#endregion
 //#region src/utils/isServer.ts
-function u() {
+function d() {
 	return typeof document > "u";
 }
 //#endregion
 //#region src/history/ensureWindowHistoryState.ts
-function d(e, t, n = {}) {
-	if (u()) return;
+function f(e, t, n = {}) {
+	if (d()) return;
 	let r = {
 		id: "root",
 		index: 0,
@@ -279,12 +293,24 @@ function d(e, t, n = {}) {
 	}, "", window.location.href);
 }
 //#endregion
+//#region src/history/seedRouterEntry.ts
+function p(e) {
+	let { driver: t, routerKey: n, nested: r, seedPathname: i, defaultTransitionName: a, rootParams: o } = e;
+	if (d()) return;
+	if (r) {
+		let e = t.readPathname().replace(/\/+$/, "") || "/";
+		if (!(e === i || e !== "/" && i.startsWith(`${e}/`))) return;
+	}
+	let s = r && n !== null ? t.readState() == null : !1;
+	f(n, a, o), r && n !== null && s && t.readPathname() !== i && t.replaceState(t.readState(), i);
+}
+//#endregion
 //#region src/history/historyDriver.ts
-var f = (e, t) => ({
+var m = (e, t) => ({
 	...window.history.state ?? {},
 	[e]: t
 });
-function p(e) {
+function h(e) {
 	return e === void 0 ? {
 		readState: () => window.history.state,
 		readPathname: () => window.location.pathname,
@@ -302,8 +328,8 @@ function p(e) {
 	} : {
 		readState: () => window.history.state?.[e] ?? null,
 		readPathname: () => window.location.pathname,
-		pushState: (t, n) => window.history.pushState(f(e, t), "", n),
-		replaceState: (t, n) => window.history.replaceState(f(e, t), "", n),
+		pushState: (t, n) => window.history.pushState(m(e, t), "", n),
+		replaceState: (t, n) => window.history.replaceState(m(e, t), "", n),
 		go: (e) => window.history.go(e),
 		back: () => window.history.back(),
 		subscribe: (t) => {
@@ -317,7 +343,7 @@ function p(e) {
 }
 //#endregion
 //#region src/navigate/selfPopGuard.ts
-function m() {
+function g() {
 	let e = 0;
 	return {
 		mark() {
@@ -328,72 +354,149 @@ function m() {
 		}
 	};
 }
-var h = m();
-function g() {
-	h.mark();
+var _ = g();
+function v() {
+	_.mark();
 }
-function _() {
-	return h.consume();
+function y() {
+	return _.consume();
 }
 //#endregion
 //#region src/history/createHistorySync.ts
-function v(e) {
-	let { stores: t, driver: n = p(), consume: r = _ } = e, i = !1, o = n.subscribe(async (e) => {
-		if (i || r()) return;
-		let o = e.state, s = t.history.getState().truncationEpoch, c = a.generateTaskId();
-		(await a.addTask(async (r) => {
+function b(e) {
+	let { stores: t, driver: n = h(), consume: r = y } = e, i = !1, s = 0, c = async (e) => {
+		let n = e.state, r = t.history.getState().truncationEpoch, i = o.generateTaskId();
+		s += 1;
+		try {
+			await l(e, n, r, i);
+		} finally {
+			--s;
+		}
+	}, l = async (r, s, l, u) => {
+		(await o.addTask(async (a) => {
 			if (i) {
-				r.abort();
+				a.abort();
 				return;
 			}
-			let { setStatus: a, setTransitionTaskId: l } = t.navigate.getState(), { index: u, histories: d, addHistory: f, popHistory: p, popHistories: m, setPendingIndex: h } = t.history.getState();
-			if (s !== t.history.getState().truncationEpoch && n.readState()?.id !== e.state?.id) {
-				r.abort();
+			if (e.ownsPathname && !e.ownsPathname(r.pathname)) {
+				a.abort();
 				return;
 			}
-			if (!o?.id) {
-				r.abort();
+			let { setStatus: o, setTransitionTaskId: d } = t.navigate.getState(), { index: f, histories: p, addHistory: m, popHistory: h, setPendingIndex: g } = t.history.getState();
+			if (l !== t.history.getState().truncationEpoch && n.readState()?.id !== r.state?.id) {
+				a.abort();
 				return;
 			}
-			let g = d.findIndex((e) => e.id === o.id);
-			if (g === u) {
-				r.abort();
+			if (!s?.id) {
+				a.abort();
+				return;
+			}
+			let _ = p.findIndex((e) => e.id === s.id);
+			if (_ === f) {
+				a.abort();
 				return;
 			}
-			let _ = {
-				id: o.id,
-				pathname: e.pathname,
-				params: o.params,
-				transitionName: o.transitionName,
-				layoutId: o.layoutId,
-				frameIndex: o.index
+			let v = {
+				id: s.id,
+				pathname: r.pathname,
+				params: s.params,
+				transitionName: s.transitionName,
+				layoutId: s.layoutId,
+				frameIndex: s.index
 			};
-			if (g === -1) {
-				let e = d[u]?.frameIndex ?? u;
-				if (!(o.index > e && (o.status === "PUSHING" || o.status === "REPLACING"))) {
-					t.history.getState().adoptHistory(_), r.abort();
+			if (_ === -1) {
+				let e = p[f]?.frameIndex ?? f;
+				if (!(s.index > e && (s.status === "PUSHING" || s.status === "REPLACING"))) {
+					t.history.getState().adoptHistory(v), a.abort();
 					return;
 				}
-				return l(c), a(o.status === "REPLACING" ? "REPLACING" : "PUSHING"), f(_), async () => {
-					a("COMPLETED");
+				return d(u), o(s.status === "REPLACING" ? "REPLACING" : "PUSHING"), m(v), async () => {
+					o("COMPLETED");
 				};
 			}
-			let v = u - g - 1;
-			return l(c), v > 0 && m(v), h(g), a("POPPING"), async () => {
-				p(g + 1), a("COMPLETED");
+			let y = f - 1;
+			return d(u), g(y), o("POPPING"), async () => {
+				h(y + 1), o("COMPLETED"), y > _ && !i && c(r);
 			};
 		}, {
-			id: c,
-			control: { manual: !0 }
+			id: u,
+			control: {
+				manual: !0,
+				maxLifetimeMs: a
+			}
 		})).result?.();
+	}, u = null, d = 0, f = "", p = 0, m = () => typeof performance < "u" ? performance.now() : Number.MAX_VALUE, g = () => {
+		i || typeof setTimeout > "u" || (u && clearTimeout(u), u = setTimeout(function e() {
+			if (u = null, i) return;
+			if (s > 0 || o.pendingTaskIds.length > 0 || m() - d < 400) {
+				u = setTimeout(e, 150);
+				return;
+			}
+			let r = n.readPathname(), { histories: a, index: l } = t.history.getState(), h = a[l];
+			if (!h || h.pathname === r) {
+				p = 0;
+				return;
+			}
+			let g = n.readState(), _ = `${l}:${h.id}:${g?.id ?? "-"}:${r}`;
+			if (_ === f) {
+				if (p += 1, p > 4) return;
+			} else f = _, p = 0;
+			g?.id && g.id !== h.id && c({
+				state: g,
+				pathname: r
+			}), u = setTimeout(e, 150);
+		}, 150));
+	}, _ = n.subscribe((e) => {
+		if (!i && (d = m(), g(), C(e.pathname), !r())) return c(e);
 	});
-	return () => {
-		i = !0, o();
+	if (e.routerKey && e.zoneEntryId && T(n, e.zoneEntryId)) {
+		let n = t.history.getState().histories[t.history.getState().index]?.pathname, r = w(n);
+		for (let t of r) c({
+			state: t.raw?.[e.routerKey] ?? null,
+			pathname: t.pathname
+		});
+	}
+	return g(), () => {
+		i = !0, u && clearTimeout(u), _();
 	};
 }
+var x = [], S = !1, C = (e) => {
+	S || typeof window > "u" || (S = !0, queueMicrotask(() => {
+		S = !1;
+	}), x.push({
+		raw: window.history.state,
+		pathname: e
+	}));
+}, w = (e) => {
+	if (!e) return [];
+	for (let t = x.length - 1; t >= 0; --t) if (x[t].pathname === e) return x.slice(t + 1);
+	return [];
+}, T = (e, t) => {
+	if (typeof window > "u") return !1;
+	let n = window.history.state;
+	return n ? Object.values(n).some((e) => !!e && typeof e == "object" && e.id === t) : !1;
+};
+function E(e, t) {
+	for (let n = x.length - 1; n >= 0; --n) if (x[n].pathname === t) return x[n].raw?.[e] ?? null;
+	return null;
+}
+var D = /* @__PURE__ */ new WeakMap();
+function ee(e) {
+	D.has(e) || D.set(e, b({
+		stores: e,
+		driver: e.driver,
+		consume: e.consume,
+		routerKey: e.routerKey,
+		zoneEntryId: e.zoneEntryId,
+		ownsPathname: e.ownsPathname
+	}));
+}
+function te(e) {
+	e.persistent || (D.get(e)?.(), D.delete(e));
+}
 //#endregion
 //#region src/history/memoryHistoryDriver.ts
-function y(e) {
+function ne(e) {
 	let t = [{
 		state: e?.state ?? null,
 		url: e?.url ?? "/"
@@ -435,7 +538,7 @@ function y(e) {
 }
 //#endregion
 //#region src/navigate/store.ts
-function b() {
+function re() {
 	return e((e) => ({
 		status: "IDLE",
 		transitionTaskId: null,
@@ -445,11 +548,11 @@ function b() {
 }
 //#endregion
 //#region src/navigate/createNavigationController.ts
-var x = (e, t, n) => {
+var O = (e, t, n) => {
 	let { regexp: r } = i(e);
 	for (let e = t - 1; e >= 0; e--) if (r.test(n[e].pathname)) return t - e;
 	return -1;
-}, S = (e, t) => typeof e == "number" && Number.isFinite(e) ? Math.max(0, Math.trunc(e)) : t, C = async (e, t, n, r) => {
+}, k = (e, t) => typeof e == "number" && Number.isFinite(e) ? Math.max(0, Math.trunc(e)) : t, ie = async (e, t, n, r) => {
 	let i, a = new Promise((t) => {
 		i = e.subscribe(() => t(!0));
 	}), o = new Promise((e) => setTimeout(() => e(!1), 200));
@@ -457,8 +560,8 @@ var x = (e, t, n) => {
 	let s = await Promise.race([a, o]);
 	i(), s && r();
 };
-function w(e) {
-	let { stores: t, buildPathname: n, driver: r = p(), markSelfInduced: i = g } = e, o = () => t.history.getState().bumpTruncationEpoch(), s = () => {
+function ae(e) {
+	let { stores: t, buildPathname: n, driver: r = h(), markSelfInduced: i = v } = e, s = () => t.history.getState().bumpTruncationEpoch(), c = () => {
 		let e = r.readState();
 		if (!e?.id) return null;
 		let { index: n, histories: i, adoptHistory: a, truncateHistory: o } = t.history.getState();
@@ -472,172 +575,181 @@ function w(e) {
 			layoutId: e.layoutId ?? null,
 			frameIndex: e.index
 		}), e;
-	}, c = async (e, c, l) => {
-		let { status: u } = t.navigate.getState();
-		if (u !== "COMPLETED" && u !== "IDLE") return;
-		let d = t.transition.getState().defaultTransitionName, { transitionName: f = d, layoutId: p = null } = l ?? {}, m = a.generateTaskId();
-		(await a.addTask(async (a) => {
+	}, l = async (e, l, u) => {
+		let { status: d } = t.navigate.getState();
+		if (d !== "COMPLETED" && d !== "IDLE") return;
+		let f = t.transition.getState().defaultTransitionName, { transitionName: p = f, layoutId: m = null } = u ?? {}, h = o.generateTaskId();
+		(await o.addTask(async (a) => {
 			if (t.life && !t.life.alive) {
 				a.abort();
 				return;
 			}
-			let u = s(), { index: d, histories: h, addHistory: g, popHistories: _ } = t.history.getState(), v = (() => {
-				if (l?.until != null) {
-					let e = x(l.until, d, h);
+			let o = c(), { index: d, histories: f, addHistory: g, popHistories: _ } = t.history.getState(), v = (() => {
+				if (u?.until != null) {
+					let e = O(u.until, d, f);
 					return e < 0 ? 0 : e;
 				}
-				return Math.min(S(l?.skip, 0), Math.max(0, d));
+				return Math.min(k(u?.skip, 0), Math.max(0, d));
 			})(), { setStatus: y, setTransitionTaskId: b } = t.navigate.getState();
-			y("PUSHING"), b(m);
-			let { pathname: w, toPathname: T } = n(e, c ?? {}), E = {
-				id: m,
-				pathname: T,
-				params: c ?? {},
-				transitionName: f,
-				layoutId: p
-			}, D = u?.index ?? h[d]?.frameIndex ?? d;
-			if (v === 0) return o(), r.pushState({
-				id: m,
-				index: D + 1,
+			y("PUSHING"), b(h);
+			let { pathname: x, toPathname: S } = n(e, l ?? {}), C = {
+				id: h,
+				pathname: S,
+				params: l ?? {},
+				transitionName: p,
+				layoutId: m
+			}, w = o?.index ?? f[d]?.frameIndex ?? d;
+			if (v === 0) return s(), r.pushState({
+				id: h,
+				index: w + 1,
 				status: "PUSHING",
-				params: c,
-				transitionName: f,
-				layoutId: p
-			}, w), g({
-				...E,
-				frameIndex: D + 1
+				params: l,
+				transitionName: p,
+				layoutId: m
+			}, x), g({
+				...C,
+				frameIndex: w + 1
 			}), () => {
 				y("COMPLETED");
 			};
-			let O = h[d - v]?.frameIndex ?? d - v;
+			let T = f[d - v]?.frameIndex ?? d - v;
 			return g({
-				...E,
-				frameIndex: O + 1
-			}), await C(r, i, v, () => {
-				o(), r.pushState({
-					id: m,
-					index: O + 1,
+				...C,
+				frameIndex: T + 1
+			}), await ie(r, i, v, () => {
+				s(), r.pushState({
+					id: h,
+					index: T + 1,
 					status: "PUSHING",
-					params: c,
-					transitionName: f,
-					layoutId: p
-				}, w);
+					params: l,
+					transitionName: p,
+					layoutId: m
+				}, x);
 			}), async () => {
 				_(v), y("COMPLETED");
 			};
 		}, {
-			id: m,
-			control: { manual: !0 }
+			id: h,
+			control: {
+				manual: !0,
+				maxLifetimeMs: a
+			}
 		})).result?.();
-	}, l = async (e, c, l) => {
-		let { status: u } = t.navigate.getState();
-		if (u !== "COMPLETED" && u !== "IDLE") return;
-		let d = t.transition.getState().defaultTransitionName, { transitionName: f = d, layoutId: p = null } = l ?? {}, m = a.generateTaskId();
-		(await a.addTask(async (a) => {
+	}, u = async (e, l, u) => {
+		let { status: d } = t.navigate.getState();
+		if (d !== "COMPLETED" && d !== "IDLE") return;
+		let f = t.transition.getState().defaultTransitionName, { transitionName: p = f, layoutId: m = null } = u ?? {}, h = o.generateTaskId();
+		(await o.addTask(async (a) => {
 			if (t.life && !t.life.alive) {
 				a.abort();
 				return;
 			}
-			let u = s(), { index: d, histories: h, addHistory: g, replaceHistory: _, popHistories: v } = t.history.getState(), y = (() => {
-				if (l?.until != null) {
-					let e = x(l.until, d, h);
+			let o = c(), { index: d, histories: f, addHistory: g, replaceHistory: _, popHistories: v } = t.history.getState(), y = (() => {
+				if (u?.until != null) {
+					let e = O(u.until, d, f);
 					return e < 0 ? 0 : e + 1;
 				}
-				return Math.min(S(l?.skip, 0) + 1, d + 1);
+				return Math.min(k(u?.skip, 0) + 1, d + 1);
 			})();
 			if (y <= 0) {
 				a.abort();
 				return;
 			}
-			let { setStatus: b, setTransitionTaskId: w } = t.navigate.getState();
-			b("REPLACING"), w(m);
-			let { pathname: T, toPathname: E } = n(e, c ?? {}), D = {
-				id: m,
-				pathname: E,
-				params: c ?? {},
-				transitionName: f,
-				layoutId: p
-			}, O = u?.index ?? h[d]?.frameIndex ?? d;
-			if (y === 1) return o(), r.replaceState({
-				id: m,
-				index: O,
+			let { setStatus: b, setTransitionTaskId: x } = t.navigate.getState();
+			b("REPLACING"), x(h);
+			let { pathname: S, toPathname: C } = n(e, l ?? {}), w = {
+				id: h,
+				pathname: C,
+				params: l ?? {},
+				transitionName: p,
+				layoutId: m
+			}, T = o?.index ?? f[d]?.frameIndex ?? d;
+			if (y === 1) return s(), r.replaceState({
+				id: h,
+				index: T,
 				status: "REPLACING",
-				params: c,
-				transitionName: f,
-				layoutId: p
-			}, T), g({
-				...D,
-				frameIndex: O
+				params: l,
+				transitionName: p,
+				layoutId: m
+			}, S), g({
+				...w,
+				frameIndex: T
 			}), async () => {
 				_(d), b("COMPLETED");
 			};
-			let k = y <= d ? (h[d - y]?.frameIndex ?? d - y) + 1 : h[0]?.frameIndex ?? 0;
+			let E = y <= d ? (f[d - y]?.frameIndex ?? d - y) + 1 : f[0]?.frameIndex ?? 0;
 			return v(y - 1), g({
-				...D,
-				frameIndex: k
-			}), y <= d ? await C(r, i, y, () => {
-				o(), r.pushState({
-					id: m,
-					index: k,
+				...w,
+				frameIndex: E
+			}), y <= d ? await ie(r, i, y, () => {
+				s(), r.pushState({
+					id: h,
+					index: E,
 					status: "REPLACING",
-					params: c,
-					transitionName: f,
-					layoutId: p
-				}, T);
-			}) : await C(r, i, d, () => {
-				o(), r.replaceState({
-					id: m,
-					index: k,
+					params: l,
+					transitionName: p,
+					layoutId: m
+				}, S);
+			}) : await ie(r, i, d, () => {
+				s(), r.replaceState({
+					id: h,
+					index: E,
 					status: "REPLACING",
-					params: c,
-					transitionName: f,
-					layoutId: p
-				}, T);
+					params: l,
+					transitionName: p,
+					layoutId: m
+				}, S);
 			}), async () => {
 				_(t.history.getState().index - 1), b("COMPLETED");
 			};
 		}, {
-			id: m,
-			control: { manual: !0 }
+			id: h,
+			control: {
+				manual: !0,
+				maxLifetimeMs: a
+			}
 		})).result?.();
-	}, u = async (e, n) => {
-		let o = a.generateTaskId();
-		(await a.addTask(async (a) => {
+	}, d = async (e, n) => {
+		let s = o.generateTaskId();
+		(await o.addTask(async (a) => {
 			if (t.life && !t.life.alive) {
 				a.abort();
 				return;
 			}
-			s();
-			let { index: c, histories: l, popHistory: u, popHistories: d, setPendingIndex: f, setTransitionName: p } = t.history.getState();
-			if (c <= 0) {
+			c();
+			let { index: o, histories: l, popHistory: u, popHistories: d, setPendingIndex: f, setTransitionName: p } = t.history.getState();
+			if (o <= 0) {
 				a.abort();
 				return;
 			}
-			let m = Math.min(e(c, l), c);
+			let m = Math.min(e(o, l), o);
 			if (m <= 0) {
 				a.abort();
 				return;
 			}
-			f(c - m);
+			f(o - m);
 			let { setStatus: h, setTransitionTaskId: g } = t.navigate.getState();
-			return n && p(c, n), h("POPPING"), g(o), d(m - 1), i(), m === 1 ? r.back() : r.go(-m), async () => {
+			return n && p(o, n), h("POPPING"), g(s), d(m - 1), i(), m === 1 ? r.back() : r.go(-m), async () => {
 				u(t.history.getState().index), h("COMPLETED");
 			};
 		}, {
-			id: o,
-			control: { manual: !0 }
+			id: s,
+			control: {
+				manual: !0,
+				maxLifetimeMs: a
+			}
 		})).result?.();
 	};
 	return {
-		push: c,
-		replace: l,
+		push: l,
+		replace: u,
 		pop: async (e) => {
-			await u((t, n) => {
+			await d((t, n) => {
 				if (e?.until != null) {
-					let r = x(e.until, t, n);
+					let r = O(e.until, t, n);
 					return r < 0 ? 0 : r;
 				}
-				let r = S(e?.skip, 1);
+				let r = k(e?.skip, 1);
 				return r <= 0 ? 0 : Math.min(r, t);
 			}, e?.transitionName);
 		}
@@ -645,18 +757,18 @@ function w(e) {
 }
 //#endregion
 //#region src/navigate/createStepController.ts
-var T = (e) => {
+var oe = (e) => {
 	let t = e;
 	return t?.step ? t.params ?? {} : null;
-}, E = (e, t) => {
+}, se = (e, t) => {
 	let n = new URLSearchParams(Object.fromEntries(Object.entries(t).map(([e, t]) => [e, String(t)]))).toString();
 	return n ? `${e}?${n}` : e;
 };
-function D(e) {
-	let { stores: t, driver: n, markSelfInduced: r, buildStepPathname: i, applyParams: o } = e;
+function ce(e) {
+	let { stores: t, driver: n, markSelfInduced: r, buildStepPathname: i, applyParams: s } = e;
 	return {
 		pushStep: async (e) => {
-			(await a.addTask(async () => {
+			(await o.addTask(async () => {
 				let t = i(e), r = n.readState();
 				return r?.step || n.replaceState({
 					...r,
@@ -665,35 +777,35 @@ function D(e) {
 					...n.readState(),
 					step: !0,
 					params: e
-				}, t), async () => o(e);
+				}, t), async () => s(e);
 			})).result?.();
 		},
 		replaceStep: async (e) => {
-			(await a.addTask(async () => {
+			(await o.addTask(async () => {
 				let t = i(e);
 				return n.replaceState({
 					...n.readState(),
 					step: !0,
 					params: e
-				}, t), async () => o(e);
+				}, t), async () => s(e);
 			})).result?.();
 		},
 		popStep: async () => {
-			let e = a.generateTaskId();
-			(await a.addTask(async (i) => {
+			let e = o.generateTaskId();
+			(await o.addTask(async (i) => {
 				let a = new Promise((e) => {
 					let t = n.subscribe((n) => {
 						t(), e(n.state);
 					});
-				}), s = new Promise((e) => setTimeout(() => e(void 0), 200));
+				}), o = new Promise((e) => setTimeout(() => e(void 0), 200));
 				r(), n.back();
-				let c = await Promise.race([a, s]);
+				let c = await Promise.race([a, o]);
 				if (!c) {
 					i.abort();
 					return;
 				}
 				if (c.step) {
-					o(c.params ?? {}), i.abort();
+					s(c.params ?? {}), i.abort();
 					return;
 				}
 				let { setStatus: l, setTransitionTaskId: u } = t.navigate.getState(), { index: d, popHistory: f } = t.history.getState();
@@ -702,30 +814,38 @@ function D(e) {
 				};
 			}, {
 				id: e,
-				control: { manual: !0 }
+				control: {
+					manual: !0,
+					maxLifetimeMs: a
+				}
 			})).result?.();
 		}
 	};
 }
-function O(e, t) {
+function le(e, t) {
 	return e.subscribe((e) => {
 		let n = e.state;
-		n?.step && a.addTask(async () => {
+		n?.step && o.addTask(async () => {
 			t(n.params ?? {});
 		});
 	});
 }
 //#endregion
 //#region src/transition/store.ts
-function k(t = "cupertino") {
+function ue(t = "cupertino") {
 	return e((e) => ({
 		defaultTransitionName: t,
 		setDefaultTransitionName: (t) => e({ defaultTransitionName: t })
 	}));
 }
 //#endregion
+//#region src/utils/matchesPathname.ts
+function de(e, t) {
+	return i(e).regexp.test(t);
+}
+//#endregion
 //#region src/screen/store.ts
-function A() {
+function fe() {
 	return e((e) => ({
 		dragStatus: "IDLE",
 		replaceTransitionStatus: "IDLE",
@@ -756,49 +876,62 @@ function A() {
 }
 //#endregion
 //#region src/core/createRouterScope.ts
-var ee = {
+var pe = {
 	mark: () => {},
 	consume: () => !1
-};
-function te(e) {
-	let { routePaths: t, pathname: n, search: r, defaultTransitionName: i, memory: a, browserDriver: s } = e, c = l(t, n, r, i), d = s && !u() ? s.readState() : null, f = d?.id ? {
-		...c,
-		id: d.id,
-		params: d.params ?? c.params,
-		frameIndex: d.index ?? 0
+}, me = /* @__PURE__ */ new Map();
+function he(e) {
+	let { routePaths: t, pathname: n, search: r, defaultTransitionName: i, memory: a, browserDriver: o } = e, c = d() ? void 0 : e.persistKey;
+	if (c) {
+		let e = me.get(c);
+		if (e) {
+			e.life.alive = !0, e.navigate.getState().setStatus("IDLE"), e.navigate.getState().setTransitionTaskId(null);
+			let t = e.history.getState();
+			return t.setPendingIndex(t.index), e;
+		}
+	}
+	let l = u(t, n, r, i), f = (e.routerKey && !d() ? E(e.routerKey, n) : null) ?? (o && !d() ? o.readState() : null), p = f?.id ? {
+		...l,
+		id: f.id,
+		params: f.params ?? l.params,
+		frameIndex: f.index ?? 0
 	} : {
-		...c,
+		...l,
 		frameIndex: 0
 	};
 	if (e.hostedScope) return e.hostedScope.life.alive = !0, e.hostedScope.history.getState().index === -1 && e.hostedScope.history.setState({
 		index: 0,
-		histories: [f]
+		histories: [p]
 	}), e.hostedScope;
-	let p = a ? y({
+	let m = a ? ne({
 		state: {
-			id: f.id,
+			id: p.id,
 			index: 0,
 			status: "IDLE",
-			params: f.params,
-			transitionName: f.transitionName,
-			layoutId: f.layoutId
+			params: p.params,
+			transitionName: p.transitionName,
+			layoutId: p.layoutId
 		},
-		url: f.pathname
-	}) : s, h = a ? ee : m();
-	return {
-		history: o([f], 0),
-		navigate: b(),
-		transition: k(i),
-		screen: A(),
-		driver: p,
+		url: p.pathname
+	}) : o, h = a ? pe : g(), _ = {
+		history: s([p], 0),
+		navigate: re(),
+		transition: ue(i),
+		screen: fe(),
+		driver: m,
 		markSelfInduced: h.mark,
 		consume: h.consume,
+		routerKey: e.routerKey,
+		zoneEntryId: e.zoneEntryId,
+		ownsPathname: (e) => de(t, e),
+		persistent: !!c,
 		life: { alive: !0 }
 	};
+	return c && me.set(c, _), _;
 }
 //#endregion
 //#region src/screen/createScreenSelector.ts
-function ne(e, t) {
+function ge(e, t) {
 	return e.map((n, r) => ({
 		...n,
 		isActive: r === t,
@@ -811,13 +944,13 @@ function ne(e, t) {
 }
 //#endregion
 //#region src/screen/computeScreenFreeze.ts
-function re(e) {
+function _e(e) {
 	let t = e.status === "COMPLETED" && e.dragStatus === "IDLE";
 	return !e.isActive && t || e.isPrev && e.index - 2 <= e.zIndex && e.replaceTransitionStatus === "IDLE" || e.isPrev && e.index - 2 > e.zIndex;
 }
 //#endregion
 //#region src/transition/createTransition.ts
-function j({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exitBack: o, options: s }) {
+function A({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exitBack: o, options: s }) {
 	return {
 		name: e,
 		initial: t,
@@ -838,7 +971,7 @@ function j({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exit
 }
 //#endregion
 //#region src/transition/createRawTransition.ts
-function ie({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnExit: l, completedOnEnter: u, options: d }) {
+function ve({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnExit: l, completedOnEnter: u, options: d }) {
 	return {
 		name: e,
 		initial: t,
@@ -859,10 +992,10 @@ function ie({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/cupertino.ts
-var ae = (e, t, n) => {
+var ye = (e, t, n) => {
 	let [r, i] = t, [a, o] = n;
 	return i === r ? a : a + (e - r) / (i - r) * (o - a);
-}, oe = j({
+}, be = A({
 	name: "cupertino",
 	initial: { x: "100%" },
 	idle: {
@@ -872,7 +1005,7 @@ var ae = (e, t, n) => {
 	enter: {
 		value: { x: 0 },
 		options: {
-			duration: .7,
+			duration: .6,
 			ease: [
 				.32,
 				.72,
@@ -894,9 +1027,9 @@ var ae = (e, t, n) => {
 		}
 	},
 	exit: {
-		value: { x: "-30%" },
+		value: { x: "-35%" },
 		options: {
-			duration: .7,
+			duration: .6,
 			ease: [
 				.32,
 				.72,
@@ -922,8 +1055,8 @@ var ae = (e, t, n) => {
 		swipeDirection: "x",
 		onSwipeStart: async () => !0,
 		onSwipe: (e, t, { animate: n, currentScreen: r, prevScreen: i, onProgress: a }) => {
-			let { offset: o } = t, s = o.x, c = ae(s, [0, window.innerWidth], [0, 100]);
-			return a?.(!0, c), n(r, { x: Math.max(0, s) }, { duration: 0 }), n(i, { x: `${-30 + c * .3}%` }, { duration: 0 }), c;
+			let { offset: o } = t, s = o.x, c = ye(s, [0, window.innerWidth], [0, 100]);
+			return a?.(!0, c), n(r, { x: Math.max(0, s) }, { duration: 0 }), n(i, { x: `${-35 + c * .35}%` }, { duration: 0 }), c;
 		},
 		onSwipeEnd: async (e, t, { animate: n, currentScreen: r, prevScreen: i, onStart: a }) => {
 			let { offset: o, velocity: s } = t, c = o.x > 50 || s.x > 20;
@@ -935,7 +1068,7 @@ var ae = (e, t, n) => {
 					0,
 					1
 				]
-			}), n(i, { x: c ? 0 : "-30%" }, {
+			}), n(i, { x: c ? 0 : "-35%" }, {
 				duration: .3,
 				ease: [
 					.32,
@@ -946,10 +1079,10 @@ var ae = (e, t, n) => {
 			})]), c;
 		}
 	}
-}), se = (e, t, n) => {
+}), xe = (e, t, n) => {
 	let [r, i] = t, [a, o] = n;
 	return i === r ? a : a + (e - r) / (i - r) * (o - a);
-}, M = j({
+}, Se = A({
 	name: "layout",
 	initial: { opacity: .97 },
 	idle: {
@@ -977,7 +1110,7 @@ var ae = (e, t, n) => {
 		swipeDirection: "y",
 		onSwipeStart: async () => !0,
 		onSwipe: (e, t, { animate: n, currentScreen: r, onProgress: i }) => {
-			let { offset: a } = t, o = a.y, s = Math.max(0, Math.min(56, o)), c = se(s, [0, 56], [1, .96]), l = Math.max(0, o - 56), u = Math.min(1, l / 160), d = Math.sqrt(u) * 12, f = Math.max(0, s + d), p = Math.min(56, f);
+			let { offset: a } = t, o = a.y, s = Math.max(0, Math.min(56, o)), c = xe(s, [0, 56], [1, .96]), l = Math.max(0, o - 56), u = Math.min(1, l / 160), d = Math.sqrt(u) * 12, f = Math.max(0, s + d), p = Math.min(56, f);
 			return i?.(!0, 100), n(r, {
 				y: f,
 				opacity: c
@@ -994,7 +1127,7 @@ var ae = (e, t, n) => {
 			}, { duration: .3 })]), c;
 		}
 	}
-}), ce = j({
+}), Ce = A({
 	name: "material",
 	initial: { y: "100%" },
 	idle: {
@@ -1102,7 +1235,7 @@ var ae = (e, t, n) => {
 			})]), c;
 		}
 	}
-}), le = j({
+}), we = A({
 	name: "none",
 	initial: {},
 	idle: {
@@ -1125,20 +1258,20 @@ var ae = (e, t, n) => {
 		value: {},
 		options: { duration: 0 }
 	}
-}), N = new Map([
-	["none", le],
-	["cupertino", oe],
-	["material", ce],
-	["layout", M]
+}), j = new Map([
+	["none", we],
+	["cupertino", be],
+	["material", Ce],
+	["layout", Se]
 ]);
 //#endregion
 //#region src/transition/resolveTransition.ts
-function ue(e) {
-	return N.get(e) ?? N.get("none");
+function M(e) {
+	return j.get(e) ?? j.get("none");
 }
 //#endregion
 //#region src/transition/decorator/createDecorator.ts
-function de({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
+function Te({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 	return {
 		name: e,
 		initial: t,
@@ -1159,7 +1292,7 @@ function de({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 }
 //#endregion
 //#region src/transition/decorator/createRawDecorator.ts
-function fe({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnEnter: l, completedOnExit: u, options: d }) {
+function Ee({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnEnter: l, completedOnExit: u, options: d }) {
 	return {
 		name: e,
 		initial: t,
@@ -1180,30 +1313,30 @@ function fe({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/decorator/overlay.ts
-var P = "rgba(0, 0, 0, 0.3)", pe = de({
+var N = "rgba(0, 0, 0, 0.2)", De = Te({
 	name: "overlay",
 	initial: {
 		opacity: 0,
-		backgroundColor: P
+		backgroundColor: N
 	},
 	idle: {
 		value: {
 			opacity: 0,
-			backgroundColor: P
+			backgroundColor: N
 		},
 		options: { duration: 0 }
 	},
 	enter: {
 		value: {
 			opacity: 1,
-			backgroundColor: P
+			backgroundColor: N
 		},
-		options: { duration: .7 }
+		options: { duration: .6 }
 	},
 	exit: {
 		value: {
 			opacity: 0,
-			backgroundColor: P
+			backgroundColor: N
 		},
 		options: { duration: .6 }
 	},
@@ -1212,10 +1345,10 @@ var P = "rgba(0, 0, 0, 0.3)", pe = de({
 		onSwipe: (e, t, { animate: n, prevDecorator: r }) => n(r, { opacity: Math.max(0, 1 - t / 100) }, { duration: 0 }),
 		onSwipeEnd: (e, { animate: t, prevDecorator: n }) => t(n, { opacity: +!e }, { duration: .3 })
 	}
-}), F = new Map([["overlay", pe]]);
+}), P = new Map([["overlay", De]]);
 //#endregion
 //#region src/transition/partTransition/createPartTransition.ts
-function me({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
+function Oe({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 	return {
 		name: e,
 		initial: t,
@@ -1236,7 +1369,7 @@ function me({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 }
 //#endregion
 //#region src/transition/partTransition/createRawPartTransition.ts
-function he({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnEnter: l, completedOnExit: u, options: d }) {
+function ke({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replaceOnEnter: a, replaceOnExit: o, popOnEnter: s, popOnExit: c, completedOnEnter: l, completedOnExit: u, options: d }) {
 	return {
 		name: e,
 		initial: t,
@@ -1257,7 +1390,7 @@ function he({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/partTransition/partTransition.ts
-var I = /* @__PURE__ */ new Map(), L = {
+var F = /* @__PURE__ */ new Map(), I = {
 	"IDLE-true": "self",
 	"IDLE-false": "self",
 	"PUSHING-true": "initial",
@@ -1268,7 +1401,25 @@ var I = /* @__PURE__ */ new Map(), L = {
 	"POPPING-false": "PUSHING-false",
 	"COMPLETED-true": "self",
 	"COMPLETED-false": "self"
-}, ge = Object.keys(L), _e = ge, ve = (e) => e.replace(/[^a-zA-Z0-9_-]/g, "_"), ye = (e) => typeof e == "object" && !!e && !Array.isArray(e), be = new Set(/* @__PURE__ */ "opacity.scale.scaleX.scaleY.scaleZ.aspectRatio.columnCount.columns.flex.flexGrow.flexShrink.fontWeight.gridArea.gridColumn.gridColumnEnd.gridColumnStart.gridRow.gridRowEnd.gridRowStart.lineHeight.lineClamp.order.orphans.tabSize.widows.zIndex.zoom.fillOpacity.floodOpacity.stopOpacity.strokeOpacity.strokeDasharray.strokeDashoffset.strokeMiterlimit.strokeWidth".split(".")), xe = (e, t) => t.startsWith("--") || be.has(t) ? `${e}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${e}deg` : `${e}px`, Se = (e, t) => typeof t == "number" ? xe(t, e) : typeof t == "string" ? t : "", Ce = (e) => e.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), we = new Set([
+}, Ae = Object.keys(I), L = (e) => {
+	if (!e) return 0;
+	let t = e.duration;
+	return typeof t == "number" && t >= 0 ? t : 0;
+}, R = (e) => e && typeof e.delay == "number" && e.delay > 0 ? e.delay : 0, je = (e, t) => {
+	let n = I[t];
+	return n === "self" ? null : n === "initial" ? e.initial : e.variants[n].value;
+}, z = (e, t) => {
+	let n = je(e, t);
+	if (n === null) return null;
+	let r = e.variants[t], i = L(r.options), a = R(r.options);
+	return i <= 0 && a <= 0 ? null : {
+		from: n,
+		to: r.value,
+		duration: i,
+		delay: a,
+		ease: r.options?.ease
+	};
+}, Me = Ae, Ne = (e) => e.replace(/[^a-zA-Z0-9_-]/g, "_"), Pe = (e) => typeof e == "object" && !!e && !Array.isArray(e), Fe = new Set(/* @__PURE__ */ "opacity.scale.scaleX.scaleY.scaleZ.aspectRatio.columnCount.columns.flex.flexGrow.flexShrink.fontWeight.gridArea.gridColumn.gridColumnEnd.gridColumnStart.gridRow.gridRowEnd.gridRowStart.lineHeight.lineClamp.order.orphans.tabSize.widows.zIndex.zoom.fillOpacity.floodOpacity.stopOpacity.strokeOpacity.strokeDasharray.strokeDashoffset.strokeMiterlimit.strokeWidth".split(".")), Ie = (e, t) => t.startsWith("--") || Fe.has(t) ? `${e}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${e}deg` : `${e}px`, Le = (e, t) => typeof t == "number" ? Ie(t, e) : typeof t == "string" ? t : "", Re = (e) => e.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), ze = new Set([
 	"x",
 	"y",
 	"z",
@@ -1279,10 +1430,10 @@ var I = /* @__PURE__ */ new Map(), L = {
 	"rotateX",
 	"rotateY",
 	"rotateZ"
-]), Te = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, Ee = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, De = /^1(\.0+)?$/, Oe = (e, t) => e === "scale" || e === "scaleX" || e === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? De.test(t.trim()) : !1 : e === "rotate" || e === "rotateX" || e === "rotateY" || e === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? Ee.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? Te.test(t.trim()) : !1, ke = (e, t) => {
+]), Be = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, Ve = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, He = /^1(\.0+)?$/, Ue = (e, t) => e === "scale" || e === "scaleX" || e === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? He.test(t.trim()) : !1 : e === "rotate" || e === "rotateX" || e === "rotateY" || e === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? Ve.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? Be.test(t.trim()) : !1, We = (e, t) => {
 	switch (e) {
-		case "x": return `translateX(${t})`;
-		case "y": return `translateY(${t})`;
+		case "x": return `translate3d(${t}, 0, 0)`;
+		case "y": return `translate3d(0, ${t}, 0)`;
 		case "z": return `translateZ(${t})`;
 		case "scale": return `scale(${t})`;
 		case "scaleX": return `scaleX(${t})`;
@@ -1293,23 +1444,32 @@ var I = /* @__PURE__ */ new Map(), L = {
 		case "rotateY": return `rotateY(${t})`;
 		default: return "";
 	}
-}, Ae = (e) => {
-	let t = /* @__PURE__ */ new Set(), n = !1, r = (e) => {
-		if (ye(e)) for (let r of Object.keys(e)) {
-			let i = e[r];
-			Se(r, i) !== "" && (we.has(r) ? n = !0 : t.add(Ce(r)));
+}, Ge = (e) => {
+	let t = /* @__PURE__ */ new Map(), n = !1, r = /* @__PURE__ */ new Set(), i = (e) => {
+		if (!Pe(e)) return;
+		let n = [];
+		for (let r of Object.keys(e)) {
+			let i = e[r], a = Le(r, i);
+			if (a !== "") if (ze.has(r)) n.push(`${r}:${a}`);
+			else {
+				let e = t.get(Re(r)) ?? /* @__PURE__ */ new Set();
+				e.add(a), t.set(Re(r), e);
+			}
 		}
+		r.add(n.sort().join("|"));
 	};
-	r(e.initial);
-	for (let t of Object.values(e.variants)) r(t.value);
-	return n && t.add("transform"), Array.from(t);
-}, R = (e) => {
-	if (!ye(e)) return [];
+	i(e.initial);
+	for (let t of Object.values(e.variants)) i(t.value);
+	n = r.size > 1;
+	let a = Array.from(t.entries()).filter(([, e]) => e.size > 1).map(([e]) => e);
+	return n && a.push("transform"), a;
+}, B = (e) => {
+	if (!Pe(e)) return [];
 	let t = [], n = !0, r = [];
 	for (let i of Object.keys(e)) {
-		let a = e[i], o = Se(i, a);
-		o !== "" && (we.has(i) ? (t.push(ke(i, o)), Oe(i, a) || (n = !1)) : r.push({
-			property: Ce(i),
+		let a = e[i], o = Le(i, a);
+		o !== "" && (ze.has(i) ? (t.push(We(i, o)), Ue(i, a) || (n = !1)) : r.push({
+			property: Re(i),
 			value: o
 		}));
 	}
@@ -1317,7 +1477,7 @@ var I = /* @__PURE__ */ new Map(), L = {
 		property: "transform",
 		value: n ? "none" : t.join(" ")
 	}), r;
-}, z = (e) => e.map((e) => `  ${e.property}: ${e.value};`).join("\n"), B = (e) => Array.isArray(e) ? e.length === 4 && e.every((e) => typeof e == "number") ? `cubic-bezier(${e.join(", ")})` : "linear" : typeof e == "string" ? {
+}, V = (e) => e.map((e) => `  ${e.property}: ${e.value};`).join("\n"), H = (e) => Array.isArray(e) ? e.length === 4 && e.every((e) => typeof e == "number") ? `cubic-bezier(${e.join(", ")})` : "linear" : typeof e == "string" ? {
 	linear: "linear",
 	easeIn: "ease-in",
 	easeOut: "ease-out",
@@ -1327,33 +1487,29 @@ var I = /* @__PURE__ */ new Map(), L = {
 	backIn: "cubic-bezier(0.31, 0.01, 0.66, -0.59)",
 	backOut: "cubic-bezier(0.33, 1.53, 0.69, 0.99)",
 	anticipate: "cubic-bezier(0.36, 0, 0.66, -0.56)"
-}[e] ?? "ease" : "ease", V = (e) => {
-	if (!e) return 0;
-	let t = e.duration;
-	return typeof t == "number" && t >= 0 ? t : 0;
-}, je = (e) => e && typeof e.delay == "number" && e.delay > 0 ? e.delay : 0, Me = (e, t) => {
+}[e] ?? "ease" : "ease", Ke = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-screen][data-flemo-transition="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, Ne = (e, t) => {
+}, qe = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-decorator][data-flemo-decorator-name="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, Pe = (e, t) => {
+}, Je = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-bar][data-flemo-bar-transition="${e}"][data-flemo-bar-status="${n}"][data-flemo-bar-active="${r}"][data-flemo-bar-riding="true"]`;
-}, Fe = (e, t) => {
+}, Ye = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-part-name="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, H = (e, t, n) => `flemo-${e}-${ve(t)}-${n}`, U = (e, t, n, r, i, a) => {
-	let o = R(r), s = R(i.value), c = V(i.options), l = je(i.options), u = B(i.options?.ease), d = a(t, n), f = e === "screen" ? `${d},\n${Pe(t, n)}` : d;
+}, Xe = (e, t, n) => `flemo-${e}-${Ne(t)}-${n}`, Ze = (e, t, n, r, i, a) => {
+	let o = B(r), s = B(i.value), c = L(i.options), l = R(i.options), u = H(i.options?.ease), d = a(t, n), f = e === "screen" ? `${d},\n${Je(t, n)}` : d;
 	if (s.length === 0 && o.length === 0) return "";
-	if (c <= 0 && l <= 0) return s.length === 0 ? "" : `${f} {\n${z(s)}\n  animation: none;\n}`;
-	let p = H(e, t, n), m = [
+	if (c <= 0 && l <= 0) return s.length === 0 ? "" : `${f} {\n${V(s)}\n  animation: none;\n}`;
+	let p = Xe(e, t, n), m = [
 		`@keyframes ${p} {`,
 		"  from {",
-		z(o).replace(/^/gm, "  "),
+		V(o).replace(/^/gm, "  "),
 		"  }",
 		"  to {",
-		z(s).replace(/^/gm, "  "),
+		V(s).replace(/^/gm, "  "),
 		"  }",
 		"}"
 	].join("\n"), h = [
@@ -1362,127 +1518,135 @@ var I = /* @__PURE__ */ new Map(), L = {
 		u,
 		l > 0 ? `${l}s` : null,
 		"both"
-	].filter(Boolean).join(" "), g = Array.from(new Set([...o.map((e) => e.property), ...s.map((e) => e.property)])), _ = g.length > 0 ? `  will-change: ${g.join(", ")};\n` : "", v = n.split("-")[0];
-	return `${m}\n${`${f} {\n  animation: ${h};\n${_}${v === "PUSHING" || v === "REPLACING" ? "  contain: layout;\n  pointer-events: none;\n" : ""}}`}${e === "screen" && n.endsWith("-false") && Ie(r) && s.length > 0 ? `\n${d}[data-flemo-anim-hold="park"] {\n  animation: none;\n${z(s)}\n}` : ""}`;
-}, Ie = (e) => {
+	].filter(Boolean).join(" "), g = new Map(o.map((e) => [e.property, e.value])), _ = new Map(s.map((e) => [e.property, e.value])), v = Array.from(new Set([...g.keys(), ..._.keys()])).filter((e) => g.get(e) !== _.get(e)), y = v.length > 0 ? `  will-change: ${v.join(", ")};\n` : "", b = n.split("-")[0];
+	return `${m}\n${`${f} {\n  animation: ${h};\n${y}${b === "PUSHING" || b === "REPLACING" ? "  contain: layout;\n  pointer-events: none;\n" : ""}}`}${e === "screen" && n.endsWith("-false") && Qe(r) && s.length > 0 ? `\n${d}[data-flemo-anim-hold="park"] {\n  animation: none;\n${V(s)}\n}` : ""}${e === "screen" && n.endsWith("-true") && (n.startsWith("PUSHING") || n.startsWith("REPLACING")) && Qe(r) && s.length > 0 ? `\n${d}[data-flemo-anim-hold="park-under"] {\n  animation: none;\n${V(s)}\n}` : ""}`;
+}, Qe = (e) => {
 	if (!e) return !1;
 	if (e.opacity === 0) return !0;
 	let t = (e) => typeof e == "string" && e.trim().endsWith("%") && Math.abs(parseFloat(e)) >= 100;
 	return t(e.x) || t(e.y);
-}, W = (e, t, n, r) => {
-	let i = R(r.value);
-	return i.length === 0 ? "" : `${e(t, n)} {\n${z(i)}\n}`;
-}, Le = (e, t, n = []) => {
+}, $e = (e, t, n, r) => {
+	let i = B(r.value);
+	return i.length === 0 ? "" : `${e(t, n)} {\n${V(i)}\n}`;
+}, et = (e, t, n = []) => {
 	let r = [];
 	for (let t of e) {
 		let e = t.name;
-		for (let n of ge) {
-			let i = t.variants[n], a = L[n];
+		for (let n of Ae) {
+			let i = t.variants[n], a = I[n];
 			if (a === "self") {
-				r.push(W(Me, e, n, i));
+				r.push($e(Ke, e, n, i));
 				continue;
 			}
 			let o = a === "initial" ? t.initial : t.variants[a].value;
-			r.push(U("screen", e, n, o, i, Me));
+			r.push(Ze("screen", e, n, o, i, Ke));
 		}
 	}
 	for (let e of t) {
 		let t = e.name;
-		for (let n of _e) {
-			let i = e.variants[n], a = L[n];
+		for (let n of Me) {
+			let i = e.variants[n], a = I[n];
 			if (a === "self") {
-				r.push(W(Ne, t, n, i));
+				r.push($e(qe, t, n, i));
 				continue;
 			}
 			let o = a === "initial" ? e.initial : e.variants[a].value;
-			r.push(U("decorator", t, n, o, i, Ne));
+			r.push(Ze("decorator", t, n, o, i, qe));
 		}
 	}
 	for (let e of n) {
 		let t = e.name;
-		for (let n of _e) {
-			let i = e.variants[n], a = L[n];
+		for (let n of Me) {
+			let i = e.variants[n], a = I[n];
 			if (a === "self") {
-				r.push(W(Fe, t, n, i));
+				r.push($e(Ye, t, n, i));
 				continue;
 			}
 			let o = a === "initial" ? e.initial : e.variants[a].value;
-			r.push(U("part", t, n, o, i, Fe));
+			r.push(Ze("part", t, n, o, i, Ye));
 		}
 	}
-	return [...r.filter((e) => e.length > 0), Re].join("\n\n");
-}, Re = [
+	return [...r.filter((e) => e.length > 0), tt].join("\n\n");
+}, tt = [
 	"[data-flemo-anim-hold=\"true\"],",
 	"[data-flemo-anim-hold=\"park\"],",
+	"[data-flemo-anim-hold=\"park-under\"],",
 	"[data-flemo-anim-hold=\"true\"] [data-flemo-part-name],",
-	"[data-flemo-anim-hold=\"park\"] [data-flemo-part-name] {",
+	"[data-flemo-anim-hold=\"park\"] [data-flemo-part-name],",
+	"[data-flemo-anim-hold=\"park-under\"] [data-flemo-part-name] {",
 	"  animation-play-state: paused !important;",
 	"}"
-].join("\n"), ze = (e, t) => {
-	let n = L[t];
+].join("\n"), nt = (e, t) => {
+	let n = I[t];
 	if (n === "self") return !1;
-	let r = e.variants[t], i = V(r.options), a = je(r.options);
+	let r = e.variants[t], i = L(r.options), a = R(r.options);
 	if (i <= 0 && a <= 0) return !1;
-	let o = R(n === "initial" ? e.initial : e.variants[n].value), s = R(r.value);
+	let o = B(n === "initial" ? e.initial : e.variants[n].value), s = B(r.value);
 	return o.length > 0 || s.length > 0;
-}, Be = "data-flemo";
-function G() {
-	if (u()) return;
-	let e = Le(N.values(), F.values(), I.values()), t = document.head.querySelector(`style[${Be}]`);
-	t || (t = document.createElement("style"), t.setAttribute(Be, ""), document.head.appendChild(t)), t.textContent !== e && (t.textContent = e);
+}, rt = "data-flemo";
+function it() {
+	if (d()) return;
+	let e = et(j.values(), P.values(), F.values()), t = document.head.querySelector(`style[${rt}]`);
+	t || (t = document.createElement("style"), t.setAttribute(rt, ""), document.head.appendChild(t)), t.textContent !== e && (t.textContent = e);
 }
 //#endregion
 //#region src/transition/registerTransitionDefinitions.ts
-function Ve(e, t, n = []) {
-	for (let t of e) N.set(t.name, t);
-	for (let e of t) F.set(e.name, e);
-	for (let e of n) I.set(e.name, e);
-	return G(), () => {
-		for (let t of e) N.delete(t.name);
-		for (let e of t) F.delete(e.name);
-		for (let e of n) I.delete(e.name);
-		G();
+var at = /* @__PURE__ */ new Map(), ot = /* @__PURE__ */ new Map(), st = /* @__PURE__ */ new Map(), ct = (e, t) => {
+	e.set(t, (e.get(t) ?? 0) + 1);
+}, lt = (e, t) => {
+	let n = (e.get(t) ?? 1) - 1;
+	return n <= 0 ? (e.delete(t), !0) : (e.set(t, n), !1);
+};
+function ut(e, t, n = []) {
+	for (let t of e) j.set(t.name, t), ct(at, t.name);
+	for (let e of t) P.set(e.name, e), ct(ot, e.name);
+	for (let e of n) F.set(e.name, e), ct(st, e.name);
+	return it(), () => {
+		for (let t of e) lt(at, t.name) && j.delete(t.name);
+		for (let e of t) lt(ot, e.name) && P.delete(e.name);
+		for (let e of n) lt(st, e.name) && F.delete(e.name);
+		it();
 	};
 }
 //#endregion
 //#region src/transition/enteringInitialStyle.ts
-function He(e) {
+function dt(e) {
 	let { initial: t, isActive: n, status: r } = e;
 	if (!n || r !== "PUSHING" && r !== "REPLACING") return {};
 	let i = {};
-	return typeof t.x == "number" && (i.transform = `translateX(${t.x}px)`), typeof t.x == "string" && (i.transform = `translateX(${t.x})`), typeof t.y == "number" && (i.transform = `translateY(${t.y}px)`), typeof t.y == "string" && (i.transform = `translateY(${t.y})`), typeof t.opacity == "number" && (i.opacity = `${t.opacity}`), i;
+	return typeof t.x == "number" && (i.transform = `translate3d(${t.x}px, 0, 0)`), typeof t.x == "string" && (i.transform = `translate3d(${t.x}, 0, 0)`), typeof t.y == "number" && (i.transform = `translate3d(0, ${t.y}px, 0)`), typeof t.y == "string" && (i.transform = `translate3d(0, ${t.y}, 0)`), typeof t.opacity == "number" && (i.opacity = `${t.opacity}`), i;
 }
 //#endregion
 //#region src/transition/animateInline.ts
-var Ue = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, K = /* @__PURE__ */ new WeakMap(), We = (e, t) => {
-	let n = K.get(e);
-	n || (n = /* @__PURE__ */ new Set(), K.set(e, n)), n.add(t);
-}, q = (e, t) => {
+var ft = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, U = /* @__PURE__ */ new WeakMap(), W = (e, t) => {
+	let n = U.get(e);
+	n || (n = /* @__PURE__ */ new Set(), U.set(e, n)), n.add(t);
+}, G = (e, t) => {
 	if (e.style.transition = "", t) {
-		let n = K.get(e);
+		let n = U.get(e);
 		for (let r of t) e.style.removeProperty(r), n?.delete(r);
 		return;
 	}
-	let n = K.get(e);
+	let n = U.get(e);
 	if (n && n.size > 0) {
 		for (let t of n) e.style.removeProperty(t);
 		n.clear();
 		return;
 	}
 	e.style.removeProperty("transform"), e.style.removeProperty("opacity");
-}, J = (e, t, n = {}) => {
-	if (!Ue(e)) return Promise.resolve();
-	let r = e, i = R(t);
+}, K = (e, t, n = {}) => {
+	if (!ft(e)) return Promise.resolve();
+	let r = e, i = B(t);
 	if (i.length === 0) return Promise.resolve();
-	let a = typeof n.duration == "number" ? n.duration : 0, o = typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, s = B(n.ease);
+	let a = typeof n.duration == "number" ? n.duration : 0, o = typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, s = H(n.ease);
 	if (a <= 0 && o <= 0) {
 		r.style.transition = "none";
-		for (let e of i) r.style.setProperty(e.property, e.value), We(r, e.property);
+		for (let e of i) r.style.setProperty(e.property, e.value), W(r, e.property);
 		return Promise.resolve();
 	}
 	let c = i.map((e) => `${e.property} ${a}s ${s} ${o}s`).join(", ");
 	r.style.transition = c, r.offsetWidth;
-	for (let e of i) r.style.setProperty(e.property, e.value), We(r, e.property);
+	for (let e of i) r.style.setProperty(e.property, e.value), W(r, e.property);
 	return new Promise((e) => {
 		let t = !1, n = () => {
 			t || (t = !0, r.removeEventListener("transitionend", i), e());
@@ -1491,38 +1655,426 @@ var Ue = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, K = /* @__
 		};
 		r.addEventListener("transitionend", i), setTimeout(n, (a + o) * 1e3 + 60);
 	});
-}, Y = "data-flemo-skip-animation", X = () => {};
-function Ge(e) {
+}, pt = "flemo:motion-driver", mt = "flemo:motion-driver-force", ht = !1, gt = () => {
+	try {
+		if (typeof localStorage > "u") return null;
+		let e = localStorage.getItem(mt);
+		return e !== "css" && e !== "raf" ? null : (!ht && typeof console < "u" && (ht = !0, console.warn(`[flemo] motion driver pinned to "${e}" via localStorage ${mt}; remove the key to restore automatic selection.`)), e);
+	} catch {
+		return null;
+	}
+}, _t = () => ({
+	read: () => {
+		try {
+			return typeof localStorage < "u" ? localStorage.getItem(pt) : null;
+		} catch {
+			return null;
+		}
+	},
+	write: (e) => {
+		try {
+			typeof localStorage < "u" && localStorage.setItem(pt, e);
+		} catch {}
+	}
+}), vt = 30, yt = 2, bt = 2, q = ((e = _t()) => {
+	let t = e.read() === "css", n = t;
+	t &&= !1;
+	let r = 0, i = 0, a = [];
+	return {
+		playerAllowed: () => {
+			let e = gt();
+			return e ? e === "raf" : !t;
+		},
+		beginRun: () => {
+			i = 0, a = [];
+		},
+		reportGap: (e) => {
+			a.push(e), e >= vt && (i += 1);
+		},
+		endRun: () => {
+			let a = i >= yt;
+			if (n) {
+				n = !1, a ? t = !0 : e.write("raf");
+				return;
+			}
+			a && (r += 1, r >= bt && !t && (t = !0, e.write("css")));
+		},
+		stats: () => ({
+			runGaps: [...a],
+			strikes: r,
+			demoted: t
+		})
+	};
+})(), xt = (e, t, n, r) => {
+	let i = (t) => 3 * (1 - t) * (1 - t) * t * e + 3 * (1 - t) * t * t * n + t ** 3, a = (e) => 3 * (1 - e) * (1 - e) * e * t + 3 * (1 - e) * e * e * r + e ** 3;
+	return (e) => {
+		if (e <= 0) return 0;
+		if (e >= 1) return 1;
+		let t = 0, n = 1;
+		for (let r = 0; r < 40; r++) {
+			let r = (t + n) / 2;
+			i(r) < e ? t = r : n = r;
+		}
+		return a((t + n) / 2);
+	};
+}, St = (e) => e, Ct = {
+	ease: [
+		.25,
+		.1,
+		.25,
+		1
+	],
+	easeIn: [
+		.42,
+		0,
+		1,
+		1
+	],
+	easeOut: [
+		0,
+		0,
+		.58,
+		1
+	],
+	easeInOut: [
+		.42,
+		0,
+		.58,
+		1
+	],
+	circIn: [
+		0,
+		.55,
+		.45,
+		1
+	],
+	circOut: [
+		.55,
+		0,
+		1,
+		.45
+	],
+	backIn: [
+		.31,
+		.01,
+		.66,
+		-.59
+	],
+	backOut: [
+		.33,
+		1.53,
+		.69,
+		.99
+	],
+	anticipate: [
+		.36,
+		0,
+		.66,
+		-.56
+	]
+}, wt = (e) => {
+	if (Array.isArray(e)) {
+		if (e.length === 4 && e.every((e) => typeof e == "number")) {
+			let [t, n, r, i] = e;
+			return xt(t, n, r, i);
+		}
+		return St;
+	}
+	return typeof e == "string" ? e === "linear" ? St : xt(...Ct[e] ?? Ct.ease) : xt(...Ct.ease);
+}, Tt = [
+	"x",
+	"y",
+	"z",
+	"scale",
+	"scaleX",
+	"scaleY",
+	"rotate",
+	"rotateX",
+	"rotateY",
+	"rotateZ"
+], Et = new Set(Tt), Dt = {
+	x: 0,
+	y: 0,
+	z: 0,
+	scale: 1,
+	scaleX: 1,
+	scaleY: 1,
+	rotate: 0,
+	rotateX: 0,
+	rotateY: 0,
+	rotateZ: 0
+}, Ot = (e, t) => {
+	if (typeof t == "number") return {
+		value: t,
+		unit: e === "x" || e === "y" || e === "z" ? "px" : ""
+	};
+	if (typeof t != "string") return null;
+	let n = t.trim(), r = /^(-?\d*\.?\d+)(px|%|deg)?$/.exec(n);
+	if (!r) return null;
+	let i = parseFloat(r[1]), a = r[2] ?? "";
+	return e === "rotate" || e === "rotateX" || e === "rotateY" || e === "rotateZ" ? a !== "deg" && !(a === "" && i === 0) ? null : {
+		value: i,
+		unit: ""
+	} : e === "scale" || e === "scaleX" || e === "scaleY" ? a === "" ? {
+		value: i,
+		unit: ""
+	} : null : a === "deg" ? null : {
+		value: i,
+		unit: a === "" && i === 0 ? "px" : a
+	};
+}, J = /-?\d*\.?\d+/g, kt = (e, t) => {
+	let n = e.match(J) ?? [], r = t.match(J) ?? [];
+	if (n.length !== r.length || e.replace(J, "\0") !== t.replace(J, "\0")) return null;
+	let i = n.map(Number), a = r.map(Number);
+	return (t) => {
+		let n = 0;
+		return e.replace(J, () => {
+			let e = n++, r = i[e] + (a[e] - i[e]) * t;
+			return `${Math.round(r * 1e3) / 1e3}`;
+		});
+	};
+}, At = (e) => e.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), jt = (e) => typeof e == "object" && !!e && !Array.isArray(e), Mt = (e) => jt(e) ? Object.keys(e) : [], Nt = (e, t) => jt(e) ? e[t] : void 0, Pt = (e) => Ft(e, null) !== null, Ft = (e, t) => {
+	let n = new Set([...Mt(e.from), ...Mt(e.to)]), r = [], i = null, a = [], o = [];
+	for (let s of n) {
+		let n = Nt(e.from, s), c = Nt(e.to, s);
+		if (Et.has(s)) {
+			let e = s, i = {
+				value: Dt[e],
+				unit: e === "x" || e === "y" || e === "z" ? "px" : ""
+			}, a = n === void 0 ? i : Ot(e, n), o = c === void 0 ? i : Ot(e, c);
+			if (!a || !o || a.unit !== o.unit && a.value !== 0 && o.value !== 0) return null;
+			let l = a.value === 0 && a.unit !== o.unit ? o.unit : a.unit, u = l === "%", d = 0;
+			u && t && (d = e === "y" ? t.offsetHeight / 100 : t.offsetWidth / 100), r.push({
+				prop: e,
+				from: {
+					value: a.value,
+					unit: l
+				},
+				to: {
+					value: o.value,
+					unit: l
+				},
+				percentBase: d
+			});
+			continue;
+		}
+		if (s === "opacity") {
+			let e = n === void 0 ? 1 : n, t = c === void 0 ? 1 : c;
+			if (typeof e != "number" || typeof t != "number") return null;
+			i = {
+				from: e,
+				to: t
+			};
+			continue;
+		}
+		if (n === void 0 || c === void 0) return null;
+		let l = typeof n == "number" ? `${n}` : n, u = typeof c == "number" ? `${c}` : c;
+		if (typeof l != "string" || typeof u != "string") return null;
+		if (l === u) {
+			o.push({
+				property: At(s),
+				value: l
+			});
+			continue;
+		}
+		let d = kt(l, u);
+		if (!d) return null;
+		a.push({
+			property: At(s),
+			mix: d
+		});
+	}
+	return {
+		transforms: r,
+		opacity: i,
+		strings: a,
+		constants: o
+	};
+}, It = 1, Lt = (e, t, n, r) => {
+	let i = 0, a = 0, o = !1, s = [], c = !0;
+	for (let l of Tt) {
+		let u = e.find((e) => e.prop === l);
+		if (!u) continue;
+		let d = u.from.value + (u.to.value - u.from.value) * t;
+		if (u.from.unit === "%" && (d *= u.percentBase), l === "x" || l === "y") {
+			let e = l === "x" ? r.x : r.y, t = (e === null || Math.abs(d - e) * n >= It) && n > 0 ? Math.round(d * n) / n : Math.round(d * 1e3) / 1e3;
+			l === "x" ? (r.x = d, i = t) : (r.y = d, a = t), o = !0, t !== 0 && (c = !1);
+			continue;
+		}
+		let f = Dt[l];
+		d !== f && (c = !1), l === "z" ? s.push(`translateZ(${d}px)`) : l === "scale" ? s.push(`scale(${d})`) : l === "scaleX" ? s.push(`scaleX(${d})`) : l === "scaleY" ? s.push(`scaleY(${d})`) : l === "rotate" || l === "rotateZ" ? s.push(`rotate(${d}deg)`) : l === "rotateX" ? s.push(`rotateX(${d}deg)`) : l === "rotateY" && s.push(`rotateY(${d}deg)`);
+	}
+	return !o && s.length === 0 ? "" : c ? "none" : [...o ? [`translate3d(${i}px, ${a}px, 0)`] : [], ...s].join(" ");
+}, Rt = () => ({
+	request: (e) => requestAnimationFrame(e),
+	cancel: (e) => cancelAnimationFrame(e),
+	devicePixelRatio: () => typeof window < "u" && window.devicePixelRatio || 1
+}), Y = ((e = Rt()) => {
+	let t = /* @__PURE__ */ new Map(), n = {
+		join: (n, r) => {
+			let i = Ft(r.motion, r.element);
+			if (!i) return null;
+			let s = t.get(n);
+			s || (s = {
+				tracks: [],
+				started: !1,
+				startTime: null,
+				lastTime: null,
+				frameHandle: null
+			}, t.set(n, s));
+			let c = {
+				...r,
+				parsed: i,
+				completed: !1,
+				detached: !1,
+				snapMemory: {
+					x: null,
+					y: null
+				}
+			};
+			s.tracks.push(c), c.element.style.animation = "none", W(c.element, "animation"), i.transforms.length > 0 && W(c.element, "transform"), i.opacity && W(c.element, "opacity");
+			for (let e of i.strings) W(c.element, e.property);
+			for (let e of i.constants) W(c.element, e.property);
+			return a(c, 0), r.role === "active" && !s.started && (s.started = !0, q.beginRun(), o(n, s)), () => {
+				c.detached = !0, G(c.element);
+				let r = t.get(n);
+				r && (r.tracks = r.tracks.filter((e) => e !== c), r.tracks.length === 0 && (r.frameHandle !== null && e.cancel(r.frameHandle), t.delete(n)));
+			};
+		},
+		dispose: (n) => {
+			let r = t.get(n);
+			r && (r.frameHandle !== null && e.cancel(r.frameHandle), t.delete(n));
+		}
+	}, r = /* @__PURE__ */ new WeakMap(), i = (e) => {
+		let t = r.get(e);
+		return t || (t = wt(e.motion.ease), r.set(e, t)), t;
+	};
+	function a(t, n) {
+		let { element: r, parsed: i } = t;
+		if (r.isConnected) {
+			if (i.transforms.length > 0) {
+				let a = Lt(i.transforms, n, e.devicePixelRatio(), t.snapMemory);
+				a !== "" && (r.style.transform = a);
+			}
+			if (i.opacity) {
+				let { from: e, to: t } = i.opacity;
+				r.style.opacity = `${e + (t - e) * n}`;
+			}
+			for (let e of i.strings) r.style.setProperty(e.property, e.mix(n));
+			if (n === 0) for (let e of i.constants) r.style.setProperty(e.property, e.value);
+		}
+	}
+	function o(t, n) {
+		n.frameHandle = e.request((e) => {
+			n.frameHandle = null, s(t, n, e);
+		});
+	}
+	function s(e, r, s) {
+		r.startTime === null && (r.startTime = s), r.lastTime !== null && (q.reportGap(s - r.lastTime), n.onFrameGap?.(s - r.lastTime)), r.lastTime = s;
+		let c = !0;
+		for (let e of r.tracks) {
+			if (e.completed || e.detached) continue;
+			let t = e.motion.duration * 1e3, n = e.motion.delay * 1e3, o = t <= 0 ? 1 : Math.min(1, Math.max(0, (s - r.startTime - n) / t));
+			a(e, i(e)(o)), o >= 1 ? (e.completed = !0, e.onComplete?.()) : c = !1;
+		}
+		if (c) {
+			q.endRun(), t.delete(e);
+			return;
+		}
+		o(e, r);
+	}
+	return n;
+})();
+Y.onFrameGap = (e) => {
+	if (typeof window < "u") {
+		let t = window.__flemoPlayerGaps ??= [];
+		t.push(Math.round(e * 10) / 10), t.length > 600 && t.splice(0, t.length - 600);
+	}
+};
+//#endregion
+//#region src/core/engine/types.ts
+var X = "data-flemo-skip-animation", Z = () => {};
+function zt(e) {
 	return { driveScreenLifecycle: (t) => {
-		let { getElements: n, transitionName: r, prevTransitionName: i, status: o, isActive: s } = t;
-		if (!s) return o === "REPLACING" && i !== r && e.setReplaceTransitionStatus("PENDING"), X;
-		if (o === "COMPLETED") {
+		let { getElements: n, transitionName: r, prevTransitionName: i, status: a, isActive: s, animHoldReleased: c } = t, l = a === "PUSHING" || a === "POPPING" || a === "REPLACING", u = (t, i, a) => {
+			let s = e.getTransitionTaskId();
+			if (!s || o.pendingTaskIds.some((e) => e !== s) || !q.playerAllowed()) return null;
+			let { scope: c, decorator: l, bars: u } = n();
+			if (!c) return null;
+			let d = M(r), f = z(d, t);
+			if (!f || !Pt(f)) return null;
+			let p = [], m = Y.join(s, {
+				element: c,
+				motion: f,
+				role: i,
+				onComplete: a
+			});
+			if (!m) return null;
+			p.push(m);
+			for (let e of u ?? []) {
+				if (!e || e.getAttribute("data-flemo-bar-riding") !== "true") continue;
+				let t = Y.join(s, {
+					element: e,
+					motion: f,
+					role: "passive"
+				});
+				t && p.push(t);
+			}
+			if (l && d.decoratorName) {
+				let e = P.get(d.decoratorName), n = e ? z(e, t) : null;
+				if (n && Pt(n)) {
+					let e = Y.join(s, {
+						element: l,
+						motion: n,
+						role: "passive"
+					});
+					e && p.push(e);
+				}
+			}
+			return () => p.forEach((e) => e());
+		};
+		if (!s) {
+			if (a === "COMPLETED") {
+				let { scope: e, decorator: t, bars: r } = n();
+				e && G(e), t && G(t);
+				for (let e of r ?? []) e && G(e);
+				return Z;
+			}
+			if (a === "REPLACING" && i !== r && e.setReplaceTransitionStatus("PENDING"), l && c) {
+				let e = u(`${a}-false`, "passive");
+				if (e) return e;
+			}
+			return Z;
+		}
+		if (a === "COMPLETED") {
 			e.setDragStatus("IDLE"), e.setReplaceTransitionStatus("IDLE");
 			let { scope: t, decorator: r, bars: i } = n();
-			t && (q(t), t.removeAttribute(Y)), r && (q(r), r.removeAttribute(Y));
-			for (let e of i ?? []) e && (q(e), e.style.removeProperty("will-change"));
-			return X;
+			t && (G(t), t.removeAttribute(X)), r && (G(r), r.removeAttribute(X));
+			for (let e of i ?? []) e && (G(e), e.style.removeProperty("will-change"));
+			return Z;
 		}
-		if (o === "IDLE") return X;
-		let { scope: c } = n();
-		if (!c) return X;
-		let l = () => {
+		if (a === "IDLE") return Z;
+		let { scope: d } = n();
+		if (!d) return Z;
+		let f = () => {
 			let t = e.getTransitionTaskId();
-			t && a.resolveTask(t);
-		}, u = ue(r), d = `${o}-true`;
-		if (!(c.getAttribute("data-flemo-skip-animation") !== "true" && ze(u, d))) return queueMicrotask(l), X;
-		let f = H("screen", r, d), p = (e) => {
-			e.target === c && e.animationName === f && (c.removeEventListener("animationend", p), l());
+			t && o.resolveTask(t);
+		}, p = M(r), m = `${a}-true`, h = d.getAttribute(X) === "true";
+		if (!(!h && nt(p, m))) return queueMicrotask(f), Z;
+		let g = z(p, m), _ = !h && !!g && Pt(g), v = Xe("screen", r, m), y = (e) => {
+			e.target === d && e.animationName === v && (d.removeEventListener("animationend", y), f());
 		};
-		return c.addEventListener("animationend", p), () => {
-			c.removeEventListener("animationend", p);
+		d.addEventListener("animationend", y);
+		let b = _ && c ? u(m, "active", f) : null, x = e.getTransitionTaskId(), S = ((g?.delay ?? 0) + (g?.duration ?? .6)) * 1e3 + 1500, C = x ? setTimeout(() => void o.resolveTask(x), S) : void 0;
+		return () => {
+			C !== void 0 && clearTimeout(C), d.removeEventListener("animationend", y), b?.();
 		};
 	} };
 }
 //#endregion
 //#region src/utils/findScrollable.ts
-function Z(e, t) {
-	let { direction: n = "x", markerSelector: r = "[data-swipe-at-edge]", depthLimit: i = 24, verifyByScroll: a = !1 } = t ?? {}, o = Ke(e);
+function Bt(e, t) {
+	let { direction: n = "x", markerSelector: r = "[data-swipe-at-edge]", depthLimit: i = 24, verifyByScroll: a = !1 } = t ?? {}, o = Vt(e);
 	if (!o) return {
 		element: null,
 		hasMarker: !1
@@ -1545,7 +2097,7 @@ function Z(e, t) {
 		hasMarker: !1
 	};
 }
-function Ke(e) {
+function Vt(e) {
 	if (!e) return null;
 	let t = e, n = typeof t.composedPath == "function" ? t.composedPath() : void 0;
 	if (n && n.length) {
@@ -1563,8 +2115,8 @@ function $(e, t) {
 }
 //#endregion
 //#region src/core/engine/createSwipeController.ts
-var qe = "data-flemo-skip-animation";
-function Je(e) {
+var Ht = "data-flemo-skip-animation";
+function Ut(e) {
 	let t = null, n = null, r = {
 		current: [],
 		prev: []
@@ -1610,9 +2162,9 @@ function Je(e) {
 			y: e.clientY
 		}, u = t;
 	}, v = (n, i, a) => {
-		let o = J(n, i, a);
-		if (n === e.getElements().scope) for (let e of r.current) J(e, i, a);
-		else if (n === t) for (let e of r.prev) J(e, i, a);
+		let o = K(n, i, a);
+		if (n === e.getElements().scope) for (let e of r.current) K(e, i, a);
+		else if (n === t) for (let e of r.prev) K(e, i, a);
 		return o;
 	}, y = (t) => {
 		let n = e.getPartnerBars(), i = [], { sharedTopBar: a, sharedBottomBar: o } = e.getElements();
@@ -1626,12 +2178,12 @@ function Je(e) {
 			current: i,
 			prev: s
 		};
-		let c = Ae(e.getTransition()).join(", ");
+		let c = Ge(e.getTransition()).join(", ");
 		for (let e of i) e.style.willChange = c;
 		for (let e of s) e.style.willChange = c;
 	}, b = () => {
-		for (let e of r.current) q(e), e.style.removeProperty("will-change");
-		for (let e of r.prev) q(e), e.style.removeProperty("will-change");
+		for (let e of r.current) G(e), e.style.removeProperty("will-change");
+		for (let e of r.prev) G(e), e.style.removeProperty("will-change");
 		r = {
 			current: [],
 			prev: []
@@ -1644,10 +2196,10 @@ function Je(e) {
 		};
 	}, S = (e, t, n) => {
 		let r = (r, i) => {
-			let a = I.get(r.getAttribute("data-flemo-part-name"));
+			let a = F.get(r.getAttribute("data-flemo-part-name"));
 			if (!a) return;
 			let o = {
-				animate: J,
+				animate: K,
 				element: r,
 				active: i
 			};
@@ -1656,7 +2208,7 @@ function Je(e) {
 		for (let e of i.current) r(e, !0);
 		for (let e of i.prev) r(e, !1);
 	}, C = () => {
-		for (let e of [...i.current, ...i.prev]) q(e);
+		for (let e of [...i.current, ...i.prev]) G(e);
 		i = {
 			current: [],
 			prev: []
@@ -1685,7 +2237,7 @@ function Je(e) {
 			prevScreen: t,
 			onStart: (e) => {
 				m?.onSwipeStart?.(e, {
-					animate: J,
+					animate: K,
 					currentDecorator: f,
 					prevDecorator: n
 				}), S("start", e, 0);
@@ -1702,7 +2254,7 @@ function Je(e) {
 			prevScreen: t,
 			onProgress: (e, t) => {
 				c?.onSwipe?.(e, t, {
-					animate: J,
+					animate: K,
 					currentDecorator: o,
 					prevDecorator: n
 				}), S("swipe", e, t);
@@ -1721,32 +2273,32 @@ function Je(e) {
 			prevScreen: t,
 			onStart: (e) => {
 				u?.onSwipeEnd?.(e, {
-					animate: J,
+					animate: K,
 					currentDecorator: l,
 					prevDecorator: n
 				}), S("end", e, 0);
 			}
 		})) {
-			c?.setAttribute(qe, "true"), l?.setAttribute(qe, "true");
+			c?.setAttribute(Ht, "true"), l?.setAttribute(Ht, "true");
 			for (let e of r.current) e.style.removeProperty("will-change");
-			for (let e of r.prev) q(e), e.style.removeProperty("will-change");
+			for (let e of r.prev) G(e), e.style.removeProperty("will-change");
 			r = {
 				current: [],
 				prev: []
 			};
-			for (let e of i.prev) q(e);
+			for (let e of i.prev) G(e);
 			i = {
 				current: [],
 				prev: []
 			}, e.back();
-		} else c && q(c), t && q(t), l && q(l), n && q(n), b(), C(), e.setDragStatus("IDLE");
+		} else c && G(c), t && G(t), l && G(l), n && G(n), b(), C(), e.setDragStatus("IDLE");
 	};
 	return {
 		pointerDown: (t) => {
-			e.isReadyForDrag() && (f = Z(t.target, {
+			e.isReadyForDrag() && (f = Bt(t.target, {
 				direction: "x",
 				verifyByScroll: !0
-			}), p = Z(t.target, {
+			}), p = Bt(t.target, {
 				direction: "y",
 				verifyByScroll: !0
 			}), m = t.clientX, h = t.clientY, (!f.element && !p.element || f.element || p.element) && (a = !0));
@@ -1775,7 +2327,7 @@ function Je(e) {
 }
 //#endregion
 //#region src/screen/computeBarRiding.ts
-function Ye(e) {
+function Wt(e) {
 	return !(e.status === "PUSHING" || e.status === "POPPING" || e.status === "REPLACING") || !e.isTopOrTopPrev ? {
 		app: !1,
 		nav: !1
@@ -1786,24 +2338,24 @@ function Ye(e) {
 }
 //#endregion
 //#region src/screen/animStartAnchor.ts
-function Xe(e) {
+function Gt(e) {
 	return !(e.status === "PUSHING" || e.status === "POPPING" || e.status === "REPLACING") || !e.isTopOrTopPrev ? null : `${e.status}:${e.transitionName}`;
 }
-var Ze = 300, Qe = 20;
-function $e(e) {
-	return Array.from(e.querySelectorAll("img")).filter((e) => e.complete && typeof e.decode == "function").slice(0, Qe);
+var Kt = 300, qt = 20;
+function Jt(e) {
+	return Array.from(e.querySelectorAll("img")).filter((e) => e.complete && typeof e.decode == "function").slice(0, qt);
 }
-function et(e) {
-	if (!(!e || typeof e.querySelectorAll != "function")) for (let t of $e(e)) t.decode().catch(() => {});
+function Yt(e) {
+	if (!(!e || typeof e.querySelectorAll != "function")) for (let t of Jt(e)) t.decode().catch(() => {});
 }
-function tt(e, t = {}) {
-	let n = !1, r = 0, i = () => {
+function Xt(e, t = {}) {
+	let n = !1, r = 0, i = [], a = () => {
 		let r = t.scope;
 		if (!r || typeof r.querySelectorAll != "function") {
 			e();
 			return;
 		}
-		let i = $e(r);
+		let i = Jt(r);
 		if (i.length === 0) {
 			e();
 			return;
@@ -1814,16 +2366,22 @@ function tt(e, t = {}) {
 		Promise.race([a, o]).then(() => {
 			n || e();
 		});
-	}, a = requestAnimationFrame(() => {
-		r = requestAnimationFrame(i);
-	}), o = setTimeout(e, 300);
+	}, o = (e) => {
+		if (e <= 0) {
+			a();
+			return;
+		}
+		i.push(requestAnimationFrame(() => o(e - 1)));
+	}, s = requestAnimationFrame(() => {
+		r = requestAnimationFrame(() => o(t.extraFrames ?? 0));
+	}), c = setTimeout(e, 300);
 	return () => {
-		n = !0, cancelAnimationFrame(a), r && cancelAnimationFrame(r), clearTimeout(o);
+		n = !0, cancelAnimationFrame(s), r && cancelAnimationFrame(r), i.forEach((e) => cancelAnimationFrame(e)), clearTimeout(c);
 	};
 }
 //#endregion
 //#region src/screen/observeBarHeight.ts
-function nt(e, t) {
+function Zt(e, t) {
 	e.offsetHeight > 0 && t(e.offsetHeight);
 	let n = new ResizeObserver(([e]) => {
 		e.contentRect.height > 0 && t(e.contentRect.height);
@@ -1834,14 +2392,14 @@ function nt(e, t) {
 }
 //#endregion
 //#region src/screen/observeViewportScrollHeight.ts
-var rt = 0;
-function it(e) {
+var Qt = 0;
+function $t(e) {
 	let t = 0, n = () => {
 		cancelAnimationFrame(t), t = requestAnimationFrame(() => {
 			let t = document.documentElement.scrollHeight - (window.visualViewport?.height || 0);
 			t = t < 0 ? 0 : t;
-			let n = t - rt;
-			n = n < 0 ? 0 : n, rt ||= t, e(t, n);
+			let n = t - Qt;
+			n = n < 0 ? 0 : n, Qt ||= t, e(t, n);
 		});
 	};
 	return window.visualViewport?.addEventListener("resize", n), window.visualViewport?.addEventListener("scroll", n), () => {
@@ -1849,13 +2407,8 @@ function it(e) {
 	};
 }
 //#endregion
-//#region src/utils/matchesPathname.ts
-function at(e, t) {
-	return i(e).regexp.test(t);
-}
-//#endregion
 //#region src/utils/isOpaqueColor.ts
-function ot(e) {
+function en(e) {
 	let t = e.trim().toLowerCase();
 	if (t === "transparent" || t === "") return !1;
 	if (t.match(/^rgb\(\s*\d+[\s,]+\d+[\s,]+\d+\s*\)$/)) return !0;
@@ -1866,7 +2419,7 @@ function ot(e) {
 }
 //#endregion
 //#region src/utils/buildRoutePath.ts
-function st(e, n) {
+function tn(e, n) {
 	let i = n ?? {}, a = t(e)(Object.fromEntries(Object.entries(i).map(([e, t]) => [e, String(t)]))), o = (typeof e == "string" ? r(e) : e).tokens.filter((e) => e.type === "param").map((e) => e.name), s = Object.fromEntries(Object.entries(i).filter(([e]) => !o.includes(e))), c = new URLSearchParams(s).toString();
 	return {
 		pathname: `${a}${c ? `?${c}` : ""}`,
@@ -1874,4 +2427,4 @@ function st(e, n) {
 	};
 }
 //#endregion
-export { Ze as ANIM_HOLD_RELEASE_BACKSTOP_MS, Y as SKIP_ANIMATION_ATTR, a as TaskManger, Xe as animHoldKey, J as animateInline, H as animationName, E as appendParamsQuery, G as applyTransitionStyles, st as buildRoutePath, $ as canProgrammaticallyScroll, q as clearInlineAnimation, Ae as collectAnimatedProperties, Le as compileTransitionStyles, Ye as computeBarRiding, re as computeScreenFreeze, _ as consumeSelfInducedPop, p as createBrowserHistoryDriver, de as createDecorator, o as createHistoryStore, v as createHistorySync, y as createMemoryHistoryDriver, b as createNavigateStore, w as createNavigationController, me as createPartTransition, fe as createRawDecorator, he as createRawPartTransition, ie as createRawTransition, te as createRouterScope, ne as createScreenSelector, A as createScreenStore, m as createSelfPopGuard, D as createStepController, Je as createSwipeController, j as createTransition, Ge as createTransitionEngine, k as createTransitionStore, oe as cupertino, F as decoratorMap, et as eagerlyDecodeImages, B as easingToCss, d as ensureWindowHistoryState, He as enteringInitialStyle, Z as findScrollable, s as getMatchedPathPattern, c as getParams, ot as isOpaqueColor, u as isServer, M as layout, g as markSelfInducedPop, at as matchesPathname, ce as material, le as none, nt as observeBarHeight, it as observeViewportScrollHeight, Q as overflowsAxis, pe as overlay, I as partTransitionMap, T as readStepParams, Ve as registerTransitionDefinitions, ue as resolveTransition, tt as scheduleAnimHoldRelease, l as seedInitialHistory, O as subscribeStepParamsRestore, R as targetToDecls, N as transitionMap, ze as variantHasAnimation };
+export { Kt as ANIM_HOLD_RELEASE_BACKSTOP_MS, X as SKIP_ANIMATION_ATTR, o as TaskManger, Gt as animHoldKey, K as animateInline, Xe as animationName, se as appendParamsQuery, it as applyTransitionStyles, tn as buildRoutePath, $ as canProgrammaticallyScroll, G as clearInlineAnimation, Ge as collectAnimatedProperties, et as compileTransitionStyles, Wt as computeBarRiding, _e as computeScreenFreeze, y as consumeSelfInducedPop, h as createBrowserHistoryDriver, Te as createDecorator, s as createHistoryStore, b as createHistorySync, ne as createMemoryHistoryDriver, re as createNavigateStore, ae as createNavigationController, Oe as createPartTransition, Ee as createRawDecorator, ke as createRawPartTransition, ve as createRawTransition, he as createRouterScope, ge as createScreenSelector, fe as createScreenStore, g as createSelfPopGuard, ce as createStepController, Ut as createSwipeController, A as createTransition, zt as createTransitionEngine, ue as createTransitionStore, be as cupertino, P as decoratorMap, Yt as eagerlyDecodeImages, H as easingToCss, ee as ensureScopeHistorySync, f as ensureWindowHistoryState, dt as enteringInitialStyle, Bt as findScrollable, c as getMatchedPathPattern, l as getParams, en as isOpaqueColor, d as isServer, Se as layout, v as markSelfInducedPop, de as matchesPathname, Ce as material, we as none, Zt as observeBarHeight, $t as observeViewportScrollHeight, Q as overflowsAxis, De as overlay, F as partTransitionMap, oe as readStepParams, ut as registerTransitionDefinitions, te as releaseScopeHistorySync, M as resolveTransition, Xt as scheduleAnimHoldRelease, u as seedInitialHistory, p as seedRouterEntry, le as subscribeStepParamsRestore, B as targetToDecls, j as transitionMap, nt as variantHasAnimation };