react-native-rectangle-doc-scanner 3.69.0 → 3.71.0

package/dist/FullDocScanner.js

@@ -58,11 +58,13 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     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 [rectangleHint, setRectangleHint] = (0, react_1.useState)(false);
     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 rectangleTimeoutRef = (0, react_1.useRef)(null);
+    const rectangleCaptureTimeoutRef = (0, react_1.useRef)(null);
+    const rectangleHintTimeoutRef = (0, react_1.useRef)(null);
     const mergedStrings = (0, react_1.useMemo)(() => ({
         captureHint: strings?.captureHint,
         manualHint: strings?.manualHint,
@@ -166,6 +168,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             processing,
             hasRef: hasScanner,
             rectangleDetected,
+            rectangleHint,
             currentCaptureMode: captureModeRef.current,
             captureInProgress: captureInProgressRef.current,
         });
@@ -214,7 +217,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                 emitError(error, 'Failed to capture image. Please try again.');
             }
         });
-    }, [processing, rectangleDetected, emitError]);
+    }, [processing, rectangleDetected, rectangleHint, emitError]);
     const handleGalleryPick = (0, react_1.useCallback)(async () => {
         console.log('[FullDocScanner] handleGalleryPick called');
         if (processing || isGalleryOpen) {
@@ -266,11 +269,16 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         setCroppedImageData(null);
         setProcessing(false);
         setRectangleDetected(false);
+        setRectangleHint(false);
         captureModeRef.current = null;
         captureInProgressRef.current = false;
-        if (rectangleTimeoutRef.current) {
-            clearTimeout(rectangleTimeoutRef.current);
-            rectangleTimeoutRef.current = null;
+        if (rectangleCaptureTimeoutRef.current) {
+            clearTimeout(rectangleCaptureTimeoutRef.current);
+            rectangleCaptureTimeoutRef.current = null;
+        }
+        if (rectangleHintTimeoutRef.current) {
+            clearTimeout(rectangleHintTimeoutRef.current);
+            rectangleHintTimeoutRef.current = null;
         }
         // Reset DocScanner state
         if (docScannerRef.current?.reset) {
@@ -281,47 +289,60 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         const stableCounter = event.stableCounter ?? 0;
         const rectangleCoordinates = event.rectangleOnScreen ?? event.rectangleCoordinates;
         const hasRectangle = Boolean(rectangleCoordinates);
-        const isConfidentRectangle = hasRectangle && (event.lastDetectionType === 0 || stableCounter > 0);
-        const scheduleDetectionClear = () => {
-            if (rectangleTimeoutRef.current) {
-                clearTimeout(rectangleTimeoutRef.current);
+        const captureReady = hasRectangle && event.lastDetectionType === 0 && stableCounter >= 1;
+        const scheduleClear = (ref, clearFn) => {
+            if (ref.current) {
+                clearTimeout(ref.current);
             }
-            rectangleTimeoutRef.current = setTimeout(() => {
-                rectangleTimeoutRef.current = null;
-                setRectangleDetected((prev) => {
-                    if (!prev) {
-                        return prev;
-                    }
-                    console.log('[FullDocScanner] Rectangle timeout - clearing detection');
-                    return false;
-                });
+            ref.current = setTimeout(() => {
+                ref.current = null;
+                clearFn();
             }, 350);
         };
-        if (isConfidentRectangle) {
-            scheduleDetectionClear();
-            setRectangleDetected((prev) => (prev ? prev : true));
+        if (hasRectangle) {
+            scheduleClear(rectangleHintTimeoutRef, () => setRectangleHint(false));
+            setRectangleHint(true);
+        }
+        else {
+            if (rectangleHintTimeoutRef.current) {
+                clearTimeout(rectangleHintTimeoutRef.current);
+                rectangleHintTimeoutRef.current = null;
+            }
+            setRectangleHint(false);
+        }
+        if (captureReady) {
+            scheduleClear(rectangleCaptureTimeoutRef, () => {
+                console.log('[FullDocScanner] Rectangle timeout - clearing detection');
+                setRectangleDetected(false);
+            });
+            setRectangleDetected(true);
         }
         else if (!hasRectangle) {
-            if (rectangleTimeoutRef.current) {
-                clearTimeout(rectangleTimeoutRef.current);
-                rectangleTimeoutRef.current = null;
+            if (rectangleCaptureTimeoutRef.current) {
+                clearTimeout(rectangleCaptureTimeoutRef.current);
+                rectangleCaptureTimeoutRef.current = null;
             }
             setRectangleDetected(false);
         }
-        else {
-            // Rectangle is present but confidence is low – keep current state but schedule a clear
-            scheduleDetectionClear();
+        else if (rectangleDetected) {
+            scheduleClear(rectangleCaptureTimeoutRef, () => {
+                console.log('[FullDocScanner] Rectangle timeout - clearing detection');
+                setRectangleDetected(false);
+            });
         }
         console.log('[FullDocScanner] Rectangle detection update', {
             lastDetectionType: event.lastDetectionType,
             stableCounter,
             hasRectangle,
-            isConfidentRectangle,
+            captureReady,
         });
-    }, []);
+    }, [rectangleDetected]);
     (0, react_1.useEffect)(() => () => {
-        if (rectangleTimeoutRef.current) {
-            clearTimeout(rectangleTimeoutRef.current);
+        if (rectangleCaptureTimeoutRef.current) {
+            clearTimeout(rectangleCaptureTimeoutRef.current);
+        }
+        if (rectangleHintTimeoutRef.current) {
+            clearTimeout(rectangleHintTimeoutRef.current);
         }
     }, []);
     return (react_1.default.createElement(react_native_1.View, { style: styles.container },
@@ -348,7 +369,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                     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,
-                                rectangleDetected && { backgroundColor: overlayColor }
+                                rectangleHint && { 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 }),

package/package.json

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

package/src/FullDocScanner.tsx

@@ -86,11 +86,13 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   const [croppedImageData, setCroppedImageData] = useState<{path: string; base64?: string} | null>(null);
   const [isGalleryOpen, setIsGalleryOpen] = useState(false);
   const [rectangleDetected, setRectangleDetected] = useState(false);
+  const [rectangleHint, setRectangleHint] = useState(false);
   const resolvedGridColor = gridColor ?? overlayColor;
   const docScannerRef = useRef<DocScannerHandle | null>(null);
   const captureModeRef = useRef<'grid' | 'no-grid' | null>(null);
   const captureInProgressRef = useRef(false);
-  const rectangleTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const rectangleCaptureTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const rectangleHintTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   const mergedStrings = useMemo(
     () => ({
@@ -226,6 +228,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       processing,
       hasRef: hasScanner,
       rectangleDetected,
+      rectangleHint,
       currentCaptureMode: captureModeRef.current,
       captureInProgress: captureInProgressRef.current,
     });
@@ -288,7 +291,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
           );
         }
       });
-  }, [processing, rectangleDetected, emitError]);
+  }, [processing, rectangleDetected, rectangleHint, emitError]);
 
   const handleGalleryPick = useCallback(async () => {
     console.log('[FullDocScanner] handleGalleryPick called');
@@ -353,11 +356,16 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     setCroppedImageData(null);
     setProcessing(false);
     setRectangleDetected(false);
+    setRectangleHint(false);
     captureModeRef.current = null;
     captureInProgressRef.current = false;
-    if (rectangleTimeoutRef.current) {
-      clearTimeout(rectangleTimeoutRef.current);
-      rectangleTimeoutRef.current = null;
+    if (rectangleCaptureTimeoutRef.current) {
+      clearTimeout(rectangleCaptureTimeoutRef.current);
+      rectangleCaptureTimeoutRef.current = null;
+    }
+    if (rectangleHintTimeoutRef.current) {
+      clearTimeout(rectangleHintTimeoutRef.current);
+      rectangleHintTimeoutRef.current = null;
     }
     // Reset DocScanner state
     if (docScannerRef.current?.reset) {
@@ -369,52 +377,70 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     const stableCounter = event.stableCounter ?? 0;
     const rectangleCoordinates = event.rectangleOnScreen ?? event.rectangleCoordinates;
     const hasRectangle = Boolean(rectangleCoordinates);
-    const isConfidentRectangle = hasRectangle && (event.lastDetectionType === 0 || stableCounter > 0);
-
-    const scheduleDetectionClear = () => {
-      if (rectangleTimeoutRef.current) {
-        clearTimeout(rectangleTimeoutRef.current);
+    const captureReady = hasRectangle && event.lastDetectionType === 0 && stableCounter >= 1;
+
+    const scheduleClear = (
+      ref: React.MutableRefObject<ReturnType<typeof setTimeout> | null>,
+      clearFn: () => void,
+    ) => {
+      if (ref.current) {
+        clearTimeout(ref.current);
       }
-
-      rectangleTimeoutRef.current = setTimeout(() => {
-        rectangleTimeoutRef.current = null;
-        setRectangleDetected((prev) => {
-          if (!prev) {
-            return prev;
-          }
-          console.log('[FullDocScanner] Rectangle timeout - clearing detection');
-          return false;
-        });
+      ref.current = setTimeout(() => {
+        ref.current = null;
+        clearFn();
       }, 350);
     };
 
-    if (isConfidentRectangle) {
-      scheduleDetectionClear();
-      setRectangleDetected((prev) => (prev ? prev : true));
+    if (hasRectangle) {
+      scheduleClear(rectangleHintTimeoutRef, () => setRectangleHint(false));
+      setRectangleHint(true);
+    } else {
+      if (rectangleHintTimeoutRef.current) {
+        clearTimeout(rectangleHintTimeoutRef.current);
+        rectangleHintTimeoutRef.current = null;
+      }
+      setRectangleHint(false);
+    }
+
+    if (captureReady) {
+      scheduleClear(rectangleCaptureTimeoutRef, () => {
+        console.log('[FullDocScanner] Rectangle timeout - clearing detection');
+        setRectangleDetected(false);
+      });
+      setRectangleDetected(true);
     } else if (!hasRectangle) {
-      if (rectangleTimeoutRef.current) {
-        clearTimeout(rectangleTimeoutRef.current);
-        rectangleTimeoutRef.current = null;
+      if (rectangleCaptureTimeoutRef.current) {
+        clearTimeout(rectangleCaptureTimeoutRef.current);
+        rectangleCaptureTimeoutRef.current = null;
       }
       setRectangleDetected(false);
-    } else {
-      // Rectangle is present but confidence is low – keep current state but schedule a clear
-      scheduleDetectionClear();
+    } else if (rectangleDetected) {
+      scheduleClear(rectangleCaptureTimeoutRef, () => {
+        console.log('[FullDocScanner] Rectangle timeout - clearing detection');
+        setRectangleDetected(false);
+      });
     }
 
     console.log('[FullDocScanner] Rectangle detection update', {
       lastDetectionType: event.lastDetectionType,
       stableCounter,
       hasRectangle,
-      isConfidentRectangle,
+      captureReady,
     });
-  }, []);
+  }, [rectangleDetected]);
 
-  useEffect(() => () => {
-    if (rectangleTimeoutRef.current) {
-      clearTimeout(rectangleTimeoutRef.current);
-    }
-  }, []);
+  useEffect(
+    () => () => {
+      if (rectangleCaptureTimeoutRef.current) {
+        clearTimeout(rectangleCaptureTimeoutRef.current);
+      }
+      if (rectangleHintTimeoutRef.current) {
+        clearTimeout(rectangleHintTimeoutRef.current);
+      }
+    },
+    [],
+  );
 
   return (
     <View style={styles.container}>
@@ -503,7 +529,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             >
               <View style={[
                 styles.shutterInner,
-                rectangleDetected && { backgroundColor: overlayColor }
+                rectangleHint && { backgroundColor: overlayColor }
               ]} />
             </TouchableOpacity>
           </View>

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

@@ -34,39 +34,18 @@ RCT_EXPORT_VIEW_PROPERTY(quality, float)
 RCT_EXPORT_VIEW_PROPERTY(brightness, float)
 RCT_EXPORT_VIEW_PROPERTY(contrast, float)
 
-// Main capture method - returns a Promise
-RCT_EXPORT_METHOD(capture:(nullable id)reactTag
-                  resolver:(RCTPromiseResolveBlock)resolve
+// Main capture method - returns a Promise and uses the last mounted scanner view
+RCT_EXPORT_METHOD(capture:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-    NSLog(@"[RNPdfScannerManager] capture called with reactTag: %@", reactTag);
+    NSLog(@"[RNPdfScannerManager] capture requested (no reactTag)");
     dispatch_async(dispatch_get_main_queue(), ^{
-        DocumentScannerView *targetView = nil;
-        NSNumber *resolvedTag = ([reactTag isKindOfClass:[NSNumber class]]) ? (NSNumber *)reactTag : nil;
-
-        if (!resolvedTag && reactTag) {
-            NSLog(@"[RNPdfScannerManager] Unexpected reactTag type %@ - falling back to last known view", NSStringFromClass([reactTag class]));
-        }
-
-        if (resolvedTag) {
-            UIView *view = [self.bridge.uiManager viewForReactTag:resolvedTag];
-            if ([view isKindOfClass:[DocumentScannerView class]]) {
-                targetView = (DocumentScannerView *)view;
-                self->_scannerView = targetView;
-            } else if (view) {
-                NSLog(@"[RNPdfScannerManager] View for tag %@ is not DocumentScannerView: %@", resolvedTag, NSStringFromClass(view.class));
-            } else {
-                NSLog(@"[RNPdfScannerManager] No view found for tag %@", resolvedTag);
-            }
-        }
-
-        if (!targetView && self->_scannerView) {
-            NSLog(@"[RNPdfScannerManager] Falling back to last known scanner view");
-            targetView = self->_scannerView;
-        }
+        DocumentScannerView *targetView = self->_scannerView;
 
         if (!targetView) {
-            NSLog(@"[RNPdfScannerManager] ERROR: No scanner view available for capture");
-            reject(@"NO_VIEW", @"No scanner view available for capture", nil);
+            NSLog(@"[RNPdfScannerManager] ERROR: Scanner view not yet ready for capture");
+            if (reject) {
+                reject(@"NO_VIEW", @"Document scanner view is not ready", nil);
+            }
             return;
         }
 

package/vendor/react-native-document-scanner/ios.js

@@ -27,18 +27,15 @@ class PdfScanner extends React.Component {
   }
 
   capture() {
-    console.log('[PdfScanner/ios.js] capture called, ref:', this.scannerRef.current);
-    const handle = findNodeHandle(this.scannerRef.current);
-    console.log('[PdfScanner/ios.js] node handle (reactTag):', handle);
+    console.log('[PdfScanner/ios.js] capture called');
 
-    if (!handle) {
-      console.error('[PdfScanner/ios.js] ERROR: No handle found for scanner ref');
-      return Promise.reject(new Error('No handle found for scanner view'));
+    if (!this.scannerRef.current) {
+      const error = new Error('DocumentScanner native view is not ready');
+      console.error('[PdfScanner/ios.js] ERROR:', error.message);
+      return Promise.reject(error);
     }
 
-    // Call native method with reactTag - now returns a Promise
-    console.log('[PdfScanner/ios.js] Calling native capture with handle:', handle);
-    return NativeModules.RNPdfScannerManager.capture(handle);
+    return NativeModules.RNPdfScannerManager.capture();
   }
 
   render() {