@lemon-fe/mini-app 0.1.57 → 0.1.70

package/es/components/AppContainer/index.js

@@ -117,11 +117,9 @@ function App(props) {
     });
   }, [goBack]);
   useEffect(function () {
-    if (!capsule) {
-      mini.setCapsule({
-        visible: false
-      });
-    }
+    mini.setCapsule({
+      visible: capsule
+    });
   }, []);
   var ctx = useMemo(function () {
     return {
@@ -139,7 +137,7 @@ function App(props) {
       key: item.route.path,
       route: item.route,
       params: item.params,
-      index: index
+      focused: index === state.routes.length - 1
     });
   }));
   return /*#__PURE__*/React.createElement(NavigationContext.Provider, {

package/es/components/Screen/index.d.ts

@@ -1,11 +1,9 @@
-import React from 'react';
 import type { NavigationStackScreen } from '../../typings';
 import './index.css';
 interface Props {
-    route: NavigationStackScreen;
     params?: Record<string, any>;
-    index: number;
+    focused: boolean;
+    route: NavigationStackScreen;
 }
-declare function Screen(props: Props): JSX.Element;
-declare const _default: React.MemoExoticComponent<typeof Screen>;
-export default _default;
+export default function Screen(props: Props): JSX.Element;
+export {};

package/es/components/Screen/index.js

@@ -1,4 +1,8 @@
-var _excluded = ["route", "params", "index"];
+var _excluded = ["params", "route", "focused"];
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -6,28 +10,15 @@ 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; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-import React, { createElement, memo, useContext, useMemo, useRef } from 'react';
+import React, { createElement, forwardRef, memo, useContext, useMemo, useRef } from 'react';
 import { CSSTransition } from 'react-transition-group';
 import { NavigationContext, ScreenContext } from '../../context';
 import { mini } from '../../global';
 import './index.css';
 import Portal from '../Portal';
 
-function Screen(props) {
-  var route = props.route,
-      params = props.params,
-      index = props.index,
-      restProps = _objectWithoutProperties(props, _excluded);
-
-  var ctx = useMemo(function () {
-    return {
-      params: params
-    };
-  }, [params]);
+function Content(props, ref) {
+  var route = props.route;
   var statusBarHeight = useMemo(function () {
     return mini.getSystemInfoSync().statusBarHeight;
   }, []);
@@ -36,17 +27,10 @@ function Screen(props) {
       navigation = _useContext.navigation,
       headerStyle = _useContext.headerStyle;
 
-  var ref = useRef(null);
   var node = useMemo(function () {
     return /*#__PURE__*/createElement(route.screen);
   }, [route.screen]);
-  return /*#__PURE__*/React.createElement(CSSTransition, _objectSpread({
-    timeout: 300,
-    classNames: "lemon-transition",
-    nodeRef: ref
-  }, restProps), /*#__PURE__*/React.createElement(ScreenContext.Provider, {
-    value: ctx
-  }, /*#__PURE__*/React.createElement(Portal.Host, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Portal.Host, null, /*#__PURE__*/React.createElement("div", {
     className: "lemon-route",
     ref: ref
   }, /*#__PURE__*/React.createElement("div", {
@@ -78,7 +62,31 @@ function Screen(props) {
     slot: "header-right"
   })))), /*#__PURE__*/React.createElement("div", {
     className: "lemon-route-body"
-  }, node)))));
+  }, node)));
 }
 
-export default /*#__PURE__*/memo(Screen);
+var MemoizedContent = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(Content));
+export default function Screen(props) {
+  var params = props.params,
+      route = props.route,
+      focused = props.focused,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var ref = useRef(null);
+  var ctx = useMemo(function () {
+    return {
+      params: params,
+      focused: focused
+    };
+  }, [params, focused]);
+  return /*#__PURE__*/React.createElement(CSSTransition, _objectSpread({
+    timeout: 300,
+    classNames: "lemon-transition",
+    nodeRef: ref
+  }, restProps), /*#__PURE__*/React.createElement(ScreenContext.Provider, {
+    value: ctx
+  }, /*#__PURE__*/React.createElement(MemoizedContent, {
+    route: route,
+    ref: ref
+  })));
+}

