react-native-rectangle-doc-scanner 3.48.0 → 3.50.0

package/dist/FullDocScanner.js

@@ -60,7 +60,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     const [rectangleDetected, setRectangleDetected] = (0, react_1.useState)(false);
     const resolvedGridColor = gridColor ?? overlayColor;
     const docScannerRef = (0, react_1.useRef)(null);
-    const manualCapturePending = (0, react_1.useRef)(false);
+    const captureModeRef = (0, react_1.useRef)(null);
     const mergedStrings = (0, react_1.useMemo)(() => ({
         captureHint: strings?.captureHint,
         manualHint: strings?.manualHint,
@@ -121,69 +121,52 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             croppedPath: document.croppedPath,
             initialPath: document.initialPath,
         });
+        const captureMode = captureModeRef.current;
+        captureModeRef.current = null;
         const normalizedDoc = normalizeCapturedDocument(document);
-        // Reset manual capture pending flag BEFORE processing
-        if (manualCapturePending.current) {
-            console.log('[FullDocScanner] Resetting manualCapturePending');
-            manualCapturePending.current = false;
+        if (captureMode === 'no-grid') {
+            console.log('[FullDocScanner] No grid at capture button press: opening cropper for manual selection');
+            await openCropper(normalizedDoc.path);
+            return;
         }
-        // If grid detected and cropped image exists, show it directly in check_DP
         if (normalizedDoc.croppedPath) {
             console.log('[FullDocScanner] Grid detected: using pre-cropped image', normalizedDoc.croppedPath);
             setCroppedImageData({
                 path: normalizedDoc.croppedPath,
             });
+            return;
         }
-        else {
-            // No grid: open cropper for manual crop
-            console.log('[FullDocScanner] No grid detected: opening cropper for manual crop', normalizedDoc.path);
-            await openCropper(normalizedDoc.path);
-        }
+        console.log('[FullDocScanner] Fallback to manual crop (no croppedPath available)');
+        await openCropper(normalizedDoc.path);
     }, [openCropper]);
     const triggerManualCapture = (0, react_1.useCallback)(() => {
         console.log('[FullDocScanner] triggerManualCapture called', {
             processing,
-            manualCapturePending: manualCapturePending.current,
             hasRef: !!docScannerRef.current,
+            rectangleDetected,
         });
         if (processing) {
             console.log('[FullDocScanner] Already processing, skipping manual capture');
             return;
         }
-        if (manualCapturePending.current) {
-            console.log('[FullDocScanner] Manual capture already pending, skipping');
-            return;
-        }
         if (!docScannerRef.current) {
             console.error('[FullDocScanner] DocScanner ref not available');
             return;
         }
         console.log('[FullDocScanner] Starting manual capture');
-        manualCapturePending.current = true;
-        try {
-            const capturePromise = docScannerRef.current.capture();
-            console.log('[FullDocScanner] Capture promise:', capturePromise);
-            if (capturePromise && typeof capturePromise.then === 'function') {
-                capturePromise
-                    .then((result) => {
-                    console.log('[FullDocScanner] Manual capture success:', result);
-                    manualCapturePending.current = false;
-                })
-                    .catch((error) => {
-                    console.error('[FullDocScanner] Manual capture failed:', error);
-                    manualCapturePending.current = false;
-                });
-            }
-            else {
-                console.warn('[FullDocScanner] No promise returned from capture()');
-                manualCapturePending.current = false;
+        captureModeRef.current = rectangleDetected ? 'grid' : 'no-grid';
+        docScannerRef.current.capture()
+            .then((result) => {
+            console.log('[FullDocScanner] Manual capture success:', result);
+        })
+            .catch((error) => {
+            captureModeRef.current = null;
+            console.error('[FullDocScanner] Manual capture failed:', error);
+            if (error instanceof Error && error.message !== 'capture_in_progress') {
+                emitError(error, 'Failed to capture image.');
             }
-        }
-        catch (error) {
-            console.error('[FullDocScanner] Exception during capture:', error);
-            manualCapturePending.current = false;
-        }
-    }, [processing]);
+        });
+    }, [processing, rectangleDetected, emitError]);
     const handleGalleryPick = (0, react_1.useCallback)(async () => {
         console.log('[FullDocScanner] handleGalleryPick called');
         if (processing || isGalleryOpen) {
@@ -227,6 +210,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         setCroppedImageData(null);
         setProcessing(false);
         setRectangleDetected(false);
+        captureModeRef.current = null;
         // Reset DocScanner state
         if (docScannerRef.current?.reset) {
             docScannerRef.current.reset();

package/package.json

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

package/src/FullDocScanner.tsx

@@ -85,7 +85,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   const [rectangleDetected, setRectangleDetected] = useState(false);
   const resolvedGridColor = gridColor ?? overlayColor;
   const docScannerRef = useRef<DocScannerHandle | null>(null);
-  const manualCapturePending = useRef(false);
+  const captureModeRef = useRef<'grid' | 'no-grid' | null>(null);
 
   const mergedStrings = useMemo(
     () => ({
@@ -165,25 +165,27 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         initialPath: document.initialPath,
       });
 
+      const captureMode = captureModeRef.current;
+      captureModeRef.current = null;
+
       const normalizedDoc = normalizeCapturedDocument(document);
 
-      // Reset manual capture pending flag BEFORE processing
-      if (manualCapturePending.current) {
-        console.log('[FullDocScanner] Resetting manualCapturePending');
-        manualCapturePending.current = false;
+      if (captureMode === 'no-grid') {
+        console.log('[FullDocScanner] No grid at capture button press: opening cropper for manual selection');
+        await openCropper(normalizedDoc.path);
+        return;
       }
 
-      // If grid detected and cropped image exists, show it directly in check_DP
       if (normalizedDoc.croppedPath) {
         console.log('[FullDocScanner] Grid detected: using pre-cropped image', normalizedDoc.croppedPath);
         setCroppedImageData({
           path: normalizedDoc.croppedPath,
         });
-      } else {
-        // No grid: open cropper for manual crop
-        console.log('[FullDocScanner] No grid detected: opening cropper for manual crop', normalizedDoc.path);
-        await openCropper(normalizedDoc.path);
+        return;
       }
+
+      console.log('[FullDocScanner] Fallback to manual crop (no croppedPath available)');
+      await openCropper(normalizedDoc.path);
     },
     [openCropper],
   );
@@ -191,8 +193,8 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   const triggerManualCapture = useCallback(() => {
     console.log('[FullDocScanner] triggerManualCapture called', {
       processing,
-      manualCapturePending: manualCapturePending.current,
       hasRef: !!docScannerRef.current,
+      rectangleDetected,
     });
 
     if (processing) {
@@ -200,42 +202,30 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       return;
     }
 
-    if (manualCapturePending.current) {
-      console.log('[FullDocScanner] Manual capture already pending, skipping');
-      return;
-    }
-
     if (!docScannerRef.current) {
       console.error('[FullDocScanner] DocScanner ref not available');
       return;
     }
 
     console.log('[FullDocScanner] Starting manual capture');
-    manualCapturePending.current = true;
 
-    try {
-      const capturePromise = docScannerRef.current.capture();
-      console.log('[FullDocScanner] Capture promise:', capturePromise);
-
-      if (capturePromise && typeof capturePromise.then === 'function') {
-        capturePromise
-          .then((result) => {
-            console.log('[FullDocScanner] Manual capture success:', result);
-            manualCapturePending.current = false;
-          })
-          .catch((error: unknown) => {
-            console.error('[FullDocScanner] Manual capture failed:', error);
-            manualCapturePending.current = false;
-          });
-      } else {
-        console.warn('[FullDocScanner] No promise returned from capture()');
-        manualCapturePending.current = false;
-      }
-    } catch (error) {
-      console.error('[FullDocScanner] Exception during capture:', error);
-      manualCapturePending.current = false;
-    }
-  }, [processing]);
+    captureModeRef.current = rectangleDetected ? 'grid' : 'no-grid';
+
+    docScannerRef.current.capture()
+      .then((result) => {
+        console.log('[FullDocScanner] Manual capture success:', result);
+      })
+      .catch((error: unknown) => {
+        captureModeRef.current = null;
+        console.error('[FullDocScanner] Manual capture failed:', error);
+        if (error instanceof Error && error.message !== 'capture_in_progress') {
+          emitError(
+            error,
+            'Failed to capture image.',
+          );
+        }
+      });
+  }, [processing, rectangleDetected, emitError]);
 
   const handleGalleryPick = useCallback(async () => {
     console.log('[FullDocScanner] handleGalleryPick called');
@@ -290,6 +280,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     setCroppedImageData(null);
     setProcessing(false);
     setRectangleDetected(false);
+    captureModeRef.current = null;
     // Reset DocScanner state
     if (docScannerRef.current?.reset) {
       docScannerRef.current.reset();