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

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

@@ -118,11 +118,11 @@ class CameraController(
         Log.d(TAG, "[CAMERAX] TextureView visibility: ${textureView.visibility}")
         Log.d(TAG, "[CAMERAX] TextureView isAvailable: ${textureView.isAvailable}")
 
-        val targetRotation = textureView.display?.rotation ?: android.view.Surface.ROTATION_0
-        Log.d(TAG, "[CAMERAX] Setting target rotation to $targetRotation")
+        // Force portrait orientation (app is portrait-only)
+        val targetRotation = android.view.Surface.ROTATION_0
+        Log.d(TAG, "[CAMERAX] Setting target rotation to ROTATION_0 (portrait-only app)")
 
         preview = Preview.Builder()
-            .setTargetAspectRatio(AspectRatio.RATIO_4_3)
             .setTargetRotation(targetRotation)  // Force portrait
             .build()
             .also { previewUseCase ->
@@ -185,7 +185,7 @@ class CameraController(
         // ImageAnalysis UseCase for document detection
         imageAnalyzer = ImageAnalysis.Builder()
             .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
-            .setTargetAspectRatio(AspectRatio.RATIO_4_3)
+            .setTargetResolution(android.util.Size(1920, 1440))  // Higher resolution for better small-edge detection
             .setTargetRotation(targetRotation)  // Match preview rotation
             .build()
             .also {
@@ -201,7 +201,6 @@ class CameraController(
         // ImageCapture UseCase
         imageCapture = ImageCapture.Builder()
             .setCaptureMode(ImageCapture.CAPTURE_MODE_MAXIMIZE_QUALITY)
-            .setTargetAspectRatio(AspectRatio.RATIO_4_3)
             .setTargetRotation(targetRotation)  // Match preview rotation
             .build()
 
@@ -474,14 +473,35 @@ class CameraController(
 
         if (viewWidth <= 0 || viewHeight <= 0) return null
 
-        // Image coordinates are already in display orientation (rotation applied before detection).
-        val finalWidth = imageWidth
-        val finalHeight = imageHeight
+        // The image coordinates are in camera sensor space. We need to transform them
+        // to match how the TextureView displays the image (after rotation/scaling).
+        val sensorOrientation = getCameraSensorOrientation()
+        val displayRotationDegrees = when (textureView.display?.rotation ?: Surface.ROTATION_0) {
+            Surface.ROTATION_0 -> 0
+            Surface.ROTATION_90 -> 90
+            Surface.ROTATION_180 -> 180
+            Surface.ROTATION_270 -> 270
+            else -> 0
+        }
 
-        // Apply the same center-crop scaling as the TextureView transform.
+        fun rotatePoint(point: org.opencv.core.Point): org.opencv.core.Point {
+            return if (sensorOrientation == 90) {
+                org.opencv.core.Point(
+                    point.y,
+                    imageWidth - point.x
+                )
+            } else {
+                point
+            }
+        }
+
+        val finalWidth = if (sensorOrientation == 90) imageHeight else imageWidth
+        val finalHeight = if (sensorOrientation == 90) imageWidth else imageHeight
+
+        // Then apply fit-center scaling
         val scaleX = viewWidth / finalWidth.toFloat()
         val scaleY = viewHeight / finalHeight.toFloat()
-        val scale = scaleX.coerceAtLeast(scaleY)
+        val scale = scaleX.coerceAtMost(scaleY)
 
         val scaledWidth = finalWidth * scale
         val scaledHeight = finalHeight * scale
@@ -489,9 +509,10 @@ class CameraController(
         val offsetY = (viewHeight - scaledHeight) / 2f
 
         fun transformPoint(point: org.opencv.core.Point): org.opencv.core.Point {
+            val rotated = rotatePoint(point)
             return org.opencv.core.Point(
-                point.x * scale + offsetX,
-                point.y * scale + offsetY
+                rotated.x * scale + offsetX,
+                rotated.y * scale + offsetY
             )
         }
 
@@ -502,9 +523,10 @@ class CameraController(
             transformPoint(rectangle.bottomRight)
         )
 
-        Log.d(TAG, "[MAPPING] Image: ${imageWidth}x${imageHeight} → View: ${viewWidth.toInt()}x${viewHeight.toInt()}")
-        Log.d(TAG, "[MAPPING] Scale: $scale, Offset: ($offsetX, $offsetY)")
+        Log.d(TAG, "[MAPPING] Sensor: ${sensorOrientation}°, Image: ${imageWidth}x${imageHeight} → Final: ${finalWidth}x${finalHeight}")
+        Log.d(TAG, "[MAPPING] View: ${viewWidth.toInt()}x${viewHeight.toInt()}, Scale: $scale, Offset: ($offsetX, $offsetY)")
         Log.d(TAG, "[MAPPING] TL: (${rectangle.topLeft.x}, ${rectangle.topLeft.y}) → " +
+            "Rotated: (${rotatePoint(rectangle.topLeft).x}, ${rotatePoint(rectangle.topLeft).y}) → " +
             "Final: (${result.topLeft.x}, ${result.topLeft.y})")
 
         return result
@@ -545,43 +567,48 @@ class CameraController(
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
 
-        // For sensor=0 (tablet landscape), we need to manually rotate the buffer
-        // CameraX only handles rotation automatically for sensor=90 (phone portrait)
-        // Important: For sensor=0, we need to rotate in the OPPOSITE direction
-        // When display is 90° (portrait), we need to rotate -90° (270°) to compensate
-        if (sensorOrientation == 0 && displayRotationDegrees != 0) {
-            val rotationDegrees = when (displayRotationDegrees) {
-                90 -> -90f  // Display 90° → Rotate -90° (counter-clockwise)
-                180 -> -180f
-                270 -> -270f  // Or +90f
-                else -> 0f
-            }
+        // Calculate rotation from buffer to display coordinates.
+        // CameraX accounts for sensor orientation via targetRotation. Some tablets with landscape
+        // sensors report Display 90 in portrait but render upside down; add a 180° fix for that case.
+        val tabletUpsideDownFix = if (sensorOrientation == 0 && displayRotationDegrees == 90) 180 else 0
+        val rotationDegrees = ((displayRotationDegrees + tabletUpsideDownFix) % 360).toFloat()
+
+        if (rotationDegrees != 0f) {
             matrix.postRotate(rotationDegrees, centerX, centerY)
         }
 
-        // Calculate rotated buffer dimensions
-        val rotatedBufferWidth = if (sensorOrientation == 0 && (displayRotationDegrees == 90 || displayRotationDegrees == 270)) {
+        // After rotation, determine effective buffer size
+        val rotatedBufferWidth = if (rotationDegrees == 90f || rotationDegrees == 270f) {
             bufferHeight
         } else {
             bufferWidth
         }
-        val rotatedBufferHeight = if (sensorOrientation == 0 && (displayRotationDegrees == 90 || displayRotationDegrees == 270)) {
+        val rotatedBufferHeight = if (rotationDegrees == 90f || rotationDegrees == 270f) {
             bufferWidth
         } else {
             bufferHeight
         }
 
-        // Scale to fill the view while maintaining aspect ratio (center-crop).
+        // Scale to fit within the view while maintaining aspect ratio (no zoom/crop)
         val scaleX = viewWidth.toFloat() / rotatedBufferWidth.toFloat()
         val scaleY = viewHeight.toFloat() / rotatedBufferHeight.toFloat()
-        val scale = scaleX.coerceAtLeast(scaleY)
+        val scale = scaleX.coerceAtMost(scaleY)  // Use min to fit
 
         Log.d(TAG, "[TRANSFORM] Rotated buffer: ${rotatedBufferWidth}x${rotatedBufferHeight}, ScaleX: $scaleX, ScaleY: $scaleY, Using: $scale")
 
         matrix.postScale(scale, scale, centerX, centerY)
 
-        // With center-crop, the preview fills the view bounds.
-        previewViewport = android.graphics.RectF(0f, 0f, viewWidth.toFloat(), viewHeight.toFloat())
+        // Track the actual preview viewport within the view for clipping overlays.
+        val scaledWidth = rotatedBufferWidth * scale
+        val scaledHeight = rotatedBufferHeight * scale
+        val offsetX = (viewWidth - scaledWidth) / 2f
+        val offsetY = (viewHeight - scaledHeight) / 2f
+        previewViewport = android.graphics.RectF(
+            offsetX,
+            offsetY,
+            offsetX + scaledWidth,
+            offsetY + scaledHeight
+        )
 
         textureView.setTransform(matrix)
         Log.d(TAG, "[TRANSFORM] Transform applied successfully")

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

@@ -746,7 +746,7 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
         if (viewWidth == 0 || viewHeight == 0 || imageWidth == 0 || imageHeight == 0) {
             return rectangle
         }
-        val scale = max(
+        val scale = min(
             viewWidth.toDouble() / imageWidth.toDouble(),
             viewHeight.toDouble() / imageHeight.toDouble()
         )

package/android/src/common/kotlin/com/reactnativerectangledocscanner/DocumentDetector.kt

@@ -498,10 +498,17 @@ class DocumentDetector {
             val rectArea = rectWidth * rectHeight
 
             // Check if rectangle is too small (less than 15% of view area)
+            // or too large (more than 85% - likely detecting screen instead of document)
             val areaRatio = rectArea / viewArea
             if (areaRatio < 0.15) {
                 if (BuildConfig.DEBUG) {
-                    Log.d(TAG, "[QUALITY] TOO_FAR: area=${String.format("%.1f", rectArea)}, ratio=${String.format("%.2f", areaRatio)}")
+                    Log.d(TAG, "[QUALITY] TOO_FAR (small): area=${String.format("%.1f", rectArea)}, ratio=${String.format("%.2f", areaRatio)}")
+                }
+                return RectangleQuality.TOO_FAR
+            }
+            if (areaRatio > 0.85) {
+                if (BuildConfig.DEBUG) {
+                    Log.d(TAG, "[QUALITY] TOO_FAR (large): area=${String.format("%.1f", rectArea)}, ratio=${String.format("%.2f", areaRatio)} - likely detecting screen")
                 }
                 return RectangleQuality.TOO_FAR
             }
@@ -582,7 +589,7 @@ class DocumentDetector {
                 return rectangle
             }
 
-            val scale = max(
+            val scale = min(
                 viewWidth.toDouble() / imageWidth.toDouble(),
                 viewHeight.toDouble() / imageHeight.toDouble()
             )
@@ -595,7 +602,10 @@ class DocumentDetector {
             fun mapPoint(point: Point): Point {
                 val x = (point.x * scale) + offsetX
                 val y = (point.y * scale) + offsetY
-                return Point(x, y)
+                return Point(
+                    x.coerceIn(0.0, viewWidth.toDouble()),
+                    y.coerceIn(0.0, viewHeight.toDouble())
+                )
             }
 
             return Rectangle(

package/dist/DocScanner.js

@@ -121,14 +121,24 @@ const mirrorRectangleHorizontally = (rectangle, imageWidth) => ({
 const mapRectangleToView = (rectangle, imageWidth, imageHeight, viewWidth, viewHeight, density) => {
     const viewWidthPx = viewWidth * density;
     const viewHeightPx = viewHeight * density;
-    const scale = Math.max(viewWidthPx / imageWidth, viewHeightPx / imageHeight);
+    const scale = react_native_1.Platform.OS === 'ios'
+        ? Math.max(viewWidthPx / imageWidth, viewHeightPx / imageHeight)
+        : Math.min(viewWidthPx / imageWidth, viewHeightPx / imageHeight);
     const scaledImageWidth = imageWidth * scale;
     const scaledImageHeight = imageHeight * scale;
-    const offsetX = (scaledImageWidth - viewWidthPx) / 2;
-    const offsetY = (scaledImageHeight - viewHeightPx) / 2;
+    const offsetX = react_native_1.Platform.OS === 'ios'
+        ? (scaledImageWidth - viewWidthPx) / 2
+        : (viewWidthPx - scaledImageWidth) / 2;
+    const offsetY = react_native_1.Platform.OS === 'ios'
+        ? (scaledImageHeight - viewHeightPx) / 2
+        : (viewHeightPx - scaledImageHeight) / 2;
     const mapPoint = (point) => ({
-        x: (point.x * scale - offsetX) / density,
-        y: (point.y * scale - offsetY) / density,
+        x: react_native_1.Platform.OS === 'ios'
+            ? (point.x * scale - offsetX) / density
+            : (point.x * scale + offsetX) / density,
+        y: react_native_1.Platform.OS === 'ios'
+            ? (point.y * scale - offsetY) / density
+            : (point.y * scale + offsetY) / density,
     });
     return {
         topLeft: mapPoint(rectangle.topLeft),

package/package.json

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

package/src/DocScanner.tsx

@@ -188,15 +188,30 @@ const mapRectangleToView = (
 ): Rectangle => {
   const viewWidthPx = viewWidth * density;
   const viewHeightPx = viewHeight * density;
-  const scale = Math.max(viewWidthPx / imageWidth, viewHeightPx / imageHeight);
+  const scale =
+    Platform.OS === 'ios'
+      ? Math.max(viewWidthPx / imageWidth, viewHeightPx / imageHeight)
+      : Math.min(viewWidthPx / imageWidth, viewHeightPx / imageHeight);
   const scaledImageWidth = imageWidth * scale;
   const scaledImageHeight = imageHeight * scale;
-  const offsetX = (scaledImageWidth - viewWidthPx) / 2;
-  const offsetY = (scaledImageHeight - viewHeightPx) / 2;
+  const offsetX =
+    Platform.OS === 'ios'
+      ? (scaledImageWidth - viewWidthPx) / 2
+      : (viewWidthPx - scaledImageWidth) / 2;
+  const offsetY =
+    Platform.OS === 'ios'
+      ? (scaledImageHeight - viewHeightPx) / 2
+      : (viewHeightPx - scaledImageHeight) / 2;
 
   const mapPoint = (point: Point): Point => ({
-    x: (point.x * scale - offsetX) / density,
-    y: (point.y * scale - offsetY) / density,
+    x:
+      Platform.OS === 'ios'
+        ? (point.x * scale - offsetX) / density
+        : (point.x * scale + offsetX) / density,
+    y:
+      Platform.OS === 'ios'
+        ? (point.y * scale - offsetY) / density
+        : (point.y * scale + offsetY) / density,
   });
 
   return {