@octane-xplat/ui 0.7.2 → 0.9.0

package/dist/web/modal-focus.web.js

@@ -0,0 +1,95 @@
+//#region src/modal-focus.web.ts
+var scopes = [];
+var originalInert = /* @__PURE__ */ new Map();
+var observer;
+function topScope() {
+	return scopes[scopes.length - 1];
+}
+function updateIsolation() {
+	const top = topScope();
+	if (!top) {
+		for (const [element, inert] of originalInert) if (!inert) element.removeAttribute("inert");
+		originalInert.clear();
+		return;
+	}
+	for (const element of Array.from(top.layer.ownerDocument.body.children)) {
+		if (!originalInert.has(element)) originalInert.set(element, element.hasAttribute("inert"));
+		const inert = originalInert.get(element) || !element.contains(top.layer);
+		element.toggleAttribute("inert", inert);
+	}
+}
+function tabStops(panel) {
+	return Array.from(panel.querySelectorAll("a[href],button,input,textarea,select,[tabindex],[contenteditable=\"true\"]")).filter((element) => {
+		if (element.tabIndex < 0 || element.matches(":disabled") || element.closest("[inert],[hidden]")) return false;
+		for (let parent = element; parent; parent = parent.parentElement) {
+			const style = getComputedStyle(parent);
+			if (style.display === "none" || style.visibility === "hidden") return false;
+		}
+		return true;
+	});
+}
+/** Own keyboard focus only for a modal body portal. Inert preserves the
+* background's state while hiding it from both focus and the browser AX tree. */
+function isolateModalFocus(layer, panel, dismiss) {
+	const document = layer.ownerDocument;
+	const scope = {
+		layer,
+		panel,
+		trigger: document.activeElement
+	};
+	const tabIndex = panel.getAttribute("tabindex");
+	if (tabIndex === null) panel.tabIndex = -1;
+	scopes.push(scope);
+	updateIsolation();
+	(tabStops(panel)[0] ?? panel).focus({ preventScroll: true });
+	if (!observer) {
+		observer = new MutationObserver(updateIsolation);
+		observer.observe(document.body, { childList: true });
+	}
+	const focusInside = () => (tabStops(panel)[0] ?? panel).focus({ preventScroll: true });
+	const onFocus = (event) => {
+		if (topScope() === scope && !panel.contains(event.target)) focusInside();
+	};
+	const onKey = (event) => {
+		if (topScope() !== scope || event.isComposing || event.keyCode === 229) return;
+		if (event.key === "Escape") {
+			event.preventDefault();
+			event.stopPropagation();
+			dismiss();
+		} else if (event.key === "Tab") {
+			const stops = tabStops(panel);
+			const index = stops.indexOf(document.activeElement);
+			if (!stops.length || index < 0 || (event.shiftKey ? index === 0 : index === stops.length - 1)) {
+				event.preventDefault();
+				(stops.length ? stops[event.shiftKey ? stops.length - 1 : 0] : panel).focus({ preventScroll: true });
+			}
+		}
+	};
+	document.addEventListener("focusin", onFocus);
+	document.addEventListener("keydown", onKey, true);
+	return () => {
+		const wasTop = topScope() === scope;
+		const index = scopes.indexOf(scope);
+		if (index < 0) return;
+		for (const other of scopes) if (other !== scope && other.trigger && scope.layer.contains(other.trigger)) other.trigger = scope.trigger;
+		scopes.splice(index, 1);
+		document.removeEventListener("focusin", onFocus);
+		document.removeEventListener("keydown", onKey, true);
+		if (tabIndex === null) panel.removeAttribute("tabindex");
+		updateIsolation();
+		if (!scopes.length) {
+			observer?.disconnect();
+			observer = void 0;
+		}
+		if (wasTop) {
+			const trigger = scope.trigger;
+			if (trigger?.isConnected && !trigger.closest("[inert]")) trigger.focus({ preventScroll: true });
+			else {
+				const remaining = topScope();
+				if (remaining) (tabStops(remaining.panel)[0] ?? remaining.panel).focus({ preventScroll: true });
+			}
+		}
+	};
+}
+//#endregion
+export { isolateModalFocus };

