fix: refact events to react

ios/ReactNativeCameraKit/CKCameraViewComponentView.h

@@ -1,3 +1,8 @@
+//
+//  CKCameraViewComponentView.h
+//  ReactNativeCameraKit
+//
+
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <UIKit/UIKit.h>
@@ -8,6 +13,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CKCameraViewComponentView : RCTViewComponentView
+- (facebook::react::SharedViewEventEmitter)eventEmitter;
 @end
 
 NS_ASSUME_NONNULL_END

ios/ReactNativeCameraKit/CKCameraViewComponentView.mm

@@ -1,14 +1,20 @@
+//
+//  CKCameraViewComponentView.h
+//  ReactNativeCameraKit
+//
+
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import "CKCameraViewComponentView.h"
 
+#import "NewArchCameraEventEmitter.h"
+
 #import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
 #import <folly/dynamic.h>
 
 #import <react/renderer/components/rncamerakit_specs/ComponentDescriptors.h>
-#import <react/renderer/components/rncamerakit_specs/EventEmitters.h>
 #import <react/renderer/components/rncamerakit_specs/Props.h>
 #import <react/renderer/components/rncamerakit_specs/RCTComponentViewHelpers.h>
 
@@ -64,6 +70,10 @@ @implementation CKCameraViewComponentView {
     CKCameraView *_view;
 }
 
+- (facebook::react::SharedViewEventEmitter)eventEmitter {
+    return _eventEmitter;
+}
+
 // Needed because of this: https://github.com/facebook/react-native/pull/37274
 + (void)load
 {
@@ -83,61 +93,19 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (void)prepareView
 {
-    _view =  [[CKCameraView alloc] init];
-
-    // just need to pass something, it won't really be used on fabric, but it's used to create events (it won't impact sending them)
+    _view = [[CKCameraView alloc] init];
     _view.reactTag = @-1;
 
-    __weak __typeof__(self) weakSelf = self;
-
-    [_view setOnReadCode:^(NSDictionary* event) {
-        __typeof__(self) strongSelf = weakSelf;
+    _view.eventEmitter = [[NewArchCameraEventEmitter alloc] initWithCameraViewComponentView:self];
 
-        if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-            std::string codeStringValue = [event valueForKey:@"codeStringValue"] == nil ? "" : std::string([[event valueForKey:@"codeStringValue"] UTF8String]);
-            std::string codeFormat = [event valueForKey:@"codeFormat"] == nil ? "" : std::string([[event valueForKey:@"codeFormat"] UTF8String]);
-            std::dynamic_pointer_cast<const facebook::react::CKCameraEventEmitter>(strongSelf->_eventEmitter)->onReadCode({.codeStringValue = codeStringValue, .codeFormat = codeFormat});
-          }
-    }];
-    [_view setOnOrientationChange:^(NSDictionary* event) {
-        __typeof__(self) strongSelf = weakSelf;
-
-        if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-            id orientation = [event valueForKey:@"orientation"] == nil ? 0 : [event valueForKey:@"orientation"];
-            std::dynamic_pointer_cast<const facebook::react::CKCameraEventEmitter>(strongSelf->_eventEmitter)->onOrientationChange({.orientation = [orientation intValue]});
-          }
-    }];
-    [_view setOnZoom:^(NSDictionary* event) {
-        __typeof__(self) strongSelf = weakSelf;
-
-        if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-            id zoom = [event valueForKey:@"zoom"] == nil ? 0 : [event valueForKey:@"zoom"];
-            std::dynamic_pointer_cast<const facebook::react::CKCameraEventEmitter>(strongSelf->_eventEmitter)->onZoom({.zoom = [zoom doubleValue]});
-          }
-    }];
-    [_view setOnCaptureButtonPressIn:^(NSDictionary* event) {
-        __typeof__(self) strongSelf = weakSelf;
-
-        if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-            std::dynamic_pointer_cast<const facebook::react::CKCameraEventEmitter>(strongSelf->_eventEmitter)->onCaptureButtonPressIn({});
-          }
-    }];
-    [_view setOnCaptureButtonPressOut:^(NSDictionary* event) {
-        __typeof__(self) strongSelf = weakSelf;
-
-        if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-            std::dynamic_pointer_cast<const facebook::react::CKCameraEventEmitter>(strongSelf->_eventEmitter)->onCaptureButtonPressOut({});
-          }
-    }];
-
     self.contentView = _view;
 }
 
 #pragma mark - RCTComponentViewProtocol
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return concreteComponentDescriptorProvider<CKCameraComponentDescriptor>();
+    return concreteComponentDescriptorProvider<CKCameraComponentDescriptor>();
 }
 
 - (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics
@@ -218,17 +186,18 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
         [changedProps addObject:@"resetFocusWhenMotionDetected"];
     }
     id focusMode = CKConvertFollyDynamicToId(newProps.focusMode);
