@tarojs/router 3.3.11 → 3.3.12

package/dist/index.js

@@ -52,7 +52,7 @@ function setHistoryMode(mode, base) {
         exports.history = createHashHistory(options);
     }
 }
-function parsePath(url) {
+function prependBasename(url) {
     if ( url === void 0 ) url = '';
 
     return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
@@ -87,36 +87,53 @@ var throttle = function (fn, threshold) {
             lastTime = now;
         }
     };
+};
+var stripBasename = function (path, basename) { return path.startsWith(basename) ? path.replace(basename, '') : path; };
+var isTabBar = function (config) {
+    var _a, _b;
+    var ref = config.router;
+    var customRoutes = ref.customRoutes; if ( customRoutes === void 0 ) customRoutes = {};
+    var basename = ref.basename; if ( basename === void 0 ) basename = '';
+    var pathname = ref.pathname;
+    var routePath = stripBasename(pathname, basename);
+    var pagePath = ((_a = Object.entries(customRoutes).find(function (ref) {
+        var target = ref[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 url = option.url;
-    var matches = option.url.match(/[?&?].*/);
-    var parameters = '';
-    if (matches && matches.length) {
-        parameters = matches[0];
-        url = url.replace(parameters, '');
-    }
+    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) {
     var success = option.success;
     var complete = option.complete;
     var 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), { timestamp: Date.now() });
+        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);
@@ -156,9 +173,11 @@ function navigateBack(options) {
     return navigate(options, 'navigateBack');
 }
 function switchTab(option) {
-    return navigateTo(option);
+    // TODO: 清除掉所有的栈去目标页面
+    return redirectTo(option);
 }
 function reLaunch(option) {
+    // TODO: 清除掉所有的栈去目标页面
     return redirectTo(option);
 }
 function getCurrentPages() {
@@ -828,6 +847,9 @@ function initTabbar(config) {
         tabbar.conf.custom = false;
         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);
@@ -1567,7 +1589,7 @@ function createRouter(app, config, framework) {
         var location = ref.location;
         var action = ref.action;
 
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         routerConfig.router.pathname = location.pathname;
         var element;
         try {
@@ -1629,33 +1651,37 @@ function createRouter(app, config, framework) {
             shouldLoad = true;
         }
         else if (action === 'REPLACE') {
-            unloadPage(runtime.Current.page);
-            shouldLoad = true;
-        }
-        if (shouldLoad) {
-            var el = (_c = element.default) !== null && _c !== void 0 ? _c : element;
-            var config$1 = Object.assign({}, pageConfig);
-            delete config$1['path'];
-            delete config$1['load'];
-            var pathname = basename ? location.pathname.replace(basename, '') : location.pathname;
-            var routerIndex;
-            var 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) {
+            if (isTabBar(config)) {
+                hidePage(runtime.Current.page);
+                var pathname = stripBasename(config.router.pathname, basename);
+                var prevIndex$1 = stacks.findIndex(function (r) {
                     var _a;
                     return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
                 });
+                if (prevIndex$1 > -1) {
+                    // tabbar 页且之前出现过，直接复用
+                    var prev$1 = stacks[prevIndex$1];
+                    return showPage(prev$1, pageConfig, prevIndex$1);
+                }
+            }
+            else {
+                unloadPage(runtime.Current.page);
             }
-            routerIndex = ((routerIndex || routerIndex === 0) && routerIndex !== -1) ? routerIndex : stacks.length;
-            var 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$1);
+            shouldLoad = true;
+        }
+        if (shouldLoad) {
+            var el = (_c = element.default) !== null && _c !== void 0 ? _c : element;
+            var loadConfig = Object.assign({}, pageConfig);
+            delete loadConfig['path'];
+            delete loadConfig['load'];
+            var pathname$1 = stripBasename(config.router.pathname, basename);
+            var routerIndex = stacks.length;
+            var page = runtime.createPageConfig(enablePullDownRefresh ? (_d = runtimeHooks.createPullDownComponent) === null || _d === void 0 ? void 0 : _d.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, pathname$1 + runtime.stringify(qs(routerIndex)), {}, loadConfig);
             loadPage(page, pageConfig, routerIndex);
         }
     }, 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({ location: exports.history.location, action: r.Push });
     app.onShow(qs(stacks.length));