react-native-rectangle-doc-scanner 15.0.0 → 15.2.0

package/android/src/main/kotlin/com/reactnativerectangledocscanner/DocumentScannerModule.kt

@@ -54,7 +54,7 @@ class DocumentScannerModule(reactContext: ReactApplicationContext) :
             .setScannerMode(GmsDocumentScannerOptions.SCANNER_MODE_FULL)
             .setResultFormats(GmsDocumentScannerOptions.RESULT_FORMAT_JPEG)
             .setPageLimit(pageLimit.coerceAtMost(2))
-            .setGalleryImportAllowed(false)
+            .setGalleryImportAllowed(true)
             .build()
 
         val scanner = GmsDocumentScanning.getClient(scannerOptions)

package/dist/DocScanner.d.ts

@@ -33,6 +33,11 @@ export type DocScannerCapture = {
     width: number;
     height: number;
     origin: 'auto' | 'manual';
+    pages?: Array<{
+        path: string;
+        width: number;
+        height: number;
+    }> | null;
 };
 export interface DetectionConfig {
     processingWidth?: number;

package/dist/DocScanner.js

@@ -121,6 +121,7 @@ const ActivityScanner = (0, react_1.forwardRef)(({ onCapture, children, showManu
                 width: event.width ?? 0,
                 height: event.height ?? 0,
                 origin,
+                pages: event.pages ?? null,
             });
         }
         if (captureResolvers.current) {
@@ -321,6 +322,7 @@ const VisionCameraScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor =
                 width: event.width ?? 0,
                 height: event.height ?? 0,
                 origin,
+                pages: event.pages ?? null,
             });
         }
         setDetectedRectangle(null);

package/dist/FullDocScanner.js

@@ -149,6 +149,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     const [scannerSession, setScannerSession] = (0, react_1.useState)(0);
     const [cropEditorDocument, setCropEditorDocument] = (0, react_1.useState)(null);
     const [cropEditorRectangle, setCropEditorRectangle] = (0, react_1.useState)(null);
+    const [androidScanAutoRequested, setAndroidScanAutoRequested] = (0, react_1.useState)(false);
     const resolvedGridColor = gridColor ?? overlayColor;
     const docScannerRef = (0, react_1.useRef)(null);
     const captureModeRef = (0, react_1.useRef)(null);
@@ -165,6 +166,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         setCroppedImageData(null);
         setCropEditorDocument(null);
         setCropEditorRectangle(null);
+        setAndroidScanAutoRequested(false);
         setRotationDegrees(0);
         setRectangleDetected(false);
         setRectangleHint(false);
@@ -205,7 +207,12 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         secondPrompt: strings?.secondPrompt ?? strings?.secondBtn ?? 'Capture Back Side?',
         originalBtn: strings?.originalBtn ?? 'Use Original',
     }), [strings]);
-    const autoEnhancementEnabled = (0, react_1.useMemo)(() => typeof pdfScannerManager?.applyColorControls === 'function', [pdfScannerManager]);
+    const autoEnhancementEnabled = (0, react_1.useMemo)(() => {
+        if (usesAndroidScannerActivity) {
+            return false;
+        }
+        return typeof pdfScannerManager?.applyColorControls === 'function';
+    }, [pdfScannerManager, usesAndroidScannerActivity]);
     const ensureBase64ForImage = (0, react_1.useCallback)(async (image) => {
         if (image.base64) {
             return image;
@@ -418,6 +425,18 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             console.warn('[FullDocScanner] Missing capture mode for capture result, ignoring');
             return;
         }
+        if (usesAndroidScannerActivity) {
+            const pages = document.pages?.length
+                ? document.pages
+                : [{ path: document.path, width: document.width, height: document.height }];
+            const results = pages.map((page) => ({
+                path: stripFileUri(page.path),
+                rotationDegrees: 0,
+            }));
+            onResult(results);
+            resetScannerView({ remount: true });
+            return;
+        }
         const normalizedDoc = normalizeCapturedDocument(document);
         const shouldOpenAndroidCropEditor = isAndroidCropEditorAvailable &&
             captureMode === 'grid' &&
@@ -457,10 +476,12 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     }, [
         emitError,
         isAndroidCropEditorAvailable,
+        onResult,
         openAndroidCropEditor,
         openCropper,
         preparePreviewImage,
         resetScannerView,
+        usesAndroidScannerActivity,
     ]);
     const triggerManualCapture = (0, react_1.useCallback)(() => {
         const scannerInstance = docScannerRef.current;
@@ -519,11 +540,25 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             console.error('[FullDocScanner] Manual capture failed:', errorMessage, error);
             captureModeRef.current = null;
             captureInProgressRef.current = false;
+            if (errorMessage.includes('SCAN_CANCELLED')) {
+                resetScannerView({ remount: true });
+                onClose?.();
+                return;
+            }
             if (error instanceof Error && error.message !== 'capture_in_progress') {
                 emitError(error, 'Failed to capture image. Please try again.');
             }
         });