-    if (focusMode != nil) {
+    if (focusMode != nil && ![focusMode isEqual: @""]) {
         _view.focusMode = [focusMode isEqualToString:@"on"] ? CKFocusModeOn : CKFocusModeOff;
         [changedProps addObject:@"focusMode"];
     }
     id zoomMode = CKConvertFollyDynamicToId(newProps.zoomMode);
-    if (zoomMode != nil) {
+    if (zoomMode != nil && ![zoomMode isEqual: @""]) {
         _view.zoomMode = [zoomMode isEqualToString:@"on"] ? CKZoomModeOn : CKZoomModeOff;
         [changedProps addObject:@"zoomMode"];
     }
     id zoom = CKConvertFollyDynamicToId(newProps.zoom);
     if (zoom != nil) {
+        NSLog(@"Zoom received: %@", zoom);
         _view.zoom = zoom;
         [changedProps addObject:@"zoom"];
     }
@@ -244,7 +213,6 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
         [changedProps addObject:@"barcodeFrameSize"];
     }
 
-
     [super updateProps:props oldProps:oldProps];
     [_view didSetProps:changedProps];
 }
@@ -259,7 +227,7 @@ - (void)prepareForRecycle
 
 Class<RCTComponentViewProtocol> CKCameraCls(void)
 {
-  return CKCameraViewComponentView.class;
+    return CKCameraViewComponentView.class;
 }
 
 #endif // RCT_NEW_ARCH_ENABLED

ios/ReactNativeCameraKit/CameraEventEmitter.swift

@@ -0,0 +1,55 @@
+//
+//  CameraEventEmitter.swift
+//  ReactNativeCameraKit
+//
+
+@objc public protocol CameraEventEmitter {
+    @objc func onReadCode(codeStringValue: String, codeFormat: String)
+    @objc func onOrientationChange(orientation: Int)
+    @objc func onZoom(zoom: Double)
+
+    @objc func onCaptureButtonPressIn()
+    @objc func onCaptureButtonPressOut()
+}
+
+class OldArchCameraEventEmitter: CameraEventEmitter {
+    var onReadCodeProp: RCTDirectEventBlock?
+    var onOrientationChangeProp: RCTDirectEventBlock?
+    var onZoomProp: RCTDirectEventBlock?
+    var onCaptureButtonPressInProp: RCTDirectEventBlock?
+    var onCaptureButtonPressOutProp: RCTDirectEventBlock?
+
+    init(onReadCodeProp: RCTDirectEventBlock?,
+         onOrientationChangeProp: RCTDirectEventBlock?,
+         onZoomProp: RCTDirectEventBlock?,
+         onCaptureButtonPressInProp: RCTDirectEventBlock?,
+         onCaptureButtonPressOutProp: RCTDirectEventBlock?) {
+        self.onReadCodeProp = onReadCodeProp
+        self.onOrientationChangeProp = onOrientationChangeProp
+        self.onZoomProp = onZoomProp
+        self.onCaptureButtonPressInProp = onCaptureButtonPressInProp
+        self.onCaptureButtonPressOutProp = onCaptureButtonPressOutProp
+    }
+
+    func onReadCode(codeStringValue: String, codeFormat: String) {
+        onReadCodeProp?(["codeStringValue": codeStringValue, "codeFormat": codeFormat])
+    }
+
+    func onOrientationChange(orientation: Int) {
+        onOrientationChangeProp?(["orientation": orientation])
+    }
+
+    func onZoom(zoom: Double) {
+        print("onZoom")
+        print(onZoomProp.debugDescription)
+        onZoomProp?(["zoom": zoom])
+    }
+
+    func onCaptureButtonPressIn() {
+        onCaptureButtonPressInProp?(nil)
+    }
+
+    func onCaptureButtonPressOut() {
+        onCaptureButtonPressOutProp?(nil)
+    }
+}

