@tarojs/router 3.3.11 → 3.3.12

package/dist/router.esm.js

@@ -45,7 +45,7 @@ function setHistoryMode(mode, base = '/') {
         history = createHashHistory(options);
     }
 }
-function parsePath(url = '') {
+function prependBasename(url = '') {
     return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
 }
 
@@ -78,34 +78,44 @@ const throttle = (fn, threshold) => {
             lastTime = now;
         }
     };
+};
+const stripBasename = (path, basename) => path.startsWith(basename) ? path.replace(basename, '') : path;
+const isTabBar = (config) => {
+    var _a, _b;
+    const { customRoutes = {}, basename = '', pathname } = config.router;
+    const routePath = stripBasename(pathname, basename);
+    const pagePath = ((_a = Object.entries(customRoutes).find(([, target]) => 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(t => t.pagePath === pagePath);
 };
 
 function processNavigateUrl(option) {
-    let url = option.url;
-    const matches = option.url.match(/[?&?].*/);
-    let parameters = '';
-    if (matches && matches.length) {
-        parameters = matches[0];
-        url = url.replace(parameters, '');
-    }
+    const pathPieces = J(option.url);
+    // 处理自定义路由
     Object.keys(routesAlias).forEach(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) {
     const { success, complete, fail } = option;
     let failReason;
-    if (option.url) {
-        processNavigateUrl(option);
-    }
     try {
-        if (method === 'navigateTo') {
-            history.push(parsePath(option.url), { timestamp: Date.now() });
-        }
-        else if (method === 'redirectTo') {
-            history.replace(parsePath(option.url), { timestamp: Date.now() });
+        if ('url' in option) {
+            const pathPieces = processNavigateUrl(option);
+            const state = { timestamp: Date.now() };
+            if (method === 'navigateTo') {
+                history.push(pathPieces, state);
+            }
+            else if (method === 'redirectTo') {
+                history.replace(pathPieces, state);
+            }
         }
         else if (method === 'navigateBack') {
             setHistoryBackDelta(option.delta);
@@ -143,9 +153,11 @@ function navigateBack(options = { delta: 1 }) {
     return navigate(options, 'navigateBack');
 }
 function switchTab(option) {
-    return navigateTo(option);
+    // TODO: 清除掉所有的栈去目标页面
+    return redirectTo(option);
 }
 function reLaunch(option) {
+    // TODO: 清除掉所有的栈去目标页面
     return redirectTo(option);
 }
 function getCurrentPages() {
@@ -815,6 +827,9 @@ function initTabbar(config) {
         tabbar.conf.custom = false;
         tabbar.conf.customRoutes = {};
     }
+    if (typeof routerConfig.basename !== 'undefined') {
+        tabbar.conf.basename = routerConfig.basename;
+    }
     const container = document.getElementById('container');
     // eslint-disable-next-line no-unused-expressions
     container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
@@ -1538,7 +1553,7 @@ function createRouter(app, config, framework) {
     const router = new UniversalRouter(routes, { baseUrl: basename || '' });
     app.onLaunch();
     const render = throttle(async ({ location, action }) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         routerConfig.router.pathname = location.pathname;
         let element;
         try {
@@ -1600,33 +1615,37 @@ function createRouter(app, config, framework) {
             shouldLoad = true;
         }
         else if (action === 'REPLACE') {
-            unloadPage(Current.page);
-            shouldLoad = true;
-        }
-        if (shouldLoad) {
-            const el = (_c = element.default) !== null && _c !== void 0 ? _c : element;
-            const config = Object.assign({}, pageConfig);
-            delete config['path'];
-            delete config['load'];
-            const pathname = basename ? location.pathname.replace(basename, '') : location.pathname;
-            let routerIndex;
-            const isTabBar = (_d = routerConfig.tabBar) === null || _d === void 0 ? void 0 : _d.list.some((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((r) => {
+            if (isTabBar(config)) {
+                hidePage(Current.page);
+                const pathname = stripBasename(config.router.pathname, basename);
+                const prevIndex = stacks.findIndex((r) => {
                     var _a;
                     return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
                 });
+                if (prevIndex > -1) {
+                    // tabbar 页且之前出现过，直接复用
+                    const prev = stacks[prevIndex];
+                    return showPage(prev, pageConfig, prevIndex);
+                }
+            }
+            else {
+                unloadPage(Current.page);
             }
-            routerIndex = ((routerIndex || routerIndex === 0) && routerIndex !== -1) ? routerIndex : stacks.length;
-            const page = createPageConfig(enablePullDownRefresh ? (_e = runtimeHooks.createPullDownComponent) === null || _e === void 0 ? void 0 : _e.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, pathname + stringify(qs(routerIndex)), {}, config);
+            shouldLoad = true;
+        }
+        if (shouldLoad) {
+            const el = (_c = element.default) !== null && _c !== void 0 ? _c : element;
+            const loadConfig = Object.assign({}, pageConfig);
+            delete loadConfig['path'];
+            delete loadConfig['load'];
+            const pathname = stripBasename(config.router.pathname, basename);
+            const routerIndex = stacks.length;
+            const page = createPageConfig(enablePullDownRefresh ? (_d = runtimeHooks.createPullDownComponent) === null || _d === void 0 ? void 0 : _d.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, pathname + stringify(qs(routerIndex)), {}, loadConfig);
             loadPage(page, pageConfig, routerIndex);
         }
     }, 500);
     if (history.location.pathname === '/') {
-        history.replace(parsePath(routes[0].path + history.location.search));
+        history.replace(prependBasename(routes[0].path + history.location.search));
     }
     render({ location: history.location, action: r.Push });
     app.onShow(qs(stacks.length));