@tarojs/router 3.6.22-nightly.0 → 3.6.22

package/dist/router/spa.js

@@ -48,7 +48,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, _h;
+        var _c, _d, _e, _f, _g, _h, _j, _k, _l;
         handler.pathname = decodeURI(location.pathname);
         if ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll)
             window.scrollTo(0, 0);
@@ -77,22 +77,35 @@ export function createRouter(app, config, framework) {
                 window.location.reload();
             }
             else {
-                throw new Error(error);
+                throw error;
             }
         }
         if (!element)
             return;
         const pageConfig = handler.pageConfig;
         let enablePullDownRefresh = ((_e = config === null || config === void 0 ? void 0 : config.window) === null || _e === void 0 ? void 0 : _e.enablePullDownRefresh) || false;
+        let navigationStyle = ((_f = config === null || config === void 0 ? void 0 : config.window) === null || _f === void 0 ? void 0 : _f.navigationStyle) || 'default';
+        let navigationBarTextStyle = ((_g = config === null || config === void 0 ? void 0 : config.window) === null || _g === void 0 ? void 0 : _g.navigationBarTextStyle) || 'white';
+        let navigationBarBackgroundColor = ((_h = config === null || config === void 0 ? void 0 : config.window) === null || _h === void 0 ? void 0 : _h.navigationBarBackgroundColor) || '#000000';
         if (pageConfig) {
-            setTitle((_f = pageConfig.navigationBarTitleText) !== null && _f !== void 0 ? _f : document.title);
+            setTitle((_j = pageConfig.navigationBarTitleText) !== null && _j !== void 0 ? _j : document.title);
             if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
                 enablePullDownRefresh = pageConfig.enablePullDownRefresh;
             }
+            if (typeof pageConfig.navigationStyle === 'string') {
+                navigationStyle = pageConfig.navigationStyle;
+            }
+            if (typeof pageConfig.navigationBarTextStyle === 'string') {
+                navigationBarTextStyle = pageConfig.navigationBarTextStyle;
+            }
+            if (typeof pageConfig.navigationBarBackgroundColor === 'string') {
+                navigationBarBackgroundColor = pageConfig.navigationBarBackgroundColor;
+            }
         }
+        eventCenter.trigger('__taroSetNavigationStyle', navigationStyle, navigationBarTextStyle, navigationBarBackgroundColor);
         const currentPage = Current.page;
         const pathname = handler.pathname;
-        const methodName = (_g = stacks.method) !== null && _g !== void 0 ? _g : '';
+        const methodName = (_k = stacks.method) !== null && _k !== void 0 ? _k : '';
         const cacheTabs = stacks.getTabs();
         let shouldLoad = false;
         stacks.method = '';
@@ -158,7 +171,7 @@ export function createRouter(app, config, framework) {
             shouldLoad = true;
         }
         if (shouldLoad || stacks.length < 1) {
-            const el = (_h = element.default) !== null && _h !== void 0 ? _h : element;
+            const el = (_l = element.default) !== null && _l !== void 0 ? _l : element;
             const loadConfig = Object.assign({}, pageConfig);
             const stacksIndex = stacks.length;
             delete loadConfig['path'];

package/dist/style.d.ts

@@ -6,3 +6,4 @@ export declare function loadAnimateStyle(ms?: number): void;
  * 插入路由相关样式
  */
 export declare function loadRouterStyle(usingWindowScroll: boolean): void;
+export declare function addStyle(css: any): void;

package/dist/style.js

@@ -63,7 +63,7 @@ export function loadRouterStyle(usingWindowScroll) {
 `;
     addStyle(css);
 }
-function addStyle(css) {
+export function addStyle(css) {
     if (!css)
         return;
     const style = document.createElement('style');

package/dist/utils/navigate.d.ts

@@ -1,5 +1,3 @@
-import MobileDetect from 'mobile-detect';
-export declare function getMobileDetect(): MobileDetect;
+export declare const isWeixin: () => boolean;
+export declare const isDingTalk: () => boolean;
 export declare function setTitle(title: string): Promise<string>;
-export declare function isWeixin(): boolean;
-export declare function isDingTalk(): boolean;

package/dist/utils/navigate.js

@@ -7,16 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import MobileDetect from 'mobile-detect';
-let md;
 let preTitle = document.title;
 let isLoadDdEntry = false;
-export function getMobileDetect() {
-    if (!md) {
-        md = new MobileDetect(navigator.userAgent);
-    }
-    return md;
-}
+export const isWeixin = () => !!navigator.userAgent.match(/\bMicroMessenger\b/ig);
+export const isDingTalk = () => !!navigator.userAgent.match(/\bDingTalk\b/ig);
 export function setTitle(title) {
     return __awaiter(this, void 0, void 0, function* () {
         if (preTitle === title)
@@ -34,11 +28,3 @@ export function setTitle(title) {
         return title;
     });
 }
-export function isWeixin() {
-    const md = getMobileDetect();
-    return md.match(/MicroMessenger/ig);
-}
-export function isDingTalk() {
-    const md = getMobileDetect();
-    return md.match(/DingTalk/ig);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "3.6.22-nightly.0",
+  "version": "3.6.22",
   "description": "Taro-router",
   "browser": "dist/index.esm.js",
   "main:h5": "dist/index.js",
@@ -27,8 +27,8 @@
     "mobile-detect": "^1.4.2",
     "query-string": "^7.1.1",
     "universal-router": "^8.3.0",
-    "@tarojs/taro": "3.6.22-nightly.0",
-    "@tarojs/runtime": "3.6.22-nightly.0"
+    "@tarojs/runtime": "3.6.22",
+    "@tarojs/taro": "3.6.22"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^20.0.0",