@tarojs/router 3.7.0-canary.0 → 3.7.0-canary.2

package/dist/api.js

@@ -65,7 +65,12 @@ function navigate(option, method) {
                 }
                 else if (method === 'navigateBack') {
                     stacks.delta = option.delta;
-                    history.go(-option.delta);
+                    if (stacks.length > option.delta) {
+                        history.go(-option.delta);
+                    }
+                    else {
+                        history.go(1 - stacks.length);
+                    }
                 }
             }
             catch (error) {

package/dist/index.cjs.js

@@ -41,65 +41,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-// export const removeLeadingSlash = (str = '') => str.replace(/^\.?\//, '')
-// export const removeTrailingSearch = (str = '') => str.replace(/\?[\s\S]*$/, '')
-const addLeadingSlash = (url = '') => (url.charAt(0) === '/' ? url : '/' + url);
-const hasBasename = (path = '', prefix = '') => new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path) || path === prefix;
-const stripBasename = (path = '', prefix = '') => hasBasename(path, prefix) ? path.substring(prefix.length) : path;
-const stripTrailing = (str = '') => str.replace(/[?#][\s\S]*$/, '');
-const getHomePage = (path = '', basename = '', customRoutes = {}, entryPagePath = '') => {
-    var _a;
-    const routePath = addLeadingSlash(stripBasename(path, basename));
-    const alias = ((_a = Object.entries(customRoutes).find(([key]) => key === routePath)) === null || _a === void 0 ? void 0 : _a[1]) || routePath;
-    return entryPagePath || (typeof alias === 'string' ? alias : alias[0]) || basename;
-};
-const getCurrentPage = (routerMode = 'hash', basename = '/') => {
-    const pagePath = routerMode === 'hash'
-        ? location.hash.slice(1).split('?')[0]
-        : location.pathname;
-    return addLeadingSlash(stripBasename(pagePath, basename));
-};
-class RoutesAlias {
-    constructor() {
-        this.conf = [];
-        this.getConfig = (url = '') => {
-            const customRoute = this.conf.filter((arr) => {
-                return arr.includes(url);
-            });
-            return customRoute[0];
-        };
-        this.getOrigin = (url = '') => {
-            var _a;
-            return ((_a = this.getConfig(url)) === null || _a === void 0 ? void 0 : _a[0]) || url;
-        };
-        this.getAlias = (url = '') => {
-            var _a;
-            return ((_a = this.getConfig(url)) === null || _a === void 0 ? void 0 : _a[1]) || url;
-        };
-        this.getAll = (url = '') => {
-            return this.conf
-                .filter((arr) => arr.includes(url))
-                .reduceRight((p, a) => {
-                p.unshift(a[1]);
-                return p;
-            }, []);
-        };
-    }
-    set(customRoutes = {}) {
-        for (let key in customRoutes) {
-            const path = customRoutes[key];
-            key = addLeadingSlash(key);
-            if (typeof path === 'string') {
-                this.conf.push([key, addLeadingSlash(path)]);
-            }
-            else if ((path === null || path === void 0 ? void 0 : path.length) > 0) {
-                this.conf.push(...path.map(p => [key, addLeadingSlash(p)]));
-            }
-        }
-    }
-}
-const routesAlias = new RoutesAlias();
-
 class RouterConfig {
     static set config(e) {
         this.__config = e;
@@ -118,7 +59,7 @@ class RouterConfig {
     }
     static get customRoutes() { return this.router.customRoutes || {}; }
     static isPage(url = '') {
-        return this.pages.findIndex(e => addLeadingSlash(e) === url) !== -1;
+        return this.pages.findIndex(e => prependBasename(e) === url) !== -1;
     }
 }
 
@@ -302,6 +243,65 @@ class Stacks {
 }
 const stacks = new Stacks();
 
+// export const removeLeadingSlash = (str = '') => str.replace(/^\.?\//, '')
+// export const removeTrailingSearch = (str = '') => str.replace(/\?[\s\S]*$/, '')
+const addLeadingSlash = (url = '') => (url.charAt(0) === '/' ? url : '/' + url);
+const hasBasename = (path = '', prefix = '') => new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path) || path === prefix;
+const stripBasename = (path = '', prefix = '') => hasBasename(path, prefix) ? path.substring(prefix.length) : path;
+const stripTrailing = (str = '') => str.replace(/[?#][\s\S]*$/, '');
+const getHomePage = (path = '', basename = '', customRoutes = {}, entryPagePath = '') => {
+    var _a;
+    const routePath = addLeadingSlash(stripBasename(path, basename));
+    const alias = ((_a = Object.entries(customRoutes).find(([key]) => key === routePath)) === null || _a === void 0 ? void 0 : _a[1]) || routePath;
+    return entryPagePath || (typeof alias === 'string' ? alias : alias[0]) || basename;
+};
+const getCurrentPage = (routerMode = 'hash', basename = '/') => {
+    const pagePath = routerMode === 'hash'
+        ? location.hash.slice(1).split('?')[0]
+        : location.pathname;
+    return addLeadingSlash(stripBasename(pagePath, basename));
+};
+class RoutesAlias {
+    constructor() {
+        this.conf = [];
+        this.getConfig = (url = '') => {
+            const customRoute = this.conf.filter((arr) => {
+                return arr.includes(url);
+            });
+            return customRoute[0];
+        };
+        this.getOrigin = (url = '') => {
+            var _a;
+            return ((_a = this.getConfig(url)) === null || _a === void 0 ? void 0 : _a[0]) || url;
+        };
+        this.getAlias = (url = '') => {
+            var _a;
+            return ((_a = this.getConfig(url)) === null || _a === void 0 ? void 0 : _a[1]) || url;
+        };
+        this.getAll = (url = '') => {
+            return this.conf
+                .filter((arr) => arr.includes(url))
+                .reduceRight((p, a) => {
+                p.unshift(a[1]);
+                return p;
+            }, []);
+        };
+    }
+    set(customRoutes = {}) {
+        for (let key in customRoutes) {
+            const path = customRoutes[key];
+            key = addLeadingSlash(key);
+            if (typeof path === 'string') {
+                this.conf.push([key, addLeadingSlash(path)]);
+            }
+            else if ((path === null || path === void 0 ? void 0 : path.length) > 0) {
+                this.conf.push(...path.map(p => [key, addLeadingSlash(p)]));
+            }
+        }
+    }
+}
+const routesAlias = new RoutesAlias();
+
 function processNavigateUrl(option) {
     var _a;
     const pathPieces = history.parsePath(option.url);
@@ -355,7 +355,12 @@ function navigate(option, method) {
                 }
                 else if (method === 'navigateBack') {
                     stacks.delta = option.delta;
-                    exports.history.go(-option.delta);
+                    if (stacks.length > option.delta) {
+                        exports.history.go(-option.delta);
+                    }
+                    else {
+                        exports.history.go(1 - stacks.length);
+                    }
                 }
             }
             catch (error) {
@@ -477,7 +482,7 @@ function getOffset() {
  */
 function loadAnimateStyle(ms = 300) {
     const css = `
-.taro_router .taro_page {
+.taro_router > .taro_page {
   position: absolute;
   left: 0;
   top: 0;
@@ -489,14 +494,15 @@ function loadAnimateStyle(ms = 300) {
   z-index: 0;
 }
 
-.taro_router .taro_page.taro_tabbar_page,
-.taro_router .taro_page.taro_page_show.taro_page_stationed {
+.taro_router > .taro_page.taro_tabbar_page,
+.taro_router > .taro_page.taro_page_show.taro_page_stationed {
   transform: none;
 }
 
-.taro_router .taro_page.taro_page_show {
+.taro_router > .taro_page.taro_page_show {
   transform: translate(0, 0);
-}`;
+}
+`;
     addStyle(css);
 }
 /**
@@ -505,15 +511,9 @@ function loadAnimateStyle(ms = 300) {
 function loadRouterStyle(usingWindowScroll) {
     const css = `
   .taro_router {
-    overflow: hidden;
     position: relative;
     width: 100%;
     height: 100%;
-    min-height: 100vh;
-  }
-
-  .taro-tabbar__container .taro_router {
-    min-height: calc(100vh - 50px);
   }
 
   .taro_page {
@@ -526,12 +526,18 @@ function loadRouterStyle(usingWindowScroll) {
   `}
   }
 
-  .taro-tabbar__container .taro-tabbar__panel {
+  .taro-tabbar__container > .taro-tabbar__panel {
     overflow: hidden;
   }
 
-  .taro-tabbar__container .taro_page.taro_tabbar_page {
-    max-height: calc(100vh - 50px);
+  .taro-tabbar__container > .taro-tabbar__panel > .taro_page.taro_tabbar_page {
+    max-height: calc(100vh - var(--taro-tabbar-height) - constant(safe-area-inset-bottom));
+    max-height: calc(100vh - var(--taro-tabbar-height) - env(safe-area-inset-bottom));
+  }
+
+  .taro_page_shade,
+  .taro_router > .taro_page.taro_page_show.taro_page_stationed:not(.taro_page_shade):not(.taro_tabbar_page):not(:last-child) {
+    display: none;
   }
 `;
     addStyle(css);
@@ -546,7 +552,7 @@ function addStyle(css) {
 
 // @ts-nocheck
 function initTabbar(config) {
-    if (config.tabBar == null) {
+    if (config.tabBar == null || config.tabBar.custom) {
         return;
     }
     // TODO: custom-tab-bar
@@ -799,11 +805,6 @@ function createMultiRouter(app, config, framework) {
 }
 
 /* eslint-disable dot-notation */
-function setDisplay(el, type = '') {
-    if (el) {
-        el.style.display = type;
-    }
-}
 class PageHandler {
     constructor(config) {
         this.defaultAnimation = { duration: 300, delay: 50 };
@@ -969,7 +970,7 @@ class PageHandler {
         const param = this.getQuery(stampId, '', page.options);
         let pageEl = this.getPageContainer(page);
         if (pageEl) {
-            setDisplay(pageEl);
+            pageEl.classList.remove('taro_page_shade');
             this.isTabBar(this.pathname) && pageEl.classList.add('taro_tabbar_page');
             this.addAnimation(pageEl, pageNo === 0);
             (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
@@ -1012,6 +1013,7 @@ class PageHandler {
                 var _a, _b;
                 this.unloadTimer = null;
                 (_b = (_a = this.lastUnloadPage) === null || _a === void 0 ? void 0 : _a.onUnload) === null || _b === void 0 ? void 0 : _b.call(_a);
+                runtime.eventCenter.trigger('__taroPageOnShowAfterDestroyed');
             }, this.animationDuration);
         }
         else {
@@ -1019,6 +1021,9 @@ class PageHandler {
             pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.remove('taro_page_stationed');
             pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.remove('taro_page_show');
             (_c = page === null || page === void 0 ? void 0 : page.onUnload) === null || _c === void 0 ? void 0 : _c.call(page);
+            setTimeout(() => {
+                runtime.eventCenter.trigger('__taroPageOnShowAfterDestroyed');
+            }, 0);
         }
         if (delta >= 1)
             this.unload(stacks.last, delta);
@@ -1030,7 +1035,7 @@ class PageHandler {
         const param = this.getQuery(page['$taroParams']['stamp'], '', page.options);
         let pageEl = this.getPageContainer(page);
         if (pageEl) {
-            setDisplay(pageEl);
+            pageEl.classList.remove('taro_page_shade');
             this.addAnimation(pageEl, pageNo === 0);
             (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
             this.bindPageEvents(page, pageConfig);
@@ -1058,12 +1063,12 @@ class PageHandler {
             if (this.hideTimer) {
                 clearTimeout(this.hideTimer);
                 this.hideTimer = null;
-                setDisplay(this.lastHidePage, 'none');
+                pageEl.classList.add('taro_page_shade');
             }
             this.lastHidePage = pageEl;
             this.hideTimer = setTimeout(() => {
                 this.hideTimer = null;
-                setDisplay(this.lastHidePage, 'none');
+                pageEl.classList.add('taro_page_shade');
             }, this.animationDuration + this.animationDelay);
             (_a = page.onHide) === null || _a === void 0 ? void 0 : _a.call(page);
         }
@@ -1248,7 +1253,9 @@ function createRouter(app, config, framework) {
             if (currentPage !== stacks.getItem(prevIndex)) {
                 handler.unload(currentPage, delta, prevIndex > -1);
                 if (prevIndex > -1) {
-                    handler.show(stacks.getItem(prevIndex), pageConfig, prevIndex);
+                    runtime.eventCenter.once('__taroPageOnShowAfterDestroyed', () => {
+                        handler.show(stacks.getItem(prevIndex), pageConfig, prevIndex);
+                    });
                 }
                 else {
                     shouldLoad = true;