@tarojs/router 3.3.11 → 3.3.15

package/dist/router.esm.js

@@ -1,4 +1,4 @@
-import { container, SERVICE_IDENTIFIER, eventCenter, Current, stringify, createPageConfig, requestAnimationFrame } from '@tarojs/runtime';
+import { requestAnimationFrame, container, SERVICE_IDENTIFIER, eventCenter, Current, createPageConfig, stringify } from '@tarojs/runtime';
 
 function _extends() {
   _extends = Object.assign || function (target) {
@@ -21,14 +21,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);}}}}
 
 let history;
 let basename = '/';
@@ -45,11 +45,56 @@ function setHistoryMode(mode, base = '/') {
         history = createHashHistory(options);
     }
 }
-function parsePath(url = '') {
+function prependBasename(url = '') {
     return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
-}
+}
+const hasBasename = (path, prefix) => new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path);
+const stripBasename = (path, prefix) => hasBasename(path, prefix) ? path.substr(prefix.length) : path;
 
-const stacks = [];
+class Stacks {
+    constructor() {
+        this.stacks = [];
+        this.backDelta = 0;
+    }
+    set delta(delta) {
+        if (delta > 0) {
+            this.backDelta = delta;
+        }
+        else {
+            --this.backDelta;
+        }
+    }
+    get length() {
+        return this.stacks.length;
+    }
+    get last() {
+        return this.stacks[this.length - 1];
+    }
+    get() {
+        return this.stacks;
+    }
+    getItem(index) {
+        return this.stacks[index];
+    }
+    getDelta(pathname) {
+        if (this.backDelta >= 1) {
+            return this.backDelta;
+        }
+        // NOTE: 此处为了修复浏览器后退多级页面，在大量重复路由状况下可能出现判断错误的情况 （增强判断能力只能考虑在 query 中新增参数来判断，暂时搁置）
+        const prevIndex = this.stacks.findIndex(r => { var _a; return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
+        return this.length - 1 - prevIndex;
+    }
+    getPrevIndex(pathname) {
+        return this.length - 1 - this.getDelta(pathname);
+    }
+    pop() {
+        return this.stacks.pop();
+    }
+    push(page) {
+        return this.stacks.push(page);
+    }
+}
+const stacks = new Stacks();
 
 let routesAlias = {};
 function setRoutesAlias(alias) {
@@ -61,73 +106,72 @@ function addLeadingSlash(path) {
     }
     return path.charAt(0) === '/' ? path : '/' + path;
 }
-// 解决navigateBack调用delta>1时,路由栈异常问题
-// 比如:A->B->C,navigateBack({delta: 2}),此时路由栈中还存在B页面
-// 原因:主要是由于一次性退出多层级页面时,此action只会执行一次,此处进行手动处理
-let historyBackDelta = 1;
-function setHistoryBackDelta(delta) {
-    historyBackDelta = delta;
-}
-// eslint-disable-next-line @typescript-eslint/ban-types
-const throttle = (fn, threshold) => {
-    let lastTime = 0;
-    return function () {
-        const now = Date.now();
-        if (now - lastTime > threshold) {
-            fn.apply(this, arguments);
-            lastTime = now;
-        }
-    };
+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, '');
-    }
+    var _a;
+    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];
         }
     });
