@capgo/camera-preview 7.4.0-beta.6 → 7.4.0-beta.8

package/ios/Sources/CapgoCameraPreview/Plugin.swift

@@ -60,11 +60,16 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         CAPPluginMethod(name: "setDeviceId", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getDeviceId", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "setAspectRatio", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "getAspectRatio", returnType: CAPPluginReturnPromise)
+        CAPPluginMethod(name: "getAspectRatio", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setGridMode", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getGridMode", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getPreviewSize", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setPreviewSize", returnType: CAPPluginReturnPromise)
     ]
     // Camera state tracking
     private var isInitializing: Bool = false
     private var isInitialized: Bool = false
+    private var backgroundSession: AVCaptureSession?
 
     var previewView: UIView!
     var cameraPosition = String()
@@ -83,7 +88,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
     var locationManager: CLLocationManager?
     var currentLocation: CLLocation?
     private var aspectRatio: String?
-    
+    private var gridMode: String = "none"
+
     // MARK: - Transparency Methods
 
 
@@ -135,14 +141,26 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         let paddingBottom = self.paddingBottom ?? 0
         let height = heightValue - paddingBottom
 
-        if UIWindow.isLandscape {
-            previewView.frame = CGRect(x: posY, y: posX, width: max(height, width), height: min(height, width))
-            self.cameraController.previewLayer?.frame = previewView.frame
-        }
+        // Handle auto-centering during rotation
+        if posX == -1 || posY == -1 {
+            // Trigger full recalculation for auto-centered views
+            self.updateCameraFrame()
+        } else {
+            // Manual positioning - use original rotation logic with no animation
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+            
+            if UIWindow.isLandscape {
+                previewView.frame = CGRect(x: posY, y: posX, width: max(height, width), height: min(height, width))
+                self.cameraController.previewLayer?.frame = previewView.bounds
+            }
 
-        if UIWindow.isPortrait {
-            previewView.frame = CGRect(x: posX, y: posY, width: min(height, width), height: max(height, width))
-            self.cameraController.previewLayer?.frame = previewView.frame
+            if UIWindow.isPortrait {
+                previewView.frame = CGRect(x: posX, y: posY, width: min(height, width), height: max(height, width))
+                self.cameraController.previewLayer?.frame = previewView.bounds
+            }
+            
+            CATransaction.commit()
         }
 
         if let connection = self.cameraController.fileVideoOutput?.connection(with: .video) {
@@ -162,11 +180,14 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
 
         cameraController.updateVideoOrientation()
 
-                cameraController.updateVideoOrientation()
+        cameraController.updateVideoOrientation()
 
-        // Update grid overlay frame if it exists
+        // Update grid overlay frame if it exists - no animation
         if let gridOverlay = self.cameraController.gridOverlayView {
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
             gridOverlay.frame = previewView.bounds
+            CATransaction.commit()
         }
 
         // Ensure webview remains transparent after rotation
@@ -174,15 +195,71 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             self.makeWebViewTransparent()
         }
     }
