react-native-rectangle-doc-scanner 3.139.0 → 3.142.0

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

@@ -6,6 +6,7 @@ import org.opencv.android.Utils
 import org.opencv.core.*
 import org.opencv.imgproc.Imgproc
 import kotlin.math.abs
+import kotlin.math.max
 import kotlin.math.sqrt
 
 data class Rectangle(
@@ -249,14 +250,34 @@ class DocumentDetector {
             viewWidth: Int,
             viewHeight: Int
         ): Rectangle {
-            val scaleX = viewWidth.toDouble() / imageWidth
-            val scaleY = viewHeight.toDouble() / imageHeight
+            if (imageWidth == 0 || imageHeight == 0 || viewWidth == 0 || viewHeight == 0) {
+                return rectangle
+            }
+
+            val scale = max(
+                viewWidth.toDouble() / imageWidth.toDouble(),
+                viewHeight.toDouble() / imageHeight.toDouble()
+            )
+
+            val scaledImageWidth = imageWidth * scale
+            val scaledImageHeight = imageHeight * scale
+            val offsetX = (scaledImageWidth - viewWidth) / 2.0
+            val offsetY = (scaledImageHeight - viewHeight) / 2.0
+
+            fun mapPoint(point: Point): Point {
+                val x = (point.x * scale) - offsetX
+                val y = (point.y * scale) - offsetY
+                return Point(
+                    x.coerceIn(0.0, viewWidth.toDouble()),
+                    y.coerceIn(0.0, viewHeight.toDouble())
+                )
+            }
 
             return Rectangle(
-                Point(rectangle.topLeft.x * scaleX, rectangle.topLeft.y * scaleY),
-                Point(rectangle.topRight.x * scaleX, rectangle.topRight.y * scaleY),
-                Point(rectangle.bottomLeft.x * scaleX, rectangle.bottomLeft.y * scaleY),
-                Point(rectangle.bottomRight.x * scaleX, rectangle.bottomRight.y * scaleY)
+                mapPoint(rectangle.topLeft),
+                mapPoint(rectangle.topRight),
+                mapPoint(rectangle.bottomLeft),
+                mapPoint(rectangle.bottomRight)
             )
         }
     }

package/dist/FullDocScanner.js

@@ -596,7 +596,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.confirmButton, styles.retakeButton], onPress: handleRetake, accessibilityLabel: mergedStrings.retake, accessibilityRole: "button" },
                     react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.retake)),
                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.confirmButton, styles.confirmButtonPrimary], onPress: handleConfirm, accessibilityLabel: mergedStrings.confirm, accessibilityRole: "button" },
-                    react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.confirm))))) : react_native_1.Platform.OS === 'ios' ? (react_1.default.createElement(react_native_1.View, { style: styles.flex },
+                    react_1.default.createElement(react_native_1.Text, { style: styles.confirmButtonText }, mergedStrings.confirm))))) : (react_1.default.createElement(react_native_1.View, { style: styles.flex },
             react_1.default.createElement(DocScanner_1.DocScanner, { key: scannerSession, ref: docScannerRef, autoCapture: false, overlayColor: overlayColor, showGrid: showGrid, gridColor: resolvedGridColor, gridLineWidth: gridLineWidth, minStableFrames: minStableFrames ?? 6, detectionConfig: detectionConfig, onCapture: handleCapture, onRectangleDetect: handleRectangleDetect, showManualCaptureButton: false, enableTorch: flashEnabled },
                 react_1.default.createElement(react_native_1.View, { style: styles.overlayTop, pointerEvents: "box-none" },
                     react_1.default.createElement(react_native_1.TouchableOpacity, { style: [
@@ -624,10 +624,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                                 styles.shutterInner,
                                 rectangleHint && { backgroundColor: overlayColor }
                             ] })),
-                    react_1.default.createElement(react_native_1.View, { style: styles.rightButtonsPlaceholder }))))) : (react_1.default.createElement(react_native_1.View, { style: styles.flex },
-            react_1.default.createElement(react_native_1.View, { style: styles.processingOverlay },
-                react_1.default.createElement(react_native_1.ActivityIndicator, { size: "large", color: overlayColor }),
-                react_1.default.createElement(react_native_1.Text, { style: styles.processingText }, "\uAC24\uB7EC\uB9AC\uC5D0\uC11C \uC774\uBBF8\uC9C0\uB97C \uC120\uD0DD\uD574\uC8FC\uC138\uC694...")))),
+                    react_1.default.createElement(react_native_1.View, { style: styles.rightButtonsPlaceholder }))))),
         processing && (react_1.default.createElement(react_native_1.View, { style: styles.processingOverlay },
             react_1.default.createElement(react_native_1.ActivityIndicator, { size: "large", color: overlayColor }),
             mergedStrings.processing && (react_1.default.createElement(react_native_1.Text, { style: styles.processingText }, mergedStrings.processing))))));

package/package.json

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

package/src/FullDocScanner.tsx

@@ -5,7 +5,6 @@ import {
   Image,
   InteractionManager,
   NativeModules,
-  Platform,
   StyleSheet,
   Text,
   TouchableOpacity,
@@ -891,7 +890,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
             </TouchableOpacity>
           </View>
         </View>
-      ) : Platform.OS === 'ios' ? (
+      ) : (
         <View style={styles.flex}>
           <DocScanner
             key={scannerSession}
@@ -989,13 +988,6 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
           </View>
         </DocScanner>
         </View>
-      ) : (
-        <View style={styles.flex}>
-          <View style={styles.processingOverlay}>
-            <ActivityIndicator size="large" color={overlayColor} />
-            <Text style={styles.processingText}>갤러리에서 이미지를 선택해주세요...</Text>
-          </View>
-        </View>
       )}
 
       {processing && (