package/es/context/index.d.ts

@@ -8,4 +8,5 @@ export declare const NavigationContext: import("react").Context<{
 }>;
 export declare const ScreenContext: import("react").Context<{
     params?: Record<string, any> | undefined;
+    focused: boolean;
 }>;

package/es/context/index.js

@@ -5,4 +5,6 @@ export var NavigationContext = /*#__PURE__*/createContext({
     goBack: function goBack() {}
   }
 });
-export var ScreenContext = /*#__PURE__*/createContext({});
+export var ScreenContext = /*#__PURE__*/createContext({
+  focused: false
+});

package/es/global.d.ts

@@ -27,8 +27,8 @@ export declare const mini: {
     }): void;
     methodSuccess(id: number, value: unknown): void;
     methodFail(id: number, err: Error): void;
-    addListener(cb: (e: string) => void): () => void;
-    postMessage(e: string): void;
+    addListener(cb: (e: string, value?: string | undefined) => void): () => void;
+    postMessage(e: string, value?: string | undefined): void;
     scanCode(opts: {
         success: (value: string) => void;
     }): void;
@@ -46,5 +46,13 @@ export declare const mini: {
     setCapsule(opts: {
         visible: boolean;
     }): void;
+    /**
+     * 监听扫码事件，常用于effect中， 并且effec重新执行需要销毁上一次注册的监听器
+     * @param opts
+     * @returns 监听器销毁函数
+     */
+    listenScanCode(opts: {
+        success: (value: string) => void;
+    }): () => void;
 };
 export declare function createApp(render: () => void): void;

package/es/global.js

@@ -67,15 +67,14 @@ export var mini = {
   addListener: function addListener(cb) {
     listeners.push(cb);
     return function () {
-      var index = listeners.findIndex(function (item) {
+      listeners.splice(listeners.findIndex(function (item) {
         return item === cb;
-      });
-      listeners.splice(index, 1);
+      }), 1);
     };
   },
-  postMessage: function postMessage(e) {
+  postMessage: function postMessage(e, value) {
     listeners.forEach(function (item) {
-      item(e);
+      item(e, value);
     });
   },
   scanCode: function scanCode(opts) {
@@ -97,6 +96,19 @@ export var mini = {
     mini.methodRegister('SET_CAPSULE', {
       params: opts
     });
+  },
+
+  /**
+   * 监听扫码事件，常用于effect中， 并且effec重新执行需要销毁上一次注册的监听器
+   * @param opts
+   * @returns 监听器销毁函数
+   */
+  listenScanCode: function listenScanCode(opts) {
+    return mini.addListener(function (e, value) {
+      if (e === 'SCAN_CODE' && value) {
+        opts.success(value);
+      }
+    });
   }
 };
 window.mini = mini;

package/es/hooks/index.d.ts

@@ -3,3 +3,4 @@ export declare function useNavigation(): {
     goBack: () => void;
 };
 export declare function useParams<T extends Record<string, any> | void = void>(): T;
+export declare function useIsFocused(): boolean;

package/es/hooks/index.js

@@ -7,4 +7,8 @@ export function useNavigation() {
 export function useParams() {
   var ctx = useContext(ScreenContext);
   return ctx.params;
+}
+export function useIsFocused() {
+  var ctx = useContext(ScreenContext);
+  return ctx.focused;
 }

package/es/typings.d.ts

@@ -18,4 +18,8 @@ export interface UserInfo {
   companyId: number;
   roleNames: string[];
   branchIds: number[];
+  branch: {
+    id: number;
+    name: string;
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/mini-app",
-  "version": "0.1.57",
+  "version": "0.1.70",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -36,5 +36,5 @@
     "react": "^17.0.2",
     "react-dom": "17.0.2"
   },
-  "gitHead": "1eb27aafe8ba7a864d9d88ca5a8dc3d4da5dc582"
+  "gitHead": "46b0cf9ea5f30f15b92816311117cfb815a47330"
 }