react-native-rectangle-doc-scanner 7.10.0 → 7.12.0

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

@@ -35,7 +35,6 @@ import java.io.ByteArrayInputStream
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.abs
-import kotlin.math.max
 import kotlin.math.min
 
 class CameraController(
@@ -485,7 +484,8 @@ class CameraController(
             val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
                 ?: throw IllegalStateException("Failed to decode JPEG")
 
-            val rotated = rotateAndMirror(bitmap, exifRotation, useFrontCamera)
+            val rotation = if (exifRotation != 0) exifRotation else computeRotationDegrees()
+            val rotated = rotateAndMirror(bitmap, rotation, useFrontCamera)
             val photoFile = File(pending.outputDirectory, "doc_scan_${System.currentTimeMillis()}.jpg")
             FileOutputStream(photoFile).use { out ->
                 rotated.compress(Bitmap.CompressFormat.JPEG, 95, out)
@@ -523,15 +523,11 @@ class CameraController(
 
     private fun computeRotationDegrees(): Int {
         val displayRotation = displayRotationDegrees()
-
-        // For back camera with sensor orientation 0 and display rotation 90 (portrait),
-        // we need 270 degree rotation to display correctly
         val rotation = if (useFrontCamera) {
             (sensorOrientation + displayRotation) % 360
         } else {
             (sensorOrientation - displayRotation + 360) % 360
         }
-
         Log.d(TAG, "[ROTATION] sensor=$sensorOrientation display=$displayRotation front=$useFrontCamera -> rotation=$rotation")
         return rotation
     }
@@ -552,47 +548,26 @@ class CameraController(
         val viewHeight = previewView.height.toFloat()
         val preview = previewSize ?: return
         if (viewWidth == 0f || viewHeight == 0f) return
-
-        val rotation = computeRotationDegrees()
-        Log.d(TAG, "[TRANSFORM] rotation=$rotation view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}")
+        val rotation = previewView.display?.rotation ?: Surface.ROTATION_0
+        val rotationDegrees = displayRotationDegrees()
+        Log.d(TAG, "[TRANSFORM] rotation=$rotationDegrees view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}")
 
         val matrix = Matrix()
-        val centerX = viewWidth / 2f
-        val centerY = viewHeight / 2f
-
-        // Match iOS behavior: use the full preview extent and scale to fill
-        if (rotation == 270 || rotation == 90) {
-            // After rotation, dimensions are swapped
-            val rotatedWidth = preview.height.toFloat()
-            val rotatedHeight = preview.width.toFloat()
-
-            Log.d(TAG, "[TRANSFORM] After rotation: ${rotatedWidth}x${rotatedHeight}")
-
-            // Calculate scale to completely fill the view (aspect fill - crop mode like iOS)
-            // This will crop the image but fill the entire screen
-            val scaleX = viewWidth / rotatedWidth
-            val scaleY = viewHeight / rotatedHeight
-            val scale = maxOf(scaleX, scaleY)
-
-            Log.d(TAG, "[TRANSFORM] scaleX=$scaleX scaleY=$scaleY finalScale=$scale")
-
-            // Apply rotation around center first
-            matrix.postRotate(rotation.toFloat(), centerX, centerY)
-
-            // Then scale to fill (will crop excess)
-            matrix.postScale(scale, scale, centerX, centerY)
+        val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
+        val bufferRect = RectF(0f, 0f, preview.height.toFloat(), preview.width.toFloat())
+        val centerX = viewRect.centerX()
+        val centerY = viewRect.centerY()
+
+        if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
+            bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
+            matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
+            val rotateDegrees = if (rotation == Surface.ROTATION_90) -90f else 90f
+            matrix.postRotate(rotateDegrees, centerX, centerY)
         } else {
-            // For 0 or 180 degree rotation
-            val scaleX = viewWidth / preview.width.toFloat()
-            val scaleY = viewHeight / preview.height.toFloat()
-            val scale = maxOf(scaleX, scaleY)
-
-            Log.d(TAG, "[TRANSFORM] scaleX=$scaleX scaleY=$scaleY finalScale=$scale")
-
-            if (rotation != 0) {
-                matrix.postRotate(rotation.toFloat(), centerX, centerY)
+            matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
+            if (rotation == Surface.ROTATION_180) {
+                matrix.postRotate(180f, centerX, centerY)
             }
-            matrix.postScale(scale, scale, centerX, centerY)
         }
 
         previewView.setTransform(matrix)

package/package.json

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