@tarojs/taro-h5 3.3.11 → 3.3.12

package/dist/index.cjs.js

@@ -1244,7 +1244,7 @@ function setHistoryMode(mode) {
   }
 }
 
-function parsePath() {
+function prependBasename() {
   var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
 }
@@ -1286,21 +1286,44 @@ var throttle = function throttle(fn, threshold) {
   };
 };
 
-function processNavigateUrl(option) {
-  var url = option.url;
-  var matches = option.url.match(/[?&?].*/);
-  var parameters = '';
+var stripBasename = function stripBasename(path, basename) {
+  return path.startsWith(basename) ? path.replace(basename, '') : path;
+};
 
-  if (matches && matches.length) {
-    parameters = matches[0];
-    url = url.replace(parameters, '');
-  }
+var isTabBar = function isTabBar(config) {
+  var _a, _b;
+
+  var _config$router = config.router,
+      _config$router$custom = _config$router.customRoutes,
+      customRoutes = _config$router$custom === void 0 ? {} : _config$router$custom,
+      _config$router$basena = _config$router.basename,
+      basename = _config$router$basena === void 0 ? '' : _config$router$basena,
+      pathname = _config$router.pathname;
+  var routePath = stripBasename(pathname, basename);
+  var pagePath = ((_a = Object.entries(customRoutes).find(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+        target = _ref2[1];
+
+    return target === routePath;
+  })) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
+  return !!pagePath && (((_b = config.tabBar) === null || _b === void 0 ? void 0 : _b.list) || []).some(function (t) {
+    return t.pagePath === pagePath;
+  });
+};
+
+function processNavigateUrl(option) {
+  var pathPieces = J(option.url); // 处理自定义路由
 
   Object.keys(routesAlias).forEach(function (key) {
-    if (addLeadingSlash(key) === addLeadingSlash(url)) {
-      option.url = routesAlias[key] + parameters;
+    if (addLeadingSlash(key) === addLeadingSlash(pathPieces.pathname)) {
+      pathPieces.pathname = routesAlias[key];
     }
-  });
+  }); // 处理 basename
+
+  pathPieces.pathname = prependBasename(pathPieces.pathname); // hack fix history v5 bug: https://github.com/remix-run/history/issues/814
+
+  if (!pathPieces.search) pathPieces.search = '';
+  return pathPieces;
 }
 
 function navigate(option, method) {
@@ -1309,19 +1332,18 @@ function navigate(option, method) {
       fail = option.fail;
   var failReason;
 
-  if (option.url) {
-    processNavigateUrl(option);
-  }
-
   try {
-    if (method === 'navigateTo') {
-      exports.history.push(parsePath(option.url), {
-        timestamp: Date.now()
-      });
-    } else if (method === 'redirectTo') {
-      exports.history.replace(parsePath(option.url), {
+    if ('url' in option) {
+      var pathPieces = processNavigateUrl(option);
+      var state = {
         timestamp: Date.now()
-      });
+      };
+
+      if (method === 'navigateTo') {
+        exports.history.push(pathPieces, state);
+      } else if (method === 'redirectTo') {
+        exports.history.replace(pathPieces, state);
+      }
     } else if (method === 'navigateBack') {
       setHistoryBackDelta(option.delta);
       exports.history.go(-option.delta);
@@ -1368,10 +1390,12 @@ function navigateBack() {
 }
 
 function switchTab(option) {
-  return navigateTo(option);
+  // TODO: 清除掉所有的栈去目标页面
+  return redirectTo(option);
 }
 
 function reLaunch(option) {
+  // TODO: 清除掉所有的栈去目标页面
   return redirectTo(option);
 }
 
@@ -2043,6 +2067,10 @@ function initTabbar(config) {
     tabbar.conf.customRoutes = {};
   }
 
+  if (typeof routerConfig.basename !== 'undefined') {
+    tabbar.conf.basename = routerConfig.basename;
+  }
+
   var container = document.getElementById('container'); // eslint-disable-next-line no-unused-expressions
 
   container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
@@ -2812,14 +2840,14 @@ function createRouter(app, config, framework) {
   });
   app.onLaunch();
   var render = throttle( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) {
-      var location, action, _a, _b, _c, _d, _e, element, pageConfig, enablePullDownRefresh, shouldLoad, delta, prevIndex, prev, el, _config, pathname, routerIndex, isTabBar, page;
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref3) {
+      var location, action, _a, _b, _c, _d, element, pageConfig, enablePullDownRefresh, shouldLoad, delta, prevIndex, prev, pathname, _prevIndex, _prev, el, loadConfig, _pathname, routerIndex, page;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              location = _ref.location, action = _ref.action;
+              location = _ref3.location, action = _ref3.action;
               routerConfig.router.pathname = location.pathname;
               _context.prev = 2;
               _context.next = 5;
@@ -2875,60 +2903,96 @@ function createRouter(app, config, framework) {
 
               shouldLoad = false;
 
-              if (action === 'POP') {
-                unloadPage(runtime.Current.page);
-                delta = historyBackDelta;
+              if (!(action === 'POP')) {
+                _context.next = 32;
+                break;
+              }
+
+              unloadPage(runtime.Current.page);
+              delta = historyBackDelta;
 
-                while (delta-- > 1) {
-                  unloadPage(stacks.slice(-1)[0]);
-                } // 最终必须重置为 1
+              while (delta-- > 1) {
+                unloadPage(stacks.slice(-1)[0]);
+              } // 最终必须重置为 1
 
 
-                setHistoryBackDelta(1);
-                prevIndex = stacks.reduceRight(function (p, s, i) {
-                  if (p !== 0) return p;else if (s.path === location.pathname + runtime.stringify(qs(i))) return i;else return 0;
-                }, 0);
-                prev = stacks[prevIndex];
+              setHistoryBackDelta(1);
+              prevIndex = stacks.reduceRight(function (p, s, i) {
+                if (p !== 0) return p;else if (s.path === location.pathname + runtime.stringify(qs(i))) return i;else return 0;
+              }, 0);
+              prev = stacks[prevIndex];
 
-                if (prev) {
-                  showPage(prev, pageConfig, prevIndex);
-                } else {
-                  shouldLoad = true;
-                }
-              } else if (action === 'PUSH') {
-                hidePage(runtime.Current.page);
-                shouldLoad = true;
-              } else if (action === 'REPLACE') {
-                unloadPage(runtime.Current.page);
+              if (prev) {
+                showPage(prev, pageConfig, prevIndex);
+              } else {
                 shouldLoad = true;
               }
 
+              _context.next = 49;
+              break;
+
+            case 32:
+              if (!(action === 'PUSH')) {
+                _context.next = 37;
+                break;
+              }
+
+              hidePage(runtime.Current.page);
+              shouldLoad = true;
+              _context.next = 49;
+              break;
+
+            case 37:
+              if (!(action === 'REPLACE')) {
+                _context.next = 49;
+                break;
+              }
+
+              if (!isTabBar(config)) {
+                _context.next = 47;
+                break;
+              }
+
+              hidePage(runtime.Current.page);
+              pathname = stripBasename(config.router.pathname, basename);
+              _prevIndex = stacks.findIndex(function (r) {
+                var _a;
+
+                return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
+              });
+
+              if (!(_prevIndex > -1)) {
+                _context.next = 45;
+                break;
+              }
+
+              // tabbar 页且之前出现过，直接复用
+              _prev = stacks[_prevIndex];
+              return _context.abrupt("return", showPage(_prev, pageConfig, _prevIndex));
+
+            case 45:
+              _context.next = 48;
+              break;
+
+            case 47:
+              unloadPage(runtime.Current.page);
+
+            case 48:
+              shouldLoad = true;
+
+            case 49:
               if (shouldLoad) {
                 el = (_c = element["default"]) !== null && _c !== void 0 ? _c : element;
-                _config = Object.assign({}, pageConfig);
-                delete _config['path'];
-                delete _config['load'];
-                pathname = basename ? location.pathname.replace(basename, '') : location.pathname;
-                isTabBar = (_d = routerConfig.tabBar) === null || _d === void 0 ? void 0 : _d.list.some(function (TabBarItem) {
-                  var _a;
-
-                  return ((_a = TabBarItem.pagePath) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
-                });
-
-                if ((stacks === null || stacks === void 0 ? void 0 : stacks.length) > 0 && isTabBar) {
-                  routerIndex = stacks.findIndex(function (r) {
-                    var _a;
-
-                    return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
-                  });
-                }
-
-                routerIndex = (routerIndex || routerIndex === 0) && routerIndex !== -1 ? routerIndex : stacks.length;
-                page = runtime.createPageConfig(enablePullDownRefresh ? (_e = runtimeHooks.createPullDownComponent) === null || _e === void 0 ? void 0 : _e.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, pathname + runtime.stringify(qs(routerIndex)), {}, _config);
+                loadConfig = Object.assign({}, pageConfig);
+                delete loadConfig['path'];
+                delete loadConfig['load'];
+                _pathname = stripBasename(config.router.pathname, basename);
+                routerIndex = stacks.length;
+                page = runtime.createPageConfig(enablePullDownRefresh ? (_d = runtimeHooks.createPullDownComponent) === null || _d === void 0 ? void 0 : _d.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, _pathname + runtime.stringify(qs(routerIndex)), {}, loadConfig);
                 loadPage(page, pageConfig, routerIndex);
               }
 
-            case 24:
+            case 50:
             case "end":
               return _context.stop();
           }
@@ -2937,12 +3001,12 @@ function createRouter(app, config, framework) {
     }));
 
     return function (_x) {
-      return _ref2.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }(), 500);
 
   if (exports.history.location.pathname === '/') {
-    exports.history.replace(parsePath(routes[0].path + exports.history.location.search));
+    exports.history.replace(prependBasename(routes[0].path + exports.history.location.search));
   }
 
   render({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.3.11",
+  "version": "3.3.12",
   "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.11",
-    "@tarojs/router": "3.3.11",
-    "@tarojs/runtime": "3.3.11",
+    "@tarojs/api": "3.3.12",
+    "@tarojs/router": "3.3.12",
+    "@tarojs/runtime": "3.3.12",
     "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": "dad3664e58bb1fe7ab752365d9cc0d0dd444c40a"
+  "gitHead": "0d7650ee4263efafacd87b9c8b69bb29b2a852c0"
 }