@tarojs/router 3.6.31-canary.1 → 3.6.32

package/dist/index.cjs.js

@@ -45,7 +45,7 @@ body {
 /**
  * 插入路由相关样式
  */
-function loadRouterStyle(enableTabBar, enableWindowScroll) {
+function loadRouterStyle(enableTabBar, enableWindowScroll, enhanceAnimation) {
     const css = `
   .taro_router {
     position: relative;
@@ -73,11 +73,15 @@ ${enableTabBar ? `
   }
 
 ` : ''}
-  .taro_page_shade:has(+.taro_page_stationed),
+${enhanceAnimation
+        ? `.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;
-  }
+  }` : ` .taro_page_shade,
+  .taro_router > .taro_page.taro_page_show.taro_page_stationed:not(.taro_page_shade):not(.taro_tabbar_page):not(:last-child) {
+    display: none;
+  }`} 
 `;
     addStyle(css);
 }
@@ -1258,7 +1262,7 @@ class PageHandler {
         this.pathname = exports.history.location.pathname;
         // Note: 注入页面样式
         this.animation && loadAnimateStyle(this.animationDuration);
-        loadRouterStyle(this.tabBarList.length > 1, this.usingWindowScroll);
+        loadRouterStyle(this.tabBarList.length > 1, this.usingWindowScroll, this.router.enhanceAnimation);
     }
     onReady(page, onLoad = true) {
         var _a;
@@ -1382,7 +1386,7 @@ class PageHandler {
         }
     }
     hide(page, animation = false) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!page)
             return;
         // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
@@ -1407,6 +1411,7 @@ class PageHandler {
                     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');
                 }
+                (_h = page.onHide) === null || _h === void 0 ? void 0 : _h.call(page);
                 pageEl.classList.add('taro_page_shade');
                 this.lastHidePage = pageEl;
             }

package/dist/index.esm.js

@@ -44,7 +44,7 @@ body {
 /**
  * 插入路由相关样式
  */
-function loadRouterStyle(enableTabBar, enableWindowScroll) {
+function loadRouterStyle(enableTabBar, enableWindowScroll, enhanceAnimation) {
     const css = `
   .taro_router {
     position: relative;
@@ -72,11 +72,15 @@ ${enableTabBar ? `
   }
 
 ` : ''}
-  .taro_page_shade:has(+.taro_page_stationed),
+${enhanceAnimation
+        ? `.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;
-  }
+  }` : ` .taro_page_shade,
+  .taro_router > .taro_page.taro_page_show.taro_page_stationed:not(.taro_page_shade):not(.taro_tabbar_page):not(:last-child) {
+    display: none;
+  }`} 
 `;
     addStyle(css);
 }
@@ -1257,7 +1261,7 @@ class PageHandler {
         this.pathname = history.location.pathname;
         // Note: 注入页面样式
         this.animation && loadAnimateStyle(this.animationDuration);
-        loadRouterStyle(this.tabBarList.length > 1, this.usingWindowScroll);
+        loadRouterStyle(this.tabBarList.length > 1, this.usingWindowScroll, this.router.enhanceAnimation);
     }
     onReady(page, onLoad = true) {
         var _a;
@@ -1381,7 +1385,7 @@ class PageHandler {
         }
     }
     hide(page, animation = false) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!page)
             return;
         // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
@@ -1406,6 +1410,7 @@ class PageHandler {
                     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');
                 }
+                (_h = page.onHide) === null || _h === void 0 ? void 0 : _h.call(page);
                 pageEl.classList.add('taro_page_shade');
                 this.lastHidePage = pageEl;
             }

package/dist/router/page.js

@@ -123,7 +123,7 @@ class PageHandler {
         this.pathname = history.location.pathname;
         // Note: 注入页面样式
         this.animation && loadAnimateStyle(this.animationDuration);
-        loadRouterStyle(this.tabBarList.length > 1, this.usingWindowScroll);
+        loadRouterStyle(this.tabBarList.length > 1, this.usingWindowScroll, this.router.enhanceAnimation);
     }
     onReady(page, onLoad = true) {
         var _a;
@@ -247,7 +247,7 @@ class PageHandler {
         }
     }
     hide(page, animation = false) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!page)
             return;
         // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
@@ -272,6 +272,7 @@ class PageHandler {
                     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');
                 }
+                (_h = page.onHide) === null || _h === void 0 ? void 0 : _h.call(page);
                 pageEl.classList.add('taro_page_shade');
                 this.lastHidePage = pageEl;
             }

package/dist/style.d.ts

@@ -5,7 +5,7 @@ declare function loadAnimateStyle(ms?: number): void;
 /**
  * 插入路由相关样式
  */
-declare function loadRouterStyle(enableTabBar: boolean, enableWindowScroll: boolean): void;
+declare function loadRouterStyle(enableTabBar: boolean, enableWindowScroll: boolean, enhanceAnimation?: boolean): void;
 /**
  * 插入导航栏相关的样式
 */

package/dist/style.js

@@ -34,7 +34,7 @@ body {
 /**
  * 插入路由相关样式
  */
-function loadRouterStyle(enableTabBar, enableWindowScroll) {
+function loadRouterStyle(enableTabBar, enableWindowScroll, enhanceAnimation) {
     const css = `
   .taro_router {
     position: relative;
@@ -62,11 +62,15 @@ ${enableTabBar ? `
   }
 
 ` : ''}
-  .taro_page_shade:has(+.taro_page_stationed),
+${enhanceAnimation
+        ? `.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;
-  }
+  }` : ` .taro_page_shade,
+  .taro_router > .taro_page.taro_page_show.taro_page_stationed:not(.taro_page_shade):not(.taro_tabbar_page):not(:last-child) {
+    display: none;
+  }`} 
 `;
     addStyle(css);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "3.6.31-canary.1",
+  "version": "3.6.32",
   "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/runtime": "3.6.31-canary.1",
-    "@tarojs/shared": "3.6.31-canary.1",
-    "@tarojs/taro": "3.6.31-canary.1"
+    "@tarojs/shared": "3.6.32",
+    "@tarojs/runtime": "3.6.32",
+    "@tarojs/taro": "3.6.32"
   },
   "peerDependencies": {
-    "@tarojs/runtime": "3.6.31-canary.1",
-    "@tarojs/taro": "3.6.31-canary.1",
-    "@tarojs/shared": "3.6.31-canary.1"
+    "@tarojs/taro": "3.6.32",
+    "@tarojs/runtime": "3.6.32",
+    "@tarojs/shared": "3.6.32"
   },
   "scripts": {
     "prebuild": "pnpm run clean",

package/types/router.d.ts

@@ -12,6 +12,8 @@ export interface Router {
   customRoutes?: Record<string, string | string[]>
   pathname: string
   forcePath?: string
+  /** 加上这个参数，可以解决返回页面的时候白屏的问题，但是某些不支持 :has() 选择器的浏览器会有问题 */
+  enhanceAnimation?: boolean
 }
 
 export interface SpaRouterConfig extends AppConfig {