Commit 242758e3 authored by Naoyuki Kanezawa's avatar Naoyuki Kanezawa Committed by Guillermo Rauch

fix navigation failure (#546)

parent 0c6efce5
...@@ -14,7 +14,7 @@ export default class Link extends Component { ...@@ -14,7 +14,7 @@ export default class Link extends Component {
return return
} }
const { href, as } = this.props const { href, as = href } = this.props
if (!isLocal(href)) { if (!isLocal(href)) {
// ignore click if it's outside our scope // ignore click if it's outside our scope
...@@ -23,17 +23,14 @@ export default class Link extends Component { ...@@ -23,17 +23,14 @@ export default class Link extends Component {
e.preventDefault() e.preventDefault()
const route = as ? href : null
const url = as || href
// avoid scroll for urls with anchor refs // avoid scroll for urls with anchor refs
let { scroll } = this.props let { scroll } = this.props
if (scroll == null) { if (scroll == null) {
scroll = url.indexOf('#') < 0 scroll = as.indexOf('#') < 0
} }
// straight up redirect // straight up redirect
Router.push(route, url) Router.push(href, as)
.then((success) => { .then((success) => {
if (!success) return if (!success) return
if (scroll) window.scrollTo(0, 0) if (scroll) window.scrollTo(0, 0)
......
...@@ -29,9 +29,10 @@ export default class Router { ...@@ -29,9 +29,10 @@ export default class Router {
onPopState (e) { onPopState (e) {
this.abortComponentLoad() this.abortComponentLoad()
let { route } = e.state || {} const as = getURL()
const { pathname, query } = parse(route || window.location.href, true) const { url = as } = e.state || {}
if (!route) route = toRoute(pathname) const { pathname, query } = parse(url, true)
const route = toRoute(pathname)
Promise.resolve() Promise.resolve()
.then(async () => { .then(async () => {
...@@ -40,7 +41,7 @@ export default class Router { ...@@ -40,7 +41,7 @@ export default class Router {
const props = await this.getInitialProps(data.Component, ctx) const props = await this.getInitialProps(data.Component, ctx)
this.route = route this.route = route
this.set(getURL(), { ...data, props }) this.set(pathname, query, { ...data, props })
}) })
.catch(async (err) => { .catch(async (err) => {
if (err.cancelled) return if (err.cancelled) return
...@@ -50,7 +51,7 @@ export default class Router { ...@@ -50,7 +51,7 @@ export default class Router {
const props = await this.getInitialProps(data.Component, ctx) const props = await this.getInitialProps(data.Component, ctx)
this.route = route this.route = route
this.set(getURL(), { ...data, props }) this.set(pathname, query, { ...data, props })
console.error(err) console.error(err)
}) })
.catch((err) => { .catch((err) => {
...@@ -102,18 +103,17 @@ export default class Router { ...@@ -102,18 +103,17 @@ export default class Router {
window.history.back() window.history.back()
} }
push (route, url = route) { push (url, as = url) {
return this.change('pushState', route, url) return this.change('pushState', url, as)
} }
replace (route, url = route) { replace (url, as = url) {
return this.change('replaceState', route, url) return this.change('replaceState', url, as)
} }
async change (method, route, url) { async change (method, url, as) {
const { pathname, query } = parse(route || url, true) const { pathname, query } = parse(url, true)
const route = toRoute(pathname)
if (!route) route = toRoute(pathname)
this.abortComponentLoad() this.abortComponentLoad()
...@@ -135,29 +135,27 @@ export default class Router { ...@@ -135,29 +135,27 @@ export default class Router {
console.error(err) console.error(err)
} }
if (method !== 'pushState' || getURL() !== url) { if (method !== 'pushState' || getURL() !== as) {
window.history[method]({ route }, null, url) window.history[method]({ url }, null, as)
} }
this.route = route this.route = route
this.set(url, { ...data, props }) this.set(pathname, query, { ...data, props })
if (_err) throw _err if (_err) throw _err
return true return true
} }
set (url, data) { set (pathname, query, data) {
const parsed = parse(url, true) if (this.urlIsNew(pathname, query)) {
this.pathname = pathname
if (this.urlIsNew(parsed)) { this.query = query
this.pathname = parsed.pathname
this.query = parsed.query
this.notify(data) this.notify(data)
} }
} }
urlIsNew ({ pathname, query }) { urlIsNew (pathname, query) {
return this.pathname !== pathname || !shallowEquals(query, this.query) return this.pathname !== pathname || !shallowEquals(query, this.query)
} }
......
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