react-native-rectangle-doc-scanner 4.12.0 → 4.14.0

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

@@ -541,25 +541,25 @@ class CameraController(
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
 
+        // Rotate to match display orientation.
         val matrix = Matrix()
-
-        // Apply transformations in correct order:
-        // 1. Translate to center
-        matrix.postTranslate(-centerX, -centerY)
-
-        // 2. Rotate around origin
         if (rotation != 0) {
-            matrix.postRotate(rotation.toFloat())
+            matrix.postRotate(rotation.toFloat(), centerX, centerY)
         }
-
-        // 3. Scale to fill view
-        val scale = max(viewWidth / bufferWidth, viewHeight / bufferHeight)
-        matrix.postScale(scale, scale)
-
-        // 4. Translate back to center
-        matrix.postTranslate(centerX, centerY)
-
         previewView.setTransform(matrix)
+
+        // Center-crop to fill the view.
+        val viewAspect = viewWidth / viewHeight
+        val bufferAspect = bufferWidth / bufferHeight
+        previewView.pivotX = centerX
+        previewView.pivotY = centerY
+        if (bufferAspect > viewAspect) {
+            previewView.scaleX = bufferAspect / viewAspect
+            previewView.scaleY = 1f
+        } else {
+            previewView.scaleX = 1f
+            previewView.scaleY = viewAspect / bufferAspect
+        }
     }
 
     private fun chooseBestSize(
@@ -602,11 +602,12 @@ class CameraController(
             }
 
             val bestDiff = pool.minOf { aspectDiff(it) }
-            // Use tight tolerance (0.05) to get the best aspect ratio match
-            val close = pool.filter { aspectDiff(it) <= bestDiff + 0.05 }
+            // Use very tight tolerance (0.001) to get only the best aspect ratio matches
+            val close = pool.filter { aspectDiff(it) <= bestDiff + 0.001 }
 
+            // Among best aspect ratio matches, prefer higher resolution
             val selected = close.maxByOrNull { it.width * it.height } ?: pool.maxByOrNull { it.width * it.height }
-            Log.d(TAG, "[SIZE_SELECTION] Best aspect diff: $bestDiff, selected: ${selected?.width}x${selected?.height}")
+            Log.d(TAG, "[SIZE_SELECTION] Best aspect diff: $bestDiff, candidates: ${close.size}, selected: ${selected?.width}x${selected?.height}")
             return selected
         }
 

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

@@ -308,18 +308,14 @@ class DocumentDetector {
          * Order points in consistent order: topLeft, topRight, bottomLeft, bottomRight
          */
         private fun orderPoints(points: Array<Point>): Rectangle {
-            // Sort by y-coordinate
-            val sorted = points.sortedBy { it.y }
-
-            // Top two points
-            val topPoints = sorted.take(2).sortedBy { it.x }
-            val topLeft = topPoints[0]
-            val topRight = topPoints[1]
-
-            // Bottom two points
-            val bottomPoints = sorted.takeLast(2).sortedBy { it.x }
-            val bottomLeft = bottomPoints[0]
-            val bottomRight = bottomPoints[1]
+            // Use sum/diff ordering for robustness under rotation.
+            val sortedBySum = points.sortedBy { it.x + it.y }
+            val sortedByDiff = points.sortedBy { it.x - it.y }
+
+            val topLeft = sortedBySum.first()
+            val bottomRight = sortedBySum.last()
+            val topRight = sortedByDiff.first()
+            val bottomLeft = sortedByDiff.last()
 
             return Rectangle(topLeft, topRight, bottomLeft, bottomRight)
         }

package/package.json

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