Merge branch 'feat/3.5-theta' of github.com:NervJS/taro into feat/3.5…

…-theta
NervJS · Jul 7, 2022 · 4c721b5 · 4c721b5
2 parents 5eae8f8 + 5fa352a
commit 4c721b5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/packages/taro-helper/src/swcRegister.ts b/packages/taro-helper/src/swcRegister.ts
@@ -16,7 +16,12 @@ export class InjectDefineConfigHeader extends Visitor {
   }
 }
 
-export default function createSwcRegister ({ only, plugin }) {
+interface ICreateSwcRegisterParam {
+  only
+  plugin?
+}
+
+export default function createSwcRegister ({ only, plugin }: ICreateSwcRegisterParam) {
   const config: Record<string, any> = {
     only: Array.from(new Set([...only])),
     jsc: {

diff --git a/packages/taro-router/src/router/page.ts b/packages/taro-router/src/router/page.ts
@@ -9,7 +9,7 @@ import { bindPageResize } from '../events/resize'
 import { bindPageScroll } from '../events/scroll'
 import { setHistoryMode } from '../history'
 import { initTabbar } from '../tabbar'
-import { addLeadingSlash, routesAlias, stripBasename } from '../utils'
+import { addLeadingSlash, routesAlias, stripBasename, stripTrailing } from '../utils'
 import stacks from './stack'
 
 function setDisplay (el?: HTMLElement | null, type = '') {
@@ -85,7 +85,7 @@ export default class PageHandler {
       }
     )?.[0] || routePath
 
-    return !!pagePath && this.tabBarList.some(t => t.pagePath === pagePath)
+    return !!pagePath && this.tabBarList.some(t => stripTrailing(t.pagePath) === pagePath)
   }
 
   isSamePage (page?: PageInstance | null) {

diff --git a/packages/taro-router/src/utils.ts b/packages/taro-router/src/utils.ts
@@ -6,6 +6,8 @@ export const hasBasename = (path = '', prefix = '') =>
 export const stripBasename = (path = '', prefix = '') =>
   hasBasename(path, prefix) ? path.substr(prefix.length) : path
 
+export const stripTrailing = (str = '') => str.replace(/[?#][\s\S]*$/, '')
+
 class RoutesAlias {
   conf: Array<string[]> = []