@flemo/react 1.8.1 → 1.8.2

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import e, { Activity as t, Children as n, createContext as r, isValidElement as i, useContext as a, useEffect as o, useId as s, useImperativeHandle as c, useInsertionEffect as l, useLayoutEffect as u, useReducer as d, useRef as f, useState as p } from "react";
-import { animHoldKey as ee, appendParamsQuery as m, buildRoutePath as h, computeBarRiding as g, computeScreenFreeze as te, consumeSelfInducedPop as _, createAnimHoldCoordinator as v, createBrowserHistoryDriver as y, createBrowserHistoryDriver as b, createDecorator as x, createHistoryStore as ne, createNavigateStore as S, createNavigationController as C, createPartTransition as re, createRawDecorator as w, createRawPartTransition as T, createRawTransition as E, createRouterScope as D, createScreenSelector as O, createScreenStore as k, createStepController as A, createSwipeController as j, createTransition as M, createTransitionEngine as ie, createTransitionStore as ae, decoratorMap as oe, eagerlyDecodeImages as se, ensureImageDecodeOffloader as ce, ensureScopeHistorySync as le, enteringInitialStyle as ue, getMatchedPathPattern as N, holdCompositorWarm as de, isOpaqueColor as fe, isServer as pe, markSelfInducedPop as me, matchesPathname as he, observeBarHeight as ge, observeViewportScrollHeight as _e, partTransitionMap as P, readStepParams as ve, registerTransitionDefinitions as ye, releaseScopeHistorySync as be, resolveTransition as xe, seedRouterEntry as F, subscribeStepParamsRestore as I } from "@flemo/core";
-import { jsx as L, jsxs as Se } from "react/jsx-runtime";
+import { animHoldKey as ee, appendParamsQuery as m, buildRoutePath as h, computeBarRiding as g, computeScreenFreeze as te, computeScreenFreezeMode as _, consumeSelfInducedPop as v, createAnimHoldCoordinator as y, createBrowserHistoryDriver as b, createBrowserHistoryDriver as ne, createDecorator as re, createHistoryStore as x, createNavigateStore as S, createNavigationController as C, createPartTransition as w, createRawDecorator as T, createRawPartTransition as E, createRawTransition as D, createRouterScope as ie, createScreenSelector as O, createScreenStore as k, createStepController as A, createSwipeController as ae, createTransition as oe, createTransitionEngine as se, createTransitionStore as ce, decoratorMap as le, eagerlyDecodeImages as ue, ensureImageDecodeOffloader as de, ensureScopeHistorySync as j, enteringInitialStyle as fe, getMatchedPathPattern as pe, holdCompositorWarm as me, isOpaqueColor as he, isServer as ge, markSelfInducedPop as _e, matchesPathname as ve, observeBarHeight as ye, observeViewportScrollHeight as M, partTransitionMap as be, readStepParams as N, registerTransitionDefinitions as xe, releaseScopeHistorySync as P, resolveTransition as Se, seedRouterEntry as F, subscribeStepParamsRestore as I } from "@flemo/core";
+import { jsx as L, jsxs as Ce } from "react/jsx-runtime";
 //#region src/stores/StoreContext.ts
 var R = r(null);
 //#endregion
@@ -12,9 +12,9 @@ function z() {
 }
 //#endregion
 //#region src/history/HistoryListener.tsx
