react-native-rectangle-doc-scanner 7.7.0 → 7.9.0

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

@@ -118,10 +118,10 @@ class CameraController(
             return
         }
 
+        // Always set the listener so we get size-change callbacks for transform updates.
+        previewView.surfaceTextureListener = textureListener
         if (previewView.isAvailable) {
             openCamera()
-        } else {
-            previewView.surfaceTextureListener = textureListener
         }
     }
 
@@ -150,8 +150,8 @@ class CameraController(
         }
 
         try {
-            // Use 90 degrees for back camera in portrait mode
-            val jpegOrientation = 90
+            // Match JPEG orientation to current device rotation and sensor orientation.
+            val jpegOrientation = computeRotationDegrees()
             Log.d(TAG, "[CAPTURE] Setting JPEG_ORIENTATION to $jpegOrientation")
 
             val requestBuilder = device.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE).apply {
@@ -240,7 +240,9 @@ class CameraController(
             val previewSizes = streamConfigMap.getOutputSizes(SurfaceTexture::class.java)
             Log.d(TAG, "[CAMERA2] Available preview sizes: ${previewSizes?.take(10)?.joinToString { "${it.width}x${it.height}" }}")
 
+            // Prefer a preview size that matches the view aspect to avoid letterboxing.
             previewSize = chooseBestSize(previewSizes, viewAspect, null, preferClosestAspect = true)
+                ?: previewSizes?.maxByOrNull { it.width * it.height }
             Log.d(TAG, "[CAMERA2] Selected preview size: ${previewSize?.width}x${previewSize?.height}")
 
             val previewAspect = previewSize?.let { it.width.toDouble() / it.height.toDouble() } ?: viewAspect
@@ -551,28 +553,26 @@ class CameraController(
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
 
-        // For 270 degree rotation (portrait mode with back camera):
-        // - The camera sensor output is landscape (1920x1088)
-        // - We need to rotate 270 degrees to display it in portrait
-        // - Then scale to fill the entire view
+        // Match iOS behavior: use the full preview extent and scale to fill
         if (rotation == 270 || rotation == 90) {
-            // Rotate first
-            matrix.postRotate(rotation.toFloat(), centerX, centerY)
-
-            // After rotation, the dimensions are swapped
+            // 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 fill the view completely (aspect fill/crop mode)
+            // 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 scale at center
+            // Apply rotation around center first
+            matrix.postRotate(rotation.toFloat(), centerX, centerY)
+
+            // Then scale to fill (will crop excess)
             matrix.postScale(scale, scale, centerX, centerY)
         } else {
             // For 0 or 180 degree rotation
@@ -649,11 +649,11 @@ class CameraController(
     private fun rotateAndMirror(bitmap: Bitmap, rotationDegrees: Int, mirror: Boolean): Bitmap {
         Log.d(TAG, "[ROTATE_MIRROR] rotationDegrees=$rotationDegrees mirror=$mirror bitmap=${bitmap.width}x${bitmap.height}")
 
-        // JPEG_ORIENTATION is already set to 90, so the image should already be rotated correctly
-        // We only need to apply mirror for front camera
+        // JPEG_ORIENTATION is already set, so the image should already be rotated correctly.
+        // We only need to apply mirror for front camera.
         if (!mirror) {
-            // Back camera: no additional processing needed since JPEG_ORIENTATION handles rotation
-            Log.d(TAG, "[ROTATE_MIRROR] Back camera: returning bitmap as-is (JPEG_ORIENTATION=90 already applied)")
+            // Back camera: no additional processing needed since JPEG_ORIENTATION handles rotation.
+            Log.d(TAG, "[ROTATE_MIRROR] Back camera: returning bitmap as-is (JPEG_ORIENTATION already applied)")
             return bitmap
         }
 

package/package.json

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