react-native-rectangle-doc-scanner 7.22.0 → 7.24.0

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

@@ -246,8 +246,10 @@ class CameraController(
             val previewSizes = streamConfigMap.getOutputSizes(SurfaceTexture::class.java)
             Log.d(TAG, "[CAMERA2] Available preview sizes: ${previewSizes?.take(10)?.joinToString { "${it.width}x${it.height}" }}")
 
-            // Prefer a preview size that matches the view aspect to avoid letterboxing.
-            previewSize = chooseBestSize(previewSizes, viewAspect, null, preferClosestAspect = true)
+            // Match iOS photo preset behavior (4:3) when available for consistent FOV.
+            val targetPreviewAspect = 4.0 / 3.0
+            previewSize = chooseBestSize(previewSizes, targetPreviewAspect, null, preferClosestAspect = true)
+                ?: chooseBestSize(previewSizes, viewAspect, null, preferClosestAspect = true)
                 ?: previewSizes?.maxByOrNull { it.width * it.height }
             Log.d(TAG, "[CAMERA2] Selected preview size: ${previewSize?.width}x${previewSize?.height}")
 
@@ -562,32 +564,27 @@ class CameraController(
         )
 
         val matrix = Matrix()
+        val isSwapped = rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270
+        val bufferWidth = if (isSwapped) preview.height.toFloat() else preview.width.toFloat()
+        val bufferHeight = if (isSwapped) preview.width.toFloat() else preview.height.toFloat()
         val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
-        val bufferRect = if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-            RectF(0f, 0f, preview.height.toFloat(), preview.width.toFloat())
-        } else {
-            RectF(0f, 0f, preview.width.toFloat(), preview.height.toFloat())
-        }
+        val bufferRect = RectF(0f, 0f, bufferWidth, bufferHeight)
         val centerX = viewRect.centerX()
         val centerY = viewRect.centerY()
 
-        if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-            bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
-            matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL)
-            val scale = max(
-                viewHeight / preview.height.toFloat(),
-                viewWidth / preview.width.toFloat()
-            )
-            matrix.postScale(scale, scale, centerX, centerY)
-            matrix.postRotate(90f * (rotation - 2), centerX, centerY)
-        } else if (rotation == Surface.ROTATION_180) {
-            matrix.postRotate(180f, centerX, centerY)
-        } else {
-            val scale = max(viewWidth / preview.width.toFloat(), viewHeight / preview.height.toFloat())
-            val scaledWidth = preview.width.toFloat() * scale
-            val scaledHeight = preview.height.toFloat() * scale
-            matrix.setScale(scale, scale)
-            matrix.postTranslate((viewWidth - scaledWidth) / 2f, (viewHeight - scaledHeight) / 2f)
+        // Preserve aspect ratio, then scale to fill (center-crop) without distortion.
+        matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
+        val scale = max(viewWidth / bufferWidth, viewHeight / bufferHeight)
+        matrix.postScale(scale, scale, centerX, centerY)
+
+        if (rotation != Surface.ROTATION_0) {
+            val rotateDegrees = when (rotation) {
+                Surface.ROTATION_90 -> -90f
+                Surface.ROTATION_180 -> 180f
+                Surface.ROTATION_270 -> 90f
+                else -> 0f
+            }
+            matrix.postRotate(rotateDegrees, centerX, centerY)
         }
 
         previewView.setTransform(matrix)

package/package.json

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