react-native-rectangle-doc-scanner 11.1.0 → 11.2.0

package/android/src/camera2/kotlin/com/reactnativerectangledocscanner/CameraController.kt

@@ -387,18 +387,30 @@ class CameraController(
         mlBox: android.graphics.Rect?
     ): Rectangle? {
         return try {
-            if (mlBox != null) {
-                val frameWidth = if (rotation == 90 || rotation == 270) height else width
-                val frameHeight = if (rotation == 90 || rotation == 270) width else height
-                val padX = (mlBox.width() * 0.25f).toInt().coerceAtLeast(32)
-                val padY = (mlBox.height() * 0.25f).toInt().coerceAtLeast(32)
-                val roi = android.graphics.Rect(
-                    (mlBox.left - padX).coerceAtLeast(0),
-                    (mlBox.top - padY).coerceAtLeast(0),
-                    (mlBox.right + padX).coerceAtMost(frameWidth),
-                    (mlBox.bottom + padY).coerceAtMost(frameHeight)
-                )
-                DocumentDetector.detectRectangleInYUVWithRoi(nv21, width, height, rotation, roi)
+            val frameWidth = if (rotation == 90 || rotation == 270) height else width
+            val frameHeight = if (rotation == 90 || rotation == 270) width else height
+            val frameArea = frameWidth.toLong() * frameHeight.toLong()
+            val roiRect = mlBox?.let { box ->
+                val boxArea = box.width().toLong() * box.height().toLong()
+                val aspect = if (box.height() > 0) box.width().toDouble() / box.height().toDouble() else 0.0
+                val isValidSize = boxArea >= (frameArea * 0.08)
+                val isValidAspect = aspect in 0.4..2.5
+                if (!isValidSize || !isValidAspect) {
+                    null
+                } else {
+                    val padX = (box.width() * 0.25f).toInt().coerceAtLeast(32)
+                    val padY = (box.height() * 0.25f).toInt().coerceAtLeast(32)
+                    android.graphics.Rect(
+                        (box.left - padX).coerceAtLeast(0),
+                        (box.top - padY).coerceAtLeast(0),
+                        (box.right + padX).coerceAtMost(frameWidth),
+                        (box.bottom + padY).coerceAtMost(frameHeight)
+                    )
+                }
+            }
+
+            if (roiRect != null) {
+                DocumentDetector.detectRectangleInYUVWithRoi(nv21, width, height, rotation, roiRect)
                     ?: DocumentDetector.detectRectangleInYUV(nv21, width, height, rotation)
             } else {
                 DocumentDetector.detectRectangleInYUV(nv21, width, height, rotation)

package/dist/DocScanner.js

@@ -428,7 +428,7 @@ const VisionCameraScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor =
     const overlayIsActive = autoCapture ? isAutoCapturing : (detectedRectangle?.stableCounter ?? 0) > 0;
     return (react_1.default.createElement(react_native_1.View, { style: styles.container, onLayout: handleLayout },
         CameraComponent && device && hasPermission ? (react_1.default.createElement(CameraComponent, { ref: cameraRef, style: styles.scanner, device: device, isActive: true, photo: true, torch: enableTorch ? 'on' : 'off', frameProcessor: frameProcessor, frameProcessorFps: 10 })) : (react_1.default.createElement(react_native_1.View, { style: styles.scanner })),
-        showGrid && overlayPolygon && (react_1.default.createElement(overlay_1.ScannerOverlay, { active: overlayIsActive, color: gridColor ?? overlayColor, lineWidth: gridLineWidth, polygon: overlayPolygon, clipRect: detectedRectangle?.previewViewport ?? null })),
+        showGrid && overlayPolygon && (react_1.default.createElement(overlay_1.ScannerOverlay, { active: overlayIsActive, color: gridColor ?? overlayColor, lineWidth: gridLineWidth, polygon: overlayPolygon, clipRect: react_native_1.Platform.OS === 'android' ? null : (detectedRectangle?.previewViewport ?? null) })),
         showManualCaptureButton && (react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.button, onPress: () => captureVision('manual') })),
         children));
 });
@@ -640,6 +640,7 @@ const NativeScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAU
         let rectangleOnScreen = normalizeRectangle(event.rectangleOnScreen ?? null);
         const density = react_native_1.PixelRatio.get();
         if (react_native_1.Platform.OS === 'android' &&
+            !rectangleOnScreen &&
             rectangleCoordinates &&
             event.imageSize &&
             event.previewSize &&
@@ -715,7 +716,7 @@ const NativeScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAU
     const detectionThreshold = autoCapture ? minStableFrames : 99999;
     return (react_1.default.createElement(react_native_1.View, { style: styles.container },
         react_1.default.createElement(react_native_document_scanner_1.default, { ref: scannerRef, style: styles.scanner, detectionCountBeforeCapture: detectionThreshold, overlayColor: overlayColor, enableTorch: enableTorch, quality: normalizedQuality, useBase64: useBase64, manualOnly: false, detectionConfig: detectionConfig, onPictureTaken: handlePictureTaken, onError: handleError, onRectangleDetect: handleRectangleDetect }),
-        showGrid && overlayPolygon && (react_1.default.createElement(overlay_1.ScannerOverlay, { active: overlayIsActive, color: gridColor ?? overlayColor, lineWidth: gridLineWidth, polygon: overlayPolygon, clipRect: detectedRectangle?.previewViewport ?? null })),
+        showGrid && overlayPolygon && (react_1.default.createElement(overlay_1.ScannerOverlay, { active: overlayIsActive, color: gridColor ?? overlayColor, lineWidth: gridLineWidth, polygon: overlayPolygon, clipRect: react_native_1.Platform.OS === 'android' ? null : (detectedRectangle?.previewViewport ?? null) })),
         showManualCaptureButton && (react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.button, onPress: handleManualCapture })),
         children));
 });

package/package.json

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

package/src/DocScanner.tsx

@@ -616,7 +616,7 @@ const VisionCameraScanner = forwardRef<DocScannerHandle, Props>(
             color={gridColor ?? overlayColor}
             lineWidth={gridLineWidth}
             polygon={overlayPolygon}
-            clipRect={detectedRectangle?.previewViewport ?? null}
+            clipRect={Platform.OS === 'android' ? null : (detectedRectangle?.previewViewport ?? null)}
           />
         )}
         {showManualCaptureButton && (
@@ -896,6 +896,7 @@ const NativeScanner = forwardRef<DocScannerHandle, Props>(
 
         if (
           Platform.OS === 'android' &&
+          !rectangleOnScreen &&
           rectangleCoordinates &&
           event.imageSize &&
           event.previewSize &&
@@ -1017,7 +1018,7 @@ const NativeScanner = forwardRef<DocScannerHandle, Props>(
             color={gridColor ?? overlayColor}
             lineWidth={gridLineWidth}
             polygon={overlayPolygon}
-            clipRect={detectedRectangle?.previewViewport ?? null}
+            clipRect={Platform.OS === 'android' ? null : (detectedRectangle?.previewViewport ?? null)}
           />
         )}
         {showManualCaptureButton && (