@tarojs/taro-rn 4.0.0-alpha.0 → 4.0.0-alpha.2

package/src/lib/scanCode/index.tsx

@@ -143,7 +143,7 @@ function scanFromPhoto(callback, errorCallBack) {
         })
       }
     }
-  }, MEDIA_TYPE.IMAGES).catch(errorCallBack)
+  }, MEDIA_TYPE.Images).catch(errorCallBack)
 }
 
 export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.scanCode.SuccessCallbackResult> {

package/src/lib/showActionSheet/index.tsx

@@ -20,9 +20,13 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
       sibling && sibling.destroy()
       sibling = undefined
       const res = { tapIndex, errMsg: 'showActionSheet:ok' }
-      success?.(res)
-      complete?.(res)
-      resolve(res)
+      // fix: iOS 无法打开相册
+      // https://github.com/expo/expo/issues/25705
+      setTimeout(() => {
+        success?.(res)
+        complete?.(res)
+        resolve(res)
+      }, 1)
     }
 
     function onFail () {
@@ -38,7 +42,7 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
       <ActionSheet
         autoDectect={autoDectect}
         type={type}
-        visible={false}
+        visible={true}
         onClose={onFail}
         menus={
           itemList.map((item, index) => {
@@ -46,7 +50,7 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
               type: 'default',
               label: item,
               textStyle: { color: itemColor },
-              onPress: onSuccess.bind(this, index)
+              onPress: () => onSuccess(index)
             }
           }) as any
         }
@@ -55,41 +59,11 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
             type: 'default',
             label: '取消',
             textStyle: { color: itemColor },
-            onPress: onFail.bind(this)
+            onPress: onFail
           }
         ] as any}
       />
     )
-
-    // hack 的做法。不推荐
-    setTimeout(() => {
-      sibling.update(
-        <ActionSheet
-          autoDectect={autoDectect}
-          type={type}
-          visible
-          onClose={onFail}
-          menus={
-            itemList.map((item, index) => {
-              return {
-                type: 'default',
-                label: item,
-                textStyle: { color: itemColor },
-                onPress: onSuccess.bind(this, index)
-              }
-            }) as any
-          }
-          actions={[
-            {
-              type: 'default',
-              label: '取消',
-              textStyle: { color: itemColor },
-              onPress: onFail.bind(this)
-            }
-          ] as any}
-        />
-      )
-    }, 100)
   })
 }
 

package/src/setup.ts

@@ -1,44 +1,24 @@
-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 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.doMock('react-native', () => {
+jest.mock('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.RNCCameraRoll
-  ReactNative.NativeModules.RNCCameraRollPermissionModule = RNCCameraRoll.RNCCameraRollPermissionModule
-  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])
-      }),
-    }),
+  ReactNative.Image.getSize = jest.fn((_uri, success: any) => {
+    setTimeout(() => success && success(320, 240))
+    return Promise.resolve([320, 240])
   })
   return ReactNative
 })

package/types/runtime.d.ts

@@ -0,0 +1,3 @@
+declare module '@tarojs/runtime' {
+  export * from '@tarojs/runtime-rn'
+}

package/src/__tests__/__mock__/mockAsyncStorage.js

@@ -1,47 +0,0 @@
-export default class MockStorage {
-  constructor (cache = {}) {
-    this.storageCache = cache
-  }
-
-  setItem = jest.fn((key, value) => {
-    return new Promise((resolve, reject) => {
-      return (typeof key !== 'string' || typeof value !== 'string')
-        ? reject(new Error('key and value must be string'))
-        : resolve(this.storageCache[key] = value)
-    })
-  });
-
-  getItem = jest.fn((key) => {
-    return new Promise((resolve) => {
-      // eslint-disable-next-line
-      return this.storageCache.hasOwnProperty(key)
-        ? resolve(this.storageCache[key])
-        : resolve(null)
-    })
-  })
-
-  removeItem = jest.fn((key) => {
-    return new Promise((resolve, reject) => {
-      return this.storageCache.hasOwnProperty(key)
-        ? resolve(delete this.storageCache[key])
-        : reject(new Error('No such key!'))
-    })
-  })
-
-  clear = jest.fn(() => {
-    return new Promise((resolve) => resolve(this.storageCache = {}))
-  })
-
-  getAllKeys = jest.fn(() => {
-    return new Promise((resolve) => resolve(Object.keys(this.storageCache)))
-  })
-
-  multiRemove = jest.fn((keys) => {
-    return new Promise((resolve) => {
-      keys.forEach(key => {
-        this.removeItem(key)
-      })
-      resolve()
-    })
-  })
-}

package/src/__tests__/__mock__/mockClipboard.js

@@ -1,15 +0,0 @@
-class Clipboard {
-  constructor () {
-    this.clipboardData = ''
-  }
-
-  setString (str) {
-    this.clipboardData = str
-  }
-
-  getString () {
-    return Promise.resolve(this.clipboardData)
-  }
-}
-
-export default Clipboard

package/src/__tests__/__mock__/mockNavigator.js

@@ -1,20 +0,0 @@
-const geolocation = {
-  getCurrentPosition (callback) {
-    const res = {}
-    const coords = {
-      latitude: 0,
-      longitude: 0,
-      speed: 0,
-      accuracy: 0,
-      altitude: 0
-    }
-    res.coords = coords
-    res.timestamp = Date.now()
-    callback && callback(res)
-  }
-}
-
-const navigator = {}
-navigator.geolocation = geolocation
-
-export default navigator

package/src/__tests__/__mock__/mockNetwork.js

@@ -1,59 +0,0 @@
-// eslint-disable-next-line
-const noop = () => {}
-
-export default class NetInfo {
-  constructor (connectionType = 'wifi', effectiveConnectionType = '4g') {
-    this.connectionType = connectionType
-    this.effectiveConnectionType = effectiveConnectionType
-    this.eventMaps = {}
-    this.connectedStatus = connectionType === 'wifi' || connectionType === 'cellular'
-  }
-
-  isConnected = {
-    fetch: this.fetch.bind(this)
-  }
-
-  fetch () {
-    return new Promise((resolve) => {
-      resolve({
-        type: this.connectionType,
-      })
-    })
-  }
-
-  getConnectionInfo () {
-    return new Promise((resolve) => {
-      const res = {}
-      res.type = this.connectionType
-      res.effectiveType = this.effectiveConnectionType
-      resolve(res)
-    })
-  }
-
-  addEventListener (eventName, listener = noop) {
-    this.eventMaps[eventName] = listener
-  }
-
-  removeEventListener (eventName, listener = noop) {
-    if (this.eventMaps[eventName] === listener) {
-      delete this.eventMaps[eventName]
-    }
-  }
-
-  // 纯粹为了模拟测试用，主动更改网络状态
-  changeNetworkType (connectionType, effectiveConnectionType = '4g') {
-    if (this.connectionType !== connectionType) {
-      this.connectionType = connectionType
-      if (connectionType === 'cellular') {
-        this.effectiveConnectionType = effectiveConnectionType
-      }
-      this.connectedStatus = connectionType === 'wifi' || connectionType === 'cellular'
-
-      const res = {}
-      res.type = this.connectionType
-      res.effectiveType = this.effectiveConnectionType
-      const fn = this.eventMaps.connectionChange
-      fn && fn(res)
-    }
-  }
-}

package/src/__tests__/__mock__/mockVibrate.js

@@ -1,6 +0,0 @@
-const Vibration = {
-  vibrate: jest.fn(),
-  cancel: jest.fn(),
-}
-
-export default Vibration