@ng-native/router 0.4.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -0
- package/dist/file-routes.d.ts +83 -0
- package/dist/file-routes.js +359 -0
- package/dist/file-routes.js.map +1 -0
- package/dist/in-tab.d.ts +20 -0
- package/dist/in-tab.js +13 -0
- package/dist/in-tab.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/markdown-page.d.ts +39 -0
- package/dist/markdown-page.js +56 -0
- package/dist/markdown-page.js.map +1 -0
- package/dist/native-header.d.ts +4 -0
- package/dist/native-header.js +17 -4
- package/dist/native-header.js.map +1 -1
- package/dist/native-platform-location.d.ts +5 -0
- package/dist/native-platform-location.js +4 -0
- package/dist/native-platform-location.js.map +1 -1
- package/dist/native-stack-outlet.d.ts +6 -0
- package/dist/native-stack-outlet.js +18 -0
- package/dist/native-stack-outlet.js.map +1 -1
- package/dist/native-stack-reuse-strategy.d.ts +9 -0
- package/dist/native-stack-reuse-strategy.js +23 -4
- package/dist/native-stack-reuse-strategy.js.map +1 -1
- package/dist/native-tab.d.ts +6 -0
- package/dist/native-tab.js +11 -2
- package/dist/native-tab.js.map +1 -1
- package/dist/native-tabs-outlet.d.ts +29 -1
- package/dist/native-tabs-outlet.js +113 -28
- package/dist/native-tabs-outlet.js.map +1 -1
- package/dist/presented-route.d.ts +9 -1
- package/dist/presented-route.js +1 -1
- package/dist/presented-route.js.map +1 -1
- package/dist/provide-native-router.js +85 -2
- package/dist/provide-native-router.js.map +1 -1
- package/dist/route-parking.d.ts +30 -0
- package/dist/route-parking.js +60 -0
- package/dist/route-parking.js.map +1 -0
- package/dist/screen-header.d.ts +10 -0
- package/dist/screen-header.js +11 -0
- package/dist/screen-header.js.map +1 -0
- package/dist/screen-safe-area-view.d.ts +18 -0
- package/dist/screen-safe-area-view.js +74 -0
- package/dist/screen-safe-area-view.js.map +1 -0
- package/dist/screens.js +3 -2
- package/dist/screens.js.map +1 -1
- package/dist/tab-safe-area-view.d.ts +4 -11
- package/dist/tab-safe-area-view.js +8 -43
- package/dist/tab-safe-area-view.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presented-route.js","sourceRoot":"","sources":["../src/presented-route.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * A page presented over whatever is showing, when its url belongs to a tab that is not.\n *\n * The router puts a route where its url sits in the route tree: `/invoices/7` is the Invoices\n * tab's, so navigating there selects that tab and shows the page in its stack. A sheet over the\n * tab the user is on has to be somewhere else, and the router has a place for that, a named\n * outlet at the root. So the page's route gets a copy there, made the first time it is presented,\n * and `present()` navigates to the copy: `/home(presented:invoices/7)`. The router still runs the\n * navigation, so the page's guards, resolvers, lazy component and params are what they are in its\n * tab, and a back goes through history as any other does.\n */\nimport {\n PRIMARY_OUTLET,\n type NavigationExtras,\n type Route,\n type Router,\n type Routes,\n type UrlTree,\n} from '@angular/router';\n\n/** The root outlet a page of another tab is presented in. */\nexport const PRESENTED = 'presented';\n\n/**\n * How many of `segments` a route's path takes, or null when it does not match them or is one this\n * does not follow: a redirect, a custom matcher, a wildcard, or a route of another outlet.\n *\n * ponytail: static and `:param` segments only, which is what a page's url is made of. The rest\n * falls back to presenting the page where its url puts it, as before.\n */\nfunction taken(route: Route, segments: readonly string[]): number | null {\n if (route.outlet && route.outlet !== PRIMARY_OUTLET) return null;\n if (route.redirectTo !== undefined || route.matcher || route.path === undefined) return null;\n const parts = route.path ? route.path.split('/') : [];\n if (parts.includes('**') || parts.length > segments.length) return null;\n const matches = parts.every((part, index) => part.startsWith(':') || part === segments[index]);\n return matches ? parts.length : null;\n}\n\n/** The children each lazily loaded route answered with, or null when they are not plain routes. */\nconst lazyChildren = new WeakMap<Route, Promise<Routes | null>>();\n\n/**\n * A route's children, loading them when they are lazy. The router loads them again when it\n * navigates, from the same function, which a dynamic import answers from its cache.\n *\n * ponytail: a loader that answers routes, or a module whose default export is routes, as\n * `loadChildren: () => import('./invoices.routes')` does. An NgModule or an observable falls back\n * to presenting the page where its url puts it.\n */\nfunction childrenOf(route: Route): Promise<Routes | null> | Routes | undefined {\n if (route.children || !route.loadChildren) return route.children;\n let loading = lazyChildren.get(route);\n if (!loading) {\n loading = Promise.resolve()\n .then(() => (route.loadChildren as () => unknown)())\n .then((answer) => {\n const routes = (answer as { default?: unknown } | null)?.default ?? answer;\n return Array.isArray(routes) ? (routes as Routes) : null;\n })\n // A loader that fails is the router's to report, when it navigates there as before.\n .catch(() => null);\n lazyChildren.set(route, loading);\n }\n return loading;\n}\n\n/** A route on the way that the copy cannot stand in for: the search stops, with no copy made. */\nconst STOP = Symbol('stop');\n\n/** A route's children, or `STOP` where the copy cannot follow it: see `chainTo`. */\nasync function followable(route: Route): Promise<Routes | undefined | typeof STOP> {\n if (route.canMatch?.length) return STOP;\n return (await childrenOf(route)) ?? (route.loadChildren ? STOP : undefined);\n}\n\n/**\n * The routes from the root to the one that shows `segments`, null when none of `routes` leads\n * there, or `STOP` at a route with a `canMatch` guard. The router runs that guard against the\n * route and the segments it was matched with, which a copy under another path cannot give it,\n * and leaving it out would let the page match where its own route refuses to.\n */\nasync function chainTo(\n routes: Routes,\n segments: readonly string[],\n): Promise<Route[] | null | typeof STOP> {\n for (const route of routes) {\n const count = taken(route, segments);\n if (count === null) continue;\n const rest = segments.slice(count);\n const children = await followable(route);\n if (children === STOP) return STOP;\n const inside = children && (await chainTo(children, rest));\n if (inside === STOP) return STOP;\n if (inside) return [route, ...inside];\n // A page of its own: a component, and no children to choose among.\n if (!rest.length && !children && (route.component || route.loadComponent)) return [route];\n }\n return null;\n}\n\n/**\n * The page's route as a root route of the presented outlet: its own component, title, data and\n * resolvers, under the whole path, with the guards and providers of the routes it sat inside.\n * Their components are left out: the tab bar and the tab's stack are not what is presented.\n */\nfunction presentedCopy(chain: readonly Route[]): Route {\n const page = chain.at(-1)!;\n const above = chain.slice(0, -1);\n return {\n ...page,\n // Its own children are in the copy by now, where they were lazy.\n loadChildren: undefined,\n path: chain\n .map((route) => route.path)\n .filter(Boolean)\n .join('/'),\n pathMatch: undefined,\n outlet: PRESENTED,\n canActivate: [\n ...above.flatMap((route) => [\n ...(route.canActivate ?? []),\n ...(route.canActivateChild ?? []),\n ]),\n ...(page.canActivate ?? []),\n ],\n providers: [...above.flatMap((route) => route.providers ?? []), ...(page.providers ?? [])],\n resolve: Object.assign({}, ...above.map((route) => route.resolve), page.resolve),\n data: Object.assign({}, ...above.map((route) => route.data), page.data),\n };\n}\n\n/** The copies each router has, by the path they match. */\nconst copies = new WeakMap<Router, Set<string>>();\n\n/**\n * The commands that present the page at `path` in the root's presented outlet, having given its\n * route a copy there, or null when the config is not one this follows.\n */\nexport async function presentedCommands(router: Router, path: string): Promise<unknown[] | null> {\n const segments = path.split('/').filter(Boolean);\n const chain = await chainTo(router.config, segments);\n if (!chain || chain === STOP) return null;\n const copy = presentedCopy(chain);\n const known = copies.get(router) ?? new Set<string>();\n copies.set(router, known);\n if (!known.has(copy.path!)) {\n known.add(copy.path!);\n router.config.push(copy);\n }\n return [{ outlets: { [PRESENTED]: segments } }];\n}\n\n/** `url` without the page presented over it: where the app is, under the page. */\nexport function withoutPresented(router: Router, url: string): string {\n // A named outlet is written `(name:path)`, so a url without that has no page to take off.\n if (!url.includes(`${PRESENTED}:`)) return url;\n const tree = router.parseUrl(url);\n delete tree.root.children[PRESENTED];\n return router.serializeUrl(tree);\n}\n\n/**\n * Where `commands` lead with the presented page left behind, when one is up and the commands are\n * not a presentation themselves; null otherwise. A navigation from a presented page goes to its\n * url's own place, which the page is over: left up, it would hide where the app went.\n */\nexport function leavingPresented(\n router: Router,\n commands: readonly unknown[],\n extras: NavigationExtras,\n): UrlTree | null {\n // A named outlet is written `(name:path)`, so a url without that has no page up.\n if (!router.url?.includes(`${PRESENTED}:`)) return null;\n const first = commands[0] as { outlets?: Record<string, unknown> } | undefined;\n if (first?.outlets && PRESENTED in first.outlets) return null;\n const tree = router.createUrlTree([...commands], extras);\n // Commands relative to the page itself, as a link inside it gives them, resolve inside the\n // presented outlet: where they lead is that path in its own place, not beside the page.\n const beside = extras.relativeTo?.pathFromRoot.some((route) => route.outlet === PRESENTED)\n ? tree.root.children[PRESENTED]\n : undefined;\n if (beside) {\n const path = beside.segments.map((segment) => segment.path);\n const { queryParams, fragment } = tree;\n const own = router.createUrlTree(['/', ...path], {\n queryParams,\n fragment: fragment ?? undefined,\n });\n delete own.root.children[PRESENTED];\n return own;\n }\n delete tree.root.children[PRESENTED];\n return tree;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"presented-route.js","sourceRoot":"","sources":["../src/presented-route.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * A page presented over whatever is showing, when its url belongs to a tab that is not.\n *\n * The router puts a route where its url sits in the route tree: `/invoices/7` is the Invoices\n * tab's, so navigating there selects that tab and shows the page in its stack. A sheet over the\n * tab the user is on has to be somewhere else, and the router has a place for that, a named\n * outlet at the root. So the page's route gets a copy there, made the first time it is presented,\n * and `present()` navigates to the copy: `/home(presented:invoices/7)`. The router still runs the\n * navigation, so the page's guards, resolvers, lazy component and params are what they are in its\n * tab, and a back goes through history as any other does.\n */\nimport {\n PRIMARY_OUTLET,\n type NavigationExtras,\n type Route,\n type Router,\n type Routes,\n type UrlTree,\n} from '@angular/router';\n\n/** The root outlet a page of another tab is presented in. */\nexport const PRESENTED = 'presented';\n\n/**\n * How many of `segments` a route's path takes, or null when it does not match them or is one this\n * does not follow: a redirect, a custom matcher, a wildcard, or a route of another outlet.\n *\n * ponytail: static and `:param` segments only, which is what a page's url is made of. The rest\n * falls back to presenting the page where its url puts it, as before.\n */\nexport function taken(route: Route, segments: readonly string[]): number | null {\n if (route.outlet && route.outlet !== PRIMARY_OUTLET) return null;\n if (route.redirectTo !== undefined || route.matcher || route.path === undefined) return null;\n const parts = route.path ? route.path.split('/') : [];\n if (parts.includes('**') || parts.length > segments.length) return null;\n const matches = parts.every((part, index) => part.startsWith(':') || part === segments[index]);\n return matches ? parts.length : null;\n}\n\n/** The children each lazily loaded route answered with, or null when they are not plain routes. */\nconst lazyChildren = new WeakMap<Route, Promise<Routes | null>>();\n\n/**\n * A route's children, loading them when they are lazy. The router loads them again when it\n * navigates, from the same function, which a dynamic import answers from its cache.\n *\n * ponytail: a loader that answers routes, or a module whose default export is routes, as\n * `loadChildren: () => import('./invoices.routes')` does. An NgModule or an observable falls back\n * to presenting the page where its url puts it.\n */\nfunction childrenOf(route: Route): Promise<Routes | null> | Routes | undefined {\n if (route.children || !route.loadChildren) return route.children;\n let loading = lazyChildren.get(route);\n if (!loading) {\n loading = Promise.resolve()\n .then(() => (route.loadChildren as () => unknown)())\n .then((answer) => {\n const routes = (answer as { default?: unknown } | null)?.default ?? answer;\n return Array.isArray(routes) ? (routes as Routes) : null;\n })\n // A loader that fails is the router's to report, when it navigates there as before.\n .catch(() => null);\n lazyChildren.set(route, loading);\n }\n return loading;\n}\n\n/** A route on the way that the copy cannot stand in for: the search stops, with no copy made. */\nconst STOP = Symbol('stop');\n\n/** A route's children, or `STOP` where the copy cannot follow it: see `chainTo`. */\nasync function followable(route: Route): Promise<Routes | undefined | typeof STOP> {\n if (route.canMatch?.length) return STOP;\n return (await childrenOf(route)) ?? (route.loadChildren ? STOP : undefined);\n}\n\n/**\n * The routes from the root to the one that shows `segments`, null when none of `routes` leads\n * there, or `STOP` at a route with a `canMatch` guard. The router runs that guard against the\n * route and the segments it was matched with, which a copy under another path cannot give it,\n * and leaving it out would let the page match where its own route refuses to.\n */\nasync function chainTo(\n routes: Routes,\n segments: readonly string[],\n): Promise<Route[] | null | typeof STOP> {\n for (const route of routes) {\n const count = taken(route, segments);\n if (count === null) continue;\n const rest = segments.slice(count);\n const children = await followable(route);\n if (children === STOP) return STOP;\n const inside = children && (await chainTo(children, rest));\n if (inside === STOP) return STOP;\n if (inside) return [route, ...inside];\n // A page of its own: a component, and no children to choose among.\n if (!rest.length && !children && (route.component || route.loadComponent)) return [route];\n }\n return null;\n}\n\n/**\n * The page's route as a root route of the presented outlet: its own component, title, data and\n * resolvers, under the whole path, with the guards and providers of the routes it sat inside.\n * Their components are left out: the tab bar and the tab's stack are not what is presented.\n */\nfunction presentedCopy(chain: readonly Route[]): Route {\n const page = chain.at(-1)!;\n const above = chain.slice(0, -1);\n return {\n ...page,\n // Its own children are in the copy by now, where they were lazy.\n loadChildren: undefined,\n path: chain\n .map((route) => route.path)\n .filter(Boolean)\n .join('/'),\n pathMatch: undefined,\n outlet: PRESENTED,\n canActivate: [\n ...above.flatMap((route) => [\n ...(route.canActivate ?? []),\n ...(route.canActivateChild ?? []),\n ]),\n ...(page.canActivate ?? []),\n ],\n providers: [...above.flatMap((route) => route.providers ?? []), ...(page.providers ?? [])],\n resolve: Object.assign({}, ...above.map((route) => route.resolve), page.resolve),\n data: Object.assign({}, ...above.map((route) => route.data), page.data),\n };\n}\n\n/** The copies each router has, by the path they match. */\nconst copies = new WeakMap<Router, Set<string>>();\n\n/**\n * The commands that present the page at `path` in the root's presented outlet, having given its\n * route a copy there, or null when the config is not one this follows.\n */\nexport async function presentedCommands(router: Router, path: string): Promise<unknown[] | null> {\n const segments = path.split('/').filter(Boolean);\n const chain = await chainTo(router.config, segments);\n if (!chain || chain === STOP) return null;\n const copy = presentedCopy(chain);\n const known = copies.get(router) ?? new Set<string>();\n copies.set(router, known);\n if (!known.has(copy.path!)) {\n known.add(copy.path!);\n router.config.push(copy);\n }\n return [{ outlets: { [PRESENTED]: segments } }];\n}\n\n/** `url` without the page presented over it: where the app is, under the page. */\nexport function withoutPresented(router: Router, url: string): string {\n // A named outlet is written `(name:path)`, so a url without that has no page to take off.\n if (!url.includes(`${PRESENTED}:`)) return url;\n const tree = router.parseUrl(url);\n delete tree.root.children[PRESENTED];\n return router.serializeUrl(tree);\n}\n\n/**\n * Where `commands` lead with the presented page left behind, when one is up and the commands are\n * not a presentation themselves; null otherwise. A navigation from a presented page goes to its\n * url's own place, which the page is over: left up, it would hide where the app went.\n */\nexport function leavingPresented(\n router: Router,\n commands: readonly unknown[],\n extras: NavigationExtras,\n): UrlTree | null {\n // A named outlet is written `(name:path)`, so a url without that has no page up.\n if (!router.url?.includes(`${PRESENTED}:`)) return null;\n const first = commands[0] as { outlets?: Record<string, unknown> } | undefined;\n if (first?.outlets && PRESENTED in first.outlets) return null;\n const tree = router.createUrlTree([...commands], extras);\n // Commands relative to the page itself, as a link inside it gives them, resolve inside the\n // presented outlet: where they lead is that path in its own place, not beside the page.\n const beside = extras.relativeTo?.pathFromRoot.some((route) => route.outlet === PRESENTED)\n ? tree.root.children[PRESENTED]\n : undefined;\n if (beside) {\n const path = beside.segments.map((segment) => segment.path);\n const { queryParams, fragment } = tree;\n const own = router.createUrlTree(['/', ...path], {\n queryParams,\n fragment: fragment ?? undefined,\n });\n delete own.root.children[PRESENTED];\n return own;\n }\n delete tree.root.children[PRESENTED];\n return tree;\n}\n"]}
|
|
@@ -14,13 +14,14 @@
|
|
|
14
14
|
*/
|
|
15
15
|
import { PlatformLocation } from '@angular/common';
|
|
16
16
|
import { NavigationCancel, NavigationEnd, NavigationError, RouteReuseStrategy, Router, provideRouter, } from '@angular/router';
|
|
17
|
-
import { ErrorHandler, computed, inject, makeEnvironmentProviders, provideEnvironmentInitializer, } from '@angular/core';
|
|
17
|
+
import { DestroyRef, ErrorHandler, computed, inject, makeEnvironmentProviders, provideEnvironmentInitializer, } from '@angular/core';
|
|
18
18
|
import { ColorScheme, DeepLinks } from '@ng-native/device';
|
|
19
19
|
import { NATIVE_HEADER_DEFAULTS, NATIVE_TAB_DEFAULTS, } from "./native-bar-defaults.js";
|
|
20
20
|
import { followLink, linkAncestry } from "./native-links.js";
|
|
21
|
-
import { NativeNavigation } from "./native-navigation.js";
|
|
21
|
+
import { NATIVE_INTENT, NativeNavigation, intentOf } from "./native-navigation.js";
|
|
22
22
|
import { NativePlatformLocation } from "./native-platform-location.js";
|
|
23
23
|
import { NativeStackReuseStrategy } from "./native-stack-reuse-strategy.js";
|
|
24
|
+
import { ROUTE_PARKING } from "./route-parking.js";
|
|
24
25
|
import { registerScreenComponents } from "./screens.js";
|
|
25
26
|
/**
|
|
26
27
|
* The page a deep link opens on top of, or null to open it alone. Without it a link to
|
|
@@ -89,6 +90,7 @@ function nativeProviders(parentOf) {
|
|
|
89
90
|
// Without this the router never detaches, so a pushed-away screen is destroyed and rebuilt.
|
|
90
91
|
{ provide: RouteReuseStrategy, useClass: NativeStackReuseStrategy },
|
|
91
92
|
NativeNavigation,
|
|
93
|
+
provideEnvironmentInitializer(keepHistoryAcrossReloads),
|
|
92
94
|
];
|
|
93
95
|
if (!parentOf) {
|
|
94
96
|
return [
|
|
@@ -146,6 +148,87 @@ function nativeProviders(parentOf) {
|
|
|
146
148
|
...shared,
|
|
147
149
|
];
|
|
148
150
|
}
|
|
151
|
+
/**
|
|
152
|
+
* A history without its round trips: each page once, reached the way it last was. An app that went
|
|
153
|
+
* from one tab to another and back has a history three entries long and is one page deep, and the
|
|
154
|
+
* app that comes back has no use for the detour: gone through at the speed of a reload, the tab
|
|
155
|
+
* bar is still on its way to the second tab when the third navigation asks for the first.
|
|
156
|
+
*/
|
|
157
|
+
function direct(pages) {
|
|
158
|
+
const route = [];
|
|
159
|
+
for (const page of pages) {
|
|
160
|
+
const before = route.findIndex((one) => one.url === page.url);
|
|
161
|
+
if (before !== -1)
|
|
162
|
+
route.length = before;
|
|
163
|
+
route.push(page);
|
|
164
|
+
}
|
|
165
|
+
return route;
|
|
166
|
+
}
|
|
167
|
+
/** A push's animation, with room to spare: 350ms on iOS, about the same on Android. */
|
|
168
|
+
const PUSH_SETTLES = 450;
|
|
169
|
+
/**
|
|
170
|
+
* In development, come back from a reload on the page it left: see `route-parking.ts`.
|
|
171
|
+
*
|
|
172
|
+
* The history a reload left is gone through again once the first navigation has ended, as a
|
|
173
|
+
* launch link is and for the same reason. The hook is what `mount`'s reload waits on.
|
|
174
|
+
*/
|
|
175
|
+
function keepHistoryAcrossReloads() {
|
|
176
|
+
// The bare identifier, so a release build folds the rest away.
|
|
177
|
+
if (typeof __DEV__ === 'undefined' || !__DEV__)
|
|
178
|
+
return;
|
|
179
|
+
const parking = inject(ROUTE_PARKING);
|
|
180
|
+
if (!parking)
|
|
181
|
+
return;
|
|
182
|
+
const router = inject(Router);
|
|
183
|
+
const history = inject(PlatformLocation);
|
|
184
|
+
const errors = inject(ErrorHandler);
|
|
185
|
+
const scope = globalThis;
|
|
186
|
+
// A page keeps how it was presented, a sheet or a modal, and nothing else of its navigation:
|
|
187
|
+
// a replace has already happened to the history, and an app's own state may not survive JSON.
|
|
188
|
+
const pages = () => history instanceof NativePlatformLocation
|
|
189
|
+
? history.ɵpages().map(({ url, state }) => {
|
|
190
|
+
const presentation = intentOf(state)?.presentation;
|
|
191
|
+
return presentation ? { url, presentation } : { url };
|
|
192
|
+
})
|
|
193
|
+
: [{ url: router.url }];
|
|
194
|
+
const park = () => parking.park(direct(pages()));
|
|
195
|
+
scope.__angularNativePark = park;
|
|
196
|
+
// `mount` keeps the app out of sight until this settles, so the pages arrive unseen.
|
|
197
|
+
const restoring = parking
|
|
198
|
+
.collect()
|
|
199
|
+
.then(async (parked) => {
|
|
200
|
+
if (!parked)
|
|
201
|
+
return;
|
|
202
|
+
await new Promise((resolve) => {
|
|
203
|
+
if (router.navigated)
|
|
204
|
+
return resolve();
|
|
205
|
+
const first = router.events.subscribe((event) => {
|
|
206
|
+
if (!isEnd(event))
|
|
207
|
+
return;
|
|
208
|
+
first.unsubscribe();
|
|
209
|
+
resolve();
|
|
210
|
+
});
|
|
211
|
+
});
|
|
212
|
+
let moved = false;
|
|
213
|
+
for (const { url, presentation } of parked) {
|
|
214
|
+
if (url === router.url)
|
|
215
|
+
continue;
|
|
216
|
+
const state = presentation && { [NATIVE_INTENT]: { stack: 'push', presentation } };
|
|
217
|
+
moved = (await router.navigateByUrl(url, { state })) || moved;
|
|
218
|
+
}
|
|
219
|
+
// The last page is still sliding in when its navigation ends.
|
|
220
|
+
if (moved)
|
|
221
|
+
await new Promise((resolve) => setTimeout(resolve, PUSH_SETTLES));
|
|
222
|
+
})
|
|
223
|
+
.catch((error) => errors.handleError(error));
|
|
224
|
+
scope.__angularNativeRestoring = restoring;
|
|
225
|
+
inject(DestroyRef).onDestroy(() => {
|
|
226
|
+
if (scope.__angularNativePark === park)
|
|
227
|
+
delete scope.__angularNativePark;
|
|
228
|
+
if (scope.__angularNativeRestoring === restoring)
|
|
229
|
+
delete scope.__angularNativeRestoring;
|
|
230
|
+
});
|
|
231
|
+
}
|
|
149
232
|
/** A navigation's last event, whichever way it went. */
|
|
150
233
|
function isEnd(event) {
|
|
151
234
|
return (event instanceof NavigationEnd ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provide-native-router.js","sourceRoot":"","sources":["../src/provide-native-router.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Angular's Router, on native navigation: `provideRouter` and the native pieces under it, in one\n * call.\n *\n * `provideNativeRouter(routes, withComponentInputBinding())` takes the same routes and the same\n * router features as `provideRouter` - it calls it - and adds what native needs on top: a\n * `PlatformLocation` over an in-memory history, a `RouteReuseStrategy` that detaches a pushed-away\n * screen instead of destroying it, and `NativeNavigation`. Those come after `provideRouter`'s own\n * providers, so they win over the web defaults without the app having to order anything.\n *\n * Deep links and Android's back button come from `@ng-native/device` and need no wiring: off a\n * device both report nothing, and navigation works either way. The native options - `withLinkParent`,\n * `withHeaderDefaults` and `withTabDefaults` - are passed like any other feature.\n */\nimport { PlatformLocation } from '@angular/common';\nimport {\n NavigationCancel,\n NavigationEnd,\n NavigationError,\n RouteReuseStrategy,\n Router,\n provideRouter,\n type RouterFeatures,\n type Routes,\n} from '@angular/router';\nimport {\n ErrorHandler,\n computed,\n inject,\n makeEnvironmentProviders,\n provideEnvironmentInitializer,\n type EnvironmentProviders,\n type InjectionToken,\n type Provider,\n type Signal,\n} from '@angular/core';\nimport { ColorScheme, DeepLinks, type Scheme } from '@ng-native/device';\nimport {\n NATIVE_HEADER_DEFAULTS,\n NATIVE_TAB_DEFAULTS,\n type HeaderDefaults,\n type SchemeDefaults,\n type TabDefaults,\n} from './native-bar-defaults.ts';\nimport { followLink, linkAncestry, type LinkParent } from './native-links.ts';\nimport { NativeNavigation } from './native-navigation.ts';\nimport { NativePlatformLocation } from './native-platform-location.ts';\nimport { NativeStackReuseStrategy } from './native-stack-reuse-strategy.ts';\nimport { registerScreenComponents } from './screens.ts';\n\n/** A native-only router option, passed to `provideNativeRouter` beside Angular's own features. */\nexport interface NativeRouterFeature {\n readonly ɵnativeRouter: { readonly linkParent?: LinkParent; readonly providers?: Provider[] };\n}\n\n/**\n * The page a deep link opens on top of, or null to open it alone. Without it a link to\n * `/settings/notifications` opens that page with no Back. See native-links.ts.\n */\nexport function withLinkParent(parentOf: LinkParent): NativeRouterFeature {\n return { ɵnativeRouter: { linkParent: parentOf } };\n}\n\n/**\n * How every `<native-header>` looks when it does not say: its colours, blur, shadow, fonts and\n * light or dark style. A header's own binding always wins.\n *\n * ```ts\n * provideNativeRouter(\n * routes,\n * withHeaderDefaults((scheme) => ({\n * backgroundColor: scheme === 'dark' ? '#101014' : '#f4f4f7',\n * titleColor: scheme === 'dark' ? '#ffffff' : '#101014',\n * color: '#3b6ef5',\n * })),\n * );\n * ```\n *\n * Colours it leaves out still come from `NATIVE_HEADER_PALETTE`.\n */\nexport function withHeaderDefaults(defaults: SchemeDefaults<HeaderDefaults>): NativeRouterFeature {\n return { ɵnativeRouter: { providers: [bySchemeProvider(NATIVE_HEADER_DEFAULTS, defaults)] } };\n}\n\n/**\n * How every `<native-tabs-outlet>` and `<native-tab>` looks when it does not say: the tint, the\n * background behind the tabs, the light or dark style, and each tab's bar appearance. An outlet's\n * or a tab's own binding always wins.\n */\nexport function withTabDefaults(defaults: SchemeDefaults<TabDefaults>): NativeRouterFeature {\n return { ɵnativeRouter: { providers: [bySchemeProvider(NATIVE_TAB_DEFAULTS, defaults)] } };\n}\n\n/** One signal for the whole app, rather than every bar calling the function again. */\nfunction bySchemeProvider<T>(\n token: InjectionToken<Signal<T>>,\n defaults: SchemeDefaults<T>,\n): Provider {\n return {\n provide: token,\n useFactory: () => {\n if (typeof defaults !== 'function') return computed(() => defaults);\n const scheme = inject(ColorScheme);\n return computed(() => (defaults as (scheme: Scheme) => T)(scheme.current()));\n },\n };\n}\n\nfunction isNative(feature: RouterFeatures | NativeRouterFeature): feature is NativeRouterFeature {\n return 'ɵnativeRouter' in feature;\n}\n\nexport function provideNativeRouter(\n routes: Routes,\n ...features: (RouterFeatures | NativeRouterFeature)[]\n): EnvironmentProviders {\n const angular = features.filter((feature): feature is RouterFeatures => !isNative(feature));\n const native = features.filter(isNative).map((feature) => feature.ɵnativeRouter);\n const parentOf = native.find((feature) => feature.linkParent)?.linkParent;\n return makeEnvironmentProviders([\n provideRouter(routes, ...angular),\n ...nativeProviders(parentOf),\n ...native.flatMap((feature) => feature.providers ?? []),\n ]);\n}\n\nfunction nativeProviders(parentOf: LinkParent | undefined): (Provider | EnvironmentProviders)[] {\n // The engine needs the element-to-view-name mapping before the first navigation renders.\n registerScreenComponents();\n\n const shared = [\n // Without this the router never detaches, so a pushed-away screen is destroyed and rebuilt.\n { provide: RouteReuseStrategy, useClass: NativeStackReuseStrategy },\n NativeNavigation,\n ];\n if (!parentOf) {\n return [\n {\n provide: PlatformLocation,\n useFactory: () => new NativePlatformLocation(inject(DeepLinks)),\n },\n ...shared,\n ];\n }\n\n return [\n {\n provide: PlatformLocation,\n // The app launches on the page the link belongs under; the link follows once it is shown.\n // Links while running go through the router below rather than straight into history.\n useFactory: () => {\n const initial = inject(DeepLinks).initialUrl();\n return new NativePlatformLocation({\n initialUrl: () => (initial && linkAncestry(initial, parentOf)[0]) || initial,\n subscribe: () => () => {},\n });\n },\n },\n provideEnvironmentInitializer(() => {\n const router = inject(Router);\n const links = inject(DeepLinks);\n const errors = inject(ErrorHandler);\n // A link nobody awaits: a page that fails to load is reported, as a tab tap's is, rather\n // than left as an unhandled rejection. The app's navigation error handler hears it too.\n const follow = (url: string) =>\n followLink(router, url, parentOf).catch((error: unknown) => errors.handleError(error));\n const initial = links.initialUrl();\n if (initial && parentOf(initial)) {\n const first = router.events.subscribe((event) => {\n if (!(event instanceof NavigationEnd)) return;\n first.unsubscribe();\n void follow(initial);\n });\n }\n // A launch link arrives the way any other does, once `getInitialURL()` settles, which is\n // usually while the router's first navigation is still going: following it then cancels that\n // navigation, and the app opens with no root screen under the link. So links wait for it.\n const settled = new Promise<void>((resolve) => {\n if (router.navigated) return resolve();\n const first = router.events.subscribe((event) => {\n if (!isEnd(event)) return;\n first.unsubscribe();\n resolve();\n });\n });\n links.subscribe((url) => void settled.then(() => follow(url)));\n }),\n ...shared,\n ];\n}\n\n/** A navigation's last event, whichever way it went. */\nfunction isEnd(event: unknown): boolean {\n return (\n event instanceof NavigationEnd ||\n event instanceof NavigationCancel ||\n event instanceof NavigationError\n );\n}\n"]}
|
|
1
|
+
{"version":3,"file":"provide-native-router.js","sourceRoot":"","sources":["../src/provide-native-router.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Angular's Router, on native navigation: `provideRouter` and the native pieces under it, in one\n * call.\n *\n * `provideNativeRouter(routes, withComponentInputBinding())` takes the same routes and the same\n * router features as `provideRouter` - it calls it - and adds what native needs on top: a\n * `PlatformLocation` over an in-memory history, a `RouteReuseStrategy` that detaches a pushed-away\n * screen instead of destroying it, and `NativeNavigation`. Those come after `provideRouter`'s own\n * providers, so they win over the web defaults without the app having to order anything.\n *\n * Deep links and Android's back button come from `@ng-native/device` and need no wiring: off a\n * device both report nothing, and navigation works either way. The native options - `withLinkParent`,\n * `withHeaderDefaults` and `withTabDefaults` - are passed like any other feature.\n */\nimport { PlatformLocation } from '@angular/common';\nimport {\n NavigationCancel,\n NavigationEnd,\n NavigationError,\n RouteReuseStrategy,\n Router,\n provideRouter,\n type RouterFeatures,\n type Routes,\n} from '@angular/router';\nimport {\n DestroyRef,\n ErrorHandler,\n computed,\n inject,\n makeEnvironmentProviders,\n provideEnvironmentInitializer,\n type EnvironmentProviders,\n type InjectionToken,\n type Provider,\n type Signal,\n} from '@angular/core';\nimport { ColorScheme, DeepLinks, type Scheme } from '@ng-native/device';\nimport {\n NATIVE_HEADER_DEFAULTS,\n NATIVE_TAB_DEFAULTS,\n type HeaderDefaults,\n type SchemeDefaults,\n type TabDefaults,\n} from './native-bar-defaults.ts';\nimport { followLink, linkAncestry, type LinkParent } from './native-links.ts';\nimport { NATIVE_INTENT, NativeNavigation, intentOf } from './native-navigation.ts';\nimport { NativePlatformLocation } from './native-platform-location.ts';\nimport { NativeStackReuseStrategy } from './native-stack-reuse-strategy.ts';\nimport { ROUTE_PARKING, type ParkedPage } from './route-parking.ts';\nimport { registerScreenComponents } from './screens.ts';\n\n/** A native-only router option, passed to `provideNativeRouter` beside Angular's own features. */\nexport interface NativeRouterFeature {\n readonly ɵnativeRouter: { readonly linkParent?: LinkParent; readonly providers?: Provider[] };\n}\n\n/**\n * The page a deep link opens on top of, or null to open it alone. Without it a link to\n * `/settings/notifications` opens that page with no Back. See native-links.ts.\n */\nexport function withLinkParent(parentOf: LinkParent): NativeRouterFeature {\n return { ɵnativeRouter: { linkParent: parentOf } };\n}\n\n/**\n * How every `<native-header>` looks when it does not say: its colours, blur, shadow, fonts and\n * light or dark style. A header's own binding always wins.\n *\n * ```ts\n * provideNativeRouter(\n * routes,\n * withHeaderDefaults((scheme) => ({\n * backgroundColor: scheme === 'dark' ? '#101014' : '#f4f4f7',\n * titleColor: scheme === 'dark' ? '#ffffff' : '#101014',\n * color: '#3b6ef5',\n * })),\n * );\n * ```\n *\n * Colours it leaves out still come from `NATIVE_HEADER_PALETTE`.\n */\nexport function withHeaderDefaults(defaults: SchemeDefaults<HeaderDefaults>): NativeRouterFeature {\n return { ɵnativeRouter: { providers: [bySchemeProvider(NATIVE_HEADER_DEFAULTS, defaults)] } };\n}\n\n/**\n * How every `<native-tabs-outlet>` and `<native-tab>` looks when it does not say: the tint, the\n * background behind the tabs, the light or dark style, and each tab's bar appearance. An outlet's\n * or a tab's own binding always wins.\n */\nexport function withTabDefaults(defaults: SchemeDefaults<TabDefaults>): NativeRouterFeature {\n return { ɵnativeRouter: { providers: [bySchemeProvider(NATIVE_TAB_DEFAULTS, defaults)] } };\n}\n\n/** One signal for the whole app, rather than every bar calling the function again. */\nfunction bySchemeProvider<T>(\n token: InjectionToken<Signal<T>>,\n defaults: SchemeDefaults<T>,\n): Provider {\n return {\n provide: token,\n useFactory: () => {\n if (typeof defaults !== 'function') return computed(() => defaults);\n const scheme = inject(ColorScheme);\n return computed(() => (defaults as (scheme: Scheme) => T)(scheme.current()));\n },\n };\n}\n\nfunction isNative(feature: RouterFeatures | NativeRouterFeature): feature is NativeRouterFeature {\n return 'ɵnativeRouter' in feature;\n}\n\nexport function provideNativeRouter(\n routes: Routes,\n ...features: (RouterFeatures | NativeRouterFeature)[]\n): EnvironmentProviders {\n const angular = features.filter((feature): feature is RouterFeatures => !isNative(feature));\n const native = features.filter(isNative).map((feature) => feature.ɵnativeRouter);\n const parentOf = native.find((feature) => feature.linkParent)?.linkParent;\n return makeEnvironmentProviders([\n provideRouter(routes, ...angular),\n ...nativeProviders(parentOf),\n ...native.flatMap((feature) => feature.providers ?? []),\n ]);\n}\n\nfunction nativeProviders(parentOf: LinkParent | undefined): (Provider | EnvironmentProviders)[] {\n // The engine needs the element-to-view-name mapping before the first navigation renders.\n registerScreenComponents();\n\n const shared = [\n // Without this the router never detaches, so a pushed-away screen is destroyed and rebuilt.\n { provide: RouteReuseStrategy, useClass: NativeStackReuseStrategy },\n NativeNavigation,\n provideEnvironmentInitializer(keepHistoryAcrossReloads),\n ];\n if (!parentOf) {\n return [\n {\n provide: PlatformLocation,\n useFactory: () => new NativePlatformLocation(inject(DeepLinks)),\n },\n ...shared,\n ];\n }\n\n return [\n {\n provide: PlatformLocation,\n // The app launches on the page the link belongs under; the link follows once it is shown.\n // Links while running go through the router below rather than straight into history.\n useFactory: () => {\n const initial = inject(DeepLinks).initialUrl();\n return new NativePlatformLocation({\n initialUrl: () => (initial && linkAncestry(initial, parentOf)[0]) || initial,\n subscribe: () => () => {},\n });\n },\n },\n provideEnvironmentInitializer(() => {\n const router = inject(Router);\n const links = inject(DeepLinks);\n const errors = inject(ErrorHandler);\n // A link nobody awaits: a page that fails to load is reported, as a tab tap's is, rather\n // than left as an unhandled rejection. The app's navigation error handler hears it too.\n const follow = (url: string) =>\n followLink(router, url, parentOf).catch((error: unknown) => errors.handleError(error));\n const initial = links.initialUrl();\n if (initial && parentOf(initial)) {\n const first = router.events.subscribe((event) => {\n if (!(event instanceof NavigationEnd)) return;\n first.unsubscribe();\n void follow(initial);\n });\n }\n // A launch link arrives the way any other does, once `getInitialURL()` settles, which is\n // usually while the router's first navigation is still going: following it then cancels that\n // navigation, and the app opens with no root screen under the link. So links wait for it.\n const settled = new Promise<void>((resolve) => {\n if (router.navigated) return resolve();\n const first = router.events.subscribe((event) => {\n if (!isEnd(event)) return;\n first.unsubscribe();\n resolve();\n });\n });\n links.subscribe((url) => void settled.then(() => follow(url)));\n }),\n ...shared,\n ];\n}\n\n/**\n * A history without its round trips: each page once, reached the way it last was. An app that went\n * from one tab to another and back has a history three entries long and is one page deep, and the\n * app that comes back has no use for the detour: gone through at the speed of a reload, the tab\n * bar is still on its way to the second tab when the third navigation asks for the first.\n */\nfunction direct(pages: ParkedPage[]): ParkedPage[] {\n const route: ParkedPage[] = [];\n for (const page of pages) {\n const before = route.findIndex((one) => one.url === page.url);\n if (before !== -1) route.length = before;\n route.push(page);\n }\n return route;\n}\n\ndeclare const __DEV__: boolean | undefined;\n\n/** A push's animation, with room to spare: 350ms on iOS, about the same on Android. */\nconst PUSH_SETTLES = 450;\n\n/**\n * In development, come back from a reload on the page it left: see `route-parking.ts`.\n *\n * The history a reload left is gone through again once the first navigation has ended, as a\n * launch link is and for the same reason. The hook is what `mount`'s reload waits on.\n */\nfunction keepHistoryAcrossReloads(): void {\n // The bare identifier, so a release build folds the rest away.\n if (typeof __DEV__ === 'undefined' || !__DEV__) return;\n const parking = inject(ROUTE_PARKING);\n if (!parking) return;\n const router = inject(Router);\n const history = inject(PlatformLocation);\n const errors = inject(ErrorHandler);\n const scope = globalThis as {\n __angularNativePark?: () => Promise<void>;\n __angularNativeRestoring?: Promise<void>;\n };\n // A page keeps how it was presented, a sheet or a modal, and nothing else of its navigation:\n // a replace has already happened to the history, and an app's own state may not survive JSON.\n const pages = (): ParkedPage[] =>\n history instanceof NativePlatformLocation\n ? history.ɵpages().map(({ url, state }) => {\n const presentation = intentOf(state)?.presentation;\n return presentation ? { url, presentation } : { url };\n })\n : [{ url: router.url }];\n const park = () => parking.park(direct(pages()));\n scope.__angularNativePark = park;\n\n // `mount` keeps the app out of sight until this settles, so the pages arrive unseen.\n const restoring = parking\n .collect()\n .then(async (parked) => {\n if (!parked) return;\n await new Promise<void>((resolve) => {\n if (router.navigated) return resolve();\n const first = router.events.subscribe((event) => {\n if (!isEnd(event)) return;\n first.unsubscribe();\n resolve();\n });\n });\n let moved = false;\n for (const { url, presentation } of parked) {\n if (url === router.url) continue;\n const state = presentation && { [NATIVE_INTENT]: { stack: 'push', presentation } };\n moved = (await router.navigateByUrl(url, { state })) || moved;\n }\n // The last page is still sliding in when its navigation ends.\n if (moved) await new Promise((resolve) => setTimeout(resolve, PUSH_SETTLES));\n })\n .catch((error: unknown) => errors.handleError(error));\n scope.__angularNativeRestoring = restoring;\n inject(DestroyRef).onDestroy(() => {\n if (scope.__angularNativePark === park) delete scope.__angularNativePark;\n if (scope.__angularNativeRestoring === restoring) delete scope.__angularNativeRestoring;\n });\n}\n\n/** A navigation's last event, whichever way it went. */\nfunction isEnd(event: unknown): boolean {\n return (\n event instanceof NavigationEnd ||\n event instanceof NavigationCancel ||\n event instanceof NavigationError\n );\n}\n"]}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Where a development reload leaves the app's history, and finds it again.
|
|
3
|
+
*
|
|
4
|
+
* An edit that cannot be applied to the running app reloads it, and the reload takes the
|
|
5
|
+
* JavaScript runtime with it, the history included: the app came back on its first route, however
|
|
6
|
+
* deep the page being worked on was. Nothing in the app outlives the reload, so the history is
|
|
7
|
+
* left with the dev server, which `withAngularNative` teaches to hold it, and collected by the app
|
|
8
|
+
* that comes back. That app goes through it again, one navigation a page, so each page is a
|
|
9
|
+
* screen with the ones before it beneath and Back retraces them.
|
|
10
|
+
*
|
|
11
|
+
* Only a reload the app started parks anything, and what is parked is handed back once: an app
|
|
12
|
+
* launched afresh, or reloaded from the dev menu, starts where it always does.
|
|
13
|
+
*
|
|
14
|
+
* Page state is not history. A reload still makes every component and service again.
|
|
15
|
+
*/
|
|
16
|
+
import { InjectionToken } from '@angular/core';
|
|
17
|
+
import type { ScreenPresentation } from './screen-presentation.ts';
|
|
18
|
+
/** One page of the history: where it is, and how it arrived if not as a plain push. */
|
|
19
|
+
export interface ParkedPage {
|
|
20
|
+
url: string;
|
|
21
|
+
presentation?: ScreenPresentation;
|
|
22
|
+
}
|
|
23
|
+
export interface RouteParking {
|
|
24
|
+
/** Leave the history, oldest first, for the app that comes back. */
|
|
25
|
+
park(pages: ParkedPage[]): Promise<void>;
|
|
26
|
+
/** The history a reload left, once; null when none did. */
|
|
27
|
+
collect(): Promise<ParkedPage[] | null>;
|
|
28
|
+
}
|
|
29
|
+
/** Null where there is no dev server to park with: a release build, a test, the web. */
|
|
30
|
+
export declare const ROUTE_PARKING: InjectionToken<RouteParking | null>;
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Where a development reload leaves the app's history, and finds it again.
|
|
3
|
+
*
|
|
4
|
+
* An edit that cannot be applied to the running app reloads it, and the reload takes the
|
|
5
|
+
* JavaScript runtime with it, the history included: the app came back on its first route, however
|
|
6
|
+
* deep the page being worked on was. Nothing in the app outlives the reload, so the history is
|
|
7
|
+
* left with the dev server, which `withAngularNative` teaches to hold it, and collected by the app
|
|
8
|
+
* that comes back. That app goes through it again, one navigation a page, so each page is a
|
|
9
|
+
* screen with the ones before it beneath and Back retraces them.
|
|
10
|
+
*
|
|
11
|
+
* Only a reload the app started parks anything, and what is parked is handed back once: an app
|
|
12
|
+
* launched afresh, or reloaded from the dev menu, starts where it always does.
|
|
13
|
+
*
|
|
14
|
+
* Page state is not history. A reload still makes every component and service again.
|
|
15
|
+
*/
|
|
16
|
+
import { InjectionToken } from '@angular/core';
|
|
17
|
+
/** Long enough for a dev server on the same network, and short enough not to hold a reload up. */
|
|
18
|
+
const PARKS_WITHIN = 1000;
|
|
19
|
+
/**
|
|
20
|
+
* Longer, for an app that is starting: its thread is busy loading itself, and a timer that ran
|
|
21
|
+
* out in the meantime is answered before the response that arrived first. On an Android emulator
|
|
22
|
+
* a second was not enough, and the history was taken from the dev server and thrown away.
|
|
23
|
+
*/
|
|
24
|
+
const COLLECTS_WITHIN = 4000;
|
|
25
|
+
/** Null where there is no dev server to park with: a release build, a test, the web. */
|
|
26
|
+
export const ROUTE_PARKING = new InjectionToken('angular-native.routeParking', { factory: devServerParking });
|
|
27
|
+
function devServerParking() {
|
|
28
|
+
if (typeof __DEV__ === 'undefined' || !__DEV__)
|
|
29
|
+
return null;
|
|
30
|
+
let bundle;
|
|
31
|
+
try {
|
|
32
|
+
// Required, and by its own path: React Native does not export it, and ships Flow, which Node
|
|
33
|
+
// cannot parse, so nothing here can be imported where a test runs.
|
|
34
|
+
// @ts-ignore `require` has a type only where the app's tsconfig loads one.
|
|
35
|
+
const module = require('react-native/Libraries/Core/Devtools/getDevServer');
|
|
36
|
+
const server = (module.default ?? module)();
|
|
37
|
+
if (server.bundleLoadedFromServer)
|
|
38
|
+
bundle = server.fullBundleUrl ?? server.url;
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
// No React Native under us.
|
|
42
|
+
}
|
|
43
|
+
const origin = /^https?:\/\/[^/]+/.exec(bundle ?? '')?.[0];
|
|
44
|
+
if (!origin)
|
|
45
|
+
return null;
|
|
46
|
+
const at = `${origin}/__ng-native/route?app=${/[?&]platform=(\w+)/.exec(bundle)?.[1] ?? ''}`;
|
|
47
|
+
const ask = (within, init) => Promise.race([
|
|
48
|
+
fetch(at, init),
|
|
49
|
+
new Promise((_, reject) => setTimeout(() => reject(new Error('timed out')), within)),
|
|
50
|
+
]);
|
|
51
|
+
return {
|
|
52
|
+
park: (pages) => ask(PARKS_WITHIN, { method: 'POST', body: JSON.stringify(pages) }).then(() => { }),
|
|
53
|
+
// A dev server that does not know the address answers with a page, not a history.
|
|
54
|
+
collect: () => ask(COLLECTS_WITHIN)
|
|
55
|
+
.then((response) => (response.ok ? response.json() : null))
|
|
56
|
+
.then((pages) => (Array.isArray(pages) ? pages : null))
|
|
57
|
+
.catch(() => null),
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=route-parking.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"route-parking.js","sourceRoot":"","sources":["../src/route-parking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAkB/C,kGAAkG;AAClG,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B;;;;GAIG;AACH,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,wFAAwF;AACxF,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,cAAc,CAC7C,6BAA6B,EAC7B,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAC9B,CAAC;AAEF,SAAS,gBAAgB;IACvB,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC5D,IAAI,MAA0B,CAAC;IAC/B,IAAI,CAAC;QACH,6FAA6F;QAC7F,mEAAmE;QACnE,2EAA2E;QAC3E,MAAM,MAAM,GAAG,OAAO,CAAC,mDAAmD,CAAc,CAAC;QACzF,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,EAAE,CAAC;QAC5C,IAAI,MAAM,CAAC,sBAAsB;YAAE,MAAM,GAAG,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,GAAG,CAAC;IACjF,CAAC;IAAC,MAAM,CAAC;QACP,4BAA4B;IAC9B,CAAC;IACD,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,EAAE,GAAG,GAAG,MAAM,0BAA0B,oBAAoB,CAAC,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;IAC9F,MAAM,GAAG,GAAG,CAAC,MAAc,EAAE,IAAkB,EAAE,EAAE,CACjD,OAAO,CAAC,IAAI,CAAC;QACX,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC;QACf,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;KAC5F,CAAC,CAAC;IACL,OAAO;QACL,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CACd,GAAG,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QACnF,kFAAkF;QAClF,OAAO,EAAE,GAAG,EAAE,CACZ,GAAG,CAAC,eAAe,CAAC;aACjB,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAC1D,IAAI,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aACjF,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;KACvB,CAAC;AACJ,CAAC","sourcesContent":["/**\n * Where a development reload leaves the app's history, and finds it again.\n *\n * An edit that cannot be applied to the running app reloads it, and the reload takes the\n * JavaScript runtime with it, the history included: the app came back on its first route, however\n * deep the page being worked on was. Nothing in the app outlives the reload, so the history is\n * left with the dev server, which `withAngularNative` teaches to hold it, and collected by the app\n * that comes back. That app goes through it again, one navigation a page, so each page is a\n * screen with the ones before it beneath and Back retraces them.\n *\n * Only a reload the app started parks anything, and what is parked is handed back once: an app\n * launched afresh, or reloaded from the dev menu, starts where it always does.\n *\n * Page state is not history. A reload still makes every component and service again.\n */\nimport { InjectionToken } from '@angular/core';\nimport type { ScreenPresentation } from './screen-presentation.ts';\n\n/** One page of the history: where it is, and how it arrived if not as a plain push. */\nexport interface ParkedPage {\n url: string;\n presentation?: ScreenPresentation;\n}\n\nexport interface RouteParking {\n /** Leave the history, oldest first, for the app that comes back. */\n park(pages: ParkedPage[]): Promise<void>;\n /** The history a reload left, once; null when none did. */\n collect(): Promise<ParkedPage[] | null>;\n}\n\ndeclare const __DEV__: boolean | undefined;\n\n/** Long enough for a dev server on the same network, and short enough not to hold a reload up. */\nconst PARKS_WITHIN = 1000;\n/**\n * Longer, for an app that is starting: its thread is busy loading itself, and a timer that ran\n * out in the meantime is answered before the response that arrived first. On an Android emulator\n * a second was not enough, and the history was taken from the dev server and thrown away.\n */\nconst COLLECTS_WITHIN = 4000;\n\n/** Null where there is no dev server to park with: a release build, a test, the web. */\nexport const ROUTE_PARKING = new InjectionToken<RouteParking | null>(\n 'angular-native.routeParking',\n { factory: devServerParking },\n);\n\nfunction devServerParking(): RouteParking | null {\n if (typeof __DEV__ === 'undefined' || !__DEV__) return null;\n let bundle: string | undefined;\n try {\n // Required, and by its own path: React Native does not export it, and ships Flow, which Node\n // cannot parse, so nothing here can be imported where a test runs.\n // @ts-ignore `require` has a type only where the app's tsconfig loads one.\n const module = require('react-native/Libraries/Core/Devtools/getDevServer') as DevServer;\n const server = (module.default ?? module)();\n if (server.bundleLoadedFromServer) bundle = server.fullBundleUrl ?? server.url;\n } catch {\n // No React Native under us.\n }\n const origin = /^https?:\\/\\/[^/]+/.exec(bundle ?? '')?.[0];\n if (!origin) return null;\n const at = `${origin}/__ng-native/route?app=${/[?&]platform=(\\w+)/.exec(bundle!)?.[1] ?? ''}`;\n const ask = (within: number, init?: RequestInit) =>\n Promise.race([\n fetch(at, init),\n new Promise<never>((_, reject) => setTimeout(() => reject(new Error('timed out')), within)),\n ]);\n return {\n park: (pages) =>\n ask(PARKS_WITHIN, { method: 'POST', body: JSON.stringify(pages) }).then(() => {}),\n // A dev server that does not know the address answers with a page, not a history.\n collect: () =>\n ask(COLLECTS_WITHIN)\n .then((response) => (response.ok ? response.json() : null))\n .then((pages: unknown) => (Array.isArray(pages) ? (pages as ParkedPage[]) : null))\n .catch(() => null),\n };\n}\n\ntype GetDevServer = () => { url: string; fullBundleUrl?: string; bundleLoadedFromServer: boolean };\ntype DevServer = GetDevServer & { default?: GetDevServer };\n"]}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Whether the screen a page is on has a bar above its content: a header that is shown and is not
|
|
3
|
+
* translucent, which the page starts below.
|
|
4
|
+
*
|
|
5
|
+
* The header says so and `<screen-safe-area-view>` reads it. On iOS the screen's own safe area
|
|
6
|
+
* already knows, and is zero at the top under such a bar. Android's has no such thing: its view
|
|
7
|
+
* insets by the status bar whatever is above it, which under the bar is a gap of that height.
|
|
8
|
+
*/
|
|
9
|
+
import { InjectionToken, type WritableSignal } from '@angular/core';
|
|
10
|
+
export declare const SCREEN_HEADER: InjectionToken<WritableSignal<boolean>>;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Whether the screen a page is on has a bar above its content: a header that is shown and is not
|
|
3
|
+
* translucent, which the page starts below.
|
|
4
|
+
*
|
|
5
|
+
* The header says so and `<screen-safe-area-view>` reads it. On iOS the screen's own safe area
|
|
6
|
+
* already knows, and is zero at the top under such a bar. Android's has no such thing: its view
|
|
7
|
+
* insets by the status bar whatever is above it, which under the bar is a gap of that height.
|
|
8
|
+
*/
|
|
9
|
+
import { InjectionToken } from '@angular/core';
|
|
10
|
+
export const SCREEN_HEADER = new InjectionToken('ng-native.router.screen-header');
|
|
11
|
+
//# sourceMappingURL=screen-header.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"screen-header.js","sourceRoot":"","sources":["../src/screen-header.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,cAAc,EAAuB,MAAM,eAAe,CAAC;AAEpE,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,cAAc,CAC7C,gCAAgC,CACjC,CAAC","sourcesContent":["/**\n * Whether the screen a page is on has a bar above its content: a header that is shown and is not\n * translucent, which the page starts below.\n *\n * The header says so and `<screen-safe-area-view>` reads it. On iOS the screen's own safe area\n * already knows, and is zero at the top under such a bar. Android's has no such thing: its view\n * insets by the status bar whatever is above it, which under the bar is a gap of that height.\n */\nimport { InjectionToken, type WritableSignal } from '@angular/core';\n\nexport const SCREEN_HEADER = new InjectionToken<WritableSignal<boolean>>(\n 'ng-native.router.screen-header',\n);\n"]}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import * as i0 from "@angular/core";
|
|
2
|
+
/** The edges of the screen. */
|
|
3
|
+
export type ScreenSafeAreaEdge = 'top' | 'right' | 'bottom' | 'left';
|
|
4
|
+
export declare class ScreenSafeAreaView {
|
|
5
|
+
constructor();
|
|
6
|
+
/** Whether the screen has a bar the page starts below. See `screen-header.ts`. */
|
|
7
|
+
private readonly header;
|
|
8
|
+
private readonly android;
|
|
9
|
+
/** Which edges to inset. Absent insets all four. */
|
|
10
|
+
readonly edges: import("@angular/core").InputSignal<readonly ScreenSafeAreaEdge[] | undefined>;
|
|
11
|
+
/**
|
|
12
|
+
* Native takes all four edges every time, as booleans; a partial record leaves the missing
|
|
13
|
+
* ones at whatever they were.
|
|
14
|
+
*/
|
|
15
|
+
protected readonly resolvedEdges: import("@angular/core").Signal<Record<ScreenSafeAreaEdge, boolean>>;
|
|
16
|
+
static ɵfac: i0.ɵɵFactoryDeclaration<ScreenSafeAreaView, never>;
|
|
17
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<ScreenSafeAreaView, "screen-safe-area-view", never, { "edges": { "alias": "edges"; "required": false; "isSignal": true; }; }, {}, never, ["*"], true, never>;
|
|
18
|
+
}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A view that keeps its content clear of whatever covers the screen it is in: a translucent
|
|
3
|
+
* navigation bar and the search bar under it, the tab bar, the home indicator and the system bars.
|
|
4
|
+
*
|
|
5
|
+
* ```html
|
|
6
|
+
* <native-header title="Planner" />
|
|
7
|
+
* <screen-safe-area-view [edges]="['top']" style="flex: 1">
|
|
8
|
+
* <view class="controls">…</view>
|
|
9
|
+
* <scroll-view>…</scroll-view>
|
|
10
|
+
* </screen-safe-area-view>
|
|
11
|
+
* ```
|
|
12
|
+
*
|
|
13
|
+
* `<safe-area-view>` cannot do this. Its insets come from the nearest `<safe-area-provider>`,
|
|
14
|
+
* which sits at the root of the app, above every bar, and so measures only the window's own
|
|
15
|
+
* unsafe areas: a page under a Liquid Glass header starts behind the bar, and anything pinned to
|
|
16
|
+
* the bottom of a tab ends up under the tab bar.
|
|
17
|
+
*
|
|
18
|
+
* This is react-native-screens' own `RNSSafeAreaView`, which asks the screen it is in instead.
|
|
19
|
+
* On iOS that is the screen's `safeAreaInsets`, which UIKit extends by a translucent navigation
|
|
20
|
+
* bar and by the tab bar, floating or not, on top of the status bar and the home indicator. On
|
|
21
|
+
* Android it is the larger of the bottom navigation bar's height and the system bars. Both follow
|
|
22
|
+
* the bars as they change, rotate, or are hidden.
|
|
23
|
+
*
|
|
24
|
+
* Android's bar is above the page rather than over it, and its view insets the top by the status
|
|
25
|
+
* bar all the same. So under a header that is shown and not translucent the top edge is left
|
|
26
|
+
* alone there, and the page starts under the bar as it does on iOS.
|
|
27
|
+
*
|
|
28
|
+
* **The insets are applied as margin, not padding.** Whatever is beneath the inset shows through
|
|
29
|
+
* it, so a panel whose background has to reach the edge of the screen puts that background on a
|
|
30
|
+
* parent and this inside it: the parent grows by the margin and paints behind the bar, and the
|
|
31
|
+
* content ends where the bar begins.
|
|
32
|
+
*
|
|
33
|
+
* It has to be inside a screen: a page of a stack, or a tab. On iOS, with no screen above it, it
|
|
34
|
+
* insets by nothing.
|
|
35
|
+
*/
|
|
36
|
+
import { Component, ElementRef, computed, inject, input } from '@angular/core';
|
|
37
|
+
import { nativePlatform } from '@ng-native/fabric';
|
|
38
|
+
import { ownHost } from "./own-host.js";
|
|
39
|
+
import { SCREEN_HEADER } from "./screen-header.js";
|
|
40
|
+
import * as i0 from "@angular/core";
|
|
41
|
+
const ALL = ['top', 'right', 'bottom', 'left'];
|
|
42
|
+
export class ScreenSafeAreaView {
|
|
43
|
+
constructor() {
|
|
44
|
+
ownHost(inject(ElementRef).nativeElement, this.constructor);
|
|
45
|
+
}
|
|
46
|
+
/** Whether the screen has a bar the page starts below. See `screen-header.ts`. */
|
|
47
|
+
header = inject(SCREEN_HEADER, { optional: true });
|
|
48
|
+
android = nativePlatform() === 'android';
|
|
49
|
+
/** Which edges to inset. Absent insets all four. */
|
|
50
|
+
edges = input(/* @ts-ignore */
|
|
51
|
+
...(ngDevMode ? [undefined, { debugName: "edges" }] : /* istanbul ignore next */ []));
|
|
52
|
+
/**
|
|
53
|
+
* Native takes all four edges every time, as booleans; a partial record leaves the missing
|
|
54
|
+
* ones at whatever they were.
|
|
55
|
+
*/
|
|
56
|
+
resolvedEdges = computed(() => {
|
|
57
|
+
const edges = this.edges() ?? ALL;
|
|
58
|
+
// Android insets the top by the status bar whatever is above the page, and a bar is.
|
|
59
|
+
const covered = this.android && this.header?.() ? 'top' : null;
|
|
60
|
+
return Object.fromEntries(ALL.map((edge) => [edge, edge !== covered && edges.includes(edge)]));
|
|
61
|
+
}, /* @ts-ignore */
|
|
62
|
+
...(ngDevMode ? [{ debugName: "resolvedEdges" }] : /* istanbul ignore next */ []));
|
|
63
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.2.0", ngImport: i0, type: ScreenSafeAreaView, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
64
|
+
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.1.0", version: "22.2.0", type: ScreenSafeAreaView, isStandalone: true, selector: "screen-safe-area-view", inputs: { edges: { classPropertyName: "edges", publicName: "edges", isSignal: true, isRequired: false, transformFunction: null } }, host: { properties: { "edges": "resolvedEdges()" } }, ngImport: i0, template: '<ng-content />', isInline: true });
|
|
65
|
+
}
|
|
66
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.2.0", ngImport: i0, type: ScreenSafeAreaView, decorators: [{
|
|
67
|
+
type: Component,
|
|
68
|
+
args: [{
|
|
69
|
+
selector: 'screen-safe-area-view',
|
|
70
|
+
template: '<ng-content />',
|
|
71
|
+
host: { '[edges]': 'resolvedEdges()' },
|
|
72
|
+
}]
|
|
73
|
+
}], ctorParameters: () => [], propDecorators: { edges: [{ type: i0.Input, args: [{ isSignal: true, alias: "edges", required: false }] }] } });
|
|
74
|
+
//# sourceMappingURL=screen-safe-area-view.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"screen-safe-area-view.js","sourceRoot":"","sources":["../src/screen-safe-area-view.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAmB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;;AAKnD,MAAM,GAAG,GAAkC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAO9E,MAAM,OAAO,kBAAkB;IAC7B;QACE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,aAA2B,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC5E,CAAC;IAED,kFAAkF;IACjE,MAAM,GAAG,MAAM,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,OAAO,GAAG,cAAc,EAAE,KAAK,SAAS,CAAC;IAE1D,oDAAoD;IAC3C,KAAK,GAAG,KAAK;yFAAiC,CAAC;IAExD;;;OAGG;IACgB,aAAa,GAAG,QAAQ,CAAC,GAAG,EAAE;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC;QAClC,qFAAqF;QACrF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/D,OAAO,MAAM,CAAC,WAAW,CACvB,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAC7B,CAAC;IAC3C,CAAC;sFAAC,CAAC;uGAvBQ,kBAAkB;2FAAlB,kBAAkB,2QAHnB,gBAAgB;;2FAGf,kBAAkB;kBAL9B,SAAS;mBAAC;oBACT,QAAQ,EAAE,uBAAuB;oBACjC,QAAQ,EAAE,gBAAgB;oBAC1B,IAAI,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE;iBACvC","sourcesContent":["/**\n * A view that keeps its content clear of whatever covers the screen it is in: a translucent\n * navigation bar and the search bar under it, the tab bar, the home indicator and the system bars.\n *\n * ```html\n * <native-header title=\"Planner\" />\n * <screen-safe-area-view [edges]=\"['top']\" style=\"flex: 1\">\n * <view class=\"controls\">…</view>\n * <scroll-view>…</scroll-view>\n * </screen-safe-area-view>\n * ```\n *\n * `<safe-area-view>` cannot do this. Its insets come from the nearest `<safe-area-provider>`,\n * which sits at the root of the app, above every bar, and so measures only the window's own\n * unsafe areas: a page under a Liquid Glass header starts behind the bar, and anything pinned to\n * the bottom of a tab ends up under the tab bar.\n *\n * This is react-native-screens' own `RNSSafeAreaView`, which asks the screen it is in instead.\n * On iOS that is the screen's `safeAreaInsets`, which UIKit extends by a translucent navigation\n * bar and by the tab bar, floating or not, on top of the status bar and the home indicator. On\n * Android it is the larger of the bottom navigation bar's height and the system bars. Both follow\n * the bars as they change, rotate, or are hidden.\n *\n * Android's bar is above the page rather than over it, and its view insets the top by the status\n * bar all the same. So under a header that is shown and not translucent the top edge is left\n * alone there, and the page starts under the bar as it does on iOS.\n *\n * **The insets are applied as margin, not padding.** Whatever is beneath the inset shows through\n * it, so a panel whose background has to reach the edge of the screen puts that background on a\n * parent and this inside it: the parent grows by the margin and paints behind the bar, and the\n * content ends where the bar begins.\n *\n * It has to be inside a screen: a page of a stack, or a tab. On iOS, with no screen above it, it\n * insets by nothing.\n */\nimport { Component, ElementRef, computed, inject, input } from '@angular/core';\nimport { nativePlatform, type EngineNode } from '@ng-native/fabric';\nimport { ownHost } from './own-host.ts';\nimport { SCREEN_HEADER } from './screen-header.ts';\n\n/** The edges of the screen. */\nexport type ScreenSafeAreaEdge = 'top' | 'right' | 'bottom' | 'left';\n\nconst ALL: readonly ScreenSafeAreaEdge[] = ['top', 'right', 'bottom', 'left'];\n\n@Component({\n selector: 'screen-safe-area-view',\n template: '<ng-content />',\n host: { '[edges]': 'resolvedEdges()' },\n})\nexport class ScreenSafeAreaView {\n constructor() {\n ownHost(inject(ElementRef).nativeElement as EngineNode, this.constructor);\n }\n\n /** Whether the screen has a bar the page starts below. See `screen-header.ts`. */\n private readonly header = inject(SCREEN_HEADER, { optional: true });\n private readonly android = nativePlatform() === 'android';\n\n /** Which edges to inset. Absent insets all four. */\n readonly edges = input<readonly ScreenSafeAreaEdge[]>();\n\n /**\n * Native takes all four edges every time, as booleans; a partial record leaves the missing\n * ones at whatever they were.\n */\n protected readonly resolvedEdges = computed(() => {\n const edges = this.edges() ?? ALL;\n // Android insets the top by the status bar whatever is above the page, and a bar is.\n const covered = this.android && this.header?.() ? 'top' : null;\n return Object.fromEntries(\n ALL.map((edge) => [edge, edge !== covered && edges.includes(edge)]),\n ) as Record<ScreenSafeAreaEdge, boolean>;\n });\n}\n"]}
|
package/dist/screens.js
CHANGED
|
@@ -40,8 +40,9 @@ export const SCREEN_VIEW_NAMES = {
|
|
|
40
40
|
'RNSScreenStackHeaderSubview',
|
|
41
41
|
{ flexDirection: 'row', alignItems: 'center', justifyContent: 'center' },
|
|
42
42
|
],
|
|
43
|
-
// Insets by what the screen it is in says is covered
|
|
44
|
-
// `
|
|
43
|
+
// Insets by what the screen it is in says is covered: a translucent navigation bar, and the tab
|
|
44
|
+
// bar. See `screen-safe-area-view.ts`. The same name on both platforms.
|
|
45
|
+
'screen-safe-area-view': ['RNSSafeAreaView'],
|
|
45
46
|
'tab-safe-area-view': ['RNSSafeAreaView'],
|
|
46
47
|
};
|
|
47
48
|
/**
|
package/dist/screens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screens.js","sourceRoot":"","sources":["../src/screens.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEpE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAA0D;IACtF,qDAAqD;IACrD,qBAAqB,EAAE,CAAC,gBAAgB,CAAC;IACzC,oFAAoF;IACpF,MAAM,EAAE,CAAC,WAAW,CAAC;IACrB,eAAe,EAAE;QACf,4BAA4B;QAC5B;YACE,QAAQ,EAAE,UAAU;YACpB,KAAK,EAAE,MAAM;YACb,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,eAAe;YAC/B,UAAU,EAAE,QAAQ;SACrB;KACF;IACD,+FAA+F;IAC/F,mBAAmB,EAAE,CAAC,cAAc,CAAC;IACrC,oBAAoB,EAAE;QACpB,6BAA6B;QAC7B,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE;KACzE;IACD,
|
|
1
|
+
{"version":3,"file":"screens.js","sourceRoot":"","sources":["../src/screens.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEpE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAA0D;IACtF,qDAAqD;IACrD,qBAAqB,EAAE,CAAC,gBAAgB,CAAC;IACzC,oFAAoF;IACpF,MAAM,EAAE,CAAC,WAAW,CAAC;IACrB,eAAe,EAAE;QACf,4BAA4B;QAC5B;YACE,QAAQ,EAAE,UAAU;YACpB,KAAK,EAAE,MAAM;YACb,aAAa,EAAE,KAAK;YACpB,cAAc,EAAE,eAAe;YAC/B,UAAU,EAAE,QAAQ;SACrB;KACF;IACD,+FAA+F;IAC/F,mBAAmB,EAAE,CAAC,cAAc,CAAC;IACrC,oBAAoB,EAAE;QACpB,6BAA6B;QAC7B,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE;KACzE;IACD,gGAAgG;IAChG,wEAAwE;IACxE,uBAAuB,EAAE,CAAC,iBAAiB,CAAC;IAC5C,oBAAoB,EAAE,CAAC,iBAAiB,CAAC;CAC1C,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,cAAc,GAAsE;IACxF,oBAAoB,EAAE;QACpB,gBAAgB;QAChB,oBAAoB;QACpB,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;KAC3C;IACD,YAAY,EAAE;QACZ,kBAAkB;QAClB,sBAAsB;QACtB,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE;KACjE;CACF,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,gDAAgD;IAChD,QAAQ,EAAE,CAAC;IACX,oDAAoD;IACpD,aAAa,EAAE,CAAC;IAChB,iCAAiC;IACjC,MAAM,EAAE,CAAC;CACD,CAAC;AAIX;;;;;;;;GAQG;AACH,MAAM,UAAU,wBAAwB;IACtC,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAChF,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAA+C,CAAC,CAAC;IACvF,CAAC;IACD,6FAA6F;IAC7F,kDAAkD;IAClD,yFAAyF;IACzF,gBAAgB,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7F,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QACjF,gBAAgB,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,QAAmC,CAAC,CAAC;IACnF,CAAC;IACD,+FAA+F;IAC/F,+FAA+F;IAC/F,+FAA+F;IAC/F,2FAA2F;IAC3F,aAAa,CAAC,eAAe,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;AAC1E,CAAC","sourcesContent":["/**\n * react-native-screens, driven directly.\n *\n * The native half of navigation already exists as codegen'd Fabric components. We register their\n * names and drive them with `createNode`; their React components are unreachable (hooks) and\n * `react-navigation` is not a dependency.\n *\n * No decorators here on purpose: tests import these at runtime, and Node's type stripping\n * refuses decorators.\n */\nimport { registerHoist, registerViewName } from '@ng-native/fabric';\n\n/**\n * Element name -> codegen'd Fabric component name, and the base style that component's React\n * wrapper would have applied in JS. Element names are lowercase, because the compiler silently\n * empties a template containing a capitalized one.\n *\n * The header's styles are `ScreenStackHeaderConfig.tsx`'s own, and the absolute positioning is\n * load-bearing: without it the config view takes part in the screen's flex layout and every page\n * renders a header's height too far down. `alignItems` is iOS-only there; it is harmless on\n * Android, where the native side lays the bar out itself.\n */\nexport const SCREEN_VIEW_NAMES: Record<string, [viewName: string, defaults?: object]> = {\n // NativeStackOutlet's own host element is the stack.\n 'native-stack-outlet': ['RNSScreenStack'],\n // Created by the outlet, one per activated route; nobody writes this in a template.\n screen: ['RNSScreen'],\n 'native-header': [\n 'RNSScreenStackHeaderConfig',\n {\n position: 'absolute',\n width: '100%',\n flexDirection: 'row',\n justifyContent: 'space-between',\n alignItems: 'center',\n },\n ],\n // Placed in a `<native-header-item type=\"searchBar\">`, as react-native-screens places its own.\n 'native-search-bar': ['RNSSearchBar'],\n 'native-header-item': [\n 'RNSScreenStackHeaderSubview',\n { flexDirection: 'row', alignItems: 'center', justifyContent: 'center' },\n ],\n // Insets by what the screen it is in says is covered: a translucent navigation bar, and the tab\n // bar. See `screen-safe-area-view.ts`. The same name on both platforms.\n 'screen-safe-area-view': ['RNSSafeAreaView'],\n 'tab-safe-area-view': ['RNSSafeAreaView'],\n};\n\n/**\n * The tabs half, which react-native-screens names per platform rather than sharing one component:\n * `RNSTabsHostIOS` wraps a `UITabBarController`, `RNSTabsHostAndroid` a bottom navigation bar,\n * and their props differ enough that the codegen specs are separate files.\n *\n * The fills are `TabsHost.ios.tsx`'s and `TabsScreen.ios.tsx`'s own. A tab screen is positioned\n * absolutely because it is one of several occupying the same space, only one of which is visible.\n */\nconst TAB_VIEW_NAMES: Record<string, [ios: string, android: string, defaults?: object]> = {\n 'native-tabs-outlet': [\n 'RNSTabsHostIOS',\n 'RNSTabsHostAndroid',\n { flex: 1, width: '100%', height: '100%' },\n ],\n 'native-tab': [\n 'RNSTabsScreenIOS',\n 'RNSTabsScreenAndroid',\n { position: 'absolute', flex: 1, width: '100%', height: '100%' },\n ],\n};\n\n/**\n * How visible a screen is. The native stack keeps every screen mounted and reads this rather\n * than adding and removing views, which is what preserves a pushed-away screen's native state.\n *\n * `Screen.tsx` throws if this ever *decreases* while in a native stack, so a screen goes\n * 0 -> 2 on push and is removed outright on pop rather than walked back down.\n */\nexport const ActivityState = {\n /** Off screen, and a candidate for freezing. */\n Inactive: 0,\n /** Mid transition: on screen but not the target. */\n Transitioning: 1,\n /** The screen the user is on. */\n Active: 2,\n} as const;\n\nexport type ActivityStateValue = (typeof ActivityState)[keyof typeof ActivityState];\n\n/**\n * Call once at startup, before the first navigation.\n *\n * The app must also have `react-native-screens` installed so the native side registers these\n * components; this only teaches the engine the element-to-view-name mapping. A name the native\n * side does not know renders as `UnimplementedNativeView`, not an error. None of its JavaScript\n * is imported - Expo Go happens to bundle the native half, which is why the canary worked before\n * it declared the dependency at all, and why an app that forgets it fails only once it ships.\n */\nexport function registerScreenComponents(): void {\n for (const [element, [viewName, defaults]] of Object.entries(SCREEN_VIEW_NAMES)) {\n registerViewName(element, viewName, defaults as Record<string, unknown> | undefined);\n }\n // By platform, chosen when the view is looked up: this runs as the app's config is imported,\n // before its `main.ts` has reported the platform.\n // A window of its own on iOS; see `full-window-overlay.ts`. Its fill is the component's.\n registerViewName('full-window-overlay', { ios: 'RNSFullWindowOverlay', android: 'RCTView' });\n for (const [element, [ios, android, defaults]] of Object.entries(TAB_VIEW_NAMES)) {\n registerViewName(element, { ios, android }, defaults as Record<string, unknown>);\n }\n // `findHeaderConfig` in `RNSScreen.mm` looks at the screen's direct children and no deeper, so\n // a header a page wrote inside a `safe-area-view` or a component of its own commits beside it.\n // Nothing in `RNSScreen.mm` updates the bar when its config is unmounted, so a header an `@if`\n // takes away leaves a config behind that hides the bar, and one that comes back adopts it.\n registerHoist('native-header', 'screen', { standIn: { hidden: true } });\n}\n"]}
|
|
@@ -1,15 +1,8 @@
|
|
|
1
|
+
import { ScreenSafeAreaView, type ScreenSafeAreaEdge } from './screen-safe-area-view.ts';
|
|
1
2
|
import * as i0 from "@angular/core";
|
|
2
3
|
/** The edges of the screen. */
|
|
3
|
-
export type TabSafeAreaEdge =
|
|
4
|
-
export declare class TabSafeAreaView {
|
|
5
|
-
constructor();
|
|
6
|
-
/** Which edges to inset: usually `['bottom']`. Absent insets all four. */
|
|
7
|
-
readonly edges: import("@angular/core").InputSignal<readonly TabSafeAreaEdge[] | undefined>;
|
|
8
|
-
/**
|
|
9
|
-
* Native takes all four edges every time, as booleans; a partial record leaves the missing
|
|
10
|
-
* ones at whatever they were.
|
|
11
|
-
*/
|
|
12
|
-
protected readonly resolvedEdges: import("@angular/core").Signal<Record<TabSafeAreaEdge, boolean>>;
|
|
4
|
+
export type TabSafeAreaEdge = ScreenSafeAreaEdge;
|
|
5
|
+
export declare class TabSafeAreaView extends ScreenSafeAreaView {
|
|
13
6
|
static ɵfac: i0.ɵɵFactoryDeclaration<TabSafeAreaView, never>;
|
|
14
|
-
static ɵcmp: i0.ɵɵComponentDeclaration<TabSafeAreaView, "tab-safe-area-view", never, {
|
|
7
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<TabSafeAreaView, "tab-safe-area-view", never, {}, {}, never, ["*"], true, never>;
|
|
15
8
|
}
|