@tarojs/router 3.3.9 → 3.3.13

package/dist/index.js

@@ -27,14 +27,14 @@ function _extends() {
 var r,B=r||(r={});B.Pop="POP";B.Push="PUSH";B.Replace="REPLACE";var C="production"!==process.env.NODE_ENV?function(b){return Object.freeze(b)}:function(b){return b};function D(b,h){if(!b){"undefined"!==typeof console&&console.warn(h);try{throw Error(h);}catch(k){}}}function E(b){b.preventDefault();b.returnValue="";}
 function F(){var b=[];return {get length(){return b.length},push:function(h){b.push(h);return function(){b=b.filter(function(k){return k!==h});}},call:function(h){b.forEach(function(k){return k&&k(h)});}}}function H(){return Math.random().toString(36).substr(2,8)}function I(b){var h=b.pathname,k=b.search;b=b.hash;return (void 0===h?"/":h)+(void 0===k?"":k)+(void 0===b?"":b)}
 function J(b){var h={};if(b){var k=b.indexOf("#");0<=k&&(h.hash=b.substr(k),b=b.substr(0,k));k=b.indexOf("?");0<=k&&(h.search=b.substr(k),b=b.substr(0,k));b&&(h.pathname=b);}return h}
-function createBrowserHistory(b){function h(){var c=p.location,a=m.state||{};return [a.idx,C({pathname:c.pathname,search:c.search,hash:c.hash,state:a.usr||null,key:a.key||"default"})]}function k(c){return "string"===typeof c?c:I(c)}function x(c,a){void 0===a&&(a=null);return C(_extends({},q,"string"===typeof c?J(c):c,{state:a,key:H()}))}function z(c){t=c;c=h();v=c[0];q=c[1];d.call({action:t,location:q});}function A(c,a){function e(){A(c,a);}var l=r.Push,g=x(c,a);if(!f.length||(f.call({action:l,
-location:g,retry:e}),!1)){var n=[{usr:g.state,key:g.key,idx:v+1},k(g)];g=n[0];n=n[1];try{m.pushState(g,"",n);}catch(G){p.location.assign(n);}z(l);}}function y(c,a){function e(){y(c,a);}var l=r.Replace,g=x(c,a);f.length&&(f.call({action:l,location:g,retry:e}),1)||(g=[{usr:g.state,key:g.key,idx:v},k(g)],m.replaceState(g[0],"",g[1]),z(l));}function w(c){m.go(c);}void 0===b&&(b={});b=b.window;var p=void 0===b?document.defaultView:b,m=p.history,u=null;p.addEventListener("popstate",function(){if(u){ f.call(u),
-u=null; }else {var c=r.Pop,a=h(),e=a[0];a=a[1];if(f.length){ if(null!=e){var l=v-e;l&&(u={action:c,location:a,retry:function(){w(-1*l);}},w(l));}else { "production"!==process.env.NODE_ENV?D(!1,"You are trying to block a POP navigation to a location that was not created by the history library. The block will fail silently in production, but in general you should do all navigation with the history library (instead of using window.history.pushState directly) to avoid this situation."):void 0; } }else { z(c); }}});var t=
-r.Pop;b=h();var v=b[0],q=b[1],d=F(),f=F();null==v&&(v=0,m.replaceState(_extends({},m.state,{idx:v}),""));return {get action(){return t},get location(){return q},createHref:k,push:A,replace:y,go:w,back:function(){w(-1);},forward:function(){w(1);},listen:function(c){return d.push(c)},block:function(c){var a=f.push(c);1===f.length&&p.addEventListener("beforeunload",E);return function(){a();f.length||p.removeEventListener("beforeunload",E);}}}}function createHashHistory(b){function h(){var a=J(m.location.hash.substr(1)),e=a.pathname,l=a.search;a=a.hash;var g=u.state||{};return [g.idx,C({pathname:void 0===e?"/":e,search:void 0===l?"":l,hash:void 0===a?"":a,state:g.usr||null,key:g.key||"default"})]}function k(){if(t){ c.call(t),t=null; }else {var a=r.Pop,e=h(),l=e[0];e=e[1];if(c.length){ if(null!=l){var g=q-l;g&&(t={action:a,location:e,retry:function(){p(-1*g);}},p(g));}else { "production"!==process.env.NODE_ENV?D(!1,"You are trying to block a POP navigation to a location that was not created by the history library. The block will fail silently in production, but in general you should do all navigation with the history library (instead of using window.history.pushState directly) to avoid this situation."):
-void 0; } }else { A(a); }}}function x(a){var e=document.querySelector("base"),l="";e&&e.getAttribute("href")&&(e=m.location.href,l=e.indexOf("#"),l=-1===l?e:e.slice(0,l));return l+"#"+("string"===typeof a?a:I(a))}function z(a,e){void 0===e&&(e=null);return C(_extends({},d,"string"===typeof a?J(a):a,{state:e,key:H()}))}function A(a){v=a;a=h();q=a[0];d=a[1];f.call({action:v,location:d});}function y(a,e){function l(){y(a,e);}var g=r.Push,n=z(a,e);"production"!==process.env.NODE_ENV?D("/"===n.pathname.charAt(0),
-"Relative pathnames are not supported in hash history.push("+JSON.stringify(a)+")"):void 0;if(!c.length||(c.call({action:g,location:n,retry:l}),!1)){var G=[{usr:n.state,key:n.key,idx:q+1},x(n)];n=G[0];G=G[1];try{u.pushState(n,"",G);}catch(K){m.location.assign(G);}A(g);}}function w(a,e){function l(){w(a,e);}var g=r.Replace,n=z(a,e);"production"!==process.env.NODE_ENV?D("/"===n.pathname.charAt(0),"Relative pathnames are not supported in hash history.replace("+JSON.stringify(a)+")"):void 0;c.length&&(c.call({action:g,
-location:n,retry:l}),1)||(n=[{usr:n.state,key:n.key,idx:q},x(n)],u.replaceState(n[0],"",n[1]),A(g));}function p(a){u.go(a);}void 0===b&&(b={});b=b.window;var m=void 0===b?document.defaultView:b,u=m.history,t=null;m.addEventListener("popstate",k);m.addEventListener("hashchange",function(){var a=h()[1];I(a)!==I(d)&&k();});var v=r.Pop;b=h();var q=b[0],d=b[1],f=F(),c=F();null==q&&(q=0,u.replaceState(_extends({},u.state,{idx:q}),""));return {get action(){return v},get location(){return d},createHref:x,push:y,
-replace:w,go:p,back:function(){p(-1);},forward:function(){p(1);},listen:function(a){return f.push(a)},block:function(a){var e=c.push(a);1===c.length&&m.addEventListener("beforeunload",E);return function(){e();c.length||m.removeEventListener("beforeunload",E);}}}}
+function createBrowserHistory(b){function h(){var c=p.location,a=m.state||{};return [a.idx,C({pathname:c.pathname,search:c.search,hash:c.hash,state:a.usr||null,key:a.key||"default"})]}function k(c){return "string"===typeof c?c:I(c)}function x(c,a){void 0===a&&(a=null);return C(_extends({pathname:q.pathname,hash:"",search:""},"string"===typeof c?J(c):c,{state:a,key:H()}))}function z(c){t=c;c=h();v=c[0];q=c[1];d.call({action:t,location:q});}function A(c,a){function e(){A(c,a);}var l=r.Push,g=x(c,
+a);if(!f.length||(f.call({action:l,location:g,retry:e}),!1)){var n=[{usr:g.state,key:g.key,idx:v+1},k(g)];g=n[0];n=n[1];try{m.pushState(g,"",n);}catch(G){p.location.assign(n);}z(l);}}function y(c,a){function e(){y(c,a);}var l=r.Replace,g=x(c,a);f.length&&(f.call({action:l,location:g,retry:e}),1)||(g=[{usr:g.state,key:g.key,idx:v},k(g)],m.replaceState(g[0],"",g[1]),z(l));}function w(c){m.go(c);}void 0===b&&(b={});b=b.window;var p=void 0===b?document.defaultView:b,m=p.history,u=null;p.addEventListener("popstate",
+function(){if(u){ f.call(u),u=null; }else {var c=r.Pop,a=h(),e=a[0];a=a[1];if(f.length){ if(null!=e){var l=v-e;l&&(u={action:c,location:a,retry:function(){w(-1*l);}},w(l));}else { "production"!==process.env.NODE_ENV?D(!1,"You are trying to block a POP navigation to a location that was not created by the history library. The block will fail silently in production, but in general you should do all navigation with the history library (instead of using window.history.pushState directly) to avoid this situation."):
+void 0; } }else { z(c); }}});var t=r.Pop;b=h();var v=b[0],q=b[1],d=F(),f=F();null==v&&(v=0,m.replaceState(_extends({},m.state,{idx:v}),""));return {get action(){return t},get location(){return q},createHref:k,push:A,replace:y,go:w,back:function(){w(-1);},forward:function(){w(1);},listen:function(c){return d.push(c)},block:function(c){var a=f.push(c);1===f.length&&p.addEventListener("beforeunload",E);return function(){a();f.length||p.removeEventListener("beforeunload",E);}}}}function createHashHistory(b){function h(){var a=J(m.location.hash.substr(1)),e=a.pathname,l=a.search;a=a.hash;var g=u.state||{};return [g.idx,C({pathname:void 0===e?"/":e,search:void 0===l?"":l,hash:void 0===a?"":a,state:g.usr||null,key:g.key||"default"})]}function k(){if(t){ c.call(t),t=null; }else {var a=r.Pop,e=h(),l=e[0];e=e[1];if(c.length){ if(null!=l){var g=q-l;g&&(t={action:a,location:e,retry:function(){p(-1*g);}},p(g));}else { "production"!==process.env.NODE_ENV?D(!1,"You are trying to block a POP navigation to a location that was not created by the history library. The block will fail silently in production, but in general you should do all navigation with the history library (instead of using window.history.pushState directly) to avoid this situation."):
+void 0; } }else { A(a); }}}function x(a){var e=document.querySelector("base"),l="";e&&e.getAttribute("href")&&(e=m.location.href,l=e.indexOf("#"),l=-1===l?e:e.slice(0,l));return l+"#"+("string"===typeof a?a:I(a))}function z(a,e){void 0===e&&(e=null);return C(_extends({pathname:d.pathname,hash:"",search:""},"string"===typeof a?J(a):a,{state:e,key:H()}))}function A(a){v=a;a=h();q=a[0];d=a[1];f.call({action:v,location:d});}function y(a,e){function l(){y(a,e);}var g=r.Push,n=z(a,e);"production"!==process.env.NODE_ENV?
+D("/"===n.pathname.charAt(0),"Relative pathnames are not supported in hash history.push("+JSON.stringify(a)+")"):void 0;if(!c.length||(c.call({action:g,location:n,retry:l}),!1)){var G=[{usr:n.state,key:n.key,idx:q+1},x(n)];n=G[0];G=G[1];try{u.pushState(n,"",G);}catch(K){m.location.assign(G);}A(g);}}function w(a,e){function l(){w(a,e);}var g=r.Replace,n=z(a,e);"production"!==process.env.NODE_ENV?D("/"===n.pathname.charAt(0),"Relative pathnames are not supported in hash history.replace("+JSON.stringify(a)+
+")"):void 0;c.length&&(c.call({action:g,location:n,retry:l}),1)||(n=[{usr:n.state,key:n.key,idx:q},x(n)],u.replaceState(n[0],"",n[1]),A(g));}function p(a){u.go(a);}void 0===b&&(b={});b=b.window;var m=void 0===b?document.defaultView:b,u=m.history,t=null;m.addEventListener("popstate",k);m.addEventListener("hashchange",function(){var a=h()[1];I(a)!==I(d)&&k();});var v=r.Pop;b=h();var q=b[0],d=b[1],f=F(),c=F();null==q&&(q=0,u.replaceState(_extends({},u.state,{idx:q}),""));return {get action(){return v},get location(){return d},
+createHref:x,push:y,replace:w,go:p,back:function(){p(-1);},forward:function(){p(1);},listen:function(a){return f.push(a)},block:function(a){var e=c.push(a);1===c.length&&m.addEventListener("beforeunload",E);return function(){e();c.length||m.removeEventListener("beforeunload",E);}}}}
 
 var basename = '/';
 function setHistoryMode(mode, base) {
@@ -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,58 +87,70 @@ 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() });
-        }
-        else if (method === 'navigateBack') {
-            setHistoryBackDelta(option.delta);
-            exports.history.go(-option.delta);
-        }
-    }
-    catch (error) {
-        failReason = error;
-    }
+async function navigate(option, method) {
     return new Promise(function (resolve, reject) {
-        if (failReason) {
-            fail && fail(failReason);
-            complete && complete();
-            reject(failReason);
-            return;
-        }
-        var unlisten = exports.history.listen(function () {
-            success && success();
-            complete && complete();
+        var success = option.success;
+        var complete = option.complete;
+        var fail = option.fail;
+        var unListen = exports.history.listen(function () {
+            success === null || success === void 0 ? void 0 : success();
+            complete === null || complete === void 0 ? void 0 : complete();
             resolve();
-            unlisten();
+            unListen();
         });
+        try {
+            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);
+            }
+        }
+        catch (error) {
+            fail === null || fail === void 0 ? void 0 : fail(error);
+            complete === null || complete === void 0 ? void 0 : complete();
+            reject(error);
+        }
     });
 }
 function navigateTo(option) {
@@ -156,9 +168,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 +842,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);
@@ -1629,21 +1646,37 @@ function createRouter(app, config, framework) {
             shouldLoad = true;
         }
         else if (action === 'REPLACE') {
-            unloadPage(runtime.Current.page);
+            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);
+            }
             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 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(stacks.length)), {}, config$1);
-            loadPage(page, pageConfig, stacks.length);
+            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));