stream-chat-react-native 5.34.1-beta.2 → 5.34.1-beta.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native",
   "description": "The official React Native SDK for Stream Chat, a service for building chat applications",
-  "version": "5.34.1-beta.2",
+  "version": "5.34.1-beta.4",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"
@@ -11,21 +11,21 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "es6-symbol": "^3.1.3",
-    "stream-chat-react-native-core": "5.34.1-beta.2"
+    "stream-chat-react-native-core": "5.34.1-beta.4"
   },
   "peerDependencies": {
     "@react-native-camera-roll/camera-roll": ">=5.0.0",
-    "@react-native-community/netinfo": ">=2.0.7",
     "@react-native-clipboard/clipboard": "^1.11.1",
+    "@react-native-community/netinfo": ">=2.0.7",
     "@stream-io/flat-list-mvcp": "^0.10.3",
     "react-native": ">=0.60.0",
+    "react-native-audio-recorder-player": ">=3.6.4",
     "react-native-document-picker": ">=9.0.1",
     "react-native-fs": ">=2.16.6",
     "react-native-haptic-feedback": ">=1.11.0",
     "react-native-image-crop-picker": ">=0.33.2",
     "react-native-image-resizer": ">=1.4.2",
     "react-native-share": ">=4.1.0",
-    "react-native-audio-recorder-player": ">=3.6.4",
     "react-native-video": ">=6.4.2"
   },
   "peerDependenciesMeta": {
@@ -41,6 +41,9 @@
     "react-native-haptic-feedback": {
       "optional": true
     },
+    "react-native-image-crop-picker": {
+      "optional": true
+    },
     "react-native-audio-recorder-player": {
       "optional": true
     },
@@ -58,7 +61,6 @@
     "@stream-io/flat-list-mvcp": "0.10.3",
     "react-native": ">=0.60.0",
     "react-native-fs": ">=2.16.6",
-    "react-native-image-crop-picker": "^0.38.0",
     "react-native-image-resizer": ">=1.4.2"
   }
 }

package/src/handlers/index.ts

@@ -4,7 +4,6 @@ export * from './getLocalAssetUri';
 export * from './getPhotos';
 export * from './NetInfo';
 export * from './saveFile';
-export * from './takePhoto';
 export * from './Sound';
 export * from './Video';
 export * from './oniOS14GalleryLibrarySelectionChange';

package/src/index.js

@@ -13,7 +13,6 @@ import {
   oniOS14GalleryLibrarySelectionChange,
   saveFile,
   Sound,
-  takePhoto,
   Video,
 } from './handlers';
 
@@ -22,6 +21,7 @@ import {
   pickDocument,
   setClipboardString,
   shareImage,
+  takePhoto,
   triggerHaptic,
 } from './optionalDependencies';
 

package/src/optionalDependencies/index.ts

@@ -4,3 +4,4 @@ export * from './Video';
 export * from './triggerHaptic';
 export * from './setClipboardString';
 export * from './pickDocument';
+export * from './takePhoto';

package/src/optionalDependencies/takePhoto.ts

