@octane-xplat/ui 0.7.2 → 0.9.0

package/src/route.ts

@@ -15,6 +15,7 @@
  *  Every drop path warns loudly — silent no-ops are how apps ship a
  *  default route on native while working fine on web. */
 
+import { createNavigationRequests, type NavigationRequest } from './navigation-request'
 import { Application, Frame, GridLayout, Page } from '@nativescript/core'
 import { createNativeScriptRoot } from '@nativescript-community/octane'
 import type { UniversalComponent } from 'octane/universal/native'
@@ -38,6 +39,8 @@ export type { Route } from './props'
 
 // ---------- screen registry ----------
 
+const navigationRequests = createNavigationRequests()
+
 // Effective tables = the file-derived base manifest merged under every
 // addRoutes layer. Keeping the split means an HMR re-run of routes.gen.*
 // (registerRoutes again) can't wipe routes an app added at runtime.
@@ -120,13 +123,17 @@ function warnOnce(key: string, msg: string): void {
 /** 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: Frame): void {
+function trackFrame(frame: Frame, stack: string): void {
 	if (tracked.has(frame)) {
 		return
 	}
 
 	tracked.add(frame)
-	frame.on('navigatedTo', () => {
+	frame.on('navigatedTo', (event) => {
+		if ((event as typeof event & { isBackNavigation?: boolean })?.isBackNavigation) {
+			navigationRequests.invalidate(stack)
+		}
+
 		// A page re-shown by pop can stay unloaded when the frame's nav
 		// bookkeeping stalls mid-transition (the iOS strand of #11444 — the
 		// same hole the isLoaded/callLoaded workaround in commitRoute covers
@@ -146,7 +153,7 @@ function trackFrame(frame: Frame): void {
 function resolveStack(stack: string): Frame | undefined {
 	const frame = getStack(stack)
 	if (frame) {
-		trackFrame(frame)
+		trackFrame(frame, stack)
 	}
 
 	return frame
@@ -163,8 +170,8 @@ function rearmFrameLoaded(frame: Frame): void {
 	}
 }
 
-onStackRegistered((_name, frame) => {
-	trackFrame(frame)
+onStackRegistered((name, frame) => {
+	trackFrame(frame, name)
 	ensureBackWired()
 	emit()
 })
@@ -273,11 +280,12 @@ function ensureBackWired(): void {
 	}
 
 	app.__octaneXplatBackWired = true
-	Application.android.on(Application.AndroidApplication.activityBackPressedEvent, (e: {
-		cancel: boolean
-	}) => {
-		app.__octaneXplatBackPress?.(e)
-	})
+	Application.android.on(
+		Application.AndroidApplication.activityBackPressedEvent,
+		(e: { cancel: boolean }) => {
+			app.__octaneXplatBackPress?.(e)
+		},
+	)
 }
 
 function presentationFor(name: string): Route['presentation'] {
@@ -299,10 +307,18 @@ function contextFor(r: Route): Record<string, unknown> {
 	return r.context ?? {}
 }
 
-async function prepareRoute(r: Route, redirects = 0): Promise<void> {
+async function prepareRoute(r: Route, request: NavigationRequest, redirects = 0): Promise<void> {
+	if (!request.isCurrent()) {
+		return
+	}
+
+	if (!request.claim(r.stack)) {
+		return
+	}
+
 	const beforeLoad = metaFor(r.name)?.beforeLoad
 	if (!beforeLoad) {
-		commitRoute(r)
+		commitRoute(r, request)
 		return
 	}
 
@@ -314,13 +330,20 @@ async function prepareRoute(r: Route, redirects = 0): Promise<void> {
 	try {
 		const returned = await beforeLoad({ params: r.params, context: contextFor(r) })
 		const context = returned ? { ...contextFor(r), ...returned } : contextFor(r)
-		commitRoute({
-			...r,
-			context,
-		})
+		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
 		}
 
@@ -333,15 +356,20 @@ export function redirect(r: Route): never {
 }
 
 export function pushRoute(r: Route): void {
+	const request = navigationRequests.begin(r.stack)
 	if (metaFor(r.name)?.beforeLoad) {
-		void prepareRoute(r)
+		void prepareRoute(r, request)
 		return
 	}
 
-	commitRoute(r)
+	commitRoute(r, request)
 }
 
-function commitRoute(r: Route): void {
+function commitRoute(r: Route, request: NavigationRequest): void {
+	if (!request.isCurrent()) {
+		return
+	}
+
 	const C = screenFor(r.name)
 	if (!C) {
 		warnOnce(
@@ -362,8 +390,8 @@ function commitRoute(r: Route): void {
 		void Promise.resolve()
 			.then(() => loader(r.params))
 			.then(
-				(loaderData) => commitRoute({ ...r, loaderData }),
-				(loaderError) => commitRoute({ ...r, loaderError }),
+				(loaderData) => commitRoute({ ...r, loaderData }, request),
+				(loaderError) => commitRoute({ ...r, loaderError }, request),
 			)
 
 		return
@@ -484,6 +512,7 @@ function pushModal(frame: Frame, r: Route, C: any): void {
 		}
 
 		modalHosts.splice(i, 1)
+		root.unmount?.()
 		emit()
 	}
 
@@ -532,7 +561,6 @@ function pushModal(frame: Frame, r: Route, C: any): void {
 		emit()
 	} catch (e) {
 		entry.dismiss()
-		root.unmount?.()
 		console.warn('[octane-xplat] modal pushRoute(' + r.name + ') threw: ' + (e as Error)?.message)
 	}
 }
@@ -542,8 +570,10 @@ function pushModal(frame: Frame, r: Route, C: any): void {
  *  where back at the app root is a no-op; loud only when the stack
  *  itself doesn't exist. */
 export function popRoute(stack = 'root'): void {
+	navigationRequests.invalidate(stack)
 	const modal = modalHosts[modalHosts.length - 1]
 	if (modal) {
+		navigationRequests.invalidate(modal.route.stack)
 		// Bookkeeping first: iOS drops dismissViewController completions
 		// that race a still-in-flight presentation, so the NS closeCallback
 		// isn't guaranteed to run — the route store can't gate on it.
@@ -639,7 +669,7 @@ export function currentModalRoute(): Route | null {
  *  `onDeepLink(pushDeepLink)` plus one `consumeInitialUrl()` call. */
 export function pushDeepLink(url: string): boolean {
 	const r = matchUrl(routes, linkPath(url))
-	if (!r) {
+	if (!r || !screenFor(r.name)) {
 		warnOnce('link:' + url, `pushDeepLink('${url}') dropped — no route matches.`)
 		return false
 	}

package/src/route.web.ts

@@ -1,3 +1,4 @@
+import { createNavigationRequests, type NavigationRequest } from './navigation-request'
 import { useSyncExternalStore } from 'octane'
 
 /** Web route store — the browser half of the nav contract. One linear URL
@@ -27,6 +28,8 @@ import {
 
 // ---------- screen registry ----------
 
+const navigationRequests = createNavigationRequests()
+
 // Effective tables = the file-derived base manifest merged under every
 // addRoutes layer. Keeping the split means an HMR re-run of routes.gen.*
 // (registerRoutes again) can't wipe routes an app added at runtime.
@@ -46,7 +49,7 @@ function rebuildRegistry(): void {
 	// Registration can land after the first lazy parse (deep link read
 	// before the routes module ran) — re-parse with patterns present.
 	if (current !== undefined) {
-		current = parse()
+		restoreRouteState()
 		emit()
 	}
 }
@@ -66,7 +69,8 @@ export function registerScreens(table: ScreenTable, manifest?: RouteMeta[]): voi
 export function registerRoutes(manifest: RouteManifest): void {
 	baseManifest = manifest
 	rebuildRegistry()
-	applyHead(read())
+	read()
+	applyHead(modalRoute ?? current ?? null)
 }
 
 /** Layer a programmatic manifest (from `defineRoutes`) over the registered
@@ -76,7 +80,8 @@ export function registerRoutes(manifest: RouteManifest): void {
 export function addRoutes(manifest: RouteManifest): void {
 	dynamicManifests.push(manifest)
 	rebuildRegistry()
-	applyHead(read())
+	read()
+	applyHead(modalRoute ?? current ?? null)
 }
 
 export function screenFor(name: string): ScreenTable[string] | undefined {
@@ -100,6 +105,82 @@ let current: Route | null | undefined
 let modalRoute: Route | null = null
 let historyDepth = history.state?.__octaneXplatDepth ?? 0
 
+// History stores an identity rather than loader results: loaders may return
+// values that structured clone cannot serialize. Retain the prepared route
+// for this document's back/forward traversal; fresh boots still parse the URL.
+const historyRoutes = new Map<string, { current: Route | null; modal: Route | null }>()
+const historyEntryPrefix = Math.random().toString(36).slice(2)
+let nextHistoryEntry = 0
+
+function rememberRouteState(entry = historyEntryPrefix + ':' + ++nextHistoryEntry): string {
+	historyRoutes.set(entry, { current: current ?? null, modal: modalRoute })
+	return entry
+}
+
+function restoreRouteState(): void {
+	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)
+		}
+	}
+}
+
+// Direct URLs and history entries from a previous document have no prepared
+// loader result. Run their loader without pushing another history entry or
+// changing the documented bootstrap guard boundary.
+function hydrateRoute(route: Route): void {
+	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: Pick<Route, 'loaderData' | 'loaderError'>) => {
+		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()
+		}
+	}
+
+	void Promise.resolve()
+		.then(() => loader(route.params))
+		.then(
+			(loaderData) => finish({ loaderData }),
+			(loaderError) => finish({ loaderError }),
+		)
+}
+
 const ROUTE_HEAD_ATTR = 'data-octane-xplat-route-head'
 
 // Scroll positions keyed by URL — restored on popstate (native keeps
@@ -123,10 +204,10 @@ function parse(): Route | null {
 
 function read(): Route | null {
 	if (current === undefined) {
-		current = parse()
+		restoreRouteState()
 	}
 
-	return current
+	return current ?? null
 }
 
 function emit() {
@@ -171,10 +252,14 @@ function contextFor(r: Route): Record<string, unknown> {
 	return r.context ?? {}
 }
 
-async function prepareRoute(r: Route, redirects = 0): Promise<void> {
+async function prepareRoute(r: Route, request: NavigationRequest, redirects = 0): Promise<void> {
+	if (!request.isCurrent()) {
+		return
+	}
+
 	const beforeLoad = metaFor(r.name)?.beforeLoad
 	if (!beforeLoad) {
-		commitRoute(r)
+		commitRoute(r, request)
 		return
 	}
 
@@ -186,13 +271,20 @@ async function prepareRoute(r: Route, redirects = 0): Promise<void> {
 	try {
 		const returned = await beforeLoad({ params: r.params, context: contextFor(r) })
 		const context = returned ? { ...contextFor(r), ...returned } : contextFor(r)
-		commitRoute({
-			...r,
-			context,
-		})
+		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
 		}
 
@@ -205,15 +297,20 @@ export function redirect(r: Route): never {
 }
 
 export function pushRoute(r: Route): void {
+	const request = navigationRequests.begin('history')
 	if (metaFor(r.name)?.beforeLoad) {
-		void prepareRoute(r)
+		void prepareRoute(r, request)
 		return
 	}
 
-	commitRoute(r)
+	commitRoute(r, request)
 }
 
-function commitRoute(r: Route): void {
+function commitRoute(r: Route, request: NavigationRequest): void {
+	if (!request.isCurrent()) {
+		return
+	}
+
 	const route: Route = { ...r, presentation: r.presentation ?? presentationFor(r.name) }
 	const loader = routeLoaders[route.name] ?? routes.find((meta) => meta.name === route.name)?.loader
 	if (
@@ -224,17 +321,26 @@ function commitRoute(r: Route): void {
 		void Promise.resolve()
 			.then(() => loader(route.params))
 			.then(
-				(loaderData) => commitRoute({ ...route, loaderData }),
-				(loaderError) => commitRoute({ ...route, loaderError }),
+				(loaderData) => commitRoute({ ...route, loaderData }, request),
+				(loaderError) => commitRoute({ ...route, loaderError }, request),
 			)
 
 		return
 	}
 
 	saveScroll()
+	read()
+	// Include the entry we are leaving, even if it was the initial URL.
+	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 {
@@ -242,6 +348,14 @@ function commitRoute(r: Route): void {
 		modalRoute = null
 	}
 
+	history.pushState(
+		{ __octaneXplatDepth: historyDepth, __octaneXplatEntry: rememberRouteState() },
+		'',
+		buildRoutePath(routes, route),
+	)
+
+	lastKey = scrollKey()
+
 	applyHead(modalRoute ?? current ?? null)
 	emit()
 }
@@ -254,6 +368,7 @@ function presentationFor(name: string): Route['presentation'] {
  *  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. */
 export function popRoute(_stack = 'root'): void {
+	navigationRequests.invalidate('history')
 	history.back()
 }
 
@@ -275,12 +390,12 @@ export function addBackInterceptor(_fn: () => boolean): () => void {
 }
 
 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()
 })
@@ -304,6 +419,7 @@ export function currentRoute(): Route | null {
 
 /** The modal route overlaying the current one, if any. */
 export function currentModalRoute(): Route | null {
+	read()
 	return modalRoute
 }
 
@@ -312,7 +428,7 @@ export function currentModalRoute(): Route | null {
  *  apps wire `onDeepLink(pushDeepLink)`). */
 export function pushDeepLink(url: string): boolean {
 	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
 	}
@@ -339,7 +455,8 @@ export function useRoute(stack: string): Route | null {
 /** Whether the selected conceptual stack has an in-app route to pop. A
  * browser's pre-app history is intentionally not counted. */
 export function canGoBack(stack = 'root'): boolean {
-	const route = read()
+	read()
+	const route = modalRoute ?? current
 	return historyDepth > 0 && route?.stack === stack
 }
 

package/src/sheet-detents.ts

@@ -1,4 +1,4 @@
-import { FlexboxLayout, Screen } from '@nativescript/core'
+import { FlexboxLayout, Screen, type View } from '@nativescript/core'
 import { detentOffset, normalizeDetents, snapDetentIndex } from './sheet-snap'
 
 const SNAP_MS = 200
@@ -38,7 +38,7 @@ export function attachSheetDetents(
 
 	// Parentless at attach (before RootLayout.open) — fall back to screen
 	// dips; every gesture-time read uses the real parent height.
-	const vh = () => (host.parent?.getActualSize?.().height || Screen.mainScreen.heightDIPs)
+	const vh = () => host.parent?.getActualSize?.().height || Screen.mainScreen.heightDIPs
 	const max = sorted[sorted.length - 1]
 	let cur = 0
 
@@ -50,7 +50,9 @@ export function attachSheetDetents(
 	grabber.verticalAlignment = 'top'
 	const grip = new FlexboxLayout()
 	grip.className = 'vx-sheet-grip'
-	grabber.addChild(grip)
+	// FlexboxLayout is a View at runtime; NativeScript's generated symbol
+	// setter index signatures make its Android declaration incompatible.
+	grabber.addChild(grip as unknown as View)
 	host.addChild(grabber)
 
 	let dragging = false

package/src/sheet-service.macos.ts

@@ -33,7 +33,10 @@ export const openSheet: OpenSheet = (Component, params, options: SheetOpenOption
 	return new Promise<ModalOpenResult>((resolve) => {
 		let finished = false
 		const finish = (result?: ModalOpenResult) => {
-			if (finished) return
+			if (finished) {
+				return
+			}
+
 			finished = true
 			active.delete(entry)
 			try {
@@ -41,6 +44,7 @@ export const openSheet: OpenSheet = (Component, params, options: SheetOpenOption
 			} catch (error) {
 				console.error('[octane-xplat] sheet close failed', error)
 			}
+
 			resolve(result)
 		}
 

package/src/sheet-service.ts

@@ -6,7 +6,7 @@ import { topRootLayout } from './root-layout.mobile'
 import { applyThemeClasses } from './theme/theme-scheme'
 import { attachSheetDetents } from './sheet-detents'
 import { bindBottomInsetToKeyboard } from './keyboard-inset.mobile'
-import { attachTapToBlur } from './tap-to-blur.mobile' 
+import { attachTapToBlur } from './tap-to-blur'
 
 interface ActiveSheet {
 	host: GridLayout

package/src/sheet-service.web.ts

@@ -2,6 +2,7 @@ import { createRoot } from 'octane'
 import type { ModalOpenResult, OpenSheet } from './props'
 import { applyThemeClasses } from './theme/theme-scheme'
 import { attachSheetDetents } from './sheet-detents.web'
+import { isolateModalFocus } from './modal-focus.web'
 
 interface ActiveSheet {
 	layer: HTMLElement
@@ -28,6 +29,7 @@ export const openSheet: OpenSheet = (Component, params, options = {}) =>
 		}
 
 		let finished = false
+		let releaseFocus: (() => void) | undefined
 		const finish = (result?: ModalOpenResult) => {
 			if (finished) {
 				return
@@ -35,6 +37,7 @@ export const openSheet: OpenSheet = (Component, params, options = {}) =>
 
 			finished = true
 			active.delete(entry)
+			releaseFocus?.()
 			unbindTheme()
 			detents?.detach()
 			root.unmount()
@@ -61,4 +64,9 @@ export const openSheet: OpenSheet = (Component, params, options = {}) =>
 		const root = createRoot(panel)
 		root.render(Component, { params, close: finish })
 		active.add(entry)
+		if (options.shadeCover ?? true) {
+			panel.setAttribute('role', 'dialog')
+			panel.setAttribute('aria-modal', 'true')
+			releaseFocus = isolateModalFocus(layer, panel, () => finish())
+		}
 	})

package/src/sheet-snap.test.ts

@@ -1,46 +1,46 @@
-import { describe, expect, it } from 'vitest';
-import { detentOffset, normalizeDetents, snapDetentIndex } from './sheet-snap';
+import { describe, expect, it } from 'vitest'
+import { detentOffset, normalizeDetents, snapDetentIndex } from './sheet-snap'
 
 // Pure math behind the sheet detents: fractions → sorted snap points →
 // resting translateY offsets → release-time snap targets. The DOM/NS
 // attachments are thin adapters over this.
 
-const D = [0.25, 0.5, 0.9];
-const VH = 800;
+const D = [0.25, 0.5, 0.9]
+const VH = 800
 
 describe('normalizeDetents', () => {
 	it('sorts, filters, and dedupes', () => {
-		expect(normalizeDetents([0.9, 0.25, 0, 1.5, 0.25])).toEqual([0.25, 0.9]);
-		expect(normalizeDetents()).toEqual([]);
-		expect(normalizeDetents([0])).toEqual([]);
-	});
-});
+		expect(normalizeDetents([0.9, 0.25, 0, 1.5, 0.25])).toEqual([0.25, 0.9])
+		expect(normalizeDetents()).toEqual([])
+		expect(normalizeDetents([0])).toEqual([])
+	})
+})
 
 describe('detentOffset', () => {
 	it('parks the largest-detent-sized panel per detent', () => {
-		expect(detentOffset(D, 0, VH)).toBe((0.9 - 0.25) * VH);
-		expect(detentOffset(D, 2, VH)).toBe(0);
-	});
-});
+		expect(detentOffset(D, 0, VH)).toBe((0.9 - 0.25) * VH)
+		expect(detentOffset(D, 2, VH)).toBe(0)
+	})
+})
 
 describe('snapDetentIndex', () => {
 	it('snaps to the nearest detent on a slow release', () => {
 		// frac 0.55 → detent 0.5 wins
-		expect(snapDetentIndex((0.9 - 0.55) * VH, 0, D, VH)).toBe(1);
-		expect(snapDetentIndex(0, 0, D, VH)).toBe(2); // fully open
-	});
+		expect(snapDetentIndex((0.9 - 0.55) * VH, 0, D, VH)).toBe(1)
+		expect(snapDetentIndex(0, 0, D, VH)).toBe(2) // fully open
+	})
 
 	it('dismisses below half of the smallest detent', () => {
 		// frac 0.1 < 0.25/2
-		expect(snapDetentIndex((0.9 - 0.1) * VH, 0, D, VH)).toBe(-1);
-	});
+		expect(snapDetentIndex((0.9 - 0.1) * VH, 0, D, VH)).toBe(-1)
+	})
 
 	it('fling direction overrides proximity', () => {
 		// frac 0.6 (nearer 0.5) flung up → 0.9
-		expect(snapDetentIndex((0.9 - 0.6) * VH, -600, D, VH)).toBe(2);
+		expect(snapDetentIndex((0.9 - 0.6) * VH, -600, D, VH)).toBe(2)
 		// frac 0.4 (nearer 0.5) flung down → 0.25
-		expect(snapDetentIndex((0.9 - 0.4) * VH, 600, D, VH)).toBe(0);
+		expect(snapDetentIndex((0.9 - 0.4) * VH, 600, D, VH)).toBe(0)
 		// flung down at/below the smallest detent → dismiss
-		expect(snapDetentIndex((0.9 - 0.25) * VH, 600, D, VH)).toBe(-1);
-	});
-});
+		expect(snapDetentIndex((0.9 - 0.25) * VH, 600, D, VH)).toBe(-1)
+	})
+})

