react-native-rectangle-doc-scanner 4.3.0 → 4.5.0

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

@@ -227,6 +227,13 @@ class CameraController(
                 ?: captureSizes?.maxByOrNull { it.width * it.height }
 
             setupImageReaders()
+            Log.d(
+                TAG,
+                "[CAMERA2] view=${previewView.width}x${previewView.height} " +
+                    "preview=${previewSize?.width}x${previewSize?.height} " +
+                    "analysis=${analysisSize?.width}x${analysisSize?.height} " +
+                    "capture=${captureSize?.width}x${captureSize?.height}"
+            )
 
             if (ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
                 Log.e(TAG, "[CAMERA2] Camera permission not granted")

package/android/src/main/kotlin/com/reactnativerectangledocscanner/DocumentDetector.kt

@@ -179,6 +179,32 @@ class DocumentDetector {
                 Imgproc.morphologyEx(cannyMat, morphMat, Imgproc.MORPH_CLOSE, kernel)
                 kernel.release()
 
+                fun refineRectangle(gray: Mat, rectangle: Rectangle): Rectangle {
+                    val maxX = (gray.cols() - 1).toDouble().coerceAtLeast(1.0)
+                    val maxY = (gray.rows() - 1).toDouble().coerceAtLeast(1.0)
+                    val points = MatOfPoint2f(
+                        Point(rectangle.topLeft.x.coerceIn(0.0, maxX), rectangle.topLeft.y.coerceIn(0.0, maxY)),
+                        Point(rectangle.topRight.x.coerceIn(0.0, maxX), rectangle.topRight.y.coerceIn(0.0, maxY)),
+                        Point(rectangle.bottomLeft.x.coerceIn(0.0, maxX), rectangle.bottomLeft.y.coerceIn(0.0, maxY)),
+                        Point(rectangle.bottomRight.x.coerceIn(0.0, maxX), rectangle.bottomRight.y.coerceIn(0.0, maxY))
+                    )
+                    val criteria = TermCriteria(TermCriteria.EPS + TermCriteria.MAX_ITER, 30, 0.01)
+                    return try {
+                        Imgproc.cornerSubPix(
+                            gray,
+                            points,
+                            Size(5.0, 5.0),
+                            Size(-1.0, -1.0),
+                            criteria
+                        )
+                        orderPoints(points.toArray())
+                    } catch (e: Exception) {
+                        rectangle
+                    } finally {
+                        points.release()
+                    }
+                }
+
                 fun findLargestRectangle(source: Mat): Rectangle? {
                     val contours = mutableListOf<MatOfPoint>()
                     val hierarchy = Mat()
@@ -216,7 +242,7 @@ class DocumentDetector {
                             val points = quad.toArray()
                             if (contourArea > largestArea) {
                                 largestArea = contourArea
-                                largestRectangle = orderPoints(points)
+                                largestRectangle = refineRectangle(grayMat, orderPoints(points))
                             }
                         } else {
                             // Fallback: use rotated bounding box when contour is near-rectangular.
@@ -230,7 +256,7 @@ class DocumentDetector {
                                     val boxPoints = Array(4) { Point() }
                                     rotated.points(boxPoints)
                                     largestArea = contourArea
-                                    largestRectangle = orderPoints(boxPoints)
+                                    largestRectangle = refineRectangle(grayMat, orderPoints(boxPoints))
                                 }
                             }
                         }

package/android/src/main/kotlin/com/reactnativerectangledocscanner/DocumentScannerView.kt

@@ -130,6 +130,13 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
         initializeCameraWhenReady()
     }
 
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+        if (changed) {
+            Log.d(TAG, "[LAYOUT] View size: ${right - left}x${bottom - top}, PreviewView: ${previewView.width}x${previewView.height}")
+        }
+    }
+
     private fun initializeCameraWhenReady() {
         // If view is already laid out, start camera immediately
         if (width > 0 && height > 0) {
@@ -384,13 +391,23 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
                 shouldCrop = shouldCrop
             )
 
-            // Save or encode images
-            val result = if (useBase64) {
-                Arguments.createMap().apply {
-                    putString("croppedImage", ImageProcessor.bitmapToBase64(processed.croppedImage, quality))
-                    putString("initialImage", ImageProcessor.bitmapToBase64(processed.initialImage, quality))
-                    putMap("rectangleCoordinates", detectedRectangle?.toMap()?.toWritableMap())
+            fun buildResult(
+                croppedPath: String,
+                initialPath: String,
+                rectangle: Rectangle?
+            ): WritableMap {
+                return Arguments.createMap().apply {
+                    putString("croppedImage", croppedPath)
+                    putString("initialImage", initialPath)
+                    putMap("rectangleCoordinates", rectangle?.toMap()?.toWritableMap())
                 }
+            }
+
+            val (resultForPromise, resultForEvent) = if (useBase64) {
+                val croppedBase64 = ImageProcessor.bitmapToBase64(processed.croppedImage, quality)
+                val initialBase64 = ImageProcessor.bitmapToBase64(processed.initialImage, quality)
+                buildResult(croppedBase64, initialBase64, detectedRectangle) to
+                    buildResult(croppedBase64, initialBase64, detectedRectangle)
             } else {
                 val timestamp = System.currentTimeMillis()
                 val croppedPath = ImageProcessor.saveBitmapToFile(
@@ -405,22 +422,18 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
                     "initial_img_$timestamp.jpeg",
                     quality
                 )
-
-                Arguments.createMap().apply {
-                    putString("croppedImage", croppedPath)
-                    putString("initialImage", initialPath)
-                    putMap("rectangleCoordinates", detectedRectangle?.toMap()?.toWritableMap())
-                }
+                buildResult(croppedPath, initialPath, detectedRectangle) to
+                    buildResult(croppedPath, initialPath, detectedRectangle)
             }
 
             withContext(Dispatchers.Main) {
                 Log.d(TAG, "Processing completed, resolving promise: ${promise != null}")
 
                 // Resolve promise first (if provided) - matches iOS behavior
-                promise?.resolve(result)
+                promise?.resolve(resultForPromise)
 
                 // Then send event for backwards compatibility
-                sendPictureTakenEvent(result)
+                sendPictureTakenEvent(resultForEvent)
 
                 isCapturing = false
 
@@ -442,9 +455,8 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
     }
 
     private fun sendPictureTakenEvent(data: WritableMap) {
-        val event = data.toHashMap().toWritableMap()
         themedContext.getJSModule(RCTEventEmitter::class.java)
-            .receiveEvent(id, "onPictureTaken", event)
+            .receiveEvent(id, "onPictureTaken", data)
     }
 
     private fun sendRectangleDetectEvent(

package/dist/FullDocScanner.js

@@ -573,6 +573,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
     }, []);
     const activePreviewImage = croppedImageData ? getActivePreviewImage(croppedImageData) : null;
     return (react_1.default.createElement(react_native_1.View, { style: styles.container },
+        react_native_1.Platform.OS === 'android' && (react_1.default.createElement(react_native_1.StatusBar, { translucent: true, backgroundColor: "transparent" })),
         croppedImageData ? (
         // check_DP: Show confirmation screen
         react_1.default.createElement(react_native_1.View, { style: styles.confirmationContainer },

package/package.json

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

package/src/FullDocScanner.tsx

@@ -7,6 +7,7 @@ import {
   NativeModules,
   Platform,
   StyleSheet,
+  StatusBar,
   Text,
   TouchableOpacity,
   View,
@@ -775,6 +776,9 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
 
   return (
     <View style={styles.container}>
+      {Platform.OS === 'android' && (
+        <StatusBar translucent backgroundColor="transparent" />
+      )}
       {croppedImageData ? (
         // check_DP: Show confirmation screen
         <View style={styles.confirmationContainer}>