@tarojs/taro-rn 4.0.0-beta.5 → 4.0.0-beta.50

package/dist/lib/showModal/Dialog.js

@@ -36,10 +36,8 @@ const styles = create({
         paddingRight: V.weuiDialogGapWidth
     },
     dialogTitle: {
-        fontWeight: '400'
-    },
-    iosDialogTitle: {
-        fontSize: 18,
+        fontWeight: '700',
+        fontSize: 17,
         textAlign: 'center'
     },
     androidDialogTitle: {
@@ -48,37 +46,28 @@ const styles = create({
     },
     dialogBody: {
         paddingLeft: V.weuiDialogGapWidth,
-        paddingRight: V.weuiDialogGapWidth
-    },
-    iosDialogBody: {
-        paddingBottom: (0.8 * 15) + 20
-    },
-    androidDialogBody: {
-        paddingTop: 0.25 * 17,
-        paddingBottom: (17 * 2) + 20
+        paddingRight: V.weuiDialogGapWidth,
+        marginBottom: 32
     },
     dialogBodyText: {
         color: V.weuiTextColorGray,
-        lineHeight: 15 * 1.3,
+        fontSize: 17,
+        textAlign: 'center',
+        lineHeight: 17 * 1.4,
         android: {
-            lineHeight: Math.round(15 * 1.3)
+            lineHeight: Math.round(17 * 1.4)
         }
     },
-    iosDialogBodyText: {
-        fontSize: 15,
-        textAlign: 'center'
-    },
     androidDialogBodyText: {
-        fontSize: 17,
         textAlign: 'left'
     },
     dialogFooter: {
-        flexDirection: 'row'
-    },
-    iosDialogFooter: {
+        flexDirection: 'row',
         height: 48,
         alignItems: 'center',
         justifyContent: 'center',
+    },
+    dialogFooterBorder: {
         borderTopWidth: StyleSheet.hairlineWidth,
         borderColor: V.weuiDialogLineColor,
         borderStyle: 'solid'
@@ -93,11 +82,9 @@ const styles = create({
     },
     dialogFooterOpr: {
         alignItems: 'center',
-        justifyContent: 'center'
-    },
-    iosDialogFooterOpr: {
+        justifyContent: 'center',
         height: 48,
-        flex: 1
+        flex: 1,
     },
     androidDialogFooterOpr: {
         height: 42,
@@ -112,7 +99,7 @@ const styles = create({
         borderColor: V.weuiDialogLineColor,
         borderStyle: 'solid'
     },
-    iosDialogFooterOprText: {
+    dialogFooterOprText: {
         fontSize: 18
     },
     androidDialogFooterOprText: {
@@ -153,10 +140,9 @@ const Index = ({ visible = false, buttons = [], title, style, maskStyle, headerS
         return React.createElement(TouchableHighlight, Object.assign({ key: idx, style: [
                 styles.dialogFooterOpr,
                 styles[`${_type}DialogFooterOpr`],
-                _type === 'ios' && idx > 0 ? styles.dialogFooterOprWithBorder : {},
-                _type === 'android' && idx === buttons.length - 1 ? styles.dialogFooterOprWithNegativeMarginRight : {}
+                _type === 'android' && idx === buttons.length - 1 ? styles.dialogFooterOprWithNegativeMarginRight : (idx > 0 ? styles.dialogFooterOprWithBorder : {}),
             ], underlayColor: underlayColor }, others),
-            React.createElement(Text, { style: [styles[`${_type}DialogFooterOprText`], { color: btnType }] }, label));
+            React.createElement(Text, { style: [styles.dialogFooterOprText, styles[`${_type}DialogFooterOprText`], { color: btnType }] }, label));
     });
     const childrenWithProps = React.Children.map(children, (child) => {
         if (child.type.displayName === 'Text') {
@@ -171,12 +157,12 @@ const Index = ({ visible = false, buttons = [], title, style, maskStyle, headerS
             React.createElement(View, { style: [styles.dialog, style] },
                 React.createElement(View, { style: [styles.dialogHeader, headerStyle] },
                     React.createElement(Text, { style: [styles.dialogTitle, styles[`${_type}DialogTitle`], titleStyle] }, title)),
-                React.createElement(View, { style: [styles.dialogBody, styles[`${_type}DialogBody`], bodyStyle] }, childrenWithProps),
-                React.createElement(View, { style: [styles.dialogFooter, styles[`${_type}DialogFooter`], footerStyle] }, _renderButtons())))));
+                React.createElement(View, { style: [styles.dialogBody, bodyStyle] }, childrenWithProps),
+                React.createElement(View, { style: [styles.dialogFooter, styles[`${_type}DialogFooter`], _type !== 'android' ? styles.dialogFooterBorder : {}, footerStyle] }, _renderButtons())))));
 };
 Index.propTypes = {
     autoDectect: PropTypes.bool,
-    type: PropTypes.oneOf(['ios', 'android']),
+    type: PropTypes.oneOf(['ios', 'android', 'harmony']),
     title: PropTypes.string,
     buttons: PropTypes.arrayOf(PropTypes.object),
     visible: PropTypes.bool,

package/dist/lib/showModal/Dialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"Dialog.js","sourceRoot":"","sources":["../../../src/lib/showModal/Dialog.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Dialog.js","sourceRoot":"","sources":["../../../src/lib/showModal/Dialog.tsx"],"names":[],"mappings":"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"}

package/dist/lib/showModal/toast.js

@@ -146,7 +146,7 @@ function showToast(options) {
         return errorHandler(fail, complete)(res);
     }
 }
-function showLoading(options) {
+function showLoading(options = { title: "加载中" }) {
     const isObject = shouldBeObject(options);
     if (!isObject.res) {
         const res = { errMsg: `showLoading${isObject.msg}` };

package/dist/lib/showModal/toast.js.map

@@ -1 +1 @@
-{"version":3,"file":"toast.js","sourceRoot":"","sources":["../../../src/lib/showModal/toast.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"toast.js","sourceRoot":"","sources":["../../../src/lib/showModal/toast.tsx"],"names":[],"mappings":"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"}

package/libList.js

@@ -6,6 +6,7 @@ module.exports = [
   'base64ToArrayBuffer',
   'canIUse',
   'chooseImage',
+  'chooseMedia',
   'chooseVideo',
   'clearStorage',
   'clearStorageSync',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-rn",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.50",
   "description": "Taro RN framework",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
@@ -47,7 +47,7 @@
     "react-native-root-toast": "^3.5.1",
     "react-native-safe-area-context": "~4.8.0",
     "react-native-stylekit": "^1.0.0",
-    "@tarojs/runtime-rn": "4.0.0-beta.5"
+    "@tarojs/runtime-rn": "4.0.0-beta.50"
   },
   "devDependencies": {
     "@babel/core": "^7.14.5",
@@ -56,6 +56,7 @@
     "@testing-library/jest-native": "^5.4.2",
     "@testing-library/react-native": "^12.4.1",
     "@types/jest": "^27.4.1",
+    "dpdm": "^3.14.0",
     "expo": "~50.0.2",
     "fbjs-scripts": "^3.0.1",
     "jest": "^29.3.1",

package/src/lib/Popup.tsx

@@ -32,14 +32,14 @@ class Popup extends Component<any, any> {
 
   height
   popup
-
-  constructor (props:Props) {
+  timer
+  constructor(props: Props) {
     super(props)
     this.state = { visible: props.visible ?? false, translateY: new Animated.Value(height) }
     this.handleLayout = this.handleLayout.bind(this)
   }
 
-  UNSAFE_componentWillReceiveProps (nextProp:Props):void {
+  UNSAFE_componentWillReceiveProps (nextProp: Props): void {
     if (this.props.visible !== nextProp.visible) {
       if (nextProp.visible) {
         this.setState({ visible: true })
@@ -53,21 +53,26 @@ class Popup extends Component<any, any> {
       }).start(() => this.setState({ visible: false }))
     }
   }
-
-  handleLayout ():void {
-    this.popup.measure((_x, _y, _w, h) => {
-      this.height = h
-      this.setState({ translateY: new Animated.Value(h) })
-      Animated.timing(this.state.translateY, {
-        toValue: 0,
-        duration: 300,
-        easing: (Easing as any).easeInOut,
-        useNativeDriver: true
-      }).start()
-    })
+  componentWillUnmount (): void {
+    this.timer && clearTimeout(this.timer);
+  }
+  handleLayout (): void {
+    this.timer = setTimeout(() => {
+      this.popup?.measure((_x, _y, _w, h) => {
+        this.height = h
+        this.setState({ translateY: new Animated.Value(h) }, () => {
+          Animated.timing(this.state.translateY, {
+            toValue: 0,
+            duration: 300,
+            easing: (Easing as any).easeInOut,
+            useNativeDriver: true
+          }).start()
+        })
+      })
+    },); // 处理鸿蒙系统handleLayout 回调 this.popup为空的情况
   }
 
-  render ():JSX.Element {
+  render (): JSX.Element {
     const {
       style,
       maskStyle,

package/src/lib/chooseImage/index.ts

@@ -1,33 +1,5 @@
 import { chooseMedia, MEDIA_TYPE } from '../media'
-import { showActionSheet } from '../showActionSheet'
 
 export function chooseImage(opts: Taro.chooseImage.Option): Promise<any> {
-  const {
-    sourceType = ['album', 'camera'],
-  } = opts
-  if(sourceType?.includes('camera') && sourceType?.includes('album')) {
-    return showImagePicker(opts)
-  } else if (sourceType?.includes('camera')) {
-    return chooseMedia({...opts, sourceType: ['camera']}, MEDIA_TYPE.IMAGES)
-  }
-  return chooseMedia({...opts, sourceType: ['album']}, MEDIA_TYPE.IMAGES)
-}
-
-async function showImagePicker(options: Taro.chooseImage.Option):Promise<any> {
-  const { fail, complete } = options
-  try {
-    const res = await showActionSheet({
-      itemList: ['拍照', '从手机相册选择'],
-    })
-    if (res.tapIndex === 0) {
-      return chooseMedia({...options, sourceType: ['camera']}, MEDIA_TYPE.IMAGES)
-    }
-    if (res.tapIndex === 1) {
-      return chooseMedia({...options, sourceType: ['album']}, MEDIA_TYPE.IMAGES)
-    }
-  } catch (err) {
-    const res = { errMsg: 'chooseImage: fail' }
-    fail?.(res)
-    complete?.(res)
-  }
+  return chooseMedia(opts, MEDIA_TYPE.Images)
 }

package/src/lib/chooseMedia/index.ts

@@ -0,0 +1,15 @@
+import { chooseMedia as _chooseMedia, MEDIA_TYPE } from '../media'
+
+export function chooseMedia (opts: Taro.chooseMedia.Option): Promise<any> {
+  if (opts.mediaType?.length === 1) {
+    if (opts.mediaType[0] === 'video') {
+      return _chooseMedia(opts, MEDIA_TYPE.Videos)
+    } else if (opts.mediaType[0] === 'image') {
+      return _chooseMedia(opts, MEDIA_TYPE.Images)
+    } else {
+      return _chooseMedia(opts, MEDIA_TYPE.All)
+    }
+  } else {
+    return _chooseMedia(opts, MEDIA_TYPE.All)
+  }
+}

package/src/lib/chooseVideo/index.ts

@@ -1,35 +1,5 @@
 import { chooseMedia, MEDIA_TYPE } from '../media'
-import { showActionSheet } from '../showActionSheet'
 
 export function chooseVideo(opts: Taro.chooseVideo.Option): Promise<any> {
-  const {
-    sourceType = ['album', 'camera'],
-    compressed
-  } = opts
-  opts = Object.assign(opts, { sizeType: compressed ? ['compressed'] : [] })
-  if(sourceType?.includes('camera') && sourceType?.includes('album')) {
-    return showVideoPicker(opts)
-  } else if (sourceType?.includes('camera')) {
-    return chooseMedia({...opts, sourceType: ['camera']}, MEDIA_TYPE.VIDEOS)
-  }
-  return chooseMedia({...opts, sourceType: ['album']}, MEDIA_TYPE.VIDEOS)
-}
-
-async function showVideoPicker(options: Taro.chooseVideo.Option):Promise<any> {
-  const { fail, complete } = options
-  try {
-    const res = await showActionSheet({
-      itemList: ['拍摄', '从手机相册选择'],
-    })
-    if (res.tapIndex === 0) {
-      return chooseMedia({...options, sourceType: ['camera']}, MEDIA_TYPE.VIDEOS)
-    }
-    if (res.tapIndex === 1) {
-      return chooseMedia({...options, sourceType: ['album']}, MEDIA_TYPE.VIDEOS)
-    }
-  } catch (err) {
-    const res = { errMsg: 'chooseVideo: fail' }
-    fail?.(res)
-    complete?.(res)
-  }
+  return chooseMedia(opts, MEDIA_TYPE.Videos)
 }

package/src/lib/getLocation/index.ts

@@ -1,14 +1,18 @@
 import Geolocation from '@react-native-community/geolocation'
-import { requestForegroundPermissionsAsync } from 'expo-location'
 import { errorHandler } from '../../utils'
 
 export async function getLocation(opts: Taro.getLocation.Option = {}): Promise<Taro.getLocation.SuccessCallbackResult> {
   const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts
-
+  const requestAuthorization = () => {
+    return new Promise((resolve, reject) => {
+      Geolocation.requestAuthorization(()=>resolve({granted: true}), (err)=>reject(err))
+    })
+  }
+  
   try {
     // @ts-ignore
     // todo: fix types
-    const { granted } = await requestForegroundPermissionsAsync()
+    const {granted} = await requestAuthorization()
     if (!granted) {
       const res = { errMsg: 'Permissions denied!' }
       return errorHandler(fail, complete)(res)

package/src/lib/index.ts

@@ -5,6 +5,7 @@ export * from './authorize'
 export * from './base64ToArrayBuffer'
 export * from './canIUse'
 export * from './chooseImage'
+export * from './chooseMedia'
 export * from './chooseVideo'
 export * from './clearStorage'
 export * from './clearStorageSync'

package/src/lib/media.ts

@@ -1,16 +1,20 @@
 import { CameraRoll } from "@react-native-camera-roll/camera-roll"
 import { requestCameraPermissionsAsync } from 'expo-camera'
-import * as ImagePicker from 'expo-image-picker'
+import {
+  requestMediaLibraryPermissionsAsync,
+  launchImageLibraryAsync,
+  launchCameraAsync,
+  MediaTypeOptions,
+  ImagePickerAsset,
+} from 'expo-image-picker'
 import { successHandler, errorHandler } from '../utils'
+import { showActionSheet } from "./showActionSheet"
 
-export const MEDIA_TYPE = {
-  VIDEOS: 'Videos',
-  IMAGES: 'Images'
-}
+export const MEDIA_TYPE = MediaTypeOptions
 
 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 { granted } = await ImagePicker.requestMediaLibraryPermissionsAsync()
+  const { granted } = await requestMediaLibraryPermissionsAsync()
   if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     return errorHandler(fail, complete)(res)
@@ -28,30 +32,70 @@ export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.
   }
 }
 
-export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option, mediaTypes: any): Promise<TaroGeneral.CallbackResult> {
-  if (!opts || typeof opts !== 'object') {
-    opts = {}
+async function showPicker(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option, mediaTypes: MediaTypeOptions):Promise<any> {
+  const { fail, complete } = opts
+  try {
+    const res = await showActionSheet({
+      itemList: ['拍摄', '从手机相册选择'],
+    })
+    if (res.tapIndex === 0) {
+      return _chooseMedia({...opts, sourceType: ['camera']}, mediaTypes)
+    }
+    if (res.tapIndex === 1) {
+      return _chooseMedia({...opts, sourceType: ['album']}, mediaTypes)
+    }
+  } catch (err) {
+    const res = { errMsg: `choose${
+      mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
+    } fail` }
+    fail?.(res)
+    complete?.(res)
+  }
+}
+
+export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option = {}, mediaTypes: MediaTypeOptions): Promise<TaroGeneral.CallbackResult> {
+  const {
+    sourceType = ['album', 'camera'],
+  } = opts
+  if(sourceType?.includes('camera') && sourceType?.includes('album')) {
+    return showPicker(opts, mediaTypes)
+  } else if (sourceType?.includes('camera')) {
+    return _chooseMedia({...opts, sourceType: ['camera']}, mediaTypes)
   }
-  const { sizeType = [], sourceType = [], success, fail, complete, maxDuration, count } = opts as any
+  return _chooseMedia({...opts, sourceType: ['album']}, mediaTypes)
+}
+
+export async function _chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option = {}, mediaTypes: MediaTypeOptions): Promise<TaroGeneral.CallbackResult> {
+  const {
+    sizeType = [],
+    sourceType = [],
+    success,
+    fail,
+    complete,
+    maxDuration,
+    count = (mediaTypes === MEDIA_TYPE.Videos ? 1 : 9),
+    compressed
+  } = opts as any
   const options = {
     mediaTypes,
-    quality: sizeType[0] === 'compressed' ? 0.7 : 1,
+    quality: (sizeType[0] === 'compressed' || compressed) ? 0.7 : 1,
     videoMaxDuration: maxDuration,
-    allowsMultipleSelection: (mediaTypes === MEDIA_TYPE.IMAGES && count > 1) ? true : false,
-    selectionLimit: mediaTypes === MEDIA_TYPE.VIDEOS ? 1 : (count || 9),
+    allowsMultipleSelection: count > 1,
+    selectionLimit: count,
   }
+  const messString = mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
   const isCamera = sourceType[0] === 'camera'
-  const { granted } = isCamera ? await requestCameraPermissionsAsync() : await ImagePicker.requestMediaLibraryPermissionsAsync()
+  const { granted } = isCamera ? await requestCameraPermissionsAsync() : await requestMediaLibraryPermissionsAsync()
   if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     return errorHandler(fail, complete)(res)
   }
 
-  let launchMediaAsync = isCamera ? ImagePicker.launchCameraAsync : ImagePicker.launchImageLibraryAsync
+  let launchMediaAsync = isCamera ? launchCameraAsync : launchImageLibraryAsync
   try {
     const resp = await launchMediaAsync(options)
     let res: any = {}
-    if (mediaTypes === MEDIA_TYPE.VIDEOS) {
+    if (mediaTypes === MEDIA_TYPE.Videos) {
       const asset = resp.assets?.[0]
       res = {
         ...asset,
@@ -61,11 +105,12 @@ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVid
     } else {
       res = {
         tempFilePaths: resp.assets?.map((item) => item.uri),
-        tempFiles: resp.assets?.map((item) => ({
+        tempFiles: resp.assets?.map((item: ImagePickerAsset) => ({
           ...item,
           path: item.uri,
           size: item.fileSize,
           type: item.mimeType,
+          fileType: item.mimeType?.startsWith('video') ? 'video' : 'image',
         }))
       }
     }
@@ -73,13 +118,13 @@ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVid
       return successHandler(success, complete)(res)
     } else {
       const res = {
-        errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo:fail cancel' : 'chooseImage:fail cancel',
+        errMsg: `choose${messString}:fail cancel`
       }
       return errorHandler(fail, complete)(res)
     }
   } catch (err) {
     const res = {
-      errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo fail' : 'chooseImage fail',
+      errMsg: `choose${messString}:fail`,
       err
     }
     return errorHandler(fail, complete)(res)

package/src/lib/request/index.ts

@@ -83,7 +83,7 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
       controller?.abort()
       reject(Error('request:fail timeout'))
       clearTimeout?.(timer)
-    }, options.timeout ?? 2000)
+    }, options.timeout ?? 60000)
   })
 
   const p: any = Promise.race([fetchPromise, timeoutPromise]).then(resData => {

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> {