package/dist/web/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/web/octane-client-build.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "buildId": "b6a64d5b-cfff-418e-921b-443efbc3bad2",
+  "buildId": "ff3183ba-911e-4372-ad13-5b2ce15c5b1b",
   "mode": "production",
   "capabilities": {
     "independentHydration": false

package/dist/web/pan.web.tsrx.js

@@ -1,26 +1,43 @@
-import { hookSlots, useEffect } from "octane";
+import { hookSlots, useEffect, useRef } from "octane";
 //#region src/pan.web.tsrx
-var _h$0 = /* @__PURE__ */ Symbol(/* @__PURE__ */ hookSlots(1));
+var _hs$ = /* @__PURE__ */ hookSlots(2);
+var _h$0 = /* @__PURE__ */ Symbol(_hs$);
+var _h$1 = /* @__PURE__ */ Symbol(_hs$ + 1);
+var VELOCITY_MAX_AGE_MS = 100;
 function usePan(el, cb) {
+	const callback = useRef(cb, _h$0);
+	callback.current = cb;
+	const enabled = Boolean(cb);
 	useEffect(() => {
 		const node = el.current;
-		if (!node || !cb) return;
-		let sx = 0, sy = 0, active = false, last = 0, lx = 0, t0 = 0;
+		if (!node || !enabled) return;
+		let sx = 0, sy = 0, active = false;
+		let last = 0, lx = 0, t0 = 0;
+		let vx = 0, vy = 0, velocityAt = 0;
 		const emit = (e, state) => {
 			const now = performance.now();
 			const dt = Math.max(now - t0, 1) / 1e3;
-			const vx = (e.clientX - lx) / dt;
-			const vy = (e.clientY - last) / dt;
+			const dx = e.clientX - lx;
+			const dy = e.clientY - last;
+			if (state === "began") {
+				vx = vy = 0;
+				velocityAt = now;
+			} else if (dx !== 0 || dy !== 0) {
+				vx = dx / dt;
+				vy = dy / dt;
+				velocityAt = now;
+			}
 			lx = e.clientX;
 			last = e.clientY;
 			t0 = now;
-			cb({
+			const fresh = now - velocityAt <= VELOCITY_MAX_AGE_MS;
+			callback.current?.({
 				x: e.clientX - sx,
 				y: e.clientY - sy,
 				dx: e.clientX - sx,
 				dy: e.clientY - sy,
-				vx,
-				vy,
+				vx: fresh ? vx : 0,
+				vy: fresh ? vy : 0,
 				state,
 				target: node
 			});
@@ -60,7 +77,7 @@ function usePan(el, cb) {
 			node.removeEventListener("pointerup", up);
 			node.removeEventListener("pointercancel", cancel);
 		};
-	}, [el, cb], _h$0);
+	}, [el, enabled], _h$1);
 }
 //#endregion
 export { usePan };

package/dist/web/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/web/route.web.js

@@ -1,6 +1,8 @@
+import { createNavigationRequests } from "./navigation-request.js";
 import { RouteRedirect, buildRoutePath, layoutChain, linkPath, matchUrl, mergeRouteManifests } from "./route-table.js";
 import { hookSlots, useSyncExternalStore } from "octane";
 //#region src/route.web.ts
+var navigationRequests = createNavigationRequests();
 var baseManifest = {
 	screens: {},
 	routes: [],
@@ -18,7 +20,7 @@ function rebuildRegistry() {
 	routeLayouts = merged.layouts;
 	routeLoaders = merged.loaders ?? {};
 	if (current !== void 0) {
-		current = parse();
+		restoreRouteState();
 		emit();
 	}
 }
@@ -40,7 +42,8 @@ function registerScreens(table, manifest) {
 function registerRoutes(manifest) {
 	baseManifest = manifest;
 	rebuildRegistry();
-	applyHead(read());
+	read();
+	applyHead(modalRoute ?? current ?? null);
 }
 /** Layer a programmatic manifest (from `defineRoutes`) over the registered
 *  routes — same-name entries win over the base with a warn, so a host
@@ -49,7 +52,8 @@ function registerRoutes(manifest) {
 function addRoutes(manifest) {
 	dynamicManifests.push(manifest);
 	rebuildRegistry();
-	applyHead(read());
+	read();
+	applyHead(modalRoute ?? current ?? null);
 }
 function screenFor(name) {
 	return screens[name];
@@ -63,6 +67,53 @@ var listeners = /* @__PURE__ */ new Set();
 var current;
 var modalRoute = null;
 var historyDepth = history.state?.__octaneXplatDepth ?? 0;
+var historyRoutes = /* @__PURE__ */ new Map();
+var historyEntryPrefix = Math.random().toString(36).slice(2);
+var nextHistoryEntry = 0;
+function rememberRouteState(entry = historyEntryPrefix + ":" + ++nextHistoryEntry) {
+	historyRoutes.set(entry, {
+		current: current ?? null,
+		modal: modalRoute
+	});
+	return entry;
+}
+function restoreRouteState() {
+	const saved = historyRoutes.get(history.state?.__octaneXplatEntry);
+	if (saved) {
+		current = saved.current;
+		modalRoute = saved.modal;
+	} else {
+		const route = parse();
+		modalRoute = route?.presentation === "modal" ? route : null;
+		current = modalRoute ? null : route;
+		if (route) hydrateRoute(route);
+	}
+}
+function hydrateRoute(route) {
+	const loader = routeLoaders[route.name] ?? metaFor(route.name)?.loader;
+	if (!loader || Object.prototype.hasOwnProperty.call(route, "loaderData") || Object.prototype.hasOwnProperty.call(route, "loaderError")) return;
+	const finish = (result) => {
+		const prepared = {
+			...route,
+			...result
+		};
+		let changed = false;
+		if (current === route) {
+			current = prepared;
+			changed = true;
+		}
+		if (modalRoute === route) {
+			modalRoute = prepared;
+			changed = true;
+		}
+		for (const saved of historyRoutes.values()) {
+			if (saved.current === route) saved.current = prepared;
+			if (saved.modal === route) saved.modal = prepared;
+		}
+		if (changed) emit();
+	};
+	Promise.resolve().then(() => loader(route.params)).then((loaderData) => finish({ loaderData }), (loaderError) => finish({ loaderError }));
+}
 var ROUTE_HEAD_ATTR = "data-octane-xplat-route-head";
 var scrollPositions = /* @__PURE__ */ new Map();
 var lastKey = location.pathname + location.search;
@@ -76,8 +127,8 @@ function parse() {
 	return matchUrl(routes, location.pathname + location.search);
 }
 function read() {
-	if (current === void 0) current = parse();
-	return current;
+	if (current === void 0) restoreRouteState();
+	return current ?? null;
 }
 function emit() {
 	listeners.forEach((l) => l());
@@ -109,10 +160,11 @@ function applyHead(r) {
 function contextFor(r) {
 	return r.context ?? {};
 }
-async function prepareRoute(r, redirects = 0) {
+async function prepareRoute(r, request, redirects = 0) {
+	if (!request.isCurrent()) return;
 	const beforeLoad = metaFor(r.name)?.beforeLoad;
 	if (!beforeLoad) {
-		commitRoute(r);
+		commitRoute(r, request);
 		return;
 	}
 	if (redirects > 16) {
@@ -131,10 +183,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}`);
@@ -144,13 +197,15 @@ function redirect(r) {
 	throw new RouteRedirect(r);
 }
 function pushRoute(r) {
+	const request = navigationRequests.begin("history");
 	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 route = {
 		...r,
 		presentation: r.presentation ?? presentationFor(r.name)
@@ -160,21 +215,30 @@ function commitRoute(r) {
 		Promise.resolve().then(() => loader(route.params)).then((loaderData) => commitRoute({
 			...route,
 			loaderData
-		}), (loaderError) => commitRoute({
+		}, request), (loaderError) => commitRoute({
 			...route,
 			loaderError
-		}));
+		}, request));
 		return;
 	}
 	saveScroll();
+	read();
+	history.replaceState({
+		...history.state,
+		__octaneXplatDepth: historyDepth,
+		__octaneXplatEntry: rememberRouteState(history.state?.__octaneXplatEntry)
+	}, "");
 	historyDepth += 1;
-	history.pushState({ __octaneXplatDepth: historyDepth }, "", buildRoutePath(routes, route));
-	lastKey = scrollKey();
 	if (route.presentation === "modal") modalRoute = route;
 	else {
 		current = route;
 		modalRoute = null;
 	}
+	history.pushState({
+		__octaneXplatDepth: historyDepth,
+		__octaneXplatEntry: rememberRouteState()
+	}, "", buildRoutePath(routes, route));
+	lastKey = scrollKey();
 	applyHead(modalRoute ?? current ?? null);
 	emit();
 }
@@ -185,6 +249,7 @@ function presentationFor(name) {
 *  per-stack pops aren't expressible, so `stack` is accepted for parity
 *  and ignored. A pushed modal is the top entry, so back dismisses it. */
 function popRoute(_stack = "root") {
+	navigationRequests.invalidate("history");
 	history.back();
 }
 var backInterceptorWarned = false;
@@ -200,12 +265,12 @@ function addBackInterceptor(_fn) {
 	return () => {};
 }
 window.addEventListener("popstate", () => {
+	navigationRequests.invalidate("history");
 	saveScroll();
 	historyDepth = history.state?.__octaneXplatDepth ?? 0;
 	lastKey = scrollKey();
-	modalRoute = null;
-	current = parse();
-	applyHead(current);
+	restoreRouteState();
+	applyHead(modalRoute ?? current ?? null);
 	restoreScroll();
 	emit();
 });
@@ -225,6 +290,7 @@ function currentRoute() {
 }
 /** The modal route overlaying the current one, if any. */
 function currentModalRoute() {
+	read();
 	return modalRoute;
 }
 /** Deep-link entry, web half — the URL *is* the route state, so this is a
@@ -232,7 +298,7 @@ function currentModalRoute() {
 *  apps wire `onDeepLink(pushDeepLink)`). */
 function pushDeepLink(url) {
 	const r = matchUrl(routes, linkPath(url));
-	if (!r) {
+	if (!r || !screenFor(r.name)) {
 		console.warn(`[octane-xplat] pushDeepLink('${url}') dropped — no route matches.`);
 		return false;
 	}
@@ -252,8 +318,8 @@ function useRoute(stack) {
 /** Whether the selected conceptual stack has an in-app route to pop. A
 * browser's pre-app history is intentionally not counted. */
 function canGoBack(stack = "root") {
-	const route = read();
-	return historyDepth > 0 && route?.stack === stack;
+	read();
+	return historyDepth > 0 && (modalRoute ?? current)?.stack === stack;
 }
 function useCanGoBack(stack = "root") {
 	return useSyncExternalStore((cb) => {

package/dist/web/sheet-service.web.js

@@ -1,4 +1,5 @@
 import { applyThemeClasses } from "./theme/theme-scheme.js";
+import { isolateModalFocus } from "./modal-focus.web.js";
 import { attachSheetDetents } from "./sheet-detents.web.js";
 import { createRoot } from "octane";
 //#region src/sheet-service.web.ts
@@ -16,10 +17,12 @@ var openSheet = (Component, params, options = {}) => new Promise((resolve) => {
 	panel.className = "vx-sheet";
 	if (options.detents?.length) panel.classList.add("vx-sheet-detents");
 	let finished = false;
+	let releaseFocus;
 	const finish = (result) => {
 		if (finished) return;
 		finished = true;
 		active.delete(entry);
+		releaseFocus?.();
 		unbindTheme();
 		detents?.detach();
 		root.unmount();
@@ -45,6 +48,11 @@ var openSheet = (Component, params, options = {}) => new Promise((resolve) => {
 		close: finish
 	});
 	active.add(entry);
+	if (options.shadeCover ?? true) {
+		panel.setAttribute("role", "dialog");
+		panel.setAttribute("aria-modal", "true");
+		releaseFocus = isolateModalFocus(layer, panel, () => finish());
+	}
 });
 //#endregion
 export { closeSheet, openSheet };