@capgo/camera-preview 7.4.0-beta.12 → 7.4.0-beta.15

package/ios/Sources/CapgoCameraPreview/Plugin.swift

@@ -64,7 +64,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         CAPPluginMethod(name: "setGridMode", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getGridMode", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getPreviewSize", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "setPreviewSize", returnType: CAPPluginReturnPromise)
+        CAPPluginMethod(name: "setPreviewSize", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setFocus", returnType: CAPPluginReturnPromise)
     ]
     // Camera state tracking
     private var isInitializing: Bool = false
@@ -83,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?
@@ -411,8 +411,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 {
@@ -452,6 +450,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
@@ -470,12 +469,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)
@@ -699,7 +693,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
@@ -1059,9 +1059,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)")
@@ -1330,10 +1331,11 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
 
         // Handle auto-centering when position is -1
         if posX == -1 || posY == -1 {
-            finalWidth = webViewWidth
+            // Only override dimensions if aspect ratio is provided and no explicit dimensions given
+            if let aspectRatio = self.aspectRatio, width == UIScreen.main.bounds.size.width && height == UIScreen.main.bounds.size.height {
+                finalWidth = webViewWidth
 
-            // Calculate height based on aspect ratio or use provided height
-            if let aspectRatio = self.aspectRatio {
+                // Calculate height based on aspect ratio
                 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
@@ -1342,11 +1344,21 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                 }
             }
 
-            finalX = posX == -1 ? 0 : posX
+            // Center horizontally if x is -1
+            if posX == -1 {
+                finalX = (webViewWidth - finalWidth) / 2
+            } else {
+                finalX = posX
+            }
 
+            // Center vertically if y is -1
             if posY == -1 {
-                let availableHeight = webViewHeight - paddingBottom
-                finalY = finalHeight < availableHeight ? (availableHeight - finalHeight) / 2 : 0
+                // 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 = posY
             }
         }
 
@@ -1443,4 +1455,43 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             call.resolve(result)
         }
     }
+
+    @objc func setFocus(_ call: CAPPluginCall) {
+        guard isInitialized else {
+            call.reject("Camera not initialized")
+            return
+        }
+
+        guard let x = call.getFloat("x"), let y = call.getFloat("y") else {
+            call.reject("x and y parameters are required")
+            return
+        }
+
+        // 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(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
+                guard let previewLayer = self.cameraController.previewLayer else {
+                    call.reject("Preview layer not available")
+                    return
+                }
+                let devicePoint = previewLayer.captureDevicePointConverted(fromLayerPoint: focusPoint)
+
+                try self.cameraController.setFocus(at: devicePoint)
+                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.12",
+  "version": "7.4.0-beta.15",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
   ],
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -sdk iphoneos -scheme Plugin && cd ..",
+    "verify:ios": "xcodebuild -scheme CapgoCameraPreview -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",