@tarojs/router 3.5.7 → 3.5.9

package/dist/router/spa.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 /* eslint-disable dot-notation */
-import { createPageConfig, Current, eventCenter, hooks, stringify } from '@tarojs/runtime';
+import { createPageConfig, Current, eventCenter, hooks, incrementId, stringify, } from '@tarojs/runtime';
 import { Action as LocationAction } from 'history';
 import UniversalRouter from 'universal-router';
 import { history, prependBasename } from '../history';
@@ -17,6 +17,8 @@ import { setTitle } from '../utils/navigate';
 import { RouterConfig } from '.';
 import PageHandler from './page';
 import stacks from './stack';
+const createStampId = incrementId();
+let launchStampId = createStampId();
 export function createRouter(app, config, framework) {
     var _a, _b;
     RouterConfig.config = config;
@@ -34,7 +36,7 @@ export function createRouter(app, config, framework) {
     const router = new UniversalRouter(routes, { baseUrl: basename || '' });
     const launchParam = {
         path: handler.homePage,
-        query: handler.getQuery(stacks.length),
+        query: handler.getQuery(launchStampId),
         scene: 0,
         shareTicket: '',
         referrerInfo: {}
@@ -43,7 +45,7 @@ export 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);
         eventCenter.trigger('__taroRouterChange', {
             toLocation: {
@@ -82,8 +84,45 @@ export function createRouter(app, config, framework) {
         }
         const currentPage = Current.page;
         const pathname = handler.pathname;
+        const methodName = (_g = stacks.method) !== null && _g !== void 0 ? _g : '';
+        const cacheTabs = stacks.getTabs();
         let shouldLoad = false;
-        if (action === 'POP') {
+        stacks.method = '';
+        if (methodName === 'reLaunch') {
+            handler.unload(currentPage, stacks.length);
+            // NOTE: 同时卸载缓存在tabs里面的页面实例
+            for (const key in cacheTabs) {
+                if (cacheTabs[key]) {
+                    handler.unload(cacheTabs[key]);
+                    stacks.removeTab(key);
+                }
+            }
+            shouldLoad = true;
+        }
+        else if (handler.isTabBar(handler.pathname)) {
+            if (handler.isSamePage(currentPage))
+                return;
+            if (handler.isTabBar(currentPage.path)) {
+                handler.hide(currentPage);
+                stacks.pushTab(currentPage.path.split('?')[0]);
+            }
+            else if (stacks.length > 0) {
+                const firstIns = stacks.getItem(0);
+                if (handler.isTabBar(firstIns.path)) {
+                    handler.unload(currentPage, stacks.length - 1);
+                    stacks.pushTab(firstIns.path.split('?')[0]);
+                }
+                else {
+                    handler.unload(currentPage, stacks.length);
+                }
+            }
+            if (cacheTabs[handler.pathname]) {
+                stacks.popTab(handler.pathname);
+                return handler.show(stacks.getItem(0), pageConfig, 0);
+            }
+            shouldLoad = true;
+        }
+        else if (action === 'POP') {
             // NOTE: 浏览器事件退后多次时，该事件只会被触发一次
             const prevIndex = stacks.getPrevIndex(pathname);
             const delta = stacks.getDelta(pathname);
@@ -98,37 +137,34 @@ export function createRouter(app, config, framework) {
                 }
             }
         }
-        else {
-            if (handler.isTabBar) {
-                if (handler.isSamePage(currentPage))
-                    return;
-                const prevIndex = stacks.getPrevIndex(pathname, 0);
-                handler.hide(currentPage);
-                if (prevIndex > -1) {
-                    // NOTE: tabbar 页且之前出现过，直接复用
-                    return handler.show(stacks.getItem(prevIndex), pageConfig, prevIndex);
-                }
-            }
-            else if (action === 'REPLACE') {
-                const delta = stacks.getDelta(pathname);
-                // NOTE: 页面路由记录并不会清空，只是移除掉缓存的 stack 以及页面
-                handler.unload(currentPage, delta);
-            }
-            else if (action === 'PUSH') {
-                handler.hide(currentPage);
-            }
+        else if (action === 'REPLACE') {
+            const delta = stacks.getDelta(pathname);
+            // NOTE: 页面路由记录并不会清空，只是移除掉缓存的 stack 以及页面
+            handler.unload(currentPage, delta);
+            shouldLoad = true;
+        }
+        else if (action === 'PUSH') {
+            handler.hide(currentPage);
             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'];
             delete loadConfig['load'];
-            const page = createPageConfig(enablePullDownRefresh ? hooks.call('createPullDownComponent', el, location.pathname, framework, handler.PullDownRefresh) : el, pathname + stringify(handler.getQuery(stacksIndex)), {}, loadConfig);
+            let pageStampId = '';
+            if (launchStampId) {
+                pageStampId = launchStampId;
+                launchStampId = '';
+            }
+            else {
+                pageStampId = createStampId();
+            }
+            const page = createPageConfig(enablePullDownRefresh ? hooks.call('createPullDownComponent', el, location.pathname, framework, handler.PullDownRefresh) : el, pathname + stringify(handler.getQuery(pageStampId)), {}, loadConfig);
             if (params)
                 page.options = params;
-            return handler.load(page, pageConfig, stacksIndex);
+            return handler.load(page, pageConfig, pageStampId, stacksIndex);
         }
     });
     const routePath = addLeadingSlash(stripBasename(history.location.pathname, handler.basename));

package/dist/router/stack.d.ts

@@ -2,8 +2,12 @@ import { PageInstance } from '@tarojs/runtime';
 declare class Stacks {
     stacks: PageInstance[];
     backDelta: number;
+    tabs: {};
+    methodName: string;
     set delta(delta: number);
     get delta(): number;
+    set method(methodName: string);
+    get method(): string;
     get length(): number;
     get last(): PageInstance;
     get(): PageInstance[];
@@ -13,6 +17,10 @@ declare class Stacks {
     getPrevIndex(pathname: string, stateWith?: number): number;
     pop(): PageInstance | undefined;
     push(page: PageInstance): number;
+    getTabs(): {};
+    pushTab(path: string): void;
+    popTab(path: string): void;
+    removeTab(path: string): void;
 }
 declare const stacks: Stacks;
 export default stacks;

package/dist/router/stack.js

@@ -2,6 +2,8 @@ class Stacks {
     constructor() {
         this.stacks = [];
         this.backDelta = 0;
+        this.tabs = {};
+        this.methodName = '';
     }
     set delta(delta) {
         if (delta > 0) {
@@ -17,6 +19,12 @@ class Stacks {
     get delta() {
         return this.backDelta;
     }
+    set method(methodName) {
+        this.methodName = methodName;
+    }
+    get method() {
+        return this.methodName;
+    }
     get length() {
         return this.stacks.length;
     }
@@ -54,6 +62,20 @@ class Stacks {
     push(page) {
         return this.stacks.push(page);
     }
+    getTabs() {
+        return this.tabs;
+    }
+    pushTab(path) {
+        this.tabs[path] = this.last;
+        this.pop();
+    }
+    popTab(path) {
+        this.push(this.tabs[path]);
+        delete this.tabs[path];
+    }
+    removeTab(path) {
+        delete this.tabs[path];
+    }
 }
 const stacks = new Stacks();
 export default stacks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "3.5.7",
+  "version": "3.5.9",
   "description": "Taro-router",
   "browser": "dist/index.esm.js",
   "main:h5": "dist/index.js",
@@ -22,13 +22,13 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/runtime": "3.5.7",
-    "@tarojs/taro": "3.5.7",
     "dingtalk-jsapi": "~2.15.2",
     "history": "^5.1.0",
     "mobile-detect": "^1.4.2",
     "query-string": "^7.1.1",
-    "universal-router": "^8.3.0"
+    "universal-router": "^8.3.0",
+    "@tarojs/runtime": "3.5.9",
+    "@tarojs/taro": "3.5.9"
   },
   "scripts": {
     "build": "rimraf ./dist && tsc && rollup -c",