fix: Preserve existing nested scroll positions across SPA navigations that create new restoration keys

[schiller-manuel]

No description provided.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: ccbb02c5-dc3b-409c-a67d-9ff26b5a1530

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch fix-scroll-nested

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[nx-cloud]

View your CI Pipeline Execution ↗ for commit d725a17

Command	Status	Duration	Result
nx affected --targets=test:eslint,test:unit,tes...	✅ Succeeded	7m 11s	View ↗

---

☁️ Nx Cloud last updated this comment at 2026-05-03 21:30:30 UTC

[github-actions]

🚀 Changeset Version Preview

4 package(s) bumped directly, 19 bumped as dependents.

🟩 Patch bumps

Package	Version	Reason
@tanstack/react-router	1.169.1 → 1.169.2	Changeset
@tanstack/router-core	1.169.1 → 1.169.2	Changeset
@tanstack/solid-router	1.169.1 → 1.169.2	Changeset
@tanstack/vue-router	1.169.1 → 1.169.2	Changeset
@tanstack/react-start	1.167.61 → 1.167.62	Dependent
@tanstack/react-start-client	1.166.47 → 1.166.48	Dependent
@tanstack/react-start-rsc	0.0.40 → 0.0.41	Dependent
@tanstack/react-start-server	1.166.50 → 1.166.51	Dependent
@tanstack/router-cli	1.166.40 → 1.166.41	Dependent
@tanstack/router-generator	1.166.39 → 1.166.40	Dependent
@tanstack/router-plugin	1.167.32 → 1.167.33	Dependent
@tanstack/router-vite-plugin	1.166.47 → 1.166.48	Dependent
@tanstack/solid-start	1.167.58 → 1.167.59	Dependent
@tanstack/solid-start-client	1.166.46 → 1.166.47	Dependent
@tanstack/solid-start-server	1.166.49 → 1.166.50	Dependent
@tanstack/start-client-core	1.168.1 → 1.168.2	Dependent
@tanstack/start-plugin-core	1.169.16 → 1.169.17	Dependent
@tanstack/start-server-core	1.167.28 → 1.167.29	Dependent
@tanstack/start-static-server-functions	1.166.40 → 1.166.41	Dependent
@tanstack/start-storage-context	1.166.34 → 1.166.35	Dependent
@tanstack/vue-start	1.167.54 → 1.167.55	Dependent
@tanstack/vue-start-client	1.166.42 → 1.166.43	Dependent
@tanstack/vue-start-server	1.166.45 → 1.166.46	Dependent

[github-actions]

Bundle Size Benchmarks

• Commit: 15df770b561e
• Measured at: 2026-05-03T21:17:00.847Z
• Baseline source: history:afa40ef46c27
• Dashboard: bundle-size history

Scenario	Current (gzip)	Delta vs baseline	Raw	Brotli	Trend
react-router.minimal	87.18 KiB	+26 B (+0.03%)	274.05 KiB	75.94 KiB	▁▁▁▁▁▁▁▁▁▁▁█
react-router.full	90.72 KiB	+38 B (+0.04%)	285.57 KiB	78.83 KiB	▁▁▁▁▁▁▁▁▁▁▁█
solid-router.minimal	35.42 KiB	+34 B (+0.09%)	106.37 KiB	31.93 KiB	▁▁▁▁▁▁▁▁▁▁▁█
solid-router.full	40.16 KiB	+56 B (+0.14%)	120.58 KiB	36.13 KiB	▁▁▁▁▁▁▁▁▁▁▁█
vue-router.minimal	53.22 KiB	+70 B (+0.13%)	151.51 KiB	47.83 KiB	▁▁▁▁▁▁▁▁▁▁▁█
vue-router.full	58.33 KiB	+55 B (+0.09%)	167.69 KiB	52.30 KiB	▁▁▁▁▁▁▁▁▁▁▁█
react-start.minimal	101.83 KiB	+71 B (+0.07%)	322.21 KiB	88.07 KiB	▁▁▁▁▁▁▁▁▁▁▁█
react-start.full	105.24 KiB	+56 B (+0.05%)	332.55 KiB	91.01 KiB	▁▁▁▁▁▁▁▁▁▁▁█
react-start.rsbuild.minimal	99.40 KiB	+72 B (+0.07%)	316.60 KiB	85.53 KiB	▁▁▁▁▁▁▁▁▁▁▁█
react-start.rsbuild.full	102.70 KiB	+68 B (+0.06%)	327.02 KiB	88.33 KiB	▁▁▁▁▁▁▁▁▁▁▁█
solid-start.minimal	49.46 KiB	+60 B (+0.12%)	152.19 KiB	43.69 KiB	▁▁▁▁▁▁▁▁▁▁▁█
solid-start.full	55.25 KiB	+59 B (+0.10%)	169.10 KiB	48.65 KiB	▁▁▁▁▁▁▁▁▁▁▁█

