@tarojs/router 3.3.14 → 3.3.15

package/dist/index.js

@@ -56,9 +56,56 @@ function prependBasename(url) {
     if ( url === void 0 ) url = '';
 
     return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
-}
+}
+var hasBasename = function (path, prefix) { return new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path); };
+var stripBasename = function (path, prefix) { return hasBasename(path, prefix) ? path.substr(prefix.length) : path; };
+
+var Stacks = function Stacks() {
+    this.stacks = [];
+    this.backDelta = 0;
+};
+
+var prototypeAccessors = { delta: { configurable: true },length: { configurable: true },last: { configurable: true } };
+prototypeAccessors.delta.set = function (delta) {
+    if (delta > 0) {
+        this.backDelta = delta;
+    }
+    else {
+        --this.backDelta;
+    }
+};
+prototypeAccessors.length.get = function () {
+    return this.stacks.length;
+};
+prototypeAccessors.last.get = function () {
+    return this.stacks[this.length - 1];
+};
+Stacks.prototype.get = function get () {
+    return this.stacks;
+};
+Stacks.prototype.getItem = function getItem (index) {
+    return this.stacks[index];
+};
+Stacks.prototype.getDelta = function getDelta (pathname) {
+    if (this.backDelta >= 1) {
+        return this.backDelta;
+    }
+    // NOTE: 此处为了修复浏览器后退多级页面，在大量重复路由状况下可能出现判断错误的情况 （增强判断能力只能考虑在 query 中新增参数来判断，暂时搁置）
+    var prevIndex = this.stacks.findIndex(function (r) { var _a; return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname; });
+    return this.length - 1 - prevIndex;
+};
+Stacks.prototype.getPrevIndex = function getPrevIndex (pathname) {
+    return this.length - 1 - this.getDelta(pathname);
+};
+Stacks.prototype.pop = function pop () {
+    return this.stacks.pop();
+};
+Stacks.prototype.push = function push (page) {
+    return this.stacks.push(page);
+};
 
-var stacks = [];
+Object.defineProperties( Stacks.prototype, prototypeAccessors );
+var stacks = new Stacks();
 
 var routesAlias = {};
 function setRoutesAlias(alias) {
@@ -70,25 +117,6 @@ function addLeadingSlash(path) {
     }
     return path.charAt(0) === '/' ? path : '/' + path;
 }