-    
+
     @objc func setAspectRatio(_ call: CAPPluginCall) {
         guard self.isInitialized else {
             call.reject("camera not started")
             return
         }
-        self.aspectRatio = call.getString("aspectRatio")
+        
+        guard let newAspectRatio = call.getString("aspectRatio") else {
+            call.reject("aspectRatio parameter is required")
+            return
+        }
+        
+        self.aspectRatio = newAspectRatio
+        
+        // When aspect ratio changes, calculate maximum size possible from current position
+        if let posX = self.posX, let posY = self.posY {
+            let webViewWidth = self.webView?.frame.width ?? UIScreen.main.bounds.width
+            let webViewHeight = self.webView?.frame.height ?? UIScreen.main.bounds.height
+            let paddingBottom = self.paddingBottom ?? 0
+            
+            // Calculate available space from current position
+            let availableWidth: CGFloat
+            let availableHeight: CGFloat
+            
+            if posX == -1 || posY == -1 {
+                // Auto-centering mode - use full dimensions
+                availableWidth = webViewWidth
+                availableHeight = webViewHeight - paddingBottom
+            } else {
+                // Manual positioning - calculate remaining space
+                availableWidth = webViewWidth - posX
+                availableHeight = webViewHeight - posY - paddingBottom
+            }
+            
+            // Parse aspect ratio - convert to portrait orientation for camera use
+            let ratioParts = newAspectRatio.split(separator: ":").map { Double($0) ?? 1.0 }
+            // For camera, we want portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+            let ratio = ratioParts[1] / ratioParts[0]
+            
+            // Calculate maximum size that fits the aspect ratio in available space
+            let maxWidthByHeight = availableHeight * CGFloat(ratio)
+            let maxHeightByWidth = availableWidth / CGFloat(ratio)
+            
+            if maxWidthByHeight <= availableWidth {
+                // Height is the limiting factor
+                self.width = maxWidthByHeight
+                self.height = availableHeight
+            } else {
+                // Width is the limiting factor
+                self.width = availableWidth
+                self.height = maxHeightByWidth
+            }
+            
+            print("[CameraPreview] Aspect ratio changed to \(newAspectRatio), new size: \(self.width!)x\(self.height!)")
+        }
+        
         self.updateCameraFrame()
-        call.resolve()
+        
+        // Return the actual preview bounds
+        var result = JSObject()
+        result["x"] = Double(self.previewView.frame.origin.x)
+        result["y"] = Double(self.previewView.frame.origin.y)
+        result["width"] = Double(self.previewView.frame.width)
+        result["height"] = Double(self.previewView.frame.height)
+        call.resolve(result)
     }
 
     @objc func getAspectRatio(_ call: CAPPluginCall) {
@@ -190,9 +267,42 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             call.reject("camera not started")
             return
         }
-        call.resolve(["aspectRatio": self.aspectRatio ?? "fill"])
+        call.resolve(["aspectRatio": self.aspectRatio ?? "4:3"])
+    }
+
+    @objc func setGridMode(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+
+        guard let gridMode = call.getString("gridMode") else {
+            call.reject("gridMode parameter is required")
+            return
+        }
+
+        self.gridMode = gridMode
+
+        // Update grid overlay
+        DispatchQueue.main.async {
+            if gridMode == "none" {
+                self.cameraController.removeGridOverlay()
+            } else {
+                self.cameraController.addGridOverlay(to: self.previewView, gridMode: gridMode)
+            }
+        }
+
+        call.resolve()
+    }
+
+    @objc func getGridMode(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+        call.resolve(["gridMode": self.gridMode])
     }
-    
+
     @objc func appDidBecomeActive() {
         if self.isInitialized {
             DispatchQueue.main.async {
@@ -308,18 +418,33 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         self.highResolutionOutput = call.getBool("enableHighResolution") ?? false
         self.cameraController.highResolutionOutput = self.highResolutionOutput
 
-        if call.getInt("width") != nil {
-            self.width = CGFloat(call.getInt("width")!)
+        // Set width - use screen width if not provided or if 0
+        if let width = call.getInt("width"), width > 0 {
+            self.width = CGFloat(width)
         } else {
             self.width = UIScreen.main.bounds.size.width
         }
-        if call.getInt("height") != nil {
-            self.height = CGFloat(call.getInt("height")!)
+
+        // Set height - use screen height if not provided or if 0
+        if let height = call.getInt("height"), height > 0 {
+            self.height = CGFloat(height)
         } else {
             self.height = UIScreen.main.bounds.size.height
         }
-        self.posX = call.getInt("x") != nil ? CGFloat(call.getInt("x")!)/UIScreen.main.scale: 0
-        self.posY = call.getInt("y") != nil ? CGFloat(call.getInt("y")!) / (call.getBool("includeSafeAreaInsets") ?? false ? 1.0 : UIScreen.main.scale) + (call.getBool("includeSafeAreaInsets") ?? false ? UIApplication.shared.windows.first?.safeAreaInsets.top ?? 0 : 0) : 0
+
+        // Set x position - use exact CSS pixel value from web view, or mark for centering
+        if let x = call.getInt("x") {
+            self.posX = CGFloat(x)
+        } else {
+            self.posX = -1 // Use -1 to indicate auto-centering
+        }
+
+        // Set y position - use exact CSS pixel value from web view, or mark for centering
+        if let y = call.getInt("y") {
+            self.posY = CGFloat(y)
+        } else {
+            self.posY = -1 // Use -1 to indicate auto-centering
+        }
         if call.getInt("paddingBottom") != nil {
             self.paddingBottom = CGFloat(call.getInt("paddingBottom")!)
         }
@@ -330,7 +455,15 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         self.enableZoom = call.getBool("enableZoom") ?? false
         self.disableAudio = call.getBool("disableAudio") ?? true
         self.aspectRatio = call.getString("aspectRatio")
-        let gridMode = call.getString("gridMode") ?? "none"
+        self.gridMode = call.getString("gridMode") ?? "none"
+        if self.aspectRatio != nil && (call.getInt("width") != nil || call.getInt("height") != nil) {
+            call.reject("Cannot set both aspectRatio and size (width/height). Use setPreviewSize after start.")
+            return
+        }
+
+        print("[CameraPreview] Camera start parameters - aspectRatio: \(String(describing: self.aspectRatio)), gridMode: \(self.gridMode)")
+        print("[CameraPreview] Screen dimensions: \(UIScreen.main.bounds.size)")
+        print("[CameraPreview] Final frame dimensions - width: \(self.width), height: \(self.height), x: \(self.posX), y: \(self.posY)")
 
         AVCaptureDevice.requestAccess(for: .video, completionHandler: { (granted: Bool) in
             guard granted else {
@@ -348,55 +481,73 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                             call.reject(error.localizedDescription)
                             return
                         }
-                        self.updateCameraFrame()
-                        
-                        // Make webview transparent - comprehensive approach
-                        self.makeWebViewTransparent()
+                        self.completeStartCamera(call: call)
+                    }
+                }
+            }
+        })
+    }
 
+    override public func load() {
+        super.load()
+        // Initialize camera session in background for faster startup
+        prepareBackgroundCamera()
+    }
 
-                        self.webView?.superview?.addSubview(self.previewView)
-                        if self.toBack! {
-                            self.webView?.superview?.bringSubviewToFront(self.webView!)
-                        }
-                        try? self.cameraController.displayPreview(on: self.previewView)
+    private func prepareBackgroundCamera() {
+        DispatchQueue.global(qos: .background).async {
+            AVCaptureDevice.requestAccess(for: .video) { granted in
+                guard granted else { return }
+                
+                // Pre-initialize camera controller for faster startup
+                DispatchQueue.main.async {
+                    self.cameraController.prepareBasicSession()
+                }
+            }
+        }
+    }
 
-                        let frontView = self.toBack! ? self.webView : self.previewView
-                        self.cameraController.setupGestures(target: frontView ?? self.previewView, enableZoom: self.enableZoom!)
+    private func completeStartCamera(call: CAPPluginCall) {
+        // Create and configure the preview view first
+        self.updateCameraFrame()
 
-                        // Add grid overlay if enabled
-                        if gridMode != "none" {
-                            self.cameraController.addGridOverlay(to: self.previewView, gridMode: gridMode)
-                        }
+        // Make webview transparent - comprehensive approach
+        self.makeWebViewTransparent()
 
-                        // Add grid overlay if enabled
-                        if gridMode != "none" {
-                            self.cameraController.addGridOverlay(to: self.previewView, gridMode: gridMode)
-                        }
+        // Add the preview view to the webview itself to use same coordinate system
+        self.webView?.addSubview(self.previewView)
+        if self.toBack! {
+            self.webView?.sendSubviewToBack(self.previewView)
+        }
 
-                        if self.rotateWhenOrientationChanged == true {
-                            NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
-                        }
+        // Display the camera preview on the configured view
+        try? self.cameraController.displayPreview(on: self.previewView)
+
+        let frontView = self.toBack! ? self.webView : self.previewView
+        self.cameraController.setupGestures(target: frontView ?? self.previewView, enableZoom: self.enableZoom!)
 
+        // Add grid overlay if enabled
+        if self.gridMode != "none" {
+            self.cameraController.addGridOverlay(to: self.previewView, gridMode: self.gridMode)
+        }
 
-                        // Add observers for app state changes to maintain transparency
-                        NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.appDidBecomeActive), name: UIApplication.didBecomeActiveNotification, object: nil)
-                        NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.appWillEnterForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
+        if self.rotateWhenOrientationChanged == true {
+            NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
+        }
 
-                        self.isInitializing = false
-                        self.isInitialized = true
-                        
-                        var returnedObject = JSObject()
-                        returnedObject["width"] = self.previewView.frame.width as any JSValue
-                        returnedObject["height"] = self.previewView.frame.height as any JSValue
-                        returnedObject["x"] = self.previewView.frame.origin.x as any JSValue
-                        returnedObject["y"] = self.previewView.frame.origin.y as any JSValue
-                        call.resolve(returnedObject)
+        // Add observers for app state changes to maintain transparency
+        NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.appDidBecomeActive), name: UIApplication.didBecomeActiveNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.appWillEnterForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
 
-                    }
-                }
-            }
-        })
+        self.isInitializing = false
+        self.isInitialized = true
 
+        var returnedObject = JSObject()
+        returnedObject["width"] = self.previewView.frame.width as any JSValue
+        returnedObject["height"] = self.previewView.frame.height as any JSValue
+        returnedObject["x"] = self.previewView.frame.origin.x as any JSValue
+        returnedObject["y"] = self.previewView.frame.origin.y as any JSValue
+        call.resolve(returnedObject)
     }
 
     @objc func flip(_ call: CAPPluginCall) {
@@ -424,8 +575,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                         try self.cameraController.switchCameras()
 
                         DispatchQueue.main.async {
+                            // Update preview layer frame without animation
+                            CATransaction.begin()
+                            CATransaction.setDisableActions(true)
                             self.cameraController.previewLayer?.frame = self.previewView.bounds
                             self.cameraController.previewLayer?.videoGravity = .resizeAspectFill
+                            CATransaction.commit()
+                            
                             self.previewView.isUserInteractionEnabled = true
 
 
@@ -876,8 +1032,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                     try self.cameraController.swapToDevice(deviceId: deviceId)
 
                     DispatchQueue.main.async {
+                        // Update preview layer frame without animation
+                        CATransaction.begin()
+                        CATransaction.setDisableActions(true)
                         self.cameraController.previewLayer?.frame = self.previewView.bounds
                         self.cameraController.previewLayer?.videoGravity = .resizeAspectFill
+                        CATransaction.commit()
+                        
                         self.previewView.isUserInteractionEnabled = true
 
 
@@ -921,36 +1082,130 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
     }
 
     private func updateCameraFrame() {
-        guard let width = self.width, var height = self.height, let posX = self.posX, let posY = self.posY else { return }
+        guard let width = self.width, var height = self.height, let posX = self.posX, let posY = self.posY else {
+            return
+        }
+
         let paddingBottom = self.paddingBottom ?? 0
         height -= paddingBottom
 
-        var frame = CGRect(x: posX, y: posY, width: width, height: height)
-
-        if let aspectRatio = self.aspectRatio, aspectRatio != "fill" {
-            let ratioParts = aspectRatio.split(separator: ":").map { Double($0) ?? 1.0 }
-            let ratio = ratioParts[0] / ratioParts[1]
-            let viewWidth = Double(width)
-            let viewHeight = Double(height)
+        // Cache webView dimensions for performance
+        let webViewWidth = self.webView?.frame.width ?? UIScreen.main.bounds.width
+        let webViewHeight = self.webView?.frame.height ?? UIScreen.main.bounds.height
+
+        var finalX = posX
+        var finalY = posY
+        var finalWidth = width
+        var finalHeight = height
+
+        // Handle auto-centering when position is -1
+        if posX == -1 || posY == -1 {
+            finalWidth = webViewWidth
+            
+            // Calculate height based on aspect ratio or use provided height
+            if let aspectRatio = self.aspectRatio {
+                let ratioParts = aspectRatio.split(separator: ":").compactMap { Double($0) }
+                if ratioParts.count == 2 {
+                    // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+                    let ratio = ratioParts[1] / ratioParts[0]
+                    finalHeight = finalWidth / CGFloat(ratio)
+                }
+            }
+            
+            finalX = posX == -1 ? 0 : posX
+            
+            if posY == -1 {
+                let availableHeight = webViewHeight - paddingBottom
+                finalY = finalHeight < availableHeight ? (availableHeight - finalHeight) / 2 : 0
+            }
+        }
 
-            if viewWidth / ratio > viewHeight {
-                let newWidth = viewHeight * ratio
-                frame.origin.x += (viewWidth - newWidth) / 2
-                frame.size.width = newWidth
-            } else {
-                let newHeight = viewWidth / ratio
-                frame.origin.y += (viewHeight - newHeight) / 2
-                frame.size.height = newHeight
+        var frame = CGRect(x: finalX, y: finalY, width: finalWidth, height: finalHeight)
+
+        // Apply aspect ratio adjustments only if not auto-centering
+        if posX != -1 && posY != -1, let aspectRatio = self.aspectRatio {
+            let ratioParts = aspectRatio.split(separator: ":").compactMap { Double($0) }
+            if ratioParts.count == 2 {
+                // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+                let ratio = ratioParts[1] / ratioParts[0]
+                let currentRatio = Double(finalWidth) / Double(finalHeight)
+                
+                if currentRatio > ratio {
+                    let newWidth = Double(finalHeight) * ratio
+                    frame.origin.x = finalX + (Double(finalWidth) - newWidth) / 2
+                    frame.size.width = CGFloat(newWidth)
+                } else {
+                    let newHeight = Double(finalWidth) / ratio
+                    frame.origin.y = finalY + (Double(finalHeight) - newHeight) / 2
+                    frame.size.height = CGFloat(newHeight)
+                }
             }
         }
+
+        // Disable ALL animations for frame updates - we want instant positioning
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
         
+        // Batch UI updates for better performance
         if self.previewView == nil {
             self.previewView = UIView(frame: frame)
+            self.previewView.backgroundColor = UIColor.clear
         } else {
             self.previewView.frame = frame
         }
+
+        // Update preview layer frame efficiently
+        if let previewLayer = self.cameraController.previewLayer {
+            previewLayer.frame = self.previewView.bounds
+        }
+        
+        // Update grid overlay frame if it exists
+        if let gridOverlay = self.cameraController.gridOverlayView {
+            gridOverlay.frame = self.previewView.bounds
+        }
+        
+        CATransaction.commit()
+    }
+
+    @objc func getPreviewSize(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+        var result = JSObject()
+        result["x"] = Double(self.previewView.frame.origin.x)
+        result["y"] = Double(self.previewView.frame.origin.y)
+        result["width"] = Double(self.previewView.frame.width)
+        result["height"] = Double(self.previewView.frame.height)
+        call.resolve(result)
+    }
+
+    @objc func setPreviewSize(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+        
+        // Only update position if explicitly provided, otherwise keep auto-centering
+        if let x = call.getInt("x") { 
+            self.posX = CGFloat(x) 
+        }
+        if let y = call.getInt("y") { 
+            self.posY = CGFloat(y) 
+        }
+        if let width = call.getInt("width") { self.width = CGFloat(width) }
+        if let height = call.getInt("height") { self.height = CGFloat(height) }
+        
+        // Direct update without animation for better performance
+        self.updateCameraFrame()
+        self.makeWebViewTransparent()
         
-        // Update the preview layer frame to match the preview view
-        self.cameraController.previewLayer?.frame = frame
+        // Return the actual preview bounds
+        var result = JSObject()
+        result["x"] = Double(self.previewView.frame.origin.x)
+        result["y"] = Double(self.previewView.frame.origin.y)
+        result["width"] = Double(self.previewView.frame.width)
+        result["height"] = Double(self.previewView.frame.height)
+        call.resolve(result)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "7.4.0-beta.6",
+  "version": "7.4.0-beta.8",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {