react-native-rectangle-doc-scanner 3.174.0 → 3.176.0

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

@@ -145,6 +145,7 @@ class CameraController(
             Log.d(TAG, "[BIND] PreviewView.surfaceProvider: ${previewView.surfaceProvider}")
             Log.d(TAG, "[BIND] PreviewView attached to window: ${previewView.isAttachedToWindow}")
             Log.d(TAG, "[BIND] PreviewView size: ${previewView.width}x${previewView.height}")
+            Log.d(TAG, "[BIND] PreviewView implementationMode: ${previewView.implementationMode}")
             // Unbind all use cases before rebinding
             Log.d(TAG, "[BIND] Unbinding all existing use cases...")
             cameraProvider.unbindAll()
@@ -167,10 +168,15 @@ class CameraController(
             Log.d(TAG, "[BIND] Setting surface provider to previewView...")
             Log.d(TAG, "[BIND] PreviewView: $previewView")
             Log.d(TAG, "[BIND] PreviewView.surfaceProvider: ${previewView.surfaceProvider}")
-            // Devices with the SurfaceOrderQuirk expect the preview surface to be set last.
-            // Apply the SurfaceProvider after binding so the preview stays on top.
-            preview.setSurfaceProvider(previewView.surfaceProvider)
-            Log.d(TAG, "[BIND] Surface provider set successfully")
+            // TextureView(Compatibility) 모드에서는 SurfaceProvider를 먼저 지정해도 순서 문제가 없다.
+            // PERFORMANCE 모드(SurfaceView)에서는 SurfaceOrderQuirk 대응을 위해 바인딩 이후에 지정한다.
+            if (previewView.implementationMode == PreviewView.ImplementationMode.COMPATIBLE) {
+                preview.setSurfaceProvider(previewView.surfaceProvider)
+                Log.d(TAG, "[BIND] Surface provider set immediately (COMPATIBLE mode)")
+            } else {
+                preview.setSurfaceProvider(previewView.surfaceProvider)
+                Log.d(TAG, "[BIND] Surface provider set after binding (PERFORMANCE mode)")
+            }
 
             // Restore torch state if it was enabled
             if (torchEnabled) {

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

@@ -119,21 +119,42 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
 
-        // Wait for view to be laid out before starting camera
-        viewTreeObserver.addOnGlobalLayoutListener(object : android.view.ViewTreeObserver.OnGlobalLayoutListener {
-            override fun onGlobalLayout() {
-                viewTreeObserver.removeOnGlobalLayoutListener(this)
-
-                if (width > 0 && height > 0 && previewView.width > 0 && previewView.height > 0) {
-                    Log.d(TAG, "[LAYOUT] View laid out: width=$width, height=$height")
-                    Log.d(TAG, "[LAYOUT] PreviewView: width=${previewView.width}, height=${previewView.height}")
+        // Initialize camera immediately or on next layout
+        initializeCameraWhenReady()
+    }
+
+    private fun initializeCameraWhenReady() {
+        // If view is already laid out, start camera immediately
+        if (width > 0 && height > 0) {
+            Log.d(TAG, "[INIT] View already laid out, starting camera immediately")
+            Log.d(TAG, "[INIT] View: width=$width, height=$height")
+            Log.d(TAG, "[INIT] PreviewView: width=${previewView.width}, height=${previewView.height}")
+            setupCamera()
+            startCamera()
+        } else {
+            // Otherwise, wait for layout
+            Log.d(TAG, "[INIT] View not laid out yet, waiting for layout")
+            post {
+                if (width > 0 && height > 0) {
+                    Log.d(TAG, "[INIT] View laid out after post: width=$width, height=$height")
                     setupCamera()
                     startCamera()
                 } else {
-                    Log.e(TAG, "[LAYOUT] View or PreviewView has invalid dimensions")
+                    // Fallback: use ViewTreeObserver if still not ready
+                    Log.d(TAG, "[INIT] Still not laid out, using ViewTreeObserver")
+                    viewTreeObserver.addOnGlobalLayoutListener(object : android.view.ViewTreeObserver.OnGlobalLayoutListener {
+                        override fun onGlobalLayout() {
+                            if (width > 0 && height > 0) {
+                                viewTreeObserver.removeOnGlobalLayoutListener(this)
+                                Log.d(TAG, "[INIT] View laid out via observer: width=$width, height=$height")
+                                setupCamera()
+                                startCamera()
+                            }
+                        }
+                    })
                 }
             }
-        })
+        }
     }
 
     private fun setupCamera() {

package/package.json

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