@octane-xplat/ui 0.3.0 → 0.4.0

package/dist/native/ui4.js

@@ -1,22 +1,24 @@
-//#region src/layout-child.native.ts
-/** NativeScript reads these attributes from each child view during parent
-*  layout. Values are forwarded with NativeScript's own property names. */
-function layoutChildProps(props) {
-	const result = {};
-	for (const key of [
-		"row",
-		"col",
-		"rowSpan",
-		"colSpan",
-		"dock",
-		"left",
-		"top",
-		"flexGrow",
-		"flexShrink",
-		"alignSelf",
-		"order"
-	]) if (props[key] !== void 0) result[key] = props[key];
-	return result;
+//#region src/glass.ts
+/** Normalize the `glass` surface prop into the config object handed to
+*  `iosGlassEffect` on native. Always returns an object — the upstream
+*  string shorthand silently drops `interactive` on the layout's update
+*  path, and an empty config defaults the variant to 'regular' here rather
+*  than upstream's own fallback. `false`/'none'/'identity' → no glass. */
+function glassConfigOf(glass) {
+	if (!glass || glass === "none" || glass === "identity") return;
+	const c = typeof glass === "string" ? { variant: glass } : glass === true ? {} : glass;
+	if (c.variant === "none" || c.variant === "identity") return;
+	return {
+		variant: "regular",
+		...c
+	};
+}
+/** `vx-glass` classes shared by web (real styling) and native (hook for
+*  app-supplied fallback CSS on non-glass OSes). */
+function glassClassOf(glass) {
+	const c = glassConfigOf(glass);
+	if (!c) return;
+	return c.variant === "clear" ? "vx-glass vx-glass--clear" : "vx-glass";
 }
 //#endregion
-export { layoutChildProps };
+export { glassClassOf, glassConfigOf };

package/dist/native/ui40.js

@@ -1,14 +1,58 @@
-import { cx } from "./ui2.js";
-import { defineUniversalComponent, universalPlan, universalValue } from "@nativescript-community/octane";
-//#region src/PlatformBadge.native.tsrx
-var __octaneUniversalPlan0 = universalPlan("nativescript", {
-	"kind": "host",
-	"type": "label",
-	"props": { "text": "ios|android" },
-	"bindings": [["className", 0]]
-});
-var PlatformBadge = defineUniversalComponent("nativescript", function PlatformBadge(props) {
-	return universalValue(__octaneUniversalPlan0, [cx(props.className)]);
-}, { "module": "@nativescript-community/octane" });
+import { hookSlots, useRef } from "@nativescript-community/octane";
+import { cancelAnimationFrame, requestAnimationFrame } from "@nativescript/core/animation-frame";
+//#region src/anim.native.tsrx
+var _h$0 = /* @__PURE__ */ Symbol(/* @__PURE__ */ hookSlots(1));
+function createAnimated(initial, prop) {
+	let view = null;
+	let current = initial;
+	let raf = 0;
+	const apply = (v) => {
+		current = v;
+		if (view) view[prop] = v;
+	};
+	const run = (step) => {
+		cancelAnimationFrame(raf);
+		const start = Date.now();
+		const tick = () => {
+			const v = step(Date.now() - start);
+			if (v === null) return;
+			apply(v);
+			raf = requestAnimationFrame(tick);
+		};
+		raf = requestAnimationFrame(tick);
+	};
+	return {
+		get value() {
+			return current;
+		},
+		bind(v) {
+			view = v;
+			if (view) view[prop] = current;
+		},
+		to(target, opts) {
+			const dur = opts?.duration ?? 300;
+			const from = current;
+			run((t) => t >= dur ? (apply(target), null) : from + (target - from) * (t / dur));
+		},
+		spring(target, opts) {
+			const damping = opts?.damping ?? 14, stiffness = opts?.stiffness ?? 120;
+			let v = 0, x = current;
+			run(() => {
+				const dt = 1 / 60;
+				v += (-stiffness * (x - target) - damping * v) * dt;
+				x += v * dt;
+				return Math.abs(v) < .5 && Math.abs(x - target) < .5 ? (apply(target), null) : x;
+			});
+		},
+		stop() {
+			cancelAnimationFrame(raf);
+		}
+	};
+}
+function useAnimation(initial = 0, prop = "translateX") {
+	const c = useRef(null, _h$0);
+	if (!c.current) c.current = createAnimated(initial, prop);
+	return c.current;
+}
 //#endregion
-export { PlatformBadge };
+export { useAnimation };

package/dist/native/ui41.js

@@ -1,104 +1,19 @@
-//#region src/route-table.ts
-var EXT = /\.(tsrx|tsx|ts|mts|cts|js|mjs|cjs|jsx)$/;
-var SUFFIX = /\.(web|native|ios|android)$/;
-var PARAM = /^\[(.+)\]$/;
-/** Component pick rule for route/layout modules: default export, then a
-*  `screen` named export, then a single function export. Route files use
-*  named exports (decision #13) — a lone component is unambiguous. */
-function pick(mod, file) {
-	if (typeof mod?.default === "function") return mod.default;
-	if (typeof mod?.screen === "function") return mod.screen;
-	const fns = Object.keys(mod ?? {}).filter((k) => typeof mod[k] === "function");
-	if (fns.length === 1) return mod[fns[0]];
-	console.warn("[octane-xplat] route file " + file + (fns.length ? ` has ${fns.length} component-shaped exports (${fns.join(", ")}) — add a default or 'screen' export` : " has no component export") + " — skipped");
-}
-function deriveRouteManifest(files, prefer, dir = "app") {
-	const prefix = dir.replace(/^\.?\/?/, "").replace(/\/+$/, "") + "/";
-	const seen = /* @__PURE__ */ new Map();
-	const layoutRank = /* @__PURE__ */ new Map();
-	const layouts = {};
-	const warned = /* @__PURE__ */ new Set();
-	for (const key of Object.keys(files).sort()) {
-		let rel = key.replace(/^\.?\//, "");
-		if (rel.startsWith(prefix)) rel = rel.slice(prefix.length);
-		rel = rel.replace(EXT, "");
-		const parts = rel.split("/");
-		let base = parts[parts.length - 1];
-		const sm = SUFFIX.exec(base);
-		const suffix = sm?.[1];
-		if (sm) base = base.slice(0, base.length - sm[0].length);
-		if (suffix && !prefer.includes(suffix)) continue;
-		const rank = suffix ? prefer.indexOf(suffix) : prefer.length;
-		if (base === "_layout") {
-			const d = parts.slice(0, -1).join("/");
-			const prev = layoutRank.get(d);
-			if (prev !== void 0 && prev <= rank) continue;
-			const component = pick(files[key], key);
-			if (component) {
-				layouts[d] = component;
-				layoutRank.set(d, rank);
-			}
-			continue;
-		}
-		const segs = parts.slice(0, -1).concat(base);
-		if (segs[segs.length - 1] === "index") segs.pop();
-		const segments = segs.map((s) => {
-			const p = PARAM.exec(s);
-			return p ? ":" + p[1] : s;
-		});
-		const name = segments.join("/") || "index";
-		const meta = {
-			name,
-			segments,
-			params: segments.filter((s) => s.startsWith(":")).map((s) => s.slice(1)),
-			file: key
-		};
-		const prev = seen.get(name);
-		if (prev && prev.rank <= rank) {
-			if (prev.rank === rank && !warned.has(name)) {
-				warned.add(name);
-				console.warn(`[octane-xplat] route '${name}' is defined by both ${prev.meta.file} and ${key} — keeping ${prev.meta.file}`);
-			}
-			continue;
+import "@nativescript-community/octane";
+import { defineUniversalComponent as defineUniversalComponent$1, universalComponent as universalComponent$1 } from "octane/universal/native";
+//#region src/styled.native.tsrx
+function styled(Base, def) {
+	function Styled(props) {
+		const cls = [def.base];
+		const rest = { ...props };
+		for (const k of Object.keys(def.variants ?? {})) {
+			if (props[k]) cls.push(def.variants[k]);
+			delete rest[k];
 		}
-		const component = pick(files[key], key);
-		if (component) seen.set(name, {
-			rank,
-			meta,
-			component
-		});
+		if (props.className) cls.push(props.className);
+		rest.className = cls;
+		return universalComponent$1("nativescript", Base, rest);
 	}
-	const screens = {};
-	const routes = [];
-	for (const { meta, component } of seen.values()) {
-		screens[meta.name] = component;
-		routes.push(meta);
-	}
-	routes.sort((a, b) => b.segments.reduce((n, s) => n + (s.startsWith(":") ? 1 : 2), 0) - a.segments.reduce((n, s) => n + (s.startsWith(":") ? 1 : 2), 0) || a.name.localeCompare(b.name));
-	return {
-		screens,
-		routes,
-		layouts
-	};
-}
-/** Serialize a Route to a URL path (no origin): manifest routes substitute
-*  `:param` segments from params (leftover params → query string);
-*  non-manifest names keep the legacy `/<stack>/<name>?params` shape. */
-function buildRoutePath(routes, r) {
-	const meta = routes.find((m) => m.name === r.name);
-	let segs;
-	let rest = r.params;
-	if (meta) {
-		segs = meta.segments.map((s) => {
-			if (!s.startsWith(":")) return s;
-			const v = r.params[s.slice(1)];
-			if (v === void 0) console.warn(`[octane-xplat] route '${r.name}' pushed without path param ${s}`);
-			return encodeURIComponent(String(v ?? ""));
-		});
-		rest = Object.fromEntries(Object.entries(r.params).filter(([k]) => !meta.params.includes(k)));
-	} else segs = [r.name];
-	const q = Object.entries(rest).map(([k, v]) => encodeURIComponent(k) + "=" + encodeURIComponent(String(v))).join("&");
-	return (((r.stack === "root" ? "" : "/" + r.stack) + "/" + segs.join("/")).replace(/\/+$/, "") || "/") + (q ? "?" + q : "");
+	return defineUniversalComponent$1("nativescript", Styled);
 }
 //#endregion
-export { buildRoutePath, deriveRouteManifest };
+export { styled };

package/dist/native/ui42.js

@@ -1,148 +1,8 @@
-import { getStack, onStackRegistered, stackEntries } from "./ui27.js";
-import { buildRoutePath } from "./ui41.js";
-import { createNativeScriptRoot } from "@nativescript-community/octane";
-import { Application, GridLayout, Page } from "@nativescript/core";
-import { hookSlots as hookSlots$1, useSyncExternalStore as useSyncExternalStore$1 } from "octane";
-//#region src/route.native.ts
-/** Native twin of route.web — same Route contract over Frame/Page stacks.
-*  `pushRoute` resolves a stack ('root' = the app's root Frame — an
-*  explicit registerStack('root') or, by default, the Frame returned by
-*  Application.getRootView(); named stacks come from TabSpec.stack panes
-*  or registerStack) and pushes a Page hosting the registered screen —
-*  each pushed Page is its own Octane root (decision #9: pages never
-*  share context with their presenter). Params land as props; named-stack
-*  pushes get `_stack` injected so the screen can popRoute its own stack.
-*
-*  Registration contract (the footgun this module exists to defuse):
-*  - `registerScreens(table)` once — pushRoute resolves `name` through it.
-*  - 'root' needs nothing when the app boots a Frame as its root view
-*    (the standard shape); non-Frame roots can't host pushes at all.
-*  - 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 screens = {};
-var routes = [];
-/** Register the app's name → screen table (call once, from the shared
-*  routes module). Native `pushRoute` resolves `route.name` through it;
-*  on web the table feeds `screenFor` for outlets without a
-*  `resolveScreen` prop. `manifest` (from deriveRouteManifest) is stored
-*  for parity — the web leaf matches URLs through it; native navigation
-*  is name+params and only needs the table. */
-function registerScreens(table, manifest) {
-	screens = table;
-	routes = manifest ?? [];
+import { Application } from "@nativescript/core";
+//#region src/windows.native.ts
+/** Open another NativeScript window and pass app-owned data to its resolver. */
+function openWindow(options = {}) {
+	Application.openWindow(options);
 }
-/** One-call registration for route-dir apps — screens + URL patterns +
-*  layouts all come from deriveRouteManifest. */
-function registerRoutes(manifest) {
-	registerScreens(manifest.screens, manifest.routes);
-}
-function screenFor(name) {
-	return screens[name];
-}
-var tracked = /* @__PURE__ */ new WeakSet();
-var listeners = /* @__PURE__ */ new Set();
-var pageRoutes = /* @__PURE__ */ new WeakMap();
-var warned = /* @__PURE__ */ new Set();
-function emit() {
-	listeners.forEach((l) => l());
-}
-function warnOnce(key, msg) {
-	if (warned.has(key)) return;
-	warned.add(key);
-	console.warn("[octane-xplat] " + 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) {
-	if (tracked.has(frame)) return;
-	tracked.add(frame);
-	frame.on("navigatedTo", emit);
-}
-function resolveStack(stack) {
-	const frame = getStack(stack);
-	if (frame) trackFrame(frame);
-	return frame;
-}
-onStackRegistered((_name, frame) => {
-	trackFrame(frame);
-	emit();
-});
-function pushRoute(r) {
-	const frame = resolveStack(r.stack);
-	if (!frame) {
-		warnOnce("stack:" + r.stack, r.stack === "root" ? `pushRoute('${r.name}') dropped — no root Frame. Boot with a Frame as the app root (Application.run create() returning new Frame) or call registerStack('root', frame).` : `pushRoute('${r.name}') dropped — no stack '${r.stack}' is registered. Named stacks come from TabSpec.stack on <Tabs> or registerStack('${r.stack}', frame).`);
-		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.`);
-		return;
-	}
-	if (Application.android && r.stack !== "root") warnOnce("android:" + r.stack, `pushRoute into named stack '${r.stack}' on Android — upstream #11444: the page mounts but currentPage/backStack/goBack never land (pages accumulate). Named-stack pushes are iOS-only until fixed.`);
-	if (!frame.isLoaded) frame.callLoaded?.();
-	const props = r.stack === "root" ? r.params : {
-		...r.params,
-		_stack: r.stack
-	};
-	try {
-		frame.navigate({ create: () => {
-			const page = new Page();
-			page.id = r.name + "-page";
-			page.actionBarHidden = true;
-			pageRoutes.set(page, r);
-			const host = new GridLayout();
-			page.content = host;
-			createNativeScriptRoot(host).render(C, props);
-			return page;
-		} });
-	} catch (e) {
-		console.warn("[octane-xplat] pushRoute(" + r.name + ") threw: " + e?.message);
-	}
-}
-/** Pop the top page of a stack ('root' default). Quiet no-op at the base
-*  page — matching web, where back at the app root is a no-op; loud only
-*  when the stack itself doesn't exist. */
-function popRoute(stack = "root") {
-	const frame = resolveStack(stack);
-	if (!frame) {
-		warnOnce("pop:" + stack, `popRoute('${stack}') dropped — no such stack is registered.`);
-		return;
-	}
-	frame.goBack();
-}
-/** Route stamped on a stack's current page, or null at its base page. */
-function routeFor(stack) {
-	const page = resolveStack(stack)?.currentPage;
-	return (page && pageRoutes.get(page)) ?? null;
-}
-/** The top route across stacks — root's current route wins (a root push
-*  covers the shell); otherwise the most recently registered named stack
-*  showing a pushed page. Native has no boot URL, so this is an
-*  approximation of web's "current URL route", not a deep link. */
-function currentRoute() {
-	const root = routeFor("root");
-	if (root) return root;
-	const named = [...stackEntries()].reverse();
-	for (const [name] of named) {
-		const r = routeFor(name);
-		if (r) return r;
-	}
-	return null;
-}
-/** Path-string parity for the web leaf's hrefFor — a canonical
-*  /<stack>/<path> rendering of the route (deep-linking consumes it
-*  there). Native navigation itself is name+params, not URLs. */
-function hrefFor(r) {
-	return buildRoutePath(routes, r);
-}
-function useRoute(stack) {
-	return useSyncExternalStore$1((cb) => {
-		listeners.add(cb);
-		return () => listeners.delete(cb);
-	}, () => routeFor(stack), _h$0);
-}
-var _h$0 = /* @__PURE__ */ Symbol(/* @__PURE__ */ hookSlots$1(1));
 //#endregion
-export { currentRoute, hrefFor, popRoute, pushRoute, registerRoutes, registerScreens, routeFor, screenFor, useRoute };
+export { openWindow };

package/dist/native/ui43.js

@@ -1,22 +1,38 @@
-//#region src/store.ts
-function createStore(initial) {
-	let value = initial;
-	const listeners = /* @__PURE__ */ new Set();
-	return {
-		get: () => value,
-		set(next) {
-			const v = typeof next === "function" ? next(value) : next;
-			if (Object.is(v, value)) return;
-			value = v;
-			for (const l of [...listeners]) l();
-		},
-		subscribe(notify) {
-			listeners.add(notify);
-			return () => {
-				listeners.delete(notify);
-			};
-		}
-	};
-}
+import { cx } from "./ui2.js";
+import { applyEscapeProps } from "./ui3.js";
+import { registerRootLayout, unregisterRootLayout } from "./ui34.js";
+import { defineUniversalComponent, universalPlan, universalValue } from "@nativescript-community/octane";
+//#region src/Screen.native.tsrx
+var __octaneUniversalPlan0 = universalPlan("nativescript", {
+	"kind": "host",
+	"type": "rootlayout",
+	"bindings": [
+		["id", 0],
+		["ref", 1],
+		["onLoaded", 2],
+		["onUnloaded", 3]
+	],
+	"children": [{
+		"kind": "host",
+		"type": "flexboxlayout",
+		"props": { "flexDirection": "column" },
+		"bindings": [["className", 4], ["style", 5]],
+		"children": [{
+			"kind": "slot",
+			"slot": 6
+		}]
+	}]
+});
+var Screen = defineUniversalComponent("nativescript", function Screen(props) {
+	return universalValue(__octaneUniversalPlan0, [
+		props.id,
+		(v) => applyEscapeProps(v, props),
+		(e) => registerRootLayout(e.object),
+		(e) => unregisterRootLayout(e.object),
+		cx(props.className),
+		props.style,
+		props.children
+	]);
+}, { "module": "@nativescript-community/octane" });
 //#endregion
-export { createStore };
+export { Screen };