Trend sparkline is historical gzip bytes ending with this PR measurement; lower is better.

[pkg-pr-new]

More templates

• tanstack-router-solid-example-authenticated-routes
• tanstack-router-solid-example-authenticated-routes-firebase
• tanstack-router-solid-example-basic
• tanstack-router-solid-example-basic-default-search-params
• tanstack-router-solid-example-basic-devtools-panel
• tanstack-router-solid-example-basic-file-based
• tanstack-router-solid-example-basic-non-nested-devtools
• tanstack-router-solid-example-basic-solid-query
• tanstack-router-solid-example-basic-solid-query-file-based
• tanstack-router-solid-example-basic-ssr-file-based
• tanstack-router-solid-example-basic-ssr-streaming-file-based
• tanstack-router-solid-example-basic-virtual-file-based
• tanstack-router-solid-example-basic-virtual-inside-file-based
• tanstack-router-solid-example-deferred-data
• tanstack-router-solid-i18n-paraglide
• tanstack-router-solid-example-kitchen-sink
• tanstack-router-solid-example-kitchen-sink-file-based
• tanstack-router-solid-example-kitchen-sink-solid-query
• tanstack-router-solid-example-kitchen-sink-solid-query-file-based
• tanstack-router-solid-example-large-file-based
• tanstack-router-solid-example-location-masking
• tanstack-router-solid-example-navigation-blocking
• tanstack-router-solid-example-quickstart
• tanstack-router-solid-example-quickstart-esbuild-file-based
• tanstack-router-solid-example-quickstart-file-based
• tanstack-router-solid-example-quickstart-rspack-file-based
• tanstack-router-solid-example-quickstart-webpack-file-based
• @tanstack/router-solid-mono-simple
• router-solid-mono-simple-lazy
• router-solid-monorepo-solid-query
• tanstack-router-solid-example-scroll-restoration
• tanstack-solid-router-search-validator-adapters
• tanstack-solid-start-example-basic
• tanstack-solid-start-example-basic-auth
• tanstack-solid-start-example-basic-authjs
• tanstack-solid-start-example-basic-cloudflare
• tanstack-solid-start-example-basic-netlify
• tanstack-solid-start-example-basic-nitro
• tanstack-start-example-basic-solid-query
• tanstack-solid-start-example-basic-static
• tanstack-solid-start-bun-hosting
• tanstack-solid-start-example-convex-better-auth
• tanstack-solid-start-example-counter
• tanstack-solid-start-i18n-paraglide
• tanstack-solid-start-example-large
• tanstack-solid-start-streaming-data-from-server-functions
• tanstack-solid-start-example-supabase-basic
• tanstack-solid-start-tailwind-v4
• tanstack-router-solid-example-view-transitions
• tanstack-router-solid-example-with-framer-motion
• tanstack-router-solid-example-with-trpc
• tanstack-router-vue-example-basic-jsx
• tanstack-router-vue-example-basic-file-based-jsx
• tanstack-router-vue-example-basic-file-based-sfc
• tanstack-router-react-example-authenticated-routes
• tanstack-router-react-example-authenticated-routes-firebase
• tanstack-router-react-example-basic
• tanstack-router-react-example-basic-default-search-params
• tanstack-router-react-example-basic-devtools-panel
• tanstack-router-react-example-basic-file-based
• tanstack-router-react-example-basic-non-nested-devtools
• tanstack-router-react-example-react-query
• tanstack-router-react-example-basic-react-query-file-based
• tanstack-router-react-example-basic-ssr-file-based
• tanstack-router-react-example-basic-ssr-streaming-file-based
• tanstack-router-react-example-basic-virtual-file-based
• tanstack-router-react-example-basic-virtual-inside-file-based
• tanstack-router-react-example-deferred-data
• tanstack-router-i18n-paraglide
• tanstack-router-react-example-kitchen-sink
• tanstack-router-react-example-kitchen-sink-file-based
• tanstack-router-react-example-kitchen-sink-react-query
• tanstack-router-react-example-kitchen-sink-react-query-file-based
• tanstack-router-react-example-large-file-based
• tanstack-router-react-example-location-masking
• tanstack-router-react-example-navigation-blocking
• tanstack-router-react-example-quickstart
• tanstack-router-react-example-quickstart-esbuild-file-based
• tanstack-router-react-example-quickstart-file-based
• tanstack-router-react-example-quickstart-rspack-file-based
• tanstack-router-react-example-quickstart-webpack-file-based
• router-monorepo-react-query
• router-mono-simple
• router-mono-simple-lazy
• tanstack-router-react-example-scroll-restoration
• tanstack-search-validator-adapters
• tanstack-start-example-bare
• tanstack-start-example-basic
• tanstack-start-example-basic-auth
• tanstack-router-react-example-basic-authjs
• tanstack-start-example-basic-cloudflare
• tanstack-start-example-basic-react-query
• tanstack-start-example-basic-static
• tanstack-start-bun-hosting
• tanstack-start-example-clerk-basic
• tanstack-start-example-convex-trellaux
• tanstack-start-example-counter
• tanstack-start-i18n-paraglide
• tanstack-start-example-large
• tanstack-start-example-material-ui
• tanstack-start-example-rscs
• tanstack-start-streaming-data-from-server-functions
• tanstack-start-example-supabase-basic
• tanstack-start-tailwind-v4
• tanstack-start-example-trellaux
• tanstack-start-example-workos
• tanstack-router-react-example-view-transitions
• tanstack-router-react-example-with-framer-motion
• tanstack-router-react-example-with-trpc
• tanstack-router-react-example-with-trpc-react-query

