@tarojs/router 4.0.0-beta.82 → 4.0.0-beta.83

package/dist/index.esm.js

@@ -14,7 +14,8 @@ import UniversalRouter from 'universal-router';
 function loadAnimateStyle(ms = 300) {
     const css = `
 body {
-  overflow: hidden; // 防止 iOS 页面滚动
+  /* 防止 iOS 页面滚动 */
+  overflow: hidden;
 }
 .taro_router > .taro_page {
   position: absolute;
@@ -71,8 +72,9 @@ ${enableTabBar ? `
   }
 
 ` : ''}
-  .taro_page_shade,
-  .taro_router > .taro_page.taro_page_show.taro_page_stationed:not(.taro_page_shade):not(.taro_tabbar_page):not(:last-child) {
+  .taro_page_shade:has(+.taro_page_stationed),
+  .taro_page_shade.taro_tabbar_page,
+  .taro_router > .taro_page.taro_page_show.taro_page_stationed:not(.taro_page_shade):not(.taro_tabbar_page):not(:last-child):has(+.taro_page_stationed) {
     display: none;
   }
 `;
@@ -140,7 +142,7 @@ function loadNavigationBarStyle() {
     to {
       transform: rotate(360deg);
     }
-  }  
+  }
 
   .taro-navigation-bar-no-icon > .taro-navigation-bar-home {
     display: none;
@@ -262,8 +264,9 @@ class RouterConfig {
         return this.router.mode || 'hash';
     }
     static get customRoutes() { return this.router.customRoutes || {}; }
+    // 这个方法不考虑 basename 和 customRoutes，只判断原始的 url 是否在 pages 中
     static isPage(url = '') {
-        return this.pages.findIndex(e => prependBasename(e) === url) !== -1;
+        return this.pages.findIndex(e => addLeadingSlash(e) === url) !== -1;
     }
 }
 
@@ -532,13 +535,14 @@ function processNavigateUrl(option) {
         const parts = routesAlias.getOrigin(history.location.pathname).split('/');
         parts.pop();
         pathPieces.pathname.split('/').forEach((item) => {
-            if (item === '.') {
+            if (item === '.')
                 return;
-            }
             item === '..' ? parts.pop() : parts.push(item);
         });
         pathPieces.pathname = parts.join('/');
     }
+    // 确保是 / 开头的路径
+    pathPieces.pathname = addLeadingSlash(pathPieces.pathname);
     // 处理自定义路由
     pathPieces.pathname = routesAlias.getAlias(addLeadingSlash(pathPieces.pathname));
     // 处理 basename
@@ -568,21 +572,8 @@ function navigate(option, method) {
                 if ('url' in option) {
                     const pathPieces = processNavigateUrl(option);
                     const state = { timestamp: Date.now() };
-                    if (pathPieces.pathname) {
-                        const originPath = routesAlias.getOrigin(pathPieces.pathname);
-                        if (!RouterConfig.isPage(addLeadingSlash(originPath)) && !RouterConfig.isPage(addLeadingSlash(pathPieces.pathname))) {
-                            const res = { errMsg: `${method}:fail page ${originPath} is not found` };
-                            fail === null || fail === void 0 ? void 0 : fail(res);
-                            complete === null || complete === void 0 ? void 0 : complete(res);
-                            if (fail || complete) {
-                                return resolve(res);
-                            }
-                            else {
-                                return reject(res);
-                            }
-                        }
-                    }
                     if (method === 'navigateTo') {
+                        // Note: 由于 spa 会针对弱网情况下，短时间内多次跳转同一个页面跳转加了锁，后续如果有用户反馈返回无效，那可能是这个问题
                         history.push(pathPieces, state);
                     }
                     else if (method === 'redirectTo' || method === 'switchTab') {
@@ -852,8 +843,8 @@ const launchStampId$1 = createStampId$1();
  * - 不支持路由动画
  */
 function createMultiRouter(history, app, config, framework) {
-    var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
         if (typeof app.onUnhandledRejection === 'function') {
             window.addEventListener('unhandledrejection', app.onUnhandledRejection);
         }
@@ -861,7 +852,7 @@ function createMultiRouter(history, app, config, framework) {
         RouterConfig.config = config;
         const handler = new MultiPageHandler(config, history);
         const launchParam = {
-            path: config.pageName,
+            path: config.pageName, // 多页面模式没新开一个页面相当于重启，所以直接使用当前页面路径
             query: handler.getQuery(launchStampId$1),
             scene: 0,
             shareTicket: '',
@@ -940,7 +931,7 @@ class NavigationBarHandler {
         });
     }
     toHomeFn() {
-        reLaunch({ url: this.pageContext.homePage });
+        reLaunch({ url: this.pageContext.originHomePage });
     }
     backFn() {
         navigateBack();
@@ -989,7 +980,7 @@ class NavigationBarHandler {
         this.setNavigationLoading();
     }
     setCacheValue() {
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         if (typeof this.cache[currentPage] !== 'object') {
             this.cache[currentPage] = {};
         }
@@ -1020,7 +1011,7 @@ class NavigationBarHandler {
         var _a;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let isShow;
         if (typeof show === 'boolean') {
             isShow = show;
@@ -1045,7 +1036,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof backgroundColor === 'string') {
             color = backgroundColor;
@@ -1069,7 +1060,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof fontColor === 'string') {
             color = fontColor;
@@ -1091,7 +1082,7 @@ class NavigationBarHandler {
     }
     setTitle(title) {
         var _a, _b, _c;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let proceedTitle;
         if (typeof title === 'string') {
             proceedTitle = title;
@@ -1172,6 +1163,7 @@ class PageHandler {
         this.defaultAnimation = { duration: 300, delay: 50 };
         this.config = config;
         this.homePage = getHomePage(this.routes[0].path, this.basename, this.customRoutes, this.config.entryPagePath);
+        this.originHomePage = this.config.entryPagePath || this.routes[0].path || this.basename;
         this.mount();
         this.navigationBarHandler = new NavigationBarHandler(this);
     }
@@ -1205,14 +1197,14 @@ class PageHandler {
     }
     set pathname(p) { this.router.pathname = p; }
     get pathname() { return this.router.pathname; }
+    // Note: 把 pathname 转换为原始路径，主要是处理 customRoutes 和 basename
+    get originPathname() { return routesAlias.getOrigin(addLeadingSlash(stripBasename(this.pathname, this.basename))); }
     get basename() { return this.router.basename || ''; }
     get pageConfig() {
-        const routePath = addLeadingSlash(stripBasename(this.pathname, this.basename));
         const homePage = addLeadingSlash(this.homePage);
         return this.routes.find(r => {
-            var _a;
             const pagePath = addLeadingSlash(r.path);
-            return [pagePath, homePage].includes(routePath) || ((_a = routesAlias.getConfig(pagePath)) === null || _a === void 0 ? void 0 : _a.includes(routePath));
+            return [pagePath, homePage].includes(this.originPathname);
         });
     }
     isTabBar(pathname) {
@@ -1402,24 +1394,35 @@ class PageHandler {
             });
         }
     }
-    hide(page) {
-        var _a;
+    hide(page, animation = false) {
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!page)
             return;
         // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
         const pageEl = this.getPageContainer(page);
         if (pageEl) {
-            if (this.hideTimer) {
-                clearTimeout(this.hideTimer);
-                this.hideTimer = null;
-                pageEl.classList.add('taro_page_shade');
+            if (animation) {
+                if (this.hideTimer) {
+                    clearTimeout(this.hideTimer);
+                    this.hideTimer = null;
+                    (_c = (_b = (_a = this.lastHidePage) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.add) === null || _c === void 0 ? void 0 : _c.call(_b, 'taro_page_shade');
+                }
+                this.lastHidePage = pageEl;
+                this.hideTimer = setTimeout(() => {
+                    this.hideTimer = null;
+                    pageEl.classList.add('taro_page_shade');
+                }, this.animationDuration + this.animationDelay);
+                (_d = page.onHide) === null || _d === void 0 ? void 0 : _d.call(page);
             }
-            this.lastHidePage = pageEl;
-            this.hideTimer = setTimeout(() => {
-                this.hideTimer = null;
+            else {
+                if (this.hideTimer) {
+                    clearTimeout(this.hideTimer);
+                    this.hideTimer = null;
+                    (_g = (_f = (_e = this.lastHidePage) === null || _e === void 0 ? void 0 : _e.classList) === null || _f === void 0 ? void 0 : _f.add) === null || _g === void 0 ? void 0 : _g.call(_f, 'taro_page_shade');
+                }
                 pageEl.classList.add('taro_page_shade');
-            }, this.animationDuration + this.animationDelay);
-            (_a = page.onHide) === null || _a === void 0 ? void 0 : _a.call(page);
+                this.lastHidePage = pageEl;
+            }
         }
         else {
             setTimeout(() => this.hide(page), 0);
@@ -1490,6 +1493,10 @@ function createRouter(history, app, config, framework) {
     }
     RouterConfig.config = config;
     const handler = new PageHandler(config, history);
+    // Note: 弱网情况下，快速切换 tab，会造成同个页面实例被多次挂在到页面上，原因是资源请求是异步的，短时间内发起多个请求，
+    // 会在资源加载完成后，同时走到挂载的逻辑，造成 pageStampId 更新不及时，两个 page 的Id 相同，后面很多操作是通过 getElementById 来进行的
+    // 所以需要加一个锁来应对这个情况
+    const pageLock = {};
     routesAlias.set(handler.router.customRoutes);
     const basename = handler.router.basename;
     const routes = handler.routes.map(route => {
@@ -1511,29 +1518,35 @@ function createRouter(history, app, config, framework) {
     eventCenter.trigger('__taroRouterLaunch', launchParam);
     (_a = app.onLaunch) === null || _a === void 0 ? void 0 : _a.call(app, launchParam);
     app.onError && window.addEventListener('error', e => { var _a; return (_a = app.onError) === null || _a === void 0 ? void 0 : _a.call(app, e.message); });
-    const render = ({ location, action }) => __awaiter(this, void 0, void 0, function* () {
-        var _c, _d, _e, _f, _g, _h, _j, _k;
-        handler.pathname = decodeURI(location.pathname);
-        if ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll)
+    const render = (_c) => __awaiter(this, [_c], void 0, function* ({ location, action }) {
+        var _d, _e, _f, _g, _h, _j, _k, _l;
+        // Note: 由于下面有异步加载操作 先不要在这里去设置 handler.pathname
+        const currentPathname = decodeURI(location.pathname);
+        if ((_d = window.__taroAppConfig) === null || _d === void 0 ? void 0 : _d.usingWindowScroll)
             window.scrollTo(0, 0);
         eventCenter.trigger('__taroRouterChange', {
             toLocation: {
-                path: handler.pathname
+                path: currentPathname
             }
         });
-        let element, params;
+        let element, context, params;
+        const routerPath = handler.router.forcePath || currentPathname;
+        pageLock[routerPath] = typeof pageLock[routerPath] === 'number' ? pageLock[routerPath] + 1 : 1;
+        const currentLock = pageLock[routerPath];
+        let postLock;
         try {
-            const result = yield router.resolve(handler.router.forcePath || handler.pathname);
-            [element, , params] = yield Promise.all(result);
+            const result = yield router.resolve(routerPath);
+            [element, context, params] = yield Promise.all(result);
+            postLock = pageLock[routerPath];
         }
         catch (error) {
             if (error.status === 404) {
                 const notFoundEvent = {
                     isEntryPage: stacks.length === 0,
-                    path: handler.pathname,
+                    path: currentPathname,
                     query: handler.getQuery(createStampId()),
                 };
-                (_d = app.onPageNotFound) === null || _d === void 0 ? void 0 : _d.call(app, notFoundEvent);
+                (_e = app.onPageNotFound) === null || _e === void 0 ? void 0 : _e.call(app, notFoundEvent);
                 eventCenter.trigger('__taroRouterNotFound', notFoundEvent);
             }
             else if (/Loading hot update .* failed./.test(error.message)) {
@@ -1544,13 +1557,16 @@ function createRouter(history, app, config, framework) {
                 throw error;
             }
         }
-        if (!element)
+        if (!element || currentLock !== postLock)
             return;
-        const pageConfig = handler.pageConfig;
-        let enablePullDownRefresh = ((_e = config === null || config === void 0 ? void 0 : config.window) === null || _e === void 0 ? void 0 : _e.enablePullDownRefresh) || false;
-        let navigationStyle = ((_f = config === null || config === void 0 ? void 0 : config.window) === null || _f === void 0 ? void 0 : _f.navigationStyle) || 'default';
-        let navigationBarTextStyle = ((_g = config === null || config === void 0 ? void 0 : config.window) === null || _g === void 0 ? void 0 : _g.navigationBarTextStyle) || 'white';
-        let navigationBarBackgroundColor = ((_h = config === null || config === void 0 ? void 0 : config.window) === null || _h === void 0 ? void 0 : _h.navigationBarBackgroundColor) || '#000000';
+        // Note: 异步结束后，在设置 handler.pathname
+        // context.pathname 在 universal-router 被处理过了，是发起资源请求的时候传入的 pathname，即 await router.resolve(routerPath) 这个 routerPath
+        handler.pathname = context.pathname;
+        const { pathname, pageConfig } = handler;
+        let enablePullDownRefresh = ((_f = config === null || config === void 0 ? void 0 : config.window) === null || _f === void 0 ? void 0 : _f.enablePullDownRefresh) || false;
+        let navigationStyle = ((_g = config === null || config === void 0 ? void 0 : config.window) === null || _g === void 0 ? void 0 : _g.navigationStyle) || 'default';
+        let navigationBarTextStyle = ((_h = config === null || config === void 0 ? void 0 : config.window) === null || _h === void 0 ? void 0 : _h.navigationBarTextStyle) || 'white';
+        let navigationBarBackgroundColor = ((_j = config === null || config === void 0 ? void 0 : config.window) === null || _j === void 0 ? void 0 : _j.navigationBarBackgroundColor) || '#000000';
         if (pageConfig) {
             if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
                 enablePullDownRefresh = pageConfig.enablePullDownRefresh;
@@ -1567,8 +1583,7 @@ function createRouter(history, app, config, framework) {
         }
         eventCenter.trigger('__taroSetNavigationStyle', navigationStyle, navigationBarTextStyle, navigationBarBackgroundColor);
         const currentPage = Current.page;
-        const pathname = handler.pathname;
-        const methodName = (_j = stacks.method) !== null && _j !== void 0 ? _j : '';
+        const methodName = (_k = stacks.method) !== null && _k !== void 0 ? _k : '';
         const cacheTabs = stacks.getTabs();
         let shouldLoad = false;
         stacks.method = '';
@@ -1583,10 +1598,11 @@ function createRouter(history, app, config, framework) {
             }
             shouldLoad = true;
         }
-        else if (currentPage && handler.isTabBar(handler.pathname)) {
+        else if (currentPage && handler.isTabBar(pathname)) {
             if (handler.isSamePage(currentPage))
                 return;
             if (handler.isTabBar(currentPage.path)) {
+                // NOTE: 从 tabBar 页面切换到 tabBar 页面
                 handler.hide(currentPage);
                 stacks.pushTab(currentPage.path.split('?')[0]);
             }
@@ -1600,8 +1616,8 @@ function createRouter(history, app, config, framework) {
                     handler.unload(currentPage, stacks.length, true);
                 }
             }
-            if (cacheTabs[handler.pathname]) {
-                stacks.popTab(handler.pathname);
+            if (cacheTabs[pathname]) {
+                stacks.popTab(pathname);
                 return handler.show(stacks.getItem(0), pageConfig, 0);
             }
             shouldLoad = true;
@@ -1630,11 +1646,11 @@ function createRouter(history, app, config, framework) {
             shouldLoad = true;
         }
         else if (action === 'PUSH') {
-            handler.hide(currentPage);
+            handler.hide(currentPage, true);
             shouldLoad = true;
         }
         if (shouldLoad || stacks.length < 1) {
-            const el = (_k = element.default) !== null && _k !== void 0 ? _k : element;
+            const el = (_l = element.default) !== null && _l !== void 0 ? _l : element;
             const loadConfig = Object.assign({}, pageConfig);
             const stacksIndex = stacks.length;
             delete loadConfig['path'];

package/dist/navigationBar.d.ts

@@ -1,3 +1,2 @@
-import { MpaRouterConfig, SpaRouterConfig } from '../types/router';
-declare function initNavigationBar(config: SpaRouterConfig | MpaRouterConfig, container: HTMLElement): void;
-export { initNavigationBar };
+import type { MpaRouterConfig, SpaRouterConfig } from '../types/router';
+export declare function initNavigationBar(config: SpaRouterConfig | MpaRouterConfig, container: HTMLElement): void;

package/dist/router/index.d.ts

@@ -1,12 +1,11 @@
-import { MpaRouterConfig, SpaRouterConfig } from '../../types/router';
-declare class RouterConfig {
+import type { MpaRouterConfig, SpaRouterConfig } from '../../types/router';
+export declare class RouterConfig {
     private static __config;
     static set config(e: SpaRouterConfig | MpaRouterConfig);
     static get config(): SpaRouterConfig | MpaRouterConfig;
     static get pages(): string[];
-    static get router(): import("../types/router").Router;
+    static get router(): import("../../types/router").Router;
     static get mode(): "hash" | "browser" | "multi";
     static get customRoutes(): Record<string, string | string[]>;
     static isPage(url?: string): boolean;
 }
-export { RouterConfig };

package/dist/router/index.js

@@ -1,4 +1,4 @@
-import { prependBasename } from '../history.js';
+import { addLeadingSlash } from '@tarojs/runtime';
 
 class RouterConfig {
     static set config(e) {
@@ -17,8 +17,9 @@ class RouterConfig {
         return this.router.mode || 'hash';
     }
     static get customRoutes() { return this.router.customRoutes || {}; }
+    // 这个方法不考虑 basename 和 customRoutes，只判断原始的 url 是否在 pages 中
     static isPage(url = '') {
-        return this.pages.findIndex(e => prependBasename(e) === url) !== -1;
+        return this.pages.findIndex(e => addLeadingSlash(e) === url) !== -1;
     }
 }
 

package/dist/router/mpa.d.ts

@@ -1,6 +1,6 @@
-import { AppInstance } from '@tarojs/runtime';
-import { History } from "../history.js";
-import { MpaRouterConfig } from '../../types/router';
+import type { AppInstance } from '@tarojs/runtime';
+import type { History } from 'history';
+import type { MpaRouterConfig } from '../../types/router';
 /** Note: 关于多页面应用
  * - 需要配置路由映射（根目录跳转、404 页面……）
  * - app.onPageNotFound 事件不支持
@@ -8,5 +8,4 @@ import { MpaRouterConfig } from '../../types/router';
  * - TabBar 会多次加载
  * - 不支持路由动画
  */
-declare function createMultiRouter(history: History, app: AppInstance, config: MpaRouterConfig, framework?: string): Promise<void>;
-export { createMultiRouter };
+export declare function createMultiRouter(history: History, app: AppInstance, config: MpaRouterConfig, framework?: string): Promise<void>;

package/dist/router/mpa.js

@@ -16,8 +16,8 @@ const launchStampId = createStampId();
  * - 不支持路由动画
  */
 function createMultiRouter(history, app, config, framework) {
-    var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
         if (typeof app.onUnhandledRejection === 'function') {
             window.addEventListener('unhandledrejection', app.onUnhandledRejection);
         }
@@ -25,7 +25,7 @@ function createMultiRouter(history, app, config, framework) {
         RouterConfig.config = config;
         const handler = new MultiPageHandler(config, history);
         const launchParam = {
-            path: config.pageName,
+            path: config.pageName, // 多页面模式没新开一个页面相当于重启，所以直接使用当前页面路径
             query: handler.getQuery(launchStampId),
             scene: 0,
             shareTicket: '',

package/dist/router/multi-page.d.ts

@@ -1,13 +1,13 @@
-import { PageInstance } from '@tarojs/runtime';
-import { PageConfig } from '@tarojs/taro';
-import { History } from "../history.js";
-import { MpaRouterConfig, Route } from '../../types/router';
-declare class MultiPageHandler {
+import type { PageInstance } from '@tarojs/runtime';
+import type { PageConfig } from '@tarojs/taro';
+import type { History } from 'history';
+import type { MpaRouterConfig, Route } from '../../types/router';
+export default class MultiPageHandler {
     history: History;
     protected config: MpaRouterConfig;
     constructor(config: MpaRouterConfig, history: History);
     get appId(): string;
-    get router(): import("../types/router").Router;
+    get router(): import("../../types/router").Router;
     get routerMode(): "hash" | "browser" | "multi";
     get customRoutes(): Record<string, string | string[]>;
     get tabBarList(): import("@tarojs/taro").TabBarItem[];
@@ -27,8 +27,7 @@ declare class MultiPageHandler {
     onReady(page: PageInstance, onLoad?: boolean): void;
     load(page: PageInstance, pageConfig?: Route): void;
     getPageContainer(page?: PageInstance | null): HTMLElement | null;
-    getScrollingElement(page?: PageInstance | null): HTMLElement | (Window & typeof globalThis);
+    getScrollingElement(page?: PageInstance | null): (Window & typeof globalThis) | HTMLElement;
     bindPageEvents(page: PageInstance, config?: Partial<PageConfig>): void;
     triggerRouterChange(): void;
 }
-export { MultiPageHandler as default };

package/dist/router/navigation-bar.d.ts

@@ -1,4 +1,4 @@
-import PageHandler from "./page.js";
+import type PageHandler from './page';
 interface NavigationBarCache {
     backgroundColor?: string;
     fontColor?: string;
@@ -6,7 +6,7 @@ interface NavigationBarCache {
     show?: boolean;
     loading?: boolean;
 }
-declare class NavigationBarHandler {
+export default class NavigationBarHandler {
     pageContext: PageHandler;
     navigationBarElement: HTMLElement;
     cache: Record<string, NavigationBarCache>;
@@ -33,4 +33,4 @@ declare class NavigationBarHandler {
     fnBtnToggleToNone(): void;
     setNavigationBarVisible(show?: any): void;
 }
-export { NavigationBarHandler as default };
+export {};

package/dist/router/navigation-bar.js

@@ -24,7 +24,7 @@ class NavigationBarHandler {
         });
     }
     toHomeFn() {
-        reLaunch({ url: this.pageContext.homePage });
+        reLaunch({ url: this.pageContext.originHomePage });
     }
     backFn() {
         navigateBack();
@@ -73,7 +73,7 @@ class NavigationBarHandler {
         this.setNavigationLoading();
     }
     setCacheValue() {
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         if (typeof this.cache[currentPage] !== 'object') {
             this.cache[currentPage] = {};
         }
@@ -104,7 +104,7 @@ class NavigationBarHandler {
         var _a;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let isShow;
         if (typeof show === 'boolean') {
             isShow = show;
@@ -129,7 +129,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof backgroundColor === 'string') {
             color = backgroundColor;
@@ -153,7 +153,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof fontColor === 'string') {
             color = fontColor;
@@ -175,7 +175,7 @@ class NavigationBarHandler {
     }
     setTitle(title) {
         var _a, _b, _c;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let proceedTitle;
         if (typeof title === 'string') {
             proceedTitle = title;

package/dist/router/page.d.ts

@@ -1,9 +1,9 @@
-import NavigationBarHandler from "./navigation-bar.js";
-import { PageInstance } from '@tarojs/runtime';
-import { PageConfig, RouterAnimate } from '@tarojs/taro';
-import { History } from "../history.js";
-import { Route, SpaRouterConfig } from '../../types/router';
-declare class PageHandler {
+import NavigationBarHandler from './navigation-bar';
+import type { PageInstance } from '@tarojs/runtime';
+import type { PageConfig, RouterAnimate } from '@tarojs/taro';
+import type { History } from 'history';
+import type { Route, SpaRouterConfig } from '../../types/router';
+export default class PageHandler {
     history: History;
     config: SpaRouterConfig;
     protected readonly defaultAnimation: RouterAnimate;
@@ -13,10 +13,11 @@ declare class PageHandler {
     protected lastUnloadPage: PageInstance | null;
     protected navigationBarHandler: NavigationBarHandler;
     homePage: string;
+    originHomePage: string;
     constructor(config: SpaRouterConfig, history: History);
     get currentPage(): string;
     get appId(): string;
-    get router(): import("../types/router").Router;
+    get router(): import("../../types/router").Router;
     get routerMode(): "hash" | "browser" | "multi";
     get customRoutes(): Record<string, string | string[]>;
     get routes(): Route[];
@@ -27,6 +28,7 @@ declare class PageHandler {
     get animationDuration(): number;
     set pathname(p: string);
     get pathname(): string;
+    get originPathname(): string;
     get basename(): string;
     get pageConfig(): Route | undefined;
     isTabBar(pathname: string): boolean;
@@ -42,11 +44,10 @@ declare class PageHandler {
     load(page: PageInstance, pageConfig: Route | undefined, stampId: string, pageNo?: number): void;
     unload(page?: PageInstance | null, delta?: number, top?: boolean): void;
     show(page?: PageInstance | null, pageConfig?: Route, pageNo?: number): void;
-    hide(page?: PageInstance | null): void;
+    hide(page?: PageInstance | null, animation?: boolean): void;
     addAnimation(pageEl?: HTMLElement | null, first?: boolean): void;
     getPageContainer(page?: PageInstance | null): HTMLElement | null;
-    getScrollingElement(page?: PageInstance | null): HTMLElement | (Window & typeof globalThis);
+    getScrollingElement(page?: PageInstance | null): (Window & typeof globalThis) | HTMLElement;
     bindPageEvents(page: PageInstance, config?: Partial<PageConfig>): void;
     triggerRouterChange(): void;
 }
-export { PageHandler as default };

package/dist/router/page.js

@@ -15,6 +15,7 @@ class PageHandler {
         this.defaultAnimation = { duration: 300, delay: 50 };
         this.config = config;
         this.homePage = getHomePage(this.routes[0].path, this.basename, this.customRoutes, this.config.entryPagePath);
+        this.originHomePage = this.config.entryPagePath || this.routes[0].path || this.basename;
         this.mount();
         this.navigationBarHandler = new NavigationBarHandler(this);
     }
@@ -48,14 +49,14 @@ class PageHandler {
     }
     set pathname(p) { this.router.pathname = p; }
     get pathname() { return this.router.pathname; }
+    // Note: 把 pathname 转换为原始路径，主要是处理 customRoutes 和 basename
+    get originPathname() { return routesAlias.getOrigin(addLeadingSlash(stripBasename(this.pathname, this.basename))); }
     get basename() { return this.router.basename || ''; }
     get pageConfig() {
-        const routePath = addLeadingSlash(stripBasename(this.pathname, this.basename));
         const homePage = addLeadingSlash(this.homePage);
         return this.routes.find(r => {
-            var _a;
             const pagePath = addLeadingSlash(r.path);
-            return [pagePath, homePage].includes(routePath) || ((_a = routesAlias.getConfig(pagePath)) === null || _a === void 0 ? void 0 : _a.includes(routePath));
+            return [pagePath, homePage].includes(this.originPathname);
         });
     }
     isTabBar(pathname) {
@@ -245,24 +246,35 @@ class PageHandler {
             });
         }
     }
-    hide(page) {
-        var _a;
+    hide(page, animation = false) {
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!page)
             return;
         // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
         const pageEl = this.getPageContainer(page);
         if (pageEl) {
-            if (this.hideTimer) {
-                clearTimeout(this.hideTimer);
-                this.hideTimer = null;
-                pageEl.classList.add('taro_page_shade');
+            if (animation) {
+                if (this.hideTimer) {
+                    clearTimeout(this.hideTimer);
+                    this.hideTimer = null;
+                    (_c = (_b = (_a = this.lastHidePage) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.add) === null || _c === void 0 ? void 0 : _c.call(_b, 'taro_page_shade');
+                }
+                this.lastHidePage = pageEl;
+                this.hideTimer = setTimeout(() => {
+                    this.hideTimer = null;
+                    pageEl.classList.add('taro_page_shade');
+                }, this.animationDuration + this.animationDelay);
+                (_d = page.onHide) === null || _d === void 0 ? void 0 : _d.call(page);
             }
-            this.lastHidePage = pageEl;
-            this.hideTimer = setTimeout(() => {
-                this.hideTimer = null;
+            else {
+                if (this.hideTimer) {
+                    clearTimeout(this.hideTimer);
+                    this.hideTimer = null;
+                    (_g = (_f = (_e = this.lastHidePage) === null || _e === void 0 ? void 0 : _e.classList) === null || _f === void 0 ? void 0 : _f.add) === null || _g === void 0 ? void 0 : _g.call(_f, 'taro_page_shade');
+                }
                 pageEl.classList.add('taro_page_shade');
-            }, this.animationDuration + this.animationDelay);
-            (_a = page.onHide) === null || _a === void 0 ? void 0 : _a.call(page);
+                this.lastHidePage = pageEl;
+            }
         }
         else {
             setTimeout(() => this.hide(page), 0);