react-native-rectangle-doc-scanner 3.59.0 → 3.61.0

package/dist/DocScanner.js

@@ -167,7 +167,8 @@ exports.DocScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAUL
         captureOriginRef.current = 'manual';
         capture().catch((error) => {
             captureOriginRef.current = 'auto';
-            console.warn('[DocScanner] manual capture failed', error);
+            console.error('[DocScanner] manual capture failed', error);
+            throw error;
         });
     }, [capture]);
     const handleRectangleDetect = (0, react_1.useCallback)((event) => {

package/dist/FullDocScanner.js

@@ -83,8 +83,15 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         try {
             console.log('[FullDocScanner] openCropper called with path:', imagePath);
             setProcessing(true);
+            // Clean path - remove file:// prefix for react-native-image-crop-picker
+            // The library handles the prefix internally and double prefixing causes issues
+            let cleanPath = imagePath;
+            if (cleanPath.startsWith('file://')) {
+                cleanPath = cleanPath.replace('file://', '');
+            }
+            console.log('[FullDocScanner] Clean path for cropper:', cleanPath);
             const croppedImage = await react_native_image_crop_picker_1.default.openCropper({
-                path: imagePath,
+                path: cleanPath,
                 mediaType: 'photo',
                 width: cropWidth,
                 height: cropHeight,
@@ -99,7 +106,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                 hasBase64: !!croppedImage.data,
             });
             setProcessing(false);
-            // Show check_DP confirmation screen
+            // Show confirmation screen
             setCroppedImageData({
                 path: croppedImage.path,
                 base64: croppedImage.data ?? undefined,
@@ -108,11 +115,14 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         catch (error) {
             console.error('[FullDocScanner] openCropper error:', error);
             setProcessing(false);
-            if (error?.message !== 'User cancelled image selection') {
-                emitError(error instanceof Error ? error : new Error(String(error)), 'Failed to crop image.');
+            const errorMessage = error?.message || String(error);
+            if (errorMessage === 'User cancelled image selection' ||
+                errorMessage.includes('cancelled') ||
+                errorMessage.includes('cancel')) {
+                console.log('[FullDocScanner] User cancelled cropper');
             }
             else {
-                console.log('[FullDocScanner] User cancelled cropper');
+                emitError(error instanceof Error ? error : new Error(errorMessage), 'Failed to crop image. Please try again.');
             }
         }
     }, [cropWidth, cropHeight, emitError]);
@@ -123,19 +133,16 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             croppedPath: document.croppedPath,
             initialPath: document.initialPath,
             captureMode: captureModeRef.current,
+            captureInProgress: captureInProgressRef.current,
         });
-        captureInProgressRef.current = false;
-        if (document.origin === 'auto') {
-            console.log('[FullDocScanner] Ignoring auto capture result');
-            return;
-        }
         const captureMode = captureModeRef.current;
+        // Reset capture state
+        captureInProgressRef.current = false;
+        captureModeRef.current = null;
         if (!captureMode) {
-            console.warn('[FullDocScanner] Missing capture mode for manual capture result');
-            captureModeRef.current = null;
+            console.warn('[FullDocScanner] Missing capture mode for capture result, ignoring');
             return;
         }
-        captureModeRef.current = null;
         const normalizedDoc = normalizeCapturedDocument(document);
         if (captureMode === 'no-grid') {
             console.log('[FullDocScanner] No grid at capture button press: opening cropper for manual selection');
@@ -178,35 +185,58 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         const captureMode = rectangleDetected ? 'grid' : 'no-grid';
         captureModeRef.current = captureMode;
         captureInProgressRef.current = true;
+        // Add timeout to reset state if capture hangs
+        const captureTimeout = setTimeout(() => {
+            if (captureInProgressRef.current) {
+                console.error('[FullDocScanner] Capture timeout - resetting state');
+                captureModeRef.current = null;
+                captureInProgressRef.current = false;
+                emitError(new Error('Capture timeout'), 'Capture timed out. Please try again.');
+            }
+        }, 10000);
         scannerInstance.capture()
             .then((result) => {
-            console.log('[FullDocScanner] Manual capture success:', result);
-            captureInProgressRef.current = false;
+            clearTimeout(captureTimeout);
+            console.log('[FullDocScanner] Manual capture promise resolved:', {
+                hasResult: !!result,
+                croppedImage: result?.croppedImage,
+                initialImage: result?.initialImage,
+            });
+            // Note: captureInProgressRef is reset in handleCapture
         })
             .catch((error) => {
+            clearTimeout(captureTimeout);
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            console.error('[FullDocScanner] Manual capture failed:', errorMessage, error);
             captureModeRef.current = null;
             captureInProgressRef.current = false;
-            console.error('[FullDocScanner] Manual capture failed:', error);
             if (error instanceof Error && error.message !== 'capture_in_progress') {
-                emitError(error, 'Failed to capture image.');
+                emitError(error, 'Failed to capture image. Please try again.');
             }
         });
     }, [processing, rectangleDetected, emitError]);
     const handleGalleryPick = (0, react_1.useCallback)(async () => {
         console.log('[FullDocScanner] handleGalleryPick called');
         if (processing || isGalleryOpen) {
+            console.log('[FullDocScanner] Skipping gallery pick - already processing:', { processing, isGalleryOpen });
             return;
         }
         try {
             setIsGalleryOpen(true);
+            console.log('[FullDocScanner] Launching image library...');
             const result = await (0, react_native_image_picker_1.launchImageLibrary)({
                 mediaType: 'photo',
                 quality: 1,
                 selectionLimit: 1,
             });
+            console.log('[FullDocScanner] Image library result:', {
+                didCancel: result.didCancel,
+                hasAssets: !!result.assets,
+                assetsLength: result.assets?.length,
+            });
             setIsGalleryOpen(false);
             if (result.didCancel || !result.assets?.[0]?.uri) {
-                console.log('[FullDocScanner] User cancelled gallery picker');
+                console.log('[FullDocScanner] User cancelled gallery picker or no image selected');
                 return;
             }
             const imageUri = result.assets[0].uri;
@@ -215,6 +245,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             await openCropper(imageUri);
         }
         catch (error) {
+            console.error('[FullDocScanner] Gallery pick error:', error);
             setIsGalleryOpen(false);
             emitError(error instanceof Error ? error : new Error(String(error)), 'Failed to pick image from gallery.');
         }
@@ -250,29 +281,33 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         const stableCounter = event.stableCounter ?? 0;
         const hasRectangle = Boolean(event.rectangleOnScreen ?? event.rectangleCoordinates);
         const isGoodRectangle = hasRectangle && event.lastDetectionType === 0;
-        if (hasRectangle) {
+        // Clear timeout immediately when rectangle is lost
+        if (!hasRectangle || !isGoodRectangle) {
+            if (rectangleTimeoutRef.current) {
+                clearTimeout(rectangleTimeoutRef.current);
+                rectangleTimeoutRef.current = null;
+            }
+            setRectangleDetected(false);
+        }
+        else {
+            // Rectangle detected - clear any existing timeout
             if (rectangleTimeoutRef.current) {
                 clearTimeout(rectangleTimeoutRef.current);
             }
+            setRectangleDetected(true);
+            // Set timeout to clear rectangle after brief period of no updates
             rectangleTimeoutRef.current = setTimeout(() => {
                 rectangleTimeoutRef.current = null;
                 setRectangleDetected(false);
+                console.log('[FullDocScanner] Rectangle timeout - clearing detection');
             }, 300);
         }
-        else if (rectangleTimeoutRef.current) {
-            clearTimeout(rectangleTimeoutRef.current);
-            rectangleTimeoutRef.current = null;
-        }
-        setRectangleDetected((prev) => {
-            if (prev !== isGoodRectangle) {
-                console.log('[FullDocScanner] Rectangle detection update', {
-                    lastDetectionType: event.lastDetectionType,
-                    stableCounter,
-                    hasRectangle,
-                    isGoodRectangle,
-                });
-            }
-            return isGoodRectangle;
+        console.log('[FullDocScanner] Rectangle detection update', {
+            lastDetectionType: event.lastDetectionType,
+            stableCounter,
+            hasRectangle,
+            isGoodRectangle,
+            rectangleDetected: isGoodRectangle,
         });
     }, []);
     (0, react_1.useEffect)(() => () => {
@@ -290,7 +325,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                     react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.retake)),
                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.confirmButton, styles.confirmButtonPrimary], onPress: handleConfirm, accessibilityLabel: mergedStrings.confirm, accessibilityRole: "button" },
                     react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.confirm))))) : (react_1.default.createElement(react_native_1.View, { style: styles.flex },
-            react_1.default.createElement(DocScanner_1.DocScanner, { ref: docScannerRef, autoCapture: true, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture, onRectangleDetect: handleRectangleDetect, showManualCaptureButton: false },
+            react_1.default.createElement(DocScanner_1.DocScanner, { ref: docScannerRef, autoCapture: false, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture, onRectangleDetect: handleRectangleDetect, showManualCaptureButton: false },
                 react_1.default.createElement(react_native_1.View, { style: styles.overlayTop, pointerEvents: "box-none" },
                     react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.closeButton, onPress: handleClose, accessibilityLabel: mergedStrings.cancel, accessibilityRole: "button" },
                         react_1.default.createElement(react_native_1.Text, { style: styles.closeButtonLabel }, "\u00D7"))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "3.59.0",
+  "version": "3.61.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",

package/src/DocScanner.tsx

@@ -241,7 +241,8 @@ export const DocScanner = forwardRef<DocScannerHandle, Props>(
       captureOriginRef.current = 'manual';
       capture().catch((error) => {
         captureOriginRef.current = 'auto';
-        console.warn('[DocScanner] manual capture failed', error);
+        console.error('[DocScanner] manual capture failed', error);
+        throw error;
       });
     }, [capture]);
 

package/src/FullDocScanner.tsx

@@ -121,8 +121,17 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       try {
         console.log('[FullDocScanner] openCropper called with path:', imagePath);
         setProcessing(true);
+
+        // Clean path - remove file:// prefix for react-native-image-crop-picker
+        // The library handles the prefix internally and double prefixing causes issues
+        let cleanPath = imagePath;
+        if (cleanPath.startsWith('file://')) {
+          cleanPath = cleanPath.replace('file://', '');
+        }
+        console.log('[FullDocScanner] Clean path for cropper:', cleanPath);
+
         const croppedImage = await ImageCropPicker.openCropper({
-          path: imagePath,
+          path: cleanPath,
           mediaType: 'photo',
           width: cropWidth,
           height: cropHeight,
@@ -140,7 +149,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
 
         setProcessing(false);
 
-        // Show check_DP confirmation screen
+        // Show confirmation screen
         setCroppedImageData({
           path: croppedImage.path,
           base64: croppedImage.data ?? undefined,
@@ -148,13 +157,18 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       } catch (error) {
         console.error('[FullDocScanner] openCropper error:', error);
         setProcessing(false);
-        if ((error as any)?.message !== 'User cancelled image selection') {
+
+        const errorMessage = (error as any)?.message || String(error);
+
+        if (errorMessage === 'User cancelled image selection' ||
+            errorMessage.includes('cancelled') ||
+            errorMessage.includes('cancel')) {
+          console.log('[FullDocScanner] User cancelled cropper');
+        } else {
           emitError(
-            error instanceof Error ? error : new Error(String(error)),
-            'Failed to crop image.',
+            error instanceof Error ? error : new Error(errorMessage),
+            'Failed to crop image. Please try again.',
           );
-        } else {
-          console.log('[FullDocScanner] User cancelled cropper');
         }
       }
     },
@@ -169,25 +183,20 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         croppedPath: document.croppedPath,
         initialPath: document.initialPath,
         captureMode: captureModeRef.current,
+        captureInProgress: captureInProgressRef.current,
       });
 
-      captureInProgressRef.current = false;
-
-      if (document.origin === 'auto') {
-        console.log('[FullDocScanner] Ignoring auto capture result');
-        return;
-      }
-
       const captureMode = captureModeRef.current;
 
+      // Reset capture state
+      captureInProgressRef.current = false;
+      captureModeRef.current = null;
+
       if (!captureMode) {
-        console.warn('[FullDocScanner] Missing capture mode for manual capture result');
-        captureModeRef.current = null;
+        console.warn('[FullDocScanner] Missing capture mode for capture result, ignoring');
         return;
       }
 
-      captureModeRef.current = null;
-
       const normalizedDoc = normalizeCapturedDocument(document);
 
       if (captureMode === 'no-grid') {
@@ -242,19 +251,40 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     captureModeRef.current = captureMode;
     captureInProgressRef.current = true;
 
+    // Add timeout to reset state if capture hangs
+    const captureTimeout = setTimeout(() => {
+      if (captureInProgressRef.current) {
+        console.error('[FullDocScanner] Capture timeout - resetting state');
+        captureModeRef.current = null;
+        captureInProgressRef.current = false;
+        emitError(
+          new Error('Capture timeout'),
+          'Capture timed out. Please try again.',
+        );
+      }
+    }, 10000);
+
     scannerInstance.capture()
       .then((result) => {
-        console.log('[FullDocScanner] Manual capture success:', result);
-        captureInProgressRef.current = false;
+        clearTimeout(captureTimeout);
+        console.log('[FullDocScanner] Manual capture promise resolved:', {
+          hasResult: !!result,
+          croppedImage: result?.croppedImage,
+          initialImage: result?.initialImage,
+        });
+        // Note: captureInProgressRef is reset in handleCapture
       })
       .catch((error: unknown) => {
+        clearTimeout(captureTimeout);
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        console.error('[FullDocScanner] Manual capture failed:', errorMessage, error);
         captureModeRef.current = null;
         captureInProgressRef.current = false;
-        console.error('[FullDocScanner] Manual capture failed:', error);
+
         if (error instanceof Error && error.message !== 'capture_in_progress') {
           emitError(
             error,
-            'Failed to capture image.',
+            'Failed to capture image. Please try again.',
           );
         }
       });
@@ -263,21 +293,30 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   const handleGalleryPick = useCallback(async () => {
     console.log('[FullDocScanner] handleGalleryPick called');
     if (processing || isGalleryOpen) {
+      console.log('[FullDocScanner] Skipping gallery pick - already processing:', { processing, isGalleryOpen });
       return;
     }
 
     try {
       setIsGalleryOpen(true);
+      console.log('[FullDocScanner] Launching image library...');
+
       const result = await launchImageLibrary({
         mediaType: 'photo',
         quality: 1,
         selectionLimit: 1,
       });
 
+      console.log('[FullDocScanner] Image library result:', {
+        didCancel: result.didCancel,
+        hasAssets: !!result.assets,
+        assetsLength: result.assets?.length,
+      });
+
       setIsGalleryOpen(false);
 
       if (result.didCancel || !result.assets?.[0]?.uri) {
-        console.log('[FullDocScanner] User cancelled gallery picker');
+        console.log('[FullDocScanner] User cancelled gallery picker or no image selected');
         return;
       }
 
@@ -287,6 +326,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       // Open cropper with the selected image
       await openCropper(imageUri);
     } catch (error) {
+      console.error('[FullDocScanner] Gallery pick error:', error);
       setIsGalleryOpen(false);
       emitError(
         error instanceof Error ? error : new Error(String(error)),
@@ -330,29 +370,34 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     const hasRectangle = Boolean(event.rectangleOnScreen ?? event.rectangleCoordinates);
     const isGoodRectangle = hasRectangle && event.lastDetectionType === 0;
 
-    if (hasRectangle) {
+    // Clear timeout immediately when rectangle is lost
+    if (!hasRectangle || !isGoodRectangle) {
       if (rectangleTimeoutRef.current) {
         clearTimeout(rectangleTimeoutRef.current);
+        rectangleTimeoutRef.current = null;
       }
+      setRectangleDetected(false);
+    } else {
+      // Rectangle detected - clear any existing timeout
+      if (rectangleTimeoutRef.current) {
+        clearTimeout(rectangleTimeoutRef.current);
+      }
+      setRectangleDetected(true);
+
+      // Set timeout to clear rectangle after brief period of no updates
       rectangleTimeoutRef.current = setTimeout(() => {
         rectangleTimeoutRef.current = null;
         setRectangleDetected(false);
+        console.log('[FullDocScanner] Rectangle timeout - clearing detection');
       }, 300);
-    } else if (rectangleTimeoutRef.current) {
-      clearTimeout(rectangleTimeoutRef.current);
-      rectangleTimeoutRef.current = null;
     }
 
-    setRectangleDetected((prev) => {
-      if (prev !== isGoodRectangle) {
-        console.log('[FullDocScanner] Rectangle detection update', {
-          lastDetectionType: event.lastDetectionType,
-          stableCounter,
-          hasRectangle,
-          isGoodRectangle,
-        });
-      }
-      return isGoodRectangle;
+    console.log('[FullDocScanner] Rectangle detection update', {
+      lastDetectionType: event.lastDetectionType,
+      stableCounter,
+      hasRectangle,
+      isGoodRectangle,
+      rectangleDetected: isGoodRectangle,
     });
   }, []);
 
@@ -395,7 +440,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         <View style={styles.flex}>
           <DocScanner
             ref={docScannerRef}
-            autoCapture={true}
+            autoCapture={false}
             overlayColor={overlayColor}
             showGrid={showGrid}
             gridColor={resolvedGridColor}