shakebug-react-native 2.3.3 → 2.3.4

package/ios/ScreenShot/{ShakebugSDKRNViewShot.m → ShakebugCapture.m}

@@ -1,19 +1,24 @@
-#import "ShakebugSDKRNViewShot.h"
+#import "ShakebugCapture.h"
 #import <AVFoundation/AVFoundation.h>
 #import <React/RCTLog.h>
 #import <React/UIView+React.h>
 #import <React/RCTUtils.h>
 #import <React/RCTConvert.h>
-#import <React/RCTScrollView.h>
 #import <React/RCTUIManager.h>
+#import <React/RCTBridge.h>
+
 #if __has_include(<React/RCTUIManagerUtils.h>)
 #import <React/RCTUIManagerUtils.h>
 #endif
-#import <React/RCTBridge.h>
 
-@implementation ShakebugSDKRNViewShot
+// Forward declaration for RCTScrollView if the header is not found
+@interface RCTScrollView : UIView
+@property (nonatomic, readonly) UIScrollView *scrollView;
+@end
+
+@implementation ShakebugCapture
 
-RCT_EXPORT_MODULE()
+RCT_EXPORT_MODULE(ShakebugSDKRNViewShot)
 
 @synthesize bridge = _bridge;
 
@@ -52,14 +57,30 @@ RCT_EXPORT_METHOD(captureRef:(nonnull NSNumber *)target
     UIView *view;
 
     if ([target intValue] == -1) {
-      UIWindow *window = [[UIApplication sharedApplication] keyWindow];
+      UIWindow *window = nil;
+      if (@available(iOS 13.0, *)) {
+          for (UIWindowScene* windowScene in [UIApplication sharedApplication].connectedScenes) {
+              if (windowScene.activationState == UISceneActivationStateForegroundActive) {
+                  for (UIWindow *w in windowScene.windows) {
+                      if (w.isKeyWindow) {
+                          window = w;
+                          break;
+                      }
+                  }
+              }
+              if (window) break;
+          }
+      }
+      if (!window) {
+          window = [[UIApplication sharedApplication] keyWindow];
+      }
       view = window;
     } else {
       view = viewRegistry[target];
     }
 
     if (!view) {
-      reject(RCTErrorUnspecified, [NSString stringWithFormat:@"No view found with reactTag: %@", target], nil);
+      reject(@"E_UNABLE_TO_SNAPSHOT", [NSString stringWithFormat:@"No view found with reactTag: %@", target], nil);
       return;
     }
 
@@ -74,14 +95,15 @@ RCT_EXPORT_METHOD(captureRef:(nonnull NSNumber *)target
     BOOL success;
 
     UIView* rendered;
-    UIScrollView* scrollView;
+    UIScrollView* scrollView = nil;
     if (snapshotContentContainer) {
-      if (![view isKindOfClass:[RCTScrollView class]]) {
-        reject(RCTErrorUnspecified, [NSString stringWithFormat:@"snapshotContentContainer can only be used on a RCTScrollView. instead got: %@", view], nil);
+      // Use string comparison for class to avoid compilation errors with RCTScrollView in newer RN versions
+      if (![view isKindOfClass:NSClassFromString(@"RCTScrollView")]) {
+        reject(@"E_UNABLE_TO_SNAPSHOT", [NSString stringWithFormat:@"snapshotContentContainer can only be used on a RCTScrollView. instead got: %@", view], nil);
         return;
       }
-      RCTScrollView* rctScrollView = view;
-      scrollView = rctScrollView.scrollView;
+      // Access scrollView property via valueForKey to be safe
+      scrollView = [view valueForKey:@"scrollView"];
       rendered = scrollView;
     }
     else {
@@ -92,12 +114,12 @@ RCT_EXPORT_METHOD(captureRef:(nonnull NSNumber *)target
       size = snapshotContentContainer ? scrollView.contentSize : view.bounds.size;
     }
     if (size.width < 0.1 || size.height < 0.1) {
-      reject(RCTErrorUnspecified, [NSString stringWithFormat:@"The content size must not be zero or negative. Got: (%g, %g)", size.width, size.height], nil);
+      reject(@"E_UNABLE_TO_SNAPSHOT", [NSString stringWithFormat:@"The content size must not be zero or negative. Got: (%g, %g)", size.width, size.height], nil);
       return;
     }
 
-    CGPoint savedContentOffset;
-    CGRect savedFrame;
+    CGPoint savedContentOffset = CGPointZero;
+    CGRect savedFrame = CGRectZero;
     if (snapshotContentContainer) {
       // Save scroll & frame and set it temporarily to the full content size
       savedContentOffset = scrollView.contentOffset;
@@ -109,12 +131,10 @@ RCT_EXPORT_METHOD(captureRef:(nonnull NSNumber *)target
     UIGraphicsBeginImageContextWithOptions(size, NO, 0);
     
     if (renderInContext) {
-      // this comes with some trade-offs such as inability to capture gradients or scrollview's content in full but it works for large views
       [rendered.layer renderInContext: UIGraphicsGetCurrentContext()];
       success = YES;
     }
     else {
-      // this doesn't work for large views and reports incorrect success even though the image is blank
       success = [rendered drawViewHierarchyInRect:(CGRect){CGPointZero, size} afterScreenUpdates:YES];
     }
     UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
@@ -127,12 +147,12 @@ RCT_EXPORT_METHOD(captureRef:(nonnull NSNumber *)target
     }
 
     if (!success) {
-      reject(RCTErrorUnspecified, @"The view cannot be captured. drawViewHierarchyInRect was not successful. This is a potential technical or security limitation.", nil);
+      reject(@"E_UNABLE_TO_SNAPSHOT", @"The view cannot be captured. drawViewHierarchyInRect was not successful.", nil);
       return;
     }
 
     if (!image) {
-      reject(RCTErrorUnspecified, @"Failed to capture view snapshot. UIGraphicsGetImageFromCurrentImageContext() returned nil!", nil);
+      reject(@"E_UNABLE_TO_SNAPSHOT", @"Failed to capture view snapshot. Image is nil.", nil);
       return;
     }
 
@@ -151,22 +171,23 @@ RCT_EXPORT_METHOD(captureRef:(nonnull NSNumber *)target
       NSError *error = nil;
       NSString *res = nil;
       if ([result isEqualToString:@"base64"]) {
-        // Return as a base64 raw string
         res = [data base64EncodedStringWithOptions: NSDataBase64Encoding64CharacterLineLength];
       }
       else if ([result isEqualToString:@"data-uri"]) {
-        // Return as a base64 data uri string
         NSString *base64 = [data base64EncodedStringWithOptions: NSDataBase64Encoding64CharacterLineLength];
         NSString *imageFormat = ([format isEqualToString:@"jpg"]) ? @"jpeg" : format;
         res = [NSString stringWithFormat:@"data:image/%@;base64,%@", imageFormat, base64];
       }
       else {
         // Save to a temp file
-        NSString *path = RCTTempFilePath(format, &error);
-        if (path && !error) {
-          if ([data writeToFile:path options:(NSDataWritingOptions)0 error:&error]) {
-            res = path;
-          }
+        NSString *tempPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"ReactNative"];
+        [[NSFileManager defaultManager] createDirectoryAtPath:tempPath withIntermediateDirectories:YES attributes:nil error:NULL];
+        
+        NSString *filename = [NSString stringWithFormat:@"%@.%@", [[NSUUID UUID] UUIDString], format ?: @"png"];
+        NSString *path = [tempPath stringByAppendingPathComponent:filename];
+        
+        if ([data writeToFile:path options:(NSDataWritingOptions)0 error:&error]) {
+          res = path;
         }
       }
 
@@ -175,12 +196,10 @@ RCT_EXPORT_METHOD(captureRef:(nonnull NSNumber *)target
         return;
       }
 
-      // If we reached here, something went wrong
-      if (error) reject(RCTErrorUnspecified, error.localizedDescription, error);
-      else reject(RCTErrorUnspecified, @"viewshot unknown error", nil);
+      if (error) reject(@"E_UNABLE_TO_SNAPSHOT", error.localizedDescription, error);
+      else reject(@"E_UNABLE_TO_SNAPSHOT", @"Unknown error during capture", nil);
     });
   }];
 }
 
-
 @end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "Shakebug allows users to report the bug from your mobile phone for your application. Here users just need to shake their mobile and all the data regarding bugs & crashes can be seen by developers through their log in panel easily",
   "main": "src/index.tsx",
   "scripts": {

package/src/APIs/AddIssue.js

@@ -31,11 +31,7 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         let osversion = await DeviceInfo.getSystemVersion()
         const type = isVideo ? 'video/mp4' : 'image/jpg';
         const name = isVideo ? 'video.mp4' : 'photo.jpg';
-        
-        let media = path;
-        if (Platform.OS === 'android' && !media.startsWith('file://') && !media.startsWith('content://') && !media.startsWith('http')) {
-            media = `file://${path}`;
-        }
+        const media = isVideo ? `file://'${path}` : path;
 
 
         const formData = new FormData();

package/src/APIs/MatchKey.js

@@ -27,8 +27,7 @@ async function MatchKeyApi(appkey, BundleId) {
             const total_video = data.response_data.total_video;
             const used_video = data.response_data.used_video;
             const video_duration = data.response_data.video_duration; 
-            const shakebug_type = data.response_data.shakebug_type;
-            return { success: true, application_id, total_mau, used_mau, total_video, used_video, video_duration, shakebug_type, message: data.msg };
+            return { success: true, application_id, total_mau, used_mau, total_video, used_video, video_duration, message: data.msg };
         } else {
             return { success: false, message: data.msg };
         }

package/src/Componanats/NavigationContext.js

@@ -25,7 +25,9 @@ export const NavigationProvider = ({ children }) => {
 
   useFocusEffect(
     React.useCallback(() => {
-      setFocusedScreen(navigationState[navigationState.length - 1].name);
+      if (navigationState && navigationState.length > 0) {
+        setFocusedScreen(navigationState[navigationState.length - 1].name);
+      }
       return () => {
         setFocusedScreen('');
       };

package/src/Componanats/ShakeFunction.js

@@ -1,7 +1,7 @@
 import { View, Text, Platform, Image, ImageBackground, NativeModules, DeviceEventEmitter, NativeEventEmitter, StatusBar, PanResponder, Animated, AppState, Dimensions, BackHandler, LogBox, StyleSheet, SafeAreaView } from 'react-native'
 import React, { useRef, useEffect, useState } from 'react'
 import { SensorTypes, setUpdateIntervalForType, accelerometer } from '../../Sensor/src/index';
-import ViewShot from 'react-native-view-shot';
+import { ShakebugCapture, captureScreen } from '../index';
 import { TouchableOpacity } from 'react-native';
 import RecordScreen from '../../RecordScreen/src/index';
 import { ClearCanvas, RNDrawingView } from '../Screens/StrockView';
@@ -33,7 +33,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
 
     useEffect(() => {
       const subscription = DeviceEventEmitter.addListener('ScreenshotTaken', async () => {
-        if (allowToReportBugByScreenCapture == true && (!global.isFeatureEnabled || global.isFeatureEnabled('4'))) {
+        if (allowToReportBugByScreenCapture == true) {
           if (!global.isScreenShotDetected && global.application_id != "" && global.application_id != undefined) {
             OpenShakebug()
           }
@@ -49,7 +49,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
       const subscription = screenShotEmitter.addListener(
         'ScreenshotTaken',
         (event) => {
-          if (allowToReportBugByScreenCapture == true && (!global.isFeatureEnabled || global.isFeatureEnabled('4'))) {
+          if (allowToReportBugByScreenCapture == true) {
             // setIsScreenShot(true)
             if (!global.isScreenShotDetected && global.application_id != "" && global.application_id != undefined) {
               OpenShakebug()
@@ -284,7 +284,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
     let zdata = 0;
 
     DeviceInfo.isEmulator().then(res => {
-      if (!res && isRecording == false && allowToReportBugByShaking !== false && (!global.isFeatureEnabled || global.isFeatureEnabled('2'))) {
+      if (!res && isRecording == false && allowToReportBugByShaking !== false) {
         const subscription = accelerometer.subscribe(async ({ x, y, z, timestamp }) => {
 
           let calculate = Math.sqrt(x * x + y * y + z * z);
@@ -301,7 +301,12 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
             if (calculate.toFixed(2) >= 18) {
               if (global.isAndroidValid == true && global.application_id != "" && global.application_id != undefined && global.isTrigger == false) {
                 setIsScreenShot(true)
-                const ImgUrl = await ref.current.capture()
+                let ImgUrl = null;
+                try {
+                  ImgUrl = ref.current ? await ref.current.capture() : null;
+                } catch (e) {
+                  log.error("Failed to capture screenshot on shake", e);
+                }
                 if (!isShow) {
                   if (ImgUrl != undefined || ImgUrl != null) {
                     subscription.unsubscribe();
@@ -324,7 +329,12 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
               if (global.isIOSValid == true && global.application_id != "" && global.application_id != undefined) {
                 setIsScreenShot(true)
                 
-                let ImgUrl = await ref.current.capture()
+                let ImgUrl = null;
+                try {
+                  ImgUrl = ref.current ? await ref.current.capture() : null;
+                } catch (e) {
+                  log.error("Failed to capture screenshot on iOS shake", e);
+                }
                 try {
                   const filePath = await ShakebugSDKCustomScreenCapture.captureScreen();
                   ImgUrl = filePath
@@ -374,7 +384,12 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
   const OpenShakebug = async () => {
     setIsScreenShot(true)
     if (global.application_id != "" && global.application_id != undefined && global.session_id != "" && global.session_id != undefined) {
-      const ImgUrl = await ref.current.capture()
+      let ImgUrl = null;
+      try {
+        ImgUrl = ref.current ? await ref.current.capture() : null;
+      } catch (e) {
+        log.error("Failed to capture screenshot in OpenShakebug", e);
+      }
       if (!isShow) {
         if (ImgUrl != undefined || ImgUrl != null) {
           global.IsBackground = false
@@ -470,12 +485,11 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
   return (
     <View
       style={{
-        width: "100%",
-        height: "100%",
+        flex: 1,
       }}
     >
 
-      <ViewShot ref={ref} options={{ fileName: "ScreenShort", format: "jpg", quality: 1, }} style={{ width: "100%", height: '100%',}}>
+      <ShakebugCapture ref={ref} options={{ format: "jpg", quality: 1, }} style={{ flex: 1 }}>
         {isDraw ? (
           <ImageBackground
             source={{ uri: img }}
@@ -494,12 +508,12 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
             />
 
           </ImageBackground>
-        ) : (<View style={{ width: '100%', height: '100%' }}>
+        ) : (<View style={{ flex: 1 }}>
           {children}
         </View>)}
 
 
-      </ViewShot>
+      </ShakebugCapture>
 
       {isLoading &&
         <View
@@ -543,7 +557,12 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
             <TouchableOpacity
               onPress={async () => {
                 StatusBar.setHidden(false, 'slide')
-                const ImgUrl = await ref.current.capture()
+                let ImgUrl = null;
+                try {
+                  ImgUrl = Platform.OS === 'android' ? await captureScreen({ format: 'jpg', quality: 1 }) : (ref.current ? await ref.current.capture() : null);
+                } catch (e) {
+                  log.error("Failed to capture screenshot in stop recording", e);
+                }
                 if (ImgUrl != undefined || ImgUrl != null) {
                   setImg(ImgUrl)
                   setIsDraw(true)

package/src/Componanats/ShakebugCapture.tsx

@@ -0,0 +1,75 @@
+import React, { useRef, useImperativeHandle, forwardRef } from 'react';
+import {
+  NativeModules,
+  findNodeHandle,
+  View,
+  ViewProps,
+  Platform,
+} from 'react-native';
+
+const { ShakebugSDKRNViewShot } = NativeModules;
+
+export interface CaptureOptions {
+  width?: number;
+  height?: number;
+  format?: 'png' | 'jpg' | 'jpeg' | 'webp' | 'raw';
+  quality?: number;
+  result?: 'tmpfile' | 'base64' | 'data-uri' | 'zip-base64';
+  snapshotContentContainer?: boolean;
+  useRenderInContext?: boolean; // iOS only
+  handleGLSurfaceView?: boolean; // Android only
+}
+
+export interface ShakebugCaptureProps extends ViewProps {
+  options?: CaptureOptions;
+  children?: React.ReactNode;
+}
+
+export interface ShakebugCaptureRef {
+  capture: () => Promise<string>;
+}
+
+export const captureRef = (
+  viewRef: any,
+  options: CaptureOptions = {}
+): Promise<string> => {
+  const tag = findNodeHandle(viewRef);
+  if (!tag) {
+    return Promise.reject(new Error('Could not find node handle for viewRef'));
+  }
+  if (!ShakebugSDKRNViewShot) {
+    return Promise.reject(new Error('ShakebugSDKRNViewShot native module is not available'));
+  }
+  return ShakebugSDKRNViewShot.captureRef(tag, options);
+};
+
+export const captureScreen = (
+  options: CaptureOptions = {}
+): Promise<string> => {
+  if (!ShakebugSDKRNViewShot) {
+    return Promise.reject(new Error('ShakebugSDKRNViewShot native module is not available'));
+  }
+  return ShakebugSDKRNViewShot.captureScreen(options);
+};
+
+export const releaseCapture = (uri: string): void => {
+  ShakebugSDKRNViewShot?.releaseCapture(uri);
+};
+
+const ShakebugCapture = forwardRef<ShakebugCaptureRef, ShakebugCaptureProps>(
+  ({ children, options, ...props }, ref) => {
+    const viewRef = useRef<View>(null);
+
+    useImperativeHandle(ref, () => ({
+      capture: () => captureRef(viewRef.current, options),
+    }));
+
+    return (
+      <View ref={viewRef} collapsable={false} {...props}>
+        {children}
+      </View>
+    );
+  }
+);
+
+export default ShakebugCapture;

package/src/Screens/FirstScreen.js

@@ -1,7 +1,7 @@
 import { Alert, Image, ImageBackground, Linking, PermissionsAndroid, Platform, SafeAreaView, StatusBar, Text, TouchableOpacity, View, TextInput, Keyboard, PanResponder, Animated, StyleSheet, KeyboardAvoidingView, BackHandler, Dimensions, Modal } from 'react-native'
 import React, { useEffect, useRef, useState } from 'react'
 import { ClearCanvas, RNDrawingView } from './StrockView.js';
-import ViewShot from 'react-native-view-shot';
+import { ShakebugCapture, captureScreen } from '../index';
 import { launchImageLibrary } from '../../ImageOrVedioPicker/src/index';
 import { logger, consoleTransport } from "react-native-logs";
 import { NativeModules } from 'react-native';
@@ -354,7 +354,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
           </TouchableOpacity>
         </View>
         <View style={{ position: 'relative', height: Platform.OS == 'android' ? '78%' : '79%', backgroundColor: '#e4fdfd', width: '100%', alignItems: 'center', paddingTop: 8 }}>
-          <ViewShot ref={ref} options={{ fileName: "ScreenShort", format: "png", quality: 1 }}  collapsable={false} style={{ width: Platform.OS == 'android' ? "77%" : '73%', height: '100%' }}>
+          <ShakebugCapture ref={ref} options={{ format: "png", quality: 1 }}  collapsable={false} style={{ width: Platform.OS == 'android' ? "77%" : '73%', height: '100%' }}>
 
             {text.trim().length > 0 ?
               <Animated.View
@@ -417,7 +417,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
               />
 
             </ImageBackground>
-          </ViewShot>
+          </ShakebugCapture>
 
         </View>
         <View style={{ margin: 10, marginHorizontal: 20, flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', height: '5%' }}>