@tarojs/router 3.3.15 → 3.3.16

package/dist/index.js

@@ -86,16 +86,23 @@ Stacks.prototype.get = function get () {
 Stacks.prototype.getItem = function getItem (index) {
     return this.stacks[index];
 };
+Stacks.prototype.getLastIndex = function getLastIndex (pathname) {
+    var list = [].concat( this.stacks ).reverse();
+    return list.findIndex(function (page) { var _a; return ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
+};
 Stacks.prototype.getDelta = function getDelta (pathname) {
     if (this.backDelta >= 1) {
         return this.backDelta;
     }
     // NOTE: 此处为了修复浏览器后退多级页面，在大量重复路由状况下可能出现判断错误的情况 （增强判断能力只能考虑在 query 中新增参数来判断，暂时搁置）
-    var prevIndex = this.stacks.findIndex(function (r) { var _a; return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
-    return this.length - 1 - prevIndex;
+    return this.getLastIndex(pathname) || 1;
 };
 Stacks.prototype.getPrevIndex = function getPrevIndex (pathname) {
-    return this.length - 1 - this.getDelta(pathname);
+    var lastIndex = this.getLastIndex(pathname);
+    if (lastIndex < 0) {
+        return -1;
+    }
+    return this.length - 1 - lastIndex;
 };
 Stacks.prototype.pop = function pop () {
     return this.stacks.pop();
@@ -1551,11 +1558,11 @@ var qs = function (stamp) {
 function pageOnReady(page, onLoad) {
     if ( onLoad === void 0 ) onLoad = true;
 
-    var _a;
+    var _a, _b;
     var pageEl = document.getElementById(page.path);
     if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
         var el = pageEl.firstElementChild;
-        (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el).then(function () {
+        (_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();
                 pageEl['__isReady'] = true;
@@ -1710,7 +1717,7 @@ function createRouter(app, config, framework) {
             }
             shouldLoad = true;
         }
-        if (shouldLoad) {
+        if (shouldLoad || stacks.length < 1) {
             var el = (_c = element.default) !== null && _c !== void 0 ? _c : element;
             var loadConfig = Object.assign({}, pageConfig);
             var stacksIndex = stacks.length;