@lemon-fe/mini-app 0.1.29 → 0.1.32

package/es/components/AppContainer/{index.less → index.css}

@@ -10,11 +10,15 @@
 }
 
 .lemon-transition-enter-active {
-  box-shadow: 0 0 20px #eee;
   transform: translate3d(0, 0, 0);
+  transition: transform 300ms;
 }
 
 .lemon-transition-exit {
-  box-shadow: 0 0 20px #eee;
-  transform: translate3d(100%, 0, 0);
+  transform: translate3d(0, 0, 0);
 }
+
+.lemon-transition-exit-active {
+  transform: translate3d(100%, 0, 0);
+  transition: transform 300ms;
+}

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

@@ -1,6 +1,6 @@
 import { CSSProperties, ReactElement } from 'react';
 import type { NavigationStackScreen } from '../../typings';
-import './index.less';
+import './index.css';
 interface Props {
     pages: NavigationStackScreen[];
     children?: ReactElement | null;

package/es/components/AppContainer/index.js

@@ -25,14 +25,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { cloneElement, useCallback, useEffect, useMemo, useState } from 'react';
-import { CSSTransition, TransitionGroup } from 'react-transition-group';
+import { TransitionGroup } from 'react-transition-group';
 import { parsePath } from '../../utils/path';
 import { NavigationContext } from '../../context';
 import Screen from '../Screen';
 import { GO_BACK } from '../../constants';
 import { mini } from '../../global';
 import Capsule from '../Capsule';
-import './index.less';
+import './index.css';
 
 function App(props) {
   var pages = props.pages,
@@ -126,19 +126,16 @@ function App(props) {
   var screens = /*#__PURE__*/React.createElement(TransitionGroup, {
     className: "lemon-routes"
   }, state.routes.map(function (item, index) {
-    return /*#__PURE__*/React.createElement(CSSTransition, {
+    return /*#__PURE__*/React.createElement(Screen, {
       key: item.route.path,
-      timeout: 300,
-      classNames: "lemon-transition"
-    }, /*#__PURE__*/React.createElement(Screen, {
       route: item.route,
       params: item.params,
       index: index
-    }));
+    });
   }));
   return /*#__PURE__*/React.createElement(NavigationContext.Provider, {
     value: ctx
-  }, children ? /*#__PURE__*/cloneElement(children, {}, screens) : screens, process.env.NODE_ENV === 'development' && /*#__PURE__*/React.createElement(Capsule, null));
+  }, children ? /*#__PURE__*/cloneElement(children, {}, screens) : screens, window.ReactNativeWebView === undefined && /*#__PURE__*/React.createElement(Capsule, null));
 }
 
 export default App;

package/es/components/Capsule/index.css

@@ -0,0 +1,21 @@
+.lemon-capsule {
+  position: fixed;
+  top: calc(env(safe-area-inset-top) + 7px);
+  right: 15px;
+  height: 30px;
+  background-color: rgba(255, 255, 255, 0.6);
+  border: 1px solid rgba(151, 151, 151, 0.2);
+  border-radius: 15px;
+}
+
+.lemon-capsule-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 44px;
+  height: 100%;
+}
+
+.lemon-capsule-item:active {
+  opacity: 0.5;
+}

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

@@ -1,2 +1,2 @@
-import './index.less';
+import './index.css';
 export default function Capsule(): JSX.Element;

package/es/components/Capsule/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import './index.less';
+import './index.css';
 export default function Capsule() {
   var generateCode = function generateCode() {
     var url = "nhsoft://external-apps?url=".concat(encodeURIComponent(window.location.href));

package/es/components/Screen/index.css

@@ -8,7 +8,6 @@
   flex-direction: column;
   color: #333;
   background-color: #fff;
-  transition: transform 300ms;
 }
 
 .lemon-route-header {

package/es/components/Screen/index.js

@@ -1,10 +1,17 @@
+var _excluded = ["route", "params", "index"];
+
 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; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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 React, { createElement, memo, useContext, useMemo } from 'react';
+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 { CSSTransition } from 'react-transition-group';
 import { NavigationContext, ScreenContext } from '../../context';
 import { mini } from '../../global';
 import './index.css';
@@ -12,7 +19,9 @@ import './index.css';
 function Screen(props) {
   var route = props.route,
       params = props.params,
-      index = props.index;
+      index = props.index,
+      restProps = _objectWithoutProperties(props, _excluded);
+
   var ctx = useMemo(function () {
     return {
       params: params
@@ -26,10 +35,16 @@ function Screen(props) {
       navigation = _useContext.navigation,
       headerStyle = _useContext.headerStyle;
 
-  return /*#__PURE__*/React.createElement(ScreenContext.Provider, {
+  var ref = useRef(null);
+  return /*#__PURE__*/React.createElement(CSSTransition, _objectSpread({
+    timeout: 300,
+    classNames: "lemon-transition",
+    nodeRef: ref
+  }, restProps), /*#__PURE__*/React.createElement(ScreenContext.Provider, {
     value: ctx
   }, /*#__PURE__*/React.createElement("div", {
-    className: "lemon-route"
+    className: "lemon-route",
+    ref: ref
   }, /*#__PURE__*/React.createElement("div", {
     className: "lemon-route-header",
     style: _objectSpread(_objectSpread({
@@ -55,7 +70,7 @@ function Screen(props) {
     className: "lemon-route-header-center"
   }, route.title))), /*#__PURE__*/React.createElement("div", {
     className: "lemon-route-body"
-  }, /*#__PURE__*/createElement(route.screen))));
+  }, /*#__PURE__*/createElement(route.screen)))));
 }
 
 export default /*#__PURE__*/memo(Screen);

package/es/global.d.ts

@@ -1,3 +1,4 @@
+import { UserInfo } from './typings';
 interface Mini {
     getSystemInfoSync(): {
         statusBarHeight: number;
@@ -20,12 +21,7 @@ interface Mini {
     }): void;
     exit(): void;
     getUserInfo(opt: {
-        success?: (user: {
-            id: number;
-            companyId: number;
-            roleNames: string[];
-            branchIds: number[];
-        }) => void;
+        success?: (user: UserInfo) => void;
     }): void;
 }
 declare global {

package/es/index.d.ts

@@ -1,4 +1,4 @@
 export * from './global';
 export { AppContainer } from './components';
 export * from './hooks';
-export type { NavigationStackScreen, Path } from './typings';
+export type { NavigationStackScreen, Path, UserInfo } from './typings';

package/es/typings.d.ts

@@ -12,3 +12,10 @@ export interface Path {
   search: string;
   hash: string;
 }
+
+export interface UserInfo {
+  id: number;
+  companyId: number;
+  roleNames: string[];
+  branchIds: number[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/mini-app",
-  "version": "0.1.29",
+  "version": "0.1.32",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -34,5 +34,5 @@
     "@types/react-transition-group": "^4.4.4",
     "color-string": "^1.9.0"
   },
-  "gitHead": "76eb517b4b3fa047aa55e61f1793a0ffa8cfb2c5"
+  "gitHead": "d64677a7dc2001d4180fa3014d9ad5bfce870c7e"
 }

package/es/components/Capsule/index.less

@@ -1,21 +0,0 @@
-.lemon-capsule {
-  position: fixed;
-  top: 7px;
-  right: 15px;
-  height: 30px;
-  background-color: rgba(255, 255, 255, 0.6);
-  border: 1px solid rgba(151, 151, 151, 0.2);
-  border-radius: 15px;
-
-  &-item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 44px;
-    height: 100%;
-  }
-
-  &:active {
-    opacity: 0.5;
-  }
-}