@tarojs/taro-rn 3.5.0-alpha.13 → 3.5.0-alpha.16

package/src/lib/media.ts

@@ -1,7 +1,6 @@
 import CameraRoll from '@react-native-community/cameraroll'
-import * as Permissions from 'expo-permissions'
+import { requestCameraPermissionsAsync } from 'expo-camera'
 import * as ImagePicker from 'expo-image-picker'
-import { askAsyncPermissions } from '../utils/premissions'
 import { successHandler, errorHandler } from '../utils'
 
 export const MEDIA_TYPE = {
@@ -11,8 +10,8 @@ export const MEDIA_TYPE = {
 
 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') {
+  const { granted } = await ImagePicker.requestMediaLibraryPermissionsAsync()
+  if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     return errorHandler(fail, complete)(res)
   }
@@ -40,8 +39,8 @@ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVid
     videoMaxDuration: maxDuration
   }
   const isCamera = sourceType[0] === 'camera'
-  const status = isCamera ? await askAsyncPermissions(Permissions.CAMERA) : await askAsyncPermissions(Permissions.CAMERA_ROLL)
-  if (status !== 'granted') {
+  const { granted } = isCamera ? await requestCameraPermissionsAsync() : await ImagePicker.requestMediaLibraryPermissionsAsync()
+  if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     return errorHandler(fail, complete)(res)
   }

package/src/lib/permission.ts

@@ -1,12 +1,20 @@
 import { Linking, AppState, NativeEventSubscription } from 'react-native';
-import * as Permissions from 'expo-permissions';
+import { getCameraPermissionsAsync, getMicrophonePermissionsAsync, requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera'
+import { getMediaLibraryPermissionsAsync, requestMediaLibraryPermissionsAsync } from 'expo-image-picker'
+import {
+  getForegroundPermissionsAsync,
+  // getBackgroundPermissionsAsync,
+  requestForegroundPermissionsAsync,
+  // requestBackgroundPermissionsAsync
+} from 'expo-location'
 import { errorHandler, successHandler } from '../utils';
 
 const scopeMap = {
-  'scope.userLocation': Permissions.LOCATION,
-  'scope.record': Permissions.AUDIO_RECORDING,
-  'scope.writePhotosAlbum': Permissions.CAMERA_ROLL,
-  'scope.camera': Permissions.CAMERA,
+  'scope.userLocation': [getForegroundPermissionsAsync, requestForegroundPermissionsAsync],
+  'scope.record': [getMicrophonePermissionsAsync, requestMicrophonePermissionsAsync],
+  'scope.writePhotosAlbum': [getMediaLibraryPermissionsAsync, requestMediaLibraryPermissionsAsync],
+  'scope.camera': [getCameraPermissionsAsync, requestCameraPermissionsAsync],
+  // 'scope.userLocationBackground': [getBackgroundPermissionsAsync, requestBackgroundPermissionsAsync],
   // 'scope.NOTIFICATIONS': Permissions.NOTIFICATIONS,
   // 'scope.USER_FACING_NOTIFICATIONS': Permissions.USER_FACING_NOTIFICATIONS,
   // 'scope.CONTACTS': Permissions.CONTACTS,
@@ -19,17 +27,13 @@ let stateListener // 缓存监听函数
 let appStateSubscription: NativeEventSubscription | undefined
 
 const getAuthSetting = async () => {
-  const keyArr = Object.keys(scopeMap)
-  const scopeArr = keyArr.map(key => scopeMap[key])
   let auths = {}
-  const { permissions } = await Permissions.getAsync(...scopeArr)
-  Object.keys(permissions).forEach(pkey => {
-    keyArr.forEach((skey) => {
-      if (scopeMap[skey] === pkey) {
-        auths[skey] = permissions[pkey].status === 'granted'
-      }
-    })
-  })
+
+  await Promise.all(Object.keys(scopeMap).map(async key => {
+    const { granted } = await scopeMap[key][0]()
+    auths[key] = granted
+  }))
+
   return auths
 }
 
@@ -62,8 +66,8 @@ export async function authorize(opts: Taro.authorize.Option): Promise<TaroGenera
   const res: any = {}
 
     try {
-      const { status } = await Permissions.askAsync(scopeMap[scope])
-      if (status === 'granted') {
+      const { granted } = await scopeMap[scope][1]()
+      if (granted) {
         res.errMsg = 'authorize:ok'
         return successHandler(success, complete)(res)
       } else {

package/src/lib/request/index.ts

@@ -33,7 +33,7 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
     url = generateRequestUrlWithParams(url, data)
   } else {
     if (typeof data === 'object') {
-      const contentType = options.header && (options.header['content-type'] || options.header['Content-Type'])
+      const contentType = options.header && (options.header['content-type'] || options.header['Content-Type']) || 'application/json'
       if (contentType.startsWith('application/json')) {
         data = JSON.stringify(data)
       } else if (contentType.startsWith('application/x-www-form-urlencoded')) {

package/src/lib/scanCode/index.tsx

@@ -1,10 +1,9 @@
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { Camera } from 'expo-camera'
-import { BarCodeScanner } from 'expo-barcode-scanner'
+import { BarCodeScanner, requestPermissionsAsync } from 'expo-barcode-scanner'
 import { BackHandler, Image, TouchableOpacity, StyleSheet, View, Dimensions, Platform, StatusBar } from 'react-native'
 import iconClose from './icon_close.png'
 import iconPic from './icon_pic.png'
-import * as Permissions from 'expo-permissions'
 import RootSiblings from 'react-native-root-siblings'
 import { chooseMedia, MEDIA_TYPE } from '../media'
 import React from 'react'
@@ -147,15 +146,14 @@ function scanFromPhoto(callback, errorCallBack) {
 
 export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.scanCode.SuccessCallbackResult> {
   const { success, fail, complete, onlyFromCamera, scanType = ['barCode', 'qrCode'] } = option
-  const { status } = await Permissions.askAsync(Permissions.CAMERA)
-  if (status !== 'granted') {
+  const { granted } = await requestPermissionsAsync();
+  if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     fail?.(res)
     complete?.(res)
     return Promise.reject(res)
   }
   const barCodeTypes = getBarCodeTypes(scanType)
-  const cameraRef = React.createRef<Camera>()
   return new Promise((resolve, reject) => {
     scannerView = new RootSiblings(
       (<View style={[styles.container]}>
@@ -175,7 +173,6 @@ export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.
             hide(scannerView)
             resolve(res)
           }}
-          ref={cameraRef}
           barCodeScannerSettings={{
             barCodeTypes,
           }}

package/src/lib/showActionSheet/ActionSheet.tsx

@@ -5,9 +5,9 @@ import {
   Text,
   TouchableHighlight,
   StyleSheet,
-  Platform,
-  ViewPropTypes
+  Platform
 } from 'react-native'
+import { ViewPropTypes } from 'deprecated-react-native-prop-types'
 import { initialWindowMetrics } from 'react-native-safe-area-context';
 import { Mask } from '../Mask'
 import { Popup } from '../Popup'

package/src/lib/showModal/Dialog.tsx

@@ -6,9 +6,9 @@ import {
   TouchableHighlight,
   Dimensions,
   StyleSheet,
-  Platform,
-  ViewPropTypes
+  Platform
 } from 'react-native'
+import { ViewPropTypes, TextPropTypes } from 'deprecated-react-native-prop-types'
 import { Mask } from '../Mask'
 import { create } from '../StyleSheet'
 import V from '../variable'
@@ -223,9 +223,9 @@ Index.propTypes = {
   style: ViewPropTypes.style,
   maskStyle: ViewPropTypes.style,
   headerStyle: ViewPropTypes.style,
-  titleStyle: (Text as any).propTypes.style,
+  titleStyle: TextPropTypes.style,
   bodyStyle: ViewPropTypes.style,
-  bodyTextStyle: (Text as any).propTypes.style,
+  bodyTextStyle: TextPropTypes.style,
   footerStyle: ViewPropTypes.style,
   children: PropTypes.node
 }

package/src/setup.ts

@@ -44,7 +44,6 @@ jest.doMock('react-native', () => {
 
 jest.doMock('expo-modules-core', () => {
   const unimodules = jest.requireActual('expo-modules-core') as any
-  const permisson = jest.requireActual('./__tests__/__mock__/mockExpoPermissions')
   const { NativeModulesProxy } = unimodules
 
   NativeModulesProxy.ExpoLocation = {
@@ -58,7 +57,27 @@ jest.doMock('expo-modules-core', () => {
       }
     }))
   }
-  NativeModulesProxy.ExpoPermissions = permisson
-
   return unimodules
 })
+
+const grantedPromise = jest.fn(() => Promise.resolve({
+  granted: true
+}))
+
+jest.doMock('expo-image-picker', () => {
+  const expoImagePicker = jest.requireActual('expo-image-picker') as any
+  expoImagePicker.requestMediaLibraryPermissionsAsync = grantedPromise
+  return expoImagePicker
+})
+
+jest.doMock('expo-location', () => {
+  const expoLocation = jest.requireActual('expo-location') as any
+  expoLocation.requestForegroundPermissionsAsync = grantedPromise
+  return expoLocation
+})
+
+jest.doMock('expo-barcode-scanner', () => {
+  const expoBarcodeSacnner = jest.requireActual('expo-barcode-scanner') as any
+  expoBarcodeSacnner.requestPermissionsAsync = grantedPromise
+  return expoBarcodeSacnner
+})

package/types/overlay.d.ts

@@ -0,0 +1,9 @@
+import Taro from '@tarojs/taro'
+
+declare module '@tarojs/taro' {
+  namespace vibrateShort {
+    interface Option {
+      type?: 'heavy' | 'medium' | 'light'
+    }
+  }
+}

package/dist/utils/premissions.js

@@ -1,17 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import * as Permissions from 'expo-permissions';
-export function askAsyncPermissions(PermissionsType) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { status } = yield Permissions.askAsync(PermissionsType);
-        return status;
-    });
-}
-//# sourceMappingURL=premissions.js.map

package/dist/utils/premissions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"premissions.js","sourceRoot":"","sources":["../../src/utils/premissions.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C,MAAM,UAAgB,mBAAmB,CAAE,eAA2C;;QACpF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;QAC9D,OAAO,MAAM,CAAA;IACf,CAAC;CAAA"}

package/src/__tests__/__mock__/mockExpoPermissions.js

@@ -1,8 +0,0 @@
-export const CAMERA = 'camera'
-export const CAMERA_ROLL = 'mediaLibrary'
-export const LOCATION = 'location'
-export const askAsync = jest.fn().mockImplementation((permissionType) => {
-  const hasPermission = [CAMERA, CAMERA_ROLL, LOCATION].includes(permissionType)
-  const responseData = hasPermission ? { status: 'granted' } : { status: 'undetermined' } // you could also pass `denied` instead of `undetermined`
-  return Promise.resolve(responseData)
-})

package/src/utils/premissions.ts

@@ -1,6 +0,0 @@
-import * as Permissions from 'expo-permissions'
-
-export async function askAsyncPermissions (PermissionsType: Permissions.PermissionType): Promise<string> {
-  const { status } = await Permissions.askAsync(PermissionsType)
-  return status
-}