@lemon-fe/mini-app 0.1.102 → 0.1.103

package/es/components/AppContainer/index.js

@@ -94,6 +94,55 @@ function App(props) {
       return prev;
     });
   }, []);
+  var replace = useCallback(function (path, otherParams) {
+    setState(function (prev) {
+      var routes = prev.routes;
+
+      var _parsePath2 = parsePath(path),
+          pathname = _parsePath2.pathname,
+          search = _parsePath2.search;
+
+      var params = search ? Object.fromEntries(Array.from(new URLSearchParams(search).entries())) : {};
+      Object.assign(params, otherParams);
+      var routeIndex = routes.findIndex(function (item) {
+        return item.route.path === pathname;
+      });
+
+      if (routeIndex >= 0) {
+        var nextRoutes = routes.slice(0, routeIndex + 1);
+        nextRoutes[routeIndex] = _objectSpread(_objectSpread({}, routes[routeIndex]), {}, {
+          params: params
+        });
+        return {
+          routes: nextRoutes
+        };
+      }
+
+      var page = pages.find(function (item) {
+        return item.path === pathname;
+      });
+
+      if (page !== undefined) {
+        var newRoute = {
+          route: page,
+          params: params
+        };
+
+        if (routes.length <= 0) {
+          return {
+            routes: [newRoute]
+          };
+        }
+
+        console.log(routes.slice(0, -1).concat(newRoute));
+        return {
+          routes: routes.slice(0, -1).concat(newRoute)
+        };
+      }
+
+      return prev;
+    });
+  }, []);
   var goBack = useCallback(function () {
     setState(function (prev) {
       var nextRoutes = _toConsumableArray(prev.routes);
@@ -125,11 +174,12 @@ function App(props) {
     return {
       navigation: {
         navigate: navigate,
-        goBack: goBack
+        goBack: goBack,
+        replace: replace
       },
       headerStyle: headerStyle
     };
-  }, [navigate, goBack, headerStyle]);
+  }, [navigate, goBack, replace, headerStyle]);
   var screens = /*#__PURE__*/React.createElement(TransitionGroup, {
     className: "lemon-routes"
   }, state.routes.map(function (item, index) {

package/es/constants/index.d.ts

@@ -1 +1,13 @@
 export declare const GO_BACK = "GO_BACK";
+export declare const METHOD = "METHOD";
+export declare const METHOD_CALLBACK = "METHOD_CALLBACK";
+export declare const INIT_IFRAME = "INIT_IFRAME";
+export declare const LEMON_APP_EXTRA_PAYLOAD = "LEMON_APP_EXTRA_PAYLOAD";
+export declare const SCAN_CODE = "SCAN_CODE";
+export declare const EXIT = "EXIT";
+export declare const SET_STATUS_BAR_STYLE = "SET_STATUS_BAR_STYLE";
+export declare const GET_USER_INFO = "GET_USER_INFO";
+export declare const GET_ACCESS_TOKEN = "GET_ACCESS_TOKEN";
+export declare const CHECK_ACCESS_TOKEN = "CHECK_ACCESS_TOKEN";
+export declare const SET_CAPSULE = "SET_CAPSULE";
+export declare const SET_EXTRA_PAYLOAD = "SET_EXTRA_PAYLOAD";

package/es/constants/index.js

@@ -1 +1,14 @@
-export var GO_BACK = 'GO_BACK';
+export var GO_BACK = 'GO_BACK';
+export var METHOD = 'METHOD';
+export var METHOD_CALLBACK = 'METHOD_CALLBACK';
+export var INIT_IFRAME = 'INIT_IFRAME';
+export var LEMON_APP_EXTRA_PAYLOAD = 'LEMON_APP_EXTRA_PAYLOAD'; // methods
+
+export var SCAN_CODE = 'SCAN_CODE';
+export var EXIT = 'EXIT';
+export var SET_STATUS_BAR_STYLE = 'SET_STATUS_BAR_STYLE';
+export var GET_USER_INFO = 'GET_USER_INFO';
+export var GET_ACCESS_TOKEN = 'GET_ACCESS_TOKEN';
+export var CHECK_ACCESS_TOKEN = 'CHECK_ACCESS_TOKEN';
+export var SET_CAPSULE = 'SET_CAPSULE';
+export var SET_EXTRA_PAYLOAD = 'SET_EXTRA_PAYLOAD';

package/es/context/index.d.ts

@@ -3,6 +3,7 @@ export declare const NavigationContext: import("react").Context<{
     navigation: {
         navigate: (path: string, params?: Record<string, any> | undefined) => void;
         goBack: () => void;
+        replace: (path: string, params?: Record<string, any> | undefined) => void;
     };
     headerStyle?: CSSProperties | undefined;
 }>;

package/es/context/index.js

@@ -2,7 +2,8 @@ import { createContext } from 'react';
 export var NavigationContext = /*#__PURE__*/createContext({
   navigation: {
     navigate: function navigate() {},
-    goBack: function goBack() {}
+    goBack: function goBack() {},
+    replace: function replace() {}
   }
 });
 export var ScreenContext = /*#__PURE__*/createContext({

package/es/global.d.ts

@@ -1,10 +1,10 @@
-import { UserInfo } from './typings';
+import type { UserInfo } from './typings';
 declare global {
     interface Window {
+        mini?: typeof mini;
         ReactNativeWebView?: {
-            postMessage(e: string): void;
+            postMessage: (e: string) => void;
         };
-        mini?: typeof mini;
     }
 }
 export declare const mini: {
@@ -19,7 +19,7 @@ export declare const mini: {
             left: number;
         };
     };
-    getExtraPayload(): unknown;
+    getExtraPayload(): any;
     methodRegister(name: string, opts?: {
         success?: ((value: any) => void) | undefined;
         fail?: ((err: Error) => void) | undefined;

package/es/global.js

@@ -1,6 +1,8 @@
-var methodID = 0;
+import { CHECK_ACCESS_TOKEN, EXIT, GET_ACCESS_TOKEN, GET_USER_INFO, INIT_IFRAME, LEMON_APP_EXTRA_PAYLOAD, METHOD, METHOD_CALLBACK, SCAN_CODE, SET_CAPSULE, SET_EXTRA_PAYLOAD, SET_STATUS_BAR_STYLE } from './constants';
 var methods = {};
 var listeners = [];
+var methodID = 0;
+var whiteList = ['localhost', 'csp.nhsoft.cn', '127.0.0.1'];
 export var mini = {
   loaded: false,
   getSystemInfoSync: function getSystemInfoSync() {
@@ -16,23 +18,22 @@ export var mini = {
     };
   },
   getExtraPayload: function getExtraPayload() {
-    return;
+    return JSON.parse(window.localStorage.getItem('LEMON_APP_EXTRA_PAYLOAD') || '{}');
   },
   methodRegister: function methodRegister(name) {
     var _window$ReactNativeWe;
 
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var mOpts = opts || {};
     methods[methodID] = {
-      success: mOpts.success,
-      fail: mOpts.fail
+      success: opts.success,
+      fail: opts.fail
     };
     (_window$ReactNativeWe = window.ReactNativeWebView) === null || _window$ReactNativeWe === void 0 ? void 0 : _window$ReactNativeWe.postMessage(JSON.stringify({
-      type: 'METHOD',
+      type: METHOD,
       target: {
         id: methodID,
         name: name,
-        params: mOpts.params
+        params: opts.params
       }
     }));
 
@@ -78,25 +79,25 @@ export var mini = {
     });
   },
   scanCode: function scanCode(opts) {
-    mini.methodRegister('SCAN_CODE', opts);
+    mini.methodRegister(SCAN_CODE, opts);
   },
   exit: function exit() {
-    mini.methodRegister('EXIT');
+    mini.methodRegister(EXIT);
   },
   setStatusBarStyle: function setStatusBarStyle(opts) {
-    mini.methodRegister('SET_STATUS_BAR_STYLE', opts);
+    mini.methodRegister(SET_STATUS_BAR_STYLE, opts);
   },
   getUserInfo: function getUserInfo(opts) {
-    mini.methodRegister('GET_USER_INFO', opts);
+    mini.methodRegister(GET_USER_INFO, opts);
   },
   getAccessToken: function getAccessToken(opts) {
-    mini.methodRegister('GET_ACCESS_TOKEN', opts);
+    mini.methodRegister(GET_ACCESS_TOKEN, opts);
   },
   checkAccessToken: function checkAccessToken(opts) {
-    mini.methodRegister('CHECK_ACCESS_TOKEN', opts);
+    mini.methodRegister(CHECK_ACCESS_TOKEN, opts);
   },
   setCapsule: function setCapsule(opts) {
-    mini.methodRegister('SET_CAPSULE', {
+    mini.methodRegister(SET_CAPSULE, {
       params: opts
     });
   },
@@ -108,7 +109,7 @@ export var mini = {
    */
   listenScanCode: function listenScanCode(opts) {
     return mini.addListener(function (e, value) {
-      if (e === 'SCAN_CODE' && value) {
+      if (e === SCAN_CODE && value) {
         opts.success(value);
       }
     });
@@ -118,21 +119,49 @@ window.mini = mini;
 window.addEventListener('message', function (evt) {
   var result = /^(([^:\/\s]+):\/?\/?([^\/\s@]*@)?([^\/@:]*)?:?(\d+)?)?(\/[^?]*)?(\?([^#]*))?(#[\s\S]*)?$/.exec(evt.origin);
 
-  if (result !== null && (result[4] === 'localhost' || result[4] === 'csp.nhsoft.cn' || result[4] === '127.0.0.1')) {
-    if (evt.data === 'INIT_IFRAME') {
+  if (result !== null && whiteList.includes(result[4])) {
+    if (evt.data === INIT_IFRAME) {
       window.ReactNativeWebView = {
         postMessage: function postMessage(e) {
           window.parent.postMessage(e, '*');
         }
       };
       mini.loaded = true;
+      var nodeList = document.getElementsByTagName('link');
+      var favicon = undefined;
+
+      for (var i = 0; i < nodeList.length; i++) {
+        if (nodeList[i].getAttribute('rel') == 'icon' || nodeList[i].getAttribute('rel') == 'shortcut icon') {
+          favicon = nodeList[i].getAttribute('href');
+          break;
+        }
+      }
+
+      window.parent.postMessage(JSON.stringify({
+        type: INIT_IFRAME,
+        target: {
+          title: document.title,
+          icon: favicon
+        }
+      }), '*');
     } else {
-      var msg = JSON.parse(evt.data);
+      var action = evt.data;
+
+      switch (action.type) {
+        case SET_EXTRA_PAYLOAD:
+          window.localStorage.setItem(LEMON_APP_EXTRA_PAYLOAD, JSON.stringify(action.payload));
+          break;
+
+        case METHOD_CALLBACK:
+          var msg = action.payload;
+
+          if (msg.type === 'success') {
+            mini.methodSuccess(msg.id, msg.data);
+          } else {
+            mini.methodFail(msg.id, new Error(msg.data));
+          }
 
-      if (msg.type === 'success') {
-        mini.methodSuccess(msg.id, msg.data);
-      } else {
-        mini.methodFail(msg.id, new Error(msg.data));
+        default:
       }
     }
   }

package/es/hooks/index.d.ts

@@ -1,6 +1,7 @@
 export declare function useNavigation(): {
     navigate: (path: string, params?: Record<string, any> | undefined) => void;
     goBack: () => void;
+    replace: (path: string, params?: Record<string, any> | undefined) => void;
 };
 export declare function useParams<T extends Record<string, any> | void = void>(): T;
 export declare function useIsFocused(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/mini-app",
-  "version": "0.1.102",
+  "version": "0.1.103",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -35,5 +35,5 @@
     "react": "^17.0.2",
     "react-dom": "17.0.2"
   },
-  "gitHead": "57ac759d854789b6b3ca42b91014fffa6ed08720"
+  "gitHead": "b9730ec895f4fc20b1ff2ed94a4b974f2b62a49b"
 }