react-native-rectangle-doc-scanner 15.1.0 → 15.3.0

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

@@ -207,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;
@@ -420,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' &&
@@ -459,11 +476,42 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     }, [
         emitError,
         isAndroidCropEditorAvailable,
+        onResult,
         openAndroidCropEditor,
         openCropper,
         preparePreviewImage,
         resetScannerView,
+        usesAndroidScannerActivity,
     ]);
+    const startAndroidScan = (0, react_1.useCallback)(async () => {
+        if (!usesAndroidScannerActivity || !pdfScannerManager?.startDocumentScanner) {
+            throw new Error('document_scanner_not_available');
+        }
+        if (captureInProgressRef.current) {
+            throw new Error('capture_in_progress');
+        }
+        captureInProgressRef.current = true;
+        captureModeRef.current = 'grid';
+        try {
+            const payload = await pdfScannerManager.startDocumentScanner({ pageLimit: 2 });
+            const normalizedPath = stripFileUri(payload?.initialImage ?? payload?.croppedImage ?? '');
+            const capturePayload = {
+                path: normalizedPath,
+                initialPath: payload?.initialImage ? stripFileUri(payload.initialImage) : normalizedPath,
+                croppedPath: payload?.croppedImage ? stripFileUri(payload.croppedImage) : normalizedPath,
+                quad: null,
+                rectangle: null,
+                width: payload?.width ?? 0,
+                height: payload?.height ?? 0,
+                origin: 'manual',
+                pages: payload?.pages ?? null,
+            };
+            await handleCapture(capturePayload);
+        }
+        finally {
+            captureInProgressRef.current = false;
+        }
+    }, [handleCapture, pdfScannerManager, usesAndroidScannerActivity]);
     const triggerManualCapture = (0, react_1.useCallback)(() => {
         const scannerInstance = docScannerRef.current;
         const hasScanner = !!scannerInstance;
@@ -489,6 +537,19 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             return;
         }
         if (!hasScanner) {
+            if (usesAndroidScannerActivity) {
+                startAndroidScan().catch((error) => {
+                    const errorMessage = error instanceof Error ? error.message : String(error);
+                    console.error('[FullDocScanner] Android scan failed:', errorMessage, error);
+                    if (errorMessage.includes('SCAN_CANCELLED')) {
+                        resetScannerView({ remount: true });
+                        onClose?.();
+                        return;
+                    }
+                    emitError(error instanceof Error ? error : new Error(String(error)), 'Failed to capture image. Please try again.');
+                });
+                return;
+            }
             console.error('[FullDocScanner] DocScanner ref not available');
             return;
         }
@@ -522,13 +583,24 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             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) {
@@ -642,7 +714,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;
@@ -785,7 +868,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.1.0",
+  "version": "15.3.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

@@ -293,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> => {
@@ -580,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 =
@@ -630,13 +645,49 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     [
       emitError,
       isAndroidCropEditorAvailable,
+      onResult,
       openAndroidCropEditor,
       openCropper,
       preparePreviewImage,
       resetScannerView,
+      usesAndroidScannerActivity,
     ],
   );
 
+  const startAndroidScan = useCallback(async () => {
+    if (!usesAndroidScannerActivity || !pdfScannerManager?.startDocumentScanner) {
+      throw new Error('document_scanner_not_available');
+    }
+
+    if (captureInProgressRef.current) {
+      throw new Error('capture_in_progress');
+    }
+
+    captureInProgressRef.current = true;
+    captureModeRef.current = 'grid';
+
+    try {
+      const payload = await pdfScannerManager.startDocumentScanner({ pageLimit: 2 });
+      const normalizedPath = stripFileUri(payload?.initialImage ?? payload?.croppedImage ?? '');
+
+      const capturePayload: DocScannerCapture = {
+        path: normalizedPath,
+        initialPath: payload?.initialImage ? stripFileUri(payload.initialImage) : normalizedPath,
+        croppedPath: payload?.croppedImage ? stripFileUri(payload.croppedImage) : normalizedPath,
+        quad: null,
+        rectangle: null,
+        width: payload?.width ?? 0,
+        height: payload?.height ?? 0,
+        origin: 'manual',
+        pages: payload?.pages ?? null,
+      };
+
+      await handleCapture(capturePayload);
+    } finally {
+      captureInProgressRef.current = false;
+    }
+  }, [handleCapture, pdfScannerManager, usesAndroidScannerActivity]);
+
   const triggerManualCapture = useCallback(() => {
     const scannerInstance = docScannerRef.current;
     const hasScanner = !!scannerInstance;
@@ -666,6 +717,22 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
     }
 
     if (!hasScanner) {
+      if (usesAndroidScannerActivity) {
+        startAndroidScan().catch((error: unknown) => {
+          const errorMessage = error instanceof Error ? error.message : String(error);
+          console.error('[FullDocScanner] Android scan failed:', errorMessage, error);
+          if (errorMessage.includes('SCAN_CANCELLED')) {
+            resetScannerView({ remount: true });
+            onClose?.();
+            return;
+          }
+          emitError(
+            error instanceof Error ? error : new Error(String(error)),
+            'Failed to capture image. Please try again.',
+          );
+        });
+        return;
+      }
       console.error('[FullDocScanner] DocScanner ref not available');
       return;
     }
@@ -707,6 +774,8 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         captureInProgressRef.current = false;
 
         if (errorMessage.includes('SCAN_CANCELLED')) {
+          resetScannerView({ remount: true });
+          onClose?.();
           return;
         }
 
@@ -717,7 +786,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');
@@ -863,7 +941,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;
@@ -1142,6 +1232,8 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             </TouchableOpacity>
           </View>
         </View>
+      ) : usesAndroidScannerActivity ? (
+        <View style={styles.flex} />
       ) : (
         <View style={styles.flex}>
           <DocScanner