react-native-rectangle-doc-scanner 4.9.0 → 4.11.0

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

@@ -209,14 +209,35 @@ class CameraController(
                 ?: return
             sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION) ?: 0
 
-            val viewAspect = if (previewView.height == 0) {
-                1.0
+            // Calculate view aspect ratio considering sensor orientation
+            // For portrait mode with 90/270 degree sensor, we need to swap width/height
+            val displayRotation = displayRotationDegrees()
+            val totalRotation = if (useFrontCamera) {
+                (sensorOrientation + displayRotation) % 360
             } else {
-                previewView.width.toDouble() / previewView.height.toDouble()
+                (sensorOrientation - displayRotation + 360) % 360
             }
 
+            val viewWidth = previewView.width.takeIf { it > 0 } ?: 1200
+            val viewHeight = previewView.height.takeIf { it > 0 } ?: 1928
+
+            // If total rotation is 90 or 270, the sensor output is rotated, so we need to match against swapped aspect
+            val viewAspect = if (totalRotation == 90 || totalRotation == 270) {
+                // Sensor outputs landscape (e.g., 1920x1080), but we display portrait
+                // So we want to find sensor size with aspect ~= viewHeight/viewWidth
+                viewHeight.toDouble() / viewWidth.toDouble()
+            } else {
+                viewWidth.toDouble() / viewHeight.toDouble()
+            }
+
+            Log.d(TAG, "[CAMERA2] sensorOrientation=$sensorOrientation displayRotation=$displayRotation totalRotation=$totalRotation")
+            Log.d(TAG, "[CAMERA2] viewAspect=$viewAspect (view: ${viewWidth}x${viewHeight})")
+
             val previewSizes = streamConfigMap.getOutputSizes(SurfaceTexture::class.java)
+            Log.d(TAG, "[CAMERA2] Available preview sizes: ${previewSizes?.take(10)?.joinToString { "${it.width}x${it.height}" }}")
+
             previewSize = chooseBestSize(previewSizes, viewAspect, null, preferClosestAspect = true)
+            Log.d(TAG, "[CAMERA2] Selected preview size: ${previewSize?.width}x${previewSize?.height}")
 
             val previewAspect = previewSize?.let { it.width.toDouble() / it.height.toDouble() } ?: viewAspect
             val analysisSizes = streamConfigMap.getOutputSizes(ImageFormat.YUV_420_888)
@@ -569,12 +590,16 @@ class CameraController(
         }
 
         if (preferClosestAspect) {
-            val maxAreaOverall = capped.maxOf { it.width * it.height }
-            val minAcceptableArea = max(640 * 480, (maxAreaOverall * 0.1).toInt())
-            val sized = capped.filter { it.width * it.height >= minAcceptableArea }
-            val pool = if (sized.isNotEmpty()) sized else capped
+            // Prefer high-resolution sizes: minimum 1080p (1920x1080 or 1080x1920)
+            val minAcceptableArea = 1920 * 1080
+            val highResSizes = capped.filter { it.width * it.height >= minAcceptableArea }
+            val pool = if (highResSizes.isNotEmpty()) highResSizes else capped
+
             val bestDiff = pool.minOf { aspectDiff(it) }
-            val close = pool.filter { aspectDiff(it) <= bestDiff + 0.05 }
+            // Allow slightly more tolerance for aspect ratio (0.15 instead of 0.05) to find better matches
+            val close = pool.filter { aspectDiff(it) <= bestDiff + 0.15 }
+
+            // Return the highest resolution among good aspect ratio matches
             return close.maxByOrNull { it.width * it.height } ?: pool.maxByOrNull { it.width * it.height }
         }
 

package/package.json

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