RNNav 8.1 issue in engine

lib/ios/RNNBottomTabsController.h

@@ -1,10 +1,10 @@
+#import <UIKit/UIKit.h>
 #import "BottomTabPresenter.h"
 #import "BottomTabsBaseAttacher.h"
 #import "RNNBottomTabsPresenter.h"
 #import "RNNDotIndicatorPresenter.h"
 #import "RNNEventEmitter.h"
 #import "UIViewController+LayoutProtocol.h"
-#import <UIKit/UIKit.h>
 
 @interface RNNBottomTabsController
     : UITabBarController <RNNLayoutProtocol, UITabBarControllerDelegate>

lib/ios/RNNBridgeEventEmitter.h

@@ -1,4 +1,6 @@
 #import "RNNEventEmitter.h"
+#import <React/RCTBridgeModule.h>
 
-@interface RNNBridgeEventEmitter : RNNEventEmitter
+@interface RNNBridgeEventEmitter : RNNEventEmitter <RCTBridgeModule>
 @end
+

lib/ios/RNNBridgeEventEmitter.mm

@@ -1,5 +1,6 @@
 #import "RNNBridgeEventEmitter.h"
 
-@implementation RNNBridgeEventEmitter {}
+@implementation RNNBridgeEventEmitter
 
+RCT_EXPORT_MODULE()
 @end

lib/ios/RNNEmitterConstants.h

@@ -0,0 +1,16 @@
+typedef NSString * EmitterEvents NS_STRING_ENUM;
+extern EmitterEvents const AppLaunched;
+extern EmitterEvents const CommandCompleted;
+extern EmitterEvents const BottomTabSelected;
+extern EmitterEvents const BottomTabLongPressed;
+extern EmitterEvents const ComponentWillAppear;
+extern EmitterEvents const ComponentDidAppear;
+extern EmitterEvents const ComponentDidDisappear;
+extern EmitterEvents const NavigationButtonPressed;
+extern EmitterEvents const ModalDismissed;
+extern EmitterEvents const ModalAttemptedToDismiss;
+extern EmitterEvents const SearchBarUpdated;
+extern EmitterEvents const SearchBarCancelPressed;
+extern EmitterEvents const PreviewCompleted;
+extern EmitterEvents const ScreenPopped;
+extern EmitterEvents const BottomTabPressed;

lib/ios/RNNEmitterConstants.mm

@@ -0,0 +1,18 @@
+#import "RNNEmitterConstants.h"
+
+EmitterEvents const AppLaunched = @"RNN.AppLaunched";
+EmitterEvents const CommandCompleted = @"RNN.CommandCompleted";
+EmitterEvents const BottomTabSelected = @"RNN.BottomTabSelected";
+EmitterEvents const BottomTabLongPressed = @"RNN.BottomTabLongPressed";
+EmitterEvents const ComponentWillAppear = @"RNN.ComponentWillAppear";
+EmitterEvents const ComponentDidAppear = @"RNN.ComponentDidAppear";
+EmitterEvents const ComponentDidDisappear = @"RNN.ComponentDidDisappear";
+EmitterEvents const NavigationButtonPressed = @"RNN.NavigationButtonPressed";
+EmitterEvents const ModalDismissed = @"RNN.ModalDismissed";
+EmitterEvents const ModalAttemptedToDismiss = @"RNN.ModalAttemptedToDismiss";
+EmitterEvents const SearchBarUpdated = @"RNN.SearchBarUpdated";
+EmitterEvents const SearchBarCancelPressed = @"RNN.SearchBarCancelPressed";
+EmitterEvents const PreviewCompleted = @"RNN.PreviewCompleted";
+EmitterEvents const ScreenPopped = @"RNN.ScreenPopped";
+EmitterEvents const BottomTabPressed = @"RNN.BottomTabPressed";
+

lib/ios/RNNEventEmitter.h

@@ -1,13 +1,19 @@
 #import <Foundation/Foundation.h>
+#ifndef RCT_NEW_ARCH_ENABLED
 #import <React/RCTEventEmitter.h>
+#endif
 
