feat(iOS): working bridgeless event emitter

wix · May 2, 2024 · 23d9bc9 · 23d9bc9
1 parent f74e49f
commit 23d9bc9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/lib/ios/RNNEventEmitter.h b/lib/ios/RNNEventEmitter.h
@@ -11,7 +11,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
                             <NativeRNNEventEmitterSpec>
 
-- (instancetype)initWithHost:(RCTHost *)host;
+- (void)setHost:(RCTHost *)host;
 
 @property(nonatomic, strong, readonly) RCTHost *host;
 #endif

diff --git a/lib/ios/RNNEventEmitter.mm b/lib/ios/RNNEventEmitter.mm
@@ -166,11 +166,11 @@ - (void)send:(NSString *)eventName body:(id)body {
     return std::make_shared<facebook::react::NativeRNNEventEmitterSpecJSI>(params);
 }
 
-- (instancetype)initWithHost:(RCTHost *)host {
-    if (self = [self init]) {
-        _host =  host;
+- (void)setHost:(RCTHost *)host {
+    if (_host != nil) {
+        return;
     }
-    return self;
+    _host = host;
 }
 #endif
 

diff --git a/lib/ios/Turbomodules/RNNTurboManager.mm b/lib/ios/Turbomodules/RNNTurboManager.mm
@@ -48,7 +48,8 @@ - (instancetype)initWithHost:(RCTHost *)host mainWindow:(UIWindow *)mainWindow {
                                                      name:RCTJavaScriptWillStartLoadingNotification
                                                    object:nil];
 
-        _eventEmitter = [[RNNEventEmitter alloc] initWithHost:_host];
+        _eventEmitter = [[_host moduleRegistry] moduleForName:"RNNEventEmitter"];
+        _eventEmitter.host = _host;
 
         RNNModalManagerEventHandler *modalManagerEventHandler =
             [[RNNModalManagerEventHandler alloc] initWithEventEmitter:_eventEmitter];

diff --git a/lib/src/adapters/NativeRNNEventEmitter.ts b/lib/src/adapters/NativeRNNEventEmitter.ts
@@ -1,9 +1,10 @@
 import { TurboModule, TurboModuleRegistry, NativeModules } from "react-native";
 
 export interface Spec extends TurboModule {
-
+    addListener: (eventType: string) => void;
+    removeListeners: (count: number) => void;
 }
 
-const emitter = TurboModuleRegistry.get<Spec>("RNNEventEmitter") ?? NativeModules.RNNBridgeEventEmitter;
+const emitter = TurboModuleRegistry.get<Spec>("RNNEventEmitter") ?? NativeModules.RNNEventEmitter;
 
 export default emitter;