-function Ce() {
+function we() {
 	let e = z();
-	return o(() => (le(e), () => be(e)), [e]), null;
+	return o(() => (j(e), () => P(e)), [e]), null;
 }
 //#endregion
 //#region src/screen/ScreenContext.ts
@@ -38,10 +38,10 @@ function V() {
 }
 //#endregion
 //#region src/screen/ParamsProvider/ParamsContext.ts
-var we = r({}), Te = r(() => {});
+var Te = r({}), Ee = r(() => {});
 //#endregion
 //#region src/screen/ParamsProvider/ParamsReducer.ts
-function Ee(e, t) {
+function H(e, t) {
 	switch (t.type) {
 		case "SET": return t.params;
 		default: return e;
@@ -49,8 +49,8 @@ function Ee(e, t) {
 }
 //#endregion
 //#region src/screen/ParamsProvider/ParamsProvider.tsx
-function H({ children: e }) {
-	let { isActive: t, params: n } = V(), { driver: r } = z(), [i, a] = d(Ee, n);
+function De({ children: e }) {
+	let { isActive: t, params: n } = V(), { driver: r } = z(), [i, a] = d(H, n);
 	return o(() => {
 		if (t) return I(r, (e) => a({
 			type: "SET",
@@ -60,9 +60,9 @@ function H({ children: e }) {
 		t,
 		a,
 		r
-	]), /* @__PURE__ */ L(Te.Provider, {
+	]), /* @__PURE__ */ L(Ee.Provider, {
 		value: a,
-		children: /* @__PURE__ */ L(we.Provider, {
+		children: /* @__PURE__ */ L(Te.Provider, {
 			value: i,
 			children: e
 		})
@@ -70,42 +70,43 @@ function H({ children: e }) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/zustand@5.0.14_@types+react@19.2.17_react@19.2.7/node_modules/zustand/esm/react.mjs
-var De = (e) => e;
-function U(t, n = De) {
+var U = (e) => e;
+function W(t, n = U) {
 	let r = e.useSyncExternalStore(t.subscribe, e.useCallback(() => n(t.getState()), [t, n]), e.useCallback(() => n(t.getInitialState()), [t, n]));
 	return e.useDebugValue(r), r;
 }
 //#endregion
 //#region src/stores/useHistoryStore.ts
-function W(e) {
-	return U(z().history, e);
+function G(e) {
+	return W(z().history, e);
 }
 //#endregion
 //#region src/renderer/Renderer.tsx
-function G({ children: e }) {
-	let t = W((e) => e.index), r = W((e) => e.histories), i = z();
+function K({ children: e }) {
+	let t = G((e) => e.index), r = G((e) => e.histories), i = z(), o = a(B);
 	return O(r, t).map((t) => {
-		let [r] = n.toArray(e).filter((e) => he(e.props.path, t.pathname));
+		let [r] = n.toArray(e).filter((e) => ve(e.props.path, t.pathname));
 		return r ? /* @__PURE__ */ L(B.Provider, {
 			value: {
 				...t,
+				isPrev: t.isPrev || o.isPrev,
 				navigateStore: i.navigate,
-				routePath: N(r.props.path, t.pathname)
+				routePath: pe(r.props.path, t.pathname)
 			},
-			children: /* @__PURE__ */ L(H, { children: r })
+			children: /* @__PURE__ */ L(De, { children: r })
 		}, t.id) : null;
 	});
 }
 //#endregion
 //#region src/screen/ScreenViewportContext.ts
-var K = r({ contained: !1 });
+var q = r({ contained: !1 });
 function Oe() {
-	return a(K);
+	return a(q);
 }
 //#endregion
 //#region src/transition/styles.ts
-function ke(e, t, n = []) {
-	l(() => ye(e, t, n), [
+function J(e, t, n = []) {
+	l(() => xe(e, t, n), [
 		e,
 		t,
 		n
@@ -113,7 +114,7 @@ function ke(e, t, n = []) {
 }
 //#endregion
 //#region src/RouterDepthContext.ts
-var q = r(0), Ae = { contained: !0 };
+var ke = r(0), Ae = { contained: !0 };
 function je({ children: e, className: t, style: n }) {
 	return /* @__PURE__ */ L("div", {
 		className: t,
@@ -122,9 +123,9 @@ function je({ children: e, className: t, style: n }) {
 			overflow: "hidden",
 			...n
 		},
-		children: /* @__PURE__ */ L(K.Provider, {
+		children: /* @__PURE__ */ L(q.Provider, {
 			value: Ae,
-			children: /* @__PURE__ */ L(G, { children: e })
+			children: /* @__PURE__ */ L(K, { children: e })
 		})
 	});
 }
@@ -145,30 +146,30 @@ function Me(e) {
 		}
 	}), t;
 }
-var Ne = typeof window > "u" ? o : u, Pe = [], Fe = [], J = [], Ie = { contained: !0 }, Le = 500, Re = 3e3;
-function Y({ children: e, initPath: t = "/", defaultTransitionName: r = "cupertino", transitions: i = Pe, decorators: c = Fe, partTransitions: l = J, history: u = "browser", createDriver: d, className: f, style: ee }) {
-	let m = a(q), h = m > 0, g = u === "memory", te = s(), _ = a(B), v = a(R), y = h && _.id ? `_F_${v?.routerKey ?? ""}${_.id}_` : te, x = Me(e), ne = x !== null, S = h ? null : v, C = S !== null, re = d ?? b, [w] = p(() => g ? null : re(C ? void 0 : y)), T = !h && !g && !pe(), E = T && w ? w.readPathname() : t || "/", O = E.indexOf("?"), k = (O >= 0 ? E.slice(0, O) : E) || "/", A = T ? window.location.search : O >= 0 ? E.slice(O) : "", [j] = p(() => D({
-		routePaths: (x ?? n.toArray(e)).map((e) => e.props.path).flat(),
-		pathname: k,
-		search: A,
+var Ne = typeof window > "u" ? o : u, Pe = [], Y = [], Fe = [], Ie = { contained: !0 }, Le = 500, Re = 3e3;
+function ze({ children: e, initPath: t = "/", defaultTransitionName: r = "cupertino", transitions: i = Pe, decorators: c = Y, partTransitions: l = Fe, history: u = "browser", createDriver: d, className: f, style: ee }) {
+	let m = a(ke), h = m > 0, g = u === "memory", te = s(), _ = a(B), v = a(R), y = h && _.id ? `_F_${v?.routerKey ?? ""}${_.id}_` : te, b = Me(e), re = b !== null, x = h ? null : v, S = x !== null, C = d ?? ne, [w] = p(() => g ? null : C(S ? void 0 : y)), T = !h && !g && !ge(), E = T && w ? w.readPathname() : t || "/", D = E.indexOf("?"), O = (D >= 0 ? E.slice(0, D) : E) || "/", k = T ? window.location.search : D >= 0 ? E.slice(D) : "", [A] = p(() => ie({
+		routePaths: (b ?? n.toArray(e)).map((e) => e.props.path).flat(),
+		pathname: O,
+		search: k,
 		defaultTransitionName: r,
 		memory: g,
 		browserDriver: w,
-		hostedScope: S,
-		routerKey: C ? void 0 : y,
-		zoneEntryId: h && !C && _.id || void 0,
-		persistKey: h && !g && !C ? y : void 0
+		hostedScope: x,
+		routerKey: S ? void 0 : y,
+		zoneEntryId: h && !S && _.id || void 0,
+		persistKey: h && !g && !S ? y : void 0
 	}));
-	j.transition.setState({ defaultTransitionName: r }), Ne(() => (j.life.alive = !0, () => {
-		j.life.alive = !1;
-	}), [j]), ke(i, c, l), o(() => ce(), []), o(() => {
+	A.transition.setState({ defaultTransitionName: r }), Ne(() => (A.life.alive = !0, () => {
+		A.life.alive = !1;
+	}), [A]), J(i, c, l), o(() => de(), []), o(() => {
 		if (typeof document > "u") return;
 		let e = null, t = null, n = 0, r = () => {
 			let r = Date.now();
 			if (r - n < Le) return;
 			n = r, t && clearTimeout(t);
 			let i = e;
-			e = de(), i?.(), t = setTimeout(() => {
+			e = me(), i?.(), t = setTimeout(() => {
 				t = null, e?.(), e = null;
 			}, Re);
 		}, i = [
@@ -186,30 +187,30 @@ function Y({ children: e, initPath: t = "/", defaultTransitionName: r = "cuperti
 	}, []), o(() => {
 		g || !w || F({
 			driver: w,
-			routerKey: C ? null : y,
-			nested: h && !C,
-			seedPathname: k,
+			routerKey: S ? null : y,
+			nested: h && !S,
+			seedPathname: O,
 			defaultTransitionName: r,
-			rootParams: j.history.getState().histories[0]?.params ?? {}
+			rootParams: A.history.getState().histories[0]?.params ?? {}
 		});
 	}, [
 		g,
-		C,
+		S,
 		h,
 		y,
-		k,
+		O,
 		r,
-		j.history,
+		A.history,
 		w
 	]);
-	let M = ne ? e : /* @__PURE__ */ L(G, { children: e }), ie = /* @__PURE__ */ L(q.Provider, {
+	let ae = re ? e : /* @__PURE__ */ L(K, { children: e }), oe = /* @__PURE__ */ L(ke.Provider, {
 		value: m + 1,
-		children: /* @__PURE__ */ Se(R.Provider, {
-			value: j,
-			children: [!g && /* @__PURE__ */ L(Ce, {}), h ? /* @__PURE__ */ L(K.Provider, {
+		children: /* @__PURE__ */ Ce(R.Provider, {
+			value: A,
+			children: [!g && /* @__PURE__ */ L(we, {}), h ? /* @__PURE__ */ L(q.Provider, {
 				value: Ie,
-				children: M
-			}) : M]
+				children: ae
+			}) : ae]
 		})
 	});
 	return h ? /* @__PURE__ */ L("div", {
@@ -219,25 +220,25 @@ function Y({ children: e, initPath: t = "/", defaultTransitionName: r = "cuperti
 			overflow: "hidden",
 			...ee
 		},
-		children: ie
-	}) : ie;
+		children: oe
+	}) : oe;
 }
 //#endregion
 //#region src/Route.tsx
-function ze({ element: e }) {
+function X({ element: e }) {
 	return e;
 }
 //#endregion
 //#region src/utils/buildRoutePath.ts
-function X(e, t) {
+function Z(e, t) {
 	return h(e, t);
 }
 //#endregion
 //#region src/navigate/useNavigate.ts
-function Z() {
+function Be() {
 	let e = z(), t = C({
 		stores: e,
-		buildPathname: (e, t) => X(e, t),
+		buildPathname: (e, t) => Z(e, t),
 		driver: e.driver,
 		markSelfInduced: e.markSelfInduced
 	});
@@ -249,21 +250,21 @@ function Z() {
 }
 //#endregion
 //#region src/navigate/usePathname.ts
-function Be() {
-	return W((e) => e.histories[e.pendingIndex]?.pathname ?? "/");
+function Ve() {
+	return G((e) => e.histories[e.pendingIndex]?.pathname ?? "/");
 }
 //#endregion
 //#region src/navigate/useStep.ts
-function Ve() {
-	let { routePath: e } = V(), t = z(), n = a(Te), { driver: r, markSelfInduced: i } = t, [s, c] = p(null);
+function He() {
+	let { routePath: e } = V(), t = z(), n = a(Ee), { driver: r, markSelfInduced: i } = t, [s, c] = p(null);
 	o(() => {
-		if (!e) return c(ve(r.readState())), r.subscribe((e) => c(ve(e.state)));
+		if (!e) return c(N(r.readState())), r.subscribe((e) => c(N(e.state)));
 	}, [e, r]);
 	let l = A({
 		stores: t,
 		driver: r,
 		markSelfInduced: i,
-		buildStepPathname: (t) => e ? X(e, t).pathname : m(r.readPathname(), t),
+		buildStepPathname: (t) => e ? Z(e, t).pathname : m(r.readPathname(), t),
 		applyParams: (t) => {
 			n({
 				type: "SET",
@@ -280,12 +281,12 @@ function Ve() {
 }
 //#endregion
 //#region src/screen/ParamsProvider/useParams.ts
-function He() {
-	return a(we);
+function Ue() {
+	return a(Te);
 }
 //#endregion
 //#region src/screen/ScreenFreeze.tsx
-function Ue({ freeze: e, children: n }) {
+function We({ freeze: e, children: n }) {
 	return /* @__PURE__ */ L(t, {
 		mode: e ? "hidden" : "visible",
 		children: n
@@ -293,27 +294,27 @@ function Ue({ freeze: e, children: n }) {
 }
 //#endregion
 //#region src/screen/scopeAnimHoldCoordinator.ts
-var We = /* @__PURE__ */ new WeakMap();
-function Ge(e) {
-	let t = We.get(e);
-	return t || (t = v(), We.set(e, t)), t;
+var Ge = /* @__PURE__ */ new WeakMap();
+function Ke(e) {
+	let t = Ge.get(e);
+	return t || (t = y(), Ge.set(e, t)), t;
 }
 //#endregion
 //#region src/stores/useNavigateStore.ts
 function Q(e) {
-	return U(z().navigate, e);
+	return W(z().navigate, e);
 }
 //#endregion
 //#region src/screen/ScreenDecorator.tsx
-function Ke({ ref: e, style: t, ...n }) {
-	let { isActive: r, transitionName: i } = V(), a = f(null);
-	c(e, () => a.current);
-	let o = Q((e) => e.status), { decoratorName: s } = xe(i), l = oe.get(s);
-	return l ? /* @__PURE__ */ L("div", {
-		ref: a,
+function qe({ ref: e, style: t, ...n }) {
+	let { isActive: r, isPrev: i, transitionName: a } = V(), o = f(null);
+	c(e, () => o.current);
+	let s = Q((e) => i ? "COMPLETED" : e.status), { decoratorName: l } = Se(a), u = le.get(l);
+	return u ? /* @__PURE__ */ L("div", {
+		ref: o,
 		"data-flemo-decorator": !0,
-		"data-flemo-decorator-name": l.name,
-		"data-flemo-status": o,
+		"data-flemo-decorator-name": u.name,
+		"data-flemo-status": s,
 		"data-flemo-active": r ? "true" : "false",
 		style: {
 			position: "absolute",
@@ -330,9 +331,9 @@ function Ke({ ref: e, style: t, ...n }) {
 }
 //#endregion
 //#region src/screen/useViewportScrollHeight.ts
-function qe() {
+function Je() {
 	let [e, t] = p(0), [n, r] = p(0);
-	return o(() => _e((e, n) => {
+	return o(() => M((e, n) => {
 		r(n), t(e);
 	}), []), {
 		viewportScrollHeight: e,
@@ -342,45 +343,45 @@ function qe() {
 //#endregion
 //#region src/stores/useScreenStore.ts
 function $(e) {
-	return U(z().screen, e);
+	return W(z().screen, e);
 }
 //#endregion
 //#region src/screen/ScreenMotion.tsx
-function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigationBarHeight: r, systemNavigationBarColor: i, sharedTopBar: a, sharedBottomBar: s, topBar: c, bottomBar: l, hideStatusBar: d, hideSystemNavigationBar: m, backgroundColor: h = "white", contentScrollable: _ = !0, ...v }) {
-	let { id: y, isActive: b, isRoot: x, isPrev: ne, zIndex: S, transitionName: C, prevTransitionName: re } = V(), { contained: w } = Oe(), T = w ? "absolute" : "fixed", E = z(), D = W((e) => e.index), O = W((e) => e.histories), k = b || S === D - 1, A = Q((e) => k ? e.status : "COMPLETED"), M = $((e) => e.dragStatus), ae = $((e) => e.replaceTransitionStatus), ce = E.screen.getState().setDragStatus, le = E.screen.getState().setReplaceTransitionStatus, N = b ? O[D - 1]?.id : O[D]?.id, de = $((e) => N ? e.sharedBars[N] : void 0), pe = $((e) => N ? e.screenSurfaces[N] : void 0), me = f(null);
-	me.current ||= ie({
+function Ye({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigationBarHeight: r, systemNavigationBarColor: i, sharedTopBar: a, sharedBottomBar: s, topBar: c, bottomBar: l, hideStatusBar: d, hideSystemNavigationBar: m, backgroundColor: h = "white", contentScrollable: _ = !0, ...v }) {
+	let { id: y, isActive: b, isRoot: ne, isPrev: re, zIndex: x, transitionName: S, prevTransitionName: C } = V(), { contained: w } = Oe(), T = w ? "absolute" : "fixed", E = z(), D = G((e) => e.index), ie = G((e) => e.histories), O = b || x === D - 1, k = Q((e) => O ? e.status : "COMPLETED"), A = $((e) => e.dragStatus), oe = $((e) => e.replaceTransitionStatus), ce = E.screen.getState().setDragStatus, de = E.screen.getState().setReplaceTransitionStatus, j = b ? ie[D - 1]?.id : ie[D]?.id, pe = $((e) => j ? e.sharedBars[j] : void 0), me = $((e) => j ? e.screenSurfaces[j] : void 0), ge = f(null);
+	ge.current ||= se({
 		getTransitionTaskId: () => E.navigate.getState().transitionTaskId,
 		setDragStatus: ce,
-		setReplaceTransitionStatus: le
+		setReplaceTransitionStatus: de
 	});
-	let he = me.current, _e = f(null);
-	_e.current ||= Ge(E.navigate);
-	let P = xe(C), { initial: ve, swipeDirection: ye, decoratorName: be } = P, F = oe.get(be), { viewportScrollHeight: I } = qe(), R = I > 0, [Ce, B] = p(0), [we, Te] = p(0), Ee = f(null), H = f(null), De = f(null), U = f(null), G = f(null), K = f({
-		transition: P,
-		decorator: F,
+	let _e = ge.current, ve = f(null);
+	ve.current ||= Ke(E.navigate);
+	let M = Se(S), { initial: be, swipeDirection: N, decoratorName: xe } = M, P = le.get(xe), { viewportScrollHeight: F } = Je(), I = F > 0, [R, we] = p(0), [B, Te] = p(0), Ee = f(null), H = f(null), De = f(null), U = f(null), W = f(null), K = f({
+		transition: M,
+		decorator: P,
 		hasSharedTopBar: !!a,
 		hasSharedBottomBar: !!s,
-		viewportScrollHeight: I,
-		isRoot: x,
+		viewportScrollHeight: F,
+		isRoot: ne,
 		isActive: b,
-		status: A,
-		dragStatus: M,
+		status: k,
+		dragStatus: A,
 		index: D
 	});
 	K.current = {
-		transition: P,
-		decorator: F,
+		transition: M,
+		decorator: P,
 		hasSharedTopBar: !!a,
 		hasSharedBottomBar: !!s,
-		viewportScrollHeight: I,
-		isRoot: x,
+		viewportScrollHeight: F,
+		isRoot: ne,
 		isActive: b,
-		status: A,
-		dragStatus: M,
+		status: k,
+		dragStatus: A,
 		index: D
 	};
-	let ke = f(null);
-	ke.current ||= j({
+	let q = f(null);
+	q.current ||= ae({
 		getTransition: () => K.current.transition,
 		getDecorator: () => K.current.decorator,
 		getElements: () => ({
@@ -388,7 +389,7 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 			screenContainer: Ee.current,
 			decorator: De.current,
 			sharedTopBar: U.current,
-			sharedBottomBar: G.current
+			sharedBottomBar: W.current
 		}),
 		hasSharedTopBar: () => K.current.hasSharedTopBar,
 		hasSharedBottomBar: () => K.current.hasSharedBottomBar,
@@ -404,32 +405,32 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		setDragStatus: ce,
 		back: () => window.history.back()
 	});
-	let q = ke.current, Ae = (e) => q.pointerDown(e.nativeEvent), je = (e) => q.pointerMove(e.nativeEvent), Me = (e) => q.pointerUp(e.nativeEvent);
+	let J = q.current, ke = (e) => J.pointerDown(e.nativeEvent), Ae = (e) => J.pointerMove(e.nativeEvent), je = (e) => J.pointerUp(e.nativeEvent);
 	o(() => {
-		se(H.current);
+		ue(H.current);
 	}, []), o(() => {
 		let e = H.current;
 		if (!e) return;
 		let t = (e) => {
-			q.shouldPreventTouch() && e.preventDefault(), e.target?.dataset.swipeAtEdgeBar === "true" && e.preventDefault();
+			J.shouldPreventTouch() && e.preventDefault(), e.target?.dataset.swipeAtEdgeBar === "true" && e.preventDefault();
 		};
 		return e.addEventListener("touchmove", t, { passive: !1 }), () => {
 			e.removeEventListener("touchmove", t);
 		};
-	}, [q]), u(() => {
+	}, [J]), u(() => {
 		let e = U.current;
 		if (!e) {
-			B(0);
+			we(0);
 			return;
 		}
-		return ge(e, B);
+		return ye(e, we);
 	}, [a]), u(() => {
-		let e = G.current;
+		let e = W.current;
 		if (!e) {
 			Te(0);
 			return;
 		}
-		return ge(e, Te);
+		return ye(e, Te);
 	}, [s]), u(() => {
 		let { registerSharedBars: e, unregisterSharedBars: t } = E.screen.getState();
 		return e(y, {
@@ -445,68 +446,68 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		let e = H.current;
 		if (!e) return;
 		let { registerScreenSurface: t, unregisterScreenSurface: n } = E.screen.getState();
-		return t(y, { opaqueBackground: fe(getComputedStyle(e).backgroundColor) }), () => n(y);
+		return t(y, { opaqueBackground: he(getComputedStyle(e).backgroundColor) }), () => n(y);
 	}, [
 		y,
 		h,
-		A,
+		k,
 		E.screen
 	]);
-	let Ne = k, { app: Pe, nav: Fe } = g({
-		status: A,
-		isTopOrTopPrev: Ne,
+	let Me = O, { app: Ne, nav: Pe } = g({
+		status: k,
+		isTopOrTopPrev: Me,
 		hasTopBar: !!a,
 		hasNavBar: !!s,
-		partnerBars: de
-	}), J = ee({
-		status: A,
-		isTopOrTopPrev: Ne,
-		transitionName: C
-	}), Ie = te({
+		partnerBars: pe
+	}), Y = ee({
+		status: k,
+		isTopOrTopPrev: Me,
+		transitionName: S
+	}), Fe = te({
 		isActive: b,
-		isPrev: ne,
-		zIndex: S,
+		isPrev: re,
+		zIndex: x,
 		index: D,
-		status: A,
-		dragStatus: M,
-		replaceTransitionStatus: ae
-	}), Le = f(Ie), Re = f(J !== null && Ie), [Y, ze] = p({
-		key: J,
-		released: J === null
+		status: k,
+		dragStatus: A,
+		replaceTransitionStatus: oe
+	}), Ie = f(Fe), Le = f(Y !== null && Fe), [Re, ze] = p({
+		key: Y,
+		released: Y === null
 	});
-	Y.key !== J && (ze({
-		key: J,
-		released: J === null
-	}), Re.current = J !== null && Le.current), Le.current = Ie;
-	let X = J !== null && Y.key === J && !Y.released, Z = X ? !b && pe?.opaqueBackground ? "park" : b && (A === "PUSHING" || A === "REPLACING") && pe?.opaqueBackground ? "park-under" : "true" : "false";
-	u(() => he.driveScreenLifecycle({
+	Re.key !== Y && (ze({
+		key: Y,
+		released: Y === null
+	}), Le.current = Y !== null && Ie.current), Ie.current = Fe;
+	let X = Y !== null && Re.key === Y && !Re.released, Z = X ? !b && me?.opaqueBackground ? "park" : b && (k === "PUSHING" || k === "REPLACING") && me?.opaqueBackground ? "park-under" : "true" : "false";
+	u(() => _e.driveScreenLifecycle({
 		getElements: () => ({
 			scope: H.current,
 			decorator: De.current,
-			bars: [U.current, G.current]
+			bars: [U.current, W.current]
 		}),
-		transitionName: C,
-		prevTransitionName: re,
-		status: A,
+		transitionName: S,
+		prevTransitionName: C,
+		status: k,
 		isActive: b,
 		animHoldReleased: !X
 	}), [
-		he,
-		A,
+		_e,
+		k,
 		b,
-		re,
 		C,
+		S,
 		X
 	]), o(() => {
-		if (!X || J === null) return;
-		let e = J, t = E.navigate.getState().transitionTaskId, n = t === null ? e : `${e}#${t}`;
-		return _e.current.join(n, () => ze((t) => t.key === e && !t.released ? {
+		if (!X || Y === null) return;
+		let e = Y, t = E.navigate.getState().transitionTaskId, n = t === null ? e : `${e}#${t}`;
+		return ve.current.join(n, () => ze((t) => t.key === e && !t.released ? {
 			key: e,
 			released: !0
 		} : t), {
 			scope: H.current,
-			decodeWait: Re.current,
-			contentSettle: b && A === "PUSHING" ? {
+			decodeWait: Le.current,
+			contentSettle: b && k === "PUSHING" ? {
 				graceMs: 150,
 				firstWaitMs: 400,
 				capMs: 900,
@@ -515,18 +516,18 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		});
 	}, [
 		X,
-		J,
+		Y,
 		Z,
 		b,
-		A,
+		k,
 		E.navigate
 	]);
-	let Be = Z === "park-under" ? {} : ue({
-		initial: ve,
+	let Be = Z === "park-under" ? {} : fe({
+		initial: be,
 		isActive: b,
-		status: A
+		status: k
 	});
-	return /* @__PURE__ */ Se("div", {
+	return /* @__PURE__ */ Ce("div", {
 		ref: Ee,
 		style: {
 			position: T,
@@ -553,16 +554,16 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 					zIndex: 1
 				}
 			}),
-			/* @__PURE__ */ Se("div", {
+			/* @__PURE__ */ Ce("div", {
 				ref: H,
 				...v,
-				onPointerDown: Ae,
-				onPointerMove: je,
-				onPointerUp: Me,
-				onPointerCancel: Me,
+				onPointerDown: ke,
+				onPointerMove: Ae,
+				onPointerUp: je,
+				onPointerCancel: je,
 				"data-flemo-screen": !0,
-				"data-flemo-transition": C,
-				"data-flemo-status": A,
+				"data-flemo-transition": S,
+				"data-flemo-status": k,
 				"data-flemo-active": b ? "true" : "false",
 				"data-flemo-anim-hold": Z,
 				style: {
@@ -571,7 +572,7 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 					height: "100%",
 					backgroundColor: h,
 					overflowY: _ ? void 0 : "auto",
-					touchAction: ye === "x" ? "pan-y" : ye === "y" ? "pan-x" : "auto",
+					touchAction: N === "x" ? "pan-y" : N === "y" ? "pan-x" : "auto",
 					...Be,
 					...v.style
 				},
@@ -588,7 +589,7 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 					}),
 					a && /* @__PURE__ */ L("div", { style: {
 						width: "100%",
-						minHeight: Ce
+						minHeight: R
 					} }),
 					c,
 					/* @__PURE__ */ L("div", {
@@ -602,13 +603,13 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 					}),
 					l,
 					s && /* @__PURE__ */ L("div", { style: {
-						display: R ? "none" : void 0,
+						display: I ? "none" : void 0,
 						width: "100%",
-						minHeight: we
+						minHeight: B
 					} }),
 					!m && r && /* @__PURE__ */ L("div", {
 						style: {
-							display: R ? "none" : void 0,
+							display: I ? "none" : void 0,
 							minHeight: r
 						},
 						children: /* @__PURE__ */ L("div", { style: {
@@ -624,10 +625,10 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 			a && /* @__PURE__ */ L("div", {
 				ref: U,
 				"data-flemo-bar": "app",
-				"data-flemo-bar-transition": C,
-				"data-flemo-bar-status": A,
+				"data-flemo-bar-transition": S,
+				"data-flemo-bar-status": k,
 				"data-flemo-bar-active": b ? "true" : "false",
-				"data-flemo-bar-riding": Pe ? "true" : "false",
+				"data-flemo-bar-riding": Ne ? "true" : "false",
 				"data-flemo-anim-hold": Z,
 				style: {
 					position: T,
@@ -639,15 +640,15 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 				children: a
 			}),
 			s && /* @__PURE__ */ L("div", {
-				ref: G,
+				ref: W,
 				"data-flemo-bar": "nav",
-				"data-flemo-bar-transition": C,
-				"data-flemo-bar-status": A,
+				"data-flemo-bar-transition": S,
+				"data-flemo-bar-status": k,
 				"data-flemo-bar-active": b ? "true" : "false",
-				"data-flemo-bar-riding": Fe ? "true" : "false",
+				"data-flemo-bar-riding": Pe ? "true" : "false",
 				"data-flemo-anim-hold": Z,
 				style: {
-					display: R ? "none" : void 0,
+					display: I ? "none" : void 0,
 					position: T,
 					bottom: m ? 0 : r,
 					left: 0,
@@ -656,7 +657,7 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 				},
 				children: s
 			}),
-			F && /* @__PURE__ */ L(Ke, {
+			P && /* @__PURE__ */ L(qe, {
 				ref: De,
 				"data-flemo-anim-hold": Z
 			}),
@@ -676,41 +677,37 @@ function Je({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 }
 //#endregion
 //#region src/screen/Screen.tsx
-function Ye({ children: e, ...t }) {
-	let { isActive: n, isPrev: r, zIndex: i } = V(), a = W((e) => e.index), s = Q((e) => e.status), c = te({
+function Xe({ children: e, ...t }) {
+	let { isActive: n, isPrev: r, zIndex: i } = V(), a = _({
 		isActive: n,
 		isPrev: r,
 		zIndex: i,
-		index: a,
-		status: s,
+		index: G((e) => e.index),
+		status: Q((e) => e.status),
 		dragStatus: $((e) => e.dragStatus),
 		replaceTransitionStatus: $((e) => e.replaceTransitionStatus)
-	}), [l, u] = p(c);
-	return !c && l && u(!1), o(() => {
-		if (!c || l || s !== "COMPLETED") return;
-		let e = setTimeout(() => u(!0), Xe);
+	}), [s, c] = p(a !== "live");
+	return a === "live" && s && c(!1), a === "immediate" && !s && c(!0), o(() => {
+		if (a !== "deferred" || s) return;
+		let e = setTimeout(() => c(!0), Ze);
 		return () => clearTimeout(e);
-	}, [
-		c,
-		l,
-		s
-	]), /* @__PURE__ */ L(Ue, {
-		freeze: l,
-		children: /* @__PURE__ */ L(Je, {
+	}, [a, s]), /* @__PURE__ */ L(We, {
+		freeze: s,
+		children: /* @__PURE__ */ L(Ye, {
 			...t,
 			children: e
 		})
 	});
 }
-var Xe = 600;
+var Ze = 600;
 //#endregion
 //#region src/screen/Part.tsx
-function Ze({ ref: e, name: t, style: n, children: r, ...i }) {
-	let { isActive: a, navigateStore: o } = V(), s = z();
+function Qe({ ref: e, name: t, style: n, children: r, ...i }) {
+	let { isActive: a, isPrev: o, navigateStore: s } = V(), c = z();
 	return /* @__PURE__ */ L("div", {
 		ref: e,
 		"data-flemo-part-name": t,
-		"data-flemo-status": U(o ?? s.navigate, (e) => e.status),
+		"data-flemo-status": W(s ?? c.navigate, (e) => o ? "COMPLETED" : e.status),
 		"data-flemo-active": a ? "true" : "false",
 		style: n,
 		...i,
@@ -719,15 +716,15 @@ function Ze({ ref: e, name: t, style: n, children: r, ...i }) {
 }
 //#endregion
 //#region src/stores/RouterScopeProvider.tsx
-function Qe({ children: e }) {
+function $e({ children: e }) {
 	let [t] = p(() => ({
-		history: ne(),
+		history: x(),
 		navigate: S(),
-		transition: ae(),
+		transition: ce(),
 		screen: k(),
-		driver: b(),
-		markSelfInduced: me,
-		consume: _,
+		driver: ne(),
+		markSelfInduced: _e,
+		consume: v,
 		life: { alive: !0 }
 	}));
 	return /* @__PURE__ */ L(R.Provider, {
@@ -736,4 +733,4 @@ function Qe({ children: e }) {
 	});
 }
 //#endregion
-export { Ze as Part, ze as Route, Y as Router, Qe as RouterScopeProvider, Ye as Screen, B as ScreenContext, Ke as ScreenDecorator, Ue as ScreenFreeze, Je as ScreenMotion, je as Slot, y as createBrowserHistoryDriver, x as createDecorator, re as createPartTransition, w as createRawDecorator, T as createRawPartTransition, E as createRawTransition, M as createTransition, P as partTransitionMap, W as useHistoryStore, Z as useNavigate, Q as useNavigateStore, He as useParams, Be as usePathname, V as useScreen, $ as useScreenStore, Ve as useStep, z as useStores, qe as useViewportScrollHeight };
+export { Qe as Part, X as Route, ze as Router, $e as RouterScopeProvider, Xe as Screen, B as ScreenContext, qe as ScreenDecorator, We as ScreenFreeze, Ye as ScreenMotion, je as Slot, b as createBrowserHistoryDriver, re as createDecorator, w as createPartTransition, T as createRawDecorator, E as createRawPartTransition, D as createRawTransition, oe as createTransition, be as partTransitionMap, G as useHistoryStore, Be as useNavigate, Q as useNavigateStore, Ue as useParams, Ve as usePathname, V as useScreen, $ as useScreenStore, He as useStep, z as useStores, Je as useViewportScrollHeight };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemo/react",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "React bindings for flemo: Router, Route, Screen, and the screen-transition runtime.",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
@@ -36,7 +36,7 @@
   "dependencies": {
     "path-to-regexp": "^8.4.2",
     "zustand": "^5.0.14",
-    "@flemo/core": "1.21.1"
+    "@flemo/core": "1.22.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",