react-native-rectangle-doc-scanner 3.145.0 → 3.147.0

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

@@ -18,7 +18,10 @@ import androidx.camera.core.Preview
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.view.PreviewView
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import com.facebook.react.uimanager.ThemedReactContext
 import com.google.common.util.concurrent.ListenableFuture
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -27,7 +30,7 @@ import java.util.concurrent.Executors
  * CameraView with real-time document detection, grid overlay, and rectangle overlay
  * Matches iOS implementation behavior
  */
-class CameraView(context: Context) : FrameLayout(context) {
+class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
     private val TAG = "CameraView"
 
     private val previewView: PreviewView
@@ -40,9 +43,12 @@ class CameraView(context: Context) : FrameLayout(context) {
     private var camera: Camera? = null
 
     private val cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor()
+    private val lifecycleRegistry = LifecycleRegistry(this)
     // Callback for detected rectangles
     var onRectangleDetected: ((Rectangle?) -> Unit)? = null
 
+    override fun getLifecycle(): Lifecycle = lifecycleRegistry
+
     init {
         // Create preview view
         previewView = PreviewView(context).apply {
@@ -56,6 +62,7 @@ class CameraView(context: Context) : FrameLayout(context) {
         addView(overlayView)
 
         Log.d(TAG, "CameraView initialized")
+        lifecycleRegistry.currentState = Lifecycle.State.CREATED
     }
 
     /**
@@ -83,16 +90,22 @@ class CameraView(context: Context) : FrameLayout(context) {
      */
     fun stopCamera() {
         cameraProvider?.unbindAll()
-        cameraExecutor.shutdown()
+        if (lifecycleRegistry.currentState != Lifecycle.State.DESTROYED) {
+            lifecycleRegistry.currentState = Lifecycle.State.CREATED
+        }
     }
 
     /**
      * Bind camera use cases
      */
     private fun bindCamera() {
-        val lifecycleOwner = context as? LifecycleOwner
+        val lifecycleOwner = when (context) {
+            is LifecycleOwner -> context as LifecycleOwner
+            is ThemedReactContext -> context.currentActivity as? LifecycleOwner ?: context as? LifecycleOwner
+            else -> null
+        }
         if (lifecycleOwner == null) {
-            Log.e(TAG, "Context is not a LifecycleOwner")
+            Log.e(TAG, "Unable to resolve LifecycleOwner for CameraView")
             return
         }
 
@@ -132,6 +145,10 @@ class CameraView(context: Context) : FrameLayout(context) {
         } catch (e: Exception) {
             Log.e(TAG, "Failed to bind camera", e)
         }
+
+        if (lifecycleRegistry.currentState != Lifecycle.State.DESTROYED) {
+            lifecycleRegistry.currentState = Lifecycle.State.RESUMED
+        }
     }
 
     /**
@@ -190,17 +207,26 @@ class CameraView(context: Context) : FrameLayout(context) {
                     onRectangleDetected?.invoke(transformedRectangle)
                 }
             } catch (e: Exception) {
-                Log.e(TAG, "Failed to analyze frame", e)
-                post {
-                    overlayView.setDetectedRectangle(null)
-                    onRectangleDetected?.invoke(null)
-                }
-            } finally {
-                imageProxy.close()
+            Log.e(TAG, "Failed to analyze frame", e)
+            post {
+                overlayView.setDetectedRectangle(null)
+                onRectangleDetected?.invoke(null)
             }
+        } finally {
+            imageProxy.close()
         }
     }
 
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        stopCamera()
+        lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
+        if (!cameraExecutor.isShutdown) {
+            cameraExecutor.shutdown()
+        }
+    }
+    }
+
     /**
      * Overlay view for grid and rectangle
      */
@@ -260,10 +286,10 @@ class CameraView(context: Context) : FrameLayout(context) {
 
         private fun drawRectangle(canvas: Canvas, rect: Rectangle) {
             val path = Path().apply {
-                moveTo(rect.topLeft.x, rect.topLeft.y)
-                lineTo(rect.topRight.x, rect.topRight.y)
-                lineTo(rect.bottomRight.x, rect.bottomRight.y)
-                lineTo(rect.bottomLeft.x, rect.bottomLeft.y)
+                moveTo(rect.topLeft.x.toFloat(), rect.topLeft.y.toFloat())
+                lineTo(rect.topRight.x.toFloat(), rect.topRight.y.toFloat())
+                lineTo(rect.bottomRight.x.toFloat(), rect.bottomRight.y.toFloat())
+                lineTo(rect.bottomLeft.x.toFloat(), rect.bottomLeft.y.toFloat())
                 close()
             }
 

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

@@ -243,6 +243,7 @@ class DocumentDetector {
         /**
          * Transform rectangle coordinates from image space to view space
          */
+        @Suppress("UNUSED_PARAMETER")
         fun transformRectangleToViewCoordinates(
             rectangle: Rectangle,
             imageWidth: Int,

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

@@ -11,7 +11,9 @@ import android.util.Log
 import android.view.View
 import android.widget.FrameLayout
 import androidx.camera.view.PreviewView
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ThemedReactContext
@@ -20,11 +22,12 @@ import kotlinx.coroutines.*
 import java.io.File
 import kotlin.math.min
 
-class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context) {
+class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), LifecycleOwner {
     private val themedContext = context
     private val previewView: PreviewView
     private val overlayView: OverlayView
     private var cameraController: CameraController? = null
+    private val lifecycleRegistry = LifecycleRegistry(this)
 
     // Props (matching iOS)
     var overlayColor: Int = Color.parseColor("#80FFFFFF")
@@ -53,6 +56,8 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context) {
         private const val TAG = "DocumentScannerView"
     }
 
+    override fun getLifecycle(): Lifecycle = lifecycleRegistry
+
     init {
         // Create preview view
         previewView = PreviewView(context).apply {
@@ -69,20 +74,20 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context) {
         post {
             setupCamera()
         }
+
+        lifecycleRegistry.currentState = Lifecycle.State.CREATED
     }
 
     private fun setupCamera() {
         try {
-            val lifecycleOwner = context as? LifecycleOwner ?: run {
-                Log.e(TAG, "Context is not a LifecycleOwner")
-                return
-            }
-
-            cameraController = CameraController(context, lifecycleOwner, previewView)
+            cameraController = CameraController(context, this, previewView)
             cameraController?.onFrameAnalyzed = { rectangle, imageWidth, imageHeight ->
                 handleDetectionResult(rectangle, imageWidth, imageHeight)
             }
             lastDetectionTimestamp = 0L
+            if (lifecycleRegistry.currentState != Lifecycle.State.DESTROYED) {
+                lifecycleRegistry.currentState = Lifecycle.State.RESUMED
+            }
             cameraController?.startCamera(isUsingFrontCamera, true)
             if (isTorchEnabled) {
                 cameraController?.setTorchEnabled(true)
@@ -91,6 +96,7 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context) {
             Log.d(TAG, "Camera setup completed")
         } catch (e: Exception) {
             Log.e(TAG, "Failed to setup camera", e)
+            lifecycleRegistry.currentState = Lifecycle.State.CREATED
         }
     }
 
@@ -341,17 +347,22 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context) {
         if (isTorchEnabled) {
             cameraController?.setTorchEnabled(true)
         }
+        lifecycleRegistry.currentState = Lifecycle.State.RESUMED
     }
 
     fun stopCamera() {
         cameraController?.stopCamera()
         overlayView.setRectangle(null, overlayColor)
         stableCounter = 0
+        if (lifecycleRegistry.currentState != Lifecycle.State.DESTROYED) {
+            lifecycleRegistry.currentState = Lifecycle.State.CREATED
+        }
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         stopCamera()
+        lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
         cameraController?.shutdown()
         scope.cancel()
     }

package/dist/FullDocScanner.js

@@ -46,6 +46,18 @@ const DocScanner_1 = require("./DocScanner");
 // 회전은 항상 지원됨 (회전 각도를 반환하고 tdb 앱에서 처리)
 const isImageRotationSupported = () => true;
 const stripFileUri = (value) => value.replace(/^file:\/\//, '');
+const ensureFileUri = (value) => {
+    if (!value) {
+        return value ?? '';
+    }
+    if (value.startsWith('file://') || value.startsWith('content://')) {
+        return value;
+    }
+    if (value.startsWith('/')) {
+        return `file://${value}`;
+    }
+    return value;
+};
 const CROPPER_TIMEOUT_MS = 8000;
 const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -580,7 +592,7 @@ const FullDocScanner = ({ onResult, onClose, detectionConfig, overlayColor = '#3
                     react_1.default.createElement(react_native_1.Text, { style: styles.rotateButtonLabel }, "\uC6B0\uB85C 90\u00B0")))) : null,
             isBusinessMode && capturedPhotos.length === 0 && (react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.captureBackButton, onPress: handleCaptureSecondPhoto, accessibilityLabel: mergedStrings.secondBtn, accessibilityRole: "button" },
                 react_1.default.createElement(react_native_1.Text, { style: styles.captureBackButtonText }, mergedStrings.secondBtn))),
-            activePreviewImage ? (react_1.default.createElement(react_native_1.Image, { source: { uri: activePreviewImage.path }, style: [
+            activePreviewImage ? (react_1.default.createElement(react_native_1.Image, { source: { uri: ensureFileUri(activePreviewImage.path) }, style: [
                     styles.previewImage,
                     { transform: [{ rotate: `${rotationDegrees}deg` }] }
                 ], resizeMode: "contain" })) : null,

package/package.json

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

package/src/FullDocScanner.tsx

@@ -27,6 +27,19 @@ const isImageRotationSupported = () => true;
 
 const stripFileUri = (value: string) => value.replace(/^file:\/\//, '');
 
+const ensureFileUri = (value?: string | null) => {
+  if (!value) {
+    return value ?? '';
+  }
+  if (value.startsWith('file://') || value.startsWith('content://')) {
+    return value;
+  }
+  if (value.startsWith('/')) {
+    return `file://${value}`;
+  }
+  return value;
+};
+
 const CROPPER_TIMEOUT_MS = 8000;
 const CROPPER_TIMEOUT_CODE = 'cropper_timeout';
 
@@ -835,7 +848,7 @@ export const FullDocScanner: React.FC<FullDocScannerProps> = ({
 
           {activePreviewImage ? (
             <Image
-              source={{ uri: activePreviewImage.path }}
+              source={{ uri: ensureFileUri(activePreviewImage.path) }}
               style={[
                 styles.previewImage,
                 { transform: [{ rotate: `${rotationDegrees}deg` }] }