package/src/sheet-snap.ts

@@ -27,7 +27,12 @@ export function detentOffset(detents: readonly number[], index: number, vh: numb
  *  `vy` (positive = dragging down). Returns the detent index, or -1 to
  *  dismiss: released below half of the smallest detent, or a downward
  *  fling while at/below it. */
-export function snapDetentIndex(ty: number, vy: number, detents: readonly number[], vh: number): number {
+export function snapDetentIndex(
+	ty: number,
+	vy: number,
+	detents: readonly number[],
+	vh: number,
+): number {
 	const max = detents[detents.length - 1]
 	const frac = Math.min(Math.max(max - ty / vh, 0), 1)
 

package/src/svg.mobile.ts

@@ -1,11 +1,17 @@
 import { registerElement } from '@nativescript-community/octane'
-import type { Attributes } from '@nativescript-community/octane/intrinsics'
-import { SVGView } from './vendor/ui-svg'
+import { SVGView } from './vendor/ui-svg/src'
 import type { IconGlyph } from './props'
 
+// The emitted declaration keeps the import() form: declaration emit elides
+// type-only imports referenced solely inside `declare module`, and the
+// augmentation must still resolve Attributes when the module isn't otherwise
+// loaded in the consumer's program.
 declare module '@nativescript-community/octane/intrinsics' {
 	interface NativeScriptElements {
-		svgview: Omit<Attributes<typeof SVGView>, 'src'> & {
+		svgview: Omit<
+			import('@nativescript-community/octane/intrinsics').Attributes<typeof SVGView>,
+			'src'
+		> & {
 			/** SVGView awaits promise srcs — remote .svg URLs arrive as fetched markup. */
 			src?: string | Promise<string>
 			stretch?: 'none' | 'fill' | 'aspectFit' | 'aspectFill'