@tarojs/taro-rn 3.4.1 → 3.4.4

package/src/__tests__/scanCode.test.js

@@ -0,0 +1,14 @@
+// eslint-disable-next-line
+import React from 'react'
+import { RootSiblingParent } from 'react-native-root-siblings';
+import { render, waitFor } from '@testing-library/react-native';
+import { scanCode } from '../lib/scanCode'
+
+describe('scanCode', () => {
+  it('should render scanCode success', async () => {
+    const { toJSON, getByLabelText } = render(<RootSiblingParent />)
+    scanCode()
+    await waitFor(() => getByLabelText('Close'));
+    expect(toJSON()).toMatchSnapshot()
+  })
+})

package/src/__tests__/storage.test.js

@@ -63,7 +63,7 @@ describe('storage', () => {
         fail,
         complete
       }).catch(err => {
-        const expectErrMsg = err.message
+        const expectErrMsg = err.errMsg
         expect(fail.mock.calls.length).toBe(1)
         expect(fail.mock.calls[0][0]).toEqual({ errMsg: expectErrMsg })
         expect(complete.mock.calls.length).toBe(1)

package/src/__tests__/system.test.js

@@ -7,8 +7,8 @@ describe('system', () => {
   describe('getSystemInfoSync', () => {
     test('能同步返回正确的系统信息', () => {
       const expectRes = {
-        brand: null,
-        model: null,
+        brand: expect.any(String),
+        model: expect.any(String),
         pixelRatio: expect.any(Number),
         safeArea: expect.any(Object),
         screenWidth: expect.any(Number),
@@ -17,8 +17,8 @@ describe('system', () => {
         windowHeight: expect.any(Number),
         statusBarHeight: expect.any(Number),
         language: null,
-        version: null,
-        system: undefined,
+        version: expect.any(String),
+        system: expect.any(String),
         platform: expect.any(String),
         fontSizeSetting: expect.any(Number),
         SDKVersion: null
@@ -35,8 +35,8 @@ describe('system', () => {
       const fail = jest.fn()
       const complete = jest.fn()
       const expectRes = {
-        brand: null,
-        model: null,
+        brand: expect.any(String),
+        model: expect.any(String),
         pixelRatio: expect.any(Number),
         safeArea: expect.any(Object),
         screenWidth: expect.any(Number),
@@ -45,8 +45,8 @@ describe('system', () => {
         windowHeight: expect.any(Number),
         statusBarHeight: expect.any(Number),
         language: null,
-        version: null,
-        system: undefined,
+        version: expect.any(String),
+        system: expect.any(String),
         platform: expect.any(String),
         fontSizeSetting: expect.any(Number),
         SDKVersion: null

package/src/lib/Mask.tsx

@@ -12,6 +12,7 @@ const styles = StyleSheet.create({
 const Mask: React.FC<any> = ({ transparent = false, style, onPress, children }) =>
   <TouchableWithoutFeedback onPress={onPress}>
     <View
+      accessibilityLabel='mask'
       style={[styles.mask, { backgroundColor: transparent ? 'transparent' : 'rgba(0,0,0,.6)' }, style]}
     >
       <TouchableWithoutFeedback>{children}</TouchableWithoutFeedback>

package/src/lib/Popup.tsx

@@ -34,7 +34,7 @@ class Popup extends Component<any, any> {
 
   constructor (props:Props) {
     super(props)
-    this.state = { visible: false, translateY: new Animated.Value(height) }
+    this.state = { visible: props.visible ?? false, translateY: new Animated.Value(height) }
     this.handleLayout = this.handleLayout.bind(this)
   }
 
@@ -54,7 +54,7 @@ class Popup extends Component<any, any> {
   }
 
   handleLayout ():void {
-    this.popup.measure((x, y, w, h) => {
+    this.popup.measure((_x, _y, _w, h) => {
       this.height = h
       this.setState({ translateY: new Animated.Value(h) })
       Animated.timing(this.state.translateY, {

package/src/lib/chooseImage/index.ts

@@ -26,7 +26,9 @@ function getRes(images) {
 function openCamera(options: Taro.chooseImage.Option): Promise<Taro.chooseImage.SuccessCallbackResult> {
   const { success, fail, complete } = options
   return new Promise((resolve, reject) => {
-    SYImagePicker.openCamera({}, (err, photo: any) => {
+    SYImagePicker.openCamera({
+      compressFocusAlpha: true
+    }, (err, photo: any) => {
       if (err) {
         const res = {
           errMsg: err
@@ -55,6 +57,7 @@ function openPicker(options: Taro.chooseImage.Option): Promise<Taro.chooseImage.
   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) => {

package/src/lib/chooseVideo/index.ts

@@ -43,7 +43,7 @@ function showVideoPicker(options: Taro.chooseVideo.Option):any {
           resolve(chooseMedia({...options, sourceType: ['album']}, MEDIA_TYPE.VIDEOS))
         }
       },
-      fail: function (err) {
+      fail: function () {
         const res = { errMsg: 'chooseVideo:fail cancel' }
         reject(res)
       }

package/src/lib/connectSocket/index.ts

@@ -25,7 +25,6 @@ export function connectSocket(opts: Taro.connectSocket.Option): Promise<Taro.Soc
     if (socketTasks.length >= 2) {
       const error = new Error('同时最多发起 2 个 socket 请求，更多请参考文档。')
       res.errMsg = error.message
-      console.error(res.errMsg)
       fail?.(res)
       complete?.(res)
       return reject(res)

package/src/lib/connectSocket/socketTask.ts

@@ -87,9 +87,9 @@ class SocketTask {
   }
 
   onError (func?: Taro.SocketTask.OnErrorCallback): void {
-    this.ws.onerror = (res) => {
+    this.ws.onerror = () => {
       func && func({
-        errMsg: res.message
+        errMsg: "There was an error with your websocket.",
       })
     }
   }

package/src/lib/createCameraContext/index.ts

@@ -113,6 +113,10 @@ class CameraContext {
       }
     }
   }
+
+  setZoom = () => {
+    console.log('not support')
+  }
 }
 /**
  * 创建 video 上下文 VideoContext 对象。

package/src/lib/createInnerAudioContext/index.ts

@@ -224,7 +224,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offCanplay (callback) {
+  offCanplay (_callback) {
     this.onCanplayCallback = undefined
   }
 
@@ -241,7 +241,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offPlay (callback) {
+  offPlay (_callback) {
     this.onPlayCallback = undefined
   }
 
@@ -258,7 +258,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offPause (callback) {
+  offPause (_callback) {
     this.onPauseCallback = undefined
   }
 
@@ -275,7 +275,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offStop (callback) {
+  offStop (_callback) {
     this.onStopCallback = undefined
   }
 
@@ -292,7 +292,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offEnded (callback) {
+  offEnded (_callback) {
     this.onEndedCallback = undefined
   }
 
@@ -309,7 +309,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offTimeUpdate (callback) {
+  offTimeUpdate (_callback) {
     this.onTimeUpdateCallback = undefined
   }
 
@@ -326,7 +326,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offError (callback) {
+  offError (_callback) {
     this.onErrorCallback = undefined
   }
 
@@ -343,7 +343,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offWaiting (callback) {
+  offWaiting (_callback) {
     this.onWaitingCallback = undefined
   }
 
@@ -360,7 +360,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offSeeking (callback) {
+  offSeeking (_callback) {
     this.onSeekingCallback = undefined
   }
 
@@ -377,7 +377,7 @@ class InnerAudioContext {
    * @param callback
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  offSeeked (callback) {
+  offSeeked (_callback) {
     this.onSeekedCallback = undefined
   }
 }

package/src/lib/createVideoContext/index.ts

@@ -108,6 +108,18 @@ class VideoContext {
     console.log('not support')
   }
 
+  exitBackgroundPlayback () {
+    console.log('not support')
+  }
+
+  exitPictureInPicture () {
+    console.log('not support')
+  }
+
+  requestBackgroundPlayback () {
+    console.log('not support')
+  }
+
   /**
    * 停止视频
    */

package/src/lib/file.ts

@@ -16,7 +16,7 @@ let timer: any
 
 const _fetch = (requestPromise, timeout) => {
   let timeoutAction
-  const timerPromise = new Promise((resolve, reject) => {
+  const timerPromise = new Promise((_resolve, reject) => {
     timeoutAction = () => {
       reject(new Error('网络请求超时'))
     }
@@ -40,6 +40,7 @@ const createFormData = (filePath, body, name) => {
     data.append(key, body[key])
   })
 
+  // @ts-ignore
   data.append(name, fileObj)
 
   return data

package/src/lib/getFileSystemManager/index.ts

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

package/src/lib/getImageInfo/index.ts

@@ -7,7 +7,7 @@ export function getImageInfo(option: Taro.getImageInfo.Option): Promise<Taro.get
     Image.getSize(
       src,
       (width, height) => {
-        const orientation: keyof Taro.getImageInfo.orientation = 'up'
+        const orientation: keyof Taro.getImageInfo.Orientation = 'up'
         const res = {
           width,
           height,

package/src/lib/getLocation/index.ts

@@ -20,7 +20,7 @@ export async function getLocation(opts: Taro.getLocation.Option = {}): Promise<T
   return new Promise((resolve, reject) => {
     Geolocation.getCurrentPosition(
       ({ coords }) => {
-        const { latitude, longitude, altitude, accuracy, altitudeAccuracy, heading, speed } = coords
+        const { latitude, longitude, altitude, accuracy, speed } = coords
         const res = {
           latitude,
           longitude,

package/src/lib/index.ts

@@ -17,6 +17,7 @@ export * from './downloadFile'
 export * from './getClipboardData'
 export * from './getEnv'
 export * from './getFileInfo'
+export * from './getFileSystemManager'
 export * from './getImageInfo'
 export * from './getLocation'
 export * from './getNetworkType'

package/src/lib/location.ts

@@ -32,7 +32,7 @@ export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Prom
       throw new Error('startLocationUpdate:fail')
     } else {
       _watchID = Geolocation.watchPosition(({ coords }) => {
-        const { latitude, longitude, altitude, accuracy, altitudeAccuracy, heading, speed } = coords
+        const { latitude, longitude, altitude, accuracy, speed } = coords
         _cbManager.trigger({
           accuracy,
           altitude,

package/src/lib/network.ts

@@ -4,8 +4,8 @@ let _unsubscribe: any = null
 
 let _callbacks: Set<Function> = new Set()
 
-function getTypeFromState(connectionInfo:NetInfoState): keyof Taro.getNetworkType.networkType {
-  let type: keyof Taro.getNetworkType.networkType
+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) {

package/src/lib/permission.ts

@@ -33,7 +33,7 @@ const getAuthSetting = async () => {
   return auths
 }
 
-const handleAppStateChange = async (nextAppState, resolve, reject, opts) => {
+const handleAppStateChange = async (_nextAppState, resolve, reject, opts) => {
   const { success, fail, complete } = opts
   const res: any = {}
 

package/src/lib/previewImage/index.tsx

@@ -7,6 +7,7 @@ import { downloadFile } from '../file'
 
 const styles = StyleSheet.create({
   mask: {
+    elevation: 1,
     position: 'absolute',
     backgroundColor: '#000000',
     top: 0,

package/src/lib/request/index.ts

@@ -34,9 +34,9 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
   } else {
     if (typeof data === 'object') {
       const contentType = options.header && (options.header['content-type'] || options.header['Content-Type'])
-      if (contentType === 'application/json') {
+      if (contentType.startsWith('application/json')) {
         data = JSON.stringify(data)
-      } else if (contentType === 'application/x-www-form-urlencoded') {
+      } else if (contentType.startsWith('application/x-www-form-urlencoded')) {
         data = serializeParams(data)
       }
     }
@@ -53,7 +53,7 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
   params.method = method
   let controller
   // eslint-disable-next-line no-undef
-  if (AbortController) {
+  if (typeof(AbortController) !== 'undefined' ) {
     // eslint-disable-next-line no-undef
     controller = new AbortController()
     const signal = controller.signal
@@ -78,7 +78,7 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
       return response
     })
 
-  const timeoutPromise = new Promise((resolve, reject) => {
+  const timeoutPromise = new Promise((_resolve, reject) => {
     const timer = setTimeout(() => {
       controller?.abort()
       reject(Error('request:fail timeout'))

package/src/lib/scanCode/index.tsx

@@ -182,7 +182,7 @@ export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.
           style={{ width, height }}
           ratio='16:9'
         />
-        <TouchableOpacity style={styles.closeIcon} onPress={() => hide(scannerView)}>
+        <TouchableOpacity accessibilityLabel="Close" style={styles.closeIcon} onPress={() => hide(scannerView)}>
           {safeViewWrapper(<Image source={iconClose} style={styles.closeImg}/>)}
         </TouchableOpacity>
         {!onlyFromCamera && (<TouchableOpacity style={styles.albumIcon} onPress={() => {

package/src/lib/showModal/toast.tsx

@@ -5,6 +5,8 @@ import RootSiblings from 'react-native-root-siblings'
 import successPng from './success.png'
 import { errorHandler, shouldBeObject, successHandler } from '../../utils'
 
+const globalAny: any = global
+
 const styles = StyleSheet.create({
   toastView: {
     width: 76,
@@ -156,15 +158,15 @@ function showToast (options: Taro.showToast.Option): Promise<TaroGeneral.Callbac
   try {
     // setTimeout fires incorrectly when using chrome debug #4470
     // https://github.com/facebook/react-native/issues/4470
-    (global as any).wxToastRootSiblings && (global as any).wxToastRootSiblings.destroy();
+    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy();
 
-    (global as any).wxToastRootSiblings = new RootSiblings(ToastView)
+    globalAny.wxToastRootSiblings = new RootSiblings(ToastView)
     setTimeout(() => {
-      (global as any).wxToastRootSiblings && (global as any).wxToastRootSiblings.update(ToastView)
+      globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.update(ToastView)
     }, 100)
     if (duration > 0) {
       setTimeout(() => {
-        (global as any).wxToastRootSiblings && (global as any).wxToastRootSiblings.destroy()
+        globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy()
       }, duration)
     }
     return successHandler(success, complete)(res)
@@ -199,8 +201,8 @@ function hideToast (opts: Taro.hideToast.Option = {}): void {
   const { success, fail, complete } = opts
 
   try {
-    (global as any).wxToastRootSiblings && (global as any).wxToastRootSiblings.destroy();
-    (global as any).wxToastRootSiblings = undefined
+    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy();
+    globalAny.wxToastRootSiblings = undefined
     const res = { errMsg: 'showToast:ok' }
     success?.(res)
     complete?.(res)
@@ -215,8 +217,8 @@ function hideLoading (opts: Taro.hideLoading.Option = {}): void {
   const { success, fail, complete } = opts
 
   try {
-    (global as any).wxToastRootSiblings && (global as any).wxToastRootSiblings.destroy();
-    (global as any).wxToastRootSiblings = undefined
+    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy();
+    globalAny.wxToastRootSiblings = undefined
     const res = { errMsg: 'showLoading:ok' }
     success?.(res)
     complete?.(res)

package/src/lib/unsupportedApi.ts

@@ -25,3 +25,6 @@ export const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clear
 // 屏幕
 export const onUserCaptureScreen = temporarilyNotSupport('onUserCaptureScreen', '', false)
 export const offUserCaptureScreen = temporarilyNotSupport('offUserCaptureScreen', '', false)
+
+// 文件
+export const getFileSystemManager = temporarilyNotSupport('getFileSystemManager', '', false)

package/src/setup.ts

@@ -0,0 +1,71 @@
+import { jest } from '@jest/globals'
+import '@testing-library/jest-native/extend-expect'
+import mockRNCNetInfo from '@react-native-community/netinfo/jest/netinfo-mock.js'
+import { NetInfoStateType } from '@react-native-community/netinfo'
+import mockRNCAsyncStorage from '@react-native-async-storage/async-storage/jest/async-storage-mock.js'
+import mockRNCDeviceInfo from 'react-native-device-info/jest/react-native-device-info-mock'
+
+jest.doMock('@react-native-community/netinfo', () => ({ ...mockRNCNetInfo, NetInfoStateType }))
+jest.doMock('@react-native-async-storage/async-storage', () => mockRNCAsyncStorage)
+jest.doMock('react-native-device-info', () => mockRNCDeviceInfo)
+
+jest.doMock('react-native', () => {
+  const ReactNative = jest.requireActual('react-native') as any
+
+  // Vibration readonly so you need use defineProperty rewrite this property descriptor.
+  const Vibration = (jest.requireActual('./__tests__/__mock__/mockVibrate') as any).default
+  Object.defineProperty(ReactNative, 'Vibration', {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value: Vibration
+  })
+
+  // mockNativeModules: react-native/Libraries/BatchedBridge/NativeModules
+  const RNCCameraRoll = (jest.requireActual('./__tests__/__mock__/mockRNCCameraRoll') as any).default
+  const MockClipboard = (jest.requireActual('./__tests__/__mock__/mockClipboard') as any).default
+  const RNCGeolocation = (jest.requireActual('./__tests__/__mock__/mockRNCGeolocation') as any).default
+  ReactNative.NativeModules.RNCCameraRoll = RNCCameraRoll
+  ReactNative.NativeModules.RNCClipboard = new MockClipboard()
+  ReactNative.NativeModules.RNCGeolocation = RNCGeolocation
+  Object.defineProperty(ReactNative.NativeModules, 'ImageLoader', {
+    configurable: true,
+    enumerable: true,
+    get: () => ({
+      prefetchImage: jest.fn(),
+      getSize: jest.fn((_uri, success: any) => {
+        process.nextTick(() => success && success(320, 240))
+        return Promise.resolve([320, 240])
+      }),
+    }),
+  })
+  return ReactNative
+})
+
+jest.doMock('@unimodules/core', () => {
+  const unimodules = jest.requireActual('@unimodules/core') as any
+  const permisson = jest.requireActual('./__tests__/__mock__/mockExpoPermissions')
+  const { NativeModulesProxy } = unimodules
+
+  NativeModulesProxy.ExpoLocation = {
+    getCurrentPositionAsync: jest.fn(() => Promise.resolve({
+      coords: {
+        latitude: 0,
+        longitude: 0,
+        speed: 0,
+        accuracy: 0,
+        altitude: 0
+      }
+    }))
+  }
+  NativeModulesProxy.ExpoPermissions = permisson
+
+  return unimodules
+})
+
+jest.doMock('react-native-unimodules', () => {
+  const unimodules = jest.requireActual('react-native-unimodules') as any
+  const permisson = jest.requireActual('./__tests__/__mock__/mockExpoPermissions')
+  unimodules.Permissions = permisson
+  return unimodules
+})

package/src/types/definition.d.ts

@@ -13,3 +13,5 @@ declare interface HTMLMediaElement {}
 declare interface File {}
 
 declare interface MediaTrackSettings {}
+
+declare const global: any