+#ifdef RCT_NEW_ARCH_ENABLED
 @class RCTHost;
-@class RCTBridge;
-
 @interface RNNEventEmitter : NSObject
+#else
+@interface RNNEventEmitter : RCTEventEmitter
+#endif
 
+#ifdef RCT_NEW_ARCH_ENABLED
 - (void)setHost:(RCTHost *)host;
 @property(nonatomic, strong, readonly) RCTHost *host;
+#endif
 
 - (void)sendOnAppLaunched;
 

lib/ios/RNNEventEmitter.mm

@@ -1,22 +1,65 @@
 #import "RNNEventEmitter.h"
 #import "RNNUtils.h"
+#import "RNNEmitterConstants.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
 #import "RNNTurboEventEmitter.h"
 #import <React-RuntimeApple/ReactCommon/RCTHost.h>
+#else
+
+#endif
 
-@implementation RNNEventEmitter { }
+@implementation RNNEventEmitter {
+#ifndef RCT_NEW_ARCH_ENABLED
+  RCTEventEmitter *_emitter;
+  NSInteger _appLaunchedListenerCount;
+  BOOL _appLaunchedEventDeferred;
+#endif
+}
 
+#ifdef RCT_NEW_ARCH_ENABLED
 - (void)setHost:(RCTHost *)host {
   if (_host != nil) {
     return;
   }
   _host = host;
 }
-
+#else
+- (NSArray<NSString *> *)supportedEvents {
+  return @[
+    AppLaunched, CommandCompleted, BottomTabSelected, BottomTabLongPressed, BottomTabPressed,
+    ComponentWillAppear, ComponentDidAppear, ComponentDidDisappear, NavigationButtonPressed,
+    ModalDismissed, SearchBarUpdated, SearchBarCancelPressed, PreviewCompleted, ScreenPopped,
+    ModalAttemptedToDismiss
+  ];
+}
+
+- (void)addListener:(NSString *)eventName {
+  [super addListener:eventName];
+  if ([eventName isEqualToString:AppLaunched]) {
+    _appLaunchedListenerCount++;
+    if (_appLaunchedEventDeferred) {
+      _appLaunchedEventDeferred = FALSE;
+      [self sendOnAppLaunched];
+    }
+  }
+}
+#endif
 #pragma mark public
 
+#ifdef RCT_NEW_ARCH_ENABLED
 - (void)sendOnAppLaunched {
     [self send:AppLaunched body:nil];
 }
+#else
+- (void)sendOnAppLaunched {
+  if (_appLaunchedListenerCount > 0) {
+    [self send:AppLaunched body:nil];
+  } else {
+    _appLaunchedEventDeferred = TRUE;
+  }
+}
+#endif
 
 - (void)sendComponentWillAppear:(NSString *)componentId
                   componentName:(NSString *)componentName
