Fixed focusMode and zoomMode not being enabled by default

teslamotors · Jul 25, 2023 · c4ac4a0 · c4ac4a0
1 parent faff3a9
commit c4ac4a0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/example/src/CameraExample.tsx b/example/src/CameraExample.tsx
@@ -159,8 +159,6 @@ const CameraExample = ({ onBack }: { onBack: () => void }) => {
             style={styles.cameraPreview}
             cameraType={cameraType}
             flashMode={flashData?.mode}
-            zoomMode="on"
-            focusMode="on"
             resetFocusWhenMotionDetected
             zoom={zoom}
             maxZoom={10}

diff --git a/ios/ReactNativeCameraKit/CameraView.swift b/ios/ReactNativeCameraKit/CameraView.swift
@@ -96,6 +96,12 @@ class CameraView: UIView {
 
         super.init(frame: frame)
 
+        // Transfer the default values, otherwise the default wont take effect since it's a separate class
+        focusInterfaceView.update(focusMode: focusMode)
+        focusInterfaceView.update(resetFocusTimeout: resetFocusTimeout)
+        focusInterfaceView.update(resetFocusWhenMotionDetected: resetFocusWhenMotionDetected)
+        update(zoomMode: zoomMode)
+
         addSubview(camera.previewView)
 
         addSubview(scannerInterfaceView)
@@ -211,18 +217,7 @@ class CameraView: UIView {
         }
 
         if changedProps.contains("zoomMode") {
-            if zoomMode == .on {
-                if (zoomGestureRecognizer == nil) {
-                    let pinchGesture = UIPinchGestureRecognizer(target: self, action: #selector(handlePinchToZoomRecognizer(_:)))
-                    addGestureRecognizer(pinchGesture)
-                    zoomGestureRecognizer = pinchGesture
-                }
-            } else {
-                if let zoomGestureRecognizer {
-                    removeGestureRecognizer(zoomGestureRecognizer)
-                    self.zoomGestureRecognizer = nil
-                }
-            }
+            self.update(zoomMode: zoomMode)
         }
 
         if changedProps.contains("zoom") {
@@ -258,6 +253,21 @@ class CameraView: UIView {
 
     // MARK: - Private Helper
 
+    private func update(zoomMode: ZoomMode) {
+        if zoomMode == .on {
+            if (zoomGestureRecognizer == nil) {
+                let pinchGesture = UIPinchGestureRecognizer(target: self, action: #selector(handlePinchToZoomRecognizer(_:)))
+                addGestureRecognizer(pinchGesture)
+                zoomGestureRecognizer = pinchGesture
+            }
+        } else {
+            if let zoomGestureRecognizer {
+                removeGestureRecognizer(zoomGestureRecognizer)
+                self.zoomGestureRecognizer = nil
+            }
+        }
+    }
+
     private func handleCameraPermission() {
         switch AVCaptureDevice.authorizationStatus(for: .video) {
         case .authorized: