fix: 修复授权弹窗的bug

thundersdata-frontend · Apr 23, 2024 · 5707f68 · 5707f68
1 parent 57f5fb6
commit 5707f68
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 34 deletions.
diff --git a/.changeset/honest-turtles-chew.md b/.changeset/honest-turtles-chew.md
@@ -0,0 +1,5 @@
+---
+'@td-design/react-native-image-picker': minor
+---
+
+fix: 修复授权弹窗的bug
diff --git a/packages/react-native-image-picker/src/index.tsx b/packages/react-native-image-picker/src/index.tsx
@@ -1,5 +1,5 @@
 import React, { forwardRef, useImperativeHandle } from 'react';
-import { Image, Rationale, TouchableWithoutFeedback } from 'react-native';
+import { Image, TouchableWithoutFeedback } from 'react-native';
 import { CameraOptions } from 'react-native-image-picker';
 
 import { ActionSheet, Box, helpers, Indicator, Modal, Pressable, Theme, useTheme } from '@td-design/react-native';
@@ -16,21 +16,6 @@ const cameraOptions: CameraOptions = {
   quality: 1,
   saveToPhotos: false,
   durationLimit: 15,
-  videoQuality: 'high',
-};
-const cameraRationaleOptions: Rationale = {
-  title: '获取摄像头权限',
-  message: '若不允许，您将无法使用摄像头功能',
-  buttonPositive: '同意',
-  buttonNegative: '取消',
-  buttonNeutral: '下次再说',
-};
-const libraryRationaleOptions: Rationale = {
-  title: '获取读取文件权限',
-  message: '若不允许，您将无法访问图库',
-  buttonPositive: '同意',
-  buttonNegative: '取消',
-  buttonNeutral: '下次再说',
 };
 
 const ImagePicker = forwardRef<ImagePickerRef, ImagePickerProps>(
@@ -41,8 +26,6 @@ const ImagePicker = forwardRef<ImagePickerRef, ImagePickerProps>(
       height = px(100),
       options = cameraOptions,
       showUploadImg = true,
-      cameraRationale = cameraRationaleOptions,
-      libraryRationale = libraryRationaleOptions,
       launchLibraryText = '打开相册',
       launchCameraText = '打开摄像头',
       previewImgText = '预览图片',
@@ -85,8 +68,6 @@ const ImagePicker = forwardRef<ImagePickerRef, ImagePickerProps>(
       onCancel,
       onFail,
       onGrantFail,
-      cameraRationale,
-      libraryRationale,
     });
 
     useImperativeHandle(ref, () => ({}));

diff --git a/packages/react-native-image-picker/src/type.ts b/packages/react-native-image-picker/src/type.ts
@@ -49,4 +49,4 @@ export type HookProps = Pick<
   ImagePickerProps,
   'value' | 'onBeforeUpload' | 'onUpload' | 'onAfterUpload' | 'onCancel' | 'onFail' | 'onGrantFail'
 > &
-  Required<Pick<ImagePickerProps, 'options' | 'showUploadImg' | 'cameraRationale' | 'libraryRationale'>>;
+  Required<Pick<ImagePickerProps, 'options' | 'showUploadImg'>>;
diff --git a/packages/react-native-image-picker/src/useImagePicker.ts b/packages/react-native-image-picker/src/useImagePicker.ts
@@ -24,8 +24,6 @@ export default function useImagePicker({
   onCancel,
   onFail,
   onGrantFail,
-  cameraRationale,
-  libraryRationale,
 }: HookProps) {
   /** 打开相册或者摄像头的ActionSheet */
   const [launchVisible, { setTrue: setLaunchVisibleTrue, setFalse: setLaunchVisibleFalse }] = useBoolean(false);
@@ -46,24 +44,14 @@ export default function useImagePicker({
 
   /** 打开相册 */
   const launchLibrary = async () => {
-    if (Platform.OS === 'android') {
-      const result = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE,
-        libraryRationale
-      );
-      if (result !== 'granted') {
-        onGrantFail?.();
-        return;
-      }
-    }
     const response = await launchImageLibrary(options);
     handleCallback(response);
   };
 
   /** 打开摄像头 */
   const launchCamera = async () => {
     if (Platform.OS === 'android') {
-      const result = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.CAMERA, cameraRationale);
+      const result = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.CAMERA);
       if (result !== 'granted') {
         onGrantFail?.();
         return;