@lemon-fe/mini-app 1.1.3 → 1.1.5

package/es/constants/index.d.ts

@@ -2,7 +2,6 @@ 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";
@@ -10,7 +9,6 @@ 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";
 export declare const SYNC_ROUTES = "SYNC_ROUTES";
 export declare const NEXT_ACTION = "NEXT_ACTION";
 export declare const REQUEST_PAYMENT = "REQUEST_PAYMENT";

package/es/constants/index.js

@@ -1,8 +1,7 @@
 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 INIT_IFRAME = 'INIT_IFRAME'; // methods
 
 export var SCAN_CODE = 'SCAN_CODE';
 export var EXIT = 'EXIT';
@@ -11,7 +10,6 @@ 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';
 export var SYNC_ROUTES = 'SYNC_ROUTES';
 export var NEXT_ACTION = 'NEXT_ACTION';
 export var REQUEST_PAYMENT = 'REQUEST_PAYMENT';

package/es/global.d.ts

@@ -4,6 +4,7 @@ declare global {
         mini?: Partial<typeof bridge>;
         ReactNativeWebView?: {
             postMessage: (e: string) => void;
+            injectedObjectJson?: () => string;
         };
     }
 }
@@ -18,7 +19,15 @@ declare const bridge: {
             left: number;
         };
     };
-    getExtraPayload(): any;
+    getExtraPayload(): {};
+    getMenuButtonBoundingClientRect(): {
+        bottom: number;
+        height: number;
+        left: number;
+        right: number;
+        top: number;
+        width: number;
+    };
     methodRegister(name: string, opts?: {
         success?: ((value: any) => void) | undefined;
         fail?: ((err: Error) => void) | undefined;
@@ -106,7 +115,15 @@ export declare const mini: {
             left: number;
         };
     };
-    getExtraPayload: () => any;
+    getExtraPayload: () => {};
+    getMenuButtonBoundingClientRect: () => {
+        bottom: number;
+        height: number;
+        left: number;
+        right: number;
+        top: number;
+        width: number;
+    };
     methodRegister: (name: string, opts?: {
         success?: ((value: any) => void) | undefined;
         fail?: ((err: Error) => void) | undefined;

package/es/global.js

@@ -4,14 +4,26 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { CHECK_ACCESS_TOKEN, EXIT, GET_ACCESS_TOKEN, GET_USER_INFO, INIT_IFRAME, LEMON_APP_EXTRA_PAYLOAD, METHOD, METHOD_CALLBACK, NAVIGATE, NEXT_ACTION, REQUEST_PAYMENT, SCAN_CODE, SET_CAPSULE, SET_EXTRA_PAYLOAD, SET_STATUS_BAR_STYLE, SYNC_ROUTES } from './constants';
-var whiteList = ['localhost', 'csp.nhsoft.cn', '127.0.0.1'];
+import { CHECK_ACCESS_TOKEN, EXIT, GET_ACCESS_TOKEN, GET_USER_INFO, INIT_IFRAME, METHOD, METHOD_CALLBACK, NAVIGATE, NEXT_ACTION, REQUEST_PAYMENT, SCAN_CODE, SET_CAPSULE, SET_STATUS_BAR_STYLE, SYNC_ROUTES } from './constants';
 var methods = {};
 var listeners = [];
 var methodID = 0;
+
+function getInjectedObject(key, defaultValue) {
+  var _window$ReactNativeWe, _window$ReactNativeWe2;
+
+  var data = (_window$ReactNativeWe = window.ReactNativeWebView) === null || _window$ReactNativeWe === void 0 ? void 0 : (_window$ReactNativeWe2 = _window$ReactNativeWe.injectedObjectJson) === null || _window$ReactNativeWe2 === void 0 ? void 0 : _window$ReactNativeWe2.call(_window$ReactNativeWe);
+
+  if (data) {
+    return JSON.parse(data)[key] || defaultValue;
+  }
+
+  return defaultValue;
+}
+
 var bridge = {
   getSystemInfoSync: function getSystemInfoSync() {
-    return {
+    return getInjectedObject('systemInfo', {
       statusBarHeight: 0,
       pixelRatio: 1,
       safeArea: {
@@ -20,20 +32,30 @@ var bridge = {
         bottom: 0,
         left: 0
       }
-    };
+    });
   },
   getExtraPayload: function getExtraPayload() {
-    return JSON.parse(window.localStorage.getItem('LEMON_APP_EXTRA_PAYLOAD') || '{}');
+    return getInjectedObject('extraPayload', {});
+  },
+  getMenuButtonBoundingClientRect: function getMenuButtonBoundingClientRect() {
+    return getInjectedObject('menuButtonBoundingClientRect', {
+      bottom: 0,
+      height: 0,
+      left: 0,
+      right: 0,
+      top: 0,
+      width: 0
+    });
   },
   methodRegister: function methodRegister(name) {
-    var _window$ReactNativeWe;
+    var _window$ReactNativeWe3;
 
     var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     methods[methodID] = {
       success: opts.success,
       fail: opts.fail
     };
-    (_window$ReactNativeWe = window.ReactNativeWebView) === null || _window$ReactNativeWe === void 0 ? void 0 : _window$ReactNativeWe.postMessage(JSON.stringify({
+    (_window$ReactNativeWe3 = window.ReactNativeWebView) === null || _window$ReactNativeWe3 === void 0 ? void 0 : _window$ReactNativeWe3.postMessage(JSON.stringify({
       type: METHOD,
       target: {
         id: methodID,
@@ -168,10 +190,25 @@ window.mini = mini;
  * init web
  */
 
-if (new URLSearchParams(window.location.search).has('__APP_DEV_TOOLS__')) {
+var urlSearch = new URLSearchParams(window.location.search);
+
+if (urlSearch.has('__APP_DEV_TOOLS__')) {
+  var _injectedObjectJson = '{}';
+
+  if (urlSearch.has('__INJECTED_OBJECT_JSON__')) {
+    try {
+      _injectedObjectJson = window.atob(urlSearch.get('__INJECTED_OBJECT_JSON__'));
+    } catch (err) {
+      console.log('解析注入属性失败');
+    }
+  }
+
   window.ReactNativeWebView = {
     postMessage: function postMessage(e) {
       window.parent.postMessage(e, '*');
+    },
+    injectedObjectJson: function injectedObjectJson() {
+      return _injectedObjectJson;
     }
   };
   mini.loaded = true;
@@ -193,27 +230,19 @@ if (new URLSearchParams(window.location.search).has('__APP_DEV_TOOLS__')) {
     }
   }), '*');
   window.addEventListener('message', function (evt) {
-    var result = /^(([^:\/\s]+):\/?\/?([^\/\s@]*@)?([^\/@:]*)?:?(\d+)?)?(\/[^?]*)?(\?([^#]*))?(#[\s\S]*)?$/.exec(evt.origin);
-
-    if (result !== null && whiteList.includes(result[4])) {
-      var action = 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;
+    switch (action.type) {
+      case METHOD_CALLBACK:
+        var msg = action.payload;
 
-        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:
-      }
+      default:
     }
   }, false);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/mini-app",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -31,5 +31,5 @@
     "react": "^17.0.2",
     "react-dom": "17.0.2"
   },
-  "gitHead": "2301a8e638df65f17134fc3a58f0369ab2210c35"
+  "gitHead": "e4b6e1f4d04b766d37ab7e5914bc7a5e02f0eb9c"
 }