@flemo/react 1.6.7 → 1.6.8

package/dist/index.mjs

@@ -1,20 +1,20 @@
-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 _, consumeSelfInducedPop as v, createAnimHoldCoordinator as y, createBrowserHistoryDriver as b, createBrowserHistoryDriver as x, createDecorator as te, createHistoryStore as S, createNavigateStore as C, createNavigationController as w, createPartTransition as T, createRawDecorator as E, createRawPartTransition as D, createRawTransition as O, createRouterScope as ne, createScreenSelector as k, createScreenStore as A, createStepController as j, createSwipeController as M, createTransition as N, createTransitionEngine as re, createTransitionStore as ie, decoratorMap as ae, eagerlyDecodeImages as oe, ensureScopeHistorySync as se, enteringInitialStyle as ce, getMatchedPathPattern as le, isOpaqueColor as ue, isServer as de, markSelfInducedPop as fe, matchesPathname as pe, observeBarHeight as me, observeViewportScrollHeight as he, partTransitionMap as ge, readStepParams as _e, registerTransitionDefinitions as P, releaseScopeHistorySync as F, resolveTransition as ve, seedRouterEntry as I, subscribeStepParamsRestore as ye } from "@flemo/core";
-import { jsx as L, jsxs as be } from "react/jsx-runtime";
+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 ee, useRef as d, useState as f } from "react";
+import { animHoldKey as te, appendParamsQuery as p, buildRoutePath as m, computeBarRiding as h, computeScreenFreeze as ne, consumeSelfInducedPop as g, createAnimHoldCoordinator as _, createBrowserHistoryDriver as v, createBrowserHistoryDriver as y, createDecorator as b, createHistoryStore as re, createNavigateStore as x, createNavigationController as S, createPartTransition as C, createRawDecorator as w, createRawPartTransition as T, createRawTransition as E, createRouterScope as D, createScreenSelector as O, createScreenStore as k, createStepController as ie, createSwipeController as A, createTransition as j, createTransitionEngine as ae, createTransitionStore as M, decoratorMap as oe, eagerlyDecodeImages as se, ensureScopeHistorySync as ce, enteringInitialStyle as le, getMatchedPathPattern as N, isOpaqueColor as ue, isServer as de, markSelfInducedPop as fe, matchesPathname as pe, observeBarHeight as me, observeViewportScrollHeight as he, partTransitionMap as ge, readStepParams as P, registerTransitionDefinitions as _e, releaseScopeHistorySync as ve, resolveTransition as ye, seedRouterEntry as be, subscribeStepParamsRestore as F } from "@flemo/core";
+import { jsx as I, jsxs as xe } from "react/jsx-runtime";
 //#region src/stores/StoreContext.ts
-var R = r(null);
+var L = r(null);
 //#endregion
 //#region src/stores/useStores.ts
