@tarojs/taro-rn 3.3.12 → 3.3.16

package/dist/lib/chooseImage/index.js

@@ -1,5 +1,5 @@
 import SYImagePicker from 'react-native-syan-image-picker';
-import { shouleBeObject } from '../../utils';
+import { shouldBeObject } from '../../utils';
 import { showActionSheet } from '../showActionSheet';
 const res = { errMsg: 'chooseImage:ok' };
 const defaultOptions = {
@@ -128,7 +128,7 @@ function showImagePicker(options) {
  */
 export function chooseImage(options) {
     // options must be an Object
-    const isObject = shouleBeObject(options);
+    const isObject = shouldBeObject(options);
     if (!isObject.res) {
         const res = { errMsg: `chooseImage${isObject.msg}` };
         console.error(res.errMsg);

package/dist/lib/createVideoContext/index.js

@@ -52,10 +52,10 @@ class VideoContext {
      * 播放视频
      */
     play() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield ((_a = this.videoRef) === null || _a === void 0 ? void 0 : _a.playAsync());
+                yield ((_b = (_a = this.videoRef) === null || _a === void 0 ? void 0 : _a.playAsync) === null || _b === void 0 ? void 0 : _b.call(_a));
             }
             catch (e) {
                 console.log(e);

package/dist/lib/createVideoContext/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/createVideoContext/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,SAAS,GAAO,MAAM,CAAA;AAE5B,SAAS,CAAC,aAAa,GAAG,EAAE,CAAA;AAE5B,MAAM,YAAY;IAGhB,YAAa,QAAQ;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAED;;OAEG;IACG,cAAc;;;YAClB,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,uBAAuB,EAAE,CAAA,CAAA;aAC/C;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;OAGG;IACH,aAAa;QACX,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC5B,CAAC;IAED;;OAEG;IACG,KAAK;;;YACT,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,CAAA;aAClC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;OAEG;IACG,IAAI;;;YACR,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,SAAS,EAAE,CAAA,CAAA;aACjC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;OAGG;IACG,YAAY,CAAE,IAAY;;;YAC9B,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,YAAY,CAAC,IAAI,CAAC,CAAA,CAAA;aACxC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;;OAIG;IACG,iBAAiB;;;YACrB,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,uBAAuB,EAAE,CAAA,CAAA;aAC/C;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;OAGG;IACG,IAAI,CAAE,QAAgB;;;YAC1B,MAAM,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAA;YAC9B,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA,CAAA;aAC9C;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;;;;;OAOG;IACH,SAAS;QACP,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC5B,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC5B,CAAC;IAED;;OAEG;IACG,IAAI;;;YACR,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,SAAS,EAAE,CAAA,CAAA;aACjC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;CACF;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAE,EAAU,EAAE,CAA2B;IACzE,IAAI,GAAG,GAAG,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IACrC,IAAI,CAAC;QAAE,GAAG,GAAG,CAAC,CAAA;IACd,IAAI,GAAG,EAAE;QACP,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,CAAA;KAC7B;SAAM;QACL,OAAO,SAAS,CAAA;KACjB;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/createVideoContext/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,SAAS,GAAO,MAAM,CAAA;AAE5B,SAAS,CAAC,aAAa,GAAG,EAAE,CAAA;AAE5B,MAAM,YAAY;IAGhB,YAAa,QAAQ;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAED;;OAEG;IACG,cAAc;;;YAClB,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,uBAAuB,EAAE,CAAA,CAAA;aAC/C;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;OAGG;IACH,aAAa;QACX,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC5B,CAAC;IAED;;OAEG;IACG,KAAK;;;YACT,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,CAAA;aAClC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;OAEG;IACG,IAAI;;;YACR,IAAI;gBACF,MAAM,CAAA,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,SAAS,kDAAI,CAAA,CAAA;aACnC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;OAGG;IACG,YAAY,CAAE,IAAY;;;YAC9B,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,YAAY,CAAC,IAAI,CAAC,CAAA,CAAA;aACxC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;;OAIG;IACG,iBAAiB;;;YACrB,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,uBAAuB,EAAE,CAAA,CAAA;aAC/C;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;OAGG;IACG,IAAI,CAAE,QAAgB;;;YAC1B,MAAM,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAA;YAC9B,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA,CAAA;aAC9C;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;IAED;;;;;;;OAOG;IACH,SAAS;QACP,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC5B,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC5B,CAAC;IAED;;OAEG;IACG,IAAI;;;YACR,IAAI;gBACF,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,SAAS,EAAE,CAAA,CAAA;aACjC;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;;KACF;CACF;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAE,EAAU,EAAE,CAA0B;IACxE,IAAI,GAAG,GAAG,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IACrC,IAAI,CAAC;QAAE,GAAG,GAAG,CAAC,CAAA;IACd,IAAI,GAAG,EAAE;QACP,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,CAAA;KAC7B;SAAM;QACL,OAAO,SAAS,CAAA;KACjB;AACH,CAAC"}

package/dist/lib/deviceMotion.js.map

@@ -1 +1 @@
-{"version":3,"file":"deviceMotion.js","sourceRoot":"","sources":["../../src/lib/deviceMotion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE9E,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAA;AAC1C,IAAI,SAAc,CAAA;AAElB,MAAM,WAAW,GAAQ;IACvB,IAAI,EAAE,EAAE;IACR,EAAE,EAAE,EAAE;IACN,MAAM,EAAE,GAAG;CACZ,CAAA;AAED,SAAS,oBAAoB,CAAE,GAAuC;IACpE,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACrB,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAuC;IACpE,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;QACpC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;KACvB;SAAM,IAAI,GAAG,KAAK,SAAS,EAAE;QAC5B,UAAU,CAAC,KAAK,EAAE,CAAA;KACnB;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;KAC7C;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,0BAA0B,CAAE,SAAiD,EAAE;IACtF,MAAM,EAAE,QAAQ,GAAG,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC/D,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAA;IACvD,IAAI;QACF,wBAAwB;QACxB,IAAI,SAAS,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;YAChD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;SACnD;QACD,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3C,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;YACxB,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC9B,CAAC,CAAC,CAAA;QACF,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAA;QAE3E,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KAC9C;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,MAAM,GAAG,iCAAiC,CAAA;QAC9C,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAE,SAAgD,EAAE;IACpF,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC1C,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,8BAA8B,EAAE,CAAA;IACtD,IAAI;QACF,SAAS,CAAC,MAAM,EAAE,CAAA;QAClB,SAAS,GAAG,IAAI,CAAA;QAEhB,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KAC9C;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,MAAM,GAAG,gCAAgC,CAAA;QAC7C,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC;AAED,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EAC1B,CAAA"}
+{"version":3,"file":"deviceMotion.js","sourceRoot":"","sources":["../../src/lib/deviceMotion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAE9E,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAA;AAC1C,IAAI,SAAc,CAAA;AAElB,MAAM,WAAW,GAAQ;IACvB,IAAI,EAAE,EAAE;IACR,EAAE,EAAE,EAAE;IACN,MAAM,EAAE,GAAG;CACZ,CAAA;AAED,SAAS,oBAAoB,CAAE,GAAuC;IACpE,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACrB,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAuC;IACpE,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;QACpC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;KACvB;SAAM,IAAI,GAAG,KAAK,SAAS,EAAE;QAC5B,UAAU,CAAC,KAAK,EAAE,CAAA;KACnB;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;KAC7C;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,0BAA0B,CAAE,SAAiD,EAAE;IACtF,MAAM,EAAE,QAAQ,GAAG,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC/D,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAA;IACvD,IAAI;QACF,wBAAwB;QACxB,IAAI,SAAS,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;YAChD,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;SACnD;QACD,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3C,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;YACxB,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC9B,CAAC,CAAC,CAAA;QACF,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,WAAW,CAAC,MAAM,CAAC,CAAA;QAE3E,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KAC9C;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,MAAM,GAAG,iCAAiC,CAAA;QAC9C,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAE,SAAgD,EAAE;IACpF,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC1C,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,8BAA8B,EAAE,CAAA;IACtD,IAAI;QACF,SAAS,CAAC,MAAM,EAAE,CAAA;QAClB,SAAS,GAAG,IAAI,CAAA;QAEhB,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KAC9C;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,MAAM,GAAG,gCAAgC,CAAA;QAC7C,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC;AAED,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EAC1B,CAAA"}

package/dist/lib/file.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import * as FileSystem from 'expo-file-system';
 import { Platform } from 'react-native';
-import { shouleBeObject, successHandler, errorHandler } from '../utils';
+import { shouldBeObject, successHandler, errorHandler } from '../utils';
 let timer;
 const _fetch = (requestPromise, timeout) => {
     let timeoutAction;
@@ -132,7 +132,7 @@ function downloadFile(opts) {
 function saveFile(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const res = { errMsg: 'saveFile:ok' };
-        const isObject = shouleBeObject(opts);
+        const isObject = shouldBeObject(opts);
         if (!isObject.res) {
             res.errMsg = `saveFile${isObject.msg}`;
             return Promise.reject(res);
@@ -171,7 +171,7 @@ function saveFile(opts) {
 function removeSavedFile(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         let res = { errMsg: 'removeSavedFile:ok' };
-        const isObject = shouleBeObject(opts);
+        const isObject = shouldBeObject(opts);
         if (!isObject.res) {
             res.errMsg = `removeSavedFile${isObject.msg}`;
             console.error(res);
@@ -197,7 +197,7 @@ function removeSavedFile(opts) {
 function getSavedFileList(opts = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const res = { errMsg: 'getSavedFileList:ok' };
-        const isObject = shouleBeObject(opts);
+        const isObject = shouldBeObject(opts);
         if (!isObject.res) {
             res.errMsg = `getSavedFileList${isObject.msg}`;
             console.error(res);
@@ -237,7 +237,7 @@ function getSavedFileList(opts = {}) {
 function getSavedFileInfo(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const res = { errMsg: 'getSavedFileInfo:ok' };
-        const isObject = shouleBeObject(opts);
+        const isObject = shouldBeObject(opts);
         if (!isObject.res) {
             res.errMsg = `getSavedFileInfo${isObject.msg}`;
             console.error(res);
@@ -272,7 +272,7 @@ function getSavedFileInfo(opts) {
 function getFileInfo(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const res = { errMsg: 'getFileInfo:ok' };
-        const isObject = shouleBeObject(opts);
+        const isObject = shouldBeObject(opts);
         if (!isObject.res) {
             res.errMsg = `getFileInfo${isObject.msg}`;
             console.error(res);

package/dist/lib/getSystemInfoSync/index.js

@@ -1,7 +1,6 @@
-import { Platform, Dimensions, StatusBar, PixelRatio } from 'react-native';
+import { Platform, Dimensions, PixelRatio } from 'react-native';
 import { initialWindowMetrics } from 'react-native-safe-area-context';
 import DeviceInfo from 'react-native-device-info';
-import { isIPhoneX } from '../system';
 export function getSystemInfoSync() {
     const res = {};
     const brand = DeviceInfo.getBrand();
@@ -11,8 +10,6 @@ export function getSystemInfoSync() {
     const os = Platform.OS;
     const version = DeviceInfo.getVersion();
     const system = os + ' ' + Platform.Version;
-    const isAndroid = Platform.OS === 'android';
-    const statusBarHeight = isAndroid ? StatusBar.currentHeight || 0 : isIPhoneX ? 44 : 20;
     const screenWidth = Dimensions.get('screen').width;
     const screenHeight = Dimensions.get('screen').height;
     const windowWidth = Dimensions.get('window').width;
@@ -20,16 +17,16 @@ export function getSystemInfoSync() {
     const deviceOrientation = screenHeight > screenWidth ? 'portrait' : 'landscape';
     // NOTE：在竖屏正方向下的安全区域
     let safeArea = {};
+    const { top = 0, bottom = 0 } = (initialWindowMetrics === null || initialWindowMetrics === void 0 ? void 0 : initialWindowMetrics.insets) || {};
     try {
-        const { left, right, top, bottom = 0 } = (initialWindowMetrics === null || initialWindowMetrics === void 0 ? void 0 : initialWindowMetrics.insets) || {};
         const W = Math.min(screenWidth, screenHeight);
         const H = Math.max(screenWidth, screenHeight);
         safeArea = {
             left: 0,
             right: W,
-            top: statusBarHeight,
+            top,
             bottom: H - bottom,
-            height: H - bottom - statusBarHeight,
+            height: H - bottom - top,
             width: W,
         };
     }
@@ -44,7 +41,7 @@ export function getSystemInfoSync() {
     res.screenHeight = screenHeight;
     res.windowWidth = windowWidth;
     res.windowHeight = windowHeight;
-    res.statusBarHeight = statusBarHeight;
+    res.statusBarHeight = top;
     res.language = null;
     res.version = version;
     res.system = system;

package/dist/lib/getSystemInfoSync/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getSystemInfoSync/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,UAAU,EACV,SAAS,EACT,UAAU,EACX,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,UAAU,MAAM,0BAA0B,CAAA;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,MAAM,UAAU,iBAAiB;IAC/B,MAAM,GAAG,GAAQ,EAAE,CAAA;IAEnB,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAA;IACnC,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAA;IACnC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE,CAAA;IACnC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,EAAE,CAAA;IAC3C,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAA;IACtB,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;IACvC,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAA;IAC1C,MAAM,SAAS,GAAG,QAAQ,CAAC,EAAE,KAAK,SAAS,CAAA;IAC3C,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACtF,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;IAClD,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;IACpD,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;IAClD,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;IACpD,MAAM,iBAAiB,GAAG,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAA;IAE/E,oBAAoB;IACpB,IAAI,QAAQ,GAAG,EAAE,CAAA;IACjB,IAAI;QACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,KAAI,EAAE,CAAA;QAC3E,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QAC7C,QAAQ,GAAG;YACT,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,CAAC;YACR,GAAG,EAAE,eAAe;YACpB,MAAM,EAAE,CAAC,GAAG,MAAM;YAClB,MAAM,EAAE,CAAC,GAAG,MAAM,GAAG,eAAe;YACpC,KAAK,EAAE,CAAC;SACT,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAA;KAChD;IAED,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IACjB,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IACjB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IAC3B,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACvB,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAC7B,GAAG,CAAC,YAAY,GAAG,YAAY,CAAA;IAC/B,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAC7B,GAAG,CAAC,YAAY,GAAG,YAAY,CAAA;IAC/B,GAAG,CAAC,eAAe,GAAG,eAAe,CAAA;IACrC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAA;IACnB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;IACrB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;IACnB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;IACjB,GAAG,CAAC,eAAe,GAAG,SAAS,CAAA;IAC/B,GAAG,CAAC,UAAU,GAAG,IAAI,CAAA;IACrB,GAAG,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAEzC,OAAO,GAAG,CAAA;AACZ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getSystemInfoSync/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,UAAU,EACV,UAAU,EACX,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,UAAU,MAAM,0BAA0B,CAAA;AAEjD,MAAM,UAAU,iBAAiB;IAC/B,MAAM,GAAG,GAAQ,EAAE,CAAA;IAEnB,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAA;IACnC,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAA;IACnC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE,CAAA;IACnC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,EAAE,CAAA;IAC3C,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAA;IACtB,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;IACvC,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAA;IAC1C,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;IAClD,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;IACpD,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAA;IAClD,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;IACpD,MAAM,iBAAiB,GAAG,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAA;IAE/E,oBAAoB;IACpB,IAAI,QAAQ,GAAG,EAAE,CAAA;IACjB,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,KAAI,EAAE,CAAA;IAClE,IAAI;QACF,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QAC7C,QAAQ,GAAG;YACT,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,CAAC;YACR,GAAG;YACH,MAAM,EAAE,CAAC,GAAG,MAAM;YAClB,MAAM,EAAE,CAAC,GAAG,MAAM,GAAG,GAAG;YACxB,KAAK,EAAE,CAAC;SACT,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAA;KAChD;IACD,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IACjB,GAAG,CAAC,KAAK,GAAG,KAAK,CAAA;IACjB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAA;IAC3B,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACvB,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAC7B,GAAG,CAAC,YAAY,GAAG,YAAY,CAAA;IAC/B,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAC7B,GAAG,CAAC,YAAY,GAAG,YAAY,CAAA;IAC/B,GAAG,CAAC,eAAe,GAAG,GAAG,CAAA;IACzB,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAA;IACnB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAA;IACrB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;IACnB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;IACjB,GAAG,CAAC,eAAe,GAAG,SAAS,CAAA;IAC/B,GAAG,CAAC,UAAU,GAAG,IAAI,CAAA;IACrB,GAAG,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAEzC,OAAO,GAAG,CAAA;AACZ,CAAC"}

package/dist/lib/keyboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../src/lib/keyboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE9E,MAAM,YAAY,GAAG,CAAC,OAAiC,EAAE,EAAwC,EAAE;IACjG,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACxC,IAAI;QACF,QAAQ,CAAC,OAAO,EAAE,CAAA;QAClB,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;QACzC,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,CAAA;QACnC,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAA;AAC1C,IAAI,YAAY,GAAG,KAAK,CAAA;AAExB,MAAM,sBAAsB,GAAG,CAAC,CAAC,EAAE,EAAE;IACnC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,sBAAsB,GAAG,CAAC,QAA8C,EAAQ,EAAE;IACtF,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxB,IAAI,CAAC,YAAY,EAAE;QACjB,QAAQ,CAAC,WAAW,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAA;QAC/D,QAAQ,CAAC,WAAW,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAA;QAC/D,YAAY,GAAG,IAAI,CAAA;KACpB;AACH,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,uBAAuB,GAAG,CAAC,QAA+C,EAAQ,EAAE;IACxF,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;QAC9C,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;KAC5B;SAAM,IAAI,QAAQ,KAAK,SAAS,EAAE;QACjC,UAAU,CAAC,KAAK,EAAE,CAAA;KACnB;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAA;KAC/C;IACD,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;QAC5B,QAAQ,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;QAC9C,QAAQ,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;QAC9C,YAAY,GAAG,KAAK,CAAA;KACrB;AACH,CAAC,CAAA;AAED,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,YAAY,EACb,CAAA"}
+{"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../src/lib/keyboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE9E,MAAM,YAAY,GAAG,CAAC,OAAiC,EAAE,EAAuC,EAAE;IAChG,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACxC,IAAI;QACF,QAAQ,CAAC,OAAO,EAAE,CAAA;QAClB,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;QACzC,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,EAAE,CAAA;QACnC,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;KACzC;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAA;AAC1C,IAAI,YAAY,GAAG,KAAK,CAAA;AAExB,MAAM,sBAAsB,GAAG,CAAC,CAAC,EAAE,EAAE;IACnC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,sBAAsB,GAAG,CAAC,QAA8C,EAAQ,EAAE;IACtF,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxB,IAAI,CAAC,YAAY,EAAE;QACjB,QAAQ,CAAC,WAAW,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAA;QAC/D,QAAQ,CAAC,WAAW,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAA;QAC/D,YAAY,GAAG,IAAI,CAAA;KACpB;AACH,CAAC,CAAA;AAED;;;GAGG;AACH,MAAM,uBAAuB,GAAG,CAAC,QAA+C,EAAQ,EAAE;IACxF,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;QAC9C,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;KAC5B;SAAM,IAAI,QAAQ,KAAK,SAAS,EAAE;QACjC,UAAU,CAAC,KAAK,EAAE,CAAA;KACnB;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAA;KAC/C;IACD,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;QAC5B,QAAQ,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;QAC9C,QAAQ,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;QAC9C,YAAY,GAAG,KAAK,CAAA;KACrB;AACH,CAAC,CAAA;AAED,OAAO,EACL,sBAAsB,EACtB,uBAAuB,EACvB,YAAY,EACb,CAAA"}

package/dist/lib/media.js.map

@@ -1 +1 @@
-{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/lib/media.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/lib/media.ts"],"names":[],"mappings":"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"}

package/dist/lib/network.js

@@ -1,19 +1,38 @@
-import NetInfo from '@react-native-community/netinfo';
+import NetInfo, { NetInfoStateType } from '@react-native-community/netinfo';
 let _unsubscribe = null;
 let _callbacks = new Set();
+function getTypeFromState(connectionInfo) {
+    let type;
+    if (connectionInfo.type === NetInfoStateType.wifi) {
+        type = NetInfoStateType.wifi;
+    }
+    else if (connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
+        type = connectionInfo.details.cellularGeneration;
+    }
+    else if (connectionInfo.type === NetInfoStateType.none) {
+        type = 'none';
+    }
+    else {
+        type = 'unknown';
+    }
+    return type;
+}
 export function getNetworkType(opts = {}) {
     const { success, fail, complete } = opts;
-    const res = {};
     return new Promise((resolve, reject) => {
         NetInfo.fetch()
             .then((connectionInfo) => {
-            res.networkType = connectionInfo.type;
-            res.errMsg = 'getNetworkType:ok';
+            const res = {
+                errMsg: 'getNetworkType:ok',
+                networkType: getTypeFromState(connectionInfo),
+            };
             success === null || success === void 0 ? void 0 : success(res);
             complete === null || complete === void 0 ? void 0 : complete(res);
             resolve(res);
         }).catch((err) => {
-            res.errMsg = err.message;
+            const res = {
+                errMsg: err.message
+            };
             fail === null || fail === void 0 ? void 0 : fail(res);
             complete === null || complete === void 0 ? void 0 : complete(res);
             reject(err);
@@ -25,8 +44,8 @@ export function onNetworkStatusChange(fnc) {
     if (!_unsubscribe) {
         _unsubscribe = NetInfo.addEventListener((connectionInfo) => {
             _callbacks.forEach(cb => {
-                const { type, isConnected } = connectionInfo;
-                cb === null || cb === void 0 ? void 0 : cb({ isConnected, networkType: type });
+                const { isConnected } = connectionInfo;
+                cb === null || cb === void 0 ? void 0 : cb({ isConnected, networkType: getTypeFromState(connectionInfo) });
             });
         });
     }

package/dist/lib/network.js.map

@@ -1 +1 @@
-{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/lib/network.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,iCAAiC,CAAA;AAErD,IAAI,YAAY,GAAQ,IAAI,CAAA;AAE5B,IAAI,UAAU,GAAkB,IAAI,GAAG,EAAE,CAAA;AAEzC,MAAM,UAAU,cAAc,CAAC,OAAmC,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IACxC,MAAM,GAAG,GAAQ,EAAE,CAAA;IAEnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,KAAK,EAAE;aACZ,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE;YACvB,GAAG,CAAC,WAAW,GAAG,cAAc,CAAC,IAAI,CAAA;YACrC,GAAG,CAAC,MAAM,GAAG,mBAAmB,CAAA;YAChC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,CAAA;YACd,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;YAEf,OAAO,CAAC,GAAG,CAAC,CAAA;QACd,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACf,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,CAAA;YACxB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;YACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;YAEf,MAAM,CAAC,GAAG,CAAC,CAAA;QACb,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAwC;IAC5E,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnB,IAAI,CAAC,YAAY,EAAE;QACjB,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,cAAc,EAAE,EAAE;YACzD,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACtB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,cAAc,CAAA;gBAC5C,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAG,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;YAC1C,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;KACH;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,GAAyC;IAC9E,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;QACpC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;KACvB;SAAM,IAAI,GAAG,KAAK,SAAS,EAAE;QAC5B,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,YAAY,aAAZ,YAAY,uBAAZ,YAAY,EAAI,CAAA;QAChB,YAAY,GAAG,IAAI,CAAA;KACpB;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA;KAC9C;AACH,CAAC"}
+{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/lib/network.ts"],"names":[],"mappings":"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"}

package/dist/lib/screen.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import * as Brightness from 'expo-brightness';
-import { errorHandler, shouleBeObject, successHandler } from '../utils';
+import { errorHandler, shouldBeObject, successHandler } from '../utils';
 /**
  * 设置屏幕亮度
  * @param opts
@@ -18,7 +18,7 @@ export function setScreenBrightness(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const { value, success, fail, complete } = opts;
         let res = { errMsg: 'setScreenBrightness:ok' };
-        const isObject = shouleBeObject(opts);
+        const isObject = shouldBeObject(opts);
         if (!isObject.res) {
             res = { errMsg: `setScreenBrightness${isObject.msg}` };
             return errorHandler(fail, complete)(res);
@@ -40,7 +40,7 @@ export function setScreenBrightness(opts) {
 export function getScreenBrightness(opts = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const { success, fail, complete } = opts;
-        const isObject = shouleBeObject(opts);
+        const isObject = shouldBeObject(opts);
         if (!isObject.res) {
             const res = { errMsg: `getScreenBrightness${isObject.msg}` };
             return errorHandler(fail, complete)(res);

package/dist/lib/showModal/toast.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { View, Text, Image, StyleSheet, ActivityIndicator } from 'react-native';
 import RootSiblings from 'react-native-root-siblings';
 import successPng from './success.png';
-import { errorHandler, shouleBeObject, successHandler } from '../../utils';
+import { errorHandler, shouldBeObject, successHandler } from '../../utils';
 const styles = StyleSheet.create({
     toastView: {
         width: 76,
@@ -91,7 +91,7 @@ WXLoading.propTypes = {
     mask: PropTypes.bool
 };
 function showToast(options) {
-    const isObject = shouleBeObject(options);
+    const isObject = shouldBeObject(options);
     if (!isObject.res) {
         const res = { errMsg: `showToast${isObject.msg}` };
         console.error(res.errMsg);
@@ -145,7 +145,7 @@ function showToast(options) {
     }
 }
 function showLoading(options) {
-    const isObject = shouleBeObject(options);
+    const isObject = shouldBeObject(options);
     if (!isObject.res) {
         const res = { errMsg: `showLoading${isObject.msg}` };
         console.error(res.errMsg);

package/dist/utils/index.js

@@ -6,7 +6,7 @@ export function getParameterError({ correct, wrong }) {
     const errorType = upperCaseFirstLetter(wrong === null ? 'Null' : typeof wrong);
     return `fail parameter error: ${parameter} should be ${correct} instead of ${errorType}`;
 }
-export function shouleBeObject(target) {
+export function shouldBeObject(target) {
     if (target && typeof target === 'object')
         return { res: true };
     return {

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAUA,SAAS,oBAAoB,CAAE,MAAc;IAC3C,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;AAC3D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAE,EAAE,OAAO,EAAE,KAAK,EAA2B;IAC5E,MAAM,SAAS,GAAG,WAAW,CAAA;IAC7B,MAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,CAAA;IAC9E,OAAO,yBAAyB,SAAS,cAAc,OAAO,eAAe,SAAS,EAAE,CAAA;AAC1F,CAAC;AAED,MAAM,UAAU,cAAc,CAAE,MAAe;IAC7C,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;IAC9D,OAAO;QACL,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,iBAAiB,CAAC;YACrB,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE,MAAM;SACd,CAAC;KACH,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAE,OAAoD,EAAE,QAAqD;IACzI,OAAO,UAAU,GAAgC;QAC/C,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAA;QACvB,QAAQ,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAA;QACzB,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAE,IAAiD,EAAE,QAAqD;IACpI,OAAO,UAAU,GAAgC;QAC/C,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,CAAA;QACjB,QAAQ,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAA;QACzB,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC,CAAA;AACH,CAAC;AAED;;;;GAIG;AAEH,MAAM,mBAAmB,GAAG,sBAAsB,CAAA;AAElD,MAAM,iBAAiB,GAAG,mCAAmC,CAAA;AAC7D,MAAM,oBAAoB,GAAG,mBAAmB,CAAA;AAEhD;;;;;GAKG;AACH,MAAM,UAAU,KAAK,CAAE,MAAc;IACnC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,OAAO,KAAK,CAAA;KACb;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC/C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAA;KACb;IAED,MAAM,uBAAuB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IACxC,IAAI,CAAC,uBAAuB,EAAE;QAC5B,OAAO,KAAK,CAAA;KACb;IAED,IAAI,iBAAiB,CAAC,IAAI,CAAC,uBAAuB,CAAC;QACjD,oBAAoB,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE;QACpD,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAUA,SAAS,oBAAoB,CAAE,MAAc;IAC3C,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;AAC3D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAE,EAAE,OAAO,EAAE,KAAK,EAA2B;IAC5E,MAAM,SAAS,GAAG,WAAW,CAAA;IAC7B,MAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,CAAA;IAC9E,OAAO,yBAAyB,SAAS,cAAc,OAAO,eAAe,SAAS,EAAE,CAAA;AAC1F,CAAC;AAED,MAAM,UAAU,cAAc,CAAE,MAAe;IAC7C,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;IAC9D,OAAO;QACL,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,iBAAiB,CAAC;YACrB,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE,MAAM;SACd,CAAC;KACH,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAE,OAAmD,EAAE,QAAoD;IACvI,OAAO,UAAU,GAA+B;QAC9C,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,CAAA;QACvB,QAAQ,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAA;QACzB,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAE,IAAgD,EAAE,QAAoD;IAClI,OAAO,UAAU,GAA+B;QAC9C,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,CAAA;QACjB,QAAQ,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAA;QACzB,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC,CAAA;AACH,CAAC;AAED;;;;GAIG;AAEH,MAAM,mBAAmB,GAAG,sBAAsB,CAAA;AAElD,MAAM,iBAAiB,GAAG,mCAAmC,CAAA;AAC7D,MAAM,oBAAoB,GAAG,mBAAmB,CAAA;AAEhD;;;;;GAKG;AACH,MAAM,UAAU,KAAK,CAAE,MAAc;IACnC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,OAAO,KAAK,CAAA;KACb;IAED,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC/C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAA;KACb;IAED,MAAM,uBAAuB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IACxC,IAAI,CAAC,uBAAuB,EAAE;QAC5B,OAAO,KAAK,CAAA;KACb;IAED,IAAI,iBAAiB,CAAC,IAAI,CAAC,uBAAuB,CAAC;QACjD,oBAAoB,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE;QACpD,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,cAAc,mBAAmB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-rn",
-  "version": "3.3.12",
+  "version": "3.3.16",
   "description": "Taro RN framework",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
@@ -32,38 +32,37 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@react-native-async-storage/async-storage": "^1.13.2",
-    "@react-native-community/cameraroll": "^4.0.1",
-    "@react-native-community/clipboard": "^1.5.1",
-    "@react-native-community/geolocation": "^2.0.2",
-    "@react-native-community/netinfo": "^6.0.2",
-    "@tarojs/runtime-rn": "3.3.12",
-    "babel-preset-expo": "^5.2.0",
+    "@react-native-async-storage/async-storage": "~1.15.11",
+    "@react-native-community/cameraroll": "~4.1.2",
+    "@react-native-community/clipboard": "~1.5.1",
+    "@react-native-community/geolocation": "~2.0.2",
+    "@react-native-community/netinfo": "~7.1.2",
+    "@tarojs/runtime-rn": "3.3.16",
+    "babel-preset-expo": "~8.5.1",
     "base64-js": "^1.3.0",
     "expo-av": "~9.2.3",
     "expo-barcode-scanner": "~10.2.2",
-    "expo-brightness": "^9.2.2",
+    "expo-brightness": "~9.2.2",
     "expo-camera": "~11.2.2",
     "expo-file-system": "~11.1.3",
     "expo-image-picker": "~10.2.3",
     "expo-keep-awake": "~9.2.0",
-    "expo-location": "^12.1.2",
     "expo-permissions": "~12.1.1",
-    "expo-sensors": "^10.2.2",
+    "expo-sensors": "~10.2.2",
     "nullthrows": "^1.1.1",
-    "react-native-device-info": "^8.3.1",
-    "react-native-image-resizer": "^1.4.0",
+    "react-native-device-info": "~8.4.8",
+    "react-native-image-resizer": "~1.4.5",
     "react-native-image-zoom-viewer": "^3.0.1",
     "react-native-root-siblings": "^3.1.0",
     "react-native-root-toast": "^3.0.1",
-    "react-native-safe-area-context": "^3.1.8",
+    "react-native-safe-area-context": "~3.3.2",
     "react-native-stylekit": "^1.0.0",
     "react-native-syan-image-picker": "0.4.10",
-    "react-native-unimodules": "^0.14.9"
+    "react-native-unimodules": "~0.14.10"
   },
   "devDependencies": {
-    "@tarojs/taro": "3.3.12",
-    "@types/react-native": "0.65.1",
+    "@tarojs/taro": "3.3.16",
+    "@types/react-native": "0.66.5",
     "babel-plugin-jest-hoist": "^26.6.2",
     "cpy-cli": "^3.1.1",
     "jest-expo": "^39.0.0",
@@ -72,30 +71,29 @@
     "rimraf": "^3.0.0"
   },
   "peerDependencies": {
-    "@react-native-async-storage/async-storage": "^1.13.2",
-    "@react-native-community/cameraroll": "^4.0.1",
-    "@react-native-community/clipboard": "^1.5.1",
-    "@react-native-community/geolocation": "^2.0.2",
-    "@react-native-community/netinfo": "^6.0.2",
+    "@react-native-async-storage/async-storage": "~1.15.11",
+    "@react-native-community/cameraroll": "~4.1.2",
+    "@react-native-community/clipboard": "~1.5.1",
+    "@react-native-community/geolocation": "~2.0.2",
+    "@react-native-community/netinfo": "~7.1.2",
     "expo-av": "~9.2.3",
     "expo-barcode-scanner": "~10.2.2",
-    "expo-brightness": "^9.2.2",
+    "expo-brightness": "~9.2.2",
     "expo-camera": "~11.2.2",
     "expo-file-system": "~11.1.3",
     "expo-image-picker": "~10.2.3",
     "expo-keep-awake": "~9.2.0",
-    "expo-location": "^12.1.2",
     "expo-permissions": "~12.1.1",
-    "expo-sensors": "^10.2.2",
-    "react-native-device-info": "^8.3.1",
-    "react-native-image-resizer": "^1.4.0",
-    "react-native-safe-area-context": "^3.1.8",
+    "expo-sensors": "~10.2.2",
+    "react-native-device-info": "~8.4.8",
+    "react-native-image-resizer": "~1.4.5",
+    "react-native-safe-area-context": "~3.3.2",
     "react-native-syan-image-picker": "0.4.10",
-    "react-native-unimodules": "^0.14.9"
+    "react-native-unimodules": "~0.14.10"
   },
   "resolutions": {
     "@types/react": "17.0.11",
     "@types/node": "^14.14.41"
   },
-  "gitHead": "0d7650ee4263efafacd87b9c8b69bb29b2a852c0"
+  "gitHead": "75d3de695c98fab79998612ef87567a68ea981a7"
 }

package/src/lib/accelerometer.ts

@@ -29,7 +29,7 @@ function onAccelerometerChange(fnc: Taro.onAccelerometerChange.Callback): void {
  * @param {Object} opts
  * @param {string} [opts.interval='normal'] 监听加速度数据回调函数的执行频率
  */
-function startAccelerometer(opts: Taro.startAccelerometer.Option = {}): Promise<Taro.General.CallbackResult> {
+function startAccelerometer(opts: Taro.startAccelerometer.Option = {}): Promise<TaroGeneral.CallbackResult> {
   const { interval = 'normal', success, fail, complete } = opts
   const res = { errMsg: 'startAccelerometer:ok' }
   try {
@@ -54,7 +54,7 @@ function startAccelerometer(opts: Taro.startAccelerometer.Option = {}): Promise<
  * 停止监听加速度数据
  * @param opts
  */
-function stopAccelerometer(opts: Taro.stopAccelerometer.Option = {}): Promise<Taro.General.CallbackResult> {
+function stopAccelerometer(opts: Taro.stopAccelerometer.Option = {}): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = opts
   const res = { errMsg: 'stopAccelerometer:ok' }
   try {

package/src/lib/chooseImage/index.ts

@@ -1,6 +1,6 @@
 import SYImagePicker from 'react-native-syan-image-picker'
 
-import { shouleBeObject } from '../../utils'
+import { shouldBeObject } from '../../utils'
 import { showActionSheet } from '../showActionSheet'
 
 const res = { errMsg: 'chooseImage:ok' }
@@ -131,7 +131,7 @@ function showImagePicker(options: Taro.chooseImage.Option):Promise<Taro.chooseIm
  */
 export function chooseImage(options: Taro.chooseImage.Option): Promise<Taro.chooseImage.SuccessCallbackResult> {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `chooseImage${isObject.msg}` }
     console.error(res.errMsg)

package/src/lib/clearStorage/index.ts

@@ -1,7 +1,7 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import { errorHandler, successHandler } from '../../utils'
 
-export async function clearStorage(option: Taro.clearStorage.Option = {}): Promise<Taro.General.CallbackResult> {
+export async function clearStorage(option: Taro.clearStorage.Option = {}): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = option
   const res = { errMsg: 'clearStorage:ok' }
 

package/src/lib/createVideoContext/index.ts

@@ -44,7 +44,7 @@ class VideoContext {
    */
   async play () {
     try {
-      await this.videoRef?.playAsync()
+      await this.videoRef?.playAsync?.()
     } catch (e) {
       console.log(e)
     }
@@ -125,7 +125,7 @@ class VideoContext {
  * {string} @param - id video 组件的 id
  * {object} @param t - 在自定义组件下，当前组件实例的this，以操作组件内 video 组件
  */
-export function createVideoContext (id: string, t?: Taro.General.IAnyObject): Taro.VideoContext|undefined {
+export function createVideoContext (id: string, t?: TaroGeneral.IAnyObject): Taro.VideoContext|undefined {
   let ref = globalAny._taroVideoMap[id]
   if (t) ref = t
   if (ref) {

package/src/lib/deviceMotion.ts

@@ -1,3 +1,4 @@
+import Taro from '@tarojs/taro'
 import { DeviceMotion } from 'expo-sensors'
 import { createCallbackManager, successHandler, errorHandler } from '../utils'
 
@@ -29,7 +30,7 @@ function offDeviceMotionChange(fnc: Taro.onDeviceMotionChange.Callback): void {
  * @param object
  * @param {string} [object.interval='normal'] - 监听设备方向的变化回调函数的执行频率
  */
-function startDeviceMotionListening (object: Taro.startDeviceMotionListening.Option = {}): Promise<Taro.General.CallbackResult> {
+function startDeviceMotionListening (object: Taro.startDeviceMotionListening.Option = {}): Promise<TaroGeneral.CallbackResult> {
   const { interval = 'normal', success, fail, complete } = object
   const res = { errMsg: 'startDeviceMotionListening:ok' }
   try {
@@ -55,7 +56,7 @@ function startDeviceMotionListening (object: Taro.startDeviceMotionListening.Opt
  * 停止监听设备方向的变化
  * @param object
  */
-function stopDeviceMotionListening (object: Taro.stopDeviceMotionListening.Option = {}): Promise<Taro.General.CallbackResult> {
+function stopDeviceMotionListening (object: Taro.stopDeviceMotionListening.Option = {}): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = object
   const res = { errMsg: 'stopDeviceMotionListening:ok' }
   try {

package/src/lib/file.ts

@@ -1,6 +1,6 @@
 import * as FileSystem from 'expo-file-system'
 import { Platform } from 'react-native'
-import { shouleBeObject, successHandler, errorHandler } from '../utils'
+import { shouldBeObject, successHandler, errorHandler } from '../utils'
 
 interface Func{
   (arg: any): void
@@ -153,7 +153,7 @@ function downloadFile (opts: Taro.downloadFile.Option): Promise<Taro.DownloadTas
  */
 async function saveFile (opts: Taro.saveFile.Option): Promise<Taro.saveFile.SuccessCallbackResult | Taro.saveFile.FailCallbackResult> {
   const res = <any>{ errMsg: 'saveFile:ok' }
-  const isObject = shouleBeObject(opts)
+  const isObject = shouldBeObject(opts)
   if (!isObject.res) {
     res.errMsg = `saveFile${isObject.msg}`
     return Promise.reject(res)
@@ -190,9 +190,9 @@ async function saveFile (opts: Taro.saveFile.Option): Promise<Taro.saveFile.Succ
  * @param opts
  * @param {string} opts.filePath 需要删除的文件路径
  */
-async function removeSavedFile (opts: Taro.removeSavedFile.Option): Promise<Taro.General.CallbackResult> {
+async function removeSavedFile (opts: Taro.removeSavedFile.Option): Promise<TaroGeneral.CallbackResult> {
   let res = <any>{ errMsg: 'removeSavedFile:ok' }
-  const isObject = shouleBeObject(opts)
+  const isObject = shouldBeObject(opts)
   if (!isObject.res) {
     res.errMsg = `removeSavedFile${isObject.msg}`
     console.error(res)
@@ -221,7 +221,7 @@ async function removeSavedFile (opts: Taro.removeSavedFile.Option): Promise<Taro
  */
 async function getSavedFileList (opts: Taro.getSavedFileList.Option = {}): Promise<Taro.getSavedFileList.SuccessCallbackResult> {
   const res = <any>{ errMsg: 'getSavedFileList:ok' }
-  const isObject = shouleBeObject(opts)
+  const isObject = shouldBeObject(opts)
   if (!isObject.res) {
     res.errMsg = `getSavedFileList${isObject.msg}`
     console.error(res)
@@ -260,7 +260,7 @@ async function getSavedFileList (opts: Taro.getSavedFileList.Option = {}): Promi
  */
 async function getSavedFileInfo (opts: Taro.getSavedFileInfo.Option): Promise<Taro.getSavedFileInfo.SuccessCallbackResult> {
   const res = <any>{ errMsg: 'getSavedFileInfo:ok' }
-  const isObject = shouleBeObject(opts)
+  const isObject = shouldBeObject(opts)
   if (!isObject.res) {
     res.errMsg = `getSavedFileInfo${isObject.msg}`
     console.error(res)
@@ -295,7 +295,7 @@ async function getSavedFileInfo (opts: Taro.getSavedFileInfo.Option): Promise<Ta
  */
 async function getFileInfo (opts: Taro.getFileInfo.Option): Promise<Taro.getFileInfo.SuccessCallbackResult | Taro.getFileInfo.FailCallbackResult> {
   const res = <any>{ errMsg: 'getFileInfo:ok' }
-  const isObject = shouleBeObject(opts)
+  const isObject = shouldBeObject(opts)
   if (!isObject.res) {
     res.errMsg = `getFileInfo${isObject.msg}`
     console.error(res)

package/src/lib/getStorageInfo/index.ts

@@ -11,7 +11,7 @@ async function getStorageCurrentSize() {
   return Number((size / 1024).toFixed(2))
 }
 
-export async function getStorageInfo(option: Taro.getStorageInfo.Option = {}): Promise<Taro.General.CallbackResult> {
+export async function getStorageInfo(option: Taro.getStorageInfo.Option = {}): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = option
   const res = { errMsg: 'getStorageInfo:ok' }
 

package/src/lib/getSystemInfoSync/index.ts

@@ -1,14 +1,11 @@
 import {
   Platform,
   Dimensions,
-  StatusBar,
   PixelRatio
 } from 'react-native'
 import { initialWindowMetrics } from 'react-native-safe-area-context'
 import DeviceInfo from 'react-native-device-info'
 
-import { isIPhoneX } from '../system'
-
 export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
   const res: any = {}
 
@@ -19,8 +16,6 @@ export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
   const os = Platform.OS
   const version = DeviceInfo.getVersion()
   const system = os + ' ' + Platform.Version
-  const isAndroid = Platform.OS === 'android'
-  const statusBarHeight = isAndroid ? StatusBar.currentHeight || 0 : isIPhoneX ? 44 : 20
   const screenWidth = Dimensions.get('screen').width
   const screenHeight = Dimensions.get('screen').height
   const windowWidth = Dimensions.get('window').width
@@ -29,22 +24,21 @@ export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
 
   // NOTE：在竖屏正方向下的安全区域
   let safeArea = {}
+  const { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
   try {
-    const { left, right, top, bottom = 0 } = initialWindowMetrics?.insets || {}
     const W = Math.min(screenWidth, screenHeight)
     const H = Math.max(screenWidth, screenHeight)
     safeArea = {
       left: 0,
       right: W,
-      top: statusBarHeight,
+      top,
       bottom: H - bottom,
-      height: H - bottom - statusBarHeight,
+      height: H - bottom - top,
       width: W,
     }
   } catch (error) {
     console.log('calculate safeArea fail: ', error)
   }
-
   res.brand = brand
   res.model = model
   res.pixelRatio = pixelRatio
@@ -53,7 +47,7 @@ export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
   res.screenHeight = screenHeight
   res.windowWidth = windowWidth
   res.windowHeight = windowHeight
-  res.statusBarHeight = statusBarHeight
+  res.statusBarHeight = top
   res.language = null
   res.version = version
   res.system = system

package/src/lib/gyroscope.ts

@@ -15,7 +15,7 @@ const intervalMap: any = {
  * @param opts 
  * @param {string} [opts.interval='normal'] 监听陀螺仪数据回调函数的执行频率
  */
-function startGyroscope(opts: Taro.startGyroscope.Option = {}): Promise<Taro.General.CallbackResult> {
+function startGyroscope(opts: Taro.startGyroscope.Option = {}): Promise<TaroGeneral.CallbackResult> {
     const { interval = 'normal', success, fail, complete } = opts
     const res = { errMsg: 'startGyroscope:ok' }
     try {
@@ -40,7 +40,7 @@ function startGyroscope(opts: Taro.startGyroscope.Option = {}): Promise<Taro.Gen
  * 停止监听陀螺仪数据
  * @param opts 
  */
-function stopGyroscope(opts: Taro.stopGyroscope.Option = {}): Promise<Taro.General.CallbackResult> {
+function stopGyroscope(opts: Taro.stopGyroscope.Option = {}): Promise<TaroGeneral.CallbackResult> {
     const { success, fail, complete } = opts
     const res = { errMsg: 'stopGyroscope:ok' }
     try {

package/src/lib/keyboard.ts

@@ -1,7 +1,7 @@
 import { Keyboard } from 'react-native'
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
-const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): Promise<Taro.General.CallbackResult> => {
+const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): Promise<TaroGeneral.CallbackResult> => {
   const { success, fail, complete } = opts
   try {
     Keyboard.dismiss()

package/src/lib/location.ts

@@ -23,7 +23,7 @@ export function offLocationChange(callback: Taro.onLocationChange.Callback): voi
  * @param opts 
  * @returns 
  */
-export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Promise<Taro.General.CallbackResult> {
+export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = opts
   const res = { errMsg: 'startLocationUpdate:ok' }
   try {
@@ -66,7 +66,7 @@ export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Prom
  * @param opts 
  * @returns 
  */
-export function stopLocationUpdate(opts: Taro.stopLocationUpdate.Option): Promise<Taro.General.CallbackResult> {
+export function stopLocationUpdate(opts: Taro.stopLocationUpdate.Option): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = opts
   const res = { errMsg: 'stopLocationUpdate:ok' }
   try {

package/src/lib/makePhoneCall/index.ts

@@ -1,7 +1,7 @@
 import { Linking } from 'react-native'
 import { successHandler, errorHandler } from '../../utils'
 
-export async function makePhoneCall(opts: Taro.makePhoneCall.Option): Promise<Taro.General.CallbackResult> {
+export async function makePhoneCall(opts: Taro.makePhoneCall.Option): Promise<TaroGeneral.CallbackResult> {
   const { phoneNumber, success, fail, complete } = opts
   const res = { errMsg: 'makePhoneCall:ok' }
   const telUrl = `tel:${phoneNumber}`

package/src/lib/media.ts

@@ -9,7 +9,7 @@ export const MEDIA_TYPE = {
   IMAGES: 'Images'
 }
 
-export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option|Taro.saveVideoToPhotosAlbum.Option, type:string, API:string):Promise<Taro.General.CallbackResult> {
+export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.saveVideoToPhotosAlbum.Option, type:string, API:string):Promise<TaroGeneral.CallbackResult> {
   const { filePath, success, fail, complete } = opts
   const status = await askAsyncPermissions(Permissions.CAMERA_ROLL)
   if (status !== 'granted') {
@@ -29,7 +29,7 @@ export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option|Taro.sa
   }
 }
 
-export async function chooseMedia(opts: Taro.chooseImage.Option|Taro.chooseVideo.Option, mediaTypes: string): Promise<Taro.General.CallbackResult> {
+export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option, mediaTypes: string): Promise<TaroGeneral.CallbackResult> {
   if (!opts || typeof opts !== 'object') {
     opts = {}
   }

package/src/lib/network.ts

@@ -1,24 +1,41 @@
-import NetInfo from '@react-native-community/netinfo'
+import NetInfo, { NetInfoStateType, NetInfoState } from '@react-native-community/netinfo'
 
 let _unsubscribe: any = null
 
 let _callbacks: Set<Function> = new Set()
 
+function getTypeFromState(connectionInfo:NetInfoState): keyof Taro.getNetworkType.networkType {
+  let type: keyof Taro.getNetworkType.networkType
+  if(connectionInfo.type === NetInfoStateType.wifi) {
+    type = NetInfoStateType.wifi
+  } else if(connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
+    type = connectionInfo.details.cellularGeneration
+  } else if(connectionInfo.type === NetInfoStateType.none) {
+    type = 'none'
+  } else {
+    type = 'unknown'
+  }
+  return type
+}
+
 export function getNetworkType(opts: Taro.getNetworkType.Option = {}): Promise<Taro.getNetworkType.SuccessCallbackResult> {
   const { success, fail, complete } = opts
-  const res: any = {}
 
   return new Promise((resolve, reject) => {
     NetInfo.fetch()
       .then((connectionInfo) => {
-        res.networkType = connectionInfo.type
-        res.errMsg = 'getNetworkType:ok'
+        const res: Taro.getNetworkType.SuccessCallbackResult = {
+          errMsg: 'getNetworkType:ok',
+          networkType: getTypeFromState(connectionInfo),
+        }
         success?.(res)
         complete?.(res)
 
         resolve(res)
       }).catch((err) => {
-        res.errMsg = err.message
+        const res: TaroGeneral.CallbackResult = {
+          errMsg: err.message
+        }
         fail?.(res)
         complete?.(res)
 
@@ -32,8 +49,8 @@ export function onNetworkStatusChange(fnc: Taro.onNetworkStatusChange.Callback):
   if (!_unsubscribe) {
     _unsubscribe = NetInfo.addEventListener((connectionInfo) => {
       _callbacks.forEach(cb => {
-        const { type, isConnected } = connectionInfo
-        cb?.({ isConnected, networkType: type })
+        const { isConnected } = connectionInfo
+        cb?.({ isConnected, networkType: getTypeFromState(connectionInfo) })
       })
     })
   }

package/src/lib/openUrl/index.d.ts

@@ -4,11 +4,11 @@ declare namespace Taro {
 			/** 跳转链接 */
 			url: string
 			/** 接口调用结束的回调函数（调用成功、失败都会执行） */
-			complete?: (res: Taro.General.CallbackResult) => void
+			complete?: (res: TaroGeneral.CallbackResult) => void
 			/** 接口调用失败的回调函数 */
-			fail?: (res: Taro.General.CallbackResult) => void
+			fail?: (res: TaroGeneral.CallbackResult) => void
 			/** 接口调用成功的回调函数 */
-			success?: (res: Taro.General.CallbackResult) => void
+			success?: (res: TaroGeneral.CallbackResult) => void
 		}
 	}
 	/**

package/src/lib/permission.ts

@@ -57,7 +57,7 @@ const handleAppStateChange = async (nextAppState, resolve, reject, opts) => {
   // AppState.currentState = nextAppState;
 };
 
-export async function authorize(opts: Taro.authorize.Option): Promise<Taro.General.CallbackResult> {
+export async function authorize(opts: Taro.authorize.Option): Promise<TaroGeneral.CallbackResult> {
   const { scope, success, fail, complete } = opts
   const res: any = {}
 

package/src/lib/removeStorage/index.ts

@@ -1,6 +1,6 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 
-export function removeStorage(option: Taro.removeStorage.Option): Promise<Taro.General.CallbackResult> {
+export function removeStorage(option: Taro.removeStorage.Option): Promise<TaroGeneral.CallbackResult> {
   const { key, success, fail, complete } = option
   const res = { errMsg: 'removeStorage:ok' }
 

package/src/lib/saveImageToPhotosAlbum/index.ts

@@ -6,6 +6,6 @@ import { saveMedia } from '../media'
  * @param {string} opts.filePath  图片文件路径，可以是临时文件路径或永久文件路径，不支持网络图片路径
  * @returns {*}
  */
-export function saveImageToPhotosAlbum(opts: Taro.saveImageToPhotosAlbum.Option): Promise<Taro.General.CallbackResult> {
+export function saveImageToPhotosAlbum(opts: Taro.saveImageToPhotosAlbum.Option): Promise<TaroGeneral.CallbackResult> {
   return saveMedia(opts, 'photo', 'saveImageToPhotosAlbum')
 }

package/src/lib/saveVideoToPhotosAlbum/index.ts

@@ -6,6 +6,6 @@ import { saveMedia } from '../media'
  * @param {string} opts.filePath - 视频文件路径，可以是临时文件路径也可以是永久文件路径
  * @returns {Promise<*>}
  */
-export function saveVideoToPhotosAlbum(opts: Taro.saveVideoToPhotosAlbum.Option): Promise<Taro.General.CallbackResult> {
+export function saveVideoToPhotosAlbum(opts: Taro.saveVideoToPhotosAlbum.Option): Promise<TaroGeneral.CallbackResult> {
   return saveMedia(opts, 'video', 'saveVideoToPhotosAlbum')
 }

package/src/lib/screen.ts

@@ -1,16 +1,16 @@
 import * as Brightness from 'expo-brightness'
-import { errorHandler, shouleBeObject, successHandler } from '../utils'
+import { errorHandler, shouldBeObject, successHandler } from '../utils'
 
 /**
  * 设置屏幕亮度
  * @param opts
  * @param {number} opts.value - 屏幕亮度值，范围 0 ~ 1。0 最暗，1 最亮
  */
-export async function setScreenBrightness (opts: Taro.setScreenBrightness.Option): Promise<Taro.General.CallbackResult> {
+export async function setScreenBrightness (opts: Taro.setScreenBrightness.Option): Promise<TaroGeneral.CallbackResult> {
   const { value, success, fail, complete } = opts
   let res = { errMsg: 'setScreenBrightness:ok' }
 
-  const isObject = shouleBeObject(opts)
+  const isObject = shouldBeObject(opts)
   if (!isObject.res) {
     res = { errMsg: `setScreenBrightness${isObject.msg}` }
     return errorHandler(fail, complete)(res)
@@ -29,9 +29,9 @@ export async function setScreenBrightness (opts: Taro.setScreenBrightness.Option
  * 获取屏幕亮度
  * @param opts
  */
-export async function getScreenBrightness (opts: Taro.getScreenBrightness.Option = {}): Promise<Taro.General.CallbackResult> {
+export async function getScreenBrightness (opts: Taro.getScreenBrightness.Option = {}): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = opts
-  const isObject = shouleBeObject(opts)
+  const isObject = shouldBeObject(opts)
   if (!isObject.res) {
     const res = { errMsg: `getScreenBrightness${isObject.msg}` }
     return errorHandler(fail, complete)(res)

package/src/lib/setStorage/index.ts

@@ -1,7 +1,7 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import { errorHandler, successHandler } from '../../utils'
 
-export async function setStorage(option: Taro.setStorage.Option): Promise<Taro.General.CallbackResult> {
+export async function setStorage(option: Taro.setStorage.Option): Promise<TaroGeneral.CallbackResult> {
   const { key, data, success, fail, complete } = option
   const res = { errMsg: 'setStorage:ok' }
 

package/src/lib/showModal/toast.tsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { View, Text, Image, StyleSheet, ActivityIndicator } from 'react-native'
 import RootSiblings from 'react-native-root-siblings'
 import successPng from './success.png'
-import { errorHandler, shouleBeObject, successHandler } from '../../utils'
+import { errorHandler, shouldBeObject, successHandler } from '../../utils'
 
 const styles = StyleSheet.create({
   toastView: {
@@ -107,8 +107,8 @@ WXLoading.propTypes = {
   mask: PropTypes.bool
 }
 
-function showToast (options: Taro.showToast.Option): Promise<Taro.General.CallbackResult> {
-  const isObject = shouleBeObject(options)
+function showToast (options: Taro.showToast.Option): Promise<TaroGeneral.CallbackResult> {
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `showToast${isObject.msg}` }
     console.error(res.errMsg)
@@ -174,8 +174,8 @@ function showToast (options: Taro.showToast.Option): Promise<Taro.General.Callba
   }
 }
 
-function showLoading (options: Taro.showLoading.Option): Promise<Taro.General.CallbackResult> {
-  const isObject = shouleBeObject(options)
+function showLoading (options: Taro.showLoading.Option): Promise<TaroGeneral.CallbackResult> {
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `showLoading${isObject.msg}` }
     console.error(res.errMsg)

package/src/lib/vibrate.ts

@@ -1,7 +1,7 @@
 import { Vibration } from 'react-native'
 import { errorHandler, successHandler } from '../utils'
 
-function vibrate (DURATION, API, OPTS): Promise<Taro.General.CallbackResult> {
+function vibrate (DURATION, API, OPTS): Promise<TaroGeneral.CallbackResult> {
   const res = { errMsg: `${API}:ok` }
     const { success, fail, complete } = OPTS
     try {
@@ -13,11 +13,11 @@ function vibrate (DURATION, API, OPTS): Promise<Taro.General.CallbackResult> {
     }
 }
 
-function vibrateShort (opts: Taro.vibrateShort.Option = {}): Promise<Taro.General.CallbackResult> {
+function vibrateShort (opts: Taro.vibrateShort.Option = {}): Promise<TaroGeneral.CallbackResult> {
   return vibrate(15, 'vibrateShort', opts)
 }
 
-function vibrateLong (opts: Taro.vibrateLong.Option = {}): Promise<Taro.General.CallbackResult> {
+function vibrateLong (opts: Taro.vibrateLong.Option = {}): Promise<TaroGeneral.CallbackResult> {
   return vibrate(400, 'vibrateLong', opts)
 }
 

package/src/utils/index.ts

@@ -1,4 +1,4 @@
-interface ShouleBeObjectResult {
+interface ShouldBeObjectResult {
   res: boolean;
   msg?: string;
 }
@@ -18,7 +18,7 @@ export function getParameterError ({ correct, wrong }: GetParameterErrorOption):
   return `fail parameter error: ${parameter} should be ${correct} instead of ${errorType}`
 }
 
-export function shouleBeObject (target: unknown): ShouleBeObjectResult {
+export function shouldBeObject (target: unknown): ShouldBeObjectResult {
   if (target && typeof target === 'object') return { res: true }
   return {
     res: false,
@@ -29,16 +29,16 @@ export function shouleBeObject (target: unknown): ShouleBeObjectResult {
   }
 }
 
-export function successHandler (success?: (res: Taro.General.CallbackResult) => void, complete?: (res: Taro.General.CallbackResult) => void) {
-  return function (res: Taro.General.CallbackResult): Promise<any> {
+export function successHandler (success?: (res: TaroGeneral.CallbackResult) => void, complete?: (res: TaroGeneral.CallbackResult) => void) {
+  return function (res: TaroGeneral.CallbackResult): Promise<any> {
     success && success(res)
     complete && complete(res)
     return Promise.resolve(res)
   }
 }
 
-export function errorHandler (fail?: (res: Taro.General.CallbackResult) => void, complete?: (res: Taro.General.CallbackResult) => void) {
-  return function (res: Taro.General.CallbackResult): Promise<any> {
+export function errorHandler (fail?: (res: TaroGeneral.CallbackResult) => void, complete?: (res: TaroGeneral.CallbackResult) => void) {
+  return function (res: TaroGeneral.CallbackResult): Promise<any> {
     fail && fail(res)
     complete && complete(res)
     return Promise.reject(res)

package/dist/lib/system.js

@@ -1,21 +0,0 @@
-import { Dimensions, Platform } from 'react-native';
-export const isIPhoneX = (function () {
-    const X_WIDTH = 375;
-    const X_HEIGHT = 812;
-    const XS_MAX_WIDTH = 414;
-    const XS_MAX_HEIGHT = 896;
-    const getResolvedDimensions = () => {
-        const { width, height } = Dimensions.get('window');
-        if (width === 0 && height === 0)
-            return Dimensions.get('window');
-        return { width, height };
-    };
-    const { height: D_HEIGHT, width: D_WIDTH } = getResolvedDimensions();
-    if (Platform.OS === 'web')
-        return false;
-    return ((D_HEIGHT === X_HEIGHT && D_WIDTH === X_WIDTH) ||
-        (D_HEIGHT === X_WIDTH && D_WIDTH === X_HEIGHT) ||
-        ((D_HEIGHT === XS_MAX_HEIGHT && D_WIDTH === XS_MAX_WIDTH) ||
-            (D_HEIGHT === XS_MAX_WIDTH && D_WIDTH === XS_MAX_HEIGHT)));
-})();
-//# sourceMappingURL=system.js.map

package/dist/lib/system.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"system.js","sourceRoot":"","sources":["../../src/lib/system.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC;IACzB,MAAM,OAAO,GAAG,GAAG,CAAA;IACnB,MAAM,QAAQ,GAAG,GAAG,CAAA;IACpB,MAAM,YAAY,GAAG,GAAG,CAAA;IACxB,MAAM,aAAa,GAAG,GAAG,CAAA;IAEzB,MAAM,qBAAqB,GAAG,GAAG,EAAE;QAClC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAClD,IAAI,KAAK,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC;YAAE,OAAO,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAChE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;IACzB,CAAC,CAAA;IAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,qBAAqB,EAAE,CAAA;IAEpE,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK;QAAE,OAAO,KAAK,CAAA;IAEvC,OAAO,CACN,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,KAAK,OAAO,CAAC;QAC9C,CAAC,QAAQ,KAAK,OAAO,IAAI,OAAO,KAAK,QAAQ,CAAC;QAC9C,CAAC,CAAC,QAAQ,KAAK,aAAa,IAAI,OAAO,KAAK,YAAY,CAAC;YACzD,CAAC,QAAQ,KAAK,YAAY,IAAI,OAAO,KAAK,aAAa,CAAC,CAAC,CACzD,CAAA;AACF,CAAC,CAAC,EAAE,CAAA"}

package/src/lib/system.ts

@@ -1,25 +0,0 @@
-import { Dimensions, Platform } from 'react-native'
-
-export const isIPhoneX = (function () {
-	const X_WIDTH = 375
-	const X_HEIGHT = 812
-	const XS_MAX_WIDTH = 414
-	const XS_MAX_HEIGHT = 896
-
-	const getResolvedDimensions = () => {
-		const { width, height } = Dimensions.get('window')
-		if (width === 0 && height === 0) return Dimensions.get('window')
-		return { width, height }
-	}
-
-	const { height: D_HEIGHT, width: D_WIDTH } = getResolvedDimensions()
-
-	if (Platform.OS === 'web') return false
-
-	return (
-		(D_HEIGHT === X_HEIGHT && D_WIDTH === X_WIDTH) ||
-		(D_HEIGHT === X_WIDTH && D_WIDTH === X_HEIGHT) ||
-		((D_HEIGHT === XS_MAX_HEIGHT && D_WIDTH === XS_MAX_WIDTH) ||
-		(D_HEIGHT === XS_MAX_WIDTH && D_WIDTH === XS_MAX_HEIGHT))
-	)
-})()