From 91e0de76c06863de4a7e77fc53bdd836c9d50c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20R=C3=B8mer=20Hesselbjerg?= <jh.roemer@gmail.com>
Date: Thu, 26 Mar 2026 18:10:34 +0100
Subject: [PATCH 1/4] Package code view: file tree scroll position is stable
 when browsing

---
 .../[packageName]/v/[version]/[...filePath].vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
index 3fbdcfe994..87b1e9f77e 100644
--- a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
+++ b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
@@ -12,6 +12,22 @@ definePageMeta({
 
 const route = useRoute('code')
 
+// Preserve file-tree scroll position across file
+const fileTreeSidebarRef = useTemplateRef('file-tree-sidebar')
+const savedFileTreeSidebarScroll = useState('code-sidebar-scroll', () => 0)
+
+onBeforeUnmount(() => {
+  savedFileTreeSidebarScroll.value = fileTreeSidebarRef.value?.scrollTop ?? 0
+})
+
+watch(
+  fileTreeSidebarRef,
+  el => {
+    if (el && savedFileTreeSidebarScroll.value) el.scrollTop = savedFileTreeSidebarScroll.value
+  },
+  { once: true, flush: 'post' },
+)
+
 // Parse package name, version, and file path from URL
 // Patterns:
 //   /code/nuxt/v/4.2.0 → packageName: "nuxt", version: "4.2.0", filePath: null (show tree)
@@ -349,6 +365,7 @@ defineOgImageComponent('Default', {
     <div v-else-if="fileTree" class="flex flex-1" dir="ltr">
       <!-- File tree sidebar - sticky with internal scroll -->
       <aside
+        ref="file-tree-sidebar"
         class="w-64 lg:w-72 border-ie border-border shrink-0 hidden md:block bg-bg-subtle sticky top-25 self-start h-[calc(100vh-7rem)] overflow-y-auto"
       >
         <CodeFileTree

From c5b0b66dde0078b903c086ebb5388386bde8eac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20R=C3=B8mer=20Hesselbjerg?= <jh.roemer@gmail.com>
Date: Thu, 26 Mar 2026 18:29:02 +0100
Subject: [PATCH 2/4] Fix comment

---
 .../[[org]]/[packageName]/v/[version]/[...filePath].vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
index 87b1e9f77e..45cc0b0aee 100644
--- a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
+++ b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
@@ -12,7 +12,7 @@ definePageMeta({
 
 const route = useRoute('code')
 
-// Preserve file-tree scroll position across file
+// Preserve file-tree scroll position across navigation
 const fileTreeSidebarRef = useTemplateRef('file-tree-sidebar')
 const savedFileTreeSidebarScroll = useState('code-sidebar-scroll', () => 0)
 

From add5bd19d583bff725918d85b9a769ac878b255b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20R=C3=B8mer=20Hesselbjerg?= <jh.roemer@gmail.com>
Date: Fri, 27 Mar 2026 09:05:19 +0100
Subject: [PATCH 3/4] improve sidebar element naming

---
 .../[[org]]/[packageName]/v/[version]/[...filePath].vue      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
index 45cc0b0aee..297e1b0efa 100644
--- a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
+++ b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
@@ -22,8 +22,9 @@ onBeforeUnmount(() => {
 
 watch(
   fileTreeSidebarRef,
-  el => {
-    if (el && savedFileTreeSidebarScroll.value) el.scrollTop = savedFileTreeSidebarScroll.value
+  fileTreeSidebarElement => {
+    if (fileTreeSidebarElement && savedFileTreeSidebarScroll.value)
+      fileTreeSidebarElement.scrollTop = savedFileTreeSidebarScroll.value
   },
   { once: true, flush: 'post' },
 )

From c4481e8b6f89a5d24a22de743263ce57961f71f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20R=C3=B8mer=20Hesselbjerg?= <jh.roemer@gmail.com>
Date: Fri, 27 Mar 2026 09:25:51 +0100
Subject: [PATCH 4/4] Ensure scroll position is reset when package + version is
 changed

---
 .../v/[version]/[...filePath].vue             | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
index 297e1b0efa..f00ec1516d 100644
--- a/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
+++ b/app/pages/package-code/[[org]]/[packageName]/v/[version]/[...filePath].vue
@@ -12,23 +12,6 @@ definePageMeta({
 
 const route = useRoute('code')
 
-// Preserve file-tree scroll position across navigation
-const fileTreeSidebarRef = useTemplateRef('file-tree-sidebar')
-const savedFileTreeSidebarScroll = useState('code-sidebar-scroll', () => 0)
-
-onBeforeUnmount(() => {
-  savedFileTreeSidebarScroll.value = fileTreeSidebarRef.value?.scrollTop ?? 0
-})
-
-watch(
-  fileTreeSidebarRef,
-  fileTreeSidebarElement => {
-    if (fileTreeSidebarElement && savedFileTreeSidebarScroll.value)
-      fileTreeSidebarElement.scrollTop = savedFileTreeSidebarScroll.value
-  },
-  { once: true, flush: 'post' },
-)
-
 // Parse package name, version, and file path from URL
 // Patterns:
 //   /code/nuxt/v/4.2.0 → packageName: "nuxt", version: "4.2.0", filePath: null (show tree)
@@ -46,6 +29,31 @@ const parsedRoute = computed(() => {
 
 const packageName = computed(() => parsedRoute.value.packageName)
 const version = computed(() => parsedRoute.value.version)
+
+// Preserve file-tree scroll position across navigation within same package (+ version)
+const fileTreeKey = computed(() => `${packageName.value}@${version.value}`)
+const fileTreeSidebarRef = useTemplateRef('file-tree-sidebar')
+const savedFileTreeSidebarScroll = useState('code-sidebar-scroll', () => ({
+  key: '',
+  scrollTop: 0,
+}))
+
+onBeforeUnmount(() => {
+  savedFileTreeSidebarScroll.value = {
+    key: fileTreeKey.value,
+    scrollTop: fileTreeSidebarRef.value?.scrollTop ?? 0,
+  }
+})
+
+watch(
+  fileTreeSidebarRef,
+  fileTreeSidebarElement => {
+    if (fileTreeSidebarElement && savedFileTreeSidebarScroll.value.key === fileTreeKey.value)
+      fileTreeSidebarElement.scrollTop = savedFileTreeSidebarScroll.value.scrollTop
+  },
+  { once: true, flush: 'post' },
+)
+
 const filePathOrig = computed(() => parsedRoute.value.filePath)
 const filePath = computed(() => parsedRoute.value.filePath?.replace(/\/$/, ''))