react-native-rectangle-doc-scanner 10.33.0 → 10.35.0

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

@@ -457,19 +457,26 @@ class CameraController(
             else -> 0
         }
 
-        // Calculate the rotation needed to display the image correctly in portrait mode.
-        // This must match the rotation applied in updateTextureViewTransform.
-        val rotationDegrees = when {
-            // Tablet with landscape sensor in portrait: add 180° fix for upside-down
-            sensorOrientation == 0 && displayRotationDegrees == 90 -> 270f
-            // Phone with 90° sensor in portrait: rotate 90° to match
-            sensorOrientation == 90 && displayRotationDegrees == 0 -> 90f
-            // Default: use display rotation
-            else -> displayRotationDegrees.toFloat()
+        // The coordinates coming from ImageAnalysis are in sensor's native orientation.
+        // For a 90° sensor (phones in portrait), the camera buffer is landscape but coordinates
+        // are in sensor space. We need to rotate coordinates to match the display orientation.
+
+        // The TextureView rotation for display
+        val tabletUpsideDownFix = if (sensorOrientation == 0 && displayRotationDegrees == 90) 180 else 0
+        val textureViewRotation = ((displayRotationDegrees + tabletUpsideDownFix) % 360).toFloat()
+
+        // For coordinate mapping: we need to account for BOTH sensor orientation AND display rotation
+        // - Sensor 90° + Display 0°: Coordinates are in landscape sensor space, need 90° rotation to portrait
+        // - Sensor 0° + Display 90°: Coordinates are in portrait, need 270° rotation (display + fix)
+        val rotationDegrees = if (sensorOrientation == 90 && displayRotationDegrees == 0) {
+            90f  // Rotate coordinates 90° to match portrait display
+        } else {
+            textureViewRotation  // Use TextureView rotation
         }
 
         Log.d(TAG, "[MAPPING] Image: ${imageWidth}x${imageHeight}, Sensor: ${sensorOrientation}°, " +
-            "Display: ${displayRotationDegrees}°, Final rotation: ${rotationDegrees}°")
+            "Display: ${displayRotationDegrees}°, TextureView rotation: ${textureViewRotation}°, " +
+            "Coordinate rotation: ${rotationDegrees}°")
 
         // Apply rotation to coordinates to match display orientation
         fun rotatePoint(point: org.opencv.core.Point): org.opencv.core.Point {
@@ -571,17 +578,10 @@ class CameraController(
         val centerY = viewHeight / 2f
 
         // Calculate rotation from buffer to display coordinates.
-        // For portrait apps:
-        // - 90° sensor (phones): buffer is landscape → need 90° rotation to portrait
-        // - 0° sensor (tablets): buffer is portrait → need displayRotation adjustment
-        val rotationDegrees = when {
-            // Tablet with landscape sensor in portrait: add 180° fix for upside-down
-            sensorOrientation == 0 && displayRotationDegrees == 90 -> 270f
-            // Phone with 90° sensor in portrait: rotate 90° to match
-            sensorOrientation == 90 && displayRotationDegrees == 0 -> 90f
-            // Default: use display rotation
-            else -> displayRotationDegrees.toFloat()
-        }
+        // CameraX accounts for sensor orientation via targetRotation. Some tablets with landscape
+        // sensors report Display 90 in portrait but render upside down; add a 180° fix for that case.
+        val tabletUpsideDownFix = if (sensorOrientation == 0 && displayRotationDegrees == 90) 180 else 0
+        val rotationDegrees = ((displayRotationDegrees + tabletUpsideDownFix) % 360).toFloat()
 
         Log.d(TAG, "[TRANSFORM] Applying rotation: ${rotationDegrees}°")
 

package/package.json

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