@tarojs/taro-rn 3.3.5 → 3.3.9

package/src/lib/openUrl/index.ts

@@ -1,4 +1,5 @@
 import { Linking } from 'react-native'
+import { successHandler, errorHandler } from '../../utils'
 
 export async function openUrl <T>(opts: Taro.OpenUrl.Option): Promise<T> {
   const { url, success, fail, complete } = opts || {} as Taro.OpenUrl.Option
@@ -7,16 +8,10 @@ export async function openUrl <T>(opts: Taro.OpenUrl.Option): Promise<T> {
   const isSupport = await Linking.canOpenURL(url)
   if (isSupport) {
     await Linking.openURL(url)
-    success && success(res)
-    complete && complete(res)
-
-    return Promise.resolve(res)
+    return successHandler(success, complete)(res)
   } else {
     res.errMsg = 'openUrl:fail. Do not support the openUrl Api'
-    fail && fail(res)
-    complete && complete(res)
-
-    return Promise.reject(res)
+    return errorHandler(fail, complete)(res)
   }
 }
 

package/src/lib/permission.ts

@@ -1,5 +1,6 @@
 import { Linking, AppState } from 'react-native';
 import * as Permissions from 'expo-permissions';
+import { errorHandler, successHandler } from '../utils';
 
 const scopeMap = {
   'scope.userLocation': Permissions.LOCATION,
@@ -39,79 +40,59 @@ const handleAppStateChange = async (nextAppState, resolve, reject, opts) => {
     try {
       res.authSetting = await getAuthSetting()
       res.errMsg = 'openSetting:ok'
-      success && success(res)
-      complete && complete(res)
-  
+      success?.(res)
+      complete?.(res)
+
       AppState.removeEventListener('change', stateListener as any);
       resolve(res)
     } catch (error) {
       res.errMsg = 'openSetting:fail'
-      fail && fail(res)
-      complete && complete(res)
-  
+      fail?.(res)
+      complete?.(res)
+
       reject(error)
     }
   }
   // AppState.currentState = nextAppState;
 };
 
-export function authorize(opts: Taro.authorize.Option): Promise<Taro.General.CallbackResult> {
+export async function authorize(opts: Taro.authorize.Option): Promise<Taro.General.CallbackResult> {
   const { scope, success, fail, complete } = opts
   const res: any = {}
 
-  return new Promise(async (resolve, reject) => {
     try {
       const { status } = await Permissions.askAsync(scopeMap[scope])
       if (status === 'granted') {
         res.errMsg = 'authorize:ok'
-        success && success(res)
-        complete && complete(res)
-
-        resolve(res)
+        return successHandler(success, complete)(res)
       } else {
         res.errMsg = 'authorize:denied/undetermined'
-        fail && fail(res)
-        complete && complete(res)
-
-        resolve(res)
+        return errorHandler(fail, complete)(res)
       }
     } catch (error) {
       res.errMsg = 'authorize:fail'
-      fail && fail(res)
-      complete && complete(res)
-
-      reject(error)
+      return errorHandler(fail, complete)(res)
     }
-  })
 }
 
-export function getSetting(opts: Taro.getSetting.Option): Promise<Taro.getSetting.SuccessCallbackResult> {
+export async function getSetting(opts: Taro.getSetting.Option = {}): Promise<Taro.getSetting.SuccessCallbackResult> {
   const { success, fail, complete } = opts
   const res: any = {}
 
-  return new Promise(async (resolve, reject) => {
     try {
       res.authSetting = await getAuthSetting()
       res.errMsg = 'getSetting:ok'
-      success && success(res)
-      complete && complete(res)
-
-      resolve(res)
+      return successHandler(success, complete)(res)
     } catch (error) {
       res.errMsg = 'getSetting:fail'
-      fail && fail(res)
-      complete && complete(res)
-
-      reject(error)
+      return errorHandler(fail, complete)(res)
     }
-  })
 }
 
-export function openSetting(opts: Taro.openSetting.Option): Promise<Taro.openSetting.SuccessCallbackResult> {
+export function openSetting(opts: Taro.openSetting.Option = {}): Promise<Taro.openSetting.SuccessCallbackResult> {
   return new Promise((resolve, reject) => {
     stateListener = (next) => handleAppStateChange(next, resolve, reject, opts)
     AppState.addEventListener('change', stateListener)
     Linking.openSettings()
   })
 }
-

package/src/lib/previewImage/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { View, ActivityIndicator, StyleSheet, Alert } from 'react-native'
+import { View, ActivityIndicator, StyleSheet, Alert, BackHandler } from 'react-native'
 import RootSiblings from 'react-native-root-siblings'
 import ImageViewer from 'react-native-image-zoom-viewer'
 import { saveMedia } from '../media'
@@ -28,8 +28,15 @@ export function previewImage(obj: Taro.previewImage.Option): void {
   if (index === -1) {
     throw new Error('"current" or "urls" is invalid')
   }
+
   let sibling
+  function backhandler() {
+    onSwipeDown()
+    return true
+  }
+
   function onSwipeDown() {
+    BackHandler.removeEventListener('hardwareBackPress', backhandler)
     sibling?.destroy()
     sibling = undefined
   }
@@ -113,6 +120,7 @@ export function previewImage(obj: Taro.previewImage.Option): void {
         />
       </View>
     )
+    BackHandler.addEventListener('hardwareBackPress', backhandler)
   } catch (e) {
     onFail(e)
   }

package/src/lib/removeStorage/index.ts

@@ -7,14 +7,14 @@ export function removeStorage(option: Taro.removeStorage.Option): Promise<Taro.G
   return new Promise((resolve, reject) => {
     AsyncStorage.removeItem(key)
       .then(() => {
-        success && success(res)
-        complete && complete(res)
+        success?.(res)
+        complete?.(res)
 
         resolve(res)
       }).catch((err) => {
         res.errMsg = err.message
-        fail && fail(res)
-        complete && complete(res)
+        fail?.(res)
+        complete?.(res)
 
         reject(err)
       })

package/src/lib/request/index.ts

@@ -1,6 +1,6 @@
-// import { Link } from '@tarojs/taro'
+import { errorHandler, successHandler } from "../../utils"
 
-function serializeParams (params) {
+function serializeParams(params) {
   if (!params) {
     return ''
   }
@@ -8,14 +8,14 @@ function serializeParams (params) {
     .map(key => (`${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`)).join('&')
 }
 
-function generateRequestUrlWithParams (url, params) {
+function generateRequestUrlWithParams(url, params) {
   params = typeof params === 'string' ? params : serializeParams(params)
   url += (~url.indexOf('?') ? '&' : '?') + params
   url = url.replace('?&', '?')
   return url
 }
 
-function _request <T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
+function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
   options = options || {}
   if (typeof options === 'string') {
     options = {
@@ -60,42 +60,40 @@ function _request <T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
     params.signal = signal
   }
 
-  const originSuccess = options.success
-  const originFail = options.fail
-  const originComplete = options.complete
-  let completeRes
-  const p: any = new Promise((resolve, reject) => {
-    // eslint-disable-next-line no-undef
-    fetch(url, params)
-      .then(response => {
-        res.statusCode = response.status
-        res.header = response.headers
-        if (options.dataType === 'json' || typeof options.dataType === 'undefined') {
-          return response.json()
-        }
-        if (options.responseType === 'arraybuffer') {
-          return response.arrayBuffer()
-        }
-        if (options.responseType === 'text') {
-          return response.text()
-        }
-        return response
-      })
-      .then(resData => {
-        res.data = resData
-        completeRes = Object.assign({}, res)
-        originSuccess && originSuccess(res)
-        resolve(res)
-      })
-      .catch(error => {
-        completeRes = error.message === 'Aborted' ? { code: 20, message: 'Aborted', name: 'AbortError' } : Object.assign({}, error)
-        originFail && originFail(error)
-        reject(error)
-      })
-      .finally(() => {
-        originComplete && originComplete(completeRes)
-      })
+  const { success, fail, complete } = options
+
+  const fetchPromise = fetch(url, params)
+    .then(response => {
+      res.statusCode = response.status
+      res.header = response.headers
+      if (options.dataType === 'json' || typeof options.dataType === 'undefined') {
+        return response.json()
+      }
+      if (options.responseType === 'arraybuffer') {
+        return response.arrayBuffer()
+      }
+      if (options.responseType === 'text') {
+        return response.text()
+      }
+      return response
+    })
+
+  const timeoutPromise = new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      controller?.abort()
+      reject(Error('request:fail timeout'))
+      clearTimeout?.(timer)
+    }, options.timeout ?? 2000)
   })
+
+  const p: any = Promise.race([fetchPromise, timeoutPromise]).then(resData => {
+    res.data = resData
+    return successHandler(success, complete)(res)
+  }).catch(err => {
+    res.errMsg = err.message
+    return errorHandler(fail, complete)(res)
+  })
+
   p.abort = function () {
     if (controller) {
       controller.abort()
@@ -107,12 +105,3 @@ function _request <T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
 }
 
 export const request = _request
-
-// function taroInterceptor (chain) {
-//   return _request(chain.requestParams)
-// }
-
-// const link = new Link(taroInterceptor)
-
-// export const request = link.request.bind(link)
-// export const addInterceptor = link.addInterceptor.bind(link)

package/src/lib/setClipboardData/index.ts

@@ -1,5 +1,6 @@
 import Clipboard from '@react-native-community/clipboard'
 import { showToast } from '../showModal/toast'
+import { successHandler, errorHandler } from '../../utils'
 
 export function setClipboardData(opts: Taro.setClipboardData.Option): Promise<Taro.setClipboardData.Promised> {
   const { data, success, fail, complete } = opts
@@ -8,10 +9,7 @@ export function setClipboardData(opts: Taro.setClipboardData.Option): Promise<Ta
     const res = {
       errMsg: 'setClipboardData:fail parameter error: parameter.data should be String'
     }
-    fail?.(res)
-    complete?.(res)
-
-    return Promise.reject(res)
+    return errorHandler(fail, complete)(res)
   }
 
   Clipboard.setString(data)
@@ -22,8 +20,5 @@ export function setClipboardData(opts: Taro.setClipboardData.Option): Promise<Ta
   showToast({
     title: '内容已复制'
   })
-  success?.(res)
-  complete?.(res)
-
-  return Promise.resolve(res)
+  return successHandler(success, complete)(res)
 }

package/src/lib/setStorage/index.ts

@@ -1,22 +1,15 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
+import { errorHandler, successHandler } from '../../utils'
 
-export function setStorage(option: Taro.setStorage.Option): Promise<Taro.General.CallbackResult> {
+export async function setStorage(option: Taro.setStorage.Option): Promise<Taro.General.CallbackResult> {
   const { key, data, success, fail, complete } = option
   const res = { errMsg: 'setStorage:ok' }
 
-  return new Promise((resolve, reject) => {
-    AsyncStorage.setItem(key, JSON.stringify(data))
-      .then(() => {
-        success?.(res)
-        complete?.(res)
-
-        resolve(res)
-      }).catch((err) => {
-        res.errMsg = err.message
-        fail?.(res)
-        complete?.(res)
-
-        reject(err)
-      })
-  })
+  try {
+    await AsyncStorage.setItem(key, JSON.stringify(data))
+    return successHandler(success, complete)(res)
+  } catch (err) {
+    res.errMsg = err.message
+    return errorHandler(fail, complete)(res)
+  }
 }

package/src/lib/showActionSheet/index.tsx

@@ -20,8 +20,8 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
       sibling && sibling.destroy()
       sibling = undefined
       const res = { tapIndex, errMsg: 'showActionSheet:ok' }
-      success && success(res)
-      complete && complete(res)
+      success?.(res)
+      complete?.(res)
       resolve(res)
     }
 
@@ -29,8 +29,8 @@ function showActionSheet (obj: Taro.showActionSheet.Option): Promise<Taro.showAc
       const res = { errMsg: 'showActionSheet:fail cancel' }
       sibling && sibling.destroy()
       sibling = undefined
-      fail && fail(res)
-      complete && complete(res)
+      fail?.(res)
+      complete?.(res)
       reject(res)
     }
 

package/src/lib/showModal/index.tsx

@@ -24,8 +24,8 @@ function showModal (obj: Taro.showModal.Option): Promise<Taro.showModal.SuccessC
       const res = { errMsg: 'showModal:ok', confirm: true, cancel: false }
       sibling && sibling.destroy()
       sibling = undefined
-      success && success(res)
-      complete && complete(res)
+      success?.(res)
+      complete?.(res)
       resolve(res)
     }
 
@@ -33,8 +33,8 @@ function showModal (obj: Taro.showModal.Option): Promise<Taro.showModal.SuccessC
       const res = { errMsg: 'showModal:cancel', confirm: false, cancel: true }
       sibling && sibling.destroy()
       sibling = undefined
-      success && success(res)
-      complete && complete(res)
+      success?.(res)
+      complete?.(res)
       resolve(res)
     }
     try {
@@ -60,8 +60,8 @@ function showModal (obj: Taro.showModal.Option): Promise<Taro.showModal.SuccessC
       )
     } catch (e) {
       const res = { errMsg: `showModal fail:${e.message}` }
-      fail && fail(res)
-      complete && complete(res)
+      fail?.(res)
+      complete?.(res)
       reject(res)
     }
   })

package/src/lib/showModal/toast.tsx

@@ -202,12 +202,12 @@ function hideToast (opts: Taro.hideToast.Option = {}): void {
     (global as any).wxToastRootSiblings && (global as any).wxToastRootSiblings.destroy();
     (global as any).wxToastRootSiblings = undefined
     const res = { errMsg: 'showToast:ok' }
-    success && success(res)
-    complete && complete(res)
+    success?.(res)
+    complete?.(res)
   } catch (e) {
     const res = { errMsg: e }
-    fail && fail(res)
-    complete && complete(res)
+    fail?.(res)
+    complete?.(res)
   }
 }
 
@@ -218,12 +218,12 @@ function hideLoading (opts: Taro.hideLoading.Option = {}): void {
     (global as any).wxToastRootSiblings && (global as any).wxToastRootSiblings.destroy();
     (global as any).wxToastRootSiblings = undefined
     const res = { errMsg: 'showLoading:ok' }
-    success && success(res)
-    complete && complete(res)
+    success?.(res)
+    complete?.(res)
   } catch (e) {
     const res = { errMsg: e }
-    fail && fail(res)
-    complete && complete(res)
+    fail?.(res)
+    complete?.(res)
   }
 }
 

package/src/lib/vibrate.ts

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