Skip to content

refactor: hoist constants out of Router component #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uhyo merged 1 commit into from
Feb 7, 2026
Merged

refactor: hoist constants out of Router component #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions packages/router/src/Router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ import { createAdapter } from "./core/createAdapter.js";
import { executeLoaders, createLoaderRequest } from "./core/loaderCache.js";
import type { RouteDefinition } from "./route.js";

const noopSubscribe = () => () => {};
const getServerSnapshot = () => null;

export type RouterProps = {
routes: RouteDefinition[];
/**
Expand Down Expand Up @@ -61,9 +64,7 @@ export function Router({
const [blockerRegistry] = useState(() => createBlockerRegistry());

// Hydration-aware initial value: null during SSR/hydration, real on client-only mount
const noopSubscribe = useCallback(() => () => {}, []);
const getSnapshot = useCallback(() => adapter.getSnapshot(), [adapter]);
const getServerSnapshot = useCallback(() => null, []);
const initialEntry = useSyncExternalStore(
noopSubscribe,
getSnapshot,
Expand All @@ -75,13 +76,8 @@ export function Router({
initialEntry,
);

// Subscribe to navigation changes and sync state
// Subscribe to navigation changes (wrapped in transition)
useEffect(() => {
// Immediately sync with current snapshot on mount
// This handles the case where the snapshot changed between SSR and hydration
setLocationEntry(adapter.getSnapshot());

// Subscribe to future changes (wrapped in transition)
return adapter.subscribe(() => {
startTransition(() => {
setLocationEntry(adapter.getSnapshot());
Expand Down