Unverified Commit bd5ee268 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Scroll to name when hash is provided (#5019)

Fixes #5008 

Apparently, browser behavior is to scroll to `name="something"` too.
parent 918e0a6e
...@@ -325,9 +325,17 @@ export default class Router { ...@@ -325,9 +325,17 @@ export default class Router {
return return
} }
const el = document.getElementById(hash) // First we check if the element by id is found
if (el) { const idEl = document.getElementById(hash)
el.scrollIntoView() if (idEl) {
idEl.scrollIntoView()
return
}
// If there's no element with the id, we check the `name` property
// To mirror browsers
const nameEl = document.getElementsByName(hash)[0]
if (nameEl) {
nameEl.scrollIntoView()
} }
} }
......
...@@ -27,10 +27,16 @@ export default class SelfReload extends Component { ...@@ -27,10 +27,16 @@ export default class SelfReload extends Component {
<Link href='#item-400'> <Link href='#item-400'>
<a id='scroll-to-item-400'>Go to item 400</a> <a id='scroll-to-item-400'>Go to item 400</a>
</Link> </Link>
<Link href='#name-item-400'>
<a id='scroll-to-name-item-400'>Go to name item 400</a>
</Link>
<p>COUNT: {this.props.count}</p> <p>COUNT: {this.props.count}</p>
{Array.from({length: 500}, (x, i) => i + 1).map(i => { {Array.from({length: 500}, (x, i) => i + 1).map(i => {
return <div key={`item-${i}`} id={`item-${i}`}>{i}</div> return <div key={`item-${i}`} id={`item-${i}`}>{i}</div>
})} })}
{Array.from({length: 500}, (x, i) => i + 1).map(i => {
return <div key={`item-${i}`} name={`name-item-${i}`}>{i}</div>
})}
</div> </div>
) )
} }
......
...@@ -293,6 +293,33 @@ export default (context, render) => { ...@@ -293,6 +293,33 @@ export default (context, render) => {
} }
}) })
it('should scroll to the specified position on the same page with a name property', async () => {
let browser
try {
browser = await webdriver(context.appPort, '/nav/hash-changes')
// Scrolls to item 400 with name="name-item-400" on the page
const scrollPosition = await browser
.elementByCss('#scroll-to-name-item-400').click()
.eval('window.pageYOffset')
console.log(scrollPosition)
expect(scrollPosition).toBe(16258)
// Scrolls back to top when scrolling to `#` with no value.
const scrollPositionAfterEmptyHash = await browser
.elementByCss('#via-empty-hash').click()
.eval('window.pageYOffset')
expect(scrollPositionAfterEmptyHash).toBe(0)
} finally {
if (browser) {
browser.close()
}
}
})
it('should scroll to the specified position to a new page', async () => { it('should scroll to the specified position to a new page', async () => {
let browser let browser
try { try {
......
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