@tarojs/taro-h5 3.3.15 → 3.3.16

package/dist/index.cjs.js

@@ -1308,6 +1308,17 @@ var Stacks = /*#__PURE__*/function () {
     value: function getItem(index) {
       return this.stacks[index];
     }
+  }, {
+    key: "getLastIndex",
+    value: function getLastIndex(pathname) {
+      var list = _toConsumableArray(this.stacks).reverse();
+
+      return list.findIndex(function (page) {
+        var _a;
+
+        return ((_a = page.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
+      });
+    }
   }, {
     key: "getDelta",
     value: function getDelta(pathname) {
@@ -1316,17 +1327,18 @@ var Stacks = /*#__PURE__*/function () {
       } // 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;
     }
   }, {
     key: "getPrevIndex",
     value: 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;
     }
   }, {
     key: "pop",
@@ -2856,13 +2868,13 @@ var qs = function qs() {
 function pageOnReady(page) {
   var onLoad = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 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;
@@ -3087,7 +3099,7 @@ function createRouter(app, config, framework) {
               shouldLoad = true;
 
             case 46:
-              if (!shouldLoad) {
+              if (!(shouldLoad || stacks.length < 1)) {
                 _context.next = 54;
                 break;
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.3.15",
+  "version": "3.3.16",
   "description": "Taro h5 framework",
   "main:h5": "src/index.js",
   "main": "dist/index.cjs.js",
@@ -33,9 +33,9 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.3.15",
-    "@tarojs/router": "3.3.15",
-    "@tarojs/runtime": "3.3.15",
+    "@tarojs/api": "3.3.16",
+    "@tarojs/router": "3.3.16",
+    "@tarojs/runtime": "3.3.16",
     "base64-js": "^1.3.0",
     "jsonp-retry": "^1.0.3",
     "mobile-detect": "^1.4.2",
@@ -45,5 +45,5 @@
   "devDependencies": {
     "jest-fetch-mock": "^3.0.3"
   },
-  "gitHead": "4a11ab9a8950f6a580e1278c160f6b4aaa8ac4f2"
+  "gitHead": "75d3de695c98fab79998612ef87567a68ea981a7"
 }