ios/ReactNativeCameraKit/CameraProtocol.swift

@@ -11,11 +11,11 @@ protocol CameraProtocol: AnyObject, FocusInterfaceViewDelegate {
     func setup(cameraType: CameraType, supportedBarcodeType: [CodeFormat])
     func cameraRemovedFromSuperview()
 
+    func update(eventEmitter: CameraEventEmitter?)
+
     func update(torchMode: TorchMode)
     func update(flashMode: FlashMode)
     func update(cameraType: CameraType)
-    func update(onOrientationChange: RCTDirectEventBlock?)
-    func update(onZoom: RCTDirectEventBlock?)
     func update(zoom: Double?)
     func update(maxZoom: Double?)
     func update(resizeMode: ResizeMode)

ios/ReactNativeCameraKit/CameraView.swift

@@ -15,6 +15,13 @@
 public class CameraView: UIView {
     private let camera: CameraProtocol
 
+    // expose event native -> react
+    @objc public var eventEmitter: CameraEventEmitter? {
+        didSet {
+            camera.update(eventEmitter: eventEmitter)
+        }
+    }
+
     // Focus
     private let focusInterfaceView: FocusInterfaceView
 
@@ -44,26 +51,26 @@
     // scanner
     @objc public var scanBarcode = false
     @objc public var showFrame = false
-    @objc public var onReadCode: RCTDirectEventBlock?
     @objc public var scanThrottleDelay = 2000
     @objc public var frameColor: UIColor?
     @objc public var laserColor: UIColor?
     @objc public var barcodeFrameSize: NSDictionary?
-
     // other
-    @objc public var onOrientationChange: RCTDirectEventBlock?
-    @objc public var onZoom: RCTDirectEventBlock?
     @objc public var resetFocusTimeout = 0
     @objc public var resetFocusWhenMotionDetected = false
     @objc public var focusMode: FocusMode = .on
     @objc public var zoomMode: ZoomMode = .on
     @objc public var zoom: NSNumber?
     @objc public var maxZoom: NSNumber?
-
+    // callbacks (only defined for old architecture)
+    @objc public var onReadCode: RCTDirectEventBlock?
+    @objc public var onOrientationChange: RCTDirectEventBlock?
+    @objc public var onZoom: RCTDirectEventBlock?
     @objc public var onCaptureButtonPressIn: RCTDirectEventBlock?
     @objc public var onCaptureButtonPressOut: RCTDirectEventBlock?
 
+    // interaction on physical volume button
     var eventInteraction: Any? = nil
 
     // MARK: - Setup
 
@@ -84,9 +91,9 @@
             hasCameraBeenSetup = true
             #if targetEnvironment(macCatalyst)
             // Force front camera on Mac Catalyst during initial setup
-            camera.setup(cameraType: .front, supportedBarcodeType: scanBarcode && onReadCode != nil ? supportedBarcodeType : [])
+            camera.setup(cameraType: .front, supportedBarcodeType: scanBarcode ? supportedBarcodeType : [])
             #else
-            camera.setup(cameraType: cameraType, supportedBarcodeType: scanBarcode && onReadCode != nil ? supportedBarcodeType : [])
+            camera.setup(cameraType: cameraType, supportedBarcodeType: scanBarcode ? supportedBarcodeType : [])
             #endif
         }
     }