@tanstack/arktype-adapter

npm i https://pkg.pr.new/@tanstack/arktype-adapter@7335

@tanstack/eslint-plugin-router

npm i https://pkg.pr.new/@tanstack/eslint-plugin-router@7335

@tanstack/eslint-plugin-start

npm i https://pkg.pr.new/@tanstack/eslint-plugin-start@7335

@tanstack/history

npm i https://pkg.pr.new/@tanstack/history@7335

@tanstack/nitro-v2-vite-plugin

npm i https://pkg.pr.new/@tanstack/nitro-v2-vite-plugin@7335

@tanstack/react-router

npm i https://pkg.pr.new/@tanstack/react-router@7335

@tanstack/react-router-devtools

npm i https://pkg.pr.new/@tanstack/react-router-devtools@7335

@tanstack/react-router-ssr-query

npm i https://pkg.pr.new/@tanstack/react-router-ssr-query@7335

@tanstack/react-start

npm i https://pkg.pr.new/@tanstack/react-start@7335

@tanstack/react-start-client

npm i https://pkg.pr.new/@tanstack/react-start-client@7335

@tanstack/react-start-rsc

npm i https://pkg.pr.new/@tanstack/react-start-rsc@7335

@tanstack/react-start-server

npm i https://pkg.pr.new/@tanstack/react-start-server@7335

