react-native-rectangle-doc-scanner 3.203.0 → 3.205.0

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

@@ -65,8 +65,8 @@ class CameraController(
 
     companion object {
         private const val TAG = "CameraController"
-        private const val MAX_PREVIEW_WIDTH = 2560
-        private const val MAX_PREVIEW_HEIGHT = 1440
+        private const val MAX_ANALYSIS_WIDTH = 1280
+        private const val MAX_ANALYSIS_HEIGHT = 720
     }
 
     private data class LastFrame(
@@ -267,8 +267,8 @@ class CameraController(
             null
         }
 
-        previewSize = chooseSize(previewChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
-        analysisSize = chooseSize(analysisChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
+        previewSize = choosePreviewSize(previewChoices, targetRatio)
+        analysisSize = chooseAnalysisSize(analysisChoices, targetRatio)
         Log.d(TAG, "[CAMERA2] Selected sizes - preview: $previewSize, analysis: $analysisSize")
     }
 
@@ -386,8 +386,8 @@ class CameraController(
             null
         }
 
-        val newPreview = chooseSize(previewChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
-        val newAnalysis = chooseSize(analysisChoices, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, targetRatio)
+        val newPreview = choosePreviewSize(previewChoices, targetRatio)
+        val newAnalysis = chooseAnalysisSize(analysisChoices, targetRatio)
 
         if (newPreview != null && newPreview != previewSize) {
             previewSize = newPreview
@@ -401,7 +401,7 @@ class CameraController(
 
     private fun updatePreviewTransform() {
         val previewSize = previewSize ?: return
-        adjustPreviewLayout(previewSize)
+        ensureMatchParent()
 
         val viewWidth = previewView.width
         val viewHeight = previewView.height
@@ -423,7 +423,8 @@ class CameraController(
             bufferHeight
         }
 
-        val scale = kotlin.math.min(
+        // Fill the view like the default camera preview (center-crop).
+        val scale = kotlin.math.max(
             viewWidth.toFloat() / rotatedBufferWidth,
             viewHeight.toFloat() / rotatedBufferHeight
         )
@@ -440,7 +441,7 @@ class CameraController(
         previewView.setTransform(matrix)
     }
 
-    private fun adjustPreviewLayout(previewSize: Size) {
+    private fun ensureMatchParent() {
         val parentView = previewView.parent as? android.view.View ?: return
         val parentWidth = parentView.width
         val parentHeight = parentView.height
@@ -448,32 +449,16 @@ class CameraController(
             return
         }
 
-        val rotationDegrees = getRotationDegrees()
-        val bufferWidth = previewSize.width.toFloat()
-        val bufferHeight = previewSize.height.toFloat()
-        val bufferAspect = if (rotationDegrees == 90 || rotationDegrees == 270) {
-            bufferHeight / bufferWidth
-        } else {
-            bufferWidth / bufferHeight
-        }
-
-        val parentAspect = parentWidth.toFloat() / parentHeight.toFloat()
-        val targetWidth: Int
-        val targetHeight: Int
-
-        if (parentAspect > bufferAspect) {
-            targetHeight = parentHeight
-            targetWidth = (parentHeight * bufferAspect).toInt()
-        } else {
-            targetWidth = parentWidth
-            targetHeight = (parentWidth / bufferAspect).toInt()
-        }
-
         val layoutParams = (previewView.layoutParams as? android.widget.FrameLayout.LayoutParams)
-            ?: android.widget.FrameLayout.LayoutParams(targetWidth, targetHeight)
-        if (layoutParams.width != targetWidth || layoutParams.height != targetHeight) {
-            layoutParams.width = targetWidth
-            layoutParams.height = targetHeight
+            ?: android.widget.FrameLayout.LayoutParams(
+                android.widget.FrameLayout.LayoutParams.MATCH_PARENT,
+                android.widget.FrameLayout.LayoutParams.MATCH_PARENT
+            )
+        if (layoutParams.width != android.widget.FrameLayout.LayoutParams.MATCH_PARENT ||
+            layoutParams.height != android.widget.FrameLayout.LayoutParams.MATCH_PARENT
+        ) {
+            layoutParams.width = android.widget.FrameLayout.LayoutParams.MATCH_PARENT
+            layoutParams.height = android.widget.FrameLayout.LayoutParams.MATCH_PARENT
             layoutParams.gravity = Gravity.CENTER
             previewView.layoutParams = layoutParams
         }
@@ -593,20 +578,48 @@ class CameraController(
         }
     }
 
-    private fun chooseSize(
+    private fun choosePreviewSize(
+        choices: Array<Size>,
+        targetRatio: Float?
+    ): Size? {
+        if (choices.isEmpty()) {
+            return null
+        }
+        val candidates = choices.toList()
+
+        if (targetRatio == null) {
+            return candidates.maxByOrNull { it.width * it.height }
+        }
+
+        val normalizedTarget = targetRatio
+        val sorted = candidates.sortedWith(
+            compareBy<Size> { size ->
+                val ratio = if (normalizedTarget < 1f) {
+                    size.height.toFloat() / size.width.toFloat()
+                } else {
+                    size.width.toFloat() / size.height.toFloat()
+                }
+                kotlin.math.abs(ratio - normalizedTarget)
+            }.thenByDescending { size ->
+                size.width * size.height
+            }
+        )
+        return sorted.first()
+    }
+
+    private fun chooseAnalysisSize(
         choices: Array<Size>,
-        maxWidth: Int,
-        maxHeight: Int,
         targetRatio: Float?
     ): Size? {
         if (choices.isEmpty()) {
             return null
         }
-        val maxCandidates = choices.filter { it.width <= maxWidth && it.height <= maxHeight }
-        val candidates = if (maxCandidates.isNotEmpty()) maxCandidates else choices.toList()
+
+        val capped = choices.filter { it.width <= MAX_ANALYSIS_WIDTH && it.height <= MAX_ANALYSIS_HEIGHT }
+        val candidates = if (capped.isNotEmpty()) capped else choices.toList()
 
         if (targetRatio == null) {
-            return candidates.sortedBy { it.width * it.height }.last()
+            return candidates.maxByOrNull { it.width * it.height }
         }
 
         val normalizedTarget = targetRatio

package/package.json

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