react-native-rectangle-doc-scanner 3.237.0 → 3.239.0

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

@@ -106,6 +106,7 @@ class DocumentDetector {
             val blurredMat = Mat()
             val cannyMat = Mat()
             val morphMat = Mat()
+            val threshMat = Mat()
 
             try {
                 // Convert to grayscale
@@ -124,57 +125,74 @@ class DocumentDetector {
                 Imgproc.morphologyEx(cannyMat, morphMat, Imgproc.MORPH_CLOSE, kernel)
                 kernel.release()
 
-                // Find contours
-                val contours = mutableListOf<MatOfPoint>()
-                val hierarchy = Mat()
-                Imgproc.findContours(
-                    morphMat,
-                    contours,
-                    hierarchy,
-                    Imgproc.RETR_EXTERNAL,
-                    Imgproc.CHAIN_APPROX_SIMPLE
-                )
-
-                // Find the largest contour that approximates to a quadrilateral
-                var largestRectangle: Rectangle? = null
-                var largestArea = 0.0
-                val minArea = max(600.0, (srcMat.rows() * srcMat.cols()) * 0.001)
-
-                for (contour in contours) {
-                    val contourArea = Imgproc.contourArea(contour)
-
-                    // Filter small contours
-                    if (contourArea < minArea) continue
-
-                    // Approximate contour to polygon
-                    val approx = MatOfPoint2f()
-                    val contour2f = MatOfPoint2f(*contour.toArray())
-                    val epsilon = 0.02 * Imgproc.arcLength(contour2f, true)
-                    Imgproc.approxPolyDP(contour2f, approx, epsilon, true)
-
-                    // Check if it's a quadrilateral
-                    if (approx.total() == 4L && Imgproc.isContourConvex(MatOfPoint(*approx.toArray()))) {
-                        val points = approx.toArray()
-
-                        if (contourArea > largestArea) {
-                            largestArea = contourArea
-                            largestRectangle = orderPoints(points)
+                fun findLargestRectangle(source: Mat): Rectangle? {
+                    val contours = mutableListOf<MatOfPoint>()
+                    val hierarchy = Mat()
+                    Imgproc.findContours(
+                        source,
+                        contours,
+                        hierarchy,
+                        Imgproc.RETR_EXTERNAL,
+                        Imgproc.CHAIN_APPROX_SIMPLE
+                    )
+
+                    var largestRectangle: Rectangle? = null
+                    var largestArea = 0.0
+                    val minArea = max(500.0, (srcMat.rows() * srcMat.cols()) * 0.0008)
+
+                    for (contour in contours) {
+                        val contourArea = Imgproc.contourArea(contour)
+                        if (contourArea < minArea) continue
+
+                        val approx = MatOfPoint2f()
+                        val contour2f = MatOfPoint2f(*contour.toArray())
+                        val epsilon = 0.018 * Imgproc.arcLength(contour2f, true)
+                        Imgproc.approxPolyDP(contour2f, approx, epsilon, true)
+
+                        if (approx.total() == 4L && Imgproc.isContourConvex(MatOfPoint(*approx.toArray()))) {
+                            val points = approx.toArray()
+                            if (contourArea > largestArea) {
+                                largestArea = contourArea
+                                largestRectangle = orderPoints(points)
+                            }
                         }
+
+                        approx.release()
+                        contour2f.release()
                     }
 
-                    approx.release()
-                    contour2f.release()
+                    hierarchy.release()
+                    contours.forEach { it.release() }
+                    return largestRectangle
                 }
 
-                hierarchy.release()
-                contours.forEach { it.release() }
+                // First pass: Canny-based edges (good for strong edges).
+                var rectangle = findLargestRectangle(morphMat)
+
+                // Fallback: adaptive threshold (better for low-contrast cards).
+                if (rectangle == null) {
+                    Imgproc.adaptiveThreshold(
+                        blurredMat,
+                        threshMat,
+                        255.0,
+                        Imgproc.ADAPTIVE_THRESH_GAUSSIAN_C,
+                        Imgproc.THRESH_BINARY,
+                        15,
+                        2.0
+                    )
+                    val kernel = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, Size(3.0, 3.0))
+                    Imgproc.morphologyEx(threshMat, morphMat, Imgproc.MORPH_CLOSE, kernel)
+                    kernel.release()
+                    rectangle = findLargestRectangle(morphMat)
+                }
 
-                return largestRectangle
+                return rectangle
             } finally {
                 grayMat.release()
                 blurredMat.release()
                 cannyMat.release()
                 morphMat.release()
+                threshMat.release()
             }
         }
 
@@ -242,7 +260,7 @@ class DocumentDetector {
             }
 
             val minDim = kotlin.math.min(viewWidth.toDouble(), viewHeight.toDouble())
-            val angleThreshold = max(40.0, minDim * 0.06)
+            val angleThreshold = max(60.0, minDim * 0.08)
 
             val topYDiff = abs(rectangle.topRight.y - rectangle.topLeft.y)
             val bottomYDiff = abs(rectangle.bottomLeft.y - rectangle.bottomRight.y)
@@ -253,7 +271,7 @@ class DocumentDetector {
                 return RectangleQuality.BAD_ANGLE
             }
 
-            val margin = max(80.0, minDim * 0.08)
+            val margin = max(120.0, minDim * 0.12)
             if (rectangle.topLeft.y > margin ||
                 rectangle.topRight.y > margin ||
                 rectangle.bottomLeft.y < (viewHeight - margin) ||

package/dist/DocScanner.js

@@ -291,10 +291,11 @@ exports.DocScanner = (0, react_1.forwardRef)(({ onCapture, overlayColor = DEFAUL
         if (payload.rectangleCoordinates || payload.rectangleOnScreen) {
             lastRectangleRef.current = payload.rectangleCoordinates ?? payload.rectangleOnScreen ?? null;
         }
-        const isGoodRectangle = payload.lastDetectionType === 0;
-        const hasValidRectangle = isGoodRectangle && rectangleOnScreen;
-        // 그리드를 표시할 조건: 좋은 품질의 사각형이 화면에 있을 때만
-        if (hasValidRectangle) {
+        const hasAnyRectangle = react_native_1.Platform.OS === 'android'
+            ? Boolean(rectangleOnScreen || payload.rectangleCoordinates)
+            : payload.lastDetectionType === 0 && Boolean(rectangleOnScreen);
+        // 그리드를 표시할 조건: 사각형이 잡히면 품질과 무관하게 표시
+        if (hasAnyRectangle) {
             // 기존 타임아웃 클리어
             if (rectangleClearTimeoutRef.current) {
                 clearTimeout(rectangleClearTimeoutRef.current);

package/package.json

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

package/src/DocScanner.tsx

@@ -397,11 +397,13 @@ export const DocScanner = forwardRef<DocScannerHandle, Props>(
           lastRectangleRef.current = payload.rectangleCoordinates ?? payload.rectangleOnScreen ?? null;
         }
 
-        const isGoodRectangle = payload.lastDetectionType === 0;
-        const hasValidRectangle = isGoodRectangle && rectangleOnScreen;
+        const hasAnyRectangle =
+          Platform.OS === 'android'
+            ? Boolean(rectangleOnScreen || payload.rectangleCoordinates)
+            : payload.lastDetectionType === 0 && Boolean(rectangleOnScreen);
 
-        // 그리드를 표시할 조건: 좋은 품질의 사각형이 화면에 있을 때만
-        if (hasValidRectangle) {
+        // 그리드를 표시할 조건: 사각형이 잡히면 품질과 무관하게 표시
+        if (hasAnyRectangle) {
           // 기존 타임아웃 클리어
           if (rectangleClearTimeoutRef.current) {
             clearTimeout(rectangleClearTimeoutRef.current);