netjes 0.0.2 → 0.0.4

package/dist/route-tree.d.ts

@@ -1,6 +1,6 @@
 import { Component, type ReactElement, type ReactNode } from 'react';
 import { type Metadata } from './metadata.tsx';
-import type { RouteModules } from './modules.ts';
+import type { ErrorPageProps, RouteModules } from './modules.ts';
 import type { PageKind, Params, SegmentRef } from './payload.ts';
 export type { ErrorPageProps } from './modules.ts';
 type RouteTreeProps = {
@@ -15,6 +15,8 @@ type RouteTreeProps = {
     pageKey: string;
     /** What `reset` does on an error page the server chose: load the page again. */
     retry?: () => void;
+    /** The error an error page (`pageKind` error) gets in place of the one the server's props describe: one caught here. */
+    error?: ErrorPageProps['error'];
     /** Metadata from the C# loader. */
     metadata?: Metadata | undefined;
 };
@@ -42,12 +44,14 @@ export declare class ErrorBoundary extends Component<BoundaryProps, {
     private readonly reset;
     render(): ReactNode;
 }
+/** What a boundary caught, as the Error `error.tsx` gets: an Error as it is, a string as its message, else a stand-in. */
+export declare function asError(error: unknown): ErrorPageProps['error'];
 /**
  * The page wrapped in its segments, outermost first. Per segment, as in the Next.js App Router:
  * layout > template > error boundary > Suspense (loading) > the next segment or the page. Layouts keep their state
  * while the page underneath changes; templates remount.
  */
-export declare function RouteTree({ modules, segments, props, params, status, pageKind, pageKey, retry, metadata }: RouteTreeProps): ReactElement;
+export declare function RouteTree({ modules, segments, props, params, status, pageKind, pageKey, retry, metadata, error }: RouteTreeProps): ReactElement;
 /** Shown for 404s and errors when the app has no not-found or error page of its own. */
 export declare function BuiltInPage({ status, props }: {
     status: number;

package/dist/route-tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-tree.d.ts","sourceRoot":"","sources":["../src/route-tree.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,YAAY,EAAE,KAAK,SAAS,EAA2B,MAAM,OAAO,CAAC;AAC9F,OAAO,EAAE,KAAK,QAAQ,EAAiC,MAAM,gBAAgB,CAAC;AAC9E,OAAO,KAAK,EAAiC,YAAY,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEjE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,iGAAiG;IACjG,QAAQ,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAChC,+GAA+G;IAC/G,OAAO,EAAE,MAAM,CAAC;IAChB,gFAAgF;IAChF,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;IACnB,mCAAmC;IACnC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,2GAA2G;AAC3G,eAAO,MAAM,kBAAkB,iCAAmB,CAAC;AAUnD,KAAK,aAAa,GAAG;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,SAAS,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAA;CAAE,CAAC;AAE5H,0GAA0G;AAC1G,qBAAa,aAAc,SAAQ,SAAS,CAAC,aAAa,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;IACrF,KAAK;QAAK,KAAK,EAAU,OAAO;QAAE,MAAM;MAAU;IAE3D,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO;;;MAE7C;IAEQ,kBAAkB,CAAC,QAAQ,EAAE,aAAa,QAElD;IAED,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuD;IAEpE,MAAM,cAEd;CACF;AAcD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,EAAE,OAAO,EAAE,QAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,cAAc,GAAG,YAAY,CAoC7I;AAWD,wFAAwF;AACxF,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,+BAkBhG"}
+{"version":3,"file":"route-tree.d.ts","sourceRoot":"","sources":["../src/route-tree.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,YAAY,EAAE,KAAK,SAAS,EAA2B,MAAM,OAAO,CAAC;AAE9F,OAAO,EAAE,KAAK,QAAQ,EAAiC,MAAM,gBAAgB,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAiB,YAAY,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEjE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,iGAAiG;IACjG,QAAQ,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAChC,+GAA+G;IAC/G,OAAO,EAAE,MAAM,CAAC;IAChB,gFAAgF;IAChF,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;IACnB,wHAAwH;IACxH,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAChC,mCAAmC;IACnC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,2GAA2G;AAC3G,eAAO,MAAM,kBAAkB,iCAAmB,CAAC;AAUnD,KAAK,aAAa,GAAG;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,SAAS,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAA;CAAE,CAAC;AAE5H,0GAA0G;AAC1G,qBAAa,aAAc,SAAQ,SAAS,CAAC,aAAa,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;IACrF,KAAK;QAAK,KAAK,EAAU,OAAO;QAAE,MAAM;MAAU;IAE3D,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO;;;MAE7C;IAEQ,kBAAkB,CAAC,QAAQ,EAAE,aAAa,QAElD;IAED,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuD;IAEpE,MAAM,cAEd;CACF;AAED,0HAA0H;AAC1H,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAG/D;AAgBD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,EAAE,OAAO,EAAE,QAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,cAAc,GAAG,YAAY,CAoCpJ;AAWD,wFAAwF;AACxF,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,+BAkBhG"}

package/dist/route-tree.js

@@ -1,5 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Component, Suspense, createContext } from 'react';
+import { withheldError } from './errors.js';
 import { MetadataTags, resolveMetadata } from './metadata.js';
 /** How many URL segments the layout rendering here covers: what useSelectedLayoutSegment(s) count from. */
 export const LayoutDepthContext = createContext(0);
@@ -25,16 +26,25 @@ export class ErrorBoundary extends Component {
         return this.state.failed ? this.props.fallback(this.state.error, this.reset) : this.props.children;
     }
 }
-function asError(error) {
-    return error instanceof Error ? error : new Error(typeof error === 'string' ? error : 'Something went wrong');
+/** What a boundary caught, as the Error `error.tsx` gets: an Error as it is, a string as its message, else a stand-in. */
+export function asError(error) {
+    if (error instanceof Error)
+        return error;
+    return typeof error === 'string' ? new Error(error) : withheldError();
 }
-/** The error the server reported (props of the error page it rendered), as an Error for `error.tsx`. */
+/**
+ * The error the server reported (props of the error page it rendered), as an Error for `error.tsx`: marked withheld
+ * when the server says its message stands in for the exception's, and with the server's stack or none, never the
+ * stack of the code here that built it.
+ */
 function serverError(props) {
     const error = new Error(typeof props.message === 'string' ? props.message : 'Something went wrong');
     if (typeof props.status === 'number')
         error.status = props.status;
-    if (typeof props.stack === 'string')
-        error.stack = props.stack;
+    if (props.withheld === true)
+        error.withheld = true;
+    // Defined rather than assigned, as an own property: Firefox keeps the stack in an accessor on Error.prototype.
+    Object.defineProperty(error, 'stack', { value: typeof props.stack === 'string' ? props.stack : undefined, writable: true, configurable: true });
     return error;
 }
 /**
@@ -42,9 +52,9 @@ function serverError(props) {
  * layout > template > error boundary > Suspense (loading) > the next segment or the page. Layouts keep their state
  * while the page underneath changes; templates remount.
  */
-export function RouteTree({ modules, segments = [], props, params, status, pageKind, pageKey, retry, metadata }) {
+export function RouteTree({ modules, segments = [], props, params, status, pageKind, pageKey, retry, metadata, error }) {
     const Page = modules.page;
-    const pageProps = pageKind === 'error' ? { ...props, error: serverError(props), reset: retry ?? (() => { }) } : props;
+    const pageProps = pageKind === 'error' ? { ...props, error: error ?? serverError(props), reset: retry ?? (() => { }) } : props;
     let element = Page ? _jsx(Page, { ...pageProps }, pageKey) : _jsx(BuiltInPage, { status: status, props: props }, pageKey);
     for (let i = modules.segments.length - 1; i >= 0; i--) {
         const { Layout, Template, Loading, Error: SegmentError, slots } = modules.segments[i];

package/dist/route-tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-tree.js","sourceRoot":"","sources":["../src/route-tree.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"route-tree.js","sourceRoot":"","sources":["../src/route-tree.tsx"],"names":[],"mappings":"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"}

package/dist/router.d.ts

@@ -19,15 +19,23 @@ export type NavigationState = {
 };
 /** The client router that `useRouter()` returns. */
 export type Router = {
+    /**
+     * Navigates, adding a history entry. The promise resolves once the router has handed the page to React, which can be
+     * before React shows it, or once the navigation has ended another way.
+     */
     push(href: Href, options?: {
         scroll?: boolean;
     }): Promise<void>;
+    /** Navigates, replacing the history entry. The promise resolves as `push`'s does. */
     replace(href: Href, options?: {
         scroll?: boolean;
     }): Promise<void>;
-    /** Fetches the page payload and modules ahead of a navigation. Links do this on hover and focus. */
+    /** Fetches the page payload and modules ahead of a navigation. Links do this on hover, focus and touch. */
     prefetch(href: Href): void;
-    /** Re-runs the current page's loader and re-renders with the new props. */
+    /**
+     * Runs every loader of the page on screen again, layout loaders included, and renders the page with the new props, in
+     * the same history entry and without scrolling. The promise resolves as `push`'s does.
+     */
     refresh(): Promise<void>;
     back(): void;
     forward(): void;
@@ -35,8 +43,22 @@ export type Router = {
 export type SubmitBody = EncodedForm;
 /** Called with every server action response, e.g. by the query shell to apply query updates. */
 export type ActionListener = (response: ActionResponse) => void;
-export type InternalRouter = Router & {
-    submit(action: URL, body: SubmitBody): Promise<void>;
+/**
+ * What `<Link>` and `<Form>` also pass: what had the focus before the app's own `onClick` or `onSubmit` ran. Those run
+ * as the navigation starts, so where they move the focus, such as back to the button of a menu that closes, is where
+ * the navigation put it.
+ */
+type FocusAtStart = {
+    focusedAtStart?: Element | null;
+};
+export type InternalRouter = Omit<Router, 'push' | 'replace'> & {
+    push(href: Href, options?: {
+        scroll?: boolean;
+    } & FocusAtStart): Promise<void>;
+    replace(href: Href, options?: {
+        scroll?: boolean;
+    } & FocusAtStart): Promise<void>;
+    submit(action: URL, body: SubmitBody, options?: FocusAtStart): Promise<void>;
     onActionResponse(listener: ActionListener): () => void;
     /**
      * Called as soon as a server action call or form post says it set or deleted a cookie (signed someone in or out),
@@ -82,7 +104,7 @@ export declare function useInternalRouter(): InternalRouter;
 export declare function useRouter(): Router;
 /** The path without the base path, as the app's routes see it (like Next.js's `usePathname` with `basePath`). */
 export declare function usePathname(): string;
-/** An href for a plain `<a>` or attribute, under the base path: what `<Link>` does for its own. */
+/** An href for a plain `<a>`, another attribute or a `fetch`, under the base path: what `<Link>` does for its own. */
 export declare function useHref(href: string): string;
 /** `UsePathBase`'s base path for this page, or '' when the app is mounted at the root. */
 export declare function useBasePath(): string;
@@ -115,4 +137,5 @@ export declare function useSelectedLayoutSegment(): string | null;
 export declare function usePagePayload(): PagePayload;
 /** The router's state: `loading` during a navigation, `submitting` during a form post, else `idle` (with `error` after a post that produced no page). */
 export declare function useNavigation(): NavigationState;
+export {};
 //# sourceMappingURL=router.d.ts.map

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"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"}

package/dist/router.js

@@ -1,19 +1,33 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Suspense, createContext, startTransition, use, useContext, useEffect, useLayoutEffect, useMemo, useState, } from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Suspense, createContext, startTransition, use, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState, } from 'react';
 import { actionRequest, expectActionClient, fetchAction, setActionClient } from './actions.js';
 import { deferredRegistry, revivePayload } from './deferred.js';
 import { MissingModuleError } from './modules.js';
+import { moveFocusAfterNavigation } from './navigation-focus.js';
 import { COOKIES_HEADER, DATA_HEADER, SEGMENTS_HEADER, SERVER_TIME_HEADER, parseAntiforgery, parseNavigationPayload, } from './payload.js';
-import { ErrorBoundary, LayoutDepthContext, RouteTree } from './route-tree.js';
+import { RouteAnnouncer } from './route-announcer.js';
+import { ErrorBoundary, LayoutDepthContext, RouteTree, asError } from './route-tree.js';
 import { parseLenient, parseWith } from './schema.js';
 function isLoaded(result) {
     return 'payload' in result;
 }
+/**
+ * What remounts the page and its templates when it changes: the page's path, or for an intercepted page the key of the
+ * page under it, which stays on screen. Two views with one key show the same page.
+ */
+const pageKeyOf = (loaded) => loaded.pageKey ?? loaded.url.pathname;
 const IDLE = { state: 'idle' };
 const ANTIFORGERY_URL = '/_netjes/antiforgery';
 const NONE = { kind: 'none' };
 const TOP = { kind: 'top' };
 const STATE_KEY = '__netjes';
+/**
+ * On `<html>` while the client router runs in the document, and the public sign that it does: end-to-end tests wait
+ * for it before they click. (The history entry's key is no such sign: the entry keeps it when the browser loads the
+ * document again.) The effect that sets it must stay after the one that registers the router as the action client,
+ * so that once it shows, the router has keyed the entry, listens for back and forward, and runs server action calls.
+ */
+const HYDRATED_ATTRIBUTE = 'data-netjes-hydrated';
 const PREFETCH_TTL_MS = 30_000;
 const MAX_REDIRECTS = 10;
 const MAX_REMEMBERED_ENTRIES = 50;
@@ -247,7 +261,8 @@ class Navigator {
         this.channel?.close();
         this.channel = null;
     }
-    async navigate(href, history, scroll) {
+    /** `focusedAtStart`: what had the focus as the navigation started, by default what has it as this is called. */
+    async navigate(href, history, scroll, focusedAtStart = document.activeElement) {
         const url = new URL(withBasePath(href, this.deps.basePath), window.location.href);
         if (!isWebUrl(url)) {
             console.error(`netjes: refusing to navigate to ${url.protocol} URL`);
@@ -264,7 +279,7 @@ class Navigator {
             const key = createKey();
             window.history[history === 'push' ? 'pushState' : 'replaceState']({ [STATE_KEY]: key }, '', url.href);
             this.setCurrent(key, { ...this.current, url });
-            this.deps.commit(this.current, scroll ? { kind: 'hash', hash: url.hash } : NONE);
+            this.deps.commit(this.current, scroll ? { kind: 'hash', hash: url.hash } : NONE, focusedAtStart);
             return;
         }
         await this.go(url, { method: 'GET' }, {
@@ -273,10 +288,11 @@ class Navigator {
             pending: 'loading',
             usePrefetch: true,
             reuseSegments: true,
+            focusedAtStart,
         });
     }
-    submit(action, body) {
-        return this.go(action, { method: 'POST', ...body }, { history: 'auto', scroll: 'auto', pending: 'submitting', usePrefetch: false, reuseSegments: false });
+    submit(action, body, focusedAtStart = document.activeElement) {
+        return this.go(action, { method: 'POST', ...body }, { history: 'auto', scroll: 'auto', pending: 'submitting', usePrefetch: false, reuseSegments: false, focusedAtStart });
     }
     /**
      * Loads the page on screen again, in place: same history entry, fragment and scroll position. `keepPrefetched` after
@@ -420,12 +436,16 @@ class Navigator {
         if (known) {
             this.active?.controller.abort();
             this.setCurrent(key, { ...known, url });
-            this.deps.commit(this.current, scroll);
+            this.deps.commit(this.current, scroll, document.activeElement);
             return;
         }
         void this.go(url, { method: 'GET' }, { history: 'none', scroll, pending: 'loading', key, usePrefetch: false, reuseSegments: true });
     }
     async go(url, request, options) {
+        // Read before anything this navigation starts can move it: inside the click (or the keypress) that started it,
+        // before React has handled that event's own state updates, such as a menu that closes. navigate() and submit()
+        // pass what they read, or what a link or a form read before the app's own handler ran.
+        const focusedAtStart = options.focusedAtStart === undefined ? document.activeElement : options.focusedAtStart;
         if (url.origin !== window.location.origin) {
             // navigate() and Form hand other origins to the browser, and every page URL the router keeps is on this one.
             // Refuse one that gets here all the same: a failed load would send the browser to it.
@@ -505,7 +525,7 @@ class Navigator {
             this.forgetToken();
             committed = true;
             const scroll = shown.base ? NONE : options.scroll === 'auto' ? (shown.url.pathname === previous.pathname ? NONE : TOP) : options.scroll;
-            this.deps.commit(shown, scroll);
+            this.deps.commit(shown, scroll, focusedAtStart);
         }
         catch (error) {
             if (controller.signal.aborted)
@@ -678,23 +698,24 @@ function elementForFragment(fragment) {
     }
     return document.getElementById(decoded) ?? document.getElementById(fragment);
 }
+/** Scrolls as the intent says, and returns the element a fragment names, which then takes the focus. */
 function applyScroll(intent) {
     switch (intent.kind) {
         case 'none':
-            return;
+            return null;
         case 'top':
             window.scrollTo(0, 0);
-            return;
+            return null;
         case 'restore':
             window.scrollTo(intent.x, intent.y);
-            return;
+            return null;
         case 'hash': {
             const target = elementForFragment(intent.hash.slice(1));
             if (target)
                 target.scrollIntoView();
             else
                 window.scrollTo(0, 0);
-            return;
+            return target;
         }
         default: {
             const exhaustive = intent;
@@ -737,6 +758,7 @@ export function RouterProvider({ initial, initialModules, loader, errorPage, har
         },
         id: 0,
         scroll: NONE,
+        focusedAtStart: null,
     }));
     const [navigation, setNavigation] = useState(IDLE);
     const [navigator] = useState(() => {
@@ -751,8 +773,8 @@ export function RouterProvider({ initial, initialModules, loader, errorPage, har
             showDocument,
             download,
             setPending: setNavigation,
-            commit: (loaded, scroll) => startTransition(() => {
-                setView((previous) => ({ loaded, id: previous.id + 1, scroll }));
+            commit: (loaded, scroll, focusedAtStart) => startTransition(() => {
+                setView((previous) => ({ loaded, id: previous.id + 1, scroll, focusedAtStart }));
                 setNavigation(IDLE);
             }),
         }, view.loaded);
@@ -811,18 +833,36 @@ export function RouterProvider({ initial, initialModules, loader, errorPage, har
             return response;
         },
     }), [navigator, actionListeners]);
+    // Directly after the registration above, and in a passive effect, never a layout one: React runs a component's
+    // effects in order, a commit's layout effects before any passive one, and the mark must not show while server
+    // action calls still wait for the router.
+    useEffect(() => {
+        const html = document.documentElement;
+        html.setAttribute(HYDRATED_ATTRIBUTE, '');
+        return () => html.removeAttribute(HYDRATED_ATTRIBUTE);
+    }, []);
+    // The key of the page on screen before this commit.
+    const committedPageKey = useRef(pageKeyOf(view.loaded));
+    // In the commit that shows the page, before the browser paints it, and after the layout effects of the page and its
+    // layouts, which have focused an autoFocus element by then. Every focus call keeps the scroll position applyScroll
+    // sets, the one Back restores included.
     useLayoutEffect(() => {
-        if (view.id > 0)
-            applyScroll(view.scroll);
+        if (view.id === 0)
+            return;
+        const target = applyScroll(view.scroll);
+        const key = pageKeyOf(view.loaded);
+        const replaced = key !== committedPageKey.current;
+        committedPageKey.current = key;
+        moveFocusAfterNavigation({ target, replaced, keep: view.scroll.kind === 'none', focusedAtStart: view.focusedAtStart });
     }, [view]);
     const router = useMemo(() => ({
-        push: (href, options) => navigator.navigate(href, 'push', options?.scroll ?? true),
-        replace: (href, options) => navigator.navigate(href, 'replace', options?.scroll ?? true),
+        push: (href, options) => navigator.navigate(href, 'push', options?.scroll ?? true, options?.focusedAtStart),
+        replace: (href, options) => navigator.navigate(href, 'replace', options?.scroll ?? true, options?.focusedAtStart),
         prefetch: (href) => navigator.prefetch(href),
         refresh: () => navigator.refresh(),
         back: () => window.history.back(),
         forward: () => window.history.forward(),
-        submit: (action, body) => navigator.submit(action, body),
+        submit: (action, body, options) => navigator.submit(action, body, options?.focusedAtStart),
         onActionResponse: (listener) => {
             actionListeners.add(listener);
             return () => actionListeners.delete(listener);
@@ -831,11 +871,16 @@ export function RouterProvider({ initial, initialModules, loader, errorPage, har
     }), [navigator, actionListeners]);
     const { payload, modules, url } = view.loaded;
     const viewValue = useMemo(() => ({ payload, url }), [payload, url]);
-    return (_jsx(RouterContext, { value: router, children: _jsx(ViewContext, { value: viewValue, children: _jsx(NavigationContext, { value: navigation, children: _jsx(Shell, { children: _jsx(ErrorBoundary, { resetKey: view.id, fallback: (error) => _jsx(ErrorFallback, { error: error, errorPage: errorPage, loader: loader, payload: payload }), children: _jsx(RouteTree, { modules: modules, segments: payload.segments, props: payload.props, params: payload.params, status: payload.status, pageKind: payload.pageKind, pageKey: view.loaded.pageKey ?? url.pathname, retry: () => void router.refresh(), metadata: payload.metadata }) }) }) }) }) }));
+    return (_jsx(RouterContext, { value: router, children: _jsx(ViewContext, { value: viewValue, children: _jsxs(NavigationContext, { value: navigation, children: [_jsx(Shell, { children: _jsx(ErrorBoundary, { resetKey: view.id, fallback: (error) => _jsx(ErrorFallback, { error: error, errorPage: errorPage, loader: loader, payload: payload }), children: _jsx(RouteTree, { modules: modules, segments: payload.segments, props: payload.props, params: payload.params, status: payload.status, pageKind: payload.pageKind, pageKey: pageKeyOf(view.loaded), retry: () => void router.refresh(), metadata: payload.metadata }) }) }), _jsx(RouteAnnouncer, { location: url.pathname + url.search, path: withoutBasePath(url.pathname, payload.basePath ?? '') })] }) }) }));
 }
 const errorPageModules = new WeakMap();
+/**
+ * What the router shows for an error no segment's boundary caught: the app's root error page, handed the error as it
+ * was thrown (its class, its stack, a server action's status), or the built-in page, which says 500.
+ */
 function ErrorFallback({ error, errorPage, loader, payload }) {
-    const props = { status: 500, message: error instanceof Error ? error.message : 'Something went wrong' };
+    const caught = asError(error);
+    const props = { status: 500, message: caught.message };
     const builtIn = _jsx(RouteTree, { modules: { page: null, segments: [] }, props: props, params: payload.params, status: 500, pageKey: "error" });
     if (!errorPage)
         return builtIn;
@@ -844,10 +889,10 @@ function ErrorFallback({ error, errorPage, loader, payload }) {
         modules = loader.loadRoute(errorPage);
         errorPageModules.set(loader, modules);
     }
-    return (_jsx(ErrorBoundary, { resetKey: 0, fallback: () => builtIn, children: _jsx(Suspense, { fallback: null, children: _jsx(LoadedErrorPage, { modules: modules, props: props, payload: payload }) }) }));
+    return (_jsx(ErrorBoundary, { resetKey: 0, fallback: () => builtIn, children: _jsx(Suspense, { fallback: null, children: _jsx(LoadedErrorPage, { modules: modules, props: props, error: caught, payload: payload }) }) }));
 }
-function LoadedErrorPage({ modules, props, payload }) {
-    return _jsx(RouteTree, { modules: use(modules), props: props, params: payload.params, status: 500, pageKind: "error", pageKey: "error" });
+function LoadedErrorPage({ modules, props, error, payload, }) {
+    return _jsx(RouteTree, { modules: use(modules), props: props, params: payload.params, status: 500, pageKind: "error", pageKey: "error", error: error });
 }
 /** The router's contexts without the router: for the test harness (netjes/testing), which fakes navigation. */
 export function RouterContexts({ router, payload, url, navigation, children, }) {
@@ -875,7 +920,7 @@ export function usePathname() {
     const { url, payload } = useView();
     return withoutBasePath(url.pathname, payload.basePath ?? '');
 }
-/** An href for a plain `<a>` or attribute, under the base path: what `<Link>` does for its own. */
+/** An href for a plain `<a>`, another attribute or a `fetch`, under the base path: what `<Link>` does for its own. */
 export function useHref(href) {
     return withBasePath(href, useBasePath());
 }