@tarojs/taro-rn 4.0.1-alpha.0 → 4.0.1

package/src/lib/chooseImage/index.ts

@@ -1,5 +1,157 @@
-import { chooseMedia, MEDIA_TYPE } from '../media'
+import SYImagePicker from 'react-native-syan-image-picker'
 
-export function chooseImage(opts: Taro.chooseImage.Option): Promise<any> {
-  return chooseMedia(opts, MEDIA_TYPE.Images)
+import { shouldBeObject } from '../../utils'
+import { showActionSheet } from '../showActionSheet'
+
+const res = { errMsg: 'chooseImage:ok' }
+const defaultOptions = {
+  count: 9,
+  sizeType: ['original', 'compressed'],
+  sourceType: ['album', 'camera']
+}
+
+function getRes(images) {
+  const tempFilePaths: string[] = []
+  const tempFiles: any[] = []
+  images.forEach((item: any) => {
+    tempFilePaths.push(item.uri)
+    tempFiles.push({
+      path: item.uri,
+      size: item.size
+    })
+  })
+  return { tempFilePaths, tempFiles }
+}
+
+function openCamera(options: Taro.chooseImage.Option): Promise<Taro.chooseImage.SuccessCallbackResult> {
+  const { success, fail, complete } = options
+  return new Promise((resolve, reject) => {
+    SYImagePicker.openCamera({
+      compressFocusAlpha: true
+    }, (err, photo: any) => {
+      if (err) {
+        const res = {
+          errMsg: err
+        }
+        fail?.(res)
+        complete?.(res)
+        reject(res)
+      } else {
+        try {
+          const data = Object.assign({}, getRes(photo), res)
+          success?.(data)
+          complete?.(data)
+          resolve(data)
+        } catch (error) {
+          // 错误
+          reject(error)
+        }
+      }
+    })
+  })
+}
+
+// NOTE: 调用此函数会改变图片的像素尺寸
+function openPicker(options: Taro.chooseImage.Option): Promise<Taro.chooseImage.SuccessCallbackResult> {
+  const { count: imageCount, sizeType = [],success, complete, fail } = options
+  return new Promise((resolve, reject) => {
+    // NOTE：react-native-syan-image-picker 暂不支持 Android 端压缩
+    SYImagePicker.showImagePicker({
+      compressFocusAlpha: true,
+      imageCount,
+      quality: sizeType[0] === 'compressed' ? 70 : 90,
+    }, (err, photos: any) => {
+      if (err) {
+        const res = {
+          errMsg: err
+        }
+        fail?.(res)
+        complete?.(res)
+        reject(res)
+      } else {
+        try {
+          const data = Object.assign({}, getRes(photos), res)
+          success?.(data)
+          complete?.(data)
+          resolve(data)
+        } catch (error) {
+          reject(error)
+        }
+      }
+    })
+  })
+}
+
+/**
+ * @description Display the image picker.
+ * @param options
+ * @returns {Promise}
+ */
+function showImagePicker(options: Taro.chooseImage.Option):Promise<Taro.chooseImage.SuccessCallbackResult> {
+  const { fail, complete } = options
+  return new Promise((resolve, reject) => {
+    showActionSheet({
+      itemList: ['拍照', '从手机相册选择'],
+      success(res) {
+        console.log(res.tapIndex)
+        if (res.tapIndex === 0) {
+          // 不添加 setTimeout 会有一定概率卡死，肯能是与 sibling.destroy() 冲突
+          setTimeout(() => {
+            openCamera(options).then(res => {
+              resolve(res)
+            }).catch(e => {
+              fail?.({ errMsg: `chooseImage:${e.message}` })
+              complete?.({ errMsg: `chooseImage:${e.message}` })
+              reject(new Error(`chooseImage:${e.message}`))
+            })
+          }, 100)
+        }
+        if (res.tapIndex === 1) {
+          setTimeout(() => {
+            openPicker(options).then(res => {
+              resolve(res)
+            }).catch(e => {
+              fail?.({ errMsg: `chooseImage:${e.message}` })
+              complete?.({ errMsg: `chooseImage:${e.message}` })
+              reject(new Error(`chooseImage:${e.message}`))
+            })
+          }, 100)
+        }
+      },
+      fail(res) {
+        console.log('error: ', res.errMsg)
+      }
+    })
+  })
+}
+
+/**
+ * @deprecated
+ * @description 从本地相册选择图片或使用相机拍照。
+ *  sizeType ❌
+ * @param options
+ * @returns {Promise<*>}
+ */
+export function chooseImage(options: Taro.chooseImage.Option): Promise<Taro.chooseImage.SuccessCallbackResult> {
+  // options must be an Object
+  const isObject = shouldBeObject(options)
+  if (!isObject.res) {
+    const res = { errMsg: `chooseImage${isObject.msg}` }
+    console.error(res.errMsg)
+    return Promise.reject(res)
+  }
+
+  options = Object.assign({}, defaultOptions, options)
+  const { sourceType } = options
+
+  switch (JSON.stringify(sourceType)) {
+    case '[\'camera\']':
+    case '["camera"]':
+      return openCamera(options)
+    case '[\'album\']':
+    case '["album"]':
+      return openPicker(options)
+    default:
+      return showImagePicker(options)
+  }
 }

package/src/lib/chooseVideo/index.ts

@@ -1,5 +1,60 @@
 import { chooseMedia, MEDIA_TYPE } from '../media'
+import { showActionSheet } from '../showActionSheet'
 
+/**
+ * 拍摄视频或从手机相册中选视频。
+ * @param {Object} opts
+ * @param {Array} [opts.sourceType=['album', 'camera']] ✔
+ * @param {boolean} [opts.compressed=true] ✔
+ * @param {number} [opts.maxDuration=60] - 拍摄视频最长拍摄时间，单位秒 ✖
+ * @param {string} [opts.camera='back'] - 默认拉起的是前置或者后置摄像头。✖
+ * @returns {Promise<*>}
+ */
 export function chooseVideo(opts: Taro.chooseVideo.Option): Promise<any> {
-  return chooseMedia(opts, MEDIA_TYPE.Videos)
+  const { sourceType, compressed } = opts
+  opts = Object.assign(opts, { sizeType: compressed ? ['compressed'] : [] })
+  switch (JSON.stringify(sourceType)) {
+    case '[\'camera\']':
+    case '["camera"]':
+      return chooseMedia({...opts, sourceType: ['camera']}, MEDIA_TYPE.VIDEOS)
+    case '[\'album\']':
+    case '["album"]':
+      return chooseMedia({...opts, sourceType: ['album']}, MEDIA_TYPE.VIDEOS)
+    default:
+      return showVideoPicker(opts)
+  }
+}
+
+/**
+ * 视频选择器
+ * @param options
+ * @returns {Promise}
+ */
+function showVideoPicker(options: Taro.chooseVideo.Option):any {
+  const { fail, complete } = options
+  return new Promise((resolve, reject) => { 
+    showActionSheet({
+      itemList: ['拍摄', '从手机相册选择'],
+      success: function (res) {
+        if (res.tapIndex === 0) {
+          resolve(chooseMedia({...options, sourceType: ['camera']}, MEDIA_TYPE.VIDEOS))
+        }
+        if (res.tapIndex === 1) {
+          resolve(chooseMedia({...options, sourceType: ['album']}, MEDIA_TYPE.VIDEOS))
+        }
+      },
+      fail: function () {
+        const res = { errMsg: 'chooseVideo:fail cancel' }
+        reject(res)
+      }
+    }).catch(err => {
+      console.log('error: ', err.errMsg)
+      if (/showActionSheet:fail cancel/.test(err.errMsg)) {
+        const res = { errMsg: 'chooseVideo:fail cancel' }
+        fail?.(res)
+        complete?.(res)
+        reject(res)
+      }
+    })
+  })
 }

package/src/lib/clearStorage/index.ts

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

package/src/lib/clearStorageSync/index.ts

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

package/src/lib/compressImage/index.ts

@@ -1,6 +1,5 @@
 import ImageResizer, { ResizeFormat } from '@bam.tech/react-native-image-resizer'
 import { Image } from 'react-native'
-
 import { errorHandler, successHandler } from '../../utils'
 
 /**

package/src/lib/connectSocket/socketTask.ts

@@ -1,11 +1,13 @@
-class SocketTask {
-  ws: WebSocket
-  _destroyWhenClose: () => void
+interface SocketTask {
+  ws: WebSocket;
+  _destroyWhenClose: () => void;
   closeDetail: {
-    code: number
-    reason: string
-  }
+    code: number;
+    reason: string;
+  };
+}
 
+class SocketTask {
   constructor (url: string, protocols: string[] | undefined) {
     if (protocols) {
       // eslint-disable-next-line no-undef
@@ -103,7 +105,7 @@ class SocketTask {
   onError (func?: Taro.SocketTask.OnErrorCallback): void {
     this.ws.onerror = () => {
       func && func({
-        errMsg: 'There was an error with your websocket.',
+        errMsg: "There was an error with your websocket.",
       })
     }
   }

package/src/lib/createCameraContext/index.ts

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

package/src/lib/createInnerAudioContext/index.ts

@@ -1,5 +1,4 @@
 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,7 +1,6 @@
 import Taro from '@tarojs/taro'
 import { DeviceMotion } from 'expo-sensors'
-
-import { createCallbackManager, errorHandler, successHandler } from '../utils'
+import { createCallbackManager, successHandler, errorHandler } from '../utils'
 
 const _cbManager = createCallbackManager()
 let _listener: any
@@ -45,7 +44,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'
@@ -72,8 +71,8 @@ function stopDeviceMotionListening (object: Taro.stopDeviceMotionListening.Optio
 }
 
 export {
-  offDeviceMotionChange,
   onDeviceMotionChange,
+  offDeviceMotionChange,
   startDeviceMotionListening,
   stopDeviceMotionListening
 }

package/src/lib/file.ts

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

package/src/lib/getClipboardData/index.ts

@@ -1,5 +1,4 @@
 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,19 +1,14 @@
 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 requestAuthorization()
+    const { granted } = await requestForegroundPermissionsAsync()
     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,12 +151,7 @@ class RecorderManager {
         const info = await FileSystem.getInfoAsync(uri)
         // console.log(`FILE INFO: ${JSON.stringify(info)}`)
 
-        const result = {
-          tempFilePath: uri,
-          duration: recordStatus.durationMillis,
-          // @ts-ignore
-          fileSize: info.size
-        }
+        const result = { tempFilePath: uri, duration: recordStatus.durationMillis, fileSize: info.size }
         this.onStopCallback && this.onStopCallback(result)
       }
     } catch (error) {

package/src/lib/getStorage/index.ts

@@ -1,5 +1,4 @@
 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,5 +1,4 @@
 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 DeviceInfo from 'react-native-device-info'
 import { initialWindowMetrics } from 'react-native-safe-area-context'
+import DeviceInfo from 'react-native-device-info'
 
 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,84 +1,83 @@
 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')
+    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)
     }
-    _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 {
-  offGyroscopeChange,
-  onGyroscopeChange,
-  startGyroscope,
-  stopGyroscope,
+    startGyroscope,
+    stopGyroscope,
+    onGyroscopeChange,
+    offGyroscopeChange,
 }

package/src/lib/index.ts

@@ -5,7 +5,6 @@ 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,5 +1,4 @@
 import { Keyboard } from 'react-native'
-
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): Promise<TaroGeneral.CallbackResult> => {
@@ -28,8 +27,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
   }
 }
@@ -54,7 +53,7 @@ const offKeyboardHeightChange = (callback?: Taro.onKeyboardHeightChange.Callback
 }
 
 export {
-  hideKeyboard,
+  onKeyboardHeightChange,
   offKeyboardHeightChange,
-  onKeyboardHeightChange
+  hideKeyboard
 }