@flemo/react 1.12.2 → 1.12.3

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import e, { Activity as t, Children as n, createContext as r, isValidElement as i, useCallback as a, useContext as o, useEffect as s, useId as c, useImperativeHandle as l, useInsertionEffect as u, useLayoutEffect as d, useReducer as f, useRef as p, useState as m, useSyncExternalStore as ee } from "react";
-import { animHoldKey as te, appendParamsQuery as ne, buildRoutePath as re, computeBarRiding as ie, computeScreenFreeze as ae, computeScreenFreezeMode as oe, consumeSelfInducedPop as se, createAnimHoldCoordinator as h, createBrowserHistoryDriver as g, createBrowserHistoryDriver as _, createDecorator as v, createHistoryStore as y, createNavigateStore as ce, createNavigationController as b, createPartTransition as x, createRawDecorator as le, createRawPartTransition as S, createRawTransition as C, createRouterScope as w, createScreenSelector as T, createScreenStore as E, createStepController as D, createSwipeController as ue, createTransition as O, createTransitionEngine as de, createTransitionStore as k, decoratorMap as fe, detectBlinkEngine as A, eagerlyDecodeImages as pe, ensureGpuPipelinePrewarm as me, ensureImageDecodeOffloader as he, ensureScopeHistorySync as j, enteringInitialStyle as ge, getMatchedPathPattern as _e, governedCompiledActive as ve, holdCompositorWarm as M, isLegacyAndroidBlink as ye, isOpaqueColor as be, isServer as N, markSelfInducedPop as xe, matchesPathname as Se, observeBarHeight as Ce, observeViewportScrollHeight as we, partTransitionMap as Te, readDeferReleaseCommitFlag as Ee, readDesktopReleaseFlipFlag as De, readImageOffloadOverride as Oe, readLayerPromotionFlag as ke, readPrerasterFlag as Ae, readSettleGateFlag as je, readStepParams as Me, registerTransitionDefinitions as Ne, releaseScopeHistorySync as Pe, resolveTransition as Fe, seedRouterEntry as Ie, sharedBarsMatch as Le, steadySixtyPlayerEligible as Re, subscribeStepParamsRestore as ze } from "@flemo/core";
+import { animHoldKey as te, appendParamsQuery as ne, buildRoutePath as re, computeBarRiding as ie, computeScreenFreeze as ae, computeScreenFreezeMode as oe, consumeSelfInducedPop as se, createAnimHoldCoordinator as h, createBrowserHistoryDriver as g, createBrowserHistoryDriver as _, createDecorator as v, createHistoryStore as y, createNavigateStore as ce, createNavigationController as b, createPartTransition as x, createRawDecorator as le, createRawPartTransition as S, createRawTransition as C, createRouterScope as w, createScreenSelector as T, createScreenStore as E, createStepController as D, createSwipeController as ue, createTransition as O, createTransitionEngine as de, createTransitionStore as k, decoratorMap as fe, detectBlinkEngine as A, eagerlyDecodeImages as pe, ensureGpuPipelinePrewarm as me, ensureImageDecodeOffloader as he, ensureScopeHistorySync as j, enteringInitialStyle as ge, getMatchedPathPattern as _e, governedCompiledActive as ve, holdCompositorWarm as M, isDesktopBlink as ye, isLegacyAndroidBlink as N, isOpaqueColor as be, isServer as xe, markSelfInducedPop as Se, matchesPathname as Ce, observeBarHeight as we, observeViewportScrollHeight as Te, partTransitionMap as Ee, readDeferReleaseCommitFlag as De, readDesktopReleaseFlipFlag as Oe, readImageOffloadOverride as ke, readLayerPromotionFlag as Ae, readPrerasterFlag as je, readSettleGateFlag as Me, readStepParams as Ne, registerTransitionDefinitions as Pe, releaseScopeHistorySync as Fe, resolveTransition as Ie, seedRouterEntry as Le, sharedBarsMatch as Re, subscribeStepParamsRestore as ze } from "@flemo/core";
 import { jsx as P, jsxs as Be } from "react/jsx-runtime";
 import { flushSync as Ve } from "react-dom";
 //#region src/stores/StoreContext.ts
@@ -15,7 +15,7 @@ function I() {
 //#region src/history/HistoryListener.tsx
 function L() {
 	let e = I();
-	return s(() => (j(e), () => Pe(e)), [e]), null;
+	return s(() => (j(e), () => Fe(e)), [e]), null;
 }
 //#endregion
 //#region src/screen/ScreenContext.ts
@@ -89,7 +89,7 @@ var Ke = r(null);
 function qe({ children: e }) {
 	let t = H((e) => e.index), r = H((e) => e.histories), i = I(), a = o(R), s = o(Ke);
 	return T(r, t).map((t) => {
-		let [r] = n.toArray(e).filter((e) => Se(e.props.path, t.pathname));
+		let [r] = n.toArray(e).filter((e) => Ce(e.props.path, t.pathname));
 		return r ? /* @__PURE__ */ P(R.Provider, {
 			value: {
 				...t,
@@ -111,7 +111,7 @@ function Ye() {
 //#endregion
 //#region src/transition/styles.ts
 function Xe(e, t, n = []) {
-	u(() => Ne(e, t, n), [
+	u(() => Pe(e, t, n), [
 		e,
 		t,
 		n
@@ -141,7 +141,7 @@ var et = r(0), U = r(null), W = [
 	return t;
 };
 function nt(e, t, n) {
-	return e.routePaths.length === 0 || e.routePaths.some((e) => e === t) ? !0 : n ? Se(e.routePaths, n) : !1;
+	return e.routePaths.length === 0 || e.routePaths.some((e) => e === t) ? !0 : n ? Ce(e.routePaths, n) : !1;
 }
 function K(e) {
 	return G(e).map((e, t) => {
@@ -243,7 +243,7 @@ var J = typeof window > "u" ? s : d, st = typeof window > "u" ? s : u, Y = [], c
 function pt({ children: e, name: t, strictRoutes: r = !1, initPath: a = "/", defaultTransitionName: l = "cupertino", transitions: u = Y, decorators: d = ct, partTransitions: f = lt, history: p = "browser", createDriver: ee, className: te, style: ne }) {
 	let re = o(et), ie = c(), [ae, oe] = m(!1);
 	s(() => oe(!0), []);
-	let se = ae ? ie : null, h = re > 0, g = p === "memory", v = c(), y = o(R), ce = o(F), b = h && y.id ? `_F_${ce?.routerKey ?? ""}${y.id}_` : v, x = ot(e), le = x !== null, S = (x ?? n.toArray(e).filter(i)).flatMap((e) => e.props?.path ? [e.props.path].flat() : []), C = h ? null : ce, T = C !== null, E = ee ?? _, [D] = m(() => g ? null : E(T ? void 0 : b)), ue = !h && !g && !N(), O = ue && D ? D.readPathname() : a || "/", de = O.indexOf("?"), k = (de >= 0 ? O.slice(0, de) : O) || "/", fe = ue ? window.location.search : de >= 0 ? O.slice(de) : "", [A] = m(() => w({
+	let se = ae ? ie : null, h = re > 0, g = p === "memory", v = c(), y = o(R), ce = o(F), b = h && y.id ? `_F_${ce?.routerKey ?? ""}${y.id}_` : v, x = ot(e), le = x !== null, S = (x ?? n.toArray(e).filter(i)).flatMap((e) => e.props?.path ? [e.props.path].flat() : []), C = h ? null : ce, T = C !== null, E = ee ?? _, [D] = m(() => g ? null : E(T ? void 0 : b)), ue = !h && !g && !xe(), O = ue && D ? D.readPathname() : a || "/", de = O.indexOf("?"), k = (de >= 0 ? O.slice(0, de) : O) || "/", fe = ue ? window.location.search : de >= 0 ? O.slice(de) : "", [A] = m(() => w({
 		routePaths: S,
 		pathname: k,
 		search: fe,
@@ -273,8 +273,8 @@ function pt({ children: e, name: t, strictRoutes: r = !1, initPath: a = "/", def
 	}, [j, t]), J(() => (A.life.alive = !0, () => {
 		A.life.alive = !1;
 	}), [A]), Xe(u, d, f), s(() => {
-		let e = Oe();
-		if (e !== "off") return e === "on" || ye() ? he() : void 0;
+		let e = ke();
+		if (e !== "off") return e === "on" || N() ? he() : void 0;
 	}, []), s(() => me(), []), s(() => {
 		if (typeof document > "u") return;
 		let e = null, t = null, n = 0, r = () => {
@@ -298,7 +298,7 @@ function pt({ children: e, name: t, strictRoutes: r = !1, initPath: a = "/", def
 			t && clearTimeout(t), e?.();
 		};
 	}, []), s(() => {
-		g || !D || Ie({
+		g || !D || Le({
 			driver: D,
 			routerKey: T ? null : b,
 			nested: h && !T,
@@ -411,7 +411,7 @@ function gt() {
 function _t() {
 	let { routePath: e } = z(), t = I(), n = o(He), { driver: r, markSelfInduced: i } = t, [a, c] = m(null);
 	s(() => {
-		if (!e) return c(Me(r.readState())), r.subscribe((e) => c(Me(e.state)));
+		if (!e) return c(Ne(r.readState())), r.subscribe((e) => c(Ne(e.state)));
 	}, [e, r]);
 	let l = D({
 		stores: t,
@@ -444,7 +444,7 @@ function bt({ freeze: e, children: n }) {
 	let [r, i] = m(e), a = p(null);
 	return !e && r && i(!1), s(() => {
 		if (!(!e || r)) {
-			if (!Re()) {
+			if (!ye()) {
 				i(!0);
 				return;
 			}
@@ -476,7 +476,7 @@ function Ct(e) {
 function wt({ ref: e, style: t, ...n }) {
 	let { isActive: r, isPrev: i, transitionName: a } = z(), o = p(null);
 	l(e, () => o.current);
-	let s = Ct((e) => i ? "COMPLETED" : e.status), { decoratorName: c } = Fe(a), u = fe.get(c);
+	let s = Ct((e) => i ? "COMPLETED" : e.status), { decoratorName: c } = Ie(a), u = fe.get(c);
 	return u ? /* @__PURE__ */ P("div", {
 		ref: o,
 		"data-flemo-decorator": !0,
@@ -500,7 +500,7 @@ function wt({ ref: e, style: t, ...n }) {
 //#region src/screen/useViewportScrollHeight.ts
 function Tt() {
 	let [e, t] = m(0), [n, r] = m(0);
-	return s(() => we((e, n) => {
+	return s(() => Te((e, n) => {
 		r(n), t(e);
 	}), []), {
 		viewportScrollHeight: e,
@@ -527,15 +527,15 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		setDragStatus: j,
 		setReplaceTransitionStatus: _e
 	});
-	let we = Se.current, Te = p(null);
+	let Ce = Se.current, Te = p(null);
 	Te.current ||= St(w.navigate);
-	let Oe = Fe(x), { initial: Me, swipeDirection: Ne, decoratorName: Pe } = Oe, Ie = fe.get(Pe), { viewportScrollHeight: Re } = Tt(), ze = Re > 0, F = !!c, L = !!u, R = F ? `${typeof l}:${String(l)}` : null, B = L ? `${typeof f}:${String(f)}` : null, [He, Ue] = m({
+	let Ee = Ie(x), { initial: ke, swipeDirection: Ne, decoratorName: Pe } = Ee, Fe = fe.get(Pe), { viewportScrollHeight: Le } = Tt(), ze = Le > 0, F = !!c, L = !!u, R = F ? `${typeof l}:${String(l)}` : null, B = L ? `${typeof f}:${String(f)}` : null, [He, Ue] = m({
 		key: R,
 		height: 0
 	}), [We, Ge] = m({
 		key: B,
 		height: 0
-	}), V = p(He), qe = p(We), Je = He.key === R ? He.height : 0, Xe = We.key === B ? We.height : 0, Ze = Le(F ? { id: l } : void 0, N?.topBar) ? N?.topBar?.height ?? 0 : 0, Qe = Le(L ? { id: f } : void 0, N?.bottomBar) ? N?.bottomBar?.height ?? 0 : 0, $e = Je || Ze, et = Xe || Qe, U = p(null), W = p(null), tt = p(null), G = p(null), nt = p(null), K = p(null), q = p(null), rt = a((e) => {
+	}), V = p(He), qe = p(We), Je = He.key === R ? He.height : 0, Xe = We.key === B ? We.height : 0, Ze = Re(F ? { id: l } : void 0, N?.topBar) ? N?.topBar?.height ?? 0 : 0, Qe = Re(L ? { id: f } : void 0, N?.bottomBar) ? N?.bottomBar?.height ?? 0 : 0, $e = Je || Ze, et = Xe || Qe, U = p(null), W = p(null), tt = p(null), G = p(null), nt = p(null), K = p(null), q = p(null), rt = a((e) => {
 		e <= 0 || R === null || (G.current && (G.current.style.minHeight = `${e}px`), V.current = {
 			key: R,
 			height: e
@@ -564,13 +564,13 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 	}, [rt]), ot = a((e) => {
 		q.current = e, e?.offsetHeight && it(e.offsetHeight);
 	}, [it]), J = p({
-		transition: Oe,
-		decorator: Ie,
+		transition: Ee,
+		decorator: Fe,
 		hasSharedTopBar: !!c,
 		hasSharedBottomBar: !!u,
 		sharedTopBarId: l,
 		sharedBottomBarId: f,
-		viewportScrollHeight: Re,
+		viewportScrollHeight: Le,
 		isRoot: y,
 		isActive: v,
 		status: k,
@@ -578,13 +578,13 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		index: E
 	});
 	J.current = {
-		transition: Oe,
-		decorator: Ie,
+		transition: Ee,
+		decorator: Fe,
 		hasSharedTopBar: !!c,
 		hasSharedBottomBar: !!u,
 		sharedTopBarId: l,
 		sharedBottomBarId: f,
-		viewportScrollHeight: Re,
+		viewportScrollHeight: Le,
 		isRoot: y,
 		isActive: v,
 		status: k,
@@ -662,10 +662,10 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		R
 	]), d(() => {
 		let e = K.current;
-		if (e) return Ce(e, rt);
+		if (e) return we(e, rt);
 	}, [rt, c]), d(() => {
 		let e = q.current;
-		if (e) return Ce(e, it);
+		if (e) return we(e, it);
 	}, [it, u]), d(() => {
 		let e = W.current;
 		if (!e) return;
@@ -706,8 +706,8 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		key: X,
 		released: X === null
 	}), yt.current = null, vt.current = X !== null && _t.current), _t.current = gt;
-	let Z = X !== null && bt.key === X && !bt.released && yt.current !== X, Q = Z ? !v && xe?.opaqueBackground ? "park" : v && (k === "PUSHING" || k === "REPLACING") && xe?.opaqueBackground ? Ae() || ve() ? "park-over" : "park-under" : "true" : "false", Dt = Et(ke);
-	d(() => we.driveScreenLifecycle({
+	let Z = X !== null && bt.key === X && !bt.released && yt.current !== X, Q = Z ? !v && xe?.opaqueBackground ? "park" : v && (k === "PUSHING" || k === "REPLACING") && xe?.opaqueBackground ? je() || ve() ? "park-over" : "park-under" : "true" : "false", Dt = Et(Ae);
+	d(() => Ce.driveScreenLifecycle({
 		getElements: () => ({
 			scope: W.current,
 			decorator: tt.current,
@@ -719,7 +719,7 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		isActive: v,
 		animHoldReleased: !Z
 	}), [
-		we,
+		Ce,
 		k,
 		v,
 		le,
@@ -729,7 +729,7 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		if (!Z || X === null) return;
 		let e = X, t = w.navigate.getState().transitionTaskId, n = t === null ? e : `${e}#${t}`;
 		return Te.current.join(n, () => {
-			let t = (J.current.transition.driver === "native" || ve() || De()) && !A();
+			let t = (J.current.transition.driver === "native" || ve() || Oe()) && !A();
 			if (t) {
 				for (let e of [
 					W.current,
@@ -744,12 +744,12 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 					key: e,
 					released: !0
 				} : t);
-				t && Ee() && typeof requestAnimationFrame == "function" ? requestAnimationFrame(() => n()) : Ve(n);
+				t && De() && typeof requestAnimationFrame == "function" ? requestAnimationFrame(() => n()) : Ve(n);
 			}
 		}, {
 			scope: W.current,
 			decodeWait: vt.current,
-			contentSettle: je() && (v && k === "PUSHING" || k === "POPPING") ? {
+			contentSettle: Me() && (v && k === "PUSHING" || k === "POPPING") ? {
 				firstWaitMs: 120,
 				capMs: 700,
 				graceMs: 60,
@@ -766,7 +766,7 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 		w.navigate
 	]);
 	let Ot = Q === "park-under" || Q === "park-over" ? {} : ge({
-		initial: Me,
+		initial: ke,
 		isActive: v,
 		status: k
 	});
@@ -906,7 +906,7 @@ function Dt({ children: e, statusBarHeight: t, statusBarColor: n, systemNavigati
 				},
 				children: u
 			}),
-			Ie && /* @__PURE__ */ P(wt, {
+			Fe && /* @__PURE__ */ P(wt, {
 				ref: tt,
 				"data-flemo-anim-hold": Q
 			})
@@ -962,7 +962,7 @@ function jt({ children: e }) {
 		transition: k(),
 		screen: E(),
 		driver: _(),
-		markSelfInduced: xe,
+		markSelfInduced: Se,
 		consume: se,
 		life: { alive: !0 }
 	}));
@@ -972,4 +972,4 @@ function jt({ children: e }) {
 	});
 }
 //#endregion
-export { At as Part, mt as Route, pt as Router, jt as RouterScopeProvider, Ot as Screen, R as ScreenContext, wt as ScreenDecorator, bt as ScreenFreeze, Dt as ScreenMotion, at as Slot, g as createBrowserHistoryDriver, v as createDecorator, x as createPartTransition, le as createRawDecorator, S as createRawPartTransition, C as createRawTransition, O as createTransition, Te as partTransitionMap, H as useHistoryStore, X as useNavigate, Ct as useNavigateStore, vt as useParams, gt as usePathname, z as useScreen, $ as useScreenStore, _t as useStep, I as useStores, Tt as useViewportScrollHeight };
+export { At as Part, mt as Route, pt as Router, jt as RouterScopeProvider, Ot as Screen, R as ScreenContext, wt as ScreenDecorator, bt as ScreenFreeze, Dt as ScreenMotion, at as Slot, g as createBrowserHistoryDriver, v as createDecorator, x as createPartTransition, le as createRawDecorator, S as createRawPartTransition, C as createRawTransition, O as createTransition, Ee as partTransitionMap, H as useHistoryStore, X as useNavigate, Ct as useNavigateStore, vt as useParams, gt as usePathname, z as useScreen, $ as useScreenStore, _t as useStep, I as useStores, Tt as useViewportScrollHeight };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemo/react",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "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.26.0"
+    "@flemo/core": "1.27.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",