@tarojs/taro-rn 4.0.1 → 4.0.2

package/src/lib/createCameraContext/index.ts

@@ -1,5 +1,7 @@
+import { Camera } from 'expo-camera'
+
 import { errorHandler, successHandler } from '../../utils'
-import { requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera'
+
 const globalAny: any = global
 
 class CameraContext {
@@ -14,8 +16,8 @@ class CameraContext {
    * 开始录像
    */
   startRecord = (option: Taro.CameraContext.StartRecordOption) => {
-    Promise.all([requestCameraPermissionsAsync(), requestMicrophonePermissionsAsync()]).then(([cameraPermission, microphonePermission]) => {
-      if(cameraPermission.granted && microphonePermission.granted) {
+    Promise.all([Camera.requestCameraPermissionsAsync(), Camera.requestMicrophonePermissionsAsync()]).then(([cameraPermission, microphonePermission]) => {
+      if (cameraPermission.granted && microphonePermission.granted) {
         this.cameraRef?.recordAsync().then((res) => {
           const { uri } = res
           const result = {
@@ -76,7 +78,7 @@ class CameraContext {
         break
     }
     try {
-      const { granted } = await requestCameraPermissionsAsync()
+      const { granted } = await Camera.requestCameraPermissionsAsync()
       if (granted) {
         if (this.cameraRef?.takePictureAsync) {
           const { uri } = await this.cameraRef.takePictureAsync({ quality: _quality })

package/src/lib/createInnerAudioContext/index.ts

@@ -1,4 +1,5 @@
 import { Audio } from 'expo-av'
+
 import { isUrl } from '../../utils'
 
 /**

package/src/lib/createSelectorQuery/index.ts

@@ -1 +1 @@
-export { createSelectorQuery } from '../unsupportedApi'
+export { createSelectorQuery } from '../unsupportedApi'

package/src/lib/deviceMotion.ts

@@ -1,6 +1,7 @@
 import Taro from '@tarojs/taro'
 import { DeviceMotion } from 'expo-sensors'
-import { createCallbackManager, successHandler, errorHandler } from '../utils'
+
+import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const _cbManager = createCallbackManager()
 let _listener: any
@@ -44,7 +45,7 @@ function startDeviceMotionListening (object: Taro.startDeviceMotionListening.Opt
       _cbManager.trigger(rotation)
     })
     DeviceMotion.setUpdateInterval(intervalMap[interval] || intervalMap.normal)
-    
+
     return successHandler(success, complete)(res)
   } catch (error) {
     res.errMsg = 'startDeviceMotionListening:fail'
@@ -71,8 +72,8 @@ function stopDeviceMotionListening (object: Taro.stopDeviceMotionListening.Optio
 }
 
 export {
-  onDeviceMotionChange,
   offDeviceMotionChange,
+  onDeviceMotionChange,
   startDeviceMotionListening,
   stopDeviceMotionListening
 }

package/src/lib/file.ts

@@ -1,14 +1,15 @@
 import * as FileSystem from 'expo-file-system'
 import { Platform } from 'react-native'
-import { shouldBeObject, successHandler, errorHandler } from '../utils'
+
+import { errorHandler, shouldBeObject, successHandler } from '../utils'
 
 interface Func {
   (arg: any): void
 }
 
 interface ExtPromise<T> extends Promise<T> {
-  onProgressUpdateCb?: Func,
-  onProgressUpdate?: Func,
+  onProgressUpdateCb?: Func
+  onProgressUpdate?: Func
   abort?: Func
 }
 
@@ -339,10 +340,10 @@ async function getFileInfo (opts: Taro.getFileInfo.Option): Promise<Taro.getFile
 
 export {
   downloadFile,
-  uploadFile,
-  saveFile,
-  removeSavedFile,
-  getSavedFileList,
+  getFileInfo,
   getSavedFileInfo,
-  getFileInfo
+  getSavedFileList,
+  removeSavedFile,
+  saveFile,
+  uploadFile
 }

package/src/lib/getClipboardData/index.ts

@@ -1,4 +1,5 @@
 import Clipboard from '@react-native-clipboard/clipboard'
+
 import { errorHandler } from '../../utils'
 
 export function getClipboardData (opts: Taro.getClipboardData.Option = {}): Promise<Taro.getClipboardData.Promised> {

package/src/lib/getEnv/index.ts

@@ -2,4 +2,4 @@ import { ENV_TYPE } from '../ENV_TYPE'
 
 export function getEnv(): string {
   return ENV_TYPE.RN
-}
+}

package/src/lib/getFileSystemManager/index.ts

@@ -1 +1 @@
-export { getFileSystemManager } from '../unsupportedApi'
+export { getFileSystemManager } from '../unsupportedApi'

package/src/lib/getLocation/index.ts

@@ -1,14 +1,19 @@
 import Geolocation from '@react-native-community/geolocation'
-import { requestForegroundPermissionsAsync } from 'expo-location'
+
 import { errorHandler } from '../../utils'
 
 export async function getLocation(opts: Taro.getLocation.Option = {}): Promise<Taro.getLocation.SuccessCallbackResult> {
   const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts
+  const requestAuthorization = () => {
+    return new Promise((resolve, reject) => {
+      Geolocation.requestAuthorization(() => resolve({ granted: true }), (err) => reject(err))
+    })
+  }
 
   try {
     // @ts-ignore
     // todo: fix types
-    const { granted } = await requestForegroundPermissionsAsync()
+    const { granted } = await requestAuthorization()
     if (!granted) {
       const res = { errMsg: 'Permissions denied!' }
       return errorHandler(fail, complete)(res)

package/src/lib/getRecorderManager/index.ts

@@ -81,7 +81,7 @@ class RecorderManager {
         playsInSilentModeIOS: true,
         staysActiveInBackground: false,
         shouldDuckAndroid: true,
-        interruptionModeAndroid: 1, //InterruptionModeAndroid.DoNotMix
+        interruptionModeAndroid: 1, // InterruptionModeAndroid.DoNotMix
         playThroughEarpieceAndroid: true
       } as any)
 
@@ -151,7 +151,12 @@ class RecorderManager {
         const info = await FileSystem.getInfoAsync(uri)
         // console.log(`FILE INFO: ${JSON.stringify(info)}`)
 
-        const result = { tempFilePath: uri, duration: recordStatus.durationMillis, fileSize: info.size }
+        const result = {
+          tempFilePath: uri,
+          duration: recordStatus.durationMillis,
+          // @ts-ignore
+          fileSize: info.size
+        }
         this.onStopCallback && this.onStopCallback(result)
       }
     } catch (error) {

package/src/lib/getStorage/index.ts

@@ -1,4 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
+
 import { errorHandler, successHandler } from '../../utils'
 
 export async function getStorage(option: Taro.getStorage.Option<any>): Promise<Taro.getStorage.SuccessCallbackResult<any>> {

package/src/lib/getStorageInfo/index.ts

@@ -1,4 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
+
 import { errorHandler, successHandler } from '../../utils'
 
 async function getStorageCurrentSize() {

package/src/lib/getStorageInfoSync/index.ts

@@ -1 +1 @@
-export { getStorageInfoSync } from '../unsupportedApi'
+export { getStorageInfoSync } from '../unsupportedApi'

package/src/lib/getStorageSync/index.ts

@@ -1 +1 @@
-export { getStorageSync } from '../unsupportedApi'
+export { getStorageSync } from '../unsupportedApi'

package/src/lib/getSystemInfo/index.ts

@@ -1,7 +1,7 @@
+import { errorHandler, successHandler } from '../../utils'
 import { getSystemInfoSync } from '../getSystemInfoSync'
-import { successHandler, errorHandler } from '../../utils'
 
-export function getSystemInfo(opts: Taro.getSystemInfo.Option  = {}): Promise<Taro.getSystemInfo.Result> {
+export function getSystemInfo(opts: Taro.getSystemInfo.Option = {}): Promise<Taro.getSystemInfo.Result> {
   const { success, fail, complete }: any = opts
   try {
     const res = {

package/src/lib/getSystemInfoSync/index.ts

@@ -1,11 +1,11 @@
 import {
-  Platform,
   Dimensions,
   PixelRatio,
+  Platform,
   StatusBar
 } from 'react-native'
-import { initialWindowMetrics } from 'react-native-safe-area-context'
 import DeviceInfo from 'react-native-device-info'
+import { initialWindowMetrics } from 'react-native-safe-area-context'
 
 export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
   const res: any = {}
@@ -28,7 +28,7 @@ export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
   let { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
   // NOTE：android 在沉浸式切换时，有几率top值为0。
   // https://github.com/th3rdwave/react-native-safe-area-context/issues/364
-  if(Platform.OS === 'android') { top = StatusBar.currentHeight || 0; }
+  if (Platform.OS === 'android') { top = StatusBar.currentHeight || 0 }
 
   try {
     const W = Math.min(screenWidth, screenHeight)

package/src/lib/gyroscope.ts

@@ -1,83 +1,84 @@
 import { Gyroscope } from 'expo-sensors'
+
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const _cbManager = createCallbackManager()
 let _listener: any
 
 const intervalMap: any = {
-    game: 20,
-    ui: 60,
-    normal: 200
+  game: 20,
+  ui: 60,
+  normal: 200
 }
 
 /**
  * 开始监听陀螺仪数据
- * @param opts 
+ * @param opts
  * @param {string} [opts.interval='normal'] 监听陀螺仪数据回调函数的执行频率
  */
 function startGyroscope(opts: Taro.startGyroscope.Option = {}): Promise<TaroGeneral.CallbackResult> {
-    const { interval = 'normal', success, fail, complete } = opts
-    const res = { errMsg: 'startGyroscope:ok' }
-    try {
-        // 适配微信小程序行为：重复 start 失败
-        if (_listener) {
-            console.error('startGyroscope:fail')
-            throw new Error('startGyroscope:fail')
-        }
-        _listener = Gyroscope.addListener(e => {
-            _cbManager.trigger(e)
-        })
-        Gyroscope.setUpdateInterval(intervalMap[interval])
-        
-        return successHandler(success, complete)(res)
-    } catch (error) {
-        res.errMsg = 'startGyroscope:fail'
-        return errorHandler(fail, complete)(res)
+  const { interval = 'normal', success, fail, complete } = opts
+  const res = { errMsg: 'startGyroscope:ok' }
+  try {
+    // 适配微信小程序行为：重复 start 失败
+    if (_listener) {
+      console.error('startGyroscope:fail')
+      throw new Error('startGyroscope:fail')
     }
+    _listener = Gyroscope.addListener(e => {
+      _cbManager.trigger(e)
+    })
+    Gyroscope.setUpdateInterval(intervalMap[interval])
+
+    return successHandler(success, complete)(res)
+  } catch (error) {
+    res.errMsg = 'startGyroscope:fail'
+    return errorHandler(fail, complete)(res)
+  }
 }
 
 /**
  * 停止监听陀螺仪数据
- * @param opts 
+ * @param opts
  */
 function stopGyroscope(opts: Taro.stopGyroscope.Option = {}): Promise<TaroGeneral.CallbackResult> {
-    const { success, fail, complete } = opts
-    const res = { errMsg: 'stopGyroscope:ok' }
-    try {
-        _listener && _listener.remove()
-        _listener = null
-        return successHandler(success, complete)(res)
-    } catch (error) {
-        res.errMsg = 'stopGyroscope:fail'
-        return errorHandler(fail, complete)(res)
-    }
+  const { success, fail, complete } = opts
+  const res = { errMsg: 'stopGyroscope:ok' }
+  try {
+    _listener && _listener.remove()
+    _listener = null
+    return successHandler(success, complete)(res)
+  } catch (error) {
+    res.errMsg = 'stopGyroscope:fail'
+    return errorHandler(fail, complete)(res)
+  }
 }
 
 /**
  * 监听陀螺仪数据变化事件
- * @param opts 
+ * @param opts
  */
 function onGyroscopeChange(fnc: Taro.onGyroscopeChange.Callback): void {
-    _cbManager.add(fnc)
+  _cbManager.add(fnc)
 }
 
 /**
  * 取消监听陀螺仪数据变化事件
- * @param opts 
+ * @param opts
  */
 function offGyroscopeChange(fnc?: Taro.onGyroscopeChange.Callback) {
-    if (fnc && typeof fnc === 'function') {
-        _cbManager.remove(fnc)
-    } else if (fnc === undefined) {
-        _cbManager.clear()
-    } else {
-        console.warn('offGyroscopeChange failed')
-    }
+  if (fnc && typeof fnc === 'function') {
+    _cbManager.remove(fnc)
+  } else if (fnc === undefined) {
+    _cbManager.clear()
+  } else {
+    console.warn('offGyroscopeChange failed')
+  }
 }
 
 export {
-    startGyroscope,
-    stopGyroscope,
-    onGyroscopeChange,
-    offGyroscopeChange,
+  offGyroscopeChange,
+  onGyroscopeChange,
+  startGyroscope,
+  stopGyroscope,
 }

package/src/lib/index.ts

@@ -5,6 +5,7 @@ export * from './authorize'
 export * from './base64ToArrayBuffer'
 export * from './canIUse'
 export * from './chooseImage'
+export * from './chooseMedia'
 export * from './chooseVideo'
 export * from './clearStorage'
 export * from './clearStorageSync'

package/src/lib/keyboard.ts

@@ -1,4 +1,5 @@
 import { Keyboard } from 'react-native'
+
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): Promise<TaroGeneral.CallbackResult> => {
@@ -27,8 +28,8 @@ const keyboardHeightListener = (e) => {
 const onKeyboardHeightChange = (callback: Taro.onKeyboardHeightChange.Callback): void => {
   _cbManager.add(callback)
   if (!_hasListener) {
-    Keyboard.addListener("keyboardDidShow", keyboardHeightListener)
-    Keyboard.addListener("keyboardDidHide", keyboardHeightListener)
+    Keyboard.addListener('keyboardDidShow', keyboardHeightListener)
+    Keyboard.addListener('keyboardDidHide', keyboardHeightListener)
     _hasListener = true
   }
 }
@@ -53,7 +54,7 @@ const offKeyboardHeightChange = (callback?: Taro.onKeyboardHeightChange.Callback
 }
 
 export {
-  onKeyboardHeightChange,
+  hideKeyboard,
   offKeyboardHeightChange,
-  hideKeyboard
+  onKeyboardHeightChange
 }

package/src/lib/location.ts

@@ -1,4 +1,5 @@
 import Geolocation from '@react-native-community/geolocation'
+
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const _cbManager = createCallbackManager()
@@ -20,8 +21,8 @@ export function offLocationChange(callback: Taro.onLocationChange.Callback): voi
 
 /**
  * 开始监听位置信息
- * @param opts 
- * @returns 
+ * @param opts
+ * @returns
  */
 export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = opts
@@ -63,8 +64,8 @@ export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Prom
 
 /**
  * 停止监听位置信息
- * @param opts 
- * @returns 
+ * @param opts
+ * @returns
  */
 export function stopLocationUpdate(opts: Taro.stopLocationUpdate.Option): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = opts
@@ -79,4 +80,4 @@ export function stopLocationUpdate(opts: Taro.stopLocationUpdate.Option): Promis
 
     return errorHandler(fail, complete)(res)
   }
-}
+}

package/src/lib/makePhoneCall/index.ts

@@ -1,5 +1,6 @@
 import { Linking } from 'react-native'
-import { successHandler, errorHandler } from '../../utils'
+
+import { errorHandler, successHandler } from '../../utils'
 
 export async function makePhoneCall(opts: Taro.makePhoneCall.Option): Promise<TaroGeneral.CallbackResult> {
   const { phoneNumber, success, fail, complete } = opts

package/src/lib/media.ts

@@ -1,16 +1,21 @@
-import { CameraRoll } from "@react-native-camera-roll/camera-roll"
-import { requestCameraPermissionsAsync } from 'expo-camera'
-import * as ImagePicker from 'expo-image-picker'
-import { successHandler, errorHandler } from '../utils'
+import { CameraRoll } from '@react-native-camera-roll/camera-roll'
+import { Camera } from 'expo-camera'
+import {
+  ImagePickerAsset,
+  launchCameraAsync,
+  launchImageLibraryAsync,
+  MediaTypeOptions,
+  requestMediaLibraryPermissionsAsync,
+} from 'expo-image-picker'
 
-export const MEDIA_TYPE = {
-  VIDEOS: 'Videos',
-  IMAGES: 'Images'
-}
+import { errorHandler, successHandler } from '../utils'
+import { showActionSheet } from './showActionSheet'
+
+export const MEDIA_TYPE = MediaTypeOptions
 
 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 { granted } = await ImagePicker.requestMediaLibraryPermissionsAsync()
+  const { granted } = await requestMediaLibraryPermissionsAsync()
   if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     return errorHandler(fail, complete)(res)
@@ -20,7 +25,7 @@ export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.
   const saveType = (type === 'video' || type === 'photo') ? type : 'auto'
   try {
     const url: string = await CameraRoll.save(filePath, { type: saveType })
-    res.path = url;
+    res.path = url
     return successHandler(success, complete)(res)
   } catch (err) {
     res.errMsg = err.message
@@ -28,54 +33,101 @@ export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.
   }
 }
 
-export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option, mediaTypes: string): Promise<TaroGeneral.CallbackResult> {
-  if (!opts || typeof opts !== 'object') {
-    opts = {}
+async function showPicker(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option, mediaTypes: MediaTypeOptions):Promise<any> {
+  const { fail, complete } = opts
+  try {
+    const res = await showActionSheet({
+      itemList: ['拍摄', '从手机相册选择'],
+    })
+    if (res.tapIndex === 0) {
+      return _chooseMedia({ ...opts, sourceType: ['camera'] }, mediaTypes)
+    }
+    if (res.tapIndex === 1) {
+      return _chooseMedia({ ...opts, sourceType: ['album'] }, mediaTypes)
+    }
+  } catch (err) {
+    const res = {
+      errMsg: `choose${
+        mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
+      } fail`
+    }
+    fail?.(res)
+    complete?.(res)
+  }
+}
+
+export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option = {}, mediaTypes: MediaTypeOptions): Promise<TaroGeneral.CallbackResult> {
+  const {
+    sourceType = ['album', 'camera'],
+  } = opts
+  if (sourceType?.includes('camera') && sourceType?.includes('album')) {
+    return showPicker(opts, mediaTypes)
+  } else if (sourceType?.includes('camera')) {
+    return _chooseMedia({ ...opts, sourceType: ['camera'] }, mediaTypes)
   }
-  const { sizeType = [], sourceType = [], success, fail, complete, maxDuration } = opts as any
+  return _chooseMedia({ ...opts, sourceType: ['album'] }, mediaTypes)
+}
+
+export async function _chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option = {}, mediaTypes: MediaTypeOptions): Promise<TaroGeneral.CallbackResult> {
+  const {
+    sizeType = [],
+    sourceType = [],
+    success,
+    fail,
+    complete,
+    maxDuration,
+    count = (mediaTypes === MEDIA_TYPE.Videos ? 1 : 9),
+    compressed
+  } = opts as any
   const options = {
     mediaTypes,
-    quality: sizeType[0] === 'compressed' ? 0.7 : 1,
-    videoMaxDuration: maxDuration
+    quality: (sizeType[0] === 'compressed' || compressed) ? 0.7 : 1,
+    videoMaxDuration: maxDuration,
+    allowsMultipleSelection: count > 1,
+    selectionLimit: count,
   }
+  const messString = mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
   const isCamera = sourceType[0] === 'camera'
-  const { granted } = isCamera ? await requestCameraPermissionsAsync() : await ImagePicker.requestMediaLibraryPermissionsAsync()
+  const { granted } = isCamera ? await Camera.requestCameraPermissionsAsync() : await requestMediaLibraryPermissionsAsync()
   if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     return errorHandler(fail, complete)(res)
   }
 
-  let launchMediaAsync = isCamera ? ImagePicker.launchCameraAsync : ImagePicker.launchImageLibraryAsync
+  const launchMediaAsync = isCamera ? launchCameraAsync : launchImageLibraryAsync
   try {
-    const resp: any = await launchMediaAsync(options as any)
-    const { uri, duration, width, height } = resp
-    resp.path = uri
-
+    const resp = await launchMediaAsync(options)
     let res: any = {}
-    if (mediaTypes === MEDIA_TYPE.VIDEOS) {
+    if (mediaTypes === MEDIA_TYPE.Videos) {
+      const asset = resp.assets?.[0]
       res = {
-        tempFilePath: uri,
-        duration,
-        width,
-        height
+        ...asset,
+        tempFilePath: asset?.uri,
+        size: asset?.fileSize,
       }
     } else {
       res = {
-        tempFilePaths: [uri],
-        tempFiles: [resp]
+        tempFilePaths: resp.assets?.map((item) => item.uri),
+        tempFiles: resp.assets?.map((item: ImagePickerAsset) => ({
+          ...item,
+          path: item.uri,
+          size: item.fileSize,
+          type: item.mimeType,
+          fileType: item.mimeType?.startsWith('video') ? 'video' : 'image',
+        }))
       }
     }
     if (res.tempFilePath || (!!res.tempFilePaths && res.tempFilePaths.length > 0)) {
       return successHandler(success, complete)(res)
     } else {
       const res = {
-        errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo:fail cancel' : 'chooseImage:fail cancel',
+        errMsg: `choose${messString}:fail cancel`
       }
       return errorHandler(fail, complete)(res)
     }
   } catch (err) {
     const res = {
-      errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo fail' : 'chooseImage fail',
+      errMsg: `choose${messString}:fail`,
       err
     }
     return errorHandler(fail, complete)(res)

package/src/lib/network.ts

@@ -1,16 +1,16 @@
-import NetInfo, { NetInfoStateType, NetInfoState } from '@react-native-community/netinfo'
+import NetInfo, { NetInfoState, NetInfoStateType } from '@react-native-community/netinfo'
 
 let _unsubscribe: any = null
 
-let _callbacks: Set<Function> = new Set()
+const _callbacks: Set<Function> = new Set()
 
 function getTypeFromState(connectionInfo:NetInfoState): keyof Taro.getNetworkType.NetworkType {
   let type: keyof Taro.getNetworkType.NetworkType
-  if(connectionInfo.type === NetInfoStateType.wifi) {
+  if (connectionInfo.type === NetInfoStateType.wifi) {
     type = NetInfoStateType.wifi
-  } else if(connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
+  } else if (connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
     type = connectionInfo.details.cellularGeneration
-  } else if(connectionInfo.type === NetInfoStateType.none) {
+  } else if (connectionInfo.type === NetInfoStateType.none) {
     type = 'none'
   } else {
     type = 'unknown'

package/src/lib/offLocationChange/index.ts

@@ -1 +1 @@
-export { offLocationChange } from '../location'
+export { offLocationChange } from '../location'

package/src/lib/offUserCaptureScreen/index.ts

@@ -1 +1 @@
-export { offUserCaptureScreen } from '../unsupportedApi'
+export { offUserCaptureScreen } from '../unsupportedApi'

package/src/lib/onLocationChange/index.ts

@@ -1 +1 @@
-export { onLocationChange } from '../location'
+export { onLocationChange } from '../location'

package/src/lib/onUserCaptureScreen/index.ts

@@ -1 +1 @@
-export { onUserCaptureScreen } from '../unsupportedApi'
+export { onUserCaptureScreen } from '../unsupportedApi'

package/src/lib/onWindowResize/index.ts

@@ -1,4 +1,4 @@
-import { callbackManager, addListener } from '../window'
+import { addListener, callbackManager } from '../window'
 
 /**
  * @typedef {Object} WindowResizeParam
@@ -15,4 +15,4 @@ export const onWindowResize = (callback: Taro.onWindowResize.Callback): void =>
   if (callbackManager.count() === 1) {
     addListener()
   }
-}
+}