react-native-rectangle-doc-scanner 3.44.2 → 3.44.4

package/dist/FullDocScanner.js

@@ -57,6 +57,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     const [processing, setProcessing] = (0, react_1.useState)(false);
     const [croppedImageData, setCroppedImageData] = (0, react_1.useState)(null);
     const [isGalleryOpen, setIsGalleryOpen] = (0, react_1.useState)(false);
+    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);
@@ -108,26 +109,34 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         console.log('[FullDocScanner] handleCapture called:', {
             origin: document.origin,
             path: document.path,
+            croppedPath: document.croppedPath,
+            initialPath: document.initialPath,
         });
+        // Reset manual capture pending flag
         if (manualCapturePending.current) {
+            console.log('[FullDocScanner] Resetting manualCapturePending');
             manualCapturePending.current = false;
         }
         const normalizedDoc = normalizeCapturedDocument(document);
         // Auto-capture: Use already cropped image, skip cropper
         if (document.origin === 'auto' && normalizedDoc.croppedPath) {
-            console.log('[FullDocScanner] Auto-capture: using pre-cropped image');
+            console.log('[FullDocScanner] Auto-capture: using pre-cropped image', normalizedDoc.croppedPath);
             setCroppedImageData({
                 path: normalizedDoc.croppedPath,
             });
         }
         else {
             // Manual capture or gallery: Open cropper
-            console.log('[FullDocScanner] Manual capture: opening cropper');
+            console.log('[FullDocScanner] Manual/Gallery capture: opening cropper with', normalizedDoc.path);
             await openCropper(normalizedDoc.path);
         }
     }, [openCropper]);
     const triggerManualCapture = (0, react_1.useCallback)(() => {
-        console.log('[FullDocScanner] triggerManualCapture called');
+        console.log('[FullDocScanner] triggerManualCapture called', {
+            processing,
+            manualCapturePending: manualCapturePending.current,
+            hasRef: !!docScannerRef.current,
+        });
         if (processing) {
             console.log('[FullDocScanner] Already processing, skipping manual capture');
             return;
@@ -136,21 +145,33 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             console.log('[FullDocScanner] Manual capture already pending, skipping');
             return;
         }
-        console.log('[FullDocScanner] Setting manualCapturePending to true');
+        if (!docScannerRef.current) {
+            console.error('[FullDocScanner] DocScanner ref not available');
+            return;
+        }
+        console.log('[FullDocScanner] Starting manual capture');
         manualCapturePending.current = true;
-        const capturePromise = docScannerRef.current?.capture();
-        if (capturePromise && typeof capturePromise.then === 'function') {
-            capturePromise
-                .then(() => {
-                console.log('[FullDocScanner] Capture success');
-            })
-                .catch((error) => {
+        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;
-                console.warn('[FullDocScanner] manual capture failed', error);
-            });
+            }
         }
-        else if (!capturePromise) {
-            console.warn('[FullDocScanner] No capture promise returned');
+        catch (error) {
+            console.error('[FullDocScanner] Exception during capture:', error);
             manualCapturePending.current = false;
         }
     }, [processing]);
@@ -193,7 +214,19 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         }
     }, [croppedImageData, onResult]);
     const handleRetake = (0, react_1.useCallback)(() => {
+        console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');
         setCroppedImageData(null);
+        setProcessing(false);
+        setRectangleDetected(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);
     }, []);
     return (react_1.default.createElement(react_native_1.View, { style: styles.container },
         croppedImageData ? (
@@ -205,7 +238,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: !manualCapture && !isGalleryOpen, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture, showManualCaptureButton: false },
+            react_1.default.createElement(DocScanner_1.DocScanner, { ref: docScannerRef, autoCapture: !manualCapture && !isGalleryOpen, 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"))),
@@ -217,7 +250,10 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                     enableGallery && (react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.galleryButton, processing && styles.buttonDisabled], onPress: handleGalleryPick, disabled: processing, accessibilityLabel: mergedStrings.galleryButton, accessibilityRole: "button" },
                         react_1.default.createElement(react_native_1.Text, { style: styles.galleryButtonText }, "\uD83D\uDCC1"))),
                     react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.shutterButton, processing && styles.buttonDisabled], onPress: triggerManualCapture, disabled: processing, accessibilityLabel: mergedStrings.manualHint, accessibilityRole: "button" },
-                        react_1.default.createElement(react_native_1.View, { style: styles.shutterInner })))))),
+                        react_1.default.createElement(react_native_1.View, { style: [
+                                styles.shutterInner,
+                                rectangleDetected && { backgroundColor: overlayColor }
+                            ] })))))),
         processing && (react_1.default.createElement(react_native_1.View, { style: styles.processingOverlay },
             react_1.default.createElement(react_native_1.ActivityIndicator, { size: "large", color: overlayColor }),
             mergedStrings.processing && (react_1.default.createElement(react_native_1.Text, { style: styles.processingText }, mergedStrings.processing))))));