@@ -153,13 +160,13 @@
             let interaction = AVCaptureEventInteraction { [weak self] event in
                 // Capture a photo on "press up" of a hardware button.
                 if event.phase == .began {
-                    self?.onCaptureButtonPressIn?(nil)
+                    self?.eventEmitter?.onCaptureButtonPressIn()
                 } else if event.phase == .ended {
-                    self?.onCaptureButtonPressOut?(nil)
+                    self?.eventEmitter?.onCaptureButtonPressOut()
                 }
             }
             // Add the interaction to the view controller's view.
-            self.addInteraction(interaction)
+            addInteraction(interaction)
             eventInteraction = interaction
         }
         #endif
@@ -200,6 +207,18 @@
     override public func didSetProps(_ changedProps: [String]) {
         hasPropBeenSetup = true
 
+        // Initialized here for old architecture, initialized in CKCameraViewComponentView for new architecture
+        if (eventEmitter == nil) {
+            eventEmitter = OldArchCameraEventEmitter(
+                onReadCodeProp: onReadCode,
+                onOrientationChangeProp: onOrientationChange,
+                onZoomProp: onZoom,
+                onCaptureButtonPressInProp: onCaptureButtonPressIn,
+                onCaptureButtonPressOutProp: onCaptureButtonPressOut
+            )
+            camera.update(eventEmitter: eventEmitter)
+        }
+
         // Camera settings
         if changedProps.contains("cameraType") {
             #if targetEnvironment(macCatalyst)
@@ -218,14 +237,6 @@
         if changedProps.contains("maxPhotoQualityPrioritization") {
             camera.update(maxPhotoQualityPrioritization: maxPhotoQualityPrioritization)
         }
-
-        if changedProps.contains("onOrientationChange") {
-            camera.update(onOrientationChange: onOrientationChange)
-        }
-
-        if changedProps.contains("onZoom") {
-            camera.update(onZoom: onZoom)
-        }
 
         if changedProps.contains("resizeMode") {
             camera.update(resizeMode: resizeMode)
@@ -251,7 +262,7 @@
         }
 
         // Scanner
-        if changedProps.contains("scanBarcode") || changedProps.contains("onReadCode") {
+        if changedProps.contains("scanBarcode") || changedProps.contains("onReadCode") /* only old arch. */ {
             camera.isBarcodeScannerEnabled(scanBarcode,
                                            supportedBarcodeTypes: supportedBarcodeType,
                                            onBarcodeRead: { [weak self] (barcode, codeFormat) in
@@ -427,7 +438,7 @@
         return temporaryFileURL
     }
 
     private func onBarcodeRead(barcode: String, codeFormat:CodeFormat) {
         // Throttle barcode detection
         let now = Date.timeIntervalSinceReferenceDate
         guard lastBarcodeDetectedTime + Double(scanThrottleDelay) / 1000 < now else {
@@ -436,7 +447,7 @@
 
         lastBarcodeDetectedTime = now
 
-        onReadCode?(["codeStringValue": barcode,"codeFormat":codeFormat.rawValue])
+        eventEmitter?.onReadCode(codeStringValue: barcode, codeFormat: codeFormat.rawValue)
     }
 
     // MARK: - Gesture selectors
@@ -449,4 +460,4 @@
             camera.zoomPinchChange(pinchScale: pinchRecognizer.scale)
         }
     }
 }

ios/ReactNativeCameraKit/NewArchCameraEventEmitter.h

@@ -0,0 +1,18 @@
+//
+//  NewArchCameraEventEmitter.h
+//  ReactNativeCameraKit
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+@class CKCameraViewComponentView;
+@protocol CameraEventEmitter;
+
+/* This unfortunately needs to be in ObjectiveC since it's using C++ implementation */
+@interface NewArchCameraEventEmitter : NSObject <CameraEventEmitter>
+
+- (instancetype)initWithCameraViewComponentView:(CKCameraViewComponentView *)viewComponentView;
+
+@end
+
+#endif // RCT_NEW_ARCH_ENABLED