react-native-rectangle-doc-scanner 3.76.0 → 3.78.0

package/dist/DocScanner.js

@@ -43,6 +43,7 @@ const react_native_document_scanner_1 = __importDefault(require("react-native-do
 const coordinate_1 = require("./utils/coordinate");
 const overlay_1 = require("./utils/overlay");
 const isFiniteNumber = (value) => typeof value === 'number' && Number.isFinite(value);
+const { RNPdfScannerManager } = react_native_1.NativeModules;
 const normalizePoint = (point) => {
     if (!point || !isFiniteNumber(point.x) || !isFiniteNumber(point.y)) {
         return null;
@@ -155,7 +156,7 @@ exports.DocScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAUL
         console.log('[DocScanner] capture() called');
         captureOriginRef.current = 'manual';
         const instance = scannerRef.current;
-        if (!instance || typeof instance.capture !== 'function') {
+        if (!instance || (typeof instance.capture !== 'function' && react_native_1.Platform.OS !== 'ios')) {
             console.error('[DocScanner] Native instance not ready:', {
                 hasInstance: !!instance,
                 hasCaptureMethod: instance ? typeof instance.capture : 'no instance',
@@ -168,7 +169,47 @@ exports.DocScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAUL
             captureOriginRef.current = 'auto';
             return Promise.reject(new Error('capture_in_progress'));
         }
-        console.log('[DocScanner] Calling native capture method (now returns Promise)...');
+        const attemptNativeManagerCapture = () => {
+            if (react_native_1.Platform.OS !== 'ios') {
+                return null;
+            }
+            if (!RNPdfScannerManager || typeof RNPdfScannerManager.capture !== 'function') {
+                console.warn('[DocScanner] RNPdfScannerManager.capture not available, falling back to instance method');
+                return null;
+            }
+            const nodeHandle = (0, react_native_1.findNodeHandle)(instance);
+            if (!nodeHandle) {
+                console.error('[DocScanner] Unable to resolve native tag for scanner view');
+                return Promise.reject(new Error('scanner_view_not_ready'));
+            }
+            console.log('[DocScanner] Calling RNPdfScannerManager.capture with tag:', nodeHandle);
+            const managerResult = RNPdfScannerManager.capture(nodeHandle);
+            if (!managerResult || typeof managerResult.then !== 'function') {
+                console.warn('[DocScanner] RNPdfScannerManager.capture did not return a promise, falling back to instance method');
+                return null;
+            }
+            return managerResult
+                .then((payload) => {
+                console.log('[DocScanner] RNPdfScannerManager promise resolved');
+                handlePictureTaken(payload);
+                return payload;
+            })
+                .catch((error) => {
+                console.error('[DocScanner] RNPdfScannerManager promise rejected:', error);
+                captureOriginRef.current = 'auto';
+                throw error;
+            });
+        };
+        const managerPromise = attemptNativeManagerCapture();
+        if (managerPromise) {
+            return managerPromise;
+        }
+        if (!instance || typeof instance.capture !== 'function') {
+            console.error('[DocScanner] capture() fallback not available on instance');
+            captureOriginRef.current = 'auto';
+            return Promise.reject(new Error('capture_not_supported'));
+        }
+        console.log('[DocScanner] Calling native capture method (legacy/event-based)...');
         try {
             const result = instance.capture();
             console.log('[DocScanner] Native capture method called, result type:', typeof result, 'isPromise:', !!(result && typeof result.then === 'function'));

package/dist/FullDocScanner.js

@@ -43,6 +43,56 @@ const react_native_image_picker_1 = require("react-native-image-picker");
 const react_native_image_crop_picker_1 = __importDefault(require("react-native-image-crop-picker"));
 const DocScanner_1 = require("./DocScanner");
 const stripFileUri = (value) => value.replace(/^file:\/\//, '');
+const CROPPER_TIMEOUT_MS = 8000;
+const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const runAfterInteractions = () => new Promise((resolve) => react_native_1.InteractionManager.runAfterInteractions(() => resolve()));
+// Allow native pickers to finish their dismissal animations before presenting the cropper.
+const waitForModalDismissal = async () => {
+    await delay(50);
+    await runAfterInteractions();
+    if (typeof requestAnimationFrame === 'function') {
+        await new Promise((resolve) => requestAnimationFrame(() => resolve()));
+    }
+    await delay(180);
+    await runAfterInteractions();
+};
+// Guard the native cropper promise so we can recover if it never resolves.
+async function withTimeout(factory) {
+    let timeoutId;
+    let finished = false;
+    const promise = factory()
+        .then((value) => {
+        finished = true;
+        return value;
+    })
+        .catch((error) => {
+        finished = true;
+        throw error;
+    });
+    const timeoutPromise = new Promise((_, reject) => {
+        timeoutId = setTimeout(() => {
+            if (!finished) {
+                const timeoutError = new Error(CROPPER_TIMEOUT_CODE);
+                timeoutError.code = CROPPER_TIMEOUT_CODE;
+                reject(timeoutError);
+            }
+        }, CROPPER_TIMEOUT_MS);
+    });
+    try {
+        return await Promise.race([promise, timeoutPromise]);
+    }
+    finally {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+        if (!finished) {
+            promise.catch(() => {
+                console.warn('[FullDocScanner] Cropper promise settled after timeout');
+            });
+        }
+    }
+}
 const normalizeCapturedDocument = (document) => {
     const { origin: _origin, ...rest } = document;
     const normalizedPath = stripFileUri(document.initialPath ?? document.path);
@@ -81,7 +131,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             react_native_1.Alert.alert('Document Scanner', fallbackMessage);
         }
     }, [onError]);
-    const openCropper = (0, react_1.useCallback)(async (imagePath) => {
+    const openCropper = (0, react_1.useCallback)(async (imagePath, options) => {
         try {
             console.log('[FullDocScanner] openCropper called with path:', imagePath);
             setProcessing(true);
@@ -92,7 +142,11 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                 cleanPath = cleanPath.replace('file://', '');
             }
             console.log('[FullDocScanner] Clean path for cropper:', cleanPath);
-            const croppedImage = await react_native_image_crop_picker_1.default.openCropper({
+            const shouldWaitForPickerDismissal = options?.waitForPickerDismissal ?? true;
+            if (shouldWaitForPickerDismissal) {
+                await waitForModalDismissal();
+            }
+            const croppedImage = await withTimeout(() => react_native_image_crop_picker_1.default.openCropper({
                 path: cleanPath,
                 mediaType: 'photo',
                 width: cropWidth,
@@ -102,7 +156,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                 freeStyleCropEnabled: true,
                 includeBase64: true,
                 compressImageQuality: 0.9,
-            });
+            }));
             console.log('[FullDocScanner] Cropper returned:', {
                 path: croppedImage.path,
                 hasBase64: !!croppedImage.data,
@@ -117,8 +171,14 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         catch (error) {
             console.error('[FullDocScanner] openCropper error:', error);
             setProcessing(false);
+            const errorCode = error?.code;
             const errorMessage = error?.message || String(error);
-            if (errorMessage === 'User cancelled image selection' ||
+            if (errorCode === CROPPER_TIMEOUT_CODE || errorMessage === CROPPER_TIMEOUT_CODE) {
+                console.error('[FullDocScanner] Cropper timed out waiting for presentation');
+                emitError(error instanceof Error ? error : new Error('Cropper timed out'), 'Failed to open crop editor. Please try again.');
+            }
+            else if (errorCode === 'E_PICKER_CANCELLED' ||
+                errorMessage === 'User cancelled image selection' ||
                 errorMessage.includes('cancelled') ||
                 errorMessage.includes('cancel')) {
                 console.log('[FullDocScanner] User cancelled cropper');
@@ -148,7 +208,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
         const normalizedDoc = normalizeCapturedDocument(document);
         if (captureMode === 'no-grid') {
             console.log('[FullDocScanner] No grid at capture button press: opening cropper for manual selection');
-            await openCropper(normalizedDoc.path);
+            await openCropper(normalizedDoc.path, { waitForPickerDismissal: false });
             return;
         }
         if (normalizedDoc.croppedPath) {
@@ -159,7 +219,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             return;
         }
         console.log('[FullDocScanner] Fallback to manual crop (no croppedPath available)');
-        await openCropper(normalizedDoc.path);
+        await openCropper(normalizedDoc.path, { waitForPickerDismissal: false });
     }, [openCropper]);
     const triggerManualCapture = (0, react_1.useCallback)(() => {
         const scannerInstance = docScannerRef.current;
@@ -244,9 +304,6 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
             }
             const imageUri = result.assets[0].uri;
             console.log('[FullDocScanner] Gallery image selected:', imageUri);
-            // Defer cropper presentation until picker dismissal finishes to avoid hierarchy errors
-            await new Promise((resolve) => react_native_1.InteractionManager.runAfterInteractions(() => resolve()));
-            await new Promise((resolve) => setTimeout(resolve, 350));
             await openCropper(imageUri);
         }
         catch (error) {

package/package.json

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

package/src/DocScanner.tsx

@@ -8,7 +8,14 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { Platform, StyleSheet, TouchableOpacity, View } from 'react-native';
+import {
+  Platform,
+  StyleSheet,
+  TouchableOpacity,
+  View,
+  NativeModules,
+  findNodeHandle,
+} from 'react-native';
 import DocumentScanner from 'react-native-document-scanner';
 import type { Rectangle as NativeRectangle, RectangleEventPayload } from 'react-native-document-scanner';
 import { rectangleToQuad } from './utils/coordinate';
@@ -42,6 +49,8 @@ export type DocScannerCapture = {
 const isFiniteNumber = (value: unknown): value is number =>
   typeof value === 'number' && Number.isFinite(value);
 
+const { RNPdfScannerManager } = NativeModules;
+
 const normalizePoint = (point?: { x?: number; y?: number } | null): Point | null => {
   if (!point || !isFiniteNumber(point.x) || !isFiniteNumber(point.y)) {
     return null;
@@ -232,10 +241,10 @@ export const DocScanner = forwardRef<DocScannerHandle, Props>(
       captureOriginRef.current = 'manual';
       const instance = scannerRef.current;
 
-      if (!instance || typeof instance.capture !== 'function') {
+      if (!instance || (typeof instance.capture !== 'function' && Platform.OS !== 'ios')) {
         console.error('[DocScanner] Native instance not ready:', {
           hasInstance: !!instance,
-          hasCaptureMethod: instance ? typeof instance.capture : 'no instance',
+          hasCaptureMethod: instance ? typeof (instance as any).capture : 'no instance',
         });
         captureOriginRef.current = 'auto';
         return Promise.reject(new Error('DocumentScanner native instance is not ready'));
@@ -247,7 +256,57 @@ export const DocScanner = forwardRef<DocScannerHandle, Props>(
         return Promise.reject(new Error('capture_in_progress'));
       }
 
-      console.log('[DocScanner] Calling native capture method (now returns Promise)...');
+      const attemptNativeManagerCapture = () => {
+        if (Platform.OS !== 'ios') {
+          return null;
+        }
+
+        if (!RNPdfScannerManager || typeof RNPdfScannerManager.capture !== 'function') {
+          console.warn('[DocScanner] RNPdfScannerManager.capture not available, falling back to instance method');
+          return null;
+        }
+
+        const nodeHandle = findNodeHandle(instance);
+
+        if (!nodeHandle) {
+          console.error('[DocScanner] Unable to resolve native tag for scanner view');
+          return Promise.reject(new Error('scanner_view_not_ready'));
+        }
+
+        console.log('[DocScanner] Calling RNPdfScannerManager.capture with tag:', nodeHandle);
+
+        const managerResult = RNPdfScannerManager.capture(nodeHandle);
+
+        if (!managerResult || typeof managerResult.then !== 'function') {
+          console.warn('[DocScanner] RNPdfScannerManager.capture did not return a promise, falling back to instance method');
+          return null;
+        }
+
+        return managerResult
+          .then((payload: PictureEvent) => {
+            console.log('[DocScanner] RNPdfScannerManager promise resolved');
+            handlePictureTaken(payload);
+            return payload;
+          })
+          .catch((error: unknown) => {
+            console.error('[DocScanner] RNPdfScannerManager promise rejected:', error);
+            captureOriginRef.current = 'auto';
+            throw error;
+          });
+      };
+
+      const managerPromise = attemptNativeManagerCapture();
+      if (managerPromise) {
+        return managerPromise;
+      }
+
+      if (!instance || typeof instance.capture !== 'function') {
+        console.error('[DocScanner] capture() fallback not available on instance');
+        captureOriginRef.current = 'auto';
+        return Promise.reject(new Error('capture_not_supported'));
+      }
+
+      console.log('[DocScanner] Calling native capture method (legacy/event-based)...');
       try {
         const result = instance.capture();
         console.log('[DocScanner] Native capture method called, result type:', typeof result, 'isPromise:', !!(result && typeof result.then === 'function'));

package/src/FullDocScanner.tsx

@@ -22,6 +22,68 @@ import type {
 
 const stripFileUri = (value: string) => value.replace(/^file:\/\//, '');
 
+const CROPPER_TIMEOUT_MS = 8000;
+const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
+
+const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
+
+const runAfterInteractions = () =>
+  new Promise<void>((resolve) => InteractionManager.runAfterInteractions(() => resolve()));
+
+// Allow native pickers to finish their dismissal animations before presenting the cropper.
+const waitForModalDismissal = async () => {
+  await delay(50);
+  await runAfterInteractions();
+  if (typeof requestAnimationFrame === 'function') {
+    await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+  }
+  await delay(180);
+  await runAfterInteractions();
+};
+
+// Guard the native cropper promise so we can recover if it never resolves.
+async function withTimeout<T>(factory: () => Promise<T>): Promise<T> {
+  let timeoutId: ReturnType<typeof setTimeout> | undefined;
+  let finished = false;
+
+  const promise = factory()
+    .then((value) => {
+      finished = true;
+      return value;
+    })
+    .catch((error) => {
+      finished = true;
+      throw error;
+    });
+
+  const timeoutPromise = new Promise<T>((_, reject) => {
+    timeoutId = setTimeout(() => {
+      if (!finished) {
+        const timeoutError = new Error(CROPPER_TIMEOUT_CODE);
+        (timeoutError as any).code = CROPPER_TIMEOUT_CODE;
+        reject(timeoutError);
+      }
+    }, CROPPER_TIMEOUT_MS);
+  });
+
+  try {
+    return await Promise.race([promise, timeoutPromise]);
+  } finally {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+    if (!finished) {
+      promise.catch(() => {
+        console.warn('[FullDocScanner] Cropper promise settled after timeout');
+      });
+    }
+  }
+}
+
+type OpenCropperOptions = {
+  waitForPickerDismissal?: boolean;
+};
+
 const normalizeCapturedDocument = (document: DocScannerCapture): CapturedDocument => {
   const { origin: _origin, ...rest } = document;
   const normalizedPath = stripFileUri(document.initialPath ?? document.path);
@@ -120,7 +182,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
   );
 
   const openCropper = useCallback(
-    async (imagePath: string) => {
+    async (imagePath: string, options?: OpenCropperOptions) => {
       try {
         console.log('[FullDocScanner] openCropper called with path:', imagePath);
         setProcessing(true);
@@ -133,17 +195,25 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         }
         console.log('[FullDocScanner] Clean path for cropper:', cleanPath);
 
-        const croppedImage = await ImageCropPicker.openCropper({
-          path: cleanPath,
-          mediaType: 'photo',
-          width: cropWidth,
-          height: cropHeight,
-          cropping: true,
-          cropperToolbarTitle: 'Crop Document',
-          freeStyleCropEnabled: true,
-          includeBase64: true,
-          compressImageQuality: 0.9,
-        });
+        const shouldWaitForPickerDismissal = options?.waitForPickerDismissal ?? true;
+
+        if (shouldWaitForPickerDismissal) {
+          await waitForModalDismissal();
+        }
+
+        const croppedImage = await withTimeout(() =>
+          ImageCropPicker.openCropper({
+            path: cleanPath,
+            mediaType: 'photo',
+            width: cropWidth,
+            height: cropHeight,
+            cropping: true,
+            cropperToolbarTitle: 'Crop Document',
+            freeStyleCropEnabled: true,
+            includeBase64: true,
+            compressImageQuality: 0.9,
+          }),
+        );
 
         console.log('[FullDocScanner] Cropper returned:', {
           path: croppedImage.path,
@@ -161,11 +231,21 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
         console.error('[FullDocScanner] openCropper error:', error);
         setProcessing(false);
 
+        const errorCode = (error as any)?.code;
         const errorMessage = (error as any)?.message || String(error);
 
-        if (errorMessage === 'User cancelled image selection' ||
-            errorMessage.includes('cancelled') ||
-            errorMessage.includes('cancel')) {
+        if (errorCode === CROPPER_TIMEOUT_CODE || errorMessage === CROPPER_TIMEOUT_CODE) {
+          console.error('[FullDocScanner] Cropper timed out waiting for presentation');
+          emitError(
+            error instanceof Error ? error : new Error('Cropper timed out'),
+            'Failed to open crop editor. Please try again.',
+          );
+        } else if (
+          errorCode === 'E_PICKER_CANCELLED' ||
+          errorMessage === 'User cancelled image selection' ||
+          errorMessage.includes('cancelled') ||
+          errorMessage.includes('cancel')
+        ) {
           console.log('[FullDocScanner] User cancelled cropper');
         } else {
           emitError(
@@ -204,7 +284,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
 
       if (captureMode === 'no-grid') {
         console.log('[FullDocScanner] No grid at capture button press: opening cropper for manual selection');
-        await openCropper(normalizedDoc.path);
+        await openCropper(normalizedDoc.path, { waitForPickerDismissal: false });
         return;
       }
 
@@ -217,7 +297,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       }
 
       console.log('[FullDocScanner] Fallback to manual crop (no croppedPath available)');
-      await openCropper(normalizedDoc.path);
+      await openCropper(normalizedDoc.path, { waitForPickerDismissal: false });
     },
     [openCropper],
   );
@@ -327,12 +407,6 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
       const imageUri = result.assets[0].uri;
       console.log('[FullDocScanner] Gallery image selected:', imageUri);
 
-      // Defer cropper presentation until picker dismissal finishes to avoid hierarchy errors
-      await new Promise<void>((resolve) =>
-        InteractionManager.runAfterInteractions(() => resolve()),
-      );
-      await new Promise((resolve) => setTimeout(resolve, 350));
-
       await openCropper(imageUri);
     } catch (error) {
       console.error('[FullDocScanner] Gallery pick error:', error);

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

@@ -35,14 +35,18 @@ RCT_EXPORT_VIEW_PROPERTY(brightness, float)
 RCT_EXPORT_VIEW_PROPERTY(contrast, float)
 
 // Main capture method - accept reactTag when available (falls back to cached view)
-RCT_EXPORT_METHOD(capture:(nullable id)reactTag
+RCT_EXPORT_METHOD(capture:(NSNumber * _Nullable)reactTag
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     NSLog(@"[RNPdfScannerManager] capture called with reactTag: %@", reactTag);
     dispatch_async(dispatch_get_main_queue(), ^{
         DocumentScannerView *targetView = nil;
 
-        if ([reactTag isKindOfClass:[NSNumber class]]) {
+        if ([reactTag isKindOfClass:[NSNull class]]) {
+            reactTag = nil;
+        }
+
+        if (reactTag) {
             NSNumber *resolvedTag = (NSNumber *)reactTag;
             UIView *view = [self.bridge.uiManager viewForReactTag:resolvedTag];
             if ([view isKindOfClass:[DocumentScannerView class]]) {
@@ -53,8 +57,6 @@ RCT_EXPORT_METHOD(capture:(nullable id)reactTag
             } else {
                 NSLog(@"[RNPdfScannerManager] No view found for tag %@", resolvedTag);
             }
-        } else if (reactTag) {
-            NSLog(@"[RNPdfScannerManager] Unexpected reactTag type %@ - ignoring reactTag", NSStringFromClass([reactTag class]));
         }
 
         if (!targetView && self->_scannerView) {