react-native-rectangle-doc-scanner 7.39.0 → 7.41.0

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

@@ -559,33 +559,41 @@ class CameraController(
         val viewHeight = previewView.height.toFloat()
         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
+        }
         Log.d(
             TAG,
-            "[TRANSFORM] rotation=${displayRotationDegrees()} view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}"
+            "[TRANSFORM] rotation=$rotationDegrees view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}"
         )
 
-        val rotationDegrees = displayRotationDegrees()
-        val bufferWidth = preview.width.toFloat()
-        val bufferHeight = preview.height.toFloat()
-        val isSwapped = rotationDegrees == 90 || rotationDegrees == 270
-
+        val matrix = Matrix()
         val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
-        val bufferRect = if (isSwapped) {
-            RectF(0f, 0f, bufferHeight, bufferWidth)
-        } else {
-            RectF(0f, 0f, bufferWidth, bufferHeight)
-        }
+        val bufferRect = RectF(0f, 0f, preview.width.toFloat(), preview.height.toFloat())
         val centerX = viewRect.centerX()
         val centerY = viewRect.centerY()
-        val scale = max(viewWidth / bufferRect.width(), viewHeight / bufferRect.height())
 
-        // Map buffer to view with uniform scale (aspect-fill), then rotate in view space.
-        val matrix = Matrix()
-        matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
-        matrix.postScale(scale, scale, centerX, centerY)
-        if (rotationDegrees != 0) {
-            matrix.postRotate(rotationDegrees.toFloat(), centerX, centerY)
+        if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
+            val swappedBufferRect = RectF(0f, 0f, preview.height.toFloat(), preview.width.toFloat())
+            swappedBufferRect.offset(centerX - swappedBufferRect.centerX(), centerY - swappedBufferRect.centerY())
+            matrix.setRectToRect(viewRect, swappedBufferRect, 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 if (rotation == Surface.ROTATION_180) {
+            matrix.postRotate(180f, centerX, centerY)
+        } else {
+            val scale = max(viewWidth / preview.width.toFloat(), viewHeight / preview.height.toFloat())
+            val scaledWidth = preview.width.toFloat() * scale
+            val scaledHeight = preview.height.toFloat() * scale
+            matrix.setScale(scale, scale)
+            matrix.postTranslate((viewWidth - scaledWidth) / 2f, (viewHeight - scaledHeight) / 2f)
         }
 
         previewView.setTransform(matrix)

package/package.json

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