react-native-rectangle-doc-scanner 7.26.0 → 7.27.0

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

@@ -564,27 +564,25 @@ class CameraController(
         )
 
         val matrix = Matrix()
-        val isSwapped = rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270
-        val bufferWidth = if (isSwapped) preview.height.toFloat() else preview.width.toFloat()
-        val bufferHeight = if (isSwapped) preview.width.toFloat() else preview.height.toFloat()
         val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
-        val bufferRect = RectF(0f, 0f, bufferWidth, bufferHeight)
+        val bufferRect = RectF(0f, 0f, preview.height.toFloat(), preview.width.toFloat())
         val centerX = viewRect.centerX()
         val centerY = viewRect.centerY()
 
-        // Use uniform scaling to avoid stretching; then center-crop to fill.
-        matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
-        val scale = max(viewWidth / bufferWidth, viewHeight / bufferHeight)
-        matrix.postScale(scale, scale, centerX, centerY)
-
-        if (rotation != Surface.ROTATION_0) {
-            val rotateDegrees = when (rotation) {
-                Surface.ROTATION_90 -> -90f
-                Surface.ROTATION_180 -> 180f
-                Surface.ROTATION_270 -> 90f
-                else -> 0f
-            }
-            matrix.postRotate(rotateDegrees, centerX, centerY)
+        if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
+            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 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/dist/DocScanner.js

@@ -627,7 +627,18 @@ const NativeScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAU
     }, [capture]);
     const handleRectangleDetect = (0, react_1.useCallback)((event) => {
         const rectangleCoordinates = normalizeRectangle(event.rectangleCoordinates ?? null);
-        const rectangleOnScreen = normalizeRectangle(event.rectangleOnScreen ?? null);
+        let rectangleOnScreen = normalizeRectangle(event.rectangleOnScreen ?? null);
+        const density = react_native_1.PixelRatio.get();
+        if (react_native_1.Platform.OS === 'android' &&
+            rectangleCoordinates &&
+            event.imageSize &&
+            event.previewSize &&
+            event.imageSize.width &&
+            event.imageSize.height &&
+            event.previewSize.width &&
+            event.previewSize.height) {
+            rectangleOnScreen = mapRectangleToView(rectangleCoordinates, event.imageSize.width, event.imageSize.height, event.previewSize.width, event.previewSize.height, density);
+        }
         const payload = {
             ...event,
             rectangleCoordinates,

package/package.json

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

package/src/DocScanner.tsx

@@ -874,7 +874,28 @@ const NativeScanner = forwardRef<DocScannerHandle, Props>(
     const handleRectangleDetect = useCallback(
       (event: RectangleEventPayload) => {
         const rectangleCoordinates = normalizeRectangle(event.rectangleCoordinates ?? null);
-        const rectangleOnScreen = normalizeRectangle(event.rectangleOnScreen ?? null);
+        let rectangleOnScreen = normalizeRectangle(event.rectangleOnScreen ?? null);
+        const density = PixelRatio.get();
+
+        if (
+          Platform.OS === 'android' &&
+          rectangleCoordinates &&
+          event.imageSize &&
+          event.previewSize &&
+          event.imageSize.width &&
+          event.imageSize.height &&
+          event.previewSize.width &&
+          event.previewSize.height
+        ) {
+          rectangleOnScreen = mapRectangleToView(
+            rectangleCoordinates,
+            event.imageSize.width,
+            event.imageSize.height,
+            event.previewSize.width,
+            event.previewSize.height,
+            density,
+          );
+        }
 
         const payload: RectangleDetectEvent = {
           ...event,