package/package.json

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

package/src/FullDocScanner.tsx

@@ -82,6 +82,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   const [processing, setProcessing] = useState(false);
   const [croppedImageData, setCroppedImageData] = useState<{path: string; base64?: string} | null>(null);
   const [isGalleryOpen, setIsGalleryOpen] = useState(false);
+  const [rectangleDetected, setRectangleDetected] = useState(false);
   const resolvedGridColor = gridColor ?? overlayColor;
   const docScannerRef = useRef<DocScannerHandle | null>(null);
   const manualCapturePending = useRef(false);
@@ -151,9 +152,13 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       console.log('[FullDocScanner] handleCapture called:', {
         origin: document.origin,
         path: document.path,
+        croppedPath: document.croppedPath,
+        initialPath: document.initialPath,
       });
 
+      // Reset manual capture pending flag
       if (manualCapturePending.current) {
+        console.log('[FullDocScanner] Resetting manualCapturePending');
         manualCapturePending.current = false;
       }
 
@@ -161,13 +166,13 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
 
       // Auto-capture: Use already cropped image, skip cropper
       if (document.origin === 'auto' && normalizedDoc.croppedPath) {
-        console.log('[FullDocScanner] Auto-capture: using pre-cropped image');
+        console.log('[FullDocScanner] Auto-capture: using pre-cropped image', normalizedDoc.croppedPath);
         setCroppedImageData({
           path: normalizedDoc.croppedPath,
         });
       } else {
         // Manual capture or gallery: Open cropper
-        console.log('[FullDocScanner] Manual capture: opening cropper');
+        console.log('[FullDocScanner] Manual/Gallery capture: opening cropper with', normalizedDoc.path);
         await openCropper(normalizedDoc.path);
       }
     },
@@ -175,31 +180,50 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   );
 
   const triggerManualCapture = useCallback(() => {
-    console.log('[FullDocScanner] triggerManualCapture called');
+    console.log('[FullDocScanner] triggerManualCapture called', {
+      processing,
+      manualCapturePending: manualCapturePending.current,
+      hasRef: !!docScannerRef.current,
+    });
+
     if (processing) {
       console.log('[FullDocScanner] Already processing, skipping manual capture');
       return;
     }
+
     if (manualCapturePending.current) {
       console.log('[FullDocScanner] Manual capture already pending, skipping');
       return;
     }
 
-    console.log('[FullDocScanner] Setting manualCapturePending to true');
+    if (!docScannerRef.current) {
+      console.error('[FullDocScanner] DocScanner ref not available');
+      return;
+    }
+
+    console.log('[FullDocScanner] Starting manual capture');
     manualCapturePending.current = true;
 
-    const capturePromise = docScannerRef.current?.capture();
-    if (capturePromise && typeof capturePromise.then === 'function') {
-      capturePromise
-        .then(() => {
-          console.log('[FullDocScanner] Capture success');
-        })
-        .catch((error: unknown) => {
-          manualCapturePending.current = false;
-          console.warn('[FullDocScanner] manual capture failed', error);
-        });
-    } else if (!capturePromise) {
-      console.warn('[FullDocScanner] No capture promise returned');
+    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]);
@@ -253,7 +277,20 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   }, [croppedImageData, onResult]);
 
   const handleRetake = useCallback(() => {
+    console.log('[FullDocScanner] Retake - clearing cropped image and resetting scanner');
     setCroppedImageData(null);
+    setProcessing(false);
+    setRectangleDetected(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);
   }, []);
 
   return (
@@ -297,6 +334,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             minStableFrames={minStableFrames ?? 6}
             detectionConfig={detectionConfig}
             onCapture={handleCapture}
+            onRectangleDetect={handleRectangleDetect}
             showManualCaptureButton={false}
           >
           <View style={styles.overlayTop} pointerEvents="box-none">
@@ -340,7 +378,10 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
               accessibilityLabel={mergedStrings.manualHint}
               accessibilityRole="button"
             >
-              <View style={styles.shutterInner} />
+              <View style={[
+                styles.shutterInner,
+                rectangleDetected && { backgroundColor: overlayColor }
+              ]} />
             </TouchableOpacity>
           </View>
         </DocScanner>

package/vendor/react-native-document-scanner/ios/IPDFCameraViewController.m

@@ -474,6 +474,12 @@
 
                      [weakSelf hideGLKView:NO completion:nil];
                      completionHandler(image, initialImage, rectangleFeature);
+                 } else {
+                     // No rectangle detected, return original image
+                     NSLog(@"[IPDFCameraViewController] No rectangle detected during manual capture, returning original image");
+                     [weakSelf hideGLKView:NO completion:nil];
+                     UIImage *initialImage = [UIImage imageWithData:imageData];
+                     completionHandler(initialImage, initialImage, nil);
                  }
              } else {
                  [weakSelf hideGLKView:NO completion:nil];