Unverified Commit 60e69955 authored by Rafael Bonalume Lebre's avatar Rafael Bonalume Lebre Committed by GitHub

Fix #top anchor link scroll (#16638)

According to [MDN docs](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-href) the page must scroll to the top with both "#" and "#top" anchors.

<img width="675" alt="Screen Shot 2020-08-27 at 7 20 19 PM" src="https://user-images.githubusercontent.com/13899924/91500693-582a5b80-e89a-11ea-803f-4592d458baba.png">
parent e2001db0
...@@ -1367,8 +1367,9 @@ export default class Router implements BaseRouter { ...@@ -1367,8 +1367,9 @@ export default class Router implements BaseRouter {
scrollToHash(as: string): void { scrollToHash(as: string): void {
const [, hash] = as.split('#') const [, hash] = as.split('#')
// Scroll to top if the hash is just `#` with no value // Scroll to top if the hash is just `#` with no value or `#top`
if (hash === '') { // To mirror browsers
if (hash === '' || hash === 'top') {
window.scrollTo(0, 0) window.scrollTo(0, 0)
return return
} }
......
...@@ -42,6 +42,9 @@ const HashChanges = ({ count }) => { ...@@ -42,6 +42,9 @@ const HashChanges = ({ count }) => {
</div> </div>
) )
})} })}
<Link href="#top">
<a id="via-top-hash">Via Top Hash</a>
</Link>
<div id="asPath">ASPATH: {router.asPath}</div> <div id="asPath">ASPATH: {router.asPath}</div>
<div id="pathname">PATHNAME: {router.pathname}</div> <div id="pathname">PATHNAME: {router.pathname}</div>
</div> </div>
......
...@@ -586,12 +586,12 @@ describe('Client Navigation', () => { ...@@ -586,12 +586,12 @@ describe('Client Navigation', () => {
browser = await webdriver(context.appPort, '/nav/hash-changes') browser = await webdriver(context.appPort, '/nav/hash-changes')
// Scrolls to item 400 on the page // Scrolls to item 400 on the page
const scrollPosition = await browser const scrollPositionBeforeEmptyHash = await browser
.elementByCss('#scroll-to-item-400') .elementByCss('#scroll-to-item-400')
.click() .click()
.eval('window.pageYOffset') .eval('window.pageYOffset')
expect(scrollPosition).toBe(7258) expect(scrollPositionBeforeEmptyHash).toBe(7258)
// Scrolls back to top when scrolling to `#` with no value. // Scrolls back to top when scrolling to `#` with no value.
const scrollPositionAfterEmptyHash = await browser const scrollPositionAfterEmptyHash = await browser
...@@ -600,6 +600,22 @@ describe('Client Navigation', () => { ...@@ -600,6 +600,22 @@ describe('Client Navigation', () => {
.eval('window.pageYOffset') .eval('window.pageYOffset')
expect(scrollPositionAfterEmptyHash).toBe(0) expect(scrollPositionAfterEmptyHash).toBe(0)
// Scrolls to item 400 on the page
const scrollPositionBeforeTopHash = await browser
.elementByCss('#scroll-to-item-400')
.click()
.eval('window.pageYOffset')
expect(scrollPositionBeforeTopHash).toBe(7258)
// Scrolls back to top when clicking link with href `#top`.
const scrollPositionAfterTopHash = await browser
.elementByCss('#via-top-hash')
.click()
.eval('window.pageYOffset')
expect(scrollPositionAfterTopHash).toBe(0)
} finally { } finally {
if (browser) { if (browser) {
await browser.close() await browser.close()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment