@capgo/camera-preview 7.4.0-beta.13 → 7.4.0-beta.16

package/ios/Sources/CapgoCameraPreview/Plugin.swift

@@ -84,7 +84,6 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
     var toBack: Bool?
     var storeToFile: Bool?
     var enableZoom: Bool?
-    var highResolutionOutput: Bool = false
     var disableAudio: Bool = false
     var locationManager: CLLocationManager?
     var currentLocation: CLLocation?
@@ -138,26 +137,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         let height = heightValue - paddingBottom
 
         // 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.bounds
-            }
-
-            CATransaction.commit()
-        }
+        // Always use the factorized method for consistent positioning
+        self.updateCameraFrame()
 
         if let connection = self.cameraController.fileVideoOutput?.connection(with: .video) {
             switch UIDevice.current.orientation {
@@ -206,48 +187,51 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         self.aspectRatio = newAspectRatio
 
         DispatchQueue.main.async {
-            // 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]
+            // When aspect ratio changes, always auto-center the view
+            // This ensures consistent behavior where changing aspect ratio recenters the view
+            self.posX = -1
+            self.posY = -1
+
+            // Calculate maximum size based on aspect ratio
+            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
+            let availableWidth: CGFloat
+            let availableHeight: CGFloat
+
+            if self.posX == -1 || self.posY == -1 {
+                // Auto-centering mode - use full dimensions
+                availableWidth = webViewWidth
+                availableHeight = webViewHeight - paddingBottom
+            } else {
+                // Manual positioning - calculate remaining space
+                availableWidth = webViewWidth - self.posX!
+                availableHeight = webViewHeight - self.posY! - paddingBottom
+            }
 
-                // Calculate maximum size that fits the aspect ratio in available space
-                let maxWidthByHeight = availableHeight * CGFloat(ratio)
-                let maxHeightByWidth = availableWidth / CGFloat(ratio)
+            // 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]
 
-                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
-                }
+            // Calculate maximum size that fits the aspect ratio in available space
+            let maxWidthByHeight = availableHeight * CGFloat(ratio)
+            let maxHeightByWidth = availableWidth / CGFloat(ratio)
 
-                print("[CameraPreview] Aspect ratio changed to \(newAspectRatio), new size: \(self.width!)x\(self.height!)")
+            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()
 
             // Return the actual preview bounds
@@ -412,8 +396,6 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         self.cameraPosition = call.getString("position") ?? "rear"
         let deviceId = call.getString("deviceId")
         let cameraMode = call.getBool("cameraMode") ?? false
-        self.highResolutionOutput = call.getBool("enableHighResolution") ?? false
-        self.cameraController.highResolutionOutput = self.highResolutionOutput
 
         // Set width - use screen width if not provided or if 0
         if let width = call.getInt("width"), width > 0 {
@@ -453,6 +435,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         self.disableAudio = call.getBool("disableAudio") ?? true
         self.aspectRatio = call.getString("aspectRatio")
         self.gridMode = call.getString("gridMode") ?? "none"
+        let initialZoomLevel = call.getFloat("initialZoomLevel") ?? 1.0
         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
@@ -471,12 +454,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             if self.cameraController.captureSession?.isRunning ?? false {
                 call.reject("camera already started")
             } else {
-                // Pre-initialize session if not already done
-                if self.cameraController.captureSession == nil {
-                    self.cameraController.prepareFullSession()
-                }
-
-                self.cameraController.prepare(cameraPosition: self.cameraPosition, deviceId: deviceId, disableAudio: self.disableAudio, cameraMode: cameraMode, aspectRatio: self.aspectRatio) {error in
+                self.cameraController.prepare(cameraPosition: self.cameraPosition, deviceId: deviceId, disableAudio: self.disableAudio, cameraMode: cameraMode, aspectRatio: self.aspectRatio, initialZoomLevel: Float(initialZoomLevel)) {error in
                     if let error = error {
                         print(error)
                         call.reject(error.localizedDescription)
@@ -506,8 +484,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         // 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!)
+        self.cameraController.setupGestures(target: self.previewView, enableZoom: self.enableZoom!)
 
         // Add grid overlay if enabled
         if self.gridMode != "none" {
@@ -686,11 +663,19 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         let withExifLocation = call.getBool("withExifLocation", false)
         let width = call.getInt("width")
         let height = call.getInt("height")
+        let aspectRatio = call.getString("aspectRatio")
 
-        print("[CameraPreview] Capture params - quality: \(quality), saveToGallery: \(saveToGallery), withExifLocation: \(withExifLocation), width: \(width ?? -1), height: \(height ?? -1)")
+        // Check for conflicting parameters
+        if aspectRatio != nil && (width != nil || height != nil) {
+            print("[CameraPreview] Error: Cannot set both aspectRatio and size (width/height)")
+            call.reject("Cannot set both aspectRatio and size (width/height). Use setPreviewSize after start.")
+            return
+        }
+
+        print("[CameraPreview] Capture params - quality: \(quality), saveToGallery: \(saveToGallery), withExifLocation: \(withExifLocation), width: \(width ?? -1), height: \(height ?? -1), aspectRatio: \(aspectRatio ?? "nil")")
         print("[CameraPreview] Current location: \(self.currentLocation?.description ?? "nil")")
 
-        self.cameraController.captureImage(width: width, height: height, quality: quality, gpsLocation: self.currentLocation) { (image, error) in
+        self.cameraController.captureImage(width: width, height: height, aspectRatio: aspectRatio, quality: quality, gpsLocation: self.currentLocation) { (image, error) in
             print("[CameraPreview] captureImage callback received")
             DispatchQueue.main.async {
                 print("[CameraPreview] Processing capture on main thread")
@@ -700,7 +685,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                     return
                 }
 
-                guard let imageDataWithExif = self.createImageDataWithExif(from: image!, quality: Int(quality), location: withExifLocation ? self.currentLocation : nil) else {
+                guard let image = image,
+                      let imageDataWithExif = self.createImageDataWithExif(
+                        from: image,
+                        quality: Int(quality),
+                        location: withExifLocation ? self.currentLocation : nil
+                      )
+                else {
                     print("[CameraPreview] Failed to create image data with EXIF")
                     call.reject("Failed to create image data with EXIF")
                     return
@@ -1060,9 +1051,10 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         }
 
         let ramp = call.getBool("ramp") ?? true
+        let autoFocus = call.getBool("autoFocus") ?? true
 
         do {
-            try self.cameraController.setZoom(level: CGFloat(level), ramp: ramp)
+            try self.cameraController.setZoom(level: CGFloat(level), ramp: ramp, autoFocus: autoFocus)
             call.resolve()
         } catch {
             call.reject("Failed to set zoom: \(error.localizedDescription)")
@@ -1304,54 +1296,79 @@ 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
-        }
-
-        // Ensure UI operations happen on main thread
-        guard Thread.isMainThread else {
-            DispatchQueue.main.async {
-                self.updateCameraFrame()
-            }
-            return
-        }
+    private func calculateCameraFrame(x: CGFloat? = nil, y: CGFloat? = nil, width: CGFloat? = nil, height: CGFloat? = nil, aspectRatio: String? = nil) -> CGRect {
+        // Use provided values or existing ones
+        let currentWidth = width ?? self.width ?? UIScreen.main.bounds.size.width
+        let currentHeight = height ?? self.height ?? UIScreen.main.bounds.size.height
+        let currentX = x ?? self.posX ?? -1
+        let currentY = y ?? self.posY ?? -1
+        let currentAspectRatio = aspectRatio ?? self.aspectRatio
 
         let paddingBottom = self.paddingBottom ?? 0
-        height -= paddingBottom
+        let adjustedHeight = currentHeight - CGFloat(paddingBottom)
 
         // 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
+        var finalX = currentX
+        var finalY = currentY
+        var finalWidth = currentWidth
+        var finalHeight = adjustedHeight
 
         // 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 currentX == -1 || currentY == -1 {
+            // Only override dimensions if aspect ratio is provided and no explicit dimensions given
+            if let ratio = currentAspectRatio, 
+               currentWidth == UIScreen.main.bounds.size.width && 
+               currentHeight == UIScreen.main.bounds.size.height {
+                finalWidth = webViewWidth
+
+                // Calculate height based on aspect ratio
+                let ratioParts = ratio.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)
+                    let ratioValue = ratioParts[1] / ratioParts[0]
+                    finalHeight = finalWidth / CGFloat(ratioValue)
                 }
             }
 
-            finalX = posX == -1 ? 0 : posX
+            // Center horizontally if x is -1
+            if currentX == -1 {
+                finalX = (webViewWidth - finalWidth) / 2
+            } else {
+                finalX = currentX
+            }
 
-            if posY == -1 {
-                let availableHeight = webViewHeight - paddingBottom
-                finalY = finalHeight < availableHeight ? (availableHeight - finalHeight) / 2 : 0
+            // Center vertically if y is -1
+            if currentY == -1 {
+                // Use full screen height for centering
+                let screenHeight = UIScreen.main.bounds.size.height
+                finalY = (screenHeight - finalHeight) / 2
+                print("[CameraPreview] Centering vertically: screenHeight=\(screenHeight), finalHeight=\(finalHeight), finalY=\(finalY)")
+            } else {
+                finalY = currentY
             }
         }
 
-        var frame = CGRect(x: finalX, y: finalY, width: finalWidth, height: finalHeight)
+        return CGRect(x: finalX, y: finalY, width: finalWidth, height: finalHeight)
+    }
+
+    private func updateCameraFrame() {
+        guard let width = self.width, let height = self.height, let posX = self.posX, let posY = self.posY else {
+            return
+        }
+
+        // Ensure UI operations happen on main thread
+        guard Thread.isMainThread else {
+            DispatchQueue.main.async {
+                self.updateCameraFrame()
+            }
+            return
+        }
+
+        // Calculate the base frame using the factorized method
+        var frame = calculateCameraFrame()
 
         // Apply aspect ratio adjustments only if not auto-centering
         if posX != -1 && posY != -1, let aspectRatio = self.aspectRatio {
@@ -1359,15 +1376,15 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             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)
+                let currentRatio = Double(frame.width) / Double(frame.height)
 
                 if currentRatio > ratio {
-                    let newWidth = Double(finalHeight) * ratio
-                    frame.origin.x = finalX + (Double(finalWidth) - newWidth) / 2
+                    let newWidth = Double(frame.height) * ratio
+                    frame.origin.x = frame.origin.x + (frame.width - CGFloat(newWidth)) / 2
                     frame.size.width = CGFloat(newWidth)
                 } else {
-                    let newHeight = Double(finalWidth) / ratio
-                    frame.origin.y = finalY + (Double(finalHeight) - newHeight) / 2
+                    let newHeight = Double(frame.width) / ratio
+                    frame.origin.y = frame.origin.y + (frame.height - CGFloat(newHeight)) / 2
                     frame.size.height = CGFloat(newHeight)
                 }
             }
@@ -1420,13 +1437,19 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             return
         }
 
-        // Only update position if explicitly provided, otherwise keep auto-centering
+        // Always set to -1 for auto-centering if not explicitly provided
         if let x = call.getInt("x") {
             self.posX = CGFloat(x)
+        } else {
+            self.posX = -1 // Auto-center if X not provided
         }
+
         if let y = call.getInt("y") {
             self.posY = CGFloat(y)
+        } else {
+            self.posY = -1 // Auto-center if Y not provided
         }
+
         if let width = call.getInt("width") { self.width = CGFloat(width) }
         if let height = call.getInt("height") { self.height = CGFloat(height) }
 
@@ -1456,15 +1479,17 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             return
         }
 
-        // Ensure values are between 0 and 1
-        let normalizedX = max(0, min(1, x))
-        let normalizedY = max(0, min(1, y))
+        // Reject if values are outside 0-1 range
+        if x < 0 || x > 1 || y < 0 || y > 1 {
+            call.reject("Focus coordinates must be between 0 and 1")
+            return
+        }
 
         DispatchQueue.main.async {
             do {
                 // Convert normalized coordinates to view coordinates
-                let viewX = CGFloat(normalizedX) * self.previewView.bounds.width
-                let viewY = CGFloat(normalizedY) * self.previewView.bounds.height
+                let viewX = CGFloat(x) * self.previewView.bounds.width
+                let viewY = CGFloat(y) * self.previewView.bounds.height
                 let focusPoint = CGPoint(x: viewX, y: viewY)
 
                 // Convert view coordinates to device coordinates
@@ -1474,7 +1499,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                 }
                 let devicePoint = previewLayer.captureDevicePointConverted(fromLayerPoint: focusPoint)
 
-                try self.cameraController.setFocus(at: devicePoint)
+                try self.cameraController.setFocus(at: devicePoint, showIndicator: true, in: self.previewView)
                 call.resolve()
             } catch {
                 call.reject("Failed to set focus: \(error.localizedDescription)")

package/package.json

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