react-native-rectangle-doc-scanner 3.52.0 → 3.54.0

package/dist/FullDocScanner.js

@@ -61,6 +61,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     const resolvedGridColor = gridColor ?? overlayColor;
     const docScannerRef = (0, react_1.useRef)(null);
     const captureModeRef = (0, react_1.useRef)(null);
+    const captureInProgressRef = (0, react_1.useRef)(false);
     const mergedStrings = (0, react_1.useMemo)(() => ({
         captureHint: strings?.captureHint,
         manualHint: strings?.manualHint,
@@ -122,10 +123,15 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             initialPath: document.initialPath,
             captureMode: captureModeRef.current,
         });
+        captureInProgressRef.current = false;
+        if (document.origin === 'auto') {
+            console.log('[FullDocScanner] Ignoring auto capture result');
+            return;
+        }
         const captureMode = captureModeRef.current;
-        // Ignore auto captures - only process manual captures
         if (!captureMode) {
-            console.log('[FullDocScanner] Ignoring auto capture - only manual captures allowed');
+            console.warn('[FullDocScanner] Missing capture mode for manual capture result');
+            captureModeRef.current = null;
             return;
         }
         captureModeRef.current = null;
@@ -146,33 +152,39 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         await openCropper(normalizedDoc.path);
     }, [openCropper]);
     const triggerManualCapture = (0, react_1.useCallback)(() => {
+        const scannerInstance = docScannerRef.current;
+        const hasScanner = !!scannerInstance;
         console.log('[FullDocScanner] triggerManualCapture called', {
             processing,
-            hasRef: !!docScannerRef.current,
+            hasRef: hasScanner,
             rectangleDetected,
             currentCaptureMode: captureModeRef.current,
+            captureInProgress: captureInProgressRef.current,
         });
         if (processing) {
             console.log('[FullDocScanner] Already processing, skipping manual capture');
             return;
         }
-        // Check if capture is already in progress
-        if (captureModeRef.current !== null) {
+        if (captureInProgressRef.current) {
             console.log('[FullDocScanner] Capture already in progress, skipping');
             return;
         }
-        if (!docScannerRef.current) {
+        if (!hasScanner) {
             console.error('[FullDocScanner] DocScanner ref not available');
             return;
         }
         console.log('[FullDocScanner] Starting manual capture, grid detected:', rectangleDetected);
-        captureModeRef.current = rectangleDetected ? 'grid' : 'no-grid';
-        docScannerRef.current.capture()
+        const captureMode = rectangleDetected ? 'grid' : 'no-grid';
+        captureModeRef.current = captureMode;
+        captureInProgressRef.current = true;
+        scannerInstance.capture()
             .then((result) => {
             console.log('[FullDocScanner] Manual capture success:', result);
+            captureInProgressRef.current = false;
         })
             .catch((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.');
@@ -223,15 +235,27 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         setProcessing(false);
         setRectangleDetected(false);
         captureModeRef.current = null;
+        captureInProgressRef.current = false;
         // Reset DocScanner state
         if (docScannerRef.current?.reset) {
             docScannerRef.current.reset();
         }
     }, []);
     const handleRectangleDetect = (0, react_1.useCallback)((event) => {
-        // Update button color based on rectangle detection
-        const hasGoodRectangle = event.lastDetectionType === 0 && event.rectangleCoordinates !== null;
-        setRectangleDetected(hasGoodRectangle);
+        const stableCounter = event.stableCounter ?? 0;
+        const hasRectangle = Boolean(event.rectangleOnScreen ?? event.rectangleCoordinates);
+        const isGoodRectangle = hasRectangle;
+        setRectangleDetected((prev) => {
+            if (prev !== isGoodRectangle) {
+                console.log('[FullDocScanner] Rectangle detection update', {
+                    lastDetectionType: event.lastDetectionType,
+                    stableCounter,
+                    hasRectangle,
+                    isGoodRectangle,
+                });
+            }
+            return isGoodRectangle;
+        });
     }, []);
     return (react_1.default.createElement(react_native_1.View, { style: styles.container },
         croppedImageData ? (

package/package.json

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

package/src/FullDocScanner.tsx

@@ -12,7 +12,12 @@ import { launchImageLibrary } from 'react-native-image-picker';
 import ImageCropPicker from 'react-native-image-crop-picker';
 import { DocScanner } from './DocScanner';
 import type { CapturedDocument } from './types';
-import type { DetectionConfig, DocScannerHandle, DocScannerCapture } from './DocScanner';
+import type {
+  DetectionConfig,
+  DocScannerHandle,
+  DocScannerCapture,
+  RectangleDetectEvent,
+} from './DocScanner';
 
 const stripFileUri = (value: string) => value.replace(/^file:\/\//, '');
 
@@ -84,6 +89,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   const resolvedGridColor = gridColor ?? overlayColor;
   const docScannerRef = useRef<DocScannerHandle | null>(null);
   const captureModeRef = useRef<'grid' | 'no-grid' | null>(null);
+  const captureInProgressRef = useRef(false);
 
   const mergedStrings = useMemo(
     () => ({
@@ -164,11 +170,18 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         captureMode: captureModeRef.current,
       });
 
+      captureInProgressRef.current = false;
+
+      if (document.origin === 'auto') {
+        console.log('[FullDocScanner] Ignoring auto capture result');
+        return;
+      }
+
       const captureMode = captureModeRef.current;
 
-      // Ignore auto captures - only process manual captures
       if (!captureMode) {
-        console.log('[FullDocScanner] Ignoring auto capture - only manual captures allowed');
+        console.warn('[FullDocScanner] Missing capture mode for manual capture result');
+        captureModeRef.current = null;
         return;
       }
 
@@ -197,11 +210,14 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   );
 
   const triggerManualCapture = useCallback(() => {
+    const scannerInstance = docScannerRef.current;
+    const hasScanner = !!scannerInstance;
     console.log('[FullDocScanner] triggerManualCapture called', {
       processing,
-      hasRef: !!docScannerRef.current,
+      hasRef: hasScanner,
       rectangleDetected,
       currentCaptureMode: captureModeRef.current,
+      captureInProgress: captureInProgressRef.current,
     });
 
     if (processing) {
@@ -209,27 +225,30 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       return;
     }
 
-    // Check if capture is already in progress
-    if (captureModeRef.current !== null) {
+    if (captureInProgressRef.current) {
       console.log('[FullDocScanner] Capture already in progress, skipping');
       return;
     }
 
-    if (!docScannerRef.current) {
+    if (!hasScanner) {
       console.error('[FullDocScanner] DocScanner ref not available');
       return;
     }
 
     console.log('[FullDocScanner] Starting manual capture, grid detected:', rectangleDetected);
 
-    captureModeRef.current = rectangleDetected ? 'grid' : 'no-grid';
+    const captureMode = rectangleDetected ? 'grid' : 'no-grid';
+    captureModeRef.current = captureMode;
+    captureInProgressRef.current = true;
 
-    docScannerRef.current.capture()
+    scannerInstance.capture()
       .then((result) => {
         console.log('[FullDocScanner] Manual capture success:', result);
+        captureInProgressRef.current = false;
       })
       .catch((error: unknown) => {
         captureModeRef.current = null;
+        captureInProgressRef.current = false;
         console.error('[FullDocScanner] Manual capture failed:', error);
         if (error instanceof Error && error.message !== 'capture_in_progress') {
           emitError(
@@ -294,16 +313,30 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     setProcessing(false);
     setRectangleDetected(false);
     captureModeRef.current = null;
+    captureInProgressRef.current = false;
     // Reset DocScanner state
     if (docScannerRef.current?.reset) {
       docScannerRef.current.reset();
     }
   }, []);
 
-  const handleRectangleDetect = useCallback((event: any) => {
-    // Update button color based on rectangle detection
-    const hasGoodRectangle = event.lastDetectionType === 0 && event.rectangleCoordinates !== null;
-    setRectangleDetected(hasGoodRectangle);
+  const handleRectangleDetect = useCallback((event: RectangleDetectEvent) => {
+    const stableCounter = event.stableCounter ?? 0;
+    const hasRectangle = Boolean(event.rectangleOnScreen ?? event.rectangleCoordinates);
+    const isGoodRectangle = hasRectangle;
+
+    setRectangleDetected((prev) => {
+      if (prev !== isGoodRectangle) {
+        console.log('[FullDocScanner] Rectangle detection update', {
+          lastDetectionType: event.lastDetectionType,
+          stableCounter,
+          hasRectangle,
+          isGoodRectangle,
+        });
+      }
+
+      return isGoodRectangle;
+    });
   }, []);
 
   return (