mirror of
https://github.com/terribleplan/next.js.git
synced 2024-01-19 02:48:18 +00:00
Allow onClick on next/link component's child (#4474)
Allow `onClick` on `next/link` child. This should not be a breaking change, but it's a very useful feature. Real-life use cases include: analytics or closing menu on navigation, and other. - [x] allow optional `onClick` on `next/link` component's child - [x] call original `child.props.onClick(e)` before `this.linkClicked(e)` - [x] add integration tests - [x] cancel the navigation if `e.defaultPrevented === true` Fixes #1490
This commit is contained in:
parent
832c494470
commit
669225263d
|
@ -127,7 +127,14 @@ export default class Link extends Component {
|
||||||
// This will return the first child, if multiple are provided it will throw an error
|
// This will return the first child, if multiple are provided it will throw an error
|
||||||
const child = Children.only(children)
|
const child = Children.only(children)
|
||||||
const props = {
|
const props = {
|
||||||
onClick: this.linkClicked
|
onClick: (e) => {
|
||||||
|
if (child.props && typeof child.props.onClick === 'function') {
|
||||||
|
child.props.onClick(e)
|
||||||
|
}
|
||||||
|
if (!e.defaultPrevented) {
|
||||||
|
this.linkClicked(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If child is an <a> tag and doesn't have a href attribute, or if the 'passHref' property is
|
// If child is an <a> tag and doesn't have a href attribute, or if the 'passHref' property is
|
||||||
|
|
|
@ -38,6 +38,7 @@ export default class extends Component {
|
||||||
<Link href='/nav/as-path' as='/as/path'><a id='as-path-link' style={linkStyle}>As Path</a></Link>
|
<Link href='/nav/as-path' as='/as/path'><a id='as-path-link' style={linkStyle}>As Path</a></Link>
|
||||||
<Link href='/nav/as-path'><a id='as-path-link-no-as' style={linkStyle}>As Path (No as)</a></Link>
|
<Link href='/nav/as-path'><a id='as-path-link-no-as' style={linkStyle}>As Path (No as)</a></Link>
|
||||||
<Link href='/nav/as-path-using-router'><a id='as-path-using-router-link' style={linkStyle}>As Path (Using Router)</a></Link>
|
<Link href='/nav/as-path-using-router'><a id='as-path-using-router-link' style={linkStyle}>As Path (Using Router)</a></Link>
|
||||||
|
<Link href='/nav/on-click'><a id='on-click-link' style={linkStyle}>A element with onClick</a></Link>
|
||||||
<button
|
<button
|
||||||
onClick={() => this.visitQueryStringPage()}
|
onClick={() => this.visitQueryStringPage()}
|
||||||
style={linkStyle}
|
style={linkStyle}
|
||||||
|
|
27
test/integration/basic/pages/nav/on-click.js
Normal file
27
test/integration/basic/pages/nav/on-click.js
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
import { Component } from 'react'
|
||||||
|
import Link from 'next/link'
|
||||||
|
|
||||||
|
let count = 0
|
||||||
|
|
||||||
|
export default class OnClick extends Component {
|
||||||
|
static getInitialProps ({ res }) {
|
||||||
|
if (res) return { count: 0 }
|
||||||
|
count += 1
|
||||||
|
|
||||||
|
return { count }
|
||||||
|
}
|
||||||
|
|
||||||
|
render () {
|
||||||
|
return (
|
||||||
|
<div id='on-click-page'>
|
||||||
|
<Link href='/nav/on-click'>
|
||||||
|
<a id='on-click-link' onClick={() => ++count}>Self Reload</a>
|
||||||
|
</Link>
|
||||||
|
<Link href='/nav/on-click'>
|
||||||
|
<a id='on-click-link-prevent-default' onClick={(e) => { e.preventDefault(); ++count }}>Self Reload</a>
|
||||||
|
</Link>
|
||||||
|
<p>COUNT: {this.props.count}</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
|
@ -159,6 +159,64 @@ export default (context, render) => {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe('with onClick action', () => {
|
||||||
|
it('should reload the page and perform additional action', async () => {
|
||||||
|
const browser = await webdriver(context.appPort, '/nav/on-click')
|
||||||
|
const defaultCount = await browser.elementByCss('p').text()
|
||||||
|
expect(defaultCount).toBe('COUNT: 0')
|
||||||
|
|
||||||
|
const countAfterClicked = await browser
|
||||||
|
.elementByCss('#on-click-link').click()
|
||||||
|
.elementByCss('p').text()
|
||||||
|
|
||||||
|
// counts (one click + onClick handler)
|
||||||
|
expect(countAfterClicked).toBe('COUNT: 2')
|
||||||
|
browser.close()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should not reload if default was prevented', async () => {
|
||||||
|
const browser = await webdriver(context.appPort, '/nav/on-click')
|
||||||
|
const defaultCount = await browser.elementByCss('p').text()
|
||||||
|
expect(defaultCount).toBe('COUNT: 0')
|
||||||
|
|
||||||
|
const countAfterClicked = await browser
|
||||||
|
.elementByCss('#on-click-link-prevent-default').click()
|
||||||
|
.elementByCss('p').text()
|
||||||
|
|
||||||
|
// counter is increased but there was no reload
|
||||||
|
expect(countAfterClicked).toBe('COUNT: 0')
|
||||||
|
|
||||||
|
const countAfterClickedAndReloaded = await browser
|
||||||
|
.elementByCss('#on-click-link').click() // +2
|
||||||
|
.elementByCss('p').text()
|
||||||
|
|
||||||
|
// counts (onClick handler, no reload)
|
||||||
|
expect(countAfterClickedAndReloaded).toBe('COUNT: 3')
|
||||||
|
browser.close()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should always replace the state and perform additional action', async () => {
|
||||||
|
const browser = await webdriver(context.appPort, '/nav')
|
||||||
|
|
||||||
|
const countAfterClicked = await browser
|
||||||
|
.elementByCss('#on-click-link').click() // 1
|
||||||
|
.waitForElementByCss('#on-click-page')
|
||||||
|
.elementByCss('#on-click-link').click() // 3
|
||||||
|
.elementByCss('#on-click-link').click() // 5
|
||||||
|
.elementByCss('p').text()
|
||||||
|
|
||||||
|
// counts (page change + two clicks + onClick handler)
|
||||||
|
expect(countAfterClicked).toBe('COUNT: 5')
|
||||||
|
|
||||||
|
// Since we replace the state, back button would simply go us back to /nav
|
||||||
|
await browser
|
||||||
|
.back()
|
||||||
|
.waitForElementByCss('.nav-home')
|
||||||
|
|
||||||
|
browser.close()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
describe('with hash changes', () => {
|
describe('with hash changes', () => {
|
||||||
describe('when hash change via Link', () => {
|
describe('when hash change via Link', () => {
|
||||||
it('should not run getInitialProps', async () => {
|
it('should not run getInitialProps', async () => {
|
||||||
|
|
Loading…
Reference in a new issue