@tarojs/router 4.0.0-beta.8 → 4.0.0-beta.80

package/dist/api.js

@@ -1,11 +1,13 @@
 import { __awaiter } from 'tslib';
 import { addLeadingSlash } from '@tarojs/runtime';
+import { EventChannel } from '@tarojs/shared';
 import { parsePath } from 'history';
 import { history, prependBasename } from './history.js';
 import { RouterConfig } from './router/index.js';
 import stacks from './router/stack.js';
 import { routesAlias } from './utils/index.js';
 
+const routeEvtChannel = EventChannel.routeChannel;
 function processNavigateUrl(option) {
     var _a;
     const pathPieces = parsePath(option.url);
@@ -37,6 +39,10 @@ function navigate(option, method) {
             const { success, complete, fail } = option;
             const unListen = history.listen(() => {
                 const res = { errMsg: `${method}:ok` };
+                if (method === 'navigateTo') {
+                    res.eventChannel = routeEvtChannel;
+                    routeEvtChannel.addEvents(option.events);
+                }
                 success === null || success === void 0 ? void 0 : success(res);
                 complete === null || complete === void 0 ? void 0 : complete(res);
                 resolve(res);
@@ -46,6 +52,20 @@ function navigate(option, method) {
                 if ('url' in option) {
                     const pathPieces = processNavigateUrl(option);
                     const state = { timestamp: Date.now() };
+                    if (pathPieces.pathname) {
+                        const originPath = routesAlias.getOrigin(pathPieces.pathname);
+                        if (!RouterConfig.isPage(addLeadingSlash(originPath)) && !RouterConfig.isPage(addLeadingSlash(pathPieces.pathname))) {
+                            const res = { errMsg: `${method}:fail page ${originPath} is not found` };
+                            fail === null || fail === void 0 ? void 0 : fail(res);
+                            complete === null || complete === void 0 ? void 0 : complete(res);
+                            if (fail || complete) {
+                                return resolve(res);
+                            }
+                            else {
+                                return reject(res);
+                            }
+                        }
+                    }
                     if (method === 'navigateTo') {
                         history.push(pathPieces, state);
                     }
@@ -71,7 +91,12 @@ function navigate(option, method) {
                 const res = { errMsg: `${method}:fail ${error.message || error}` };
                 fail === null || fail === void 0 ? void 0 : fail(res);
                 complete === null || complete === void 0 ? void 0 : complete(res);
-                reject(res);
+                if (fail || complete) {
+                    return resolve(res);
+                }
+                else {
+                    return reject(res);
+                }
             }
         });
     });

package/dist/events/resize.js

@@ -2,12 +2,18 @@ let pageResizeFn;
 function bindPageResize(page) {
     pageResizeFn && window.removeEventListener('resize', pageResizeFn);
     pageResizeFn = function () {
-        page.onResize && page.onResize({
-            size: {
-                windowHeight: window.innerHeight,
-                windowWidth: window.innerWidth
-            }
-        });
+        if (page.onResize) {
+            const mediaQuery = window.matchMedia('(orientation: portrait)');
+            page.onResize({
+                deviceOrientation: mediaQuery.matches ? 'portrait' : 'landscape',
+                size: {
+                    windowHeight: window.innerHeight,
+                    windowWidth: window.innerWidth,
+                    screenHeight: window.screen.height,
+                    screenWidth: window.screen.width,
+                }
+            });
+        }
     };
     window.addEventListener('resize', pageResizeFn, false);
 }

package/dist/history.js

@@ -1,3 +1,4 @@
+import { addLeadingSlash } from '@tarojs/runtime';
 import { createBrowserHistory, createHashHistory, Action } from 'history';
 export { createBrowserHistory, createHashHistory } from 'history';
 import { RouterConfig } from './router/index.js';
@@ -25,14 +26,14 @@ class MpaHistory {
     }
     parseUrl(to) {
         let url = to.pathname || '';
-        if (RouterConfig.isPage(url)) {
+        if (RouterConfig.isPage(addLeadingSlash(url))) {
             url += '.html';
         }
         if (to.search) {
             url += `?${to.search}`;
         }
         if (to.hash) {
-            url += `#${to.hash}`;
+            url += to.hash.startsWith('#') ? to.hash : `#${to.hash}`;
         }
         return url;
     }

package/dist/index.cjs.d.ts

@@ -54,7 +54,13 @@ declare class RoutesAlias {
 declare const routesAlias: RoutesAlias;
 declare const isWeixin: () => boolean;
 declare const isDingTalk: () => boolean;
-declare function setTitle(title: string): Promise<string>;
+declare function setMpaTitle(title: string): void;
+declare function setTitle(title: string): void;
+declare function setNavigationBarStyle(option: {
+    backgroundColor: string;
+    frontColor: string;
+}): void;
+declare function setNavigationBarLoading(loading: boolean): void;
 declare function handleAppMount(config: SpaRouterConfig | MpaRouterConfig, _: History, appId?: string): void;
 declare function handleAppMountWithTabbar(config: SpaRouterConfig | MpaRouterConfig, history: History, appId?: string): void;
-export { navigateTo, redirectTo, navigateBack, switchTab, reLaunch, getCurrentPages, history, setHistory, createMpaHistory, createBrowserHistory, createHashHistory, setHistoryMode, prependBasename, createMultiRouter, createRouter, routesAlias, isWeixin, isDingTalk, setTitle, handleAppMount, handleAppMountWithTabbar };
+export { navigateTo, redirectTo, navigateBack, switchTab, reLaunch, getCurrentPages, history, setHistory, createMpaHistory, createBrowserHistory, createHashHistory, setHistoryMode, prependBasename, createMultiRouter, createRouter, routesAlias, isWeixin, isDingTalk, setMpaTitle, setTitle, setNavigationBarStyle, setNavigationBarLoading, handleAppMount, handleAppMountWithTabbar };