-    }, [processing, rectangleDetected, rectangleHint, captureReady, emitError, usesAndroidScannerActivity]);
+    }, [
+        emitError,
+        onClose,
+        processing,
+        rectangleDetected,
+        rectangleHint,
+        captureReady,
+        resetScannerView,
+        usesAndroidScannerActivity,
+    ]);
     const handleGalleryPick = (0, react_1.useCallback)(async () => {
         console.log('[FullDocScanner] handleGalleryPick called');
         if (processing || isGalleryOpen) {
@@ -637,7 +672,18 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             setCurrentPhotoIndex(0);
         }
         resetScannerView({ remount: true });
-    }, [capturedPhotos.length, isBusinessMode, resetScannerView]);
+        if (usesAndroidScannerActivity) {
+            requestAnimationFrame(() => {
+                triggerManualCapture();
+            });
+        }
+    }, [
+        capturedPhotos.length,
+        isBusinessMode,
+        resetScannerView,
+        triggerManualCapture,
+        usesAndroidScannerActivity,
+    ]);
     const handleRectangleDetect = (0, react_1.useCallback)((event) => {
         const stableCounter = event.stableCounter ?? 0;
         const rectangleCoordinates = event.rectangleOnScreen ?? event.rectangleCoordinates;
@@ -709,6 +755,23 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             setCaptureReady(true);
         }
     }, [usesAndroidScannerActivity]);
+    (0, react_1.useEffect)(() => {
+        if (!usesAndroidScannerActivity) {
+            return;
+        }
+        if (androidScanAutoRequested || croppedImageData || cropEditorDocument || processing) {
+            return;
+        }
+        setAndroidScanAutoRequested(true);
+        triggerManualCapture();
+    }, [
+        androidScanAutoRequested,
+        cropEditorDocument,
+        croppedImageData,
+        processing,
+        triggerManualCapture,
+        usesAndroidScannerActivity,
+    ]);
     const activePreviewImage = croppedImageData ? getActivePreviewImage(croppedImageData) : null;
     return (react_1.default.createElement(react_native_1.View, { style: styles.container },
         react_native_1.Platform.OS === 'android' && (react_1.default.createElement(react_native_1.StatusBar, { translucent: true, backgroundColor: "transparent" })),
@@ -763,7 +826,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.confirmButton, styles.retakeButton], onPress: handleCropEditorCancel, accessibilityLabel: mergedStrings.retake, accessibilityRole: "button", disabled: processing },
                     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: handleCropEditorConfirm, accessibilityLabel: mergedStrings.confirm, accessibilityRole: "button", disabled: processing },