-// 解决navigateBack调用delta>1时,路由栈异常问题
-// 比如:A->B->C,navigateBack({delta: 2}),此时路由栈中还存在B页面
-// 原因:主要是由于一次性退出多层级页面时,此action只会执行一次,此处进行手动处理
-var historyBackDelta = 1;
-function setHistoryBackDelta(delta) {
-    historyBackDelta = delta;
-}
-// eslint-disable-next-line @typescript-eslint/ban-types
-var throttle = function (fn, threshold) {
-    var lastTime = 0;
-    return function () {
-        var now = Date.now();
-        if (now - lastTime > threshold) {
-            fn.apply(this, arguments);
-            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;
@@ -105,6 +133,7 @@ var isTabBar = function (config) {
 };
 
 function processNavigateUrl(option) {
+    var _a;
     var pathPieces = J(option.url);
     // 处理自定义路由
     Object.keys(routesAlias).forEach(function (key) {
@@ -112,6 +141,18 @@ function processNavigateUrl(option) {
             pathPieces.pathname = routesAlias[key];
         }
     });
+    // 处理相对路径
+    if ((_a = pathPieces === null || pathPieces === void 0 ? void 0 : pathPieces.pathname) === null || _a === void 0 ? void 0 : _a.includes('./')) {
+        var parts = exports.history.location.pathname.split('/');
+        parts.pop();
+        pathPieces.pathname.split('/').forEach(function (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
@@ -142,7 +183,7 @@ async function navigate(option, method) {
                 }
             }
             else if (method === 'navigateBack') {
-                setHistoryBackDelta(option.delta);
+                stacks.delta = option.delta;
                 exports.history.go(-option.delta);
             }
         }
@@ -176,7 +217,7 @@ function reLaunch(option) {
     return redirectTo(option);
 }
 function getCurrentPages() {
-    return stacks;
+    return stacks.get();
 }
 
 /**
@@ -822,6 +863,7 @@ var UniversalRouter = function () {
 
 UniversalRouter.pathToRegexp = pathToRegexp_1;
 
+var Taro = require('@tarojs/taro-h5');
 function initTabbar(config) {
     if (config.tabBar == null) {
         return;
@@ -833,7 +875,6 @@ function initTabbar(config) {
     tabbar.conf.homePage = exports.history.location.pathname === '/' ? homePage : exports.history.location.pathname;
     var 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;
@@ -848,6 +889,7 @@ function initTabbar(config) {
     var container = document.getElementById('container');
     // eslint-disable-next-line no-unused-expressions
     container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
+    Taro.initTabBarApis(config);
 }
 
 var routerConfig = Object.create(null);
@@ -871,6 +913,58 @@ function init(config) {
     initTabbar(config);
 }
 
+var pageScrollFn;
+var pageDOM = window;
+function bindPageScroll(page, config) {
+    pageDOM.removeEventListener('scroll', pageScrollFn);
+    pageDOM = getScrollContainer();
+    var distance = config.onReachBottomDistance || 50;
+    var 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', function (e) {
+    var _a;
+    // @ts-ignore
+    var 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;
 }
@@ -1427,14 +1521,25 @@ var queryString_5 = queryString.stringifyUrl;
 var queryString_6 = queryString.pick;
 var queryString_7 = queryString.exclude;
 
+function getSearch() {
+    var search = '?';
+    if (routerConfig.router.mode === 'hash') {
+        var idx = location.hash.indexOf('?');
+        if (idx > -1) {
+            search = location.hash.slice(idx);
+        }
+    }
+    else {
+        search = location.search;
+    }
+    return search.substr(1);
+}
 var qs = function (stamp) {
     if ( stamp === void 0 ) stamp = 0;
 
-    var search = routerConfig.router.mode === 'hash'
-        ? location.hash.slice(routerConfig.router.pathname.length + 1)
-        : location.search;
+    var search = getSearch();
     var query = search
-        ? queryString.parse(search.substr(1))
+        ? queryString.parse(search)
         : {};
     if (stamp) {
         query.stamp = stamp.toString();
@@ -1442,98 +1547,14 @@ var qs = function (stamp) {
     return query;
 };
 
-var pageScrollFn;
-var pageDOM = window;
-function bindPageScroll(page, config) {
-    pageDOM.removeEventListener('scroll', pageScrollFn);
-    pageDOM = getScrollContainer();
-    var distance = config.onReachBottomDistance || 50;
-    var 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', function (e) {
-    var _a;
-    // @ts-ignore
-    var 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();
-        var pageEl = document.getElementById(page.path);
-        if (pageEl) {
-            pageEl.style.display = 'none';
-        }
-    }
-}
-function showPage(page, pageConfig, stacksIndex) {
-    if ( stacksIndex === void 0 ) stacksIndex = 0;
-
-    if (page != null) {
-        page.onShow();
-        var 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) {
+function pageOnReady(page, onLoad) {
     if ( onLoad === void 0 ) onLoad = true;
 
     var _a;
+    var pageEl = document.getElementById(page.path);
     if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
         var 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(function () {
             runtime.requestAnimationFrame(function () {
                 page.onReady();
@@ -1544,24 +1565,64 @@ function pageOnReady(pageEl, page, onLoad) {
     }
 }
 function loadPage(page, pageConfig, stacksIndex) {
+    if ( pageConfig === void 0 ) pageConfig = {};
     if ( stacksIndex === void 0 ) stacksIndex = 0;
 
-    if (page !== null) {
-        var 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 || {});
+    if (!page)
+        { return; }
+    var pageEl = document.getElementById(page.path);
+    if (pageEl) {
+        pageEl.style.display = 'block';
     }
+    else {
+        page.onLoad(qs(stacksIndex), function () { return pageOnReady(page, true); });
+    }
+    stacks.push(page);
+    page.onShow();
+    bindPageScroll(page, pageConfig);
+}
+function unloadPage(page, delta) {
+    if ( delta === void 0 ) delta = 1;
+
+    if (!page)
+        { return; }
+    stacks.delta = --delta;
+    stacks.pop();
+    page.onUnload();
+    if (delta >= 1)
+        { unloadPage(stacks.last, delta); }
 }
+function showPage(page, pageConfig, stacksIndex) {
+    if ( pageConfig === void 0 ) pageConfig = {};
+    if ( stacksIndex === void 0 ) stacksIndex = 0;
+
+    if (!page)
+        { return; }
+    page.onShow();
+    var pageEl = document.getElementById(page.path);
+    if (pageEl) {
+        pageEl.style.display = 'block';
+    }
+    else {
+        page.onLoad(qs(stacksIndex), function () { return pageOnReady(page, false); });
+    }
+    bindPageScroll(page, pageConfig);
+}
+function hidePage(page) {
+    if (!page)
+        { return; }
+    // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
+    var pageEl = document.getElementById(page.path);
+    if (pageEl) {
+        pageEl.style.display = 'none';
+        page.onHide();
+    }
+    else {
+        setTimeout(function () { return hidePage(page); }, 0);
+    }
+}
+
+/* eslint-disable dot-notation */
 function createRouter(app, config, framework) {
     var _a;
     init(config);
@@ -1580,7 +1641,7 @@ function createRouter(app, config, framework) {
     var basename = config.router.basename;
     var router = new UniversalRouter(routes, { baseUrl: basename || '' });
     app.onLaunch();
-    var render = throttle(async function (ref) {
+    var render = async function (ref) {
         var location = ref.location;
         var action = ref.action;
 
@@ -1616,65 +1677,49 @@ function createRouter(app, config, framework) {
             document.title = (_b = pageConfig.navigationBarTitleText) !== null && _b !== void 0 ? _b : document.title;
             enablePullDownRefresh = pageConfig.enablePullDownRefresh;
         }
+        var currentPage = runtime.Current.page;
+        var pathname = location.pathname;
         var shouldLoad = false;
         if (action === 'POP') {
-            unloadPage(runtime.Current.page);
-            var delta = historyBackDelta;
-            while (delta-- > 1) {
-                unloadPage(stacks.slice(-1)[0]);
-            }
-            // 最终必须重置为 1
-            setHistoryBackDelta(1);
-            var 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);
-            var prev = stacks[prevIndex];
-            if (prev) {
-                showPage(prev, pageConfig, prevIndex);
+            // NOTE: 浏览器事件退后多次时，该事件只会被触发一次
+            var prevIndex = stacks.getPrevIndex(pathname);
+            var delta = stacks.getDelta(pathname);
+            unloadPage(currentPage, delta);
+            if (prevIndex > -1) {
+                showPage(stacks.getItem(prevIndex), pageConfig, prevIndex);
             }
             else {
                 shouldLoad = true;
             }
         }
         else if (action === 'PUSH') {
-            hidePage(runtime.Current.page);
+            hidePage(currentPage);
             shouldLoad = true;
         }
         else if (action === 'REPLACE') {
             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;
-                });
+                hidePage(currentPage);
+                var prevIndex$1 = stacks.getPrevIndex(pathname);
                 if (prevIndex$1 > -1) {
-                    // tabbar 页且之前出现过，直接复用
-                    var prev$1 = stacks[prevIndex$1];
-                    return showPage(prev$1, pageConfig, prevIndex$1);
+                    // NOTE: tabbar 页且之前出现过，直接复用
+                    return showPage(stacks.getItem(prevIndex$1), pageConfig, prevIndex$1);
                 }
             }
             else {
-                unloadPage(runtime.Current.page);
+                unloadPage(currentPage);
             }
             shouldLoad = true;
         }
         if (shouldLoad) {
             var el = (_c = element.default) !== null && _c !== void 0 ? _c : element;
             var loadConfig = Object.assign({}, pageConfig);
+            var stacksIndex = stacks.length;
             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);
+            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(stacksIndex)), {}, loadConfig);
+            return loadPage(page, pageConfig, stacksIndex);
         }
-    }, 500);
+    };
     if (exports.history.location.pathname === '/') {
         exports.history.replace(prependBasename(routes[0].path + exports.history.location.search));
     }