@tarojs/router 3.3.18 → 3.3.19

package/dist/index.js

@@ -81,9 +81,12 @@ prototypeAccessors.delta.set = function (delta) {
     if (delta > 0) {
         this.backDelta = delta;
     }
-    else {
+    else if (this.backDelta > 0) {
         --this.backDelta;
     }
+    else {
+        this.backDelta = 0;
+    }
 };
 prototypeAccessors.length.get = function () {
     return this.stacks.length;
@@ -107,8 +110,9 @@ Stacks.prototype.getDelta = function getDelta (pathname) {
     if (this.backDelta >= 1) {
         return this.backDelta;
     }
+    var index = this.getLastIndex(pathname);
     // NOTE: 此处为了修复浏览器后退多级页面，在大量重复路由状况下可能出现判断错误的情况 （增强判断能力只能考虑在 query 中新增参数来判断，暂时搁置）
-    return this.getLastIndex(pathname) || 1;
+    return index > 0 ? index : 1;
 };
 Stacks.prototype.getPrevIndex = function getPrevIndex (pathname, stateWith) {
         if ( stateWith === void 0 ) stateWith = 1;
@@ -1697,7 +1701,8 @@ PageHandler.prototype.onReady = function onReady (page, onLoad) {
         var 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(function () {
             runtime.requestAnimationFrame(function () {
-                page.onReady();
+                var _a;
+                (_a = page.onReady) === null || _a === void 0 ? void 0 : _a.call(page);
                 pageEl['__isReady'] = true;
             });
         });
@@ -1709,6 +1714,7 @@ PageHandler.prototype.load = function load (page, pageConfig, stacksIndex) {
         if ( pageConfig === void 0 ) pageConfig = {};
         if ( stacksIndex === void 0 ) stacksIndex = 0;
 
+    var _a;
     if (!page)
         { return; }
     var pageEl = document.getElementById(page.path);
@@ -1726,7 +1732,7 @@ PageHandler.prototype.load = function load (page, pageConfig, stacksIndex) {
         });
     }
     stacks.push(page);
-    page.onShow();
+    (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
     bindPageScroll(page, pageConfig);
 };
 PageHandler.prototype.unload = function unload (page, delta, top) {
@@ -1754,6 +1760,11 @@ PageHandler.prototype.unload = function unload (page, delta, top) {
             (_a = this$1.lastUnloadPage) === null || _a === void 0 ? void 0 : _a.onUnload();
         }, this.animationDuration);
     }
+    else {
+        var pageEl$1 = document.getElementById(page.path);
+        pageEl$1 === null || pageEl$1 === void 0 ? void 0 : pageEl$1.classList.remove('taro_page_show');
+        page === null || page === void 0 ? void 0 : page.onUnload();
+    }
     if (delta >= 1)
         { this.unload(stacks.last, delta); }
 };
@@ -1762,9 +1773,10 @@ PageHandler.prototype.show = function show (page, pageConfig, stacksIndex) {
         if ( pageConfig === void 0 ) pageConfig = {};
         if ( stacksIndex === void 0 ) stacksIndex = 0;
 
+    var _a;
     if (!page)
         { return; }
-    page.onShow();
+    (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
     var pageEl = document.getElementById(page.path);
     if (pageEl) {
         setDisplay(pageEl);
@@ -1782,6 +1794,7 @@ PageHandler.prototype.show = function show (page, pageConfig, stacksIndex) {
 PageHandler.prototype.hide = function hide (page) {
         var this$1 = this;
 
+    var _a;
     if (!page)
         { return; }
     // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
@@ -1797,7 +1810,7 @@ PageHandler.prototype.hide = function hide (page) {
             this$1.hideTimer = null;
             setDisplay(this$1.lastHidePage, 'none');
         }, this.animationDelay);
-        page.onHide();
+        (_a = page.onHide) === null || _a === void 0 ? void 0 : _a.call(page);
     }
     else {
         setTimeout(function () { return this$1.hide(page); }, 0);
@@ -1822,7 +1835,7 @@ Object.defineProperties( PageHandler.prototype, prototypeAccessors$1 );
 
 /* eslint-disable dot-notation */
 function createRouter(app, config, framework) {
-    var _a;
+    var _a, _b, _c;
     var handler = new PageHandler(config);
     var runtimeHooks = runtime.container.get(runtime.SERVICE_IDENTIFIER.Hooks);
     routesAlias.set(handler.router.customRoutes);
@@ -1833,7 +1846,7 @@ function createRouter(app, config, framework) {
     }); });
     var entryPagePath = config.entryPagePath || ((_a = routes[0].path) === null || _a === void 0 ? void 0 : _a[0]);
     var router = new UniversalRouter(routes, { baseUrl: basename || '' });
-    app.onLaunch();
+    (_b = app.onLaunch) === null || _b === void 0 ? void 0 : _b.call(app);
     var render = async function (ref) {
         var location = ref.location;
         var action = ref.action;
@@ -1917,7 +1930,7 @@ function createRouter(app, config, framework) {
         exports.history.replace(prependBasename(entryPagePath + exports.history.location.search));
     }
     render({ location: exports.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 exports.history.listen(render);
 }