-                    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(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.confirm))))) : usesAndroidScannerActivity ? (react_1.default.createElement(react_native_1.View, { style: styles.flex })) : (react_1.default.createElement(react_native_1.View, { style: styles.flex },
             react_1.default.createElement(DocScanner_1.DocScanner, { key: scannerSession, ref: docScannerRef, autoCapture: false, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture, onRectangleDetect: handleRectangleDetect, showManualCaptureButton: false, enableTorch: flashEnabled },
                 react_1.default.createElement(react_native_1.View, { style: styles.overlayTop, pointerEvents: "box-none" },
                     react_1.default.createElement(react_native_1.TouchableOpacity, { style: [

package/package.json

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

package/src/DocScanner.tsx

@@ -48,6 +48,7 @@ export type DocScannerCapture = {
   width: number;
   height: number;
   origin: 'auto' | 'manual';
+  pages?: Array<{ path: string; width: number; height: number }> | null;
 };
 
 const isFiniteNumber = (value: unknown): value is number =>
@@ -192,6 +193,7 @@ const ActivityScanner = forwardRef<DocScannerHandle, Props>(
             width: event.width ?? 0,
             height: event.height ?? 0,
             origin,
+            pages: event.pages ?? null,
           });
         }
 
@@ -480,6 +482,7 @@ const VisionCameraScanner = forwardRef<DocScannerHandle, Props>(
             width: event.width ?? 0,
             height: event.height ?? 0,
             origin,
+            pages: event.pages ?? null,
           });
         }
 

package/src/FullDocScanner.tsx

@@ -220,6 +220,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   const [scannerSession, setScannerSession] = useState(0);
   const [cropEditorDocument, setCropEditorDocument] = useState<CapturedDocument | null>(null);
   const [cropEditorRectangle, setCropEditorRectangle] = useState<Rectangle | null>(null);
+  const [androidScanAutoRequested, setAndroidScanAutoRequested] = useState(false);
   const resolvedGridColor = gridColor ?? overlayColor;
   const docScannerRef = useRef<DocScannerHandle | null>(null);
   const captureModeRef = useRef<'grid' | 'no-grid' | null>(null);
@@ -240,6 +241,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       setCroppedImageData(null);
       setCropEditorDocument(null);
       setCropEditorRectangle(null);
+      setAndroidScanAutoRequested(false);
       setRotationDegrees(0);
       setRectangleDetected(false);
       setRectangleHint(false);
@@ -291,10 +293,12 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     [strings],
   );
 
-  const autoEnhancementEnabled = useMemo(
-    () => typeof pdfScannerManager?.applyColorControls === 'function',
-    [pdfScannerManager],
-  );
+  const autoEnhancementEnabled = useMemo(() => {
+    if (usesAndroidScannerActivity) {
+      return false;
+    }
+    return typeof pdfScannerManager?.applyColorControls === 'function';
+  }, [pdfScannerManager, usesAndroidScannerActivity]);
 
   const ensureBase64ForImage = useCallback(
     async (image: PreviewImageInfo): Promise<PreviewImageInfo> => {
@@ -578,6 +582,19 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         return;
       }
 
+      if (usesAndroidScannerActivity) {
+        const pages = document.pages?.length
+          ? document.pages
+          : [{ path: document.path, width: document.width, height: document.height }];
+        const results: FullDocScannerResult[] = pages.map((page) => ({
+          path: stripFileUri(page.path),
+          rotationDegrees: 0,
+        }));
+        onResult(results);
+        resetScannerView({ remount: true });
+        return;
+      }
+
       const normalizedDoc = normalizeCapturedDocument(document);
 
       const shouldOpenAndroidCropEditor =
@@ -628,10 +645,12 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     [
       emitError,
       isAndroidCropEditorAvailable,
+      onResult,
       openAndroidCropEditor,
       openCropper,
       preparePreviewImage,
       resetScannerView,
+      usesAndroidScannerActivity,
     ],
   );
 
@@ -704,6 +723,12 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         captureModeRef.current = null;
         captureInProgressRef.current = false;
 
+        if (errorMessage.includes('SCAN_CANCELLED')) {
+          resetScannerView({ remount: true });
+          onClose?.();
+          return;
+        }
+
         if (error instanceof Error && error.message !== 'capture_in_progress') {
           emitError(
             error,
@@ -711,7 +736,16 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
           );
         }
       });
-  }, [processing, rectangleDetected, rectangleHint, captureReady, emitError, usesAndroidScannerActivity]);
+  }, [
+    emitError,
+    onClose,
+    processing,
+    rectangleDetected,
+    rectangleHint,
+    captureReady,
+    resetScannerView,
+    usesAndroidScannerActivity,
+  ]);
 
   const handleGalleryPick = useCallback(async () => {
     console.log('[FullDocScanner] handleGalleryPick called');
@@ -857,7 +891,19 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     }
 
     resetScannerView({ remount: true });
-  }, [capturedPhotos.length, isBusinessMode, resetScannerView]);
+
+    if (usesAndroidScannerActivity) {
+      requestAnimationFrame(() => {
+        triggerManualCapture();
+      });
+    }
+  }, [
+    capturedPhotos.length,
+    isBusinessMode,
+    resetScannerView,
+    triggerManualCapture,
+    usesAndroidScannerActivity,
+  ]);
 
   const handleRectangleDetect = useCallback((event: RectangleDetectEvent) => {
     const stableCounter = event.stableCounter ?? 0;
@@ -941,6 +987,26 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     }
   }, [usesAndroidScannerActivity]);
 
+  useEffect(() => {
+    if (!usesAndroidScannerActivity) {
+      return;
+    }
+
+    if (androidScanAutoRequested || croppedImageData || cropEditorDocument || processing) {
+      return;
+    }
+
+    setAndroidScanAutoRequested(true);
+    triggerManualCapture();
+  }, [
+    androidScanAutoRequested,
+    cropEditorDocument,
+    croppedImageData,
+    processing,
+    triggerManualCapture,
+    usesAndroidScannerActivity,
+  ]);
+
   const activePreviewImage = croppedImageData ? getActivePreviewImage(croppedImageData) : null;
 
   return (
@@ -1116,6 +1182,8 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             </TouchableOpacity>
           </View>
         </View>
+      ) : usesAndroidScannerActivity ? (
+        <View style={styles.flex} />
       ) : (
         <View style={styles.flex}>
           <DocScanner