react-native-navigation 8.0.0 → 8.1.0-alpha01

package/lib/ios/RNNAppDelegate.mm

@@ -1,8 +1,8 @@
 #import "RNNAppDelegate.h"
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
 
-#if RCT_NEW_ARCH_ENABLED
-
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RCTAppSetupUtils.h"
 #import <React/CoreModulesPlugins.h>
 #import <React/RCTCxxBridgeDelegate.h>
 #import <React/RCTLegacyViewManagerInteropComponentView.h>
@@ -13,121 +13,118 @@
 #import <react/config/ReactNativeConfig.h>
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
+#import <React/RCTSurfacePresenter.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTImageLoader.h>
+#import <React/RCTBridgeProxy.h>
+#import <React/RCTSurfacePresenter.h>
+#import <react/utils/ManagedObjectWrapper.h>
 
 static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 
-@interface RNNAppDelegate () <RCTTurboModuleManagerDelegate, RCTCxxBridgeDelegate> {
-    std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
-    facebook::react::ContextContainer::Shared _contextContainer;
-    std::shared_ptr<facebook::react::RuntimeScheduler> _runtimeScheduler;
-}
+@interface RNNAppDelegate () <RCTTurboModuleManagerDelegate, RCTCxxBridgeDelegate> {}
 @end
 
 #endif
 
 @implementation RNNAppDelegate
 
-#if RCT_NEW_ARCH_ENABLED
-- (instancetype)init {
-    if (self = [super init]) {
-        _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
-        _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-        _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
-    }
-    return self;
-}
-#endif
-
 - (BOOL)application:(UIApplication *)application
-    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-#if RCT_NEW_ARCH_ENABLED
-    RCTEnableTurboModule(true);
-#endif
-    RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
-#if RCT_NEW_ARCH_ENABLED
-    self.bridgeAdapter =
-        [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge
-                                                contextContainer:_contextContainer];
-    bridge.surfacePresenter = self.bridgeAdapter.surfacePresenter;
-
-    [self unstable_registerLegacyComponents];
-#endif
+	didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
-    [ReactNativeNavigation bootstrapWithBridge:bridge];
+	// Copied from RCTAppDelegate, it private inside it
+	self.rootViewFactory = [self createRCTRootViewFactory];
 
-    return YES;
-}
+#ifdef RCT_NEW_ARCH_ENABLED
+	RCTAppSetupPrepareApp(application, self.turboModuleEnabled);
+	RCTSetNewArchEnabled(TRUE);
+
+	if (self.bridgelessEnabled) {
+		// Creating host instead of bridge
+		self.rootViewFactory.reactHost = [self.rootViewFactory createReactHost:launchOptions];
+
+		[ReactNativeNavigation bootstrapWithHost:self.rootViewFactory.reactHost];
 
-- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
-    return [ReactNativeNavigation extraModulesForBridge:bridge];
+		return YES;
+	}
+#endif
+	// Force RN to init all necessary modules instead of copy-pasting code (ex. bridge)
+	[self.rootViewFactory viewWithModuleName:@""];
+
+	[ReactNativeNavigation bootstrapWithBridge:self.bridge];
+
+	return YES;
 }
 
