Commit c4bef164 authored by JJ Kasper's avatar JJ Kasper Committed by Joe Haddad

Add unique identifier to router instance (#9015)

* Update to use a historyId to track invalid popstates

* Remove log from debugging

* Use Math.random instead of Date.getTime to avoid mocks
parent d3293f7c
...@@ -71,6 +71,7 @@ export default class Router implements BaseRouter { ...@@ -71,6 +71,7 @@ export default class Router implements BaseRouter {
_bps: BeforePopStateCallback | undefined _bps: BeforePopStateCallback | undefined
events: MittEmitter events: MittEmitter
_wrapApp: (App: ComponentType) => any _wrapApp: (App: ComponentType) => any
historyId: number
static events: MittEmitter = mitt() static events: MittEmitter = mitt()
...@@ -126,6 +127,8 @@ export default class Router implements BaseRouter { ...@@ -126,6 +127,8 @@ export default class Router implements BaseRouter {
this.sub = subscription this.sub = subscription
this.clc = null this.clc = null
this._wrapApp = wrapApp this._wrapApp = wrapApp
// we use a historyId to enable ignoring invalid popstates
this.historyId = Math.random()
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
// in order for `e.state` to work on the `onpopstate` event // in order for `e.state` to work on the `onpopstate` event
...@@ -137,17 +140,6 @@ export default class Router implements BaseRouter { ...@@ -137,17 +140,6 @@ export default class Router implements BaseRouter {
) )
window.addEventListener('popstate', this.onPopState) window.addEventListener('popstate', this.onPopState)
window.addEventListener('unload', () => {
// Workaround for popstate firing on initial page load when
// navigating back from an external site
if (history.state) {
const { url, as, options }: any = history.state
this.changeState('replaceState', url, as, {
...options,
fromExternal: true,
})
}
})
} }
} }
...@@ -178,7 +170,7 @@ export default class Router implements BaseRouter { ...@@ -178,7 +170,7 @@ export default class Router implements BaseRouter {
// Make sure we don't re-render on initial load, // Make sure we don't re-render on initial load,
// can be caused by navigating back from an external site // can be caused by navigating back from an external site
if (e.state.options && e.state.options.fromExternal) { if (e.state.options && e.state.options.historyId !== this.historyId) {
return return
} }
...@@ -384,7 +376,18 @@ export default class Router implements BaseRouter { ...@@ -384,7 +376,18 @@ export default class Router implements BaseRouter {
if (method !== 'pushState' || getURL() !== as) { if (method !== 'pushState' || getURL() !== as) {
// @ts-ignore method should always exist on history // @ts-ignore method should always exist on history
window.history[method]({ url, as, options }, null, as) window.history[method](
{
url,
as,
options: {
...options,
historyId: this.historyId,
},
},
null,
as
)
} }
} }
......
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