@flemo/core 1.5.0 → 1.6.1

package/dist/index.mjs

@@ -178,17 +178,21 @@ var r = new class {
 function i(t = [], n = -1) {
 	return e((e) => ({
 		index: n,
+		pendingIndex: n,
 		histories: t,
 		addHistory: (t) => e((e) => ({
 			index: e.index + 1,
+			pendingIndex: e.index + 1,
 			histories: e.histories.concat(t)
 		})),
 		replaceHistory: (t) => e((e) => (e.histories.splice(t, 1), {
 			index: e.index - 1,
+			pendingIndex: e.index - 1,
 			histories: e.histories
 		})),
 		popHistory: (t) => e((e) => ({
 			index: e.index - 1,
+			pendingIndex: e.index - 1,
 			histories: e.histories.filter((e, n) => n !== t)
 		})),
 		popHistories: (t) => {
@@ -196,10 +200,12 @@ function i(t = [], n = -1) {
 				let n = e.index;
 				return {
 					index: e.index - t,
+					pendingIndex: e.index - t,
 					histories: e.histories.filter((e, r) => r < n - t || r >= n)
 				};
 			});
 		},
+		setPendingIndex: (t) => e({ pendingIndex: t }),
 		setTransitionName: (t, n) => e((e) => {
 			let r = e.histories[t];
 			if (!r || r.transitionName === n) return {};
@@ -243,64 +249,162 @@ function c() {
 }
 //#endregion
 //#region src/history/ensureWindowHistoryState.ts
-function l(e) {
-	c() || window.history.state?.index || window.history.replaceState({
+function l(e, t, n = {}) {
+	if (c()) return;
+	let r = {
 		id: "root",
 		index: 0,
 		status: "IDLE",
-		params: {},
-		transitionName: e,
+		params: n,
+		transitionName: t,
 		layoutId: null
+	};
+	if (e === null) {
+		if (window.history.state?.index) return;
+		window.history.replaceState(r, "", window.location.href);
+		return;
+	}
+	let i = window.history.state ?? {};
+	i[e]?.index || window.history.replaceState({
+		...i,
+		[e]: r
 	}, "", window.location.href);
 }
 //#endregion
-//#region src/navigate/selfPopGuard.ts
-var u = 0;
-function d() {
-	u += 1;
+//#region src/history/historyDriver.ts
+var u = (e, t) => ({
+	...window.history.state ?? {},
+	[e]: t
+});
+function d(e) {
+	return e === void 0 ? {
+		readState: () => window.history.state,
+		readPathname: () => window.location.pathname,
+		pushState: (e, t) => window.history.pushState(e, "", t),
+		replaceState: (e, t) => window.history.replaceState(e, "", t),
+		go: (e) => window.history.go(e),
+		back: () => window.history.back(),
+		subscribe: (e) => {
+			let t = (t) => e({
+				state: t.state,
+				pathname: window.location.pathname
+			});
+			return window.addEventListener("popstate", t), () => window.removeEventListener("popstate", t);
+		}
+	} : {
+		readState: () => window.history.state?.[e] ?? null,
+		readPathname: () => window.location.pathname,
+		pushState: (t, n) => window.history.pushState(u(e, t), "", n),
+		replaceState: (t, n) => window.history.replaceState(u(e, t), "", n),
+		go: (e) => window.history.go(e),
+		back: () => window.history.back(),
+		subscribe: (t) => {
+			let n = (n) => t({
+				state: n.state?.[e] ?? null,
+				pathname: window.location.pathname
+			});
+			return window.addEventListener("popstate", n), () => window.removeEventListener("popstate", n);
+		}
+	};
 }
+//#endregion
+//#region src/navigate/selfPopGuard.ts
 function f() {
-	return u > 0 ? (--u, !0) : !1;
+	let e = 0;
+	return {
+		mark() {
+			e += 1;
+		},
+		consume() {
+			return e > 0 ? (--e, !0) : !1;
+		}
+	};
+}
+var p = f();
+function m() {
+	p.mark();
+}
+function h() {
+	return p.consume();
 }
 //#endregion
 //#region src/history/createHistorySync.ts
-function p(e) {
-	let { stores: t } = e, n = async (e) => {
-		if (f()) return;
-		let n = e.state?.id, i = r.generateTaskId();
+function g(e) {
+	let { stores: t, driver: n = d(), consume: i = h } = e;
+	return n.subscribe(async (e) => {
+		if (i()) return;
+		let n = e.state, a = r.generateTaskId();
 		(await r.addTask(async (r) => {
-			let a = e.state?.index, o = e.state?.status, s = e.state?.params, c = e.state?.transitionName, l = e.state?.layoutId, { setStatus: u, setTransitionTaskId: d } = t.navigate.getState(), { index: f, addHistory: p, popHistory: m } = t.history.getState(), h = a < f, g = o === "PUSHING" && a > f, _ = o === "REPLACING" && a > f, v = window.location.pathname;
-			if (!h && !g && !_) {
+			let { setStatus: i, setTransitionTaskId: o } = t.navigate.getState(), { index: s, addHistory: c, popHistory: l, setPendingIndex: u } = t.history.getState(), d = n?.index, f = d !== void 0 && d < s, p = n?.status === "PUSHING" && d !== void 0 && d > s, m = n?.status === "REPLACING" && d !== void 0 && d > s;
+			if (!f && !p && !m) {
 				r.abort();
 				return;
 			}
-			return d(i), h ? u("POPPING") : g ? (u("PUSHING"), p({
-				id: n,
-				pathname: v,
-				params: s,
-				transitionName: c,
-				layoutId: l
-			})) : (u("REPLACING"), p({
-				id: n,
-				pathname: v,
-				params: s,
-				transitionName: c,
-				layoutId: l
-			})), async () => {
-				h && m(a + 1), u("COMPLETED");
+			if (o(a), f) u(d), i("POPPING");
+			else {
+				let t = n;
+				i(p ? "PUSHING" : "REPLACING"), c({
+					id: t.id,
+					pathname: e.pathname,
+					params: t.params,
+					transitionName: t.transitionName,
+					layoutId: t.layoutId
+				});
+			}
+			return async () => {
+				f && d !== void 0 && l(d + 1), i("COMPLETED");
 			};
 		}, {
-			id: i,
+			id: a,
 			control: { manual: !0 }
 		})).result?.();
+	});
+}
+//#endregion
+//#region src/history/memoryHistoryDriver.ts
+function _(e) {
+	let t = [{
+		state: e?.state ?? null,
+		url: e?.url ?? "/"
+	}], n = 0, r = /* @__PURE__ */ new Set(), i = () => {
+		let e = t[n], i = {
+			state: e.state,
+			pathname: e.url
+		};
+		queueMicrotask(() => {
+			for (let e of r) e(i);
+		});
 	};
-	return window.addEventListener("popstate", n), () => {
-		window.removeEventListener("popstate", n);
+	return {
+		readState: () => t[n].state,
+		readPathname: () => t[n].url,
+		pushState: (e, r) => {
+			t.splice(n + 1), t.push({
+				state: e,
+				url: r
+			}), n = t.length - 1;
+		},
+		replaceState: (e, r) => {
+			t[n] = {
+				state: e,
+				url: r
+			};
+		},
+		go: (e) => {
+			let r = Math.min(Math.max(n + e, 0), t.length - 1);
+			r !== n && (n = r, i());
+		},
+		back: () => {
+			n !== 0 && (--n, i());
+		},
+		subscribe: (e) => (r.add(e), () => {
+			r.delete(e);
+		})
 	};
 }
 //#endregion
 //#region src/navigate/store.ts
-function m() {
+function v() {
 	return e((e) => ({
 		status: "IDLE",
 		transitionTaskId: null,
@@ -310,157 +414,156 @@ function m() {
 }
 //#endregion
 //#region src/navigate/createNavigationController.ts
-var h = (e, t, r) => {
+var y = (e, t, r) => {
 	let { regexp: i } = n(e);
 	for (let e = t - 1; e >= 0; e--) if (i.test(r[e].pathname)) return t - e;
 	return -1;
-}, g = (e, t) => typeof e == "number" && Number.isFinite(e) ? Math.max(0, Math.trunc(e)) : t, _ = async (e, t) => {
-	let n, r = new Promise((e) => {
-		n = () => e(!0), window.addEventListener("popstate", n, { once: !0 });
-	}), i = new Promise((e) => setTimeout(() => e(!1), 200));
-	if (d(), window.history.go(-e), !await Promise.race([r, i])) {
-		window.removeEventListener("popstate", n);
-		return;
-	}
-	t();
+}, b = (e, t) => typeof e == "number" && Number.isFinite(e) ? Math.max(0, Math.trunc(e)) : t, x = async (e, t, n, r) => {
+	let i, a = new Promise((t) => {
+		i = e.subscribe(() => t(!0));
+	}), o = new Promise((e) => setTimeout(() => e(!1), 200));
+	t(), e.go(-n);
+	let s = await Promise.race([a, o]);
+	i(), s && r();
 };
-function v(e) {
-	let { stores: t, buildPathname: n } = e, i = async (e, i, a) => {
-		let { status: o } = t.navigate.getState();
-		if (o !== "COMPLETED" && o !== "IDLE") return;
-		let s = t.transition.getState().defaultTransitionName, { transitionName: c = s, layoutId: l = null } = a ?? {}, u = r.generateTaskId();
+function S(e) {
+	let { stores: t, buildPathname: n, driver: i = d(), markSelfInduced: a = m } = e, o = async (e, o, s) => {
+		let { status: c } = t.navigate.getState();
+		if (c !== "COMPLETED" && c !== "IDLE") return;
+		let l = t.transition.getState().defaultTransitionName, { transitionName: u = l, layoutId: d = null } = s ?? {}, f = r.generateTaskId();
 		(await r.addTask(async () => {
-			let { index: r, histories: o, addHistory: s, popHistories: d } = t.history.getState(), f = (() => {
-				if (a?.until != null) {
-					let e = h(a.until, r, o);
+			let { index: r, histories: c, addHistory: l, popHistories: p } = t.history.getState(), m = (() => {
+				if (s?.until != null) {
+					let e = y(s.until, r, c);
 					return e < 0 ? 0 : e;
 				}
-				return Math.min(g(a?.skip, 0), Math.max(0, r));
-			})(), { setStatus: p, setTransitionTaskId: m } = t.navigate.getState();
-			p("PUSHING"), m(u);
-			let { pathname: v, toPathname: y } = n(e, i ?? {}), b = {
-				id: u,
-				pathname: y,
-				params: i ?? {},
-				transitionName: c,
-				layoutId: l
+				return Math.min(b(s?.skip, 0), Math.max(0, r));
+			})(), { setStatus: h, setTransitionTaskId: g } = t.navigate.getState();
+			h("PUSHING"), g(f);
+			let { pathname: _, toPathname: v } = n(e, o ?? {}), S = {
+				id: f,
+				pathname: v,
+				params: o ?? {},
+				transitionName: u,
+				layoutId: d
 			};
-			return f === 0 ? (window.history.pushState({
-				id: u,
+			return m === 0 ? (i.pushState({
+				id: f,
 				index: r + 1,
 				status: "PUSHING",
-				params: i,
-				transitionName: c,
-				layoutId: l
-			}, "", v), s(b), () => {
-				p("COMPLETED");
-			}) : (s(b), await _(f, () => {
-				window.history.pushState({
-					id: u,
-					index: t.history.getState().index - f,
+				params: o,
+				transitionName: u,
+				layoutId: d
+			}, _), l(S), () => {
+				h("COMPLETED");
+			}) : (l(S), await x(i, a, m, () => {
+				i.pushState({
+					id: f,
+					index: t.history.getState().index - m,
 					status: "PUSHING",
-					params: i,
-					transitionName: c,
-					layoutId: l
-				}, "", v);
+					params: o,
+					transitionName: u,
+					layoutId: d
+				}, _);
 			}), async () => {
-				d(f), p("COMPLETED");
+				p(m), h("COMPLETED");
 			});
 		}, {
-			id: u,
+			id: f,
 			control: { manual: !0 }
 		})).result?.();
-	}, a = async (e, i, a) => {
-		let { status: o } = t.navigate.getState();
-		if (o !== "COMPLETED" && o !== "IDLE") return;
-		let s = t.transition.getState().defaultTransitionName, { transitionName: c = s, layoutId: l = null } = a ?? {}, u = r.generateTaskId();
+	}, s = async (e, o, s) => {
+		let { status: c } = t.navigate.getState();
+		if (c !== "COMPLETED" && c !== "IDLE") return;
+		let l = t.transition.getState().defaultTransitionName, { transitionName: u = l, layoutId: d = null } = s ?? {}, f = r.generateTaskId();
 		(await r.addTask(async (r) => {
-			let { index: o, histories: s, addHistory: d, replaceHistory: f, popHistories: p } = t.history.getState(), m = (() => {
-				if (a?.until != null) {
-					let e = h(a.until, o, s);
+			let { index: c, histories: l, addHistory: p, replaceHistory: m, popHistories: h } = t.history.getState(), g = (() => {
+				if (s?.until != null) {
+					let e = y(s.until, c, l);
 					return e < 0 ? 0 : e + 1;
 				}
-				return Math.min(g(a?.skip, 0) + 1, o + 1);
+				return Math.min(b(s?.skip, 0) + 1, c + 1);
 			})();
-			if (m <= 0) {
+			if (g <= 0) {
 				r.abort();
 				return;
 			}
-			let { setStatus: v, setTransitionTaskId: y } = t.navigate.getState();
-			v("REPLACING"), y(u);
-			let { pathname: b, toPathname: x } = n(e, i ?? {}), S = {
-				id: u,
-				pathname: x,
-				params: i ?? {},
-				transitionName: c,
-				layoutId: l
+			let { setStatus: _, setTransitionTaskId: v } = t.navigate.getState();
+			_("REPLACING"), v(f);
+			let { pathname: S, toPathname: C } = n(e, o ?? {}), w = {
+				id: f,
+				pathname: C,
+				params: o ?? {},
+				transitionName: u,
+				layoutId: d
 			};
-			return m === 1 ? (window.history.replaceState({
-				id: u,
-				index: o,
+			return g === 1 ? (i.replaceState({
+				id: f,
+				index: c,
 				status: "REPLACING",
-				params: i,
-				transitionName: c,
-				layoutId: l
-			}, "", b), d(S), async () => {
-				f(o), v("COMPLETED");
-			}) : (p(m - 1), d(S), m <= o ? await _(m, () => {
-				window.history.pushState({
-					id: u,
+				params: o,
+				transitionName: u,
+				layoutId: d
+			}, S), p(w), async () => {
+				m(c), _("COMPLETED");
+			}) : (h(g - 1), p(w), g <= c ? await x(i, a, g, () => {
+				i.pushState({
+					id: f,
 					index: t.history.getState().index - 1,
 					status: "REPLACING",
-					params: i,
-					transitionName: c,
-					layoutId: l
-				}, "", b);
-			}) : await _(o, () => {
-				window.history.replaceState({
-					id: u,
+					params: o,
+					transitionName: u,
+					layoutId: d
+				}, S);
+			}) : await x(i, a, c, () => {
+				i.replaceState({
+					id: f,
 					index: 0,
 					status: "REPLACING",
-					params: i,
-					transitionName: c,
-					layoutId: l
-				}, "", b);
+					params: o,
+					transitionName: u,
+					layoutId: d
+				}, S);
 			}), async () => {
-				f(t.history.getState().index - 1), v("COMPLETED");
+				m(t.history.getState().index - 1), _("COMPLETED");
 			});
 		}, {
-			id: u,
+			id: f,
 			control: { manual: !0 }
 		})).result?.();
-	}, o = async (e, n) => {
-		let i = r.generateTaskId();
+	}, c = async (e, n) => {
+		let o = r.generateTaskId();
 		(await r.addTask(async (r) => {
-			let { index: a, histories: o, popHistory: s, popHistories: c, setTransitionName: l } = t.history.getState();
-			if (a <= 0) {
+			let { index: s, histories: c, popHistory: l, popHistories: u, setPendingIndex: d, setTransitionName: f } = t.history.getState();
+			if (s <= 0) {
 				r.abort();
 				return;
 			}
-			let u = Math.min(e(a, o), a);
-			if (u <= 0) {
+			let p = Math.min(e(s, c), s);
+			if (p <= 0) {
 				r.abort();
 				return;
 			}
-			let { setStatus: f, setTransitionTaskId: p } = t.navigate.getState();
-			return n && l(a, n), f("POPPING"), p(i), c(u - 1), d(), u === 1 ? window.history.back() : window.history.go(-u), async () => {
-				s(t.history.getState().index), f("COMPLETED");
+			d(s - p);
+			let { setStatus: m, setTransitionTaskId: h } = t.navigate.getState();
+			return n && f(s, n), m("POPPING"), h(o), u(p - 1), a(), p === 1 ? i.back() : i.go(-p), async () => {
+				l(t.history.getState().index), m("COMPLETED");
 			};
 		}, {
-			id: i,
+			id: o,
 			control: { manual: !0 }
 		})).result?.();
 	};
 	return {
-		push: i,
-		replace: a,
+		push: o,
+		replace: s,
 		pop: async (e) => {
-			await o((t, n) => {
+			await c((t, n) => {
 				if (e?.until != null) {
-					let r = h(e.until, t, n);
+					let r = y(e.until, t, n);
 					return r < 0 ? 0 : r;
 				}
-				let r = g(e?.skip, 1);
+				let r = b(e?.skip, 1);
 				return r <= 0 ? 0 : Math.min(r, t);
 			}, e?.transitionName);
 		}
@@ -468,7 +571,7 @@ function v(e) {
 }
 //#endregion
 //#region src/screen/store.ts
-function y() {
+function C() {
 	return e((e) => ({
 		dragStatus: "IDLE",
 		replaceTransitionStatus: "IDLE",
@@ -487,7 +590,7 @@ function y() {
 }
 //#endregion
 //#region src/screen/createScreenSelector.ts
-function b(e, t) {
+function w(e, t) {
 	return e.map((n, r) => ({
 		...n,
 		isActive: r === t,
@@ -500,13 +603,13 @@ function b(e, t) {
 }
 //#endregion
 //#region src/screen/computeScreenFreeze.ts
-function x(e) {
+function ee(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 S({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exitBack: o, options: s }) {
+function T({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exitBack: o, options: s }) {
 	return {
 		name: e,
 		initial: t,
@@ -527,7 +630,7 @@ function S({ name: e, initial: t, idle: n, enter: r, enterBack: i, exit: a, exit
 }
 //#endregion
 //#region src/transition/createRawTransition.ts
-function C({ 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 te({ 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,
@@ -548,10 +651,10 @@ function C({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, replac
 }
 //#endregion
 //#region src/transition/cupertino.ts
-var w = (e, t, n) => {
+var ne = (e, t, n) => {
 	let [r, i] = t, [a, o] = n;
 	return i === r ? a : a + (e - r) / (i - r) * (o - a);
-}, T = S({
+}, E = T({
 	name: "cupertino",
 	initial: { x: "100%" },
 	idle: {
@@ -611,7 +714,7 @@ var w = (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 = w(s, [0, window.innerWidth], [0, 100]);
+			let { offset: o } = t, s = o.x, c = ne(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;
 		},
 		onSwipeEnd: async (e, t, { animate: n, currentScreen: r, prevScreen: i, onStart: a }) => {
@@ -635,10 +738,10 @@ var w = (e, t, n) => {
 			})]), c;
 		}
 	}
-}), ee = (e, t, n) => {
+}), re = (e, t, n) => {
 	let [r, i] = t, [a, o] = n;
 	return i === r ? a : a + (e - r) / (i - r) * (o - a);
-}, te = S({
+}, ie = T({
 	name: "layout",
 	initial: { opacity: .97 },
 	idle: {
@@ -666,7 +769,7 @@ var w = (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 = ee(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 = re(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
@@ -683,7 +786,7 @@ var w = (e, t, n) => {
 			}, { duration: .3 })]), c;
 		}
 	}
-}), ne = S({
+}), ae = T({
 	name: "material",
 	initial: { y: "100%" },
 	idle: {
@@ -791,7 +894,7 @@ var w = (e, t, n) => {
 			})]), c;
 		}
 	}
-}), E = S({
+}), oe = T({
 	name: "none",
 	initial: {},
 	idle: {
@@ -815,14 +918,14 @@ var w = (e, t, n) => {
 		options: { duration: 0 }
 	}
 }), D = new Map([
-	["none", E],
-	["cupertino", T],
-	["material", ne],
-	["layout", te]
+	["none", oe],
+	["cupertino", E],
+	["material", ae],
+	["layout", ie]
 ]);
 //#endregion
 //#region src/transition/store.ts
-function re(t = "cupertino") {
+function se(t = "cupertino") {
 	return e((e) => ({
 		defaultTransitionName: t,
 		setDefaultTransitionName: (t) => e({ defaultTransitionName: t })
@@ -830,7 +933,7 @@ function re(t = "cupertino") {
 }
 //#endregion
 //#region src/transition/decorator/createDecorator.ts
-function ie({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
+function O({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 	return {
 		name: e,
 		initial: t,
@@ -851,7 +954,7 @@ function ie({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 }
 //#endregion
 //#region src/transition/decorator/createRawDecorator.ts
-function ae({ 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 ce({ 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,
@@ -872,30 +975,30 @@ function ae({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/decorator/overlay.ts
-var O = "rgba(0, 0, 0, 0.3)", oe = ie({
+var k = "rgba(0, 0, 0, 0.3)", le = O({
 	name: "overlay",
 	initial: {
 		opacity: 0,
-		backgroundColor: O
+		backgroundColor: k
 	},
 	idle: {
 		value: {
 			opacity: 0,
-			backgroundColor: O
+			backgroundColor: k
 		},
 		options: { duration: 0 }
 	},
 	enter: {
 		value: {
 			opacity: 1,
-			backgroundColor: O
+			backgroundColor: k
 		},
 		options: { duration: .7 }
 	},
 	exit: {
 		value: {
 			opacity: 0,
-			backgroundColor: O
+			backgroundColor: k
 		},
 		options: { duration: .6 }
 	},
@@ -904,10 +1007,10 @@ var O = "rgba(0, 0, 0, 0.3)", oe = ie({
 		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 })
 	}
-}), se = new Map([["overlay", oe]]);
+}), A = new Map([["overlay", le]]);
 //#endregion
 //#region src/transition/partTransition/createPartTransition.ts
-function ce({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
+function ue({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 	return {
 		name: e,
 		initial: t,
@@ -928,7 +1031,7 @@ function ce({ name: e, initial: t, idle: n, enter: r, exit: i, options: a }) {
 }
 //#endregion
 //#region src/transition/partTransition/createRawPartTransition.ts
-function le({ 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 de({ 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,
@@ -949,7 +1052,7 @@ function le({ name: e, initial: t, idle: n, pushOnEnter: r, pushOnExit: i, repla
 }
 //#endregion
 //#region src/transition/partTransition/partTransition.ts
-var k = /* @__PURE__ */ new Map(), A = {
+var j = /* @__PURE__ */ new Map(), M = {
 	"IDLE-true": "self",
 	"IDLE-false": "self",
 	"PUSHING-true": "initial",
@@ -960,7 +1063,7 @@ var k = /* @__PURE__ */ new Map(), A = {
 	"POPPING-false": "PUSHING-false",
 	"COMPLETED-true": "self",
 	"COMPLETED-false": "self"
-}, ue = Object.keys(A), de = ue, fe = (e) => e.replace(/[^a-zA-Z0-9_-]/g, "_"), j = (e) => typeof e == "object" && !!e && !Array.isArray(e), pe = 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(".")), me = (e, t) => t.startsWith("--") || pe.has(t) ? `${e}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${e}deg` : `${e}px`, M = (e, t) => typeof t == "number" ? me(t, e) : typeof t == "string" ? t : "", N = (e) => e.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), P = new Set([
+}, fe = Object.keys(M), pe = fe, me = (e) => e.replace(/[^a-zA-Z0-9_-]/g, "_"), N = (e) => typeof e == "object" && !!e && !Array.isArray(e), he = 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(".")), ge = (e, t) => t.startsWith("--") || he.has(t) ? `${e}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${e}deg` : `${e}px`, P = (e, t) => typeof t == "number" ? ge(t, e) : typeof t == "string" ? t : "", F = (e) => e.replace(/[A-Z]/g, (e) => `-${e.toLowerCase()}`), I = new Set([
 	"x",
 	"y",
 	"z",
@@ -971,7 +1074,7 @@ var k = /* @__PURE__ */ new Map(), A = {
 	"rotateX",
 	"rotateY",
 	"rotateZ"
-]), he = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, ge = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, _e = /^1(\.0+)?$/, ve = (e, t) => e === "scale" || e === "scaleX" || e === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? _e.test(t.trim()) : !1 : e === "rotate" || e === "rotateX" || e === "rotateY" || e === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? ge.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? he.test(t.trim()) : !1, ye = (e, t) => {
+]), _e = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, ve = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, ye = /^1(\.0+)?$/, be = (e, t) => e === "scale" || e === "scaleX" || e === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? ye.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" ? _e.test(t.trim()) : !1, xe = (e, t) => {
 	switch (e) {
 		case "x": return `translateX(${t})`;
 		case "y": return `translateY(${t})`;
@@ -985,23 +1088,23 @@ var k = /* @__PURE__ */ new Map(), A = {
 		case "rotateY": return `rotateY(${t})`;
 		default: return "";
 	}
-}, F = (e) => {
+}, L = (e) => {
 	let t = /* @__PURE__ */ new Set(), n = !1, r = (e) => {
-		if (j(e)) for (let r of Object.keys(e)) {
+		if (N(e)) for (let r of Object.keys(e)) {
 			let i = e[r];
-			M(r, i) !== "" && (P.has(r) ? n = !0 : t.add(N(r)));
+			P(r, i) !== "" && (I.has(r) ? n = !0 : t.add(F(r)));
 		}
 	};
 	r(e.initial);
 	for (let t of Object.values(e.variants)) r(t.value);
 	return n && t.add("transform"), Array.from(t);
-}, I = (e) => {
-	if (!j(e)) return [];
+}, R = (e) => {
+	if (!N(e)) return [];
 	let t = [], n = !0, r = [];
 	for (let i of Object.keys(e)) {
-		let a = e[i], o = M(i, a);
-		o !== "" && (P.has(i) ? (t.push(ye(i, o)), ve(i, a) || (n = !1)) : r.push({
-			property: N(i),
+		let a = e[i], o = P(i, a);
+		o !== "" && (I.has(i) ? (t.push(xe(i, o)), be(i, a) || (n = !1)) : r.push({
+			property: F(i),
 			value: o
 		}));
 	}
@@ -1009,7 +1112,7 @@ var k = /* @__PURE__ */ new Map(), A = {
 		property: "transform",
 		value: n ? "none" : t.join(" ")
 	}), r;
-}, L = (e) => e.map((e) => `  ${e.property}: ${e.value};`).join("\n"), R = (e) => Array.isArray(e) ? e.length === 4 && e.every((e) => typeof e == "number") ? `cubic-bezier(${e.join(", ")})` : "linear" : typeof e == "string" ? {
+}, 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" ? {
 	linear: "linear",
 	easeIn: "ease-in",
 	easeOut: "ease-out",
@@ -1019,33 +1122,33 @@ var k = /* @__PURE__ */ new Map(), A = {
 	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", z = (e) => {
+}[e] ?? "ease" : "ease", V = (e) => {
 	if (!e) return 0;
 	let t = e.duration;
 	return typeof t == "number" && t >= 0 ? t : 0;
-}, B = (e) => e && typeof e.delay == "number" && e.delay > 0 ? e.delay : 0, be = (e, t) => {
+}, Se = (e) => e && typeof e.delay == "number" && e.delay > 0 ? e.delay : 0, Ce = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-screen][data-flemo-transition="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, xe = (e, t) => {
+}, we = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-decorator][data-flemo-decorator-name="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, Se = (e, t) => {
+}, Te = (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"]`;
-}, Ce = (e, t) => {
+}, Ee = (e, t) => {
 	let [n, r] = t.split("-");
 	return `[data-flemo-part-name="${e}"][data-flemo-status="${n}"][data-flemo-active="${r}"]`;
-}, V = (e, t, n) => `flemo-${e}-${fe(t)}-${n}`, H = (e, t, n, r, i, a) => {
-	let o = I(r), s = I(i.value), c = z(i.options), l = B(i.options), u = R(i.options?.ease), d = a(t, n), f = e === "screen" ? `${d},\n${Se(t, n)}` : d;
+}, H = (e, t, n) => `flemo-${e}-${me(t)}-${n}`, U = (e, t, n, r, i, a) => {
+	let o = R(r), s = R(i.value), c = V(i.options), l = Se(i.options), u = B(i.options?.ease), d = a(t, n), f = e === "screen" ? `${d},\n${Te(t, n)}` : d;
 	if (s.length === 0 && o.length === 0) return "";
-	if (c <= 0 && l <= 0) return s.length === 0 ? "" : `${f} {\n${L(s)}\n  animation: none;\n}`;
-	let p = V(e, t, n), m = [
+	if (c <= 0 && l <= 0) return s.length === 0 ? "" : `${f} {\n${z(s)}\n  animation: none;\n}`;
+	let p = H(e, t, n), m = [
 		`@keyframes ${p} {`,
 		"  from {",
-		L(o).replace(/^/gm, "  "),
+		z(o).replace(/^/gm, "  "),
 		"  }",
 		"  to {",
-		L(s).replace(/^/gm, "  "),
+		z(s).replace(/^/gm, "  "),
 		"  }",
 		"}"
 	].join("\n"), h = [
@@ -1056,92 +1159,92 @@ var k = /* @__PURE__ */ new Map(), A = {
 		"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" : ""}}`}`;
-}, U = (e, t, n, r) => {
-	let i = I(r.value);
-	return i.length === 0 ? "" : `${e(t, n)} {\n${L(i)}\n}`;
-}, we = (e, t, n = []) => {
+}, W = (e, t, n, r) => {
+	let i = R(r.value);
+	return i.length === 0 ? "" : `${e(t, n)} {\n${z(i)}\n}`;
+}, De = (e, t, n = []) => {
 	let r = [];
 	for (let t of e) {
 		let e = t.name;
-		for (let n of ue) {
-			let i = t.variants[n], a = A[n];
+		for (let n of fe) {
+			let i = t.variants[n], a = M[n];
 			if (a === "self") {
-				r.push(U(be, e, n, i));
+				r.push(W(Ce, e, n, i));
 				continue;
 			}
 			let o = a === "initial" ? t.initial : t.variants[a].value;
-			r.push(H("screen", e, n, o, i, be));
+			r.push(U("screen", e, n, o, i, Ce));
 		}
 	}
 	for (let e of t) {
 		let t = e.name;
-		for (let n of de) {
-			let i = e.variants[n], a = A[n];
+		for (let n of pe) {
+			let i = e.variants[n], a = M[n];
 			if (a === "self") {
-				r.push(U(xe, t, n, i));
+				r.push(W(we, t, n, i));
 				continue;
 			}
 			let o = a === "initial" ? e.initial : e.variants[a].value;
-			r.push(H("decorator", t, n, o, i, xe));
+			r.push(U("decorator", t, n, o, i, we));
 		}
 	}
 	for (let e of n) {
 		let t = e.name;
-		for (let n of de) {
-			let i = e.variants[n], a = A[n];
+		for (let n of pe) {
+			let i = e.variants[n], a = M[n];
 			if (a === "self") {
-				r.push(U(Ce, t, n, i));
+				r.push(W(Ee, t, n, i));
 				continue;
 			}
 			let o = a === "initial" ? e.initial : e.variants[a].value;
-			r.push(H("part", t, n, o, i, Ce));
+			r.push(U("part", t, n, o, i, Ee));
 		}
 	}
 	return r.filter((e) => e.length > 0).join("\n\n");
-}, Te = (e, t) => {
-	let n = A[t];
+}, Oe = (e, t) => {
+	let n = M[t];
 	if (n === "self") return !1;
-	let r = e.variants[t], i = z(r.options), a = B(r.options);
+	let r = e.variants[t], i = V(r.options), a = Se(r.options);
 	if (i <= 0 && a <= 0) return !1;
-	let o = I(n === "initial" ? e.initial : e.variants[n].value), s = I(r.value);
+	let o = R(n === "initial" ? e.initial : e.variants[n].value), s = R(r.value);
 	return o.length > 0 || s.length > 0;
-}, Ee = "data-flemo";
-function De() {
+}, ke = "data-flemo";
+function Ae() {
 	if (c()) return;
-	let e = we(D.values(), se.values(), k.values()), t = document.head.querySelector(`style[${Ee}]`);
-	t || (t = document.createElement("style"), t.setAttribute(Ee, ""), document.head.appendChild(t)), t.textContent !== e && (t.textContent = e);
+	let e = De(D.values(), A.values(), j.values()), t = document.head.querySelector(`style[${ke}]`);
+	t || (t = document.createElement("style"), t.setAttribute(ke, ""), document.head.appendChild(t)), t.textContent !== e && (t.textContent = e);
 }
 //#endregion
 //#region src/transition/animateInline.ts
-var Oe = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, W = /* @__PURE__ */ new WeakMap(), ke = (e, t) => {
-	let n = W.get(e);
-	n || (n = /* @__PURE__ */ new Set(), W.set(e, n)), n.add(t);
-}, G = (e, t) => {
+var je = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, G = /* @__PURE__ */ new WeakMap(), Me = (e, t) => {
+	let n = G.get(e);
+	n || (n = /* @__PURE__ */ new Set(), G.set(e, n)), n.add(t);
+}, K = (e, t) => {
 	if (e.style.transition = "", t) {
-		let n = W.get(e);
+		let n = G.get(e);
 		for (let r of t) e.style.removeProperty(r), n?.delete(r);
 		return;
 	}
-	let n = W.get(e);
+	let n = G.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");
-}, K = (e, t, n = {}) => {
-	if (!Oe(e)) return Promise.resolve();
-	let r = e, i = I(t);
+}, q = (e, t, n = {}) => {
+	if (!je(e)) return Promise.resolve();
+	let r = e, i = R(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 = R(n.ease);
+	let a = typeof n.duration == "number" ? n.duration : 0, o = typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, s = B(n.ease);
 	if (a <= 0 && o <= 0) {
 		r.style.transition = "none";
-		for (let e of i) r.style.setProperty(e.property, e.value), ke(r, e.property);
+		for (let e of i) r.style.setProperty(e.property, e.value), Me(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), ke(r, e.property);
+	for (let e of i) r.style.setProperty(e.property, e.value), Me(r, e.property);
 	return new Promise((e) => {
 		let t = !1, n = () => {
 			t || (t = !0, r.removeEventListener("transitionend", i), e());
@@ -1150,27 +1253,27 @@ var Oe = (e) => typeof HTMLElement < "u" && e instanceof HTMLElement, W = /* @__
 		};
 		r.addEventListener("transitionend", i), setTimeout(n, (a + o) * 1e3 + 60);
 	});
-}, q = "data-flemo-skip-animation", J = () => {};
-function Ae(e) {
+}, J = "data-flemo-skip-animation", Y = () => {};
+function Ne(e) {
 	return { driveScreenLifecycle: (t) => {
 		let { getElements: n, transitionName: i, prevTransitionName: a, status: o, isActive: s } = t;
-		if (!s) return o === "REPLACING" && a !== i && e.setReplaceTransitionStatus("PENDING"), J;
+		if (!s) return o === "REPLACING" && a !== i && e.setReplaceTransitionStatus("PENDING"), Y;
 		if (o === "COMPLETED") {
 			e.setDragStatus("IDLE"), e.setReplaceTransitionStatus("IDLE");
 			let { scope: t, decorator: r, bars: i } = n();
-			t && (G(t), t.removeAttribute(q)), r && (G(r), r.removeAttribute(q));
-			for (let e of i ?? []) e && (G(e), e.style.removeProperty("will-change"));
-			return J;
+			t && (K(t), t.removeAttribute(J)), r && (K(r), r.removeAttribute(J));
+			for (let e of i ?? []) e && (K(e), e.style.removeProperty("will-change"));
+			return Y;
 		}
-		if (o === "IDLE") return J;
+		if (o === "IDLE") return Y;
 		let { scope: c } = n();
-		if (!c) return J;
+		if (!c) return Y;
 		let l = () => {
 			let t = e.getTransitionTaskId();
 			t && r.resolveTask(t);
 		}, u = D.get(i) ?? D.get("none"), d = `${o}-true`;
-		if (!(c.getAttribute("data-flemo-skip-animation") !== "true" && Te(u, d))) return queueMicrotask(l), J;
-		let f = V("screen", i, d), p = (e) => {
+		if (!(c.getAttribute("data-flemo-skip-animation") !== "true" && Oe(u, d))) return queueMicrotask(l), Y;
+		let f = H("screen", i, d), p = (e) => {
 			e.target === c && e.animationName === f && (c.removeEventListener("animationend", p), l());
 		};
 		return c.addEventListener("animationend", p), () => {
@@ -1180,20 +1283,20 @@ function Ae(e) {
 }
 //#endregion
 //#region src/utils/findScrollable.ts
-function Y(e, t) {
-	let { direction: n = "x", markerSelector: r = "[data-swipe-at-edge]", depthLimit: i = 24, verifyByScroll: a = !1 } = t ?? {}, o = je(e);
+function X(e, t) {
+	let { direction: n = "x", markerSelector: r = "[data-swipe-at-edge]", depthLimit: i = 24, verifyByScroll: a = !1 } = t ?? {}, o = Pe(e);
 	if (!o) return {
 		element: null,
 		hasMarker: !1
 	};
 	let s = o.closest?.(r);
-	if (s instanceof HTMLElement && X(s, n) && (!a || Z(s, n))) return {
+	if (s instanceof HTMLElement && Z(s, n) && (!a || Q(s, n))) return {
 		element: s,
 		hasMarker: !0
 	};
 	let c = o, l = 0;
 	for (; c && l < i;) {
-		if (X(c, n) && (!a || Z(c, n))) return {
+		if (Z(c, n) && (!a || Q(c, n))) return {
 			element: c,
 			hasMarker: !1
 		};
@@ -1204,7 +1307,7 @@ function Y(e, t) {
 		hasMarker: !1
 	};
 }
-function je(e) {
+function Pe(e) {
 	if (!e) return null;
 	let t = e, n = typeof t.composedPath == "function" ? t.composedPath() : void 0;
 	if (n && n.length) {
@@ -1212,18 +1315,18 @@ function je(e) {
 	}
 	return e instanceof HTMLElement ? e : null;
 }
-function X(e, t) {
+function Z(e, t) {
 	return t === "y" ? e.scrollHeight - e.clientHeight > 1 : e.scrollWidth - e.clientWidth > 1;
 }
-function Z(e, t) {
-	if (!X(e, t) || typeof window > "u") return !1;
+function Q(e, t) {
+	if (!Z(e, t) || typeof window > "u") return !1;
 	let n = window.getComputedStyle(e), r = t === "y" ? n.overflowY : n.overflowX;
 	return r === "auto" || r === "scroll" || r === "overlay";
 }
 //#endregion
 //#region src/core/engine/createSwipeController.ts
-var Q = "data-flemo-skip-animation";
-function Me(e) {
+var Fe = "data-flemo-skip-animation";
+function Ie(e) {
 	let t = null, n = null, r = {
 		current: [],
 		prev: []
@@ -1269,28 +1372,28 @@ function Me(e) {
 			y: e.clientY
 		}, u = t;
 	}, v = (n, 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);
+		let o = q(n, i, a);
+		if (n === e.getElements().scope) for (let e of r.current) q(e, i, a);
+		else if (n === t) for (let e of r.prev) q(e, i, a);
 		return o;
 	}, y = (t) => {
-		let n = e.getPartnerBars(), i = [], { sharedAppBar: a, sharedNavigationBar: o } = e.getElements();
-		a && e.hasSharedAppBar() && !n?.appBar && i.push(a), o && e.hasSharedNavigationBar() && !n?.navigationBar && i.push(o);
+		let n = e.getPartnerBars(), i = [], { sharedTopBar: a, sharedBottomBar: o } = e.getElements();
+		a && e.hasSharedTopBar() && !n?.topBar && i.push(a), o && e.hasSharedBottomBar() && !n?.bottomBar && i.push(o);
 		let s = [];
 		if (t) {
 			let n = t.querySelector("[data-flemo-bar=\"app\"]"), r = t.querySelector("[data-flemo-bar=\"nav\"]");
-			n && !e.hasSharedAppBar() && s.push(n), r && !e.hasSharedNavigationBar() && s.push(r);
+			n && !e.hasSharedTopBar() && s.push(n), r && !e.hasSharedBottomBar() && s.push(r);
 		}
 		r = {
 			current: i,
 			prev: s
 		};
-		let c = F(e.getTransition()).join(", ");
+		let c = L(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) G(e), e.style.removeProperty("will-change");
-		for (let e of r.prev) G(e), e.style.removeProperty("will-change");
+		for (let e of r.current) K(e), e.style.removeProperty("will-change");
+		for (let e of r.prev) K(e), e.style.removeProperty("will-change");
 		r = {
 			current: [],
 			prev: []
@@ -1303,10 +1406,10 @@ function Me(e) {
 		};
 	}, S = (e, t, n) => {
 		let r = (r, i) => {
-			let a = k.get(r.getAttribute("data-flemo-part-name"));
+			let a = j.get(r.getAttribute("data-flemo-part-name"));
 			if (!a) return;
 			let o = {
-				animate: K,
+				animate: q,
 				element: r,
 				active: i
 			};
@@ -1315,7 +1418,7 @@ function Me(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]) G(e);
+		for (let e of [...i.current, ...i.prev]) K(e);
 		i = {
 			current: [],
 			prev: []
@@ -1325,7 +1428,7 @@ function Me(e) {
 		if (!i.swipeDirection || e.getViewportScrollHeight() > 10) return;
 		let { scope: a, screenContainer: o, decorator: f } = e.getElements();
 		if (!a) return;
-		let p = o?.parentElement?.previousElementSibling ?? null;
+		let p = o?.previousElementSibling ?? null;
 		if (t = p?.querySelector("[data-flemo-screen]") ?? null, n = p?.querySelector("[data-flemo-decorator]") ?? null, !t) return;
 		s = !0, c = {
 			x: r.clientX,
@@ -1344,13 +1447,13 @@ function Me(e) {
 			prevScreen: t,
 			onStart: (e) => {
 				m?.onSwipeStart?.(e, {
-					animate: K,
+					animate: q,
 					currentDecorator: f,
 					prevDecorator: n
 				}), S("start", e, 0);
 			}
 		}) ? e.setDragStatus("PENDING") : (e.setDragStatus("IDLE"), s = !1, b());
-	}, T = (r) => {
+	}, ee = (r) => {
 		let i = e.getTransition();
 		if (!i.swipeDirection || !s || e.getViewportScrollHeight() > 10) return;
 		_(r);
@@ -1361,13 +1464,13 @@ function Me(e) {
 			prevScreen: t,
 			onProgress: (e, t) => {
 				c?.onSwipe?.(e, t, {
-					animate: K,
+					animate: q,
 					currentDecorator: o,
 					prevDecorator: n
 				}), S("swipe", e, t);
 			}
 		});
-	}, ee = async (a) => {
+	}, T = async (a) => {
 		let o = e.getTransition();
 		if (!o.swipeDirection || !s) return;
 		s = !1;
@@ -1380,32 +1483,32 @@ function Me(e) {
 			prevScreen: t,
 			onStart: (e) => {
 				u?.onSwipeEnd?.(e, {
-					animate: K,
+					animate: q,
 					currentDecorator: l,
 					prevDecorator: n
 				}), S("end", e, 0);
 			}
 		})) {
-			c?.setAttribute(Q, "true"), l?.setAttribute(Q, "true");
+			c?.setAttribute(Fe, "true"), l?.setAttribute(Fe, "true");
 			for (let e of r.current) e.style.removeProperty("will-change");
-			for (let e of r.prev) G(e), e.style.removeProperty("will-change");
+			for (let e of r.prev) K(e), e.style.removeProperty("will-change");
 			r = {
 				current: [],
 				prev: []
 			};
-			for (let e of i.prev) G(e);
+			for (let e of i.prev) K(e);
 			i = {
 				current: [],
 				prev: []
 			}, e.back();
-		} else c && G(c), t && G(t), l && G(l), n && G(n), b(), C(), e.setDragStatus("IDLE");
+		} else c && K(c), t && K(t), l && K(l), n && K(n), b(), C(), e.setDragStatus("IDLE");
 	};
 	return {
 		pointerDown: (t) => {
-			e.isReadyForDrag() && (f = Y(t.target, {
+			e.isReadyForDrag() && (f = X(t.target, {
 				direction: "x",
 				verifyByScroll: !0
-			}), p = Y(t.target, {
+			}), p = X(t.target, {
 				direction: "y",
 				verifyByScroll: !0
 			}), m = t.clientX, h = t.clientY, (!f.element && !p.element || f.element || p.element) && (a = !0));
@@ -1413,7 +1516,7 @@ function Me(e) {
 		pointerMove: (t) => {
 			if (e.getViewportScrollHeight() > 10) return;
 			if (s) {
-				T(t);
+				ee(t);
 				return;
 			}
 			let n = e.getTransition().swipeDirection, r = !f.element && !p.element;
@@ -1427,7 +1530,7 @@ function Me(e) {
 			}
 		},
 		pointerUp: (e) => {
-			a = !1, o = !1, s && ee(e);
+			a = !1, o = !1, s && T(e);
 		},
 		shouldPreventTouch: () => o
 	};
@@ -1435,8 +1538,8 @@ function Me(e) {
 //#endregion
 //#region src/core/engine/barRiding.ts
 var $ = "data-flemo-bar-riding";
-function Ne(e) {
-	let { appBar: t, navBar: n } = e;
+function Le(e) {
+	let { topBar: t, navBar: n } = e;
 	if (!t && !n) return () => {};
 	let r = () => {
 		let r = e.getStatus();
@@ -1444,7 +1547,7 @@ function Ne(e) {
 			t?.removeAttribute($), n?.removeAttribute($);
 			return;
 		}
-		let i = e.getHistories(), a = e.isActive ? i[e.index - 1]?.id : i[e.index]?.id, o = a ? e.getSharedBars()[a] : void 0, s = e.hasAppBar && !o?.appBar, c = e.hasNavBar && !o?.navigationBar;
+		let i = e.getHistories(), a = e.isActive ? i[e.index - 1]?.id : i[e.index]?.id, o = a ? e.getSharedBars()[a] : void 0, s = e.hasTopBar && !o?.topBar, c = e.hasNavBar && !o?.bottomBar;
 		t && t.setAttribute($, s ? "true" : "false"), n && n.setAttribute($, c ? "true" : "false");
 	};
 	r();
@@ -1454,4 +1557,4 @@ function Ne(e) {
 	};
 }
 //#endregion
-export { q as SKIP_ANIMATION_ATTR, r as TaskManger, K as animateInline, V as animationName, De as applyTransitionStyles, Z as canProgrammaticallyScroll, G as clearInlineAnimation, F as collectAnimatedProperties, we as compileTransitionStyles, x as computeScreenFreeze, f as consumeSelfInducedPop, ie as createDecorator, i as createHistoryStore, p as createHistorySync, m as createNavigateStore, v as createNavigationController, ce as createPartTransition, ae as createRawDecorator, le as createRawPartTransition, C as createRawTransition, b as createScreenSelector, y as createScreenStore, Me as createSwipeController, S as createTransition, Ae as createTransitionEngine, re as createTransitionStore, T as cupertino, se as decoratorMap, Ne as driveBarRiding, R as easingToCss, l as ensureWindowHistoryState, Y as findScrollable, a as getMatchedPathPattern, o as getParams, c as isServer, te as layout, d as markSelfInducedPop, ne as material, E as none, X as overflowsAxis, oe as overlay, k as partTransitionMap, s as seedInitialHistory, I as targetToDecls, D as transitionMap, Te as variantHasAnimation };
+export { J as SKIP_ANIMATION_ATTR, r as TaskManger, q as animateInline, H as animationName, Ae as applyTransitionStyles, Q as canProgrammaticallyScroll, K as clearInlineAnimation, L as collectAnimatedProperties, De as compileTransitionStyles, ee as computeScreenFreeze, h as consumeSelfInducedPop, d as createBrowserHistoryDriver, O as createDecorator, i as createHistoryStore, g as createHistorySync, _ as createMemoryHistoryDriver, v as createNavigateStore, S as createNavigationController, ue as createPartTransition, ce as createRawDecorator, de as createRawPartTransition, te as createRawTransition, w as createScreenSelector, C as createScreenStore, f as createSelfPopGuard, Ie as createSwipeController, T as createTransition, Ne as createTransitionEngine, se as createTransitionStore, E as cupertino, A as decoratorMap, Le as driveBarRiding, B as easingToCss, l as ensureWindowHistoryState, X as findScrollable, a as getMatchedPathPattern, o as getParams, c as isServer, ie as layout, m as markSelfInducedPop, ae as material, oe as none, Z as overflowsAxis, le as overlay, j as partTransitionMap, s as seedInitialHistory, R as targetToDecls, D as transitionMap, Oe as variantHasAnimation };