-#if RCT_NEW_ARCH_ENABLED
-#pragma mark - RCTCxxBridgeDelegate
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:
-    (RCTBridge *)bridge {
-    _runtimeScheduler = _runtimeScheduler =
-        std::make_shared<facebook::react::RuntimeScheduler>(RCTRuntimeExecutorFromBridge(bridge));
-    std::shared_ptr<facebook::react::CallInvoker> callInvoker =
-        std::make_shared<facebook::react::RuntimeSchedulerCallInvoker>(_runtimeScheduler);
-    self.turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                                   delegate:self
-                                                                  jsInvoker:callInvoker];
-    _contextContainer->erase("RuntimeScheduler");
-    _contextContainer->insert("RuntimeScheduler", _runtimeScheduler);
-    return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager, _runtimeScheduler);
+- (RCTRootViewFactory *)createRCTRootViewFactory
+{
+  __weak __typeof(self) weakSelf = self;
+  RCTBundleURLBlock bundleUrlBlock = ^{
+	RCTAppDelegate *strongSelf = weakSelf;
+	return strongSelf.bundleURL;
+  };
+
+  RCTRootViewFactoryConfiguration *configuration =
+	  [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock
+													   newArchEnabled:self.fabricEnabled
+												   turboModuleEnabled:self.turboModuleEnabled
+													bridgelessEnabled:self.bridgelessEnabled];
+
+  if (!self.bridgelessEnabled) {
+	  configuration.extraModulesForBridge = ^NSArray<id<RCTBridgeModule>> * _Nonnull(RCTBridge * _Nonnull bridge) {
+		  return [ReactNativeNavigation extraModulesForBridge:bridge];
+	  };
+  }
+
+  configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps)
+  {
+	// Ignoring creation of default view, will initialize our custom UIViewController later
+	return nil;
+  };
+
+  configuration.createBridgeWithDelegate = ^RCTBridge *(id<RCTBridgeDelegate> delegate, NSDictionary *launchOptions)
+  {
+	return [weakSelf createBridgeWithDelegate:delegate launchOptions:launchOptions];
+  };
+
+#ifndef RCT_NEW_ARCH_ENABLED
+	return [[RCTRootViewFactory alloc] initWithConfiguration:configuration];
+  }
+#else
+  return [[RCTRootViewFactory alloc] initWithConfiguration:configuration andTurboModuleManagerDelegate:self];
 }
 
 #pragma mark RCTTurboModuleManagerDelegate
 
 - (Class)getModuleClassFromName:(const char *)name {
-    return RCTCoreModulesClassProvider(name);
+	return RCTCoreModulesClassProvider(name);
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)
-    getTurboModule:(const std::string &)name
-         jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker {
-    return nullptr;
+	getTurboModule:(const std::string &)name
+		 jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker {
+	return nullptr;
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)
-    getTurboModule:(const std::string &)name
-        initParams:(const facebook::react::ObjCTurboModule::InitParams &)params {
-    return nullptr;
+	getTurboModule:(const std::string &)name
+		initParams:(const facebook::react::ObjCTurboModule::InitParams &)params {
+	return nullptr;
 }
 
 - (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass {
-    return RCTAppSetupDefaultModuleFromClass(moduleClass);
-}
-
-#pragma mark - New Arch Enabled settings
-
-- (BOOL)turboModuleEnabled {
-    return YES;
+	return RCTAppSetupDefaultModuleFromClass(moduleClass);
 }
-
-- (BOOL)fabricEnabled {
-    return YES;
-}
-
-#pragma mark - New Arch Utilities
-
-- (void)unstable_registerLegacyComponents {
-    for (NSString *legacyComponent in [RCTLegacyInteropComponents legacyInteropComponents]) {
-        [RCTLegacyViewManagerInteropComponentView supportLegacyViewManagerWithName:legacyComponent];
-    }
-}
-
 #endif
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
-    [NSException raise:@"RCTBridgeDelegate::sourceURLForBridge not implemented"
-                format:@"Subclasses must implement a valid sourceURLForBridge method"];
-    return nil;
+	[NSException raise:@"RCTBridgeDelegate::sourceURLForBridge not implemented"
+				format:@"Subclasses must implement a valid sourceURLForBridge method"];
+	return nil;
 }
 
 - (BOOL)concurrentRootEnabled {
-    return true;
+	return true;
 }
 
 @end

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

@@ -74,7 +74,7 @@
     UINavigationController *selectedChild = self.selectedViewController;
     if ([selectedChild isKindOfClass:UINavigationController.class] &&
         selectedChild.hidesBottomBarWhenPushed) {
-        [selectedChild pushViewController:UIViewController.new animated:NO];
+        [selectedChild pushViewController: [UIViewController new] animated:NO];
         [selectedChild popViewControllerAnimated:NO];
     }
 }

package/lib/ios/RNNBridgeEventEmitter.h

@@ -0,0 +1,4 @@
+#import "RNNEventEmitter.h"
+
+@interface RNNBridgeEventEmitter : RNNEventEmitter
+@end

package/lib/ios/RNNBridgeEventEmitter.mm

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

package/lib/ios/RNNBridgeManager.mm

@@ -2,12 +2,11 @@
 
 #import "RNNBridgeModule.h"
 #import "RNNComponentViewCreator.h"
-#import "RNNEventEmitter.h"
+#import "RNNBridgeEventEmitter.h"
 #import "RNNLayoutManager.h"
 #import "RNNModalHostViewManagerHandler.h"
 #import "RNNReactComponentRegistry.h"
 #import "RNNReactRootViewCreator.h"
-#import "RNNSplashScreen.h"
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 
@@ -24,100 +23,101 @@
 @end
 
 @implementation RNNBridgeManager {
-    RCTBridge *_bridge;
-    UIWindow *_mainWindow;
+	RCTBridge *_bridge;
+	UIWindow *_mainWindow;
 
-    RNNExternalComponentStore *_store;
+	RNNExternalComponentStore *_store;
 
-    RNNCommandsHandler *_commandsHandler;
+	RNNCommandsHandler *_commandsHandler;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge mainWindow:(UIWindow *)mainWindow {
-    if (self = [super init]) {
-        _bridge = bridge;
-        _mainWindow = mainWindow;
-
-        _overlayManager = [RNNOverlayManager new];
-
-        _store = [RNNExternalComponentStore new];
-
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(onJavaScriptLoaded)
-                                                     name:RCTJavaScriptDidLoadNotification
-                                                   object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(onJavaScriptWillLoad)
-                                                     name:RCTJavaScriptWillStartLoadingNotification
-                                                   object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(onBridgeWillReload)
-                                                     name:RCTBridgeWillReloadNotification
-                                                   object:nil];
-    }
-    return self;
+	if (self = [super init]) {
+		_bridge = bridge;
+		_mainWindow = mainWindow;
+
+		_overlayManager = [RNNOverlayManager new];
+
+		_store = [RNNExternalComponentStore new];
+
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(onJavaScriptLoaded)
+													 name:RCTJavaScriptDidLoadNotification
+												   object:nil];
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(onJavaScriptWillLoad)
+													 name:RCTJavaScriptWillStartLoadingNotification
+												   object:nil];
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(onBridgeWillReload)
+													 name:RCTBridgeWillReloadNotification
+												   object:nil];
+	}
+	return self;
 }
 
 - (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCreator)callback {
-    [_store registerExternalComponent:name callback:callback];
+	[_store registerExternalComponent:name callback:callback];
 }
 
 - (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
-    RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
-    RNNModalManagerEventHandler *modalManagerEventHandler =
-        [[RNNModalManagerEventHandler alloc] initWithEventEmitter:eventEmitter];
-    _modalManager = [[RNNModalManager alloc] initWithBridge:bridge
-                                               eventHandler:modalManagerEventHandler];
-    _modalHostViewHandler =
-        [[RNNModalHostViewManagerHandler alloc] initWithModalManager:_modalManager];
-    _layoutManager = [[RNNLayoutManager alloc] init];
-
-    id<RNNComponentViewCreator> rootViewCreator =
-        [[RNNReactRootViewCreator alloc] initWithBridge:bridge eventEmitter:eventEmitter];
-    _componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator];
-    RNNControllerFactory *controllerFactory =
-        [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator
-                                                 eventEmitter:eventEmitter
-                                                        store:_store
-                                            componentRegistry:_componentRegistry
-                                                    andBridge:bridge
-                                  bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]];
-    RNNSetRootAnimator *setRootAnimator = [RNNSetRootAnimator new];
-    _commandsHandler = [[RNNCommandsHandler alloc] initWithControllerFactory:controllerFactory
-                                                               layoutManager:_layoutManager
-                                                                eventEmitter:eventEmitter
-                                                                modalManager:_modalManager
-                                                              overlayManager:_overlayManager
-                                                             setRootAnimator:setRootAnimator
-                                                                  mainWindow:_mainWindow];
-    RNNBridgeModule *bridgeModule =
-        [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
-
-    return @[ bridgeModule, eventEmitter ];
+	RNNEventEmitter * eventEmitter = [[RNNBridgeEventEmitter alloc] init];
+	
+	RNNModalManagerEventHandler *modalManagerEventHandler =
+		[[RNNModalManagerEventHandler alloc] initWithEventEmitter:eventEmitter];
+	_modalManager = [[RNNModalManager alloc] initWithBridge:bridge
+											   eventHandler:modalManagerEventHandler];
+	_modalHostViewHandler =
+		[[RNNModalHostViewManagerHandler alloc] initWithModalManager:_modalManager];
+	_layoutManager = [[RNNLayoutManager alloc] init];
+
+	id<RNNComponentViewCreator> rootViewCreator =
+		[[RNNReactRootViewCreator alloc] initWithBridge:bridge eventEmitter:eventEmitter];
+	_componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator];
+	RNNViewControllerFactory *controllerFactory =
+		[[RNNViewControllerFactory alloc] initWithRootViewCreator:rootViewCreator
+												 eventEmitter:eventEmitter
+														store:_store
+											componentRegistry:_componentRegistry
+													andBridge:bridge
+								  bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]];
+	RNNSetRootAnimator *setRootAnimator = [RNNSetRootAnimator new];
+	_commandsHandler = [[RNNCommandsHandler alloc] initWithViewControllerFactory:controllerFactory
+																   layoutManager:_layoutManager
+																	eventEmitter:eventEmitter
+																	modalManager:_modalManager
+																  overlayManager:_overlayManager
+																 setRootAnimator:setRootAnimator
+																	  mainWindow:_mainWindow];
+	RNNBridgeModule *bridgeModule =
+		[[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
+
+	return @[ bridgeModule, eventEmitter ];
 }
 
 - (UIViewController *)findComponentForId:(NSString *)componentId {
-    return [_layoutManager findComponentForId:componentId];
+	return [_layoutManager findComponentForId:componentId];
 }
 
 #pragma mark - JavaScript & Bridge Notifications
 
 - (void)onJavaScriptWillLoad {
-    [_componentRegistry clear];
+	[_componentRegistry clear];
 }
 
 - (void)onJavaScriptLoaded {
-    [_commandsHandler setReadyToReceiveCommands:true];
-    [_modalHostViewHandler
-        connectModalHostViewManager:[self.bridge moduleForClass:RCTModalHostViewManager.class]];
-    [[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
+	[_commandsHandler setReadyToReceiveCommands:true];
+	[_modalHostViewHandler
+		connectModalHostViewManager:[self.bridge moduleForClass:RCTModalHostViewManager.class]];
+	[[_bridge moduleForClass:[RNNBridgeEventEmitter class]] sendOnAppLaunched];
 }
 
 - (void)onBridgeWillReload {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self->_overlayManager dismissAllOverlays];
-      [self->_componentRegistry clear];
-      UIApplication.sharedApplication.delegate.window.rootViewController = nil;
-    });
+	dispatch_async(dispatch_get_main_queue(), ^{
+	  [self->_overlayManager dismissAllOverlays];
+	  [self->_componentRegistry clear];
+	  UIApplication.sharedApplication.delegate.window.rootViewController = nil;
+	});
 }
 
 @end

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

