Fixes for catalyst

ios/ReactNativeCameraKit/CameraView.swift

@@ -24,7 +24,7 @@
     private var supportedBarcodeType: [CodeFormat] = {
         return CodeFormat.allCases
     }()
 
     // camera
     private var ratioOverlayView: RatioOverlayView?
 
@@ -60,8 +60,8 @@
 
     @objc public var onCaptureButtonPressIn: RCTDirectEventBlock?
     @objc public var onCaptureButtonPressOut: RCTDirectEventBlock?
 
     var eventInteraction: Any? = nil
 
     // MARK: - Setup
 
@@ -124,10 +124,10 @@
         focusInterfaceView.delegate = camera
 
         handleCameraPermission()
 
         configureHardwareInteraction()
     }
 
     private func configureHardwareInteraction() {
         #if !targetEnvironment(macCatalyst)
         // Create a new capture event interaction with a handler that captures a photo.
@@ -159,10 +159,13 @@
         super.reactSetFrame(frame)
         self.updateSubviewsBounds(frame)
     }
 
     @objc public func updateSubviewsBounds(_ frame: CGRect) {
         camera.previewView.frame = bounds
-
+        #if targetEnvironment(macCatalyst)
+        // Do not apply any transform on Mac Catalyst
+        // (macCatalyst orientation is managed by AVFoundation as set in RealCamera)
+        #endif
         scannerInterfaceView.frame = bounds
         // If frame size changes, we have to update the scanner
         camera.update(scannerFrameSize: showFrame ? scannerInterfaceView.frameSize : nil)
@@ -404,7 +407,7 @@
         return temporaryFileURL
     }
 
     private func onBarcodeRead(barcode: String, codeFormat:CodeFormat) {
         // Throttle barcode detection
         let now = Date.timeIntervalSinceReferenceDate
         guard lastBarcodeDetectedTime + Double(scanThrottleDelay) / 1000 < now else {
@@ -413,7 +416,7 @@
 
         lastBarcodeDetectedTime = now
 
         onReadCode?(["codeStringValue": barcode,"codeFormat":codeFormat.rawValue])
     }
 
     // MARK: - Gesture selectors
@@ -426,4 +429,4 @@
             camera.zoomPinchChange(pinchScale: pinchRecognizer.scale)
         }
     }
 }

ios/ReactNativeCameraKit/RealCamera.swift

@@ -54,7 +54,6 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
     private var inProgressPhotoCaptureDelegates = [Int64: PhotoCaptureDelegate]()
 
     // MARK: - Lifecycle
-
     #if !targetEnvironment(macCatalyst)
     override init() {
         super.init()
@@ -75,8 +74,8 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
         // Mac Catalyst doesn't support device orientation notifications
     }
     #endif
-    
-    @available(*, unavailable)
+
+@available(*, unavailable)
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -132,6 +131,12 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
            DispatchQueue.main.async {
                self.setVideoOrientationToInterfaceOrientation()
            }
+
+           #if targetEnvironment(macCatalyst)
+           if let connection = self.cameraPreview.previewLayer.connection {
+               connection.videoOrientation = .portrait
+           }
+           #endif
         }
     }
 
@@ -689,17 +694,21 @@ class RealCamera: NSObject, CameraProtocol, AVCaptureMetadataOutputObjectsDelega
     }
 
     private func setVideoOrientationToInterfaceOrientation() {
-        #if !targetEnvironment(macCatalyst)
+        #if targetEnvironment(macCatalyst)
+        if let connection = self.cameraPreview.previewLayer.connection {
+            connection.automaticallyAdjustsVideoMirroring = false  // Disable automatic mirroring
+            connection.videoOrientation = .portrait         // Force portrait
+            connection.isVideoMirrored = false                      // Ensure no mirroring
+        }
+        self.cameraPreview.previewLayer.setAffineTransform(.identity)
+        #else
         var interfaceOrientation: UIInterfaceOrientation
         if #available(iOS 13.0, *) {
             interfaceOrientation = self.previewView.window?.windowScene?.interfaceOrientation ?? .portrait
         } else {
             interfaceOrientation = UIApplication.shared.statusBarOrientation
         }
         self.cameraPreview.previewLayer.connection?.videoOrientation = self.videoOrientation(from: interfaceOrientation)
-        #else
-        // Mac Catalyst always uses landscape orientation
-        self.cameraPreview.previewLayer.connection?.videoOrientation = .landscapeRight
         #endif
     }