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

package/ios/Sources/CapgoCameraPreview/CameraController.swift

@@ -66,8 +66,8 @@ extension CameraController {
         self.captureSession = AVCaptureSession()
 
         // 2. Pre-configure session preset (can be changed later)
-        if captureSession!.canSetSessionPreset(.medium) {
-            captureSession!.sessionPreset = .medium
+        if captureSession!.canSetSessionPreset(.high) {
+            captureSession!.sessionPreset = .high
         }
 
         // 3. Discover and configure all cameras
@@ -258,8 +258,9 @@ extension CameraController {
         guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
 
         // Update session preset based on aspect ratio if needed
+        var targetPreset: AVCaptureSession.Preset = .high // Default to high quality
+
         if let aspectRatio = aspectRatio {
-            var targetPreset: AVCaptureSession.Preset
             switch aspectRatio {
             case "16:9":
                 targetPreset = captureSession.canSetSessionPreset(.hd1920x1080) ? .hd1920x1080 : .high
@@ -268,11 +269,16 @@ extension CameraController {
             default:
                 targetPreset = .high
             }
+        }
 
-            if captureSession.canSetSessionPreset(targetPreset) {
-                captureSession.sessionPreset = targetPreset
-                print("[CameraPreview] Updated preset to \(targetPreset) for aspect ratio: \(aspectRatio)")
-            }
+        // Always try to set the best preset available
+        if captureSession.canSetSessionPreset(targetPreset) {
+            captureSession.sessionPreset = targetPreset
+            print("[CameraPreview] Updated preset to \(targetPreset) for aspect ratio: \(aspectRatio ?? "default")")
+        } else if captureSession.canSetSessionPreset(.high) {
+            // Fallback to high if target preset not available
+            captureSession.sessionPreset = .high
+            print("[CameraPreview] Fallback to high preset")
         }
 
         // Add photo output (already created in prepareOutputs)
@@ -307,6 +313,9 @@ extension CameraController {
         self.previewLayer?.connection?.videoOrientation = .portrait
         self.previewLayer?.isOpaque = true
 
+        // Set contentsScale for retina display quality
+        self.previewLayer?.contentsScale = UIScreen.main.scale
+
         // Enable high-quality rendering
         if #available(iOS 13.0, *) {
             self.previewLayer?.videoGravity = .resizeAspectFill
@@ -776,6 +785,50 @@ extension CameraController {
         }
     }
 
+    func setFocus(at point: CGPoint) throws {
+        var currentCamera: AVCaptureDevice?
+        switch currentCameraPosition {
+        case .front:
+            currentCamera = self.frontCamera
+        case .rear:
+            currentCamera = self.rearCamera
+        default: break
+        }
+
+        guard let device = currentCamera else {
+            throw CameraControllerError.noCamerasAvailable
+        }
+
+        guard device.isFocusPointOfInterestSupported else {
+            // Device doesn't support focus point of interest
+            return
+        }
+
+        do {
+            try device.lockForConfiguration()
+
+            // Set focus mode to auto if supported
+            if device.isFocusModeSupported(.autoFocus) {
+                device.focusMode = .autoFocus
+            } else if device.isFocusModeSupported(.continuousAutoFocus) {
+                device.focusMode = .continuousAutoFocus
+            }
+
+            // Set the focus point
+            device.focusPointOfInterest = point
+
+            // Also set exposure point if supported
+            if device.isExposurePointOfInterestSupported && device.isExposureModeSupported(.autoExpose) {
+                device.exposureMode = .autoExpose
+                device.exposurePointOfInterest = point
+            }
+
+            device.unlockForConfiguration()
+        } catch {
+            throw CameraControllerError.unknown
+        }
+    }
+
     func getFlashMode() throws -> String {
         switch self.flashMode {
         case .off:

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
@@ -1443,4 +1444,41 @@ 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
+        }
+
+        // Ensure values are between 0 and 1
+        let normalizedX = max(0, min(1, x))
+        let normalizedY = max(0, min(1, y))
+
+        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 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.11",
+  "version": "7.4.0-beta.13",
   "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",