Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: improve method to determine whether the two path are the same i… #3454

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/history/hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import type Router from '../index'
import { History } from './base'
import { cleanPath } from '../util/path'
import { isSameRoute, createPlainRoute } from '../util/route'
import { getLocation } from './html5'
import { setupScroll, handleScroll } from '../util/scroll'
import { pushState, replaceState, supportsPushState } from '../util/push-state'
Expand Down Expand Up @@ -87,8 +88,10 @@ export class HashHistory extends History {
}

ensureURL (push?: boolean) {
const current = this.current.fullPath
if (getHash() !== current) {
const location = getHash()
const plainRoute = createPlainRoute(location)
if (!isSameRoute(plainRoute, this.current)) {
const current = this.current.fullPath
push ? pushHash(current) : replaceHash(current)
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/history/html5.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import type Router from '../index'
import { History } from './base'
import { cleanPath } from '../util/path'
import { START } from '../util/route'
import { START, isSameRoute, createPlainRoute } from '../util/route'
import { setupScroll, handleScroll } from '../util/scroll'
import { pushState, replaceState, supportsPushState } from '../util/push-state'

Expand Down Expand Up @@ -74,7 +74,9 @@ export class HTML5History extends History {
}

ensureURL (push?: boolean) {
if (getLocation(this.base) !== this.current.fullPath) {
const location = getLocation(this.base)
const plainRoute = createPlainRoute(location)
if (!isSameRoute(plainRoute, this.current)) {
const current = cleanPath(this.base + this.current.fullPath)
push ? pushState(current) : replaceState(current)
}
Expand Down
6 changes: 6 additions & 0 deletions src/util/route.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import type VueRouter from '../index'
import { stringifyQuery } from './query'
import { normalizeLocation } from './location'

const trailingSlashRE = /\/?$/

Expand Down Expand Up @@ -149,3 +150,8 @@ export function handleRouteEntered (route: Route) {
}
}
}
/** just create a route without any added process */
export function createPlainRoute (url: string) {
const location = normalizeLocation(url)
return createRoute(null, location)
}
19 changes: 18 additions & 1 deletion test/unit/specs/route.spec.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isSameRoute, isIncludedRoute } from '../../../src/util/route'
import { isSameRoute, isIncludedRoute, createPlainRoute } from '../../../src/util/route'

describe('Route utils', () => {
describe('isSameRoute', () => {
Expand Down Expand Up @@ -150,4 +150,21 @@ describe('Route utils', () => {
expect(isIncludedRoute(d, f)).toBe(false)
})
})

describe('createPlainRoute', () => {
it('path', () => {
const a = { path: '/a?arr=1&foo=bar&arr=2#hi' }
const b = { path: '/a?arr=1&arr=2&foo=bar#hi' }
const route = {
path: '/a',
hash: '#hi',
query: { foo: 'bar', arr: [1, 2] }
}
const aRoute = createPlainRoute(a)
const bRoute = createPlainRoute(b)
expect(isSameRoute(aRoute, route)).toBe(true)
expect(isSameRoute(aRoute, route)).toBe(true)
expect(isSameRoute(aRoute, bRoute)).toBe(true)
})
})
})