react-native-rectangle-doc-scanner 7.52.0 → 7.54.0

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

@@ -67,6 +67,9 @@ class CameraController(
 
     private val pendingCapture = AtomicReference<PendingCapture?>()
     private val analysisInFlight = AtomicBoolean(false)
+    private var latestTransform: Matrix? = null
+    private var latestBufferWidth = 0
+    private var latestBufferHeight = 0
     private val objectDetector = ObjectDetection.getClient(
         ObjectDetectorOptions.Builder()
             .setDetectorMode(ObjectDetectorOptions.STREAM_MODE)
@@ -208,6 +211,71 @@ class CameraController(
         analysisThread.quitSafely()
     }
 
+    fun mapRectangleToView(rectangle: Rectangle?, imageWidth: Int, imageHeight: Int): Rectangle? {
+        val transform = latestTransform ?: return null
+        if (rectangle == null || imageWidth <= 0 || imageHeight <= 0) return null
+        if (latestBufferWidth <= 0 || latestBufferHeight <= 0) return null
+
+        val rotationDegrees = computeRotationDegrees()
+        val inverseRotation = (360 - rotationDegrees) % 360
+
+        fun rotatePoint(point: Point): Point {
+            return when (inverseRotation) {
+                90 -> Point(imageHeight - point.y, point.x)
+                180 -> Point(imageWidth - point.x, imageHeight - point.y)
+                270 -> Point(point.y, imageWidth - point.x)
+                else -> point
+            }
+        }
+
+        val rotated = Rectangle(
+            rotatePoint(rectangle.topLeft),
+            rotatePoint(rectangle.topRight),
+            rotatePoint(rectangle.bottomLeft),
+            rotatePoint(rectangle.bottomRight)
+        )
+
+        val bufferWidth = if (inverseRotation == 90 || inverseRotation == 270) {
+            imageHeight.toDouble()
+        } else {
+            imageWidth.toDouble()
+        }
+        val bufferHeight = if (inverseRotation == 90 || inverseRotation == 270) {
+            imageWidth.toDouble()
+        } else {
+            imageHeight.toDouble()
+        }
+
+        val scaleX = latestBufferWidth.toDouble() / bufferWidth
+        val scaleY = latestBufferHeight.toDouble() / bufferHeight
+
+        fun scalePoint(point: Point): Point {
+            return Point(point.x * scaleX, point.y * scaleY)
+        }
+
+        val scaled = Rectangle(
+            scalePoint(rotated.topLeft),
+            scalePoint(rotated.topRight),
+            scalePoint(rotated.bottomLeft),
+            scalePoint(rotated.bottomRight)
+        )
+
+        val pts = floatArrayOf(
+            scaled.topLeft.x.toFloat(), scaled.topLeft.y.toFloat(),
+            scaled.topRight.x.toFloat(), scaled.topRight.y.toFloat(),
+            scaled.bottomLeft.x.toFloat(), scaled.bottomLeft.y.toFloat(),
+            scaled.bottomRight.x.toFloat(), scaled.bottomRight.y.toFloat()
+        )
+        transform.mapPoints(pts)
+
+        return Rectangle(
+            Point(pts[0].toDouble(), pts[1].toDouble()),
+            Point(pts[2].toDouble(), pts[3].toDouble()),
+            Point(pts[4].toDouble(), pts[5].toDouble()),
+            Point(pts[6].toDouble(), pts[7].toDouble())
+        )
+    }
+
     private fun openCamera() {
         if (cameraDevice != null) {
             return
@@ -262,6 +330,13 @@ class CameraController(
             captureSize = chooseBestSize(captureSizes, previewAspect, null, preferClosestAspect = true)
                 ?: captureSizes?.maxByOrNull { it.width * it.height }
 
+            val previewDiff = previewSize?.let { abs(it.width.toDouble() / it.height.toDouble() - targetPreviewAspect) }
+            Log.d(
+                TAG,
+                "[SIZE_SELECTION] targetAspect=$targetPreviewAspect viewAspect=$viewAspect " +
+                    "previewAspect=$previewAspect diff=$previewDiff selected=${previewSize?.width}x${previewSize?.height}"
+            )
+
             setupImageReaders()
             Log.d(
                 TAG,
@@ -361,6 +436,7 @@ class CameraController(
         val preview = previewSize ?: return
 
         surfaceTexture.setDefaultBufferSize(preview.width, preview.height)
+        Log.d(TAG, "[CAMERA2] SurfaceTexture defaultBufferSize=${preview.width}x${preview.height}")
         val previewSurface = Surface(surfaceTexture)
 
         val targets = mutableListOf(previewSurface)
@@ -573,19 +649,34 @@ class CameraController(
         val isSwapped = rotationDegrees == 90 || rotationDegrees == 270
         val bufferWidth = if (isSwapped) preview.height.toFloat() else preview.width.toFloat()
         val bufferHeight = if (isSwapped) preview.width.toFloat() else preview.height.toFloat()
-        val scale = max(viewWidth / bufferWidth, viewHeight / bufferHeight)
-        val scaledWidth = bufferWidth * scale
-        val scaledHeight = bufferHeight * scale
-        val dx = (viewWidth - scaledWidth) / 2f
-        val dy = (viewHeight - scaledHeight) / 2f
+        val bufferRect = RectF(0f, 0f, bufferWidth, bufferHeight)
+        bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
 
-        matrix.setScale(scale, scale)
-        matrix.postTranslate(dx, dy)
+        matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL)
+        val scale = max(viewWidth / bufferWidth, viewHeight / bufferHeight)
+        matrix.postScale(scale, scale, centerX, centerY)
         if (rotationDegrees != 0) {
             matrix.postRotate(rotationDegrees.toFloat(), centerX, centerY)
         }
 
         previewView.setTransform(matrix)
+        latestTransform = Matrix(matrix)
+        latestBufferWidth = preview.width
+        latestBufferHeight = preview.height
+
+        val pts = floatArrayOf(
+            0f, 0f,
+            bufferWidth, 0f,
+            0f, bufferHeight,
+            bufferWidth, bufferHeight
+        )
+        matrix.mapPoints(pts)
+        Log.d(
+            TAG,
+            "[TRANSFORM] viewClass=${previewView.javaClass.name} isTextureView=${previewView is TextureView} " +
+                "buffer=${bufferWidth}x${bufferHeight} scale=$scale center=${centerX}x${centerY} matrix=$matrix " +
+                "pts=[${pts[0]},${pts[1]} ${pts[2]},${pts[3]} ${pts[4]},${pts[5]} ${pts[6]},${pts[7]}]"
+        )
         Log.d(TAG, "[TRANSFORM] Matrix applied successfully")
     }
 
@@ -620,9 +711,7 @@ class CameraController(
         fun aspectDiff(size: Size): Double {
             val w = size.width.toDouble()
             val h = size.height.toDouble()
-            val direct = abs(w / h - targetAspect)
-            val inverted = abs(h / w - targetAspect)
-            return min(direct, inverted)
+            return abs(w / h - targetAspect)
         }
 
         if (preferClosestAspect) {

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

@@ -210,7 +210,8 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
         }
 
         val rectangleOnScreen = if (rectangle != null && width > 0 && height > 0) {
-            DocumentDetector.transformRectangleToViewCoordinates(rectangle, imageWidth, imageHeight, width, height)
+            cameraController?.mapRectangleToView(rectangle, imageWidth, imageHeight)
+                ?: DocumentDetector.transformRectangleToViewCoordinates(rectangle, imageWidth, imageHeight, width, height)
         } else {
             null
         }

package/package.json

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