@tarojs/router 4.0.0-alpha.2 → 4.0.0-alpha.21

package/dist/index.js

@@ -6,7 +6,7 @@ export { createMultiRouter } from './router/mpa.js';
 export { createRouter } from './router/spa.js';
 export { routesAlias } from './utils/index.js';
 export { createBrowserHistory, createHashHistory } from 'history';
-export { isDingTalk, isWeixin, setMpaTitle, setNavigationBarStyle, setTitle } from './utils/navigate.js';
+export { isDingTalk, isWeixin, setMpaTitle, setNavigationBarLoading, setNavigationBarStyle, setTitle } from './utils/navigate.js';
 
 function handleAppMount(config, _, appId = config.appId || 'app') {
     let app = document.getElementById(appId);
@@ -20,7 +20,7 @@ function handleAppMount(config, _, appId = config.appId || 'app') {
     app.classList.add('taro_router');
     if (!isPosition)
         appWrapper.appendChild(app);
-    initNavigationBar(appWrapper);
+    initNavigationBar(config, appWrapper);
 }
 function handleAppMountWithTabbar(config, history, appId = config.appId || 'app') {
     let app = document.getElementById(appId);
@@ -46,7 +46,7 @@ function handleAppMountWithTabbar(config, history, appId = config.appId || 'app'
         appWrapper.replaceChild(container, app);
     }
     initTabbar(config, history);
-    initNavigationBar(container);
+    initNavigationBar(config, container);
 }
 
 export { handleAppMount, handleAppMountWithTabbar };

package/dist/navigationBar.d.ts

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

package/dist/navigationBar.js

@@ -1,3 +1,5 @@
+import { loadNavigationBarStyle } from './style.js';
+
 const home_svg_str = `
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M23.8899 12.2737C23.8232 12.3584 23.7237 12.3997 23.6198 12.3974H20.7994V23.5996C20.7994 23.8194 20.6213 24 20.4001 24H14.7994C14.5791 24 14.4002 23.8194 14.4002 23.5996V15.6H9.59963V23.5996C9.59963 23.8194 9.42075 24 9.20033 24H3.59968C3.48981 24 3.38964 23.954 3.31764 23.8811C3.24495 23.8091 3.2004 23.7087 3.2004 23.5996V12.3975H0.398546V12.3967C0.296893 12.396 0.194446 12.3544 0.11579 12.2738C-0.0371146 12.114 -0.0400714 11.864 0.11579 11.7076L11.7201 0.117284C11.8767 -0.0390948 12.1298 -0.0390948 12.2863 0.117284L23.8899 11.7076C24.0465 11.864 24.0265 12.0995 23.8899 12.2737ZM12.0029 0.964625L1.37086 11.5854L3.59968 11.5839V11.5999C3.65537 11.5999 3.70804 11.611 3.75557 11.6307C3.89952 11.692 4.00046 11.8339 4.00046 11.9996V23.1991H8.79955V15.2003C8.79955 14.9789 8.97917 14.8002 9.20033 14.8002H14.7995C15.0207 14.8002 15.2003 14.9789 15.2003 15.2003V23.1991H20.0001V11.9996C20.0001 11.8339 20.1003 11.692 20.2443 11.6307C20.2918 11.611 20.3453 11.5999 20.4001 11.5999V11.5713L22.6193 11.5691L12.0029 0.964625Z" fill="currentColor"/>
@@ -7,21 +9,36 @@ const back_svg_str = `
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M17.8206 22.9016L7.45515 11.8756L17.8206 1.09845C18.0598 0.849741 18.0598 0.435233 17.8206 0.186528C17.5814 -0.0621762 17.1827 -0.0621762 16.9435 0.186528L6.1794 11.4611C5.9402 11.7098 5.9402 12.1244 6.1794 12.3731L16.9435 23.8135C17.1827 24.0622 17.5814 24.0622 17.8206 23.8135C18.0598 23.5648 18.0598 23.1503 17.8206 22.9016Z" fill="currentColor"/>
 </svg>
-
 `;
-function initNavigationBar(container) {
-    const navigationBar = document.createElement('taro-navigation-bar-wrap');
+const loading_svg_str = `
+<svg t="1709608074670" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4741" width="24" height="24"><path d="M256 529.066667H85.333333a17.066667 17.066667 0 1 1 0-34.133334h170.666667a17.066667 17.066667 0 0 1 0 34.133334z" opacity=".278" p-id="4742"></path><path d="M99.84 640a17.066667 17.066667 0 0 1-4.437333-33.553067l164.693333-44.373333a17.066667 17.066667 0 1 1 8.891733 32.9728l-164.693333 44.373333a17.544533 17.544533 0 0 1-4.4544 0.580267z" opacity=".322" p-id="4743"></path><path d="M264.533333 462.523733a16.896 16.896 0 0 1-4.369066-0.580266l-164.693334-43.52a17.0496 17.0496 0 1 1 8.721067-32.989867l164.693333 43.52a17.066667 17.066667 0 1 1-4.352 33.570133z" opacity=".239" p-id="4744"></path><path d="M384.017067 307.2a17.032533 17.032533 0 0 1-14.7968-8.533333l-85.333334-147.626667a17.066667 17.066667 0 0 1 29.559467-17.083733l85.333333 147.626666A17.066667 17.066667 0 0 1 384.017067 307.2z" opacity=".122" p-id="4745"></path><path d="M639.982933 307.2a17.0496 17.0496 0 0 1-14.762666-25.6l85.333333-147.626667a17.066667 17.066667 0 1 1 29.559467 17.066667l-85.333334 147.626667a17.032533 17.032533 0 0 1-14.7968 8.533333z" opacity=".922" p-id="4746"></path><path d="M692.906667 347.306667a17.066667 17.066667 0 0 1-12.117334-29.098667l120.337067-121.173333a17.066667 17.066667 0 1 1 24.234667 24.046933l-120.337067 121.173333a17.1008 17.1008 0 0 1-12.117333 5.051734z" opacity=".878" p-id="4747"></path><path d="M733.883733 401.066667a17.066667 17.066667 0 0 1-8.5504-31.8464l147.626667-85.333334a17.0496 17.0496 0 1 1 17.066667 29.5424l-147.626667 85.333334a16.776533 16.776533 0 0 1-8.516267 2.304z" opacity=".839" p-id="4748"></path><path d="M512 273.066667a17.066667 17.066667 0 0 1-17.066667-17.066667V85.333333a17.066667 17.066667 0 0 1 34.133334 0v170.666667a17.066667 17.066667 0 0 1-17.066667 17.066667z" p-id="4749"></path><path d="M578.577067 281.6a17.066667 17.066667 0 0 1-16.520534-21.418667l43.52-164.693333a17.066667 17.066667 0 0 1 33.006934 8.721067l-43.52 164.693333a17.066667 17.066667 0 0 1-16.4864 12.6976z" opacity=".961" p-id="4750"></path><path d="M445.44 282.453333a17.066667 17.066667 0 0 1-16.469333-12.629333l-44.373334-164.693333a17.066667 17.066667 0 0 1 32.955734-8.891734l44.373333 164.693334a17.066667 17.066667 0 0 1-16.4864 21.521066z" opacity=".078" p-id="4751"></path><path d="M924.177067 640c-1.4848 0-2.9696-0.187733-4.4544-0.580267l-164.693334-44.373333a17.066667 17.066667 0 0 1 8.874667-32.9728l164.693333 44.373333a17.066667 17.066667 0 0 1-4.420266 33.553067z" opacity=".722" p-id="4752"></path><path d="M881.476267 742.4a17.015467 17.015467 0 0 1-8.482134-2.269867l-148.48-85.333333a17.0496 17.0496 0 1 1 16.9984-29.5936l148.48 85.333333a17.0496 17.0496 0 0 1-8.516266 31.863467z" opacity=".678" p-id="4753"></path><path d="M813.226667 830.293333a17.015467 17.015467 0 0 1-12.066134-5.000533l-120.337066-120.337067a17.0496 17.0496 0 1 1 24.132266-24.132266l120.337067 120.337066a17.0496 17.0496 0 0 1-12.066133 29.1328z" opacity=".639" p-id="4754"></path><path d="M938.666667 529.066667H768a17.066667 17.066667 0 1 1 0-34.133334h170.666667a17.066667 17.066667 0 1 1 0 34.133334z" opacity=".761" p-id="4755"></path><path d="M401.066667 941.226667a17.066667 17.066667 0 0 1-16.4864-21.504l44.373333-164.693334a17.066667 17.066667 0 1 1 32.955733 8.874667l-44.373333 164.693333a17.066667 17.066667 0 0 1-16.469333 12.629334z" opacity=".478" p-id="4756"></path><path d="M298.6496 898.56a17.066667 17.066667 0 0 1-14.779733-25.565867l85.333333-148.48a17.083733 17.083733 0 0 1 29.5936 16.9984l-85.333333 148.48a17.032533 17.032533 0 0 1-14.813867 8.567467z" opacity=".439" p-id="4757"></path><path d="M512 955.733333a17.066667 17.066667 0 0 1-17.066667-17.066666V768a17.066667 17.066667 0 1 1 34.133334 0v170.666667a17.066667 17.066667 0 0 1-17.066667 17.066666z" opacity=".522" p-id="4758"></path><path d="M725.3504 898.56a17.032533 17.032533 0 0 1-14.7968-8.533333l-85.333333-147.626667a17.066667 17.066667 0 0 1 29.559466-17.066667l85.333334 147.626667a17.066667 17.066667 0 0 1-14.762667 25.6z" opacity=".6" p-id="4759"></path><path d="M622.062933 942.08c-7.509333 0-14.421333-5.0176-16.469333-12.629333l-44.3904-164.693334a17.066667 17.066667 0 1 1 32.9728-8.874666l44.3904 164.693333a17.066667 17.066667 0 0 1-16.503467 21.504z" opacity=".561" p-id="4760"></path><path d="M759.4496 463.36a17.083733 17.083733 0 0 1-4.420267-33.553067l164.693334-44.373333a17.066667 17.066667 0 0 1 8.874666 32.955733l-164.693333 44.373334a16.657067 16.657067 0 0 1-4.4544 0.597333z" opacity=".702" p-id="4761"></path><path d="M330.24 347.306667a17.015467 17.015467 0 0 1-12.066133-5.000534l-120.32-120.32a17.0496 17.0496 0 1 1 24.132266-24.132266l120.32 120.32a17.0496 17.0496 0 0 1-12.066133 29.1328z" opacity=".161" p-id="4762"></path><path d="M290.116267 401.066667a17.032533 17.032533 0 0 1-8.533334-2.286934l-147.626666-85.333333a17.066667 17.066667 0 1 1 17.083733-29.5424l147.626667 85.333333a17.066667 17.066667 0 0 1-8.5504 31.829334z" opacity=".2" p-id="4763"></path><path d="M142.523733 742.4a17.066667 17.066667 0 0 1-8.567466-31.8464l147.626666-85.333333a17.066667 17.066667 0 1 1 17.083734 29.559466l-147.626667 85.333334a16.930133 16.930133 0 0 1-8.516267 2.286933z" opacity=".361" p-id="4764"></path><path d="M209.92 830.293333a17.066667 17.066667 0 0 1-12.117333-29.098666l120.32-121.173334a17.066667 17.066667 0 0 1 24.2176 24.029867l-120.32 121.1904a16.896 16.896 0 0 1-12.100267 5.051733z" opacity=".4" p-id="4765"></path></svg>
+`;
+function initNavigationBar(config, container) {
+    if (config.router.mode === 'multi')
+        return;
+    const navigationBar = document.createElement('div');
     navigationBar.classList.add('taro-navigation-bar-no-icon');
-    const navigationBarBackBtn = document.createElement('taro-navigation-bar-back');
-    const navigationBarHomeBtn = document.createElement('taro-navigation-bar-home');
+    const navigationBarBackBtn = document.createElement('div');
+    navigationBarBackBtn.classList.add('taro-navigation-bar-back');
+    const navigationBarHomeBtn = document.createElement('div');
+    navigationBarHomeBtn.classList.add('taro-navigation-bar-home');
     navigationBarBackBtn.innerHTML = back_svg_str;
     navigationBarHomeBtn.innerHTML = home_svg_str;
-    const navigationBarTitle = document.createElement('taro-navigation-bar-title');
+    const navigationBarTitleWrap = document.createElement('div');
+    navigationBarTitleWrap.classList.add('taro-navigation-bar-title-wrap');
+    const navigationBarLoading = document.createElement('div');
+    navigationBarLoading.classList.add('taro-navigation-bar-loading');
+    navigationBarLoading.innerHTML = loading_svg_str;
+    const navigationBarTitle = document.createElement('div');
+    navigationBarTitle.classList.add('taro-navigation-bar-title');
+    navigationBarTitleWrap.appendChild(navigationBarLoading);
+    navigationBarTitleWrap.appendChild(navigationBarTitle);
     navigationBar.appendChild(navigationBarHomeBtn);
     navigationBar.appendChild(navigationBarBackBtn);
-    navigationBar.appendChild(navigationBarTitle);
+    navigationBar.appendChild(navigationBarTitleWrap);
     navigationBar.id = 'taro-navigation-bar';
     container.prepend(navigationBar);
+    loadNavigationBarStyle();
 }
 
 export { initNavigationBar };

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

@@ -1,5 +1,5 @@
 import { __awaiter } from 'tslib';
-import { incrementId, eventCenter, createPageConfig, hooks, stringify } from '@tarojs/runtime';
+import { incrementId, eventCenter, createPageConfig, hooks, stringify, Current } from '@tarojs/runtime';
 import '../utils/index.js';
 import { RouterConfig } from './index.js';
 import MultiPageHandler from './multi-page.js';
@@ -16,16 +16,16 @@ 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);
         }
-        eventCenter.on('__taroH5SetNavigationTitle', setMpaTitle);
+        eventCenter.on('__taroH5SetNavigationBarTitle', setMpaTitle);
         RouterConfig.config = config;
         const handler = new MultiPageHandler(config, history);
         const launchParam = {
-            path: config.pageName,
+            path: config.pageName, // 多页面模式没新开一个页面相当于重启，所以直接使用当前页面路径
             query: handler.getQuery(launchStampId),
             scene: 0,
             shareTicket: '',
@@ -68,12 +68,17 @@ function createMultiRouter(history, app, config, framework) {
         handler.load(page, pageConfig);
         (_f = app.onShow) === null || _f === void 0 ? void 0 : _f.call(app, launchParam);
         window.addEventListener('visibilitychange', () => {
-            var _a, _b;
+            var _a, _b, _c;
+            const currentPath = ((_a = Current.page) === null || _a === void 0 ? void 0 : _a.path) || '';
+            const path = currentPath.substring(0, currentPath.indexOf('?'));
+            const param = {};
+            // app的 onShow/onHide 生命周期的路径信息为当前页面的路径
+            Object.assign(param, launchParam, { path });
             if (document.visibilityState === 'visible') {
-                (_a = app.onShow) === null || _a === void 0 ? void 0 : _a.call(app, launchParam);
+                (_b = app.onShow) === null || _b === void 0 ? void 0 : _b.call(app, param);
             }
             else {
-                (_b = app.onHide) === null || _b === void 0 ? void 0 : _b.call(app, launchParam);
+                (_c = app.onHide) === null || _c === void 0 ? void 0 : _c.call(app, param);
             }
         });
     });

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,13 +1,14 @@
-import PageHandler from "./page.js";
+import type PageHandler from './page';
 interface NavigationBarCache {
     backgroundColor?: string;
     fontColor?: string;
     title?: string;
     show?: boolean;
+    loading?: boolean;
 }
-declare class NavigationBarHandler {
+export default class NavigationBarHandler {
     pageContext: PageHandler;
-    navigationBarElement: Element;
+    navigationBarElement: HTMLElement;
     cache: Record<string, NavigationBarCache>;
     isLoadDdEntry: boolean;
     constructor(pageContext: PageHandler);
@@ -16,11 +17,14 @@ declare class NavigationBarHandler {
     get homeBtnElement(): Element | null;
     get backBtnElement(): Element | null;
     get titleElement(): Element | null;
+    get loadingElement(): Element | null;
     init(): void;
     setNavigationBarElement(): void;
     load(): void;
     setCacheValue(): void;
     setFnBtnState(): void;
+    shiftLoadingState(show: boolean): void;
+    setNavigationLoading(show?: boolean): void;
     setNavigationBarBackground(backgroundColor?: string): void;
     setNavigationBarTextStyle(fontColor?: string): void;
     setTitle(title?: any): void;
@@ -29,4 +33,4 @@ declare class NavigationBarHandler {
     fnBtnToggleToNone(): void;
     setNavigationBarVisible(show?: any): void;
 }
-export { NavigationBarHandler as default };
+export {};

package/dist/router/navigation-bar.js

@@ -1,6 +1,5 @@
 import { eventCenter } from '@tarojs/runtime';
 import { reLaunch, navigateBack } from '../api.js';
-import { loadNavigationBarStyle } from '../style.js';
 import '../utils/index.js';
 import stacks from './stack.js';
 import { isDingTalk } from '../utils/navigate.js';
@@ -11,10 +10,12 @@ class NavigationBarHandler {
         this.cache = {};
         this.pageContext = pageContext;
         this.init();
-        loadNavigationBarStyle();
-        eventCenter.on('__taroH5SetNavigationTitle', (title) => {
+        eventCenter.on('__taroH5SetNavigationBarTitle', (title) => {
             this.setTitle(title);
         });
+        eventCenter.on('__taroH5setNavigationBarLoading', (loading) => {
+            this.setNavigationLoading(loading);
+        });
         eventCenter.on('__taroH5setNavigationBarColor', ({ backgroundColor, frontColor }) => {
             if (typeof backgroundColor === 'string')
                 this.setNavigationBarBackground(backgroundColor);
@@ -23,7 +24,7 @@ class NavigationBarHandler {
         });
     }
     toHomeFn() {
-        reLaunch({ url: this.pageContext.homePage });
+        reLaunch({ url: this.pageContext.originHomePage });
     }
     backFn() {
         navigateBack();
@@ -32,19 +33,24 @@ class NavigationBarHandler {
         var _a;
         if (!this.navigationBarElement)
             return null;
-        return (_a = this.navigationBarElement.getElementsByTagName('taro-navigation-bar-home')) === null || _a === void 0 ? void 0 : _a[0];
+        return (_a = this.navigationBarElement.getElementsByClassName('taro-navigation-bar-home')) === null || _a === void 0 ? void 0 : _a[0];
     }
     get backBtnElement() {
         var _a;
         if (!this.navigationBarElement)
             return null;
-        return (_a = this.navigationBarElement.getElementsByTagName('taro-navigation-bar-back')) === null || _a === void 0 ? void 0 : _a[0];
+        return (_a = this.navigationBarElement.getElementsByClassName('taro-navigation-bar-back')) === null || _a === void 0 ? void 0 : _a[0];
     }
     get titleElement() {
         var _a;
         if (!this.navigationBarElement)
             return null;
-        return (_a = this.navigationBarElement.getElementsByTagName('taro-navigation-bar-title')) === null || _a === void 0 ? void 0 : _a[0];
+        return (_a = this.navigationBarElement.getElementsByClassName('taro-navigation-bar-title')) === null || _a === void 0 ? void 0 : _a[0];
+    }
+    get loadingElement() {
+        if (!this.navigationBarElement)
+            return null;
+        return this.navigationBarElement.getElementsByClassName('taro-navigation-bar-loading')[0];
     }
     init() {
         var _a, _b;
@@ -55,8 +61,7 @@ class NavigationBarHandler {
         (_b = this.backBtnElement) === null || _b === void 0 ? void 0 : _b.addEventListener('click', this.backFn.bind(this));
     }
     setNavigationBarElement() {
-        var _a;
-        this.navigationBarElement = (_a = document.getElementsByTagName('taro-navigation-bar-wrap')) === null || _a === void 0 ? void 0 : _a[0];
+        this.navigationBarElement = document.getElementById('taro-navigation-bar');
     }
     load() {
         this.setCacheValue();
@@ -65,9 +70,10 @@ class NavigationBarHandler {
         this.setFnBtnState();
         this.setNavigationBarBackground();
         this.setNavigationBarTextStyle();
+        this.setNavigationLoading();
     }
     setCacheValue() {
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         if (typeof this.cache[currentPage] !== 'object') {
             this.cache[currentPage] = {};
         }
@@ -84,11 +90,46 @@ class NavigationBarHandler {
             this.fnBtnToggleToHome();
         }
     }
+    shiftLoadingState(show) {
+        if (!this.loadingElement)
+            return;
+        if (show) {
+            this.loadingElement.classList.add('taro-navigation-bar-loading-show');
+        }
+        else {
+            this.loadingElement.classList.remove('taro-navigation-bar-loading-show');
+        }
+    }
+    setNavigationLoading(show) {
+        var _a;
+        if (!this.navigationBarElement)
+            return;
+        const currentPage = this.pageContext.originPathname;
+        let isShow;
+        if (typeof show === 'boolean') {
+            isShow = show;
+            this.cache[currentPage] &&
+                (this.cache[currentPage].loading = isShow);
+        }
+        else {
+            const cacheValue = (_a = this.cache[currentPage]) === null || _a === void 0 ? void 0 : _a.loading;
+            if (typeof cacheValue === 'boolean') {
+                isShow = cacheValue;
+            }
+            else {
+                // 默认值为 false
+                isShow = false;
+                this.cache[currentPage] &&
+                    (this.cache[currentPage].loading = isShow);
+            }
+        }
+        this.shiftLoadingState(isShow);
+    }
     setNavigationBarBackground(backgroundColor) {
         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;
@@ -112,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;
@@ -134,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;
@@ -168,23 +209,25 @@ class NavigationBarHandler {
     fnBtnToggleToHome() {
         if (!this.navigationBarElement)
             return;
-        this.navigationBarElement.classList.add('taro-navigation-bar-home');
-        this.navigationBarElement.classList.remove('taro-navigation-bar-back');
+        this.navigationBarElement.classList.add('taro-navigation-bar-home-icon');
+        this.navigationBarElement.classList.remove('taro-navigation-bar-back-icon');
     }
     fnBtnToggleToBack() {
         if (!this.navigationBarElement)
             return;
-        this.navigationBarElement.classList.remove('taro-navigation-bar-home');
-        this.navigationBarElement.classList.add('taro-navigation-bar-back');
+        this.navigationBarElement.classList.remove('taro-navigation-bar-home-icon');
+        this.navigationBarElement.classList.add('taro-navigation-bar-back-icon');
     }
     fnBtnToggleToNone() {
         if (!this.navigationBarElement)
             return;
-        this.navigationBarElement.classList.remove('taro-navigation-bar-home');
-        this.navigationBarElement.classList.remove('taro-navigation-bar-back');
+        this.navigationBarElement.classList.remove('taro-navigation-bar-home-icon');
+        this.navigationBarElement.classList.remove('taro-navigation-bar-back-icon');
     }
     setNavigationBarVisible(show) {
         var _a, _b;
+        if (!this.navigationBarElement)
+            return;
         let shouldShow;
         if (typeof show === 'boolean') {
             shouldShow = show;

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);

package/dist/router/spa.d.ts

@@ -1,5 +1,4 @@
-import { AppInstance } from '@tarojs/runtime';
-import { History } from "../history.js";
-import { SpaRouterConfig } from '../../types/router';
-declare function createRouter(history: History, app: AppInstance, config: SpaRouterConfig, framework?: string): () => void;
-export { createRouter };
+import type { AppInstance } from '@tarojs/runtime';
+import type { History } from 'history';
+import type { SpaRouterConfig } from '../../types/router';
+export declare function createRouter(history: History, app: AppInstance, config: SpaRouterConfig, framework?: string): () => void;