react-native-rectangle-doc-scanner 3.198.0 → 3.200.0

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

@@ -244,8 +244,16 @@ class CameraController(
         val previewChoices = streamConfig?.getOutputSizes(SurfaceTexture::class.java) ?: emptyArray()
         val analysisChoices = streamConfig?.getOutputSizes(ImageFormat.YUV_420_888) ?: emptyArray()
 
-        previewSize = chooseSize(previewChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT)
-        analysisSize = chooseSize(analysisChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT)
+        val viewWidth = if (previewView.width > 0) previewView.width else context.resources.displayMetrics.widthPixels
+        val viewHeight = if (previewView.height > 0) previewView.height else context.resources.displayMetrics.heightPixels
+        val targetRatio = if (viewWidth > 0 && viewHeight > 0) {
+            viewWidth.toFloat() / viewHeight.toFloat()
+        } else {
+            null
+        }
+
+        previewSize = chooseSize(previewChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
+        analysisSize = chooseSize(analysisChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
         Log.d(TAG, "[CAMERA2] Selected sizes - preview: $previewSize, analysis: $analysisSize")
     }
 
@@ -358,25 +366,32 @@ class CameraController(
         }
 
         val rotationDegrees = getRotationDegrees()
-        val matrix = Matrix()
-        val viewRect = RectF(0f, 0f, viewWidth.toFloat(), viewHeight.toFloat())
-        val bufferRect = if (rotationDegrees == 90 || rotationDegrees == 270) {
-            RectF(0f, 0f, previewSize.height.toFloat(), previewSize.width.toFloat())
+        val bufferWidth = previewSize.width.toFloat()
+        val bufferHeight = previewSize.height.toFloat()
+        val rotatedBufferWidth = if (rotationDegrees == 90 || rotationDegrees == 270) {
+            bufferHeight
         } else {
-            RectF(0f, 0f, previewSize.width.toFloat(), previewSize.height.toFloat())
+            bufferWidth
+        }
+        val rotatedBufferHeight = if (rotationDegrees == 90 || rotationDegrees == 270) {
+            bufferWidth
+        } else {
+            bufferHeight
         }
-        val centerX = viewRect.centerX()
-        val centerY = viewRect.centerY()
 
-        bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
-        // Fill the view while preserving aspect ratio (center-crop).
-        matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.FILL)
+        val scale = kotlin.math.min(
+            viewWidth.toFloat() / rotatedBufferWidth,
+            viewHeight.toFloat() / rotatedBufferHeight
+        )
 
-        when (rotationDegrees) {
-            90 -> matrix.postRotate(90f, centerX, centerY)
-            180 -> matrix.postRotate(180f, centerX, centerY)
-            270 -> matrix.postRotate(270f, centerX, centerY)
+        val matrix = Matrix()
+        // Center buffer at origin, rotate, scale to fit, then move to view center.
+        matrix.postTranslate(-bufferWidth / 2f, -bufferHeight / 2f)
+        if (rotationDegrees != 0) {
+            matrix.postRotate(rotationDegrees.toFloat())
         }
+        matrix.postScale(scale, scale)
+        matrix.postTranslate(viewWidth / 2f, viewHeight / 2f)
 
         previewView.setTransform(matrix)
     }
@@ -495,13 +510,33 @@ class CameraController(
         }
     }
 
-    private fun chooseSize(choices: Array<Size>, maxWidth: Int, maxHeight: Int): Size? {
+    private fun chooseSize(
+        choices: Array<Size>,
+        maxWidth: Int,
+        maxHeight: Int,
+        targetRatio: Float?
+    ): Size? {
         if (choices.isEmpty()) {
             return null
         }
-        val filtered = choices.filter { it.width <= maxWidth && it.height <= maxHeight }
-        val candidates = if (filtered.isNotEmpty()) filtered else choices.toList()
-        return candidates.sortedBy { it.width * it.height }.last()
+        val maxCandidates = choices.filter { it.width <= maxWidth && it.height <= maxHeight }
+        val candidates = if (maxCandidates.isNotEmpty()) maxCandidates else choices.toList()
+
+        val ratioFiltered = if (targetRatio != null) {
+            candidates.filter { size ->
+                val ratio = if (targetRatio < 1f) {
+                    size.height.toFloat() / size.width.toFloat()
+                } else {
+                    size.width.toFloat() / size.height.toFloat()
+                }
+                kotlin.math.abs(ratio - targetRatio) <= 0.05f
+            }
+        } else {
+            emptyList()
+        }
+
+        val pickFrom = if (ratioFiltered.isNotEmpty()) ratioFiltered else candidates
+        return pickFrom.sortedBy { it.width * it.height }.last()
     }
 
     private fun startBackgroundThread() {

package/package.json

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