@tarojs/router 3.3.15 → 3.3.16

package/dist/router.esm.js

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