fix: app router hash scrolling should respect scroll-padding

packages/next/src/client/components/layout-router.tsx

@@ -216,9 +216,10 @@ class InnerScrollAndFocusHandler extends React.Component<ScrollAndFocusHandlerPr
 
       handleSmoothScroll(
         () => {
-          // In case of hash scroll we need to scroll to the top of the element
+          // In case of hash scroll, we only need to scroll the element into view
           if (hashFragment) {
-            window.scrollTo(0, (domNode as HTMLElement).offsetTop)
+            ;(domNode as HTMLElement).scrollIntoView()
+
             return
           }
           // Store the current viewport height because reading `clientHeight` causes a reflow,

test/e2e/app-dir/navigation/app/hash-with-scroll-offset/global.css

@@ -0,0 +1,8 @@
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  font-size: 14px;
+  line-height: 1;
+  scroll-padding-top: 20px;
+}

test/e2e/app-dir/navigation/app/hash-with-scroll-offset/page.js

@@ -0,0 +1,41 @@
+import Link from 'next/link'
+import './global.css'
+
+export default function HashPage() {
+  // Create list of 5000 items that all have unique id
+  const items = Array.from({ length: 5000 }, (_, i) => ({ id: i }))
+
+  return (
+    <div style={{ fontFamily: 'sans-serif', fontSize: '16px' }}>
+      <p>Hash Page</p>
+      <Link href="/hash#hash-6" id="link-to-6">
+        To 6
+      </Link>
+      <Link href="/hash#hash-50" id="link-to-50">
+        To 50
+      </Link>
+      <Link href="/hash#hash-160" id="link-to-160">
+        To 160
+      </Link>
+      <Link href="/hash#hash-300" id="link-to-300">
+        To 300
+      </Link>
+      <Link href="#hash-500" id="link-to-500">
+        To 500 (hash only)
+      </Link>
+      <Link href="/hash#top" id="link-to-top">
+        To Top
+      </Link>
+      <Link href="/hash#non-existent" id="link-to-non-existent">
+        To non-existent
+      </Link>
+      <div>
+        {items.map((item) => (
+          <div key={item.id}>
+            <div id={`hash-${item.id}`}>{item.id}</div>
+          </div>
+        ))}
+      </div>
+    </div>
+  )
+}

test/e2e/app-dir/navigation/navigation.test.ts

@@ -87,6 +87,37 @@ createNextDescribe(
       })
     })
 
+    describe('hash-with-scroll-offset', () => {
+      it('should scroll to the specified hash', async () => {
+        const browser = await next.browser('/hash-with-scroll-offset')
+
+        const checkLink = async (
+          val: number | string,
+          expectedScroll: number
+        ) => {
+          await browser.elementByCss(`#link-to-${val.toString()}`).click()
+          await check(
+            async () => {
+              const val = await browser.eval('window.pageYOffset')
+              return val.toString()
+            },
+            expectedScroll.toString(),
+            true,
+            // Try maximum of 15 seconds
+            15
+          )
+        }
+
+        await checkLink(6, 94)
+        await checkLink(50, 710)
+        await checkLink(160, 2250)
+        await checkLink(300, 4210)
+        await checkLink(500, 7010) // this one is hash only (`href="#hash-500"`)
+        await checkLink('top', 0)
+        await checkLink('non-existent', 0)
+      })
+    })
+
     describe('hash-link-back-to-same-page', () => {
       it('should scroll to the specified hash', async () => {
         const browser = await next.browser('/hash-link-back-to-same-page')