@tarojs/router 3.6.28 → 3.6.29

package/dist/api.js

@@ -50,22 +50,19 @@ function navigate(option, method) {
             });
             try {
                 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 (!RouterConfig.isPage(addLeadingSlash(option.url))) {
+                        const res = { errMsg: `${method}:fail page ${option.url} 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);
                         }
                     }
+                    const pathPieces = processNavigateUrl(option);
+                    const state = { timestamp: Date.now() };
                     if (method === 'navigateTo') {
                         history.push(pathPieces, state);
                     }

package/dist/index.cjs.js

@@ -32,6 +32,7 @@ body {
 .taro_router > .taro_page.taro_tabbar_page,
 .taro_router > .taro_page.taro_page_show.taro_page_stationed {
   transform: none;
+  transition: none;
 }
 
 .taro_router > .taro_page.taro_page_show {
@@ -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;
   }
 `;
@@ -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 => runtime.addLeadingSlash(e) === url) !== -1;
     }
 }
 
@@ -566,22 +569,19 @@ function navigate(option, method) {
             });
             try {
                 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 (!RouterConfig.isPage(runtime.addLeadingSlash(option.url))) {
+                        const res = { errMsg: `${method}:fail page ${option.url} 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);
                         }
                     }
+                    const pathPieces = processNavigateUrl(option);
+                    const state = { timestamp: Date.now() };
                     if (method === 'navigateTo') {
                         exports.history.push(pathPieces, state);
                     }
@@ -926,7 +926,7 @@ class NavigationBarHandler {
         });
     }
     toHomeFn() {
-        reLaunch({ url: this.pageContext.homePage });
+        reLaunch({ url: this.pageContext.originHomePage });
     }
     backFn() {
         navigateBack();
@@ -1158,6 +1158,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);
     }
@@ -1388,24 +1389,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);
@@ -1573,6 +1585,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]);
             }
@@ -1616,7 +1629,7 @@ 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) {

package/dist/index.esm.js

@@ -31,6 +31,7 @@ body {
 .taro_router > .taro_page.taro_tabbar_page,
 .taro_router > .taro_page.taro_page_show.taro_page_stationed {
   transform: none;
+  transition: none;
 }
 
 .taro_router > .taro_page.taro_page_show {
@@ -70,8 +71,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;
   }
 `;
@@ -261,8 +263,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;
     }
 }
 
@@ -565,22 +568,19 @@ function navigate(option, method) {
             });
             try {
                 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 (!RouterConfig.isPage(addLeadingSlash(option.url))) {
+                        const res = { errMsg: `${method}:fail page ${option.url} 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);
                         }
                     }
+                    const pathPieces = processNavigateUrl(option);
+                    const state = { timestamp: Date.now() };
                     if (method === 'navigateTo') {
                         history.push(pathPieces, state);
                     }
@@ -925,7 +925,7 @@ class NavigationBarHandler {
         });
     }
     toHomeFn() {
-        reLaunch({ url: this.pageContext.homePage });
+        reLaunch({ url: this.pageContext.originHomePage });
     }
     backFn() {
         navigateBack();
@@ -1157,6 +1157,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);
     }
@@ -1387,24 +1388,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);
@@ -1572,6 +1584,7 @@ function createRouter(history, 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]);
             }
@@ -1615,7 +1628,7 @@ 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) {

package/dist/router/index.d.ts

@@ -7,6 +7,7 @@ declare class RouterConfig {
     static get router(): import("../types/router").Router;
     static get mode(): "hash" | "browser" | "multi";
     static get customRoutes(): Record<string, string | string[]>;
+    // 这个方法不考虑 basename 和 customRoutes，只判断原始的 url 是否在 pages 中
     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/navigation-bar.js

@@ -24,7 +24,7 @@ class NavigationBarHandler {
         });
     }
     toHomeFn() {
-        reLaunch({ url: this.pageContext.homePage });
+        reLaunch({ url: this.pageContext.originHomePage });
     }
     backFn() {
         navigateBack();

package/dist/router/page.d.ts

@@ -13,6 +13,7 @@ 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;
@@ -42,7 +43,7 @@ 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);

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);
     }
@@ -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.js

@@ -114,6 +114,7 @@ function createRouter(history, 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]);
             }
@@ -157,7 +158,7 @@ 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) {

package/dist/style.js

@@ -21,6 +21,7 @@ body {
 .taro_router > .taro_page.taro_tabbar_page,
 .taro_router > .taro_page.taro_page_show.taro_page_stationed {
   transform: none;
+  transition: none;
 }
 
 .taro_router > .taro_page.taro_page_show {
@@ -60,8 +61,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;
   }
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "3.6.28",
+  "version": "3.6.29",
   "description": "Taro-router",
   "browser": "dist/index.js",
   "main:h5": "dist/index.esm.js",
@@ -44,14 +44,14 @@
     "rollup-plugin-ts": "^3.0.2",
     "ts-jest": "^29.0.5",
     "typescript": "^4.7.4",
-    "@tarojs/taro": "3.6.28",
-    "@tarojs/runtime": "3.6.28",
-    "@tarojs/shared": "3.6.28"
+    "@tarojs/runtime": "3.6.29",
+    "@tarojs/taro": "3.6.29",
+    "@tarojs/shared": "3.6.29"
   },
   "peerDependencies": {
-    "@tarojs/taro": "3.6.28",
-    "@tarojs/runtime": "3.6.28",
-    "@tarojs/shared": "3.6.28"
+    "@tarojs/runtime": "3.6.29",
+    "@tarojs/taro": "3.6.29",
+    "@tarojs/shared": "3.6.29"
   },
   "scripts": {
     "prebuild": "pnpm run clean",