@@ -119,6 +162,7 @@ - (void)sendScreenPoppedEvent:(NSString *)componentId {
 #pragma mark private
 
 - (void)send:(NSString *)eventName body:(id)body {
+#ifdef RCT_NEW_ARCH_ENABLED
   if (_host == nil) {
     return;
   }
@@ -129,6 +173,12 @@ - (void)send:(NSString *)eventName body:(id)body {
   }
 
   [_eventEmitter send:eventName body:body];
+#else
+  if (self.bridge == nil) {
+    return;
+  }
+  [self sendEventWithName:eventName body:body];
+#endif
 }
 
 @end

lib/ios/RNNModalManagerEventHandler.h

@@ -1,5 +1,6 @@
-#import "RNNEventEmitter.h"
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import "RNNEventEmitter.h"
 
 @interface RNNModalManagerEventHandler : NSObject
 

lib/ios/RNNReactRootViewCreator.h

@@ -1,6 +1,6 @@
+#import <Foundation/Foundation.h>
 #import "RNNComponentViewCreator.h"
 #import "RNNEventEmitter.h"
-#import <Foundation/Foundation.h>
 #import <React/RCTBridge.h>
 
 @interface RNNReactRootViewCreator : NSObject <RNNComponentViewCreator>

lib/ios/RNNViewControllerFactory.h

@@ -1,12 +1,12 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 #import "BottomTabsAttachModeFactory.h"
 #import "RNNComponentViewCreator.h"
 #import "RNNEventEmitter.h"
 #import "RNNExternalComponentStore.h"
 #import "RNNNavigationOptions.h"
 #import "RNNReactComponentRegistry.h"
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 
 @interface RNNViewControllerFactory : NSObject
 

lib/ios/StackControllerDelegate.h

@@ -1,10 +1,11 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RNNEventEmitter.h"
 #else
 #import "RNNEventEmitter.h"
 #endif
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 
 @class RCTHost;
 

lib/ios/TurboModules/RNNTurboEventEmitter.h

@@ -1,25 +1,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
-#import "RNNEventEmitter.h"
+#import <React/RCTEventEmitter.h>
 #import <rnnavigation/rnnavigation.h>
 
-typedef NSString * EmitterEvents NS_STRING_ENUM;
-
-extern EmitterEvents const AppLaunched;
-extern EmitterEvents const CommandCompleted;
-extern EmitterEvents const BottomTabSelected;
-extern EmitterEvents const BottomTabLongPressed;
-extern EmitterEvents const ComponentWillAppear;
-extern EmitterEvents const ComponentDidAppear;
-extern EmitterEvents const ComponentDidDisappear;
-extern EmitterEvents const NavigationButtonPressed;
-extern EmitterEvents const ModalDismissed;
-extern EmitterEvents const ModalAttemptedToDismiss;
-extern EmitterEvents const SearchBarUpdated;
-extern EmitterEvents const SearchBarCancelPressed;
-extern EmitterEvents const PreviewCompleted;
-extern EmitterEvents const ScreenPopped;
-extern EmitterEvents const BottomTabPressed;
-
 @interface RNNTurboEventEmitter : RCTEventEmitter <NativeRNNTurboEventEmitterSpec>
 - (void)send:(NSString *)eventName body:(id)body;
 @end

lib/ios/TurboModules/RNNTurboEventEmitter.mm

@@ -1,24 +1,8 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RNNTurboEventEmitter.h"
-
+#import "RNNEmitterConstants.h"
 #import "RNNUtils.h"
 
-EmitterEvents const AppLaunched = @"RNN.AppLaunched";
-EmitterEvents const CommandCompleted = @"RNN.CommandCompleted";
-EmitterEvents const BottomTabSelected = @"RNN.BottomTabSelected";
-EmitterEvents const BottomTabLongPressed = @"RNN.BottomTabLongPressed";
-EmitterEvents const ComponentWillAppear = @"RNN.ComponentWillAppear";
-EmitterEvents const ComponentDidAppear = @"RNN.ComponentDidAppear";
-EmitterEvents const ComponentDidDisappear = @"RNN.ComponentDidDisappear";
-EmitterEvents const NavigationButtonPressed = @"RNN.NavigationButtonPressed";
-EmitterEvents const ModalDismissed = @"RNN.ModalDismissed";
-EmitterEvents const ModalAttemptedToDismiss = @"RNN.ModalAttemptedToDismiss";
-EmitterEvents const SearchBarUpdated = @"RNN.SearchBarUpdated";
-EmitterEvents const SearchBarCancelPressed = @"RNN.SearchBarCancelPressed";
-EmitterEvents const PreviewCompleted = @"RNN.PreviewCompleted";
-EmitterEvents const ScreenPopped = @"RNN.ScreenPopped";
-EmitterEvents const BottomTabPressed = @"RNN.BottomTabPressed";
-
 @implementation RNNTurboEventEmitter {
   NSInteger _appLaunchedListenerCount;
   BOOL _appLaunchedEventDeferred;

lib/ios/UIViewController+LayoutProtocol.h

@@ -1,6 +1,6 @@
+#import <UIKit/UIKit.h>
 #import "RNNEventEmitter.h"
 #import "RNNLayoutProtocol.h"
-#import <UIKit/UIKit.h>
 
 typedef void (^RNNReactViewReadyCompletionBlock)(void);