@tarojs/router 4.0.0-beta.74 → 4.0.0-beta.76

package/LICENSE

@@ -154,15 +154,8 @@ See `/LICENSE` for details of the license.
 
 ==================
 
-MIT (stencil-vue2-output-target):
-The following files embed [stencil-vue2-output-target](https://github.com/diondree/stencil-vue2-output-target) MIT:
-`/packages/taro-components-library-vue2/src/vue-component-lib/utils.ts`
-See `/LICENSE` for details of the license.
-
-==================
-
 MIT (weui):
-The following files embed [stencil-vue2-output-target](https://github.com/Tencent/weui) MIT:
+The following files embed [weui](https://github.com/Tencent/weui) MIT:
 `/packages/taro-components/src/components/*.scss`
 See `/LICENSE.txt` for details of the license.
 

package/dist/api.d.ts

@@ -1,8 +1,7 @@
 import Taro from '@tarojs/taro';
-declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;
-declare function redirectTo(option: Taro.redirectTo.Option): ReturnType<typeof Taro.redirectTo>;
-declare function navigateBack(option?: Taro.navigateBack.Option): ReturnType<typeof Taro.navigateBack>;
-declare function switchTab(option: Taro.switchTab.Option): ReturnType<typeof Taro.switchTab>;
-declare function reLaunch(option: Taro.reLaunch.Option): ReturnType<typeof Taro.reLaunch>;
-declare function getCurrentPages(): Taro.Page[];
-export { navigateTo, redirectTo, navigateBack, switchTab, reLaunch, getCurrentPages };
+export declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;
+export declare function redirectTo(option: Taro.redirectTo.Option): ReturnType<typeof Taro.redirectTo>;
+export declare function navigateBack(option?: Taro.navigateBack.Option): ReturnType<typeof Taro.navigateBack>;
+export declare function switchTab(option: Taro.switchTab.Option): ReturnType<typeof Taro.switchTab>;
+export declare function reLaunch(option: Taro.reLaunch.Option): ReturnType<typeof Taro.reLaunch>;
+export declare function getCurrentPages(): Taro.Page[];

package/dist/api.js

@@ -16,13 +16,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
@@ -52,20 +53,6 @@ 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') {
                         history.push(pathPieces, state);
                     }

package/dist/events/resize.d.ts

@@ -1,3 +1,2 @@
-import { PageInstance } from '@tarojs/runtime';
-declare function bindPageResize(page: PageInstance): void;
-export { bindPageResize };
+import type { PageInstance } from '@tarojs/runtime';
+export declare function bindPageResize(page: PageInstance): void;

package/dist/events/scroll.d.ts

@@ -1,3 +1,2 @@
-import { PageInstance } from '@tarojs/runtime';
-declare function bindPageScroll(page: PageInstance, scrollEl: HTMLElement | Window, distance?: number): void;
-export { bindPageScroll };
+import type { PageInstance } from '@tarojs/runtime';
+export declare function bindPageScroll(page: PageInstance, scrollEl: HTMLElement | Window, distance?: number): void;

package/dist/history.d.ts

@@ -1,6 +1,8 @@
-import { IH5RouterConfig } from '@tarojs/taro/types/compile';
-import { StateEvent } from '../types/history';
-declare let history: History;
+import { Action, createBrowserHistory, createHashHistory } from 'history';
+import type { IH5RouterConfig } from '@tarojs/taro/types/compile';
+import type { Blocker, BrowserHistoryOptions, HashHistoryOptions, History, Listener, Location, Path, To } from 'history';
+import type { StateEvent } from '../types/history';
+export declare let history: History;
 declare class MpaHistory implements History {
     action: Action;
     get location(): Location;
@@ -17,8 +19,8 @@ declare class MpaHistory implements History {
     replaceState: globalThis.History['replaceState'];
     eventState(action: Required<StateEvent>['action']): (data: any, unused: string, url?: string | URL | null) => any;
 }
-declare function setHistory(h: History, base?: string): void;
-declare function createMpaHistory(_?: HashHistoryOptions | BrowserHistoryOptions): MpaHistory;
-declare function setHistoryMode(mode?: IH5RouterConfig['mode'], base?: string): void;
-declare function prependBasename(url?: string): string;
-export { history, setHistory, createMpaHistory, createBrowserHistory, createHashHistory, setHistoryMode, prependBasename };
+export declare function setHistory(h: History, base?: string): void;
+export declare function createMpaHistory(_?: HashHistoryOptions | BrowserHistoryOptions): MpaHistory;
+export { createBrowserHistory, createHashHistory };
+export declare function setHistoryMode(mode?: IH5RouterConfig['mode'], base?: string): void;
+export declare function prependBasename(url?: string): string;

package/dist/index.cjs.js

@@ -15,7 +15,8 @@ var UniversalRouter = require('universal-router');
 function loadAnimateStyle(ms = 300) {
     const css = `
 body {
-  overflow: hidden; // 防止 iOS 页面滚动
+  /* 防止 iOS 页面滚动 */
+  overflow: hidden;
 }
 .taro_router > .taro_page {
   position: absolute;
@@ -72,8 +73,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;
   }
 `;
@@ -141,7 +143,7 @@ function loadNavigationBarStyle() {
     to {
       transform: rotate(360deg);
     }
-  }  
+  }
 
   .taro-navigation-bar-no-icon > .taro-navigation-bar-home {
     display: none;
@@ -263,8 +265,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 => runtime.addLeadingSlash(e) === url) !== -1;
     }
 }
 
@@ -533,13 +536,14 @@ function processNavigateUrl(option) {
         const parts = routesAlias.getOrigin(exports.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 = runtime.addLeadingSlash(pathPieces.pathname);
     // 处理自定义路由
     pathPieces.pathname = routesAlias.getAlias(runtime.addLeadingSlash(pathPieces.pathname));
     // 处理 basename
@@ -569,20 +573,6 @@ 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(runtime.addLeadingSlash(originPath)) && !RouterConfig.isPage(runtime.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') {
                         exports.history.push(pathPieces, state);
                     }
@@ -853,8 +843,8 @@ const launchStampId$1 = createStampId$1();
  * - 不支持路由动画
  */
 function createMultiRouter(history, app, config, framework) {
-    var _a, _b, _c, _d, _e, _f;
     return tslib.__awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
         if (typeof app.onUnhandledRejection === 'function') {
             window.addEventListener('unhandledrejection', app.onUnhandledRejection);
         }
@@ -862,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: '',
@@ -941,7 +931,7 @@ class NavigationBarHandler {
         });
     }
     toHomeFn() {
-        reLaunch({ url: this.pageContext.homePage });
+        reLaunch({ url: this.pageContext.originHomePage });
     }
     backFn() {
         navigateBack();
@@ -990,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] = {};
         }
@@ -1021,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;
@@ -1046,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;
@@ -1070,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;
@@ -1092,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;
@@ -1173,6 +1163,7 @@ class PageHandler {
         this.defaultAnimation = { duration: 300, delay: 50 };
         this.config = config;
         this.homePage = runtime.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);
     }