@tanstack/router-cli

npm i https://pkg.pr.new/@tanstack/router-cli@7335

@tanstack/router-core

npm i https://pkg.pr.new/@tanstack/router-core@7335

@tanstack/router-devtools

npm i https://pkg.pr.new/@tanstack/router-devtools@7335

@tanstack/router-devtools-core

npm i https://pkg.pr.new/@tanstack/router-devtools-core@7335

@tanstack/router-generator

npm i https://pkg.pr.new/@tanstack/router-generator@7335

@tanstack/router-plugin

npm i https://pkg.pr.new/@tanstack/router-plugin@7335

@tanstack/router-ssr-query-core

npm i https://pkg.pr.new/@tanstack/router-ssr-query-core@7335

@tanstack/router-utils

npm i https://pkg.pr.new/@tanstack/router-utils@7335

@tanstack/router-vite-plugin

npm i https://pkg.pr.new/@tanstack/router-vite-plugin@7335

@tanstack/solid-router

npm i https://pkg.pr.new/@tanstack/solid-router@7335

@tanstack/solid-router-devtools

npm i https://pkg.pr.new/@tanstack/solid-router-devtools@7335

@tanstack/solid-router-ssr-query

npm i https://pkg.pr.new/@tanstack/solid-router-ssr-query@7335

@tanstack/solid-start

npm i https://pkg.pr.new/@tanstack/solid-start@7335

@tanstack/solid-start-client

npm i https://pkg.pr.new/@tanstack/solid-start-client@7335

@tanstack/solid-start-server

npm i https://pkg.pr.new/@tanstack/solid-start-server@7335

@tanstack/start-client-core

npm i https://pkg.pr.new/@tanstack/start-client-core@7335

@tanstack/start-fn-stubs

npm i https://pkg.pr.new/@tanstack/start-fn-stubs@7335

@tanstack/start-plugin-core

npm i https://pkg.pr.new/@tanstack/start-plugin-core@7335

@tanstack/start-server-core

npm i https://pkg.pr.new/@tanstack/start-server-core@7335

@tanstack/start-static-server-functions

npm i https://pkg.pr.new/@tanstack/start-static-server-functions@7335

@tanstack/start-storage-context

npm i https://pkg.pr.new/@tanstack/start-storage-context@7335

@tanstack/valibot-adapter

npm i https://pkg.pr.new/@tanstack/valibot-adapter@7335

@tanstack/virtual-file-routes

npm i https://pkg.pr.new/@tanstack/virtual-file-routes@7335

@tanstack/vue-router

npm i https://pkg.pr.new/@tanstack/vue-router@7335

@tanstack/vue-router-devtools

npm i https://pkg.pr.new/@tanstack/vue-router-devtools@7335

@tanstack/vue-router-ssr-query

npm i https://pkg.pr.new/@tanstack/vue-router-ssr-query@7335

@tanstack/vue-start

npm i https://pkg.pr.new/@tanstack/vue-start@7335

@tanstack/vue-start-client

npm i https://pkg.pr.new/@tanstack/vue-start-client@7335

@tanstack/vue-start-server

npm i https://pkg.pr.new/@tanstack/vue-start-server@7335

@tanstack/zod-adapter

npm i https://pkg.pr.new/@tanstack/zod-adapter@7335

commit: d725a17

[codspeed-hq]

Merging this PR will not alter performance

✅ 5 untouched benchmarks
⏩ 1 skipped benchmark¹

---

_{Comparing fix-scroll-nested (d725a17) with fix-hash-scroll (de88c86)}

Footnotes

1. 1 benchmark was skipped, so the baseline result was used instead. If it was deleted from the codebase, click here and archive it to remove it from the performance reports. ↩

[schiller-manuel]

@Sheraff