-}
-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() });
-        }
-        else if (method === 'navigateBack') {
-            setHistoryBackDelta(option.delta);
-            history.go(-option.delta);
-        }
-    }
-    catch (error) {
-        failReason = error;
+    // 处理相对路径
+    if ((_a = pathPieces === null || pathPieces === void 0 ? void 0 : pathPieces.pathname) === null || _a === void 0 ? void 0 : _a.includes('./')) {
+        const parts = history.location.pathname.split('/');
+        parts.pop();
+        pathPieces.pathname.split('/').forEach((item) => {
+            if (item === '.') {
+                return;
+            }
+            item === '..' ? parts.pop() : parts.push(item);
+        });
+        pathPieces.pathname = parts.join('/');
     }
+    // 处理 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;
+}
+async function navigate(option, method) {
     return new Promise((resolve, reject) => {
-        if (failReason) {
-            fail && fail(failReason);
-            complete && complete();
-            reject(failReason);
-            return;
-        }
-        const unlisten = history.listen(() => {
-            success && success();
-            complete && complete();
+        const { success, complete, fail } = option;
+        const unListen = history.listen(() => {
+            success === null || success === void 0 ? void 0 : success();
+            complete === null || complete === void 0 ? void 0 : complete();
             resolve();
-            unlisten();
+            unListen();
         });
+        try {
+            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') {
+                stacks.delta = option.delta;
+                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) {
@@ -143,13 +187,15 @@ 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() {
-    return stacks;
+    return stacks.get();
 }
 
 /**
@@ -795,6 +841,7 @@ var UniversalRouter = function () {
 
 UniversalRouter.pathToRegexp = pathToRegexp_1;
 
+const Taro = require('@tarojs/taro-h5');
 function initTabbar(config) {
     if (config.tabBar == null) {
         return;
@@ -806,7 +853,6 @@ function initTabbar(config) {
     tabbar.conf.homePage = history.location.pathname === '/' ? homePage : history.location.pathname;
     const routerConfig = config.router;
     tabbar.conf.mode = routerConfig && routerConfig.mode ? routerConfig.mode : 'hash';
-    tabbar.conf.custom = !!routerConfig.customRoutes;
     if (routerConfig.customRoutes) {
         tabbar.conf.custom = true;
         tabbar.conf.customRoutes = routerConfig.customRoutes;
@@ -815,9 +861,13 @@ 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);
+    Taro.initTabBarApis(config);
 }
 
 const routerConfig = Object.create(null);
@@ -841,6 +891,58 @@ function init(config) {
     initTabbar(config);
 }
 
+let pageScrollFn;
+let pageDOM = window;
+function bindPageScroll(page, config) {
+    pageDOM.removeEventListener('scroll', pageScrollFn);
+    pageDOM = getScrollContainer();
+    const distance = config.onReachBottomDistance || 50;
+    let isReachBottom = false;
+    pageScrollFn = function () {
+        page.onPageScroll && page.onPageScroll({
+            scrollTop: pageDOM instanceof Window ? window.scrollY : pageDOM.scrollTop
+        });
+        if (isReachBottom && getOffset() > distance) {
+            isReachBottom = false;
+        }
+        if (page.onReachBottom &&
+            !isReachBottom &&
+            getOffset() < distance) {
+            isReachBottom = true;
+            page.onReachBottom();
+        }
+    };
+    pageDOM.addEventListener('scroll', pageScrollFn, false);
+}
+window.addEventListener('DOMSubtreeModified', (e) => {
+    var _a;
+    // @ts-ignore
+    const className = (_a = e.target) === null || _a === void 0 ? void 0 : _a.className;
+    if (className && /taro-tabbar__/.test(className)) {
+        pageDOM.removeEventListener('scroll', pageScrollFn);
+        pageDOM = getScrollContainer();
+        pageDOM.addEventListener('scroll', pageScrollFn, false);
+    }
+}, false);
+function getScrollContainer() {
+    if (document.querySelector('.taro-tabbar__tabbar') === null) {
+        // 没设置tabbar
+        return window;
+    }
+    else {
+        // 有设置tabbar
+        return document.querySelector('.taro-tabbar__panel') || window;
+    }
+}
+function getOffset() {
+    if (pageDOM instanceof Window) {
+        return document.documentElement.scrollHeight - window.scrollY - window.innerHeight;
+    }
+    else {
+        return pageDOM.scrollHeight - pageDOM.scrollTop - pageDOM.clientHeight;
+    }
+}
+
 function createCommonjsModule(fn, module) {
 	return module = { exports: {} }, fn(module, module.exports), module.exports;
 }
@@ -1392,12 +1494,23 @@ var queryString_5 = queryString.stringifyUrl;
 var queryString_6 = queryString.pick;
 var queryString_7 = queryString.exclude;
 
+function getSearch() {
+    let search = '?';
+    if (routerConfig.router.mode === 'hash') {
+        const idx = location.hash.indexOf('?');
+        if (idx > -1) {
+            search = location.hash.slice(idx);
+        }
+    }
+    else {
+        search = location.search;
+    }
+    return search.substr(1);
+}
 const qs = function (stamp = 0) {
-    const search = routerConfig.router.mode === 'hash'
-        ? location.hash.slice(routerConfig.router.pathname.length + 1)
-        : location.search;
+    const search = getSearch();
     const query = search
-        ? queryString.parse(search.substr(1))
+        ? queryString.parse(search)
         : {};
     if (stamp) {
         query.stamp = stamp.toString();
@@ -1405,94 +1518,12 @@ const qs = function (stamp = 0) {
     return query;
 };
 
-let pageScrollFn;
-let pageDOM = window;
-function bindPageScroll(page, config) {
-    pageDOM.removeEventListener('scroll', pageScrollFn);
-    pageDOM = getScrollContainer();
-    const distance = config.onReachBottomDistance || 50;
-    let isReachBottom = false;
-    pageScrollFn = function () {
-        page.onPageScroll && page.onPageScroll({
-            scrollTop: pageDOM instanceof Window ? window.scrollY : pageDOM.scrollTop
-        });
-        if (isReachBottom && getOffset() > distance) {
-            isReachBottom = false;
-        }
-        if (page.onReachBottom &&
-            !isReachBottom &&
-            getOffset() < distance) {
-            isReachBottom = true;
-            page.onReachBottom();
-        }
-    };
-    pageDOM.addEventListener('scroll', pageScrollFn, false);
-}
-window.addEventListener('DOMSubtreeModified', (e) => {
-    var _a;
-    // @ts-ignore
-    const className = (_a = e.target) === null || _a === void 0 ? void 0 : _a.className;
-    if (className && /taro-tabbar__/.test(className)) {
-        pageDOM.removeEventListener('scroll', pageScrollFn);
-        pageDOM = getScrollContainer();
-        pageDOM.addEventListener('scroll', pageScrollFn, false);
-    }
-}, false);
-function getScrollContainer() {
-    if (document.querySelector('.taro-tabbar__tabbar') === null) {
-        // 没设置tabbar
-        return window;
-    }
-    else {
-        // 有设置tabbar
-        return document.querySelector('.taro-tabbar__panel') || window;
-    }
-}
-function getOffset() {
-    if (pageDOM instanceof Window) {
-        return document.documentElement.scrollHeight - window.scrollY - window.innerHeight;
-    }
-    else {
-        return pageDOM.scrollHeight - pageDOM.scrollTop - pageDOM.clientHeight;
-    }
-}
-
 /* eslint-disable dot-notation */
-function hidePage(page) {
-    if (page != null) {
-        page.onHide();
-        const pageEl = document.getElementById(page.path);
-        if (pageEl) {
-            pageEl.style.display = 'none';
-        }
-    }
-}
-function showPage(page, pageConfig, stacksIndex = 0) {
-    if (page != null) {
-        page.onShow();
-        let pageEl = document.getElementById(page.path);
-        if (pageEl) {
-            pageEl.style.display = 'block';
-        }
-        else {
-            page.onLoad(qs(stacksIndex));
-            pageEl = document.getElementById(page.path);
-            pageOnReady(pageEl, page, false);
-        }
-        bindPageScroll(page, pageConfig || {});
-    }
-}
-function unloadPage(page) {
-    if (page != null) {
-        stacks.pop();
-        page.onUnload();
-    }
-}
-function pageOnReady(pageEl, page, onLoad = true) {
+function pageOnReady(page, onLoad = true) {
     var _a;
+    const pageEl = document.getElementById(page.path);
     if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
         const el = pageEl.firstElementChild;
-        // eslint-disable-next-line no-unused-expressions
         (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el).then(() => {
             requestAnimationFrame(() => {
                 page.onReady();
@@ -1502,23 +1533,57 @@ function pageOnReady(pageEl, page, onLoad = true) {
         onLoad && (pageEl['__page'] = page);
     }
 }
-function loadPage(page, pageConfig, stacksIndex = 0) {
-    if (page !== null) {
-        let pageEl = document.getElementById(page.path);
-        if (pageEl) {
-            pageEl.style.display = 'block';
-        }
-        else {
-            page.onLoad(qs(stacksIndex), function () {
-                pageEl = document.getElementById(page.path);
-                pageOnReady(pageEl, page);
-            });
-        }
-        stacks.push(page);
-        page.onShow();
-        bindPageScroll(page, pageConfig || {});
+function loadPage(page, pageConfig = {}, stacksIndex = 0) {
+    if (!page)
+        return;
+    const pageEl = document.getElementById(page.path);
+    if (pageEl) {
+        pageEl.style.display = 'block';
+    }
+    else {
+        page.onLoad(qs(stacksIndex), () => pageOnReady(page, true));
     }
+    stacks.push(page);
+    page.onShow();
+    bindPageScroll(page, pageConfig);
 }
+function unloadPage(page, delta = 1) {
+    if (!page)
+        return;
+    stacks.delta = --delta;
+    stacks.pop();
+    page.onUnload();
+    if (delta >= 1)
+        unloadPage(stacks.last, delta);
+}
+function showPage(page, pageConfig = {}, stacksIndex = 0) {
+    if (!page)
+        return;
+    page.onShow();
+    const pageEl = document.getElementById(page.path);
+    if (pageEl) {
+        pageEl.style.display = 'block';
+    }
+    else {
+        page.onLoad(qs(stacksIndex), () => pageOnReady(page, false));
+    }
+    bindPageScroll(page, pageConfig);
+}
+function hidePage(page) {
+    if (!page)
+        return;
+    // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
+    const pageEl = document.getElementById(page.path);
+    if (pageEl) {
+        pageEl.style.display = 'none';
+        page.onHide();
+    }
+    else {
+        setTimeout(() => hidePage(page), 0);
+    }
+}
+
+/* eslint-disable dot-notation */
 function createRouter(app, config, framework) {
     var _a;
     init(config);
@@ -1537,8 +1602,8 @@ function createRouter(app, config, framework) {
     const basename = config.router.basename;
     const router = new UniversalRouter(routes, { baseUrl: basename || '' });
     app.onLaunch();
-    const render = throttle(async ({ location, action }) => {
-        var _a, _b, _c, _d, _e;
+    const render = async ({ location, action }) => {
+        var _a, _b, _c, _d;
         routerConfig.router.pathname = location.pathname;
         let element;
         try {
@@ -1570,63 +1635,51 @@ function createRouter(app, config, framework) {
             document.title = (_b = pageConfig.navigationBarTitleText) !== null && _b !== void 0 ? _b : document.title;
             enablePullDownRefresh = pageConfig.enablePullDownRefresh;
         }
+        const currentPage = Current.page;
+        const pathname = location.pathname;
         let shouldLoad = false;
         if (action === 'POP') {
-            unloadPage(Current.page);
-            let delta = historyBackDelta;
-            while (delta-- > 1) {
-                unloadPage(stacks.slice(-1)[0]);
-            }
-            // 最终必须重置为 1
-            setHistoryBackDelta(1);
-            const prevIndex = stacks.reduceRight((p, s, i) => {
-                if (p !== 0)
-                    return p;
-                else if (s.path === location.pathname + stringify(qs(i)))
-                    return i;
-                else
-                    return 0;
-            }, 0);
-            const prev = stacks[prevIndex];
-            if (prev) {
-                showPage(prev, pageConfig, prevIndex);
+            // NOTE: 浏览器事件退后多次时，该事件只会被触发一次
+            const prevIndex = stacks.getPrevIndex(pathname);
+            const delta = stacks.getDelta(pathname);
+            unloadPage(currentPage, delta);
+            if (prevIndex > -1) {
+                showPage(stacks.getItem(prevIndex), pageConfig, prevIndex);
             }
             else {
                 shouldLoad = true;
             }
         }
         else if (action === 'PUSH') {
-            hidePage(Current.page);
+            hidePage(currentPage);
             shouldLoad = true;
         }
         else if (action === 'REPLACE') {
-            unloadPage(Current.page);
+            if (isTabBar(config)) {
+                hidePage(currentPage);
+                const prevIndex = stacks.getPrevIndex(pathname);
+                if (prevIndex > -1) {
+                    // NOTE: tabbar 页且之前出现过，直接复用
+                    return showPage(stacks.getItem(prevIndex), pageConfig, prevIndex);
+                }
+            }
+            else {
+                unloadPage(currentPage);
+            }
             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) => {
-                    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;
-            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);
-            loadPage(page, pageConfig, routerIndex);
+            const loadConfig = Object.assign({}, pageConfig);
+            const stacksIndex = stacks.length;
+            delete loadConfig['path'];
+            delete loadConfig['load'];
+            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(stacksIndex)), {}, loadConfig);
+            return loadPage(page, pageConfig, stacksIndex);
         }
-    }, 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));