react-native-rectangle-doc-scanner 7.51.0 → 7.53.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
@@ -559,14 +627,7 @@ class CameraController(
         val preview = previewSize ?: return
         if (viewWidth == 0f || viewHeight == 0f) return
 
-        val rotation = previewView.display?.rotation ?: Surface.ROTATION_0
-        val rotationDegrees = when (rotation) {
-            Surface.ROTATION_0 -> 0
-            Surface.ROTATION_90 -> 90
-            Surface.ROTATION_180 -> 180
-            Surface.ROTATION_270 -> 270
-            else -> 0
-        }
+        val rotationDegrees = computeRotationDegrees()
         Log.d(
             TAG,
             "[TRANSFORM] rotation=$rotationDegrees view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}"
@@ -577,31 +638,30 @@ class CameraController(
         val centerX = viewRect.centerX()
         val centerY = viewRect.centerY()
 
-        val isSwapped = rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270
-        if (isSwapped) {
-            val bufferRect = RectF(0f, 0f, preview.height.toFloat(), preview.width.toFloat())
-            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 {
-            val bufferRect = RectF(0f, 0f, preview.width.toFloat(), preview.height.toFloat())
-            matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
-            val scale = max(
-                viewWidth / preview.width.toFloat(),
-                viewHeight / preview.height.toFloat()
-            )
-            matrix.postScale(scale, scale, centerX, centerY)
-            if (rotation == Surface.ROTATION_180) {
-                matrix.postRotate(180f, centerX, centerY)
-            }
+        val bufferWidth = preview.width.toFloat()
+        val bufferHeight = preview.height.toFloat()
+        val bufferRect = RectF(0f, 0f, bufferWidth, bufferHeight)
+        val rotatedRect = RectF(bufferRect)
+
+        if (rotationDegrees != 0) {
+            matrix.postRotate(rotationDegrees.toFloat(), bufferRect.centerX(), bufferRect.centerY())
+            matrix.mapRect(rotatedRect, bufferRect)
         }
 
+        val scale = max(viewWidth / rotatedRect.width(), viewHeight / rotatedRect.height())
+        matrix.postScale(scale, scale, rotatedRect.centerX(), rotatedRect.centerY())
+        matrix.postTranslate(centerX - rotatedRect.centerX(), centerY - rotatedRect.centerY())
+
         previewView.setTransform(matrix)
+        latestTransform = Matrix(matrix)
+        latestBufferWidth = preview.width
+        latestBufferHeight = preview.height
+        Log.d(
+            TAG,
+            "[TRANSFORM] viewClass=${previewView.javaClass.name} isTextureView=${previewView is TextureView} " +
+                "buffer=${preview.width}x${preview.height} rotated=${rotatedRect.width()}x${rotatedRect.height()} " +
+                "scale=$scale center=${centerX}x${centerY} matrix=$matrix"
+        )
         Log.d(TAG, "[TRANSFORM] Matrix applied successfully")
     }
 

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.51.0",
+  "version": "7.53.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",