@@ -11,9 +11,9 @@
     self = [super init];
     _componentRegistry = componentRegistry;
     if (@available(iOS 13.0, *)) {
-        _iconCreator = [[RNNDynamicIconCreator alloc] initWithIconDrawer:RNNIconDrawer.new];
+        _iconCreator = [[RNNDynamicIconCreator alloc] initWithIconDrawer:[RNNIconDrawer new]];
     } else {
-        _iconCreator = [[RNNIconCreator alloc] initWithIconDrawer:RNNIconDrawer.new];
+        _iconCreator = [[RNNIconCreator alloc] initWithIconDrawer:[RNNIconDrawer new]];
     }
 
     return self;

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

@@ -30,7 +30,7 @@
 }
 
 - (RNNButtonOptions *)copy {
-    RNNButtonOptions *newOptions = RNNButtonOptions.new;
+    RNNButtonOptions *newOptions = [RNNButtonOptions new];
     newOptions.identifier = self.identifier.copy;
     newOptions.component = self.component.copy;
     newOptions.fontFamily = self.fontFamily.copy;
@@ -100,7 +100,7 @@
 
 - (UIColor *)resolveColor {
     if ([_disableIconTint withDefault:NO])
-        return NullColor.new.get;
+        return [NullColor new].get;
     if (![_enabled withDefault:YES] && _disabledColor.hasValue)
         return _disabledColor.get;
     else

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

@@ -6,7 +6,7 @@
     if (!buttons)
         return nil;
     if ([buttons isKindOfClass:[NSArray class]]) {
-        NSMutableArray *buttonsArray = NSMutableArray.new;
+        NSMutableArray *buttonsArray = [NSMutableArray new];
         for (NSDictionary *buttonDict in buttons) {
             [buttonsArray addObject:[self parseButton:buttonDict]];
         }

package/lib/ios/RNNCommandsHandler.h

@@ -1,4 +1,4 @@
-#import "RNNControllerFactory.h"
+#import "RNNViewControllerFactory.h"
 #import "RNNLayoutManager.h"
 #import "RNNModalManager.h"
 #import "RNNOverlayManager.h"
@@ -6,9 +6,15 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTSurfacePresenter.h>
+#import <React/RCTMountingManager.h>
+#import <React/RCTComponentViewRegistry.h>
+#endif
+
 @interface RNNCommandsHandler : NSObject
 
-- (instancetype)initWithControllerFactory:(RNNControllerFactory *)controllerFactory
+- (instancetype)initWithViewControllerFactory:(RNNViewControllerFactory *)controllerFactory
                             layoutManager:(RNNLayoutManager *)layoutManager
                              eventEmitter:(RNNEventEmitter *)eventEmitter
                              modalManager:(RNNModalManager *)modalManager

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

@@ -8,6 +8,7 @@
 #import "React/RCTI18nUtil.h"
 #import "UINavigationController+RNNCommands.h"
 #import "UIViewController+RNNOptions.h"
+#import "RNNUtils.h"
 
 static NSString *const setRoot = @"setRoot";
 static NSString *const setStackRoot = @"setStackRoot";
@@ -30,7 +31,7 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
 @end
 
 @implementation RNNCommandsHandler {
-    RNNControllerFactory *_controllerFactory;
+	RNNViewControllerFactory *_controllerFactory;
     RNNLayoutManager *_layoutManager;
     RNNModalManager *_modalManager;
     RNNOverlayManager *_overlayManager;
@@ -39,7 +40,7 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
     RNNSetRootAnimator *_setRootAnimator;
 }
 
-- (instancetype)initWithControllerFactory:(RNNControllerFactory *)controllerFactory
+- (instancetype)initWithViewControllerFactory:(RNNViewControllerFactory *)controllerFactory
                             layoutManager:(RNNLayoutManager *)layoutManager
                              eventEmitter:(RNNEventEmitter *)eventEmitter
                              modalManager:(RNNModalManager *)modalManager
@@ -89,7 +90,7 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
     [_layoutManager addPendingViewController:vc];
 
     RNNNavigationOptions *optionsWithDefault = vc.resolveOptionsWithDefault;
-    vc.waitForRender = [optionsWithDefault.animations.setRoot.waitForRender withDefault:NO];
+    vc.waitForRender = [optionsWithDefault.animations.setRoot.waitForRender withDefault: [RNNUtils getDefaultWaitForRender]];
 
     __weak UIViewController *weakVC = vc;
     [vc setReactViewReadyCallback:^{
@@ -140,7 +141,9 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
     [RNNDefaultOptionsHelper recursivelySetDefaultOptions:defaultOptions
                                      onRootViewController:rootViewController];
 
-    completion();
+	if (completion != nil) {
+		completion();
+	}
 }
 
 - (void)push:(NSString *)componentId
@@ -195,9 +198,22 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
                 newVc.preferredContentSize = size;
             }
             RCTExecuteOnMainQueue(^{
-              UIView *view = [[ReactNativeNavigation getBridge].uiManager
-                  viewForReactTag:optionsWithDefault.preview.reactTag.get];
-              [rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:view];
+				UIView *view = nil;
+#ifdef RCT_NEW_ARCH_ENABLED
+				RCTHost *host = [ReactNativeNavigation getHost];
+
+				if (host != nil) {
+					view = [host.surfacePresenter.mountingManager.componentViewRegistry
+						findComponentViewWithTag: [optionsWithDefault.preview.reactTag.get integerValue]];
+				} else {
+					view = [[ReactNativeNavigation getBridge].uiManager
+						viewForReactTag:optionsWithDefault.preview.reactTag.get];
+				}
+#else
+				view = [[ReactNativeNavigation getBridge].uiManager
+					viewForReactTag:optionsWithDefault.preview.reactTag.get];
+#endif
+				[rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:view];
             });
         }
     } else {
@@ -246,14 +262,14 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
     UIViewController *fromVC = [_layoutManager findComponentForId:componentId];
 
     RNNNavigationOptions *options = newVC.resolveOptionsWithDefault;
-    newVC.waitForRender = ([options.animations.setStackRoot.waitForRender withDefault:NO]);
+    newVC.waitForRender = ([options.animations.setStackRoot.waitForRender withDefault: [RNNUtils getDefaultWaitForRender]]);
 
-    __weak typeof(RNNEventEmitter *) weakEventEmitter = _eventEmitter;
+    __weak RNNEventEmitter *weakEventEmitter = _eventEmitter;
     __weak UIViewController *weakNewVC = newVC;
     [newVC setReactViewReadyCallback:^{
       [fromVC.stack setStackChildren:childViewControllers
                   fromViewController:fromVC
-                            animated:[options.animations.setStackRoot.enable withDefault:YES]
+                            animated:[options.animations.setStackRoot.enable withDefault: [RNNUtils getDefaultWaitForRender]]
                           completion:^{
                             [self->_layoutManager removePendingViewController:weakNewVC];
                             [weakEventEmitter sendOnNavigationCommandCompletion:setStackRoot
@@ -502,12 +518,15 @@ static NSString *const setDefaultOptions = @"setDefaultOptions";
 #pragma mark - private
 
 - (void)assertReady {
+#ifndef RCT_NEW_ARCH_ENABLED
     if (!self.readyToReceiveCommands) {
         [[NSException exceptionWithName:@"BridgeNotLoadedError"
                                  reason:@"Bridge not yet loaded! Send commands after "
                                         @"Navigation.events().onAppLaunched() has been called."
                                userInfo:nil] raise];
     }
+#endif
+    return;
 }
 
 @end

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

@@ -1,4 +1,5 @@
 #import "RNNComponentOptions.h"
+#import "RNNUtils.h"
 
 @implementation RNNComponentOptions
 
@@ -8,13 +9,13 @@
     self.name = [TextParser parse:dict key:@"name"];
     self.componentId = [TextParser parse:dict key:@"componentId"];
     self.alignment = [TextParser parse:dict key:@"alignment"];
-    self.waitForRender = [BoolParser parse:dict key:@"waitForRender"];
+	self.waitForRender = [Bool withValue:[[BoolParser parse:dict key:@"waitForRender"] withDefault:[RNNUtils getDefaultWaitForRender]]];
 
     return self;
 }
 
 - (id)copyWithZone:(NSZone *)zone {
-    RNNComponentOptions *newOptions = RNNComponentOptions.new;
+    RNNComponentOptions *newOptions = [RNNComponentOptions new];
     newOptions.name = self.name.copy;
     newOptions.componentId = self.componentId.copy;
     newOptions.alignment = self.alignment.copy;

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

@@ -237,7 +237,7 @@
 - (void)renderComponents:(RNNNavigationOptions *)options
                  perform:(RNNReactViewReadyCompletionBlock)readyBlock {
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-    [_topBarTitlePresenter renderComponents:withDefault.topBar perform:readyBlock];
+	[_topBarTitlePresenter renderComponents:(RNNNavigationOptions *)withDefault.topBar perform:readyBlock];
 }
 
 - (void)dealloc {

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

@@ -77,10 +77,6 @@
     [self renderReactViewIfNeeded];
 }
 
-- (void)destroyReactView {
-    [self.reactView invalidate];
-}
-
 - (void)renderReactViewIfNeeded {
     if (!self.reactView) {
         self.view = [[UIView alloc] initWithFrame:UIScreen.mainScreen.bounds];

package/lib/ios/RNNCustomTitleView.h

@@ -1,11 +1,21 @@
-#import <React/RCTRootView.h>
 #import <React/RCTRootViewDelegate.h>
 #import <UIKit/UIKit.h>
+#import "RNNReactView.h"
 
-@interface RNNCustomTitleView : UIView <RCTRootViewDelegate>
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTSurfaceDelegate.h>
+#endif
+
+@interface RNNCustomTitleView : UIView <
+#ifdef RCT_NEW_ARCH_ENABLED
+RCTSurfaceDelegate
+#else
+RCTRootViewDelegate
+#endif
+>
 
 - (instancetype)initWithFrame:(CGRect)frame
-                      subView:(RCTRootView *)subView
-                    alignment:(NSString *)alignment;
+					  subView:(RNNReactView *)subView
+					alignment:(NSString *)alignment;
 
 @end