fix(presentation): keep preferences above the scope fence, dispose routers (R-8.3)
LocaleProvider and ThemeProvider lived inside AppRouter, below the server-state scope fence (and below QueryClientProvider keyed by generation). A session change (FENCED -> READY) unmounted and remounted them, so their live state was thrown away and re-read from storage. The browser router was created in useMemo and never disposed, so every remount (and StrictMode's double useMemo) left a popstate listener behind. - New presentation/providers/preference-providers.tsx: persisted LocaleProvider + ThemeProvider (the wiring T45 added to AppRouter). - bootstrap/runtime-application.tsx: ApplicationProvider > PreferenceProviders > ServerStateGenerationProvider > AppRouter, so the fence only remounts session-scoped UI. - AppRouter no longer mounts Locale/Theme. It creates the router in the effect that disposes it: a disposed router never listens to history again, so useMemo + cleanup would break back/forward under StrictMode's replayed mount. - Tests that mount AppRouter directly now wrap it in PreferenceProviders (router, chunk-recovery-boundary, app-shell, product-feature-switch, locale-platform, reference-feature reference-page). Verified: RED "keeps locale state across a session scope fence and disposes routers" (RuntimeApplication, demo sign-in, storage cleared after choosing en-US) came back in Korean before and passes after; with the providers hoisted but no dispose it fails on popstate listeners (4 added, 0 removed). check:architecture, check:types:app, check:types:test, lint, test:component, test:reference-feature pass; test:unit passes except the pre-existing removal-fixture test (needs generated artifacts/ files absent from a fresh worktree). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
e5ef6ba236
commit
ddf74ed6e9
@@ -0,0 +1,23 @@
|
||||
import type { ReactNode } from "react";
|
||||
|
||||
import { LocaleProvider, normalizeLocale } from "../i18n/index.ts";
|
||||
import { useApplicationPreferences } from "./application-provider.tsx";
|
||||
import { ThemeProvider } from "./theme-provider.tsx";
|
||||
|
||||
/**
|
||||
* User preferences outlive a session. Mount this above the server-state scope
|
||||
* fence so a session change (FENCED → READY) does not reset locale or theme.
|
||||
*/
|
||||
export function PreferenceProviders({
|
||||
children,
|
||||
}: Readonly<{ children: ReactNode }>) {
|
||||
const preferences = useApplicationPreferences();
|
||||
return (
|
||||
<LocaleProvider
|
||||
initialLocale={normalizeLocale(preferences.getLocale() ?? "ko-KR")}
|
||||
onLocaleChange={preferences.setLocale}
|
||||
>
|
||||
<ThemeProvider>{children}</ThemeProvider>
|
||||
</LocaleProvider>
|
||||
);
|
||||
}
|
||||
@@ -3,7 +3,6 @@ import {
|
||||
type ReactNode,
|
||||
Suspense,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
} from "react";
|
||||
@@ -39,16 +38,14 @@ import { ChunkRecoveryBoundary } from "../boundaries/chunk-recovery-boundary.tsx
|
||||
import { ContextErrorBoundary } from "../../platform/errors/context-error-boundary.tsx";
|
||||
import { FeatureErrorBoundary } from "../../platform/errors/feature-error-boundary.tsx";
|
||||
import { Button, PageHeader } from "../design-system/index.ts";
|
||||
import { LocaleProvider, normalizeLocale, useLocale } from "../i18n/index.ts";
|
||||
import { useLocale } from "../i18n/index.ts";
|
||||
import { AppShell } from "../layouts/app-shell.tsx";
|
||||
import {
|
||||
useApplicationDiagnostics,
|
||||
useApplicationPreferences,
|
||||
useApplicationRecovery,
|
||||
useApplicationRuntime,
|
||||
} from "../providers/application-provider.tsx";
|
||||
import { SessionProvider, useSession } from "../providers/session-provider.tsx";
|
||||
import { ThemeProvider } from "../providers/theme-provider.tsx";
|
||||
import {
|
||||
createRedirectLoopGuard,
|
||||
decideRouteAccess,
|
||||
@@ -498,28 +495,30 @@ function createRegisteredRoutes(buildId: string): RouteObject[] {
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Locale and theme come from `PreferenceProviders` above this component, which
|
||||
* the server-state scope fence may remount on a session change.
|
||||
*/
|
||||
export function AppRouter({
|
||||
basename = "/",
|
||||
buildId = "local-build",
|
||||
}: Readonly<{ basename?: string; buildId?: string }>) {
|
||||
const preferences = useApplicationPreferences();
|
||||
const router = useMemo(
|
||||
() =>
|
||||
createBrowserRouter(createRegisteredRoutes(buildId), {
|
||||
basename,
|
||||
}),
|
||||
[basename, buildId],
|
||||
);
|
||||
const [router, setRouter] = useState<ReturnType<
|
||||
typeof createBrowserRouter
|
||||
> | null>(null);
|
||||
// Created in the effect that disposes it: a disposed router never listens
|
||||
// to history again, so StrictMode's replayed mount needs a fresh one, and a
|
||||
// remount must not leave the old router's popstate listener behind.
|
||||
useEffect(() => {
|
||||
const created = createBrowserRouter(createRegisteredRoutes(buildId), {
|
||||
basename,
|
||||
});
|
||||
setRouter(created);
|
||||
return () => created.dispose();
|
||||
}, [basename, buildId]);
|
||||
return (
|
||||
<LocaleProvider
|
||||
initialLocale={normalizeLocale(preferences.getLocale() ?? "ko-KR")}
|
||||
onLocaleChange={preferences.setLocale}
|
||||
>
|
||||
<ThemeProvider>
|
||||
<SessionProvider>
|
||||
<RouterProvider router={router} />
|
||||
</SessionProvider>
|
||||
</ThemeProvider>
|
||||
</LocaleProvider>
|
||||
<SessionProvider>
|
||||
{router ? <RouterProvider router={router} /> : null}
|
||||
</SessionProvider>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user