@@ -1206,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(runtime.addLeadingSlash(runtime.stripBasename(this.pathname, this.basename))); }
     get basename() { return this.router.basename || ''; }
     get pageConfig() {
-        const routePath = runtime.addLeadingSlash(runtime.stripBasename(this.pathname, this.basename));
         const homePage = runtime.addLeadingSlash(this.homePage);
         return this.routes.find(r => {
-            var _a;
             const pagePath = runtime.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) {
@@ -1403,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);
@@ -1512,10 +1514,10 @@ function createRouter(history$1, app, config, framework) {
     runtime.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 }) => tslib.__awaiter(this, void 0, void 0, function* () {
-        var _c, _d, _e, _f, _g, _h, _j, _k;
+    const render = (_c) => tslib.__awaiter(this, [_c], void 0, function* ({ location, action }) {
+        var _d, _e, _f, _g, _h, _j, _k, _l;
         handler.pathname = decodeURI(location.pathname);
-        if ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll)
+        if ((_d = window.__taroAppConfig) === null || _d === void 0 ? void 0 : _d.usingWindowScroll)
             window.scrollTo(0, 0);
         runtime.eventCenter.trigger('__taroRouterChange', {
             toLocation: {
@@ -1534,7 +1536,7 @@ function createRouter(history$1, app, config, framework) {
                     path: handler.pathname,
                     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);
                 runtime.eventCenter.trigger('__taroRouterNotFound', notFoundEvent);
             }
             else if (/Loading hot update .* failed./.test(error.message)) {
@@ -1548,10 +1550,10 @@ function createRouter(history$1, app, config, framework) {
         if (!element)
             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';
+        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;
@@ -1569,7 +1571,7 @@ function createRouter(history$1, app, config, framework) {
         runtime.eventCenter.trigger('__taroSetNavigationStyle', navigationStyle, navigationBarTextStyle, navigationBarBackgroundColor);
         const currentPage = runtime.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 = '';
@@ -1588,6 +1590,7 @@ function createRouter(history$1, app, config, framework) {
             if (handler.isSamePage(currentPage))
                 return;
             if (handler.isTabBar(currentPage.path)) {
+                // NOTE: 从 tabBar 页面切换到 tabBar 页面
                 handler.hide(currentPage);
                 stacks.pushTab(currentPage.path.split('?')[0]);
             }
@@ -1631,11 +1634,11 @@ function createRouter(history$1, 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'];
@@ -1724,11 +1727,11 @@ function handleAppMountWithTabbar(config, history, appId = config.appId || 'app'
     initNavigationBar(config, container);
 }
 
-Object.defineProperty(exports, 'createBrowserHistory', {
+Object.defineProperty(exports, "createBrowserHistory", {
   enumerable: true,
   get: function () { return history.createBrowserHistory; }
 });
-Object.defineProperty(exports, 'createHashHistory', {
+Object.defineProperty(exports, "createHashHistory", {
   enumerable: true,
   get: function () { return history.createHashHistory; }
 });

package/dist/index.d.ts

@@ -1,10 +1,9 @@
-import { History } from "./history.js";
-import { MpaRouterConfig, SpaRouterConfig } from '../types/router';
-declare function handleAppMount(config: SpaRouterConfig | MpaRouterConfig, _: History, appId?: string): void;
-declare function handleAppMountWithTabbar(config: SpaRouterConfig | MpaRouterConfig, history: History, appId?: string): void;
-export * from "./api.js";
-export * from "./history.js";
-export { createMultiRouter } from "./router/mpa.js";
-export { createRouter } from "./router/spa.js";
-export * from "./utils/index.js";
-export { handleAppMount, handleAppMountWithTabbar };
+import type { History } from 'history';
+import type { MpaRouterConfig, SpaRouterConfig } from '../types/router';
+export * from './api';
+export * from './history';
+export { createMultiRouter } from './router/mpa';
+export { createRouter } from './router/spa';
+export * from './utils';
+export declare function handleAppMount(config: SpaRouterConfig | MpaRouterConfig, _: History, appId?: string): void;
+export declare function handleAppMountWithTabbar(config: SpaRouterConfig | MpaRouterConfig, history: History, appId?: string): void;