-function z() {
-	let e = a(R);
+function R() {
+	let e = a(L);
 	if (!e) throw Error("flemo stores are missing. Render inside a <Router>.");
 	return e;
 }
 //#endregion
 //#region src/history/HistoryListener.tsx
-function xe() {
-	let e = z();
-	return o(() => (se(e), () => F(e)), [e]), null;
+function z() {
+	let e = R();
+	return o(() => (ce(e), () => ve(e)), [e]), null;
 }
 //#endregion
 //#region src/screen/ScreenContext.ts
@@ -38,10 +38,10 @@ function V() {
 }
 //#endregion
 //#region src/screen/ParamsProvider/ParamsContext.ts
-var Se = r({}), H = r(() => {});
+var Se = r({}), Ce = r(() => {});
 //#endregion
 //#region src/screen/ParamsProvider/ParamsReducer.ts
-function Ce(e, t) {
+function we(e, t) {
 	switch (t.type) {
 		case "SET": return t.params;
 		default: return e;
@@ -49,10 +49,10 @@ function Ce(e, t) {
 }
 //#endregion
 //#region src/screen/ParamsProvider/ParamsProvider.tsx
-function U({ children: e }) {
-	let { isActive: t, params: n } = V(), { driver: r } = z(), [i, a] = d(Ce, n);
+function Te({ children: e }) {
+	let { isActive: t, params: n } = V(), { driver: r } = R(), [i, a] = ee(we, n);
 	return o(() => {
-		if (t) return ye(r, (e) => a({
+		if (t) return F(r, (e) => a({
 			type: "SET",
 			params: e
 		}));
@@ -60,9 +60,9 @@ function U({ children: e }) {
 		t,
 		a,
 		r
-	]), /* @__PURE__ */ L(H.Provider, {
+	]), /* @__PURE__ */ I(Ce.Provider, {
 		value: a,
-		children: /* @__PURE__ */ L(Se.Provider, {
+		children: /* @__PURE__ */ I(Se.Provider, {
 			value: i,
 			children: e
 		})
@@ -70,41 +70,41 @@ function U({ 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 W = (e) => e;
-function G(t, n = W) {
+var H = (e) => e;
+function U(t, n = H) {
 	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 K(e) {
-	return G(z().history, e);
+function W(e) {
+	return U(R().history, e);
 }
 //#endregion
 //#region src/renderer/Renderer.tsx
-function we({ children: e }) {
-	let t = K((e) => e.index);
-	return k(K((e) => e.histories), t).map((t) => {
+function G({ children: e }) {
+	let t = W((e) => e.index);
+	return O(W((e) => e.histories), t).map((t) => {
 		let [r] = n.toArray(e).filter((e) => pe(e.props.path, t.pathname));
-		return r ? /* @__PURE__ */ L(B.Provider, {
+		return r ? /* @__PURE__ */ I(B.Provider, {
 			value: {
 				...t,
-				routePath: le(r.props.path, t.pathname)
+				routePath: N(r.props.path, t.pathname)
 			},
-			children: /* @__PURE__ */ L(U, { children: r })
+			children: /* @__PURE__ */ I(Te, { children: r })
 		}, t.id) : null;
 	});
 }
 //#endregion
 //#region src/screen/ScreenViewportContext.ts
-var q = r({ contained: !1 });
-function Te() {
-	return a(q);
+var K = r({ contained: !1 });
+function Ee() {
+	return a(K);
 }
 //#endregion
 //#region src/transition/styles.ts
-function Ee(e, t, n = []) {
-	l(() => P(e, t, n), [
+function q(e, t, n = []) {
+	l(() => _e(e, t, n), [
 		e,
 		t,
 		n
@@ -112,109 +112,109 @@ function Ee(e, t, n = []) {
 }
 //#endregion
 //#region src/RouterDepthContext.ts
-var De = r(0), Oe = { contained: !0 };
-function ke({ children: e, className: t, style: n }) {
-	return /* @__PURE__ */ L("div", {
+var De = r(0), J = { contained: !0 };
+function Oe({ children: e, className: t, style: n }) {
+	return /* @__PURE__ */ I("div", {
 		className: t,
 		style: {
 			position: "relative",
 			overflow: "hidden",
 			...n
 		},
-		children: /* @__PURE__ */ L(q.Provider, {
-			value: Oe,
-			children: /* @__PURE__ */ L(we, { children: e })
+		children: /* @__PURE__ */ I(K.Provider, {
+			value: J,
+			children: /* @__PURE__ */ I(G, { children: e })
 		})
 	});
 }
 //#endregion
 //#region src/Router.tsx
-function Ae(e) {
+function ke(e) {
 	let t = null;
 	return n.forEach(e, (e) => {
 		if (t || !i(e)) return;
-		if (e.type === ke) {
+		if (e.type === Oe) {
 			t = n.toArray(e.props.children).filter(i);
 			return;
 		}
 		let r = e.props.children;
 		if (r) {
-			let e = Ae(r);
+			let e = ke(r);
 			e && (t = e);
 		}
 	}), t;
 }
-var je = typeof window > "u" ? o : u, J = [], Y = [], Me = [], X = { contained: !0 };
-function Z({ children: e, initPath: t = "/", defaultTransitionName: r = "cupertino", transitions: i = J, decorators: c = Y, partTransitions: l = Me, history: u = "browser", createDriver: d, className: f, style: ee }) {
-	let m = a(De), h = m > 0, g = u === "memory", _ = s(), v = a(B), y = h && v.id ? `_F_${v.id}_` : _, b = Ae(e), te = b !== null, S = a(R), C = h ? null : S, w = C !== null, T = d ?? x, [E] = p(() => g ? null : T(w ? void 0 : y)), D = !h && !g && !de(), O = D && E ? E.readPathname() : t || "/", k = O.indexOf("?"), A = (k >= 0 ? O.slice(0, k) : O) || "/", j = D ? window.location.search : k >= 0 ? O.slice(k) : "", [M] = p(() => ne({
-		routePaths: (b ?? n.toArray(e)).map((e) => e.props.path).flat(),
-		pathname: A,
-		search: j,
+var Ae = typeof window > "u" ? o : u, je = [], Me = [], Ne = [], Y = { contained: !0 };
+function Pe({ children: e, initPath: t = "/", defaultTransitionName: r = "cupertino", transitions: i = je, decorators: c = Me, partTransitions: l = Ne, history: u = "browser", createDriver: ee, className: d, style: te }) {
+	let p = a(De), m = p > 0, h = u === "memory", ne = s(), g = a(B), _ = m && g.id ? `_F_${g.id}_` : ne, v = ke(e), b = v !== null, re = a(L), x = m ? null : re, S = x !== null, C = ee ?? y, [w] = f(() => h ? null : C(S ? void 0 : _)), T = !m && !h && !de(), E = T && w ? w.readPathname() : t || "/", O = E.indexOf("?"), k = (O >= 0 ? E.slice(0, O) : E) || "/", ie = T ? window.location.search : O >= 0 ? E.slice(O) : "", [A] = f(() => D({
+		routePaths: (v ?? n.toArray(e)).map((e) => e.props.path).flat(),
+		pathname: k,
+		search: ie,
 		defaultTransitionName: r,
-		memory: g,
-		browserDriver: E,
-		hostedScope: C,
-		routerKey: w ? void 0 : y,
-		zoneEntryId: h && !w && v.id || void 0,
-		persistKey: h && !g && !w ? y : void 0
+		memory: h,
+		browserDriver: w,
+		hostedScope: x,
+		routerKey: S ? void 0 : _,
+		zoneEntryId: m && !S && g.id || void 0,
+		persistKey: m && !h && !S ? _ : void 0
 	}));
-	M.transition.setState({ defaultTransitionName: r }), je(() => (M.life.alive = !0, () => {
-		M.life.alive = !1;
-	}), [M]), Ee(i, c, l), o(() => {
-		g || !E || I({
-			driver: E,
-			routerKey: w ? null : y,
-			nested: h && !w,
-			seedPathname: A,
+	A.transition.setState({ defaultTransitionName: r }), Ae(() => (A.life.alive = !0, () => {
+		A.life.alive = !1;
+	}), [A]), q(i, c, l), o(() => {
+		h || !w || be({
+			driver: w,
+			routerKey: S ? null : _,
+			nested: m && !S,
+			seedPathname: k,
 			defaultTransitionName: r,
-			rootParams: M.history.getState().histories[0]?.params ?? {}
+			rootParams: A.history.getState().histories[0]?.params ?? {}
 		});
 	}, [
-		g,
-		w,
 		h,
-		y,
-		A,
+		S,
+		m,
+		_,
+		k,
 		r,
-		M.history,
-		E
+		A.history,
+		w
 	]);
-	let N = te ? e : /* @__PURE__ */ L(we, { children: e }), re = /* @__PURE__ */ L(De.Provider, {
-		value: m + 1,
-		children: /* @__PURE__ */ be(R.Provider, {
-			value: M,
-			children: [!g && /* @__PURE__ */ L(xe, {}), h ? /* @__PURE__ */ L(q.Provider, {
-				value: X,
-				children: N
-			}) : N]
+	let j = b ? e : /* @__PURE__ */ I(G, { children: e }), ae = /* @__PURE__ */ I(De.Provider, {
+		value: p + 1,
+		children: /* @__PURE__ */ xe(L.Provider, {
+			value: A,
+			children: [!h && /* @__PURE__ */ I(z, {}), m ? /* @__PURE__ */ I(K.Provider, {
+				value: Y,
+				children: j
+			}) : j]
 		})
 	});
-	return h ? /* @__PURE__ */ L("div", {
-		className: f,
+	return m ? /* @__PURE__ */ I("div", {
+		className: d,
 		style: {
 			position: "relative",
 			overflow: "hidden",
-			...ee
+			...te
 		},
-		children: re
-	}) : re;
+		children: ae
+	}) : ae;
 }
 //#endregion
 //#region src/Route.tsx
-function Ne({ element: e }) {
+function Fe({ element: e }) {
 	return e;
 }
 //#endregion
 //#region src/utils/buildRoutePath.ts
-function Pe(e, t) {
-	return h(e, t);
+function Ie(e, t) {
+	return m(e, t);
 }
 //#endregion
 //#region src/navigate/useNavigate.ts
-function Fe() {
-	let e = z(), t = w({
+function Le() {
+	let e = R(), t = S({
 		stores: e,
-		buildPathname: (e, t) => Pe(e, t),
+		buildPathname: (e, t) => Ie(e, t),
 		driver: e.driver,
 		markSelfInduced: e.markSelfInduced
 	});
@@ -226,21 +226,21 @@ function Fe() {
 }
 //#endregion
 //#region src/navigate/usePathname.ts
-function Ie() {
-	return K((e) => e.histories[e.pendingIndex]?.pathname ?? "/");
+function Re() {
+	return W((e) => e.histories[e.pendingIndex]?.pathname ?? "/");
 }
 //#endregion
 //#region src/navigate/useStep.ts
-function Le() {
-	let { routePath: e } = V(), t = z(), n = a(H), { driver: r, markSelfInduced: i } = t, [s, c] = p(null);
+function X() {
+	let { routePath: e } = V(), t = R(), n = a(Ce), { driver: r, markSelfInduced: i } = t, [s, c] = f(null);
 	o(() => {
-		if (!e) return c(_e(r.readState())), r.subscribe((e) => c(_e(e.state)));
+		if (!e) return c(P(r.readState())), r.subscribe((e) => c(P(e.state)));
 	}, [e, r]);
-	let l = j({
+	let l = ie({
 		stores: t,
 		driver: r,
 		markSelfInduced: i,
-		buildStepPathname: (t) => e ? Pe(e, t).pathname : m(r.readPathname(), t),
+		buildStepPathname: (t) => e ? Ie(e, t).pathname : p(r.readPathname(), t),
 		applyParams: (t) => {
 			n({
 				type: "SET",
@@ -257,13 +257,13 @@ function Le() {
 }
 //#endregion
 //#region src/screen/ParamsProvider/useParams.ts
-function Re() {
+function Z() {
 	return a(Se);
 }
 //#endregion
 //#region src/screen/ScreenFreeze.tsx
 function ze({ freeze: e, children: n }) {
-	return /* @__PURE__ */ L(t, {
+	return /* @__PURE__ */ I(t, {
 		mode: e ? "hidden" : "visible",
 		children: n
 	});
@@ -273,20 +273,20 @@ function ze({ freeze: e, children: n }) {
 var Be = /* @__PURE__ */ new WeakMap();
 function Ve(e) {
 	let t = Be.get(e);
-	return t || (t = y(), Be.set(e, t)), t;
+	return t || (t = _(), Be.set(e, t)), t;
 }
 //#endregion
 //#region src/stores/useNavigateStore.ts
 function Q(e) {
-	return G(z().navigate, e);
+	return U(R().navigate, e);
 }
 //#endregion
 //#region src/screen/ScreenDecorator.tsx
 function He({ ref: e, style: t, ...n }) {
-	let { isActive: r, transitionName: i } = V(), a = f(null);
+	let { isActive: r, transitionName: i } = V(), a = d(null);
 	c(e, () => a.current);
-	let o = Q((e) => e.status), { decoratorName: s } = ve(i), l = ae.get(s);
-	return l ? /* @__PURE__ */ L("div", {
+	let o = Q((e) => e.status), { decoratorName: s } = ye(i), l = oe.get(s);
+	return l ? /* @__PURE__ */ I("div", {
 		ref: a,
 		"data-flemo-decorator": !0,
 		"data-flemo-decorator-name": l.name,
@@ -308,7 +308,7 @@ function He({ ref: e, style: t, ...n }) {
 //#endregion
 //#region src/screen/useViewportScrollHeight.ts
 function Ue() {
-	let [e, t] = p(0), [n, r] = p(0);
+	let [e, t] = f(0), [n, r] = f(0);
 	return o(() => he((e, n) => {
 		r(n), t(e);
 	}), []), {
@@ -319,102 +319,102 @@ function Ue() {
 //#endregion
 //#region src/stores/useScreenStore.ts
 function $(e) {
-	return G(z().screen, e);
+	return U(R().screen, e);
 }
 //#endregion
 //#region src/screen/ScreenMotion.tsx
-function We({ 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, zIndex: te, transitionName: S, prevTransitionName: C } = V(), { contained: w } = Te(), T = w ? "absolute" : "fixed", E = z(), D = Q((e) => e.status), O = $((e) => e.dragStatus), ne = E.screen.getState().setDragStatus, k = E.screen.getState().setReplaceTransitionStatus, A = K((e) => e.index), j = K((e) => e.histories), N = b ? j[A - 1]?.id : j[A]?.id, ie = $((e) => N ? e.sharedBars[N] : void 0), se = $((e) => N ? e.screenSurfaces[N] : void 0), le = f(null);
-	le.current ||= re({
+function We({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigationBarHeight: r, systemNavigationBarColor: i, sharedTopBar: a, sharedBottomBar: s, topBar: c, bottomBar: l, hideStatusBar: ee, hideSystemNavigationBar: p, backgroundColor: m = "white", contentScrollable: g = !0, ..._ }) {
+	let { id: v, isActive: y, isRoot: b, isPrev: re, zIndex: x, transitionName: S, prevTransitionName: C } = V(), { contained: w } = Ee(), T = w ? "absolute" : "fixed", E = R(), D = Q((e) => e.status), O = $((e) => e.dragStatus), k = $((e) => e.replaceTransitionStatus), ie = E.screen.getState().setDragStatus, j = E.screen.getState().setReplaceTransitionStatus, M = W((e) => e.index), ce = W((e) => e.histories), N = y ? ce[M - 1]?.id : ce[M]?.id, de = $((e) => N ? e.sharedBars[N] : void 0), fe = $((e) => N ? e.screenSurfaces[N] : void 0), pe = d(null);
+	pe.current ||= ae({
 		getTransitionTaskId: () => E.navigate.getState().transitionTaskId,
-		setDragStatus: ne,
-		setReplaceTransitionStatus: k
+		setDragStatus: ie,
+		setReplaceTransitionStatus: j
 	});
-	let de = le.current, fe = f(null);
-	fe.current ||= Ve(E.navigate);
-	let pe = ve(S), { initial: he, swipeDirection: ge, decoratorName: _e } = pe, P = ae.get(_e), { viewportScrollHeight: F } = Ue(), I = F > 0, [ye, R] = p(0), [xe, B] = p(0), Se = f(null), H = f(null), Ce = f(null), U = f(null), W = f(null), G = f({
-		transition: pe,
-		decorator: P,
+	let he = pe.current, ge = d(null);
+	ge.current ||= Ve(E.navigate);
+	let P = ye(S), { initial: _e, swipeDirection: ve, decoratorName: be } = P, F = oe.get(be), { viewportScrollHeight: L } = Ue(), z = L > 0, [B, Se] = f(0), [Ce, we] = f(0), Te = d(null), H = d(null), U = d(null), G = d(null), K = d(null), q = d({
+		transition: P,
+		decorator: F,
 		hasSharedTopBar: !!a,
 		hasSharedBottomBar: !!s,
-		viewportScrollHeight: F,
-		isRoot: x,
-		isActive: b,
+		viewportScrollHeight: L,
+		isRoot: b,
+		isActive: y,
 		status: D,
 		dragStatus: O,
-		index: A
+		index: M
 	});
-	G.current = {
-		transition: pe,
-		decorator: P,
+	q.current = {
+		transition: P,
+		decorator: F,
 		hasSharedTopBar: !!a,
 		hasSharedBottomBar: !!s,
-		viewportScrollHeight: F,
-		isRoot: x,
-		isActive: b,
+		viewportScrollHeight: L,
+		isRoot: b,
+		isActive: y,
 		status: D,
 		dragStatus: O,
-		index: A
+		index: M
 	};
-	let we = f(null);
-	we.current ||= M({
-		getTransition: () => G.current.transition,
-		getDecorator: () => G.current.decorator,
+	let De = d(null);
+	De.current ||= A({
+		getTransition: () => q.current.transition,
+		getDecorator: () => q.current.decorator,
 		getElements: () => ({
 			scope: H.current,
-			screenContainer: Se.current,
-			decorator: Ce.current,
-			sharedTopBar: U.current,
-			sharedBottomBar: W.current
+			screenContainer: Te.current,
+			decorator: U.current,
+			sharedTopBar: G.current,
+			sharedBottomBar: K.current
 		}),
-		hasSharedTopBar: () => G.current.hasSharedTopBar,
-		hasSharedBottomBar: () => G.current.hasSharedBottomBar,
-		getViewportScrollHeight: () => G.current.viewportScrollHeight,
+		hasSharedTopBar: () => q.current.hasSharedTopBar,
+		hasSharedBottomBar: () => q.current.hasSharedBottomBar,
+		getViewportScrollHeight: () => q.current.viewportScrollHeight,
 		isReadyForDrag: () => {
-			let e = G.current;
+			let e = q.current;
 			return !e.isRoot && e.isActive && e.status === "COMPLETED" && e.dragStatus === "IDLE" && !!e.transition.swipeDirection && e.viewportScrollHeight < 10;
 		},
 		getPartnerBars: () => {
-			let e = G.current, t = E.history.getState().histories, n = e.isActive ? t[e.index - 1]?.id : t[e.index]?.id;
+			let e = q.current, t = E.history.getState().histories, n = e.isActive ? t[e.index - 1]?.id : t[e.index]?.id;
 			return n ? E.screen.getState().sharedBars[n] : void 0;
 		},
-		setDragStatus: ne,
+		setDragStatus: ie,
 		back: () => window.history.back()
 	});
-	let q = we.current, Ee = (e) => q.pointerDown(e.nativeEvent), De = (e) => q.pointerMove(e.nativeEvent), Oe = (e) => q.pointerUp(e.nativeEvent);
+	let J = De.current, Oe = (e) => J.pointerDown(e.nativeEvent), ke = (e) => J.pointerMove(e.nativeEvent), Ae = (e) => J.pointerUp(e.nativeEvent);
 	o(() => {
-		oe(H.current);
+		se(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(() => {
-		let e = U.current;
+	}, [J]), u(() => {
+		let e = G.current;
 		if (!e) {
-			R(0);
+			Se(0);
 			return;
 		}
-		return me(e, R);
+		return me(e, Se);
 	}, [a]), u(() => {
-		let e = W.current;
+		let e = K.current;
 		if (!e) {
-			B(0);
+			we(0);
 			return;
 		}
-		return me(e, B);
+		return me(e, we);
 	}, [s]), u(() => {
 		let { registerSharedBars: e, unregisterSharedBars: t } = E.screen.getState();
-		return e(y, {
+		return e(v, {
 			topBar: !!a,
 			bottomBar: !!s
-		}), () => t(y);
+		}), () => t(v);
 	}, [
-		y,
+		v,
 		a,
 		s,
 		E.screen
@@ -422,70 +422,81 @@ function We({ 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: ue(getComputedStyle(e).backgroundColor) }), () => n(y);
+		return t(v, { opaqueBackground: ue(getComputedStyle(e).backgroundColor) }), () => n(v);
 	}, [
-		y,
-		h,
+		v,
+		m,
 		D,
 		E.screen
 	]);
-	let ke = b || te === A - 1, { app: Ae, nav: je } = g({
+	let je = y || x === M - 1, { app: Me, nav: Ne } = h({
 		status: D,
-		isTopOrTopPrev: ke,
+		isTopOrTopPrev: je,
 		hasTopBar: !!a,
 		hasNavBar: !!s,
-		partnerBars: ie
-	}), J = ee({
+		partnerBars: de
+	}), Y = te({
 		status: D,
-		isTopOrTopPrev: ke,
+		isTopOrTopPrev: je,
 		transitionName: S
-	}), [Y, Me] = p({
-		key: J,
-		released: J === null
-	});
-	Y.key !== J && Me({
-		key: J,
-		released: J === null
+	}), Pe = ne({
+		isActive: y,
+		isPrev: re,
+		zIndex: x,
+		index: M,
+		status: D,
+		dragStatus: O,
+		replaceTransitionStatus: k
+	}), Fe = d(Pe), Ie = d(Y !== null && Pe), [Le, Re] = f({
+		key: Y,
+		released: Y === null
 	});
-	let X = J !== null && Y.key === J && !Y.released, Z = X ? !b && se?.opaqueBackground ? "park" : b && (D === "PUSHING" || D === "REPLACING") && se?.opaqueBackground ? "park-under" : "true" : "false";
-	u(() => de.driveScreenLifecycle({
+	Le.key !== Y && (Re({
+		key: Y,
+		released: Y === null
+	}), Ie.current = Y !== null && Fe.current), Fe.current = Pe;
+	let X = Y !== null && Le.key === Y && !Le.released, Z = X ? !y && fe?.opaqueBackground ? "park" : y && (D === "PUSHING" || D === "REPLACING") && fe?.opaqueBackground ? "park-under" : "true" : "false";
+	u(() => he.driveScreenLifecycle({
 		getElements: () => ({
 			scope: H.current,
-			decorator: Ce.current,
-			bars: [U.current, W.current]
+			decorator: U.current,
+			bars: [G.current, K.current]
 		}),
 		transitionName: S,
 		prevTransitionName: C,
 		status: D,
-		isActive: b,
+		isActive: y,
 		animHoldReleased: !X
 	}), [
-		de,
+		he,
 		D,
-		b,
+		y,
 		C,
 		S,
 		X
 	]), o(() => {
-		if (!X || J === null) return;
-		let e = J, t = E.navigate.getState().transitionTaskId, n = t === null ? e : `${e}#${t}`;
-		return fe.current.join(n, () => Me((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 ge.current.join(n, () => Re((t) => t.key === e && !t.released ? {
 			key: e,
 			released: !0
-		} : t), { scope: H.current });
+		} : t), {
+			scope: H.current,
+			decodeWait: Ie.current
+		});
 	}, [
 		X,
-		J,
+		Y,
 		Z,
 		E.navigate
 	]);
-	let Ne = Z === "park-under" ? {} : ce({
-		initial: he,
-		isActive: b,
+	let ze = Z === "park-under" ? {} : le({
+		initial: _e,
+		isActive: y,
 		status: D
 	});
-	return /* @__PURE__ */ be("div", {
-		ref: Se,
+	return /* @__PURE__ */ xe("div", {
+		ref: Te,
 		style: {
 			position: T,
 			top: 0,
@@ -500,7 +511,7 @@ function We({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 			overscrollBehavior: "contain"
 		},
 		children: [
-			/* @__PURE__ */ L("div", {
+			/* @__PURE__ */ I("div", {
 				"data-swipe-at-edge-bar": !0,
 				style: {
 					position: T,
@@ -511,32 +522,32 @@ function We({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 					zIndex: 1
 				}
 			}),
-			/* @__PURE__ */ be("div", {
+			/* @__PURE__ */ xe("div", {
 				ref: H,
-				...v,
-				onPointerDown: Ee,
-				onPointerMove: De,
-				onPointerUp: Oe,
-				onPointerCancel: Oe,
+				..._,
+				onPointerDown: Oe,
+				onPointerMove: ke,
+				onPointerUp: Ae,
+				onPointerCancel: Ae,
 				"data-flemo-screen": !0,
 				"data-flemo-transition": S,
 				"data-flemo-status": D,
-				"data-flemo-active": b ? "true" : "false",
+				"data-flemo-active": y ? "true" : "false",
 				"data-flemo-anim-hold": Z,
 				style: {
 					display: "flex",
 					flexDirection: "column",
 					height: "100%",
-					backgroundColor: h,
-					overflowY: _ ? void 0 : "auto",
-					touchAction: ge === "x" ? "pan-y" : ge === "y" ? "pan-x" : "auto",
-					...Ne,
-					...v.style
+					backgroundColor: m,
+					overflowY: g ? void 0 : "auto",
+					touchAction: ve === "x" ? "pan-y" : ve === "y" ? "pan-x" : "auto",
+					...ze,
+					..._.style
 				},
 				children: [
-					!d && t && /* @__PURE__ */ L("div", {
+					!ee && t && /* @__PURE__ */ I("div", {
 						style: { minHeight: t },
-						children: /* @__PURE__ */ L("div", { style: {
+						children: /* @__PURE__ */ I("div", { style: {
 							position: T,
 							top: 0,
 							width: "100%",
@@ -544,32 +555,32 @@ function We({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 							backgroundColor: n
 						} })
 					}),
-					a && /* @__PURE__ */ L("div", { style: {
+					a && /* @__PURE__ */ I("div", { style: {
 						width: "100%",
-						minHeight: ye
+						minHeight: B
 					} }),
 					c,
-					/* @__PURE__ */ L("div", {
+					/* @__PURE__ */ I("div", {
 						style: {
 							display: "flex",
 							flexDirection: "column",
 							flexGrow: 1,
-							overflowY: _ ? "auto" : void 0
+							overflowY: g ? "auto" : void 0
 						},
 						children: e
 					}),
 					l,
-					s && /* @__PURE__ */ L("div", { style: {
-						display: I ? "none" : void 0,
+					s && /* @__PURE__ */ I("div", { style: {
+						display: z ? "none" : void 0,
 						width: "100%",
-						minHeight: xe
+						minHeight: Ce
 					} }),
-					!m && r && /* @__PURE__ */ L("div", {
+					!p && r && /* @__PURE__ */ I("div", {
 						style: {
-							display: I ? "none" : void 0,
+							display: z ? "none" : void 0,
 							minHeight: r
 						},
-						children: /* @__PURE__ */ L("div", { style: {
+						children: /* @__PURE__ */ I("div", { style: {
 							position: T,
 							bottom: 0,
 							width: "100%",
@@ -579,46 +590,46 @@ function We({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 					})
 				]
 			}),
-			a && /* @__PURE__ */ L("div", {
-				ref: U,
+			a && /* @__PURE__ */ I("div", {
+				ref: G,
 				"data-flemo-bar": "app",
 				"data-flemo-bar-transition": S,
 				"data-flemo-bar-status": D,
-				"data-flemo-bar-active": b ? "true" : "false",
-				"data-flemo-bar-riding": Ae ? "true" : "false",
+				"data-flemo-bar-active": y ? "true" : "false",
+				"data-flemo-bar-riding": Me ? "true" : "false",
 				"data-flemo-anim-hold": Z,
 				style: {
 					position: T,
-					top: d ? 0 : t,
+					top: ee ? 0 : t,
 					left: 0,
 					width: "100%",
 					zIndex: 1
 				},
 				children: a
 			}),
-			s && /* @__PURE__ */ L("div", {
-				ref: W,
+			s && /* @__PURE__ */ I("div", {
+				ref: K,
 				"data-flemo-bar": "nav",
 				"data-flemo-bar-transition": S,
 				"data-flemo-bar-status": D,
-				"data-flemo-bar-active": b ? "true" : "false",
-				"data-flemo-bar-riding": je ? "true" : "false",
+				"data-flemo-bar-active": y ? "true" : "false",
+				"data-flemo-bar-riding": Ne ? "true" : "false",
 				"data-flemo-anim-hold": Z,
 				style: {
-					display: I ? "none" : void 0,
+					display: z ? "none" : void 0,
 					position: T,
-					bottom: m ? 0 : r,
+					bottom: p ? 0 : r,
 					left: 0,
 					width: "100%",
 					zIndex: 1
 				},
 				children: s
 			}),
-			P && /* @__PURE__ */ L(He, {
-				ref: Ce,
+			F && /* @__PURE__ */ I(He, {
+				ref: U,
 				"data-flemo-anim-hold": Z
 			}),
-			/* @__PURE__ */ L("div", {
+			/* @__PURE__ */ I("div", {
 				"data-swipe-at-edge-bar": !0,
 				style: {
 					position: T,
@@ -636,17 +647,17 @@ function We({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 //#region src/screen/Screen.tsx
 function Ge({ children: e, ...t }) {
 	let { isActive: n, isPrev: r, zIndex: i } = V();
-	return /* @__PURE__ */ L(ze, {
-		freeze: _({
+	return /* @__PURE__ */ I(ze, {
+		freeze: ne({
 			isActive: n,
 			isPrev: r,
 			zIndex: i,
-			index: K((e) => e.index),
+			index: W((e) => e.index),
 			status: Q((e) => e.status),
 			dragStatus: $((e) => e.dragStatus),
 			replaceTransitionStatus: $((e) => e.replaceTransitionStatus)
 		}),
-		children: /* @__PURE__ */ L(We, {
+		children: /* @__PURE__ */ I(We, {
 			...t,
 			children: e
 		})
@@ -656,7 +667,7 @@ function Ge({ children: e, ...t }) {
 //#region src/screen/Part.tsx
 function Ke({ ref: e, name: t, style: n, children: r, ...i }) {
 	let { isActive: a } = V();
-	return /* @__PURE__ */ L("div", {
+	return /* @__PURE__ */ I("div", {
 		ref: e,
 		"data-flemo-part-name": t,
 		"data-flemo-status": Q((e) => e.status),
@@ -669,20 +680,20 @@ function Ke({ ref: e, name: t, style: n, children: r, ...i }) {
 //#endregion
 //#region src/stores/RouterScopeProvider.tsx
 function qe({ children: e }) {
-	let [t] = p(() => ({
-		history: S(),
-		navigate: C(),
-		transition: ie(),
-		screen: A(),
-		driver: x(),
+	let [t] = f(() => ({
+		history: re(),
+		navigate: x(),
+		transition: M(),
+		screen: k(),
+		driver: y(),
 		markSelfInduced: fe,
-		consume: v,
+		consume: g,
 		life: { alive: !0 }
 	}));
-	return /* @__PURE__ */ L(R.Provider, {
+	return /* @__PURE__ */ I(L.Provider, {
 		value: t,
 		children: e
 	});
 }
 //#endregion
-export { Ke as Part, Ne as Route, Z as Router, qe as RouterScopeProvider, Ge as Screen, B as ScreenContext, He as ScreenDecorator, ze as ScreenFreeze, We as ScreenMotion, ke as Slot, b as createBrowserHistoryDriver, te as createDecorator, T as createPartTransition, E as createRawDecorator, D as createRawPartTransition, O as createRawTransition, N as createTransition, ge as partTransitionMap, K as useHistoryStore, Fe as useNavigate, Q as useNavigateStore, Re as useParams, Ie as usePathname, V as useScreen, $ as useScreenStore, Le as useStep, z as useStores, Ue as useViewportScrollHeight };
+export { Ke as Part, Fe as Route, Pe as Router, qe as RouterScopeProvider, Ge as Screen, B as ScreenContext, He as ScreenDecorator, ze as ScreenFreeze, We as ScreenMotion, Oe as Slot, v as createBrowserHistoryDriver, b as createDecorator, C as createPartTransition, w as createRawDecorator, T as createRawPartTransition, E as createRawTransition, j as createTransition, ge as partTransitionMap, W as useHistoryStore, Le as useNavigate, Q as useNavigateStore, Z as useParams, Re as usePathname, V as useScreen, $ as useScreenStore, X as useStep, R as useStores, Ue as useViewportScrollHeight };

package/dist/screen/__tests__/ScreenMotion.decodeWait.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemo/react",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "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.17.0"
+    "@flemo/core": "1.18.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",