@@ -0,0 +1,83 @@
+import { AppState, Image, PermissionsAndroid, Platform } from 'react-native';
+
+let ImagePicker;
+
+try {
+  ImagePicker = require('react-native-image-crop-picker').default;
+} catch (e) {
+  console.log('react-native-image-crop-picker is not installed');
+}
+
+export const takePhoto = ImagePicker
+  ? async ({ compressImageQuality = Platform.OS === 'ios' ? 0.8 : 1 }) => {
+      if (Platform.OS === 'android') {
+        const cameraPermissions = await PermissionsAndroid.check(
+          PermissionsAndroid.PERMISSIONS.CAMERA,
+        );
+        if (!cameraPermissions) {
+          const androidPermissionStatus = await PermissionsAndroid.request(
+            PermissionsAndroid.PERMISSIONS.CAMERA,
+          );
+          if (androidPermissionStatus === PermissionsAndroid.RESULTS.DENIED) {
+            return { cancelled: true };
+          } else if (androidPermissionStatus === PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN) {
+            return { askToOpenSettings: true, cancelled: true };
+          }
+        }
+      }
+      try {
+        const photo = await ImagePicker.openCamera({
+          compressImageQuality: Math.min(Math.max(0, compressImageQuality), 1),
+        });
+        if (photo.height && photo.width && photo.path) {
+          let size: { height?: number; width?: number } = {};
+          if (Platform.OS === 'android') {
+            // Height and width returned by ImagePicker are incorrect on Android.
+            // The issue is described in following github issue:
+            // https://github.com/ivpusic/react-native-image-crop-picker/issues/901
+            // This we can't rely on them as it is, and we need to use Image.getSize
+            // to get accurate size.
+            const getSize = (): Promise<{ height: number; width: number }> =>
+              new Promise((resolve) => {
+                Image.getSize(photo.path, (width, height) => {
+                  resolve({ height, width });
+                });
+              });
+
+            try {
+              const { height, width } = await getSize();
+              size.height = height;
+              size.width = width;
+            } catch (e) {
+              // do nothing
+              console.warn('Error get image size of picture caputred from camera ', e);
+            }
+          } else {
+            size = {
+              height: photo.height,
+              width: photo.width,
+            };
+          }
+          return {
+            cancelled: false,
+            source: 'camera',
+            uri: photo.path,
+            ...size,
+          };
+        }
+      } catch (e: unknown) {
+        if (e instanceof Error) {
+          // on iOS: if it was in inactive state, then the user had just denied the permissions
+          if (Platform.OS === 'ios' && AppState.currentState === 'active') {
+            const cameraPermissionDeniedMsg = 'User did not grant camera permission.';
+            // Open settings when the user did not allow camera permissions
+            if (e.message === cameraPermissionDeniedMsg) {
+              return { askToOpenSettings: true, cancelled: true };
+            }
+          }
+        }
+      }
+
+      return { cancelled: true };
+    }
+  : null;

package/src/handlers/takePhoto.ts

@@ -1,72 +0,0 @@
-import { AppState, Image, PermissionsAndroid, Platform } from 'react-native';
-import ImagePicker from 'react-native-image-crop-picker';
-
-export const takePhoto = async ({ compressImageQuality = Platform.OS === 'ios' ? 0.8 : 1 }) => {
-  if (Platform.OS === 'android') {
-    const cameraPermissions = await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.CAMERA);
-    if (!cameraPermissions) {
-      const androidPermissionStatus = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.CAMERA,
-      );
-      if (androidPermissionStatus === PermissionsAndroid.RESULTS.DENIED) {
-        return { cancelled: true };
-      } else if (androidPermissionStatus === PermissionsAndroid.RESULTS.NEVER_ASK_AGAIN) {
-        return { askToOpenSettings: true, cancelled: true };
-      }
-    }
-  }
-  try {
-    const photo = await ImagePicker.openCamera({
-      compressImageQuality: Math.min(Math.max(0, compressImageQuality), 1),
-    });
-    if (photo.height && photo.width && photo.path) {
-      let size: { height?: number; width?: number } = {};
-      if (Platform.OS === 'android') {
-        // Height and width returned by ImagePicker are incorrect on Android.
-        // The issue is described in following github issue:
-        // https://github.com/ivpusic/react-native-image-crop-picker/issues/901
-        // This we can't rely on them as it is, and we need to use Image.getSize
-        // to get accurate size.
-        const getSize = (): Promise<{ height: number; width: number }> =>
-          new Promise((resolve) => {
-            Image.getSize(photo.path, (width, height) => {
-              resolve({ height, width });
-            });
-          });
-
-        try {
-          const { height, width } = await getSize();
-          size.height = height;
-          size.width = width;
-        } catch (e) {
-          // do nothing
-          console.warn('Error get image size of picture caputred from camera ', e);
-        }
-      } else {
-        size = {
-          height: photo.height,
-          width: photo.width,
-        };
-      }
-      return {
-        cancelled: false,
-        source: 'camera',
-        uri: photo.path,
-        ...size,
-      };
-    }
-  } catch (e: unknown) {
-    if (e instanceof Error) {
-      // on iOS: if it was in inactive state, then the user had just denied the permissions
-      if (Platform.OS === 'ios' && AppState.currentState === 'active') {
-        const cameraPermissionDeniedMsg = 'User did not grant camera permission.';
-        // Open settings when the user did not allow camera permissions
-        if (e.message === cameraPermissionDeniedMsg) {
-          return { askToOpenSettings: true, cancelled: true };
-        }
-      }
-    }
-  }
-
-  return { cancelled: true };
-};