react-native-navigation 8.0.0 → 8.1.0-alpha01

package/lib/ios/RNNReactView.mm

@@ -1,13 +1,21 @@
 #import "RNNReactView.h"
+#import "RNNAppDelegate.h"
 #import <React/RCTRootContentView.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
+#import <React-RuntimeApple/ReactCommon/RCTHost.h>
 #import <React/RCTFabricSurface.h>
+#import <React/RCTSurfacePresenter.h>
+
 #endif
 
 @implementation RNNReactView {
-    BOOL _isAppeared;
+    BOOL _isMounted;
+    BOOL _pendingDidAppear;
+    BOOL _didAppear;
+    BOOL _willAppear;
 }
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
@@ -15,9 +23,11 @@
                   eventEmitter:(RNNEventEmitter *)eventEmitter
                sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
            reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
-  RCTFabricSurface *surface = [[RCTFabricSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
-  self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode];
-  [surface start];
+    RCTFabricSurface *surface = [[RCTFabricSurface alloc]
+        initWithSurfacePresenter:(RCTSurfacePresenter *)bridge.surfacePresenter
+                      moduleName:moduleName
+               initialProperties:initialProperties];
+    self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode];
 #else
 - (instancetype)initWithBridge:(RCTBridge *)bridge
                     moduleName:(NSString *)moduleName
@@ -27,15 +37,49 @@
     self = [super initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
 #endif
 
+    _reactViewReadyBlock = reactViewReadyBlock;
+    _eventEmitter = eventEmitter;
+
+#ifdef RCT_NEW_ARCH_ENABLED
+    [surface start];
+#else
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(contentDidAppear:)
                                                  name:RCTContentDidAppearNotification
                                                object:nil];
+#endif
+
+    return self;
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype)initWithHost:(RCTHost *)host
+                  moduleName:(NSString *)moduleName
+           initialProperties:(NSDictionary *)initialProperties
+                eventEmitter:(RNNEventEmitter *)eventEmitter
+             sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
+         reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
+    RCTFabricSurface *surface = [host createSurfaceWithModuleName:moduleName
+                                                initialProperties:initialProperties];
+             [host.surfacePresenter addObserver:self];
+    self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode];
+
     _reactViewReadyBlock = reactViewReadyBlock;
     _eventEmitter = eventEmitter;
 
     return self;
 }
+#endif
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#pragma mark - RCTSurfaceDelegate
+- (void)surface:(__unused RCTSurface *)surface didChangeStage:(RCTSurfaceStage)stage {
+    RCTExecuteOnMainQueue(^{
+      [super surface:surface didChangeStage:stage];
+      [self reactViewReady];
+    });
+}
+#else
 
 - (void)contentDidAppear:(NSNotification *)notification {
     RNNReactView *appearedView = notification.object;
@@ -43,47 +87,107 @@
         [self reactViewReady];
     }
 }
+#endif
 
 - (void)reactViewReady {
     if (_reactViewReadyBlock) {
         _reactViewReadyBlock();
         _reactViewReadyBlock = nil;
     }
+#ifndef RCT_NEW_ARCH_ENABLED
     [[NSNotificationCenter defaultCenter] removeObserver:self];
+#endif
 }
 
 - (void)componentWillAppear {
-    if (!_isAppeared) {
+    if (!_willAppear) {
         [_eventEmitter sendComponentWillAppear:self.componentId
                                  componentName:self.moduleName
                                  componentType:self.componentType];
+        
+        _willAppear = YES;
     }
 }
 
 - (void)componentDidAppear {
-    if (!_isAppeared) {
+    if (!_isMounted) {
+        _pendingDidAppear = YES;
+        return;
+    }
+    
+    _pendingDidAppear = NO;
+    if (!_didAppear) {
         [_eventEmitter sendComponentDidAppear:self.componentId
                                 componentName:self.moduleName
                                 componentType:self.componentType];
+        _didAppear = YES;
     }
-
-    _isAppeared = YES;
 }
 
 - (void)componentDidDisappear {
-    if (_isAppeared) {
-        [_eventEmitter sendComponentDidDisappear:self.componentId
-                                   componentName:self.moduleName
-                                   componentType:self.componentType];
+    [_eventEmitter sendComponentDidDisappear:self.componentId
+                               componentName:self.moduleName
+                               componentType:self.componentType];
+    _willAppear = NO;
+    _didAppear = NO;
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+- (void)didMountComponentsWithRootTag:(NSInteger)rootTag {
+    if (self.surface.rootTag == rootTag) {
+        _isMounted = YES;
+        if (_pendingDidAppear) {
+            [self componentDidAppear];
+        }
+    }
+}
+    
+- (NSDictionary *)appProperties {
+    @synchronized(self) {
+        return self.surface.properties;
     }
+}
+
+- (void)setAppProperties:(NSDictionary *)newValue {
+    @synchronized(self) {
+        self.surface.properties = newValue;
+    }
+}
 
-    _isAppeared = NO;
+// TODO: Remove delegate in bridgeful
+- (id<RCTSurfaceDelegate>)delegate {
+    return self.surface.delegate;
 }
 
-- (void)invalidate {
-    [((RCTRootContentView *)self.contentView) invalidate];
+- (void)setDelegate:(id<RCTSurfaceDelegate>)newValue {
+    @synchronized(self) {
+        self.surface.delegate = newValue;
+    }
 }
 
+- (NSString *)moduleName {
+    return self.surface.moduleName;
+}
+
+- (UIView *)view {
+    return (UIView *)super.surface.view;
+}
+
+- (UIView *)contentView {
+   return self;
+}
+
+- (RCTRootViewSizeFlexibility)sizeFlexibility {
+    return convertToRootViewSizeFlexibility(super.sizeMeasureMode);
+}
+
+- (void)setSizeFlexibility:(RCTRootViewSizeFlexibility)sizeFlexibility {
+    super.sizeMeasureMode = convertToSurfaceSizeMeasureMode(sizeFlexibility);
+}
+
+#endif
+
 - (NSString *)componentId {
     return self.appProperties[@"componentId"];
 }

package/lib/ios/{RNNScreenTransition.m → RNNScreenTransition.mm}

@@ -1,5 +1,6 @@
 #import "RNNScreenTransition.h"
 #import "OptionsArrayParser.h"
+#import "RNNUtils.h"
 
 @implementation RNNScreenTransition
 
@@ -10,7 +11,7 @@
     self.content = [[RNNEnterExitAnimation alloc] initWithDict:dict[@"content"]];
     self.bottomTabs = [[ElementTransitionOptions alloc] initWithDict:dict[@"bottomTabs"]];
     self.enable = [BoolParser parse:dict key:@"enabled"];
-    self.waitForRender = [BoolParser parse:dict key:@"waitForRender"];
+	self.waitForRender = [Bool withValue: [[BoolParser parse:dict key:@"waitForRender"] withDefault: [RNNUtils getDefaultWaitForRender]]];
     self.duration = [TimeIntervalParser parse:dict key:@"duration"];
     self.sharedElementTransitions = [OptionsArrayParser parse:dict
                                                           key:@"sharedElementTransitions"
@@ -45,7 +46,7 @@
 }
 
 - (BOOL)shouldWaitForRender {
-    return [self.waitForRender withDefault:NO] || self.hasCustomAnimation;
+	return [self.waitForRender withDefault: [RNNUtils getDefaultWaitForRender]] || self.hasCustomAnimation;
 }
 
 - (NSTimeInterval)maxDuration {

package/lib/ios/RNNSideMenu/MMDrawerController/{MMDrawerController.m → MMDrawerController.mm}

@@ -283,7 +283,7 @@ static NSString *MMDrawerOpenSideKey = @"MMDrawerOpenSide";
         self.centerViewController = controller;
     }
 
-    if ((openside = [coder decodeIntegerForKey:MMDrawerOpenSideKey])) {
+	if ((openside = (MMDrawerSide)[coder decodeIntegerForKey:MMDrawerOpenSideKey])) {
         [self openDrawerSide:openside animated:false completion:nil];
     }
 }

package/lib/ios/{RNNSideMenuChildVC.h → RNNSideMenuChildViewController.h}

@@ -8,7 +8,7 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
     RNNSideMenuChildTypeRight,
 };
 
-@interface RNNSideMenuChildVC : UIViewController <RNNLayoutProtocol>
+@interface RNNSideMenuChildViewController : UIViewController <RNNLayoutProtocol>
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
                            creator:(id<RNNComponentViewCreator>)creator

package/lib/ios/{RNNSideMenuChildVC.m → RNNSideMenuChildViewController.mm}

@@ -1,13 +1,14 @@
-#import "RNNSideMenuChildVC.h"
+#import "RNNSideMenuChildViewController.h"
 #import "UIViewController+LayoutProtocol.h"
-@interface RNNSideMenuChildVC ()
+
+@interface RNNSideMenuChildViewController ()
 
 @property(readwrite) RNNSideMenuChildType type;
 @property(nonatomic, retain) UIViewController<RNNLayoutProtocol> *child;
 
 @end
 
-@implementation RNNSideMenuChildVC
+@implementation RNNSideMenuChildViewController
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
                            creator:(id<RNNComponentViewCreator>)creator

package/lib/ios/{RNNSideMenuPresenter.m → RNNSideMenuPresenter.mm}

@@ -1,5 +1,5 @@
 #import "RNNSideMenuPresenter.h"
-#import "RNNSideMenuController.h"
+#import "RNNSideMenuViewController.h"
 
 @implementation RNNSideMenuPresenter
 
@@ -130,8 +130,8 @@
     }
 }
 
-- (RNNSideMenuController *)sideMenuController {
-    return (RNNSideMenuController *)self.boundViewController;
+- (RNNSideMenuViewController *)sideMenuController {
+    return (RNNSideMenuViewController *)self.boundViewController;
 }
 
 @end

package/lib/ios/{RNNSideMenuController.h → RNNSideMenuViewController.h}

@@ -1,10 +1,10 @@
 #import "MMDrawerController.h"
-#import "RNNSideMenuChildVC.h"
+#import "RNNSideMenuChildViewController.h"
 #import "RNNSideMenuPresenter.h"
 #import "UIViewController+LayoutProtocol.h"
 #import <UIKit/UIKit.h>
 
-@interface RNNSideMenuController : MMDrawerController <RNNLayoutProtocol>
+@interface RNNSideMenuViewController : MMDrawerController <RNNLayoutProtocol>
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
                            creator:(id<RNNComponentViewCreator>)creator
@@ -14,9 +14,9 @@
                          presenter:(RNNBasePresenter *)presenter
                       eventEmitter:(RNNEventEmitter *)eventEmitter;
 
-@property(readonly) RNNSideMenuChildVC *center;
-@property(readonly) RNNSideMenuChildVC *left;
-@property(readonly) RNNSideMenuChildVC *right;
+@property(readonly) RNNSideMenuChildViewController *center;
+@property(readonly) RNNSideMenuChildViewController *left;
+@property(readonly) RNNSideMenuChildViewController *right;
 
 - (void)side:(MMDrawerSide)side enabled:(BOOL)enabled;
 - (void)side:(MMDrawerSide)side visible:(BOOL)visible;

package/lib/ios/{RNNSideMenuController.m → RNNSideMenuViewController.mm}

@@ -1,16 +1,16 @@
-#import "RNNSideMenuController.h"
+#import "RNNSideMenuViewController.h"
 #import "MMDrawerVisualState.h"
 
-@interface RNNSideMenuController ()
+@interface RNNSideMenuViewController ()
 
 @property(nonatomic, strong) NSArray *childViewControllers;
-@property(readwrite) RNNSideMenuChildVC *center;
-@property(readwrite) RNNSideMenuChildVC *left;
-@property(readwrite) RNNSideMenuChildVC *right;
+@property(readwrite) RNNSideMenuChildViewController *center;
+@property(readwrite) RNNSideMenuChildViewController *left;
+@property(readwrite) RNNSideMenuChildViewController *right;
 
 @end
 
-@implementation RNNSideMenuController
+@implementation RNNSideMenuViewController
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
                            creator:(id<RNNComponentViewCreator>)creator
@@ -121,8 +121,8 @@
 - (void)setChildViewControllers:(NSArray *)childViewControllers {
     _childViewControllers = childViewControllers;
     for (id controller in childViewControllers) {
-        if ([controller isKindOfClass:[RNNSideMenuChildVC class]]) {
-            RNNSideMenuChildVC *child = (RNNSideMenuChildVC *)controller;
+        if ([controller isKindOfClass:[RNNSideMenuChildViewController class]]) {
+            RNNSideMenuChildViewController *child = (RNNSideMenuChildViewController *)controller;
 
             if (child.type == RNNSideMenuChildTypeCenter) {
                 self.center = child;

package/lib/ios/{RNNSplashScreen.h → RNNSplashScreenViewController.h}

@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-@interface RNNSplashScreen : UIViewController
+@interface RNNSplashScreenViewController : UIViewController
 
 + (void)showOnWindow:(UIWindow *)window;
 

package/lib/ios/{RNNSplashScreen.m → RNNSplashScreenViewController.mm}

@@ -1,8 +1,8 @@
 
-#import "RNNSplashScreen.h"
+#import "RNNSplashScreenViewController.h"
 #import <UIKit/UIKit.h>
 
-@implementation RNNSplashScreen
+@implementation RNNSplashScreenViewController
 
 + (void)showOnWindow:(UIWindow *)window {
     CGRect screenBounds = [UIScreen mainScreen].bounds;
@@ -20,7 +20,7 @@
                                                                  bundle:nil];
             UIViewController *launchVC = [storyboard instantiateInitialViewController];
 
-            viewController = [[RNNSplashScreen alloc] init];
+            viewController = [[RNNSplashScreenViewController alloc] init];
             [viewController addChildViewController:launchVC];
             [viewController.view addSubview:launchVC.view];
             [launchVC didMoveToParentViewController:viewController];
@@ -31,7 +31,7 @@
             if (splashView != nil) {
                 splashView.frame =
                     CGRectMake(0, 0, screenBounds.size.width, screenBounds.size.height);
-                viewController = [[RNNSplashScreen alloc] init];
+                viewController = [[RNNSplashScreenViewController alloc] init];
                 viewController.view = splashView;
             }
         }
@@ -77,7 +77,7 @@
         }
 
         if (image != nil) {
-            viewController = [[RNNSplashScreen alloc] init];
+            viewController = [[RNNSplashScreenViewController alloc] init];
             viewController.view = [[UIImageView alloc] initWithImage:image];
         }
     }

package/lib/ios/RNNSplitViewController.h

@@ -1,6 +1,5 @@
 #import "RNNLayoutProtocol.h"
 #import "RNNSplitViewControllerPresenter.h"
-#import "UISplitViewController+RNNOptions.h"
 #import <UIKit/UIKit.h>
 
 @interface RNNSplitViewController : UISplitViewController <RNNLayoutProtocol>

package/lib/ios/{RNNStackPresenter.m → RNNStackPresenter.mm}

@@ -6,6 +6,7 @@
 #import "RNNStackController.h"
 #import "TopBarPresenterCreator.h"
 #import "UINavigationController+RNNOptions.h"
+#import "RNNUtils.h"
 
 @interface RNNStackPresenter () {
     RNNReactComponentRegistry *_componentRegistry;
@@ -183,7 +184,7 @@
                                        perform:(RNNReactViewReadyCompletionBlock)readyBlock {
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
     RNNStackController *stack = self.stackController;
-    if (![withDefault.topBar.background.component.waitForRender withDefault:NO] && readyBlock) {
+	if (![withDefault.topBar.background.component.waitForRender withDefault: [RNNUtils getDefaultWaitForRender]] && readyBlock) {
         readyBlock();
         readyBlock = nil;
     }

package/lib/ios/RNNUIBarButtonItem.h

@@ -7,7 +7,13 @@
 
 typedef void (^RNNButtonPressCallback)(NSString *buttonId);
 
-@interface RNNUIBarButtonItem : UIBarButtonItem <RCTRootViewDelegate>
+@interface RNNUIBarButtonItem : UIBarButtonItem <
+#ifdef RCT_NEW_ARCH_ENABLED
+RCTSurfaceDelegate
+#else
+RCTRootViewDelegate
+#endif
+>
 
 @property(nonatomic, strong) NSString *buttonId;
 

package/lib/ios/{RNNUIBarButtonItem.m → RNNUIBarButtonItem.mm}

@@ -3,6 +3,10 @@
 #import "RNNFontAttributesCreator.h"
 #import "UIImage+utils.h"
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTSurface.h>
+#endif
+
 @interface RNNUIBarButtonItem ()
 
 @property(nonatomic, strong) NSLayoutConstraint *widthConstraint;
@@ -88,31 +92,6 @@
                            onPress:(RNNButtonPressCallback)onPress {
     self = [super initWithCustomView:reactView];
     [self applyOptions:buttonOptions];
-    reactView.sizeFlexibility = RCTRootViewSizeFlexibilityWidthAndHeight;
-    reactView.hidden = CGRectEqualToRect(reactView.frame, CGRectZero);
-
-    [NSLayoutConstraint deactivateConstraints:reactView.constraints];
-    self.widthConstraint =
-        [NSLayoutConstraint constraintWithItem:reactView
-                                     attribute:NSLayoutAttributeWidth
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:nil
-                                     attribute:NSLayoutAttributeNotAnAttribute
-                                    multiplier:1.0
-                                      constant:reactView.intrinsicContentSize.width];
-    self.heightConstraint =
-        [NSLayoutConstraint constraintWithItem:reactView
-                                     attribute:NSLayoutAttributeHeight
-                                     relatedBy:NSLayoutRelationEqual
-                                        toItem:nil
-                                     attribute:NSLayoutAttributeNotAnAttribute
-                                    multiplier:1.0
-                                      constant:reactView.intrinsicContentSize.height];
-    [NSLayoutConstraint activateConstraints:@[ self.widthConstraint, self.heightConstraint ]];
-    reactView.delegate = self;
-
-    reactView.backgroundColor = [UIColor clearColor];
-
     self.onPress = onPress;
     return self;
 }
@@ -213,6 +192,18 @@
     }
 }
 
+
+#ifdef RCT_NEW_ARCH_ENABLED
+// TODO: Verify
+- (void)surface:(RCTSurface *)surface didChangeIntrinsicSize:(CGSize)intrinsicSize {
+	self.widthConstraint.constant = intrinsicSize.width;
+	self.heightConstraint.constant = intrinsicSize.height;
+	[surface setSize:intrinsicSize];
+	//[rootView setNeedsUpdateConstraints];
+	//[rootView updateConstraintsIfNeeded];
+	//surface.hidden = NO;
+}
+#else
 - (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView {
     self.widthConstraint.constant = rootView.intrinsicContentSize.width;
     self.heightConstraint.constant = rootView.intrinsicContentSize.height;
@@ -220,6 +211,7 @@
     [rootView updateConstraintsIfNeeded];
     rootView.hidden = NO;
 }
+#endif
 
 - (void)onButtonPressed:(RNNUIBarButtonItem *)barButtonItem {
     self.onPress(self.buttonId);

package/lib/ios/RNNUtils.h

@@ -9,5 +9,6 @@
 + (BOOL)getBoolOrKey:(NSDictionary *)dict withKey:(NSString *)key withDefault:(BOOL)defaultResult;
 + (id)getObjectOrKey:(NSDictionary *)dict withKey:(NSString *)key withDefault:(id)defaultResult;
 + (NSNumber *)getCurrentTimestamp;
++ (BOOL)getDefaultWaitForRender;
 
 @end

package/lib/ios/{RNNUtils.m → RNNUtils.mm}

@@ -2,6 +2,14 @@
 
 @implementation RNNUtils
 
++ (BOOL)getDefaultWaitForRender {
+#ifdef RCT_NEW_ARCH_ENABLED
+	return YES;
+#else
+	return NO;
+#endif
+}
+
 + (double)getDoubleOrKey:(NSDictionary *)dict
                  withKey:(NSString *)key
              withDefault:(double)defaultResult {

package/lib/ios/{RNNControllerFactory.h → RNNViewControllerFactory.h}

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-@interface RNNControllerFactory : NSObject
+@interface RNNViewControllerFactory : NSObject
 
 - (instancetype)initWithRootViewCreator:(id<RNNComponentViewCreator>)creator
                            eventEmitter:(RNNEventEmitter *)eventEmitter
@@ -17,6 +17,15 @@
                               andBridge:(RCTBridge *)bridge
             bottomTabsAttachModeFactory:(BottomTabsAttachModeFactory *)bottomTabsAttachModeFactory;
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype)initWithRootViewCreator:(id<RNNComponentViewCreator>)creator
+						   eventEmitter:(RNNEventEmitter *)eventEmitter
+								  store:(RNNExternalComponentStore *)store
+					  componentRegistry:(RNNReactComponentRegistry *)componentRegistry
+								andHost:(RCTHost *)host
+			bottomTabsAttachModeFactory:(BottomTabsAttachModeFactory *)bottomTabsAttachModeFactory;
+#endif
+
 - (UIViewController *)createLayout:(NSDictionary *)layout;
 
 - (NSArray *)createChildrenLayout:(NSArray *)children;

package/lib/ios/{RNNControllerFactory.m → RNNViewControllerFactory.mm}

@@ -1,18 +1,22 @@
-#import "RNNControllerFactory.h"
+#import "RNNViewControllerFactory.h"
 #import "BottomTabPresenterCreator.h"
 #import "BottomTabsPresenterCreator.h"
 #import "RNNBottomTabsController.h"
 #import "RNNComponentViewController.h"
 #import "RNNExternalViewController.h"
-#import "RNNSideMenuController.h"
+#import "RNNSideMenuViewController.h"
+#import "RNNSideMenuChildViewController.h"
 #import "RNNSplitViewController.h"
 #import "RNNStackController.h"
 #import "RNNTopTabsViewController.h"
 
-@implementation RNNControllerFactory {
+@implementation RNNViewControllerFactory {
     id<RNNComponentViewCreator> _creator;
     RNNExternalComponentStore *_store;
     RCTBridge *_bridge;
+#ifdef RCT_NEW_ARCH_ENABLED
+	RCTHost *_host;
+#endif
     RNNReactComponentRegistry *_componentRegistry;
     BottomTabsAttachModeFactory *_bottomTabsAttachModeFactory;
 }
@@ -38,6 +42,27 @@
     return self;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype)initWithRootViewCreator:(id<RNNComponentViewCreator>)creator
+						   eventEmitter:(RNNEventEmitter *)eventEmitter
+								  store:(RNNExternalComponentStore *)store
+					  componentRegistry:(RNNReactComponentRegistry *)componentRegistry
+							  andHost:(RCTHost *)host
+			bottomTabsAttachModeFactory:(BottomTabsAttachModeFactory *)bottomTabsAttachModeFactory {
+
+	self = [super init];
+
+	_creator = creator;
+	_eventEmitter = eventEmitter;
+	_host = host;
+	_store = store;
+	_componentRegistry = componentRegistry;
+	_bottomTabsAttachModeFactory = bottomTabsAttachModeFactory;
+
+	return self;
+}
+#endif
+
 - (void)setDefaultOptions:(RNNNavigationOptions *)defaultOptions {
     _defaultOptions = defaultOptions;
     _bottomTabsAttachModeFactory.defaultOptions = defaultOptions;
@@ -149,7 +174,12 @@
                                                   defaultOptions:_defaultOptions
                                                 buttonsPresenter:buttonsPresenter];
 
-    UIViewController *externalVC = [_store getExternalComponent:layoutInfo bridge:_bridge];
+	UIViewController *externalVC =
+#ifdef RCT_NEW_ARCH_ENABLED
+	[_store getExternalHostComponent:layoutInfo host:_host];
+#else
+	[_store getExternalComponent:layoutInfo bridge:_bridge];
+#endif
 
     RNNExternalViewController *component =
         [[RNNExternalViewController alloc] initWithLayoutInfo:layoutInfo
@@ -238,8 +268,8 @@
 
     NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 
-    RNNSideMenuController *sideMenu =
-        [[RNNSideMenuController alloc] initWithLayoutInfo:layoutInfo
+	RNNSideMenuViewController *sideMenu =
+        [[RNNSideMenuViewController alloc] initWithLayoutInfo:layoutInfo
                                                   creator:_creator
                                      childViewControllers:childViewControllers
                                                   options:options
@@ -256,7 +286,7 @@
     RNNNavigationOptions *options =
         [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
 
-    RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc]
+	RNNSideMenuChildViewController *sideMenuChild = [[RNNSideMenuChildViewController alloc]
          initWithLayoutInfo:layoutInfo
                     creator:_creator
                     options:options