@tarojs/router 3.7.0-alpha.0 → 3.7.0-alpha.10

package/dist/events/scroll.d.ts

@@ -1,2 +1,2 @@
 import { PageInstance } from '@tarojs/runtime';
-export declare function bindPageScroll(page: PageInstance, pageEl: HTMLElement, distance?: number): void;
+export declare function bindPageScroll(page: PageInstance, scrollEl: HTMLElement | Window, distance?: number): void;

package/dist/events/scroll.js

@@ -1,11 +1,11 @@
 import { Current } from '@tarojs/runtime';
 const pageScrollFn = {};
 let pageDOM = window;
-export function bindPageScroll(page, pageEl, distance = 50) {
+export function bindPageScroll(page, scrollEl, distance = 50) {
     var _a;
     const pagePath = (page ? page === null || page === void 0 ? void 0 : page.path : (_a = Current.router) === null || _a === void 0 ? void 0 : _a.path);
-    pageScrollFn[pagePath] && pageEl.removeEventListener('scroll', pageScrollFn[pagePath]);
-    pageDOM = pageEl;
+    pageScrollFn[pagePath] && scrollEl.removeEventListener('scroll', pageScrollFn[pagePath]);
+    pageDOM = scrollEl;
     let isReachBottom = false;
     pageScrollFn[pagePath] = function () {
         var _a;

package/dist/history.js

@@ -35,7 +35,7 @@ class MpaHistory {
         return url;
     }
     push(to, _state = {}) {
-        window.location.pathname = this.parseUrl(to);
+        window.location.assign(this.parseUrl(to));
         // this.pushState(_state, '', this.parseUrl(to))
     }
     replace(to, _state = {}) {

package/dist/index.cjs.d.ts

@@ -1,6 +1,5 @@
 import Taro from "@tarojs/taro";
 import { History } from "history";
-/* eslint-disable dot-notation */
 import { AppInstance } from "@tarojs/runtime";
 import { MpaRouterConfig, SpaRouterConfig } from "../../types/router";
 declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;

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;
     }
 }
 
@@ -157,7 +98,7 @@ class MpaHistory {
         return url;
     }
     push(to, _state = {}) {
-        window.location.pathname = this.parseUrl(to);
+        window.location.assign(this.parseUrl(to));
         // this.pushState(_state, '', this.parseUrl(to))
     }
     replace(to, _state = {}) {
@@ -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);
@@ -440,11 +440,11 @@ function bindPageResize(page) {
 
 const pageScrollFn = {};
 let pageDOM = window;
-function bindPageScroll(page, pageEl, distance = 50) {
+function bindPageScroll(page, scrollEl, distance = 50) {
     var _a;
     const pagePath = (page ? page === null || page === void 0 ? void 0 : page.path : (_a = runtime.Current.router) === null || _a === void 0 ? void 0 : _a.path);
-    pageScrollFn[pagePath] && pageEl.removeEventListener('scroll', pageScrollFn[pagePath]);
-    pageDOM = pageEl;
+    pageScrollFn[pagePath] && scrollEl.removeEventListener('scroll', pageScrollFn[pagePath]);
+    pageDOM = scrollEl;
     let isReachBottom = false;
     pageScrollFn[pagePath] = function () {
         var _a;
@@ -472,6 +472,77 @@ function getOffset() {
     }
 }
 
+/**
+ * 插入页面动画需要的样式
+ */
+function loadAnimateStyle(ms = 300) {
+    const css = `
+.taro_router .taro_page {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+  transform: translate(100%, 0);
+  transition: transform ${ms}ms;
+  z-index: 0;
+}
+
+.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 {
+  transform: translate(0, 0);
+}`;
+    addStyle(css);
+}
+/**
+ * 插入路由相关样式
+ */
+function loadRouterStyle(usingWindowScroll) {
+    const css = `
+  .taro_router {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    min-height: 100vh;
+  }
+
+  .taro-tabbar__container .taro_router {
+    min-height: calc(100vh - 50px);
+  }
+
+  .taro_page {
+    width: 100%;
+    height: 100%;
+  ${usingWindowScroll ? '' : `
+    overflow-x: hidden;
+    overflow-y: scroll;
+    max-height: 100vh;
+  `}
+  }
+
+  .taro-tabbar__container .taro-tabbar__panel {
+    overflow: hidden;
+  }
+
+  .taro-tabbar__container .taro_page.taro_tabbar_page {
+    max-height: calc(100vh - 50px);
+  }
+`;
+    addStyle(css);
+}
+function addStyle(css) {
+    if (!css)
+        return;
+    const style = document.createElement('style');
+    style.innerHTML = css;
+    document.getElementsByTagName('head')[0].appendChild(style);
+}
+
 // @ts-nocheck
 function initTabbar(config) {
     if (config.tabBar == null) {
@@ -532,6 +603,17 @@ class MultiPageHandler {
         return !!pagePath && this.tabBarList.some(t => t.pagePath === pagePath);
     }
     get search() { return location.search.substr(1); }
+    get usingWindowScroll() {
+        var _a;
+        let usingWindowScroll = true;
+        if (typeof ((_a = this.pageConfig) === null || _a === void 0 ? void 0 : _a.usingWindowScroll) === 'boolean') {
+            usingWindowScroll = this.pageConfig.usingWindowScroll;
+        }
+        const win = window;
+        win.__taroAppConfig || (win.__taroAppConfig = {});
+        win.__taroAppConfig.usingWindowScroll = usingWindowScroll;
+        return usingWindowScroll;
+    }
     getQuery(search = '', options = {}) {
         search = search ? `${search}&${this.search}` : this.search;
         const query = search
@@ -541,6 +623,7 @@ class MultiPageHandler {
     }
     mount() {
         setHistoryMode(this.routerMode, this.router.basename);
+        loadRouterStyle(this.usingWindowScroll);
         const appId = this.appId;
         let app = document.getElementById(appId);
         let isPosition = true;
@@ -577,7 +660,20 @@ class MultiPageHandler {
         const pageEl = this.getPageContainer(page);
         if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
             const el = pageEl.firstElementChild;
-            (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el);
+            const componentOnReady = el === null || el === void 0 ? void 0 : el['componentOnReady'];
+            if (componentOnReady) {
+                componentOnReady === null || componentOnReady === void 0 ? void 0 : componentOnReady().then(() => {
+                    requestAnimationFrame(() => {
+                        var _a;
+                        (_a = page.onReady) === null || _a === void 0 ? void 0 : _a.call(page);
+                        pageEl['__isReady'] = true;
+                    });
+                });
+            }
+            else {
+                (_a = page.onReady) === null || _a === void 0 ? void 0 : _a.call(page);
+                pageEl['__isReady'] = true;
+            }
             onLoad && (pageEl['__page'] = page);
         }
     }
@@ -587,11 +683,14 @@ class MultiPageHandler {
             return;
         (_a = page.onLoad) === null || _a === void 0 ? void 0 : _a.call(page, this.getQuery('', page.options), () => {
             var _a;
-            const pageEl = this.getPageContainer(page);
-            this.isTabBar && (pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.add('taro_tabbar_page'));
+            if (this.isTabBar) {
+                const pageEl = this.getPageContainer(page);
+                pageEl === null || pageEl === void 0 ? void 0 : pageEl.classList.add('taro_tabbar_page');
+            }
             this.onReady(page, true);
             (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
-            this.bindPageEvents(page, pageEl, pageConfig);
+            this.bindPageEvents(page, pageConfig);
+            this.triggerRouterChange();
         });
     }
     getPageContainer(page) {
@@ -605,17 +704,33 @@ class MultiPageHandler {
             ? document.querySelector(`.taro_page#${id}`)
             : document.querySelector('.taro_page') ||
                 document.querySelector('.taro_router'));
-        return el || window;
+        return el;
     }
-    bindPageEvents(page, pageEl, config = {}) {
+    getScrollingElement(page) {
+        if (this.usingWindowScroll)
+            return window;
+        return this.getPageContainer(page) || window;
+    }
+    bindPageEvents(page, config = {}) {
         var _a;
-        if (!pageEl) {
-            pageEl = this.getPageContainer();
-        }
+        const scrollEl = this.getScrollingElement(page);
         const distance = config.onReachBottomDistance || ((_a = this.config.window) === null || _a === void 0 ? void 0 : _a.onReachBottomDistance) || 50;
-        bindPageScroll(page, pageEl, distance);
+        bindPageScroll(page, scrollEl, distance);
         bindPageResize(page);
     }
+    triggerRouterChange() {
+        /**
+         * @tarojs/runtime 中生命周期跑在 promise 中，所以这里需要 setTimeout 延迟事件调用
+         * TODO 考虑将生命周期返回 Promise，用于处理相关事件调用顺序
+         */
+        setTimeout(() => {
+            runtime.eventCenter.trigger('__afterTaroRouterChange', {
+                toLocation: {
+                    path: this.pathname
+                }
+            });
+        }, 0);
+    }
 }
 
 const createStampId$1 = runtime.incrementId();
@@ -631,6 +746,9 @@ const launchStampId$1 = createStampId$1();
 function createMultiRouter(app, config, framework) {
     var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function* () {
+        if (typeof app.onUnhandledRejection === 'function') {
+            window.addEventListener('unhandledrejection', app.onUnhandledRejection);
+        }
         RouterConfig.config = config;
         const handler = new MultiPageHandler(config);
         const launchParam = {
@@ -673,42 +791,12 @@ function createMultiRouter(app, config, framework) {
         const loadConfig = Object.assign({}, pageConfig);
         delete loadConfig['path'];
         delete loadConfig['load'];
-        const page = runtime.createPageConfig(enablePullDownRefresh ? runtime.hooks.call('createPullDownComponent', el, location.pathname, framework, handler.PullDownRefresh) : el, pathName + runtime.stringify(launchParam), {}, loadConfig);
+        const page = runtime.createPageConfig(enablePullDownRefresh ? runtime.hooks.call('createPullDownComponent', el, pathName, framework, handler.PullDownRefresh) : el, pathName + runtime.stringify(launchParam), {}, loadConfig);
         handler.load(page, pageConfig);
         (_f = app.onShow) === null || _f === void 0 ? void 0 : _f.call(app, launchParam);
     });
 }
 
-/**
- * 插入页面动画需要的样式
- */
-function loadAnimateStyle(ms = 300) {
-    const css = `
-.taro_router .taro_page {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background-color: #fff;
-  transform: translate(100%, 0);
-  transition: transform ${ms}ms;
-  z-index: 0;
-}
-
-.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 {
-  transform: translate(0, 0);
-}`;
-    const style = document.createElement('style');
-    style.innerHTML = css;
-    document.getElementsByTagName('head')[0].appendChild(style);
-}
-
 /* eslint-disable dot-notation */
 function setDisplay(el, type = '') {
     if (el) {
@@ -794,6 +882,17 @@ class PageHandler {
         }
         return search.substring(1);
     }
+    get usingWindowScroll() {
+        var _a;
+        let usingWindowScroll = false;
+        if (typeof ((_a = this.pageConfig) === null || _a === void 0 ? void 0 : _a.usingWindowScroll) === 'boolean') {
+            usingWindowScroll = this.pageConfig.usingWindowScroll;
+        }
+        const win = window;
+        win.__taroAppConfig || (win.__taroAppConfig = {});
+        win.__taroAppConfig.usingWindowScroll = usingWindowScroll;
+        return usingWindowScroll;
+    }
     getQuery(stamp = '', search = '', options = {}) {
         search = search ? `${search}&${this.search}` : this.search;
         const query = search
@@ -804,7 +903,9 @@ class PageHandler {
     }
     mount() {
         setHistoryMode(this.routerMode, this.router.basename);
+        this.pathname = exports.history.location.pathname;
         this.animation && loadAnimateStyle(this.animationDuration);
+        loadRouterStyle(this.usingWindowScroll);
         const appId = this.appId;
         let app = document.getElementById(appId);
         let isPosition = true;
@@ -871,7 +972,8 @@ class PageHandler {
             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);
-            this.bindPageEvents(page, pageEl, pageConfig);
+            this.bindPageEvents(page, pageConfig);
+            this.triggerRouterChange();
         }
         else {
             (_b = page.onLoad) === null || _b === void 0 ? void 0 : _b.call(page, param, () => {
@@ -881,7 +983,8 @@ class PageHandler {
                 this.addAnimation(pageEl, pageNo === 0);
                 this.onReady(page, true);
                 (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
-                this.bindPageEvents(page, pageEl, pageConfig);
+                this.bindPageEvents(page, pageConfig);
+                this.triggerRouterChange();
             });
         }
     }
@@ -901,10 +1004,14 @@ class PageHandler {
             const pageEl = this.getPageContainer(page);
             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');
+            if (pageEl) {
+                pageEl.style.zIndex = '1';
+            }
             this.unloadTimer = setTimeout(() => {
                 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 {
@@ -912,6 +1019,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);
@@ -926,7 +1036,8 @@ class PageHandler {
             setDisplay(pageEl);
             this.addAnimation(pageEl, pageNo === 0);
             (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
-            this.bindPageEvents(page, pageEl, pageConfig);
+            this.bindPageEvents(page, pageConfig);
+            this.triggerRouterChange();
         }
         else {
             (_b = page.onLoad) === null || _b === void 0 ? void 0 : _b.call(page, param, () => {
@@ -935,7 +1046,8 @@ class PageHandler {
                 this.addAnimation(pageEl, pageNo === 0);
                 this.onReady(page, false);
                 (_a = page.onShow) === null || _a === void 0 ? void 0 : _a.call(page);
-                this.bindPageEvents(page, pageEl, pageConfig);
+                this.bindPageEvents(page, pageConfig);
+                this.triggerRouterChange();
             });
         }
     }
@@ -989,23 +1101,42 @@ class PageHandler {
             ? document.querySelector(`.taro_page#${id}`)
             : document.querySelector('.taro_page') ||
                 document.querySelector('.taro_router'));
-        return el || window;
+        return el;
     }
-    bindPageEvents(page, pageEl, config = {}) {
+    getScrollingElement(page) {
+        if (this.usingWindowScroll)
+            return window;
+        return this.getPageContainer(page) || window;
+    }
+    bindPageEvents(page, config = {}) {
         var _a;
-        if (!pageEl) {
-            pageEl = this.getPageContainer();
-        }
+        const scrollEl = this.getScrollingElement(page);
         const distance = config.onReachBottomDistance || ((_a = this.config.window) === null || _a === void 0 ? void 0 : _a.onReachBottomDistance) || 50;
-        bindPageScroll(page, pageEl, distance);
+        bindPageScroll(page, scrollEl, distance);
         bindPageResize(page);
     }
+    triggerRouterChange() {
+        /**
+         * @tarojs/runtime 中生命周期跑在 promise 中，所以这里需要 setTimeout 延迟事件调用
+         * TODO 考虑将生命周期返回 Promise，用于处理相关事件调用顺序
+         */
+        setTimeout(() => {
+            runtime.eventCenter.trigger('__afterTaroRouterChange', {
+                toLocation: {
+                    path: this.pathname
+                }
+            });
+        }, 0);
+    }
 }
 
 const createStampId = runtime.incrementId();
 let launchStampId = createStampId();
 function createRouter(app, config, framework) {
     var _a, _b;
+    if (typeof app.onUnhandledRejection === 'function') {
+        window.addEventListener('unhandledrejection', app.onUnhandledRejection);
+    }
     RouterConfig.config = config;
     const handler = new PageHandler(config);
     routesAlias.set(handler.router.customRoutes);
@@ -1030,8 +1161,10 @@ function createRouter(app, config, framework) {
     (_a = app.onLaunch) === null || _a === void 0 ? void 0 : _a.call(app, launchParam);
     app.onError && window.addEventListener('error', e => { var _a; return (_a = app.onError) === null || _a === void 0 ? void 0 : _a.call(app, e.message); });
     const render = ({ location, action }) => __awaiter(this, void 0, void 0, function* () {
-        var _c, _d, _e, _f, _g;
+        var _c, _d, _e, _f, _g, _h;
         handler.pathname = decodeURI(location.pathname);
+        if ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll)
+            window.scrollTo(0, 0);
         runtime.eventCenter.trigger('__taroRouterChange', {
             toLocation: {
                 path: handler.pathname
@@ -1044,9 +1177,13 @@ function createRouter(app, config, framework) {
         }
         catch (error) {
             if (error.status === 404) {
-                (_c = app.onPageNotFound) === null || _c === void 0 ? void 0 : _c.call(app, {
-                    path: handler.pathname
-                });
+                const notFoundEvent = {
+                    isEntryPage: stacks.length === 0,
+                    path: handler.pathname,
+                    query: handler.getQuery(createStampId()),
+                };
+                (_d = app.onPageNotFound) === null || _d === void 0 ? void 0 : _d.call(app, notFoundEvent);
+                runtime.eventCenter.trigger('__taroRouterNotFound', notFoundEvent);
             }
             else if (/Loading hot update .* failed./.test(error.message)) {
                 // NOTE: webpack5 与 prebundle 搭配使用时，开发环境下初次启动时偶发错误，由于 HMR 加载 chunk hash 错误，导致热更新失败
@@ -1059,16 +1196,16 @@ function createRouter(app, config, framework) {
         if (!element)
             return;
         const pageConfig = handler.pageConfig;
-        let enablePullDownRefresh = ((_d = config === null || config === void 0 ? void 0 : config.window) === null || _d === void 0 ? void 0 : _d.enablePullDownRefresh) || false;
+        let enablePullDownRefresh = ((_e = config === null || config === void 0 ? void 0 : config.window) === null || _e === void 0 ? void 0 : _e.enablePullDownRefresh) || false;
         if (pageConfig) {
-            setTitle((_e = pageConfig.navigationBarTitleText) !== null && _e !== void 0 ? _e : document.title);
+            setTitle((_f = pageConfig.navigationBarTitleText) !== null && _f !== void 0 ? _f : document.title);
             if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
                 enablePullDownRefresh = pageConfig.enablePullDownRefresh;
             }
         }
         const currentPage = runtime.Current.page;
         const pathname = handler.pathname;
-        const methodName = (_f = stacks.method) !== null && _f !== void 0 ? _f : '';
+        const methodName = (_g = stacks.method) !== null && _g !== void 0 ? _g : '';
         const cacheTabs = stacks.getTabs();
         let shouldLoad = false;
         stacks.method = '';
@@ -1093,11 +1230,11 @@ function createRouter(app, config, framework) {
             else if (stacks.length > 0) {
                 const firstIns = stacks.getItem(0);
                 if (handler.isTabBar(firstIns.path)) {
-                    handler.unload(currentPage, stacks.length - 1);
+                    handler.unload(currentPage, stacks.length - 1, true);
                     stacks.pushTab(firstIns.path.split('?')[0]);
                 }
                 else {
-                    handler.unload(currentPage, stacks.length);
+                    handler.unload(currentPage, stacks.length, true);
                 }
             }
             if (cacheTabs[handler.pathname]) {
@@ -1114,7 +1251,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;
@@ -1132,7 +1271,7 @@ function createRouter(app, config, framework) {
             shouldLoad = true;
         }
         if (shouldLoad || stacks.length < 1) {
-            const el = (_g = element.default) !== null && _g !== void 0 ? _g : element;
+            const el = (_h = element.default) !== null && _h !== void 0 ? _h : element;
             const loadConfig = Object.assign({}, pageConfig);
             const stacksIndex = stacks.length;
             delete loadConfig['path'];
@@ -1145,16 +1284,11 @@ function createRouter(app, config, framework) {
             else {
                 pageStampId = createStampId();
             }
-            const page = runtime.createPageConfig(enablePullDownRefresh ? runtime.hooks.call('createPullDownComponent', el, location.pathname, framework, handler.PullDownRefresh) : el, pathname + runtime.stringify(handler.getQuery(pageStampId)), {}, loadConfig);
+            const page = runtime.createPageConfig(enablePullDownRefresh ? runtime.hooks.call('createPullDownComponent', el, pathname, framework, handler.PullDownRefresh, pageStampId) : el, pathname + runtime.stringify(handler.getQuery(pageStampId)), {}, loadConfig);
             if (params)
                 page.options = params;
             handler.load(page, pageConfig, pageStampId, stacksIndex);
         }
-        runtime.eventCenter.trigger('__afterTaroRouterChange', {
-            toLocation: {
-                path: handler.pathname
-            }
-        });
     });
     const routePath = addLeadingSlash(stripBasename(exports.history.location.pathname, handler.basename));
     if (routePath === '/') {