@octane-xplat/ui 0.7.2 → 0.9.0

package/dist/native/escape-props.js

@@ -1,9 +1,11 @@
 import { applyNativeModifiers } from "./apply-native-modifiers.native.js";
+import { rememberGridChildPlacement } from "./grid-placement.js";
 import { isAndroid, isIOS } from "@nativescript/core";
 //#region src/escape-props.ts
 /** Apply only the active device's escape bag after the primitive's own props. */
 function applyEscapeProps(view, props) {
 	if (!view) return;
+	rememberGridChildPlacement(view, props);
 	const bag = isIOS ? props.ios : isAndroid ? props.android : void 0;
 	if (bag) Object.assign(view, bag);
 	applyNativeModifiers(view, props.modifiers);

package/dist/native/grid-auto-placement.js

@@ -0,0 +1,83 @@
+//#region src/grid-auto-placement.ts
+function gridIndex(value) {
+	if (value == null || value === "") return null;
+	const index = Number(value);
+	return Number.isInteger(index) && index >= 0 ? index : null;
+}
+function gridSpan(value) {
+	const span = Number(value);
+	return Number.isInteger(span) && span > 0 ? span : 1;
+}
+function trackCount(spec) {
+	return spec?.split(",").filter((track) => track.trim().length > 0).length ?? 0;
+}
+/** Match CSS Grid's row-flow placement for NativeScript GridLayout children. */
+function autoPlaceGridChildren(items, rowTracks, columnTracks) {
+	const placements = items.map((item) => ({
+		row: gridIndex(item.row),
+		col: gridIndex(item.col),
+		rowSpan: gridSpan(item.rowSpan),
+		colSpan: gridSpan(item.colSpan)
+	}));
+	const columnCount = Math.max(1, trackCount(columnTracks), ...placements.filter((placement) => placement.col != null).map((placement) => placement.col + placement.colSpan), ...placements.map((placement) => placement.colSpan));
+	const occupied = /* @__PURE__ */ new Set();
+	const isFree = (row, col, rowSpan, colSpan) => {
+		for (let y = row; y < row + rowSpan; y++) for (let x = col; x < col + colSpan; x++) if (occupied.has(`${y},${x}`)) return false;
+		return true;
+	};
+	const occupy = (row, col, rowSpan, colSpan) => {
+		for (let y = row; y < row + rowSpan; y++) for (let x = col; x < col + colSpan; x++) occupied.add(`${y},${x}`);
+	};
+	for (const placement of placements) if (placement.row != null && placement.col != null) occupy(placement.row, placement.col, placement.rowSpan, placement.colSpan);
+	for (const placement of placements) {
+		if (placement.row == null || placement.col != null) continue;
+		let col = 0;
+		while (!isFree(placement.row, col, placement.rowSpan, placement.colSpan)) col++;
+		placement.col = col;
+		occupy(placement.row, col, placement.rowSpan, placement.colSpan);
+	}
+	for (const placement of placements) {
+		if (placement.col == null || placement.row != null) continue;
+		let row = 0;
+		while (!isFree(row, placement.col, placement.rowSpan, placement.colSpan)) row++;
+		placement.row = row;
+		occupy(row, placement.col, placement.rowSpan, placement.colSpan);
+	}
+	let cursorRow = 0;
+	let cursorCol = 0;
+	for (const placement of placements) {
+		if (placement.row != null && placement.col != null) continue;
+		while (true) {
+			if (cursorCol + placement.colSpan > columnCount) {
+				cursorRow++;
+				cursorCol = 0;
+				continue;
+			}
+			if (isFree(cursorRow, cursorCol, placement.rowSpan, placement.colSpan)) break;
+			cursorCol++;
+		}
+		placement.row = cursorRow;
+		placement.col = cursorCol;
+		occupy(cursorRow, cursorCol, placement.rowSpan, placement.colSpan);
+		cursorCol += placement.colSpan;
+		if (cursorCol >= columnCount) {
+			cursorRow++;
+			cursorCol = 0;
+		}
+	}
+	return {
+		cells: placements.map(({ row, col }) => ({
+			row,
+			col
+		})),
+		rowCount: Math.max(trackCount(rowTracks), ...placements.map((item) => item.row + item.rowSpan)),
+		columnCount: Math.max(columnCount, ...placements.map((item) => item.col + item.colSpan))
+	};
+}
+function ensureGridTracks(spec, requiredCount) {
+	const tracks = spec?.split(",").map((track) => track.trim()).filter(Boolean) ?? [];
+	while (tracks.length < requiredCount) tracks.push("auto");
+	return tracks.join(",");
+}
+//#endregion
+export { autoPlaceGridChildren, ensureGridTracks };

package/dist/native/grid-placement.js

@@ -0,0 +1,20 @@
+//#region src/grid-placement.ts
+var placements = /* @__PURE__ */ new WeakMap();
+/** Keep the authored Grid placement next to its mounted NativeScript view. */
+function rememberGridChildPlacement(view, props) {
+	if ((typeof view !== "object" || view === null) && typeof view !== "function") return;
+	const placement = {};
+	for (const key of [
+		"row",
+		"col",
+		"rowSpan",
+		"colSpan"
+	]) if (props[key] !== void 0) placement[key] = props[key];
+	if (Object.keys(placement).length) placements.set(view, placement);
+	else placements.delete(view);
+}
+function gridChildPlacement(view) {
+	return typeof view === "object" && view !== null ? placements.get(view) ?? {} : {};
+}
+//#endregion
+export { gridChildPlacement, rememberGridChildPlacement };

package/dist/native/index.shared.js

@@ -6,9 +6,12 @@ import { Absolute } from "./Absolute.tsrx.js";
 import { setTranslate } from "./translate.js";
 import { Spacer } from "./Spacer.tsrx.js";
 import { Text } from "./Text.tsrx.js";
+import { Screen } from "./Screen.tsrx.js";
+import { ActivityIndicator } from "./ActivityIndicator.tsrx.js";
+import { ScrollView } from "./ScrollView.tsrx.js";
+import { Markdown, MarkdownScreen } from "./Markdown.tsrx.js";
 import { RichText, RichTextSpan } from "./RichText.tsrx.js";
 import { Pressable } from "./Pressable.tsrx.js";
-import { ActivityIndicator } from "./ActivityIndicator.tsrx.js";
 import { Button } from "./Button.tsrx.js";
 import { Collapsible } from "./Collapsible.tsrx.js";
 import { Accordion } from "./Accordion.tsrx.js";
@@ -58,14 +61,13 @@ import { Meter } from "./Meter.tsrx.js";
 import { ProgressGroup } from "./ProgressGroup.tsrx.js";
 import { Link } from "./Link.tsrx.js";
 import { getStack, registerStack, stackEntries } from "./stacks.js";
-import { defineRoutes, deriveRouteManifest, mergeRouteManifests } from "./route-table.js";
+import { defineRoutes, deriveRouteManifest, manifestToJson, mergeRouteManifests } from "./route-table.js";
 import { addBackInterceptor, addRoutes, canGoBack, currentModalRoute, currentRoute, hrefFor, layoutsForRoute, popRoute, pushDeepLink, pushRoute, redirect, registerRoutes, registerScreens, routeFor, routeStacks, screenFor, useCanGoBack, useModalRoute, useRoute } from "./route.js";
 import { NavLink } from "./NavLink.tsrx.js";
 import { TextArea } from "./TextArea.tsrx.js";
 import { SearchInput } from "./SearchInput.tsrx.js";
 import { SegmentedControl } from "./SegmentedControl.tsrx.js";
 import { ScrollBox } from "./ScrollBox.tsrx.js";
-import { ScrollView } from "./ScrollView.tsrx.js";
 import { VirtualList } from "./VirtualList.tsrx.js";
 import { WebView } from "./WebView.tsrx.js";
 import { Hoverable } from "./Hoverable.mobile.tsrx.js";
@@ -74,11 +76,11 @@ import { showToast } from "./toast-anchor.tsrx.js";
 import { useAnimation } from "./anim.tsrx.js";
 import { styled } from "./styled.tsrx.js";
 import { openWindow } from "./windows.js";
-import { Screen } from "./Screen.tsrx.js";
 import { Tabs } from "./Tabs.tsrx.js";
 import { Switch } from "./Switch.tsrx.js";
 import { useSafeAreaInsets } from "./safeAreaInsets.tsrx.js";
 import { SafeArea } from "./SafeArea.tsrx.js";
+import { KeyboardAvoiding } from "./KeyboardAvoiding.mobile.tsrx.js";
 import { Drawer } from "./Drawer.tsrx.js";
 import { useMeasure } from "./useMeasure.tsrx.js";
 import { Slider } from "./Slider.tsrx.js";
@@ -89,4 +91,4 @@ import { createStore } from "./store.js";
 import { useStore } from "./use-store.tsrx.js";
 import { Sheet } from "./Sheet.tsrx.js";
 import { closeSheet, openSheet } from "./sheet-service.js";
-export { Absolute, Accordion, ActivityIndicator, Alert, Avatar, AvatarGroup, Badge, Banner, Breadcrumb, Button, Card, Checkbox, CheckboxGroup, Chip, Collapsible, View as Column, Combobox, CommandPalette, ContextMenu, Drawer, DropdownMenu, Empty, FieldGroup, FormField, Grid, Heading, Hoverable, Icon, Image, InputMenu, InputNumber, InputRating, InputTags, Kbd, Link, ListItem, Meter, NavLink, NavigationMenu, Overlay, Pagination, PinInput, Popover, Pressable, ProgressGroup, RadioGroup, RichText, RichTextSpan, Row, SafeArea, Screen, ScrollBox, ScrollView, SearchInput, SegmentedControl, Select, SelectMenu, Separator, Sheet, Skeleton, Slider, Spacer, Stack, Stepper, Switch, Table, Tabs, Text, TextArea, TextInput, Timeline, Tooltip, Tree, User, View, VirtualList, WebView, addBackInterceptor, addRoutes, applyThemeClasses, canGoBack, closeSheet, createStore, currentModalRoute, currentRoute, defineRoutes, deriveRouteManifest, getColorScheme, getStack, getThemePreference, getThemeScheme, hrefFor, isNative, layoutsForRoute, mergeRouteManifests, onThemeSchemeChange, openSheet, openWindow, popRoute, pushDeepLink, pushRoute, redirect, registerIcon, registerIcons, registerRoutes, registerScreens, registerStack, routeFor, routeStacks, screenFor, setThemePreference, setTranslate, showToast, stackEntries, styled, themeSchemeClasses, useAnimation, useBackInterceptor, useCanGoBack, useColorScheme, useMeasure, useModalRoute, useRoute, useSafeAreaInsets, useStore, useThemeScheme };
+export { Absolute, Accordion, ActivityIndicator, Alert, Avatar, AvatarGroup, Badge, Banner, Breadcrumb, Button, Card, Checkbox, CheckboxGroup, Chip, Collapsible, View as Column, Combobox, CommandPalette, ContextMenu, Drawer, DropdownMenu, Empty, FieldGroup, FormField, Grid, Heading, Hoverable, Icon, Image, InputMenu, InputNumber, InputRating, InputTags, Kbd, KeyboardAvoiding, Link, ListItem, Markdown, MarkdownScreen, Meter, NavLink, NavigationMenu, Overlay, Pagination, PinInput, Popover, Pressable, ProgressGroup, RadioGroup, RichText, RichTextSpan, Row, SafeArea, Screen, ScrollBox, ScrollView, SearchInput, SegmentedControl, Select, SelectMenu, Separator, Sheet, Skeleton, Slider, Spacer, Stack, Stepper, Switch, Table, Tabs, Text, TextArea, TextInput, Timeline, Tooltip, Tree, User, View, VirtualList, WebView, addBackInterceptor, addRoutes, applyThemeClasses, canGoBack, closeSheet, createStore, currentModalRoute, currentRoute, defineRoutes, deriveRouteManifest, getColorScheme, getStack, getThemePreference, getThemeScheme, hrefFor, isNative, layoutsForRoute, manifestToJson, mergeRouteManifests, onThemeSchemeChange, openSheet, openWindow, popRoute, pushDeepLink, pushRoute, redirect, registerIcon, registerIcons, registerRoutes, registerScreens, registerStack, routeFor, routeStacks, screenFor, setThemePreference, setTranslate, showToast, stackEntries, styled, themeSchemeClasses, useAnimation, useBackInterceptor, useCanGoBack, useColorScheme, useMeasure, useModalRoute, useRoute, useSafeAreaInsets, useStore, useThemeScheme };

package/dist/native/keyboard-inset.mobile.js

@@ -1,4 +1,4 @@
-import { Application } from "@nativescript/core";
+import { Application, Utils } from "@nativescript/core";
 //#region src/keyboard-inset.mobile.ts
 var bound = /* @__PURE__ */ new Set();
 var inset = 0;
@@ -39,19 +39,19 @@ function bindBottomInsetToKeyboard(host) {
 		};
 	}
 	if (Application.android) {
-		const nativeWindow = Application.android.foregroundActivity?.window;
+		const nativeWindow = Application.android.foregroundActivity?.getWindow();
 		if (!nativeWindow) return () => {};
 		const params = globalThis.android?.view?.WindowManager?.LayoutParams;
 		if (!params) return () => {};
-		if ((nativeWindow.attributes.softInputMode & params.SOFT_INPUT_MASK_ADJUST) === params.SOFT_INPUT_ADJUST_RESIZE) return () => {};
+		if ((nativeWindow.getAttributes().softInputMode & params.SOFT_INPUT_MASK_ADJUST) === params.SOFT_INPUT_ADJUST_RESIZE) return () => {};
 		const ViewCompat = globalThis.androidx?.core?.view?.ViewCompat;
 		const WindowInsetsCompat = globalThis.androidx?.core?.view?.WindowInsetsCompat;
 		if (!ViewCompat || !WindowInsetsCompat) return () => {};
-		const decorView = nativeWindow.decorView;
+		const decorView = nativeWindow.getDecorView();
 		const listener = new ViewCompat.OnApplyWindowInsetsListener({ onApplyWindowInsets: (v, insets) => {
 			const ime = insets.getInsets(WindowInsetsCompat.Type.ime()).bottom;
 			const nav = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
-			host.translateY = -Math.max(0, ime - nav);
+			host.translateY = -Utils.layout.toDeviceIndependentPixels(Math.max(0, ime - nav));
 			return insets;
 		} });
 		ViewCompat.setOnApplyWindowInsetsListener(decorView, listener);

package/dist/native/navigation-request.js

@@ -0,0 +1,26 @@
+//#region src/navigation-request.ts
+function createNavigationRequests() {
+	const versions = /* @__PURE__ */ new Map();
+	const invalidate = (stack) => {
+		const version = (versions.get(stack) ?? 0) + 1;
+		versions.set(stack, version);
+		return version;
+	};
+	return {
+		invalidate,
+		begin(stack) {
+			const owned = /* @__PURE__ */ new Map([[stack, invalidate(stack)]]);
+			const isCurrent = () => [...owned].every(([name, version]) => versions.get(name) === version);
+			return {
+				isCurrent,
+				claim(name) {
+					if (!isCurrent()) return false;
+					if (!owned.has(name)) owned.set(name, invalidate(name));
+					return true;
+				}
+			};
+		}
+	};
+}
+//#endregion
+export { createNavigationRequests };

package/dist/native/octane-client-build.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "buildId": "397eabd3-87de-49d4-adf0-133ab9697510",
+  "buildId": "346919ac-5da4-4078-bfa3-89cdb83c992f",
   "mode": "production",
   "capabilities": {
     "independentHydration": false

package/dist/native/overlay-lifetime.mobile.js

@@ -0,0 +1,65 @@
+//#region src/overlay-lifetime.mobile.ts
+/** Own the resources of one independently mounted overlay. RootLayout emits
+* closed before removing the host, so that notification must never reenter close. */
+function createOverlayLifetime(owner, host, root, label, onFinish) {
+	const registry = owner;
+	let released = false;
+	let closing = false;
+	const cleanups = /* @__PURE__ */ new Set();
+	const report = (action, error) => console.error(`[${label}] ${action} failed`, error);
+	const release = (dismissed) => {
+		if (released) return;
+		released = true;
+		host.off("closed", onClosed);
+		for (const cleanup of cleanups) cleanup();
+		cleanups.clear();
+		root.unmount();
+		onFinish(dismissed);
+	};
+	const onClosed = () => {
+		closing = true;
+		release(true);
+	};
+	const detach = () => {
+		if (closing || !registry.hasChild(host)) return;
+		if (registry.getPopupIndex(host) === -1) return;
+		closing = true;
+		const failed = (error) => {
+			report("close", error);
+			if (registry.hasChild(host)) owner.removeChild(host);
+		};
+		try {
+			owner.close(host).catch(failed);
+		} catch (error) {
+			failed(error);
+		}
+	};
+	host.on("closed", onClosed);
+	return {
+		own(cleanup) {
+			if (released) cleanup();
+			else cleanups.add(cleanup);
+		},
+		close() {
+			release(false);
+			detach();
+		},
+		open(options, afterOpen) {
+			const failed = (error) => {
+				report("open", error);
+				release(false);
+				detach();
+			};
+			try {
+				owner.open(host, options).then(() => {
+					if (released) detach();
+					else return afterOpen?.();
+				}).catch(failed);
+			} catch (error) {
+				failed(error);
+			}
+		}
+	};
+}
+//#endregion
+export { createOverlayLifetime };

package/dist/native/pan.tsrx.js

@@ -11,6 +11,14 @@ var PAN_STATE = [
 	"ended"
 ];
 function panVelocity(e, state, trackerRef) {
+	if (state === 0) {
+		trackerRef.current?.recycle?.();
+		trackerRef.current = null;
+		return {
+			vx: 0,
+			vy: 0
+		};
+	}
 	const recognizer = e.ios;
 	const nativeView = e.view?.nativeViewProtected;
 	if (recognizer?.velocityInView && nativeView) {
@@ -44,11 +52,17 @@ function panVelocity(e, state, trackerRef) {
 	}
 	return velocity;
 }
+function nativePanState(e) {
+	const motionEvent = e.android?.current;
+	if (!motionEvent) return e.state;
+	return motionEvent.getActionMasked?.() === (globalThis.android?.view?.MotionEvent?.ACTION_CANCEL ?? 3) ? 0 : e.state;
+}
 function usePan(cb) {
 	const velocityTracker = useRef(null, _h$0);
 	const handler = useCallback((e) => {
-		const state = PAN_STATE[e.state] ?? "moved";
-		const velocity = panVelocity(e, e.state, velocityTracker);
+		const nativeState = nativePanState(e);
+		const state = PAN_STATE[nativeState] ?? "moved";
+		const velocity = panVelocity(e, nativeState, velocityTracker);
 		cb?.({
 			x: e.deltaX,
 			y: e.deltaY,

package/dist/native/route-table.js

@@ -2,7 +2,22 @@
 var EXT = /\.(tsrx|tsx|ts|mts|cts|js|mjs|cjs|jsx)$/;
 var SUFFIX = /\.(web|mobile|ios|android|macos|windows|linux)$/;
 var PARAM = /^\[(.+)\]$/;
+/** Build-time loader modules — `docs.loader.ts` pairs with route `docs`
+*  for `dataMode: 'baked'`. Never a route itself, never in a runtime glob. */
+var LOADER_FILE = /\.loader\.(ts|mts|cts|js|mjs|cjs|jsx)$/;
 var PRESENT = /\+(modal|fade|push)$/;
+/** Loader for a `dataMode: 'baked'` route — resolves the name out of its
+*  owning manifest's `baked` map at push time. The map is assigned after
+*  the manifest is built (generated glue) or passed in (RouteSpecSet), so
+*  the lookup reads it lazily. A missing entry throws, landing as the
+*  screen's `error` prop like a live loader rejection. */
+function bakedLookup(manifest, name) {
+	return () => {
+		const baked = manifest()?.baked;
+		if (baked && Object.prototype.hasOwnProperty.call(baked, name)) return baked[name];
+		throw new Error(`[octane-xplat] baked route '${name}' has no baked data — run \`xplat routes\` to regenerate`);
+	};
+}
 /** Internal error carrier used by the public `redirect()` helper. Keeping
 * this in the shared route table gives both platform leaves the same guard
 * behavior without importing a platform runtime. */
@@ -35,7 +50,9 @@ function deriveRouteManifest(files, prefer, dir = "app") {
 	const layouts = {};
 	const loaders = {};
 	const warned = /* @__PURE__ */ new Set();
+	const self = {};
 	for (const key of Object.keys(files).sort()) {
+		if (LOADER_FILE.test(key)) continue;
 		let rel = key.replace(/^\.?\//, "");
 		if (rel.startsWith(prefix)) rel = rel.slice(prefix.length);
 		rel = rel.replace(EXT, "");
@@ -74,8 +91,13 @@ function deriveRouteManifest(files, prefer, dir = "app") {
 			file: key,
 			presentation
 		};
+		const dataMode = files[key]?.dataMode;
+		if (dataMode === "baked" || dataMode === "live") meta.dataMode = dataMode;
 		const loader = files[key]?.loader;
-		if (typeof loader === "function") meta.loader = loader;
+		if (meta.dataMode === "baked") {
+			meta.loader = bakedLookup(() => self.m, name);
+			if (typeof loader === "function") console.warn(`[octane-xplat] baked route '${name}' also exports a loader — move it to a .loader.ts sibling so its imports stay out of the bundle`);
+		} else if (typeof loader === "function") meta.loader = loader;
 		const beforeLoad = files[key]?.beforeLoad;
 		if (typeof beforeLoad === "function") meta.beforeLoad = beforeLoad;
 		if (files[key]?.head && (typeof files[key].head === "object" || typeof files[key].head === "function")) meta.head = files[key].head;
@@ -102,12 +124,14 @@ function deriveRouteManifest(files, prefer, dir = "app") {
 		if (meta.loader) loaders[meta.name] = meta.loader;
 	}
 	routes.sort(bySpecificity);
-	return {
+	const manifest = {
 		screens,
 		routes,
 		layouts,
 		loaders
 	};
+	self.m = manifest;
+	return manifest;
 }
 /** Match-order comparator: static segments (2) outrank params (1), ties
 *  break alphabetically so ordering is total and stable across merges. */
@@ -131,7 +155,12 @@ var mergeWarned = /* @__PURE__ */ new Set();
 *  from their own sources, e.g. `readdirSync` over a content dir). Each
 *  spec's `path` uses the route-dir vocabulary; `layouts` keys are path
 *  prefixes playing the `_layout` role. Same-name duplicates inside the
-*  set keep the later entry with a warn, matching merge precedence. */
+*  set keep the later entry with a warn, matching merge precedence.
+*
+*  The return is branded with the spec-derived route types — read them
+*  with `ManifestRouteParams`/`ManifestRouteNames`/
+*  `ManifestRoutePresentations` to merge programmatic names into the
+*  app's typed navigation surface (`RouteName | …`, `RouteParams & …`). */
 function defineRoutes(input) {
 	const set = Array.isArray(input) ? { routes: input } : input;
 	const specs = set.routes;
@@ -140,6 +169,7 @@ function defineRoutes(input) {
 	const layouts = {};
 	const metas = /* @__PURE__ */ new Map();
 	const warned = /* @__PURE__ */ new Set();
+	const self = {};
 	for (const [key, layout] of Object.entries(extra ?? {})) {
 		const dir = key.replace(/^\/+|\/+$/g, "");
 		if (dir !== key) console.warn(`[octane-xplat] layout key '${key}' normalized to '${dir}'`);
@@ -155,7 +185,11 @@ function defineRoutes(input) {
 			file: spec.source ?? `programmatic:${spec.path}`,
 			presentation: spec.presentation
 		};
-		if (spec.loader) meta.loader = spec.loader;
+		if (spec.dataMode) meta.dataMode = spec.dataMode;
+		if (spec.dataMode === "baked") {
+			meta.loader = bakedLookup(() => self.m, name);
+			if (spec.loader) console.warn(`[octane-xplat] baked route '${name}' also carries a loader — bake it in the host and pass the result via 'baked' so its code stays out of the bundle`);
+		} else if (spec.loader) meta.loader = spec.loader;
 		if (spec.beforeLoad) meta.beforeLoad = spec.beforeLoad;
 		if (spec.head) meta.head = spec.head;
 		if (metas.has(name) && !warned.has(name)) {
@@ -172,12 +206,15 @@ function defineRoutes(input) {
 	const routes = [...metas.values()].sort(bySpecificity);
 	const loaders = {};
 	for (const meta of routes) if (meta.loader) loaders[meta.name] = meta.loader;
-	return {
+	const manifest = {
 		screens,
 		routes,
 		layouts,
-		loaders
+		loaders,
+		baked: set.baked
 	};
+	self.m = manifest;
+	return manifest;
 }
 /** Compose manifests into one — file-derived base plus any number of
 *  programmatic sets (`registerRoutes(mergeRouteManifests(fromDir, dynamic))`).
@@ -188,9 +225,11 @@ function defineRoutes(input) {
 function mergeRouteManifests(...manifests) {
 	const screens = {};
 	const layouts = {};
+	const baked = {};
 	const winners = /* @__PURE__ */ new Map();
 	for (const m of manifests) {
 		Object.assign(layouts, m.layouts);
+		Object.assign(baked, m.baked);
 		Object.assign(screens, m.screens);
 		for (const meta of m.routes) {
 			const prev = winners.get(meta.name);
@@ -208,7 +247,38 @@ function mergeRouteManifests(...manifests) {
 		screens,
 		routes,
 		layouts,
-		loaders
+		loaders,
+		baked
+	};
+}
+/** Serialize a manifest to the normalized `RouteManifestJson` shape — the
+*  same list `xplat routes` emits for file routes, produced here for
+*  programmatic/merged manifests so hosts consume one schema. */
+function manifestToJson(manifest) {
+	return {
+		version: 1,
+		layouts: Object.keys(manifest.layouts).sort(),
+		screens: Object.keys(manifest.screens).sort(),
+		routes: manifest.routes.map((meta) => {
+			const segs = meta.name.split("/");
+			const layoutDirs = manifest.layouts[""] ? [""] : [];
+			for (let i = 1; i < segs.length; i++) {
+				const d = segs.slice(0, i).join("/");
+				if (manifest.layouts[d]) layoutDirs.push(d);
+			}
+			return {
+				name: meta.name,
+				path: meta.name === "index" ? "" : meta.segments.join("/"),
+				params: [...meta.params],
+				...meta.presentation ? { presentation: meta.presentation } : {},
+				...meta.dataMode ? { dataMode: meta.dataMode } : {},
+				layouts: layoutDirs,
+				source: meta.file,
+				loader: !!meta.loader,
+				guard: !!meta.beforeLoad,
+				head: !!meta.head
+			};
+		})
 	};
 }
 /** Match URL path segments against a manifest — returns the winning meta
@@ -309,9 +379,19 @@ function linkPath(url) {
 *  is the stack prefix ('/demos/demo/x' → stack 'demos'). Unmatched names
 *  fall through as literal routes for pre-manifest callers. */
 function matchUrl(routes, url) {
-	const [p, qs] = url.split("?");
+	url = url.split("#", 1)[0];
+	const at = url.indexOf("?");
+	const p = at === -1 ? url : url.slice(0, at);
+	const qs = at === -1 ? void 0 : url.slice(at + 1);
 	const segs = p.split("/").filter(Boolean);
-	const query = parseQueryString(qs);
+	let query;
+	try {
+		if (!decodeURIComponent(p)) return null;
+		query = parseQueryString(qs);
+	} catch (error) {
+		if (error instanceof URIError) return null;
+		throw error;
+	}
 	if (!segs.length) return null;
 	const finish = (stack, m, fallbackName) => ({
 		stack,
@@ -347,4 +427,4 @@ function layoutChain(layouts, name) {
 	return chain;
 }
 //#endregion
-export { RouteRedirect, buildRoutePath, defineRoutes, deriveRouteManifest, layoutChain, linkPath, matchRoute, matchUrl, mergeRouteManifests, parseQueryString };
+export { RouteRedirect, buildRoutePath, defineRoutes, deriveRouteManifest, layoutChain, linkPath, manifestToJson, matchRoute, matchUrl, mergeRouteManifests, parseQueryString };

package/dist/native/route.js

@@ -1,3 +1,4 @@
+import { createNavigationRequests } from "./navigation-request.js";
 import { getStack, onStackRegistered, stackEntries } from "./stacks.js";
 import { RouteRedirect, buildRoutePath, layoutChain, linkPath, matchUrl, mergeRouteManifests } from "./route-table.js";
 import { RouteHost } from "./RouteHost.mobile.tsrx.js";
@@ -23,6 +24,7 @@ import { hookSlots as hookSlots$1, useSyncExternalStore as useSyncExternalStore$
 *  - named stacks register via `TabSpec.stack` or `registerStack`.
 *  Every drop path warns loudly — silent no-ops are how apps ship a
 *  default route on native while working fine on web. */
+var navigationRequests = createNavigationRequests();
 var baseManifest = {
 	screens: {},
 	routes: [],
@@ -95,10 +97,11 @@ function warnOnce(key, msg) {
 /** Attach the route-store emission hook once per frame. `navigatedTo`
 *  fires on push AND on pop (the revealed page re-fires it), so one
 *  listener keeps every useRoute snapshot honest. */
-function trackFrame(frame) {
+function trackFrame(frame, stack) {
 	if (tracked.has(frame)) return;
 	tracked.add(frame);
-	frame.on("navigatedTo", () => {
+	frame.on("navigatedTo", (event) => {
+		if (event?.isBackNavigation) navigationRequests.invalidate(stack);
 		const page = frame.currentPage;
 		if (page && page.isLoaded === false) page.callLoaded?.();
 		emit();
@@ -106,7 +109,7 @@ function trackFrame(frame) {
 }
 function resolveStack(stack) {
 	const frame = getStack(stack);
-	if (frame) trackFrame(frame);
+	if (frame) trackFrame(frame, stack);
 	return frame;
 }
 /** TabViewItem-hosted frames report isLoaded=false after tab-selection
@@ -117,8 +120,8 @@ function resolveStack(stack) {
 function rearmFrameLoaded(frame) {
 	if (!frame.isLoaded) frame.callLoaded?.();
 }
-onStackRegistered((_name, frame) => {
-	trackFrame(frame);
+onStackRegistered((name, frame) => {
+	trackFrame(frame, name);
 	ensureBackWired();
 	emit();
 });
@@ -209,10 +212,12 @@ function headFor(r) {
 function contextFor(r) {
 	return r.context ?? {};
 }
-async function prepareRoute(r, redirects = 0) {
+async function prepareRoute(r, request, redirects = 0) {
+	if (!request.isCurrent()) return;
+	if (!request.claim(r.stack)) return;
 	const beforeLoad = metaFor(r.name)?.beforeLoad;
 	if (!beforeLoad) {
-		commitRoute(r);
+		commitRoute(r, request);
 		return;
 	}
 	if (redirects > 16) {
@@ -231,10 +236,11 @@ async function prepareRoute(r, redirects = 0) {
 		commitRoute({
 			...r,
 			context
-		});
+		}, request);
 	} catch (e) {
+		if (!request.isCurrent()) return;
 		if (e instanceof RouteRedirect) {
-			await prepareRoute(e.route, redirects + 1);
+			await prepareRoute(e.route, request, redirects + 1);
 			return;
 		}
 		console.warn(`[octane-xplat] beforeLoad('${r.name}') rejected: ${e?.message ?? e}`);
@@ -244,13 +250,15 @@ function redirect(r) {
 	throw new RouteRedirect(r);
 }
 function pushRoute(r) {
+	const request = navigationRequests.begin(r.stack);
 	if (metaFor(r.name)?.beforeLoad) {
-		prepareRoute(r);
+		prepareRoute(r, request);
 		return;
 	}
-	commitRoute(r);
+	commitRoute(r, request);
 }
-function commitRoute(r) {
+function commitRoute(r, request) {
+	if (!request.isCurrent()) return;
 	const C = screenFor(r.name);
 	if (!C) {
 		warnOnce("screen:" + r.name, `pushRoute('${r.name}') dropped — '${r.name}' isn't in the screen table. Call registerScreens({ ${r.name}: ... }) at boot.`);
@@ -262,10 +270,10 @@ function commitRoute(r) {
 		Promise.resolve().then(() => loader(r.params)).then((loaderData) => commitRoute({
 			...r,
 			loaderData
-		}), (loaderError) => commitRoute({
+		}, request), (loaderError) => commitRoute({
 			...r,
 			loaderError
-		}));
+		}, request));
 		return;
 	}
 	if (presentation === "modal") {
@@ -347,6 +355,7 @@ function pushModal(frame, r, C) {
 		const i = modalHosts.indexOf(entry);
 		if (i === -1) return;
 		modalHosts.splice(i, 1);
+		root.unmount?.();
 		emit();
 	};
 	const presenter = modalPresenter(frame);
@@ -380,7 +389,6 @@ function pushModal(frame, r, C) {
 		emit();
 	} catch (e) {
 		entry.dismiss();
-		root.unmount?.();
 		console.warn("[octane-xplat] modal pushRoute(" + r.name + ") threw: " + e?.message);
 	}
 }
@@ -389,8 +397,10 @@ function pushModal(frame, r, C) {
 *  where back at the app root is a no-op; loud only when the stack
 *  itself doesn't exist. */
 function popRoute(stack = "root") {
+	navigationRequests.invalidate(stack);
 	const modal = modalHosts[modalHosts.length - 1];
 	if (modal) {
+		navigationRequests.invalidate(modal.route.stack);
 		modal.dismiss();
 		modal.host.closeModal?.();
 		return;
@@ -456,7 +466,7 @@ function currentModalRoute() {
 *  `onDeepLink(pushDeepLink)` plus one `consumeInitialUrl()` call. */
 function pushDeepLink(url) {
 	const r = matchUrl(routes, linkPath(url));
-	if (!r) {
+	if (!r || !screenFor(r.name)) {
 		warnOnce("link:" + url, `pushDeepLink('${url}') dropped — no route matches.`);
 		return false;
 	}