@tarojs/router 3.3.18 → 3.3.19

package/dist/router.esm.js

@@ -61,9 +61,12 @@ class Stacks {
         if (delta > 0) {
             this.backDelta = delta;
         }
-        else {
+        else if (this.backDelta > 0) {
             --this.backDelta;
         }
+        else {
+            this.backDelta = 0;
+        }
     }
     get length() {
         return this.stacks.length;
@@ -85,8 +88,9 @@ class Stacks {
         if (this.backDelta >= 1) {
             return this.backDelta;
         }
+        const index = this.getLastIndex(pathname);
         // NOTE: 此处为了修复浏览器后退多级页面，在大量重复路由状况下可能出现判断错误的情况 （增强判断能力只能考虑在 query 中新增参数来判断，暂时搁置）
-        return this.getLastIndex(pathname) || 1;
+        return index > 0 ? index : 1;
     }
     getPrevIndex(pathname, stateWith = 1) {
         const lastIndex = this.getLastIndex(pathname, stateWith);
@@ -1653,7 +1657,8 @@ class PageHandler {
             const el = pageEl.firstElementChild;
             (_b = (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el)) === null || _b === void 0 ? void 0 : _b.then(() => {
                 requestAnimationFrame(() => {
-                    page.onReady();
+                    var _a;
+                    (_a = page.onReady) === null || _a === void 0 ? void 0 : _a.call(page);
                     pageEl['__isReady'] = true;
                 });
             });
@@ -1661,6 +1666,7 @@ class PageHandler {
         }
     }
     load(page, pageConfig = {}, stacksIndex = 0) {
+        var _a;
         if (!page)
             return;
         let pageEl = document.getElementById(page.path);
@@ -1678,7 +1684,7 @@ class PageHandler {
             });
         }
         stacks.push(page);
-        page.onShow();
+        (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
         bindPageScroll(page, pageConfig);
     }
     unload(page, delta = 1, top = false) {
@@ -1702,13 +1708,19 @@ class PageHandler {
                 (_a = this.lastUnloadPage) === null || _a === void 0 ? void 0 : _a.onUnload();
             }, this.animationDuration);
         }
+        else {
+            const pageEl = document.getElementById(page.path);
+            pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.remove('taro_page_show');
+            page === null || page === void 0 ? void 0 : page.onUnload();
+        }
         if (delta >= 1)
             this.unload(stacks.last, delta);
     }
     show(page, pageConfig = {}, stacksIndex = 0) {
+        var _a;
         if (!page)
             return;
-        page.onShow();
+        (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
         let pageEl = document.getElementById(page.path);
         if (pageEl) {
             setDisplay(pageEl);
@@ -1724,6 +1736,7 @@ class PageHandler {
         bindPageScroll(page, pageConfig);
     }
     hide(page) {
+        var _a;
         if (!page)
             return;
         // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
@@ -1739,7 +1752,7 @@ class PageHandler {
                 this.hideTimer = null;
                 setDisplay(this.lastHidePage, 'none');
             }, this.animationDelay);
-            page.onHide();
+            (_a = page.onHide) === null || _a === void 0 ? void 0 : _a.call(page);
         }
         else {
             setTimeout(() => this.hide(page), 0);
@@ -1761,7 +1774,7 @@ class PageHandler {
 
 /* eslint-disable dot-notation */
 function createRouter(app, config, framework) {
-    var _a;
+    var _a, _b, _c;
     const handler = new PageHandler(config);
     const runtimeHooks = container.get(SERVICE_IDENTIFIER.Hooks);
     routesAlias.set(handler.router.customRoutes);
@@ -1772,7 +1785,7 @@ function createRouter(app, config, framework) {
     }));
     const entryPagePath = config.entryPagePath || ((_a = routes[0].path) === null || _a === void 0 ? void 0 : _a[0]);
     const router = new UniversalRouter(routes, { baseUrl: basename || '' });
-    app.onLaunch();
+    (_b = app.onLaunch) === null || _b === void 0 ? void 0 : _b.call(app);
     const render = async ({ location, action }) => {
         var _a, _b, _c, _d;
         handler.pathname = location.pathname;
@@ -1853,7 +1866,7 @@ function createRouter(app, config, framework) {
         history.replace(prependBasename(entryPagePath + history.location.search));
     }
     render({ location: history.location, action: r.Push });
-    app.onShow(handler.getQuery(stacks.length));
+    (_c = app.onShow) === null || _c === void 0 ? void 0 : _c.call(app, handler.getQuery(stacks.length));
     return history.listen(render);
 }