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.

Sign up for GitHub

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: switchTab on pages route to fix #6878 #7344

Merged
merged 2 commits into from
Aug 17, 2020
Merged

feat: switchTab on pages route to fix #6878 #7344

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d24cf55
feat: switchTab on pages route to fix #6878
ZakaryCode Aug 14, 2020
94625af
Merge branch '2.x' into 2.x-fix-router
ZakaryCode Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/taro-router/src/router/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Route extends Taro.Component<RouteProps, {}> {
}
}

computeMatch (currentLocation: Location, isIndex = this.props.isIndex, isTabBar = this.props.isTabBar) {
computeMatch (currentLocation: Location, pKey = this.props.key, pPath = this.props.path, isIndex = this.props.isIndex, isTabBar = this.props.isTabBar) {
let pathname = currentLocation.path;
const key = currentLocation.state.key;

Expand All @@ -74,9 +74,9 @@ class Route extends Taro.Component<RouteProps, {}> {

if (key !== undefined) {
if (isTabBar) {
return key === this.props.key && pathname === this.props.path
return key === pKey && pathname === pPath
} else {
return key === this.props.key
return key === pKey
}
} else {
return isIndex && pathname === '/'
Expand Down Expand Up @@ -127,7 +127,7 @@ class Route extends Taro.Component<RouteProps, {}> {
componentWillReceiveProps (nProps: RouteProps) {
const isRedirect = nProps.isRedirect
const lastMatched = this.matched
const nextMatched = this.computeMatch(nProps.currentLocation, nProps.isIndex, nProps.isTabBar)
const nextMatched = this.computeMatch(nProps.currentLocation, nProps.key, nProps.path, nProps.isIndex, nProps.isTabBar)

this.matched = nextMatched

Expand Down