@tarojs/taro-rn 4.0.0-beta.78 → 4.0.0-beta.79

package/src/lib/setStorageSync/index.ts

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

package/src/lib/showActionSheet/ActionSheet.tsx

@@ -1,15 +1,14 @@
-import { ViewPropTypes } from 'deprecated-react-native-prop-types'
-import PropTypes from 'prop-types'
 import React from 'react'
+import PropTypes from 'prop-types'
 import {
-  Platform,
-  StyleSheet,
+  View,
   Text,
   TouchableHighlight,
-  View
+  StyleSheet,
+  Platform
 } from 'react-native'
-import { initialWindowMetrics } from 'react-native-safe-area-context'
-
+import { ViewPropTypes } from 'deprecated-react-native-prop-types'
+import { initialWindowMetrics } from 'react-native-safe-area-context';
 import { Popup } from '../Popup'
 import V from '../variable'
 

package/src/lib/showActionSheet/index.tsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import RootSiblings from 'react-native-root-siblings'
-
 import ActionSheet from './ActionSheet'
 
 function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showActionSheet.SuccessCallbackResult> {

package/src/lib/showModal/Dialog.tsx

@@ -1,15 +1,14 @@
-import { TextPropTypes, ViewPropTypes } from 'deprecated-react-native-prop-types'
-import PropTypes from 'prop-types'
 import React from 'react'
+import PropTypes from 'prop-types'
 import {
-  Dimensions,
-  Platform,
-  StyleSheet,
+  View,
   Text,
   TouchableHighlight,
-  View
+  Dimensions,
+  StyleSheet,
+  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'

package/src/lib/showModal/index.tsx

@@ -1,7 +1,6 @@
 import React from 'react'
 import { Text } from 'react-native'
 import RootSiblings from 'react-native-root-siblings'
-
 import Dialog from './Dialog'
 
 function showModal (obj: Taro.showModal.Option): Promise<Taro.showModal.SuccessCallbackResult> {

package/src/lib/showModal/toast.tsx

@@ -1,11 +1,10 @@
-import PropTypes from 'prop-types'
 import React from 'react'
-import { ActivityIndicator, Image, StyleSheet, Text, View } from 'react-native'
+import PropTypes from 'prop-types'
+import { View, Text, Image, StyleSheet, ActivityIndicator } from 'react-native'
 import RootSiblings from 'react-native-root-siblings'
-
-import { errorHandler, shouldBeObject, successHandler } from '../../utils'
-import errorPng from './error.png'
 import successPng from './success.png'
+import errorPng from './error.png'
+import { errorHandler, shouldBeObject, successHandler } from '../../utils'
 
 const globalAny: any = global
 
@@ -160,7 +159,7 @@ 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
-    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy()
+    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy();
 
     globalAny.wxToastRootSiblings = new RootSiblings(ToastView)
     setTimeout(() => {
@@ -178,7 +177,7 @@ function showToast (options: Taro.showToast.Option): Promise<TaroGeneral.Callbac
   }
 }
 
-function showLoading (options: Taro.showLoading.Option = { title: '加载中' }): Promise<TaroGeneral.CallbackResult> {
+function showLoading (options: Taro.showLoading.Option = { title: "加载中" }): Promise<TaroGeneral.CallbackResult> {
   const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `showLoading${isObject.msg}` }
@@ -203,7 +202,7 @@ function hideToast (opts: Taro.hideToast.Option = {}): void {
   const { success, fail, complete } = opts
 
   try {
-    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy()
+    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy();
     globalAny.wxToastRootSiblings = undefined
     const res = { errMsg: 'showToast:ok' }
     success?.(res)
@@ -219,7 +218,7 @@ function hideLoading (opts: Taro.hideLoading.Option = {}): void {
   const { success, fail, complete } = opts
 
   try {
-    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy()
+    globalAny.wxToastRootSiblings && globalAny.wxToastRootSiblings.destroy();
     globalAny.wxToastRootSiblings = undefined
     const res = { errMsg: 'showLoading:ok' }
     success?.(res)
@@ -232,8 +231,8 @@ function hideLoading (opts: Taro.hideLoading.Option = {}): void {
 }
 
 export {
-  hideLoading,
-  hideToast,
+  showToast,
   showLoading,
-  showToast
+  hideToast,
+  hideLoading
 }

package/src/lib/startGyroscope/index.ts

@@ -1 +1 @@
-export { startGyroscope } from '../gyroscope'
+export { startGyroscope } from '../gyroscope'

package/src/lib/startLocationUpdate/index.ts

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

package/src/lib/unsupportedApi.ts

@@ -1,12 +1,14 @@
-function temporarilyNotSupport(apiName: string, recommended?: string, isSync = true) {
+function temporarilyNotSupport(apiName: String, recommended?: String, isSync = true) {
   return () => {
     let errMsg = `RN 端暂不支持 API ${apiName}`
-    if (recommended) {
+    if (!!recommended) {
       errMsg += `, 请使用 ${recommended}`
     }
     console.error(errMsg)
     if (!isSync) {
-      return Promise.reject(new Error(errMsg))
+      return Promise.reject({
+        errMsg
+      })
     } else {
       return new Error(errMsg)
     }

package/src/lib/vibrate.ts

@@ -1,17 +1,16 @@
 import { Vibration } from 'react-native'
-
 import { errorHandler, successHandler } from '../utils'
 
 function vibrate (DURATION, API, OPTS): Promise<TaroGeneral.CallbackResult> {
   const res = { errMsg: `${API}:ok` }
-  const { success, fail, complete } = OPTS
-  try {
-    Vibration.vibrate(DURATION)
-    return successHandler(success, complete)(res)
-  } catch (err) {
-    res.errMsg = err.message
-    return errorHandler(fail, complete)(res)
-  }
+    const { success, fail, complete } = OPTS
+    try {
+      Vibration.vibrate(DURATION)
+      return successHandler(success, complete)(res)
+    } catch (err) {
+      res.errMsg = err.message
+      return errorHandler(fail, complete)(res)
+    }
 }
 
 function vibrateShort (opts: Taro.vibrateShort.Option = {}): Promise<TaroGeneral.CallbackResult> {
@@ -23,6 +22,6 @@ function vibrateLong (opts: Taro.vibrateLong.Option = {}): Promise<TaroGeneral.C
 }
 
 export {
-  vibrateLong,
-  vibrateShort
+  vibrateShort,
+  vibrateLong
 }

package/src/lib/window.ts

@@ -1,5 +1,4 @@
-import { Dimensions, EmitterSubscription, ScaledSize } from 'react-native'
-
+import { ScaledSize, Dimensions, EmitterSubscription } from 'react-native'
 import { createCallbackManager } from '../utils'
 
 let listener: EmitterSubscription
@@ -19,4 +18,4 @@ export const addListener = () => {
 
 export const removeListener = () => {
   listener?.remove()
-}
+}

package/src/setup.ts

@@ -0,0 +1,64 @@
+import '@testing-library/jest-native/extend-expect'
+import { NetInfoStateType } from '@react-native-community/netinfo'
+import mockRNCNetInfo from '@react-native-community/netinfo/jest/netinfo-mock'
+import mockRNCAsyncStorage from '@react-native-async-storage/async-storage/jest/async-storage-mock'
+import mockRNCDeviceInfo from 'react-native-device-info/jest/react-native-device-info-mock'
+import mockRNCClipboard from '@react-native-clipboard/clipboard/jest/clipboard-mock'
+import mockRNCGeolocation from './__tests__/__mock__/mockRNCGeolocation'
+import mockRNCameraRoll from './__tests__/__mock__/mockRNCCameraRoll'
+jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter')
+jest.doMock('@react-native-community/netinfo', () => ({ ...mockRNCNetInfo, NetInfoStateType }))
+jest.doMock('@react-native-async-storage/async-storage', () => mockRNCAsyncStorage)
+jest.doMock('@react-native-community/geolocation', () => mockRNCGeolocation)
+jest.doMock('@react-native-clipboard/clipboard', () => mockRNCClipboard)
+jest.doMock('react-native-device-info', () => mockRNCDeviceInfo)
+jest.mock('@react-native-camera-roll/camera-roll', () => mockRNCameraRoll)
+
+jest.mock('react-native', () => {
+  const ReactNative = jest.requireActual('react-native') as any
+  ReactNative.Image.getSize = jest.fn((_uri, success: any) => {
+    setTimeout(() => success && success(320, 240))
+    return Promise.resolve([320, 240])
+  })
+  return ReactNative
+})
+
+jest.doMock('expo-modules-core', () => {
+  const unimodules = jest.requireActual('expo-modules-core') as any
+  const { NativeModulesProxy } = unimodules
+
+  NativeModulesProxy.ExpoLocation = {
+    getCurrentPositionAsync: jest.fn(() => Promise.resolve({
+      coords: {
+        latitude: 0,
+        longitude: 0,
+        speed: 0,
+        accuracy: 0,
+        altitude: 0
+      }
+    }))
+  }
+  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 → src/types}/vue/index.d.ts

@@ -1,5 +1,6 @@
+
 declare namespace Vue {
-  interface ComponentOptions<T>{}
-}
+    interface ComponentOptions<T>{}
+  }
 
 declare interface Vue {}

package/src/utils/callbackManager.ts

@@ -1,9 +1,9 @@
 interface CallbackManager {
-  add: (opt: any) => void
-  remove: (opt: any) => void
-  clear: () => void
-  count: () => number
-  trigger: (...args: any[]) => void
+  add: (opt: any) => void;
+  remove: (opt: any) => void;
+  clear: () => void;
+  count: () => number;
+  trigger: (...args: any[]) => void;
 }
 
 export function createCallbackManager(): CallbackManager {

package/src/utils/index.ts

@@ -1,11 +1,11 @@
 interface ShouldBeObjectResult {
-  res: boolean
-  msg?: string
+  res: boolean;
+  msg?: string;
 }
 
 interface GetParameterErrorOption {
-  correct: string
-  wrong: any
+  correct: string;
+  wrong: any;
 }
 
 function upperCaseFirstLetter (string: string): string {