Fixes detached overlays on setRoot (#4204)

lib/ios/RNNBridgeManager.m

@@ -23,6 +23,7 @@
 	RCTBridge* _bridge;
 
 	RNNStore* _store;
+	RNNStore* _overlayStore;
 
 	RNNCommandsHandler* _commandsHandler;
 }
@@ -34,6 +35,7 @@
 		_delegate = delegate;
 		
 		_store = [RNNStore new];
+		_overlayStore = [RNNStore new];
 		_bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:_launchOptions];
 
 		[[NSNotificationCenter defaultCenter] addObserver:self
@@ -74,8 +76,9 @@
 	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
 
 	id<RNNRootViewCreator> rootViewCreator = [[RNNReactRootViewCreator alloc] initWithBridge:bridge];
-	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator store:_store eventEmitter:eventEmitter andBridge:bridge];
-	_commandsHandler = [[RNNCommandsHandler alloc] initWithStore:_store controllerFactory:controllerFactory eventEmitter:eventEmitter];
+	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator eventEmitter:eventEmitter andBridge:bridge];
+	
+	_commandsHandler = [[RNNCommandsHandler alloc] initWithStore:_store overlayStore:_overlayStore controllerFactory:controllerFactory eventEmitter:eventEmitter stackManager:[RNNNavigationStackManager new] modalManager:[RNNModalManager new] overlayManager:[RNNOverlayManager new]];
 	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
 
 	return [@[bridgeModule,eventEmitter] arrayByAddingObjectsFromArray:[self extraModulesFromDelegate]];
@@ -85,10 +88,12 @@
 
 - (void)onJavaScriptWillLoad {
 	[_store clean];
+	[_overlayStore clean];
 }
 
 - (void)onJavaScriptLoaded {
 	[_store setReadyToReceiveCommands:true];
+	[_overlayStore setReadyToReceiveCommands:true];
 	[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
 }
 

lib/ios/RNNCommandsHandler.h

@@ -3,10 +3,13 @@
 
 #import "RNNControllerFactory.h"
 #import "RNNStore.h"
+#import "RNNModalManager.h"
+#import "RNNNavigationStackManager.h"
+#import "RNNOverlayManager.h"
 
 @interface RNNCommandsHandler : NSObject
 
-- (instancetype)initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter*)eventEmitter;
+- (instancetype)initWithStore:(RNNStore*)store overlayStore:(RNNStore*)overlayStore controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter stackManager:(RNNNavigationStackManager *)stackManager modalManager:(RNNModalManager *)modalManager overlayManager:(RNNOverlayManager *)overlayManager;
 
 - (void)setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 

lib/ios/RNNCommandsHandler.m

@@ -1,7 +1,4 @@
 #import "RNNCommandsHandler.h"
-#import "RNNModalManager.h"
-#import "RNNNavigationStackManager.h"
-#import "RNNOverlayManager.h"
 #import "RNNNavigationOptions.h"
 #import "RNNRootViewController.h"
 #import "RNNSplitViewController.h"
@@ -33,21 +30,23 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 @implementation RNNCommandsHandler {
 	RNNControllerFactory *_controllerFactory;
 	RNNStore *_store;
+	RNNStore *_overlayStore;
 	RNNModalManager* _modalManager;
 	RNNOverlayManager* _overlayManager;
 	RNNNavigationStackManager* _stackManager;
 	RNNEventEmitter* _eventEmitter;
 }
 
-- (instancetype)initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter {
+- (instancetype)initWithStore:(RNNStore*)store overlayStore:(RNNStore*)overlayStore controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter stackManager:(RNNNavigationStackManager *)stackManager modalManager:(RNNModalManager *)modalManager overlayManager:(RNNOverlayManager *)overlayManager {
 	self = [super init];
 	_store = store;
+	_overlayStore = overlayStore;
 	_controllerFactory = controllerFactory;
 	_eventEmitter = eventEmitter;
-	_modalManager = [[RNNModalManager alloc] init];
+	_modalManager = modalManager;
 	_modalManager.delegate = self;
-	_stackManager = [[RNNNavigationStackManager alloc] init];
-	_overlayManager = [[RNNOverlayManager alloc] init];
+	_stackManager = stackManager;
+	_overlayManager = overlayManager;
 	return self;
 }
 
@@ -59,7 +58,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_modalManager dismissAllModalsAnimated:NO];
 	[_store removeAllComponents];
 	
-	UIViewController *vc = [_controllerFactory createLayoutAndSaveToStore:layout[@"root"]];
+	UIViewController *vc = [_controllerFactory createLayout:layout[@"root"] saveToStore:_store];
 	
 	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
 	[UIApplication.sharedApplication.delegate.window makeKeyWindow];
@@ -97,7 +96,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	
-	UIViewController<RNNLayoutProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController<RNNLayoutProtocol> *newVc = [_controllerFactory createLayout:layout saveToStore:_store];
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	
 	if ([newVc.options.preview.reactTag floatValue] > 0) {
@@ -154,7 +153,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	
-	UIViewController<RNNParentProtocol> *newVC = [_controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController<RNNParentProtocol> *newVC = [_controllerFactory createLayout:layout saveToStore:_store];
 	RNNNavigationOptions* options = [newVC getCurrentChild].options;
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
@@ -229,7 +228,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)showModal:(NSDictionary*)layout completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
 	[self assertReady];
 	
-	UIViewController<RNNParentProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController<RNNParentProtocol> *newVc = [_controllerFactory createLayout:layout saveToStore:_store];
 	
 	[newVc.getCurrentChild waitForReactViewRender:newVc.getCurrentChild.options.animations.showModal.waitForRender perform:^{
 		[_modalManager showModal:newVc animated:newVc.getCurrentChild.options.animations.showModal.enable hasCustomAnimation:newVc.getCurrentChild.options.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
@@ -281,7 +280,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 - (void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
-	UIViewController<RNNParentProtocol>* overlayVC = [_controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController<RNNParentProtocol>* overlayVC = [_controllerFactory createLayout:layout saveToStore:_overlayStore];
 	[_overlayManager showOverlay:overlayVC];
 	[_eventEmitter sendOnNavigationCommandCompletion:showOverlay params:@{@"layout": layout}];
 	completion();
@@ -289,7 +288,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 - (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject {
 	[self assertReady];
-	UIViewController* viewController = [_store findComponentForId:componentId];
+	UIViewController* viewController = [_overlayStore findComponentForId:componentId];
 	if (viewController) {
 		[_overlayManager dismissOverlay:viewController];
 		[_eventEmitter sendOnNavigationCommandCompletion:dismissOverlay params:@{@"componentId": componentId}];

lib/ios/RNNControllerFactory.h

@@ -9,11 +9,10 @@
 @interface RNNControllerFactory : NSObject
 
 -(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator
-								 store:(RNNStore*)store
 						  eventEmitter:(RNNEventEmitter*)eventEmitter
 							 andBridge:(RCTBridge*)bridge;
 
--(UIViewController<RNNParentProtocol, UIViewControllerPreviewingDelegate> *)createLayoutAndSaveToStore:(NSDictionary*)layout;
+- (UIViewController<RNNParentProtocol> *)createLayout:(NSDictionary*)layout saveToStore:(RNNStore *)store;
 
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 

lib/ios/RNNControllerFactory.m

@@ -25,22 +25,23 @@
 
 
 - (instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator
-								  store:(RNNStore *)store
 						   eventEmitter:(RNNEventEmitter*)eventEmitter
 							  andBridge:(RCTBridge *)bridge {
 	
 	self = [super init];
 	
 	_creator = creator;
-	_store = store;
 	_eventEmitter = eventEmitter;
 	_bridge = bridge;
 	
 	return self;
 }
 
-- (UIViewController<RNNParentProtocol> *)createLayoutAndSaveToStore:(NSDictionary*)layout {
-	return [self fromTree:layout];
+- (UIViewController<RNNParentProtocol> *)createLayout:(NSDictionary*)layout saveToStore:(RNNStore *)store {
+	_store = store;
+	UIViewController<RNNParentProtocol>* layoutViewController = [self fromTree:layout];
+	_store = nil;
+	return layoutViewController;
 }
 
 # pragma mark private

lib/ios/RNNOverlayOptions.m

@@ -11,11 +11,4 @@
 	return self;
 }
 
-- (void)applyOn:(UIViewController *)viewController {
-//	if (self.interceptTouchOutside) {
-//		RCTRootView* rootView = (RCTRootView*)viewController.view;
-//		rootView.passThroughTouches = ![self.interceptTouchOutside boolValue];
-//	}
-}
-
 @end

lib/ios/RNNViewControllerPresenter.m

@@ -3,6 +3,7 @@
 #import "UITabBarController+RNNOptions.h"
 #import "RNNNavigationButtons.h"
 #import "RCTConvert+Modal.h"
+#import "RNNReactView.h"
 
 @interface RNNViewControllerPresenter()
 @property (nonatomic, strong) RNNNavigationButtons* navigationButtons;
@@ -23,6 +24,7 @@
 	[viewController rnn_setStatusBarBlur:[options.statusBar.blur getWithDefaultValue:NO]];
 	[viewController rnn_setStatusBarStyle:[options.statusBar.style getWithDefaultValue:@"default"] animated:[options.statusBar.animate getWithDefaultValue:YES]];
 	[viewController rnn_setBackButtonVisible:[options.topBar.backButton.visible getWithDefaultValue:YES]];
+	[viewController rnn_setInterceptTouchOutside:[options.overlay.interceptTouchOutside getWithDefaultValue:YES]];
 
 	if (options.layout.backgroundColor.hasValue) {
 		[viewController rnn_setBackgroundColor:options.layout.backgroundColor.get];
@@ -117,6 +119,11 @@
 		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
 		[_navigationButtons applyLeftButtons:options.topBar.leftButtons rightButtons:options.topBar.rightButtons defaultLeftButtonStyle:buttonsResolvedOptions.topBar.leftButtonStyle defaultRightButtonStyle:buttonsResolvedOptions.topBar.rightButtonStyle];
 	}
+	
+	if (options.overlay.interceptTouchOutside.hasValue) {
+		RCTRootView* rootView = (RCTRootView*)viewController.view;
+		rootView.passThroughTouches = !options.overlay.interceptTouchOutside.get;
+	}
 }
 
 @end

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -4,8 +4,9 @@
 #import "RNNNavigationOptions.h"
 #import "RNNTestRootViewCreator.h"
 #import "RNNRootViewController.h"
-#import "RNNNavigationStackManager.h"
 #import "RNNNavigationController.h"
+#import "RNNErrorHandler.h"
+#import <OCMock/OCMock.h>
 
 @interface MockUINavigationController : RNNNavigationController
 @property (nonatomic, strong) NSArray* willReturnVCs;
@@ -26,11 +27,15 @@
 @interface RNNCommandsHandlerTest : XCTestCase
 
 @property (nonatomic, strong) RNNStore* store;
+@property (nonatomic, strong) id overlayStore;
 @property (nonatomic, strong) RNNCommandsHandler* uut;
 @property (nonatomic, strong) RNNRootViewController* vc1;
 @property (nonatomic, strong) RNNRootViewController* vc2;
 @property (nonatomic, strong) RNNRootViewController* vc3;
 @property (nonatomic, strong) MockUINavigationController* nvc;
+@property (nonatomic, strong) id controllerFactory;
+@property (nonatomic, strong) id overlayManager;
+@property (nonatomic, strong) id eventEmmiter;
 
 @end
 
@@ -40,7 +45,11 @@
 	[super setUp];
 //	[self.store setReadyToReceiveCommands:true];
 	self.store = [[RNNStore alloc] init];
-	self.uut = [[RNNCommandsHandler alloc] initWithStore:self.store controllerFactory:[[RNNControllerFactory alloc] initWithRootViewCreator:nil store:self.store eventEmitter:nil andBridge:nil] eventEmitter:nil];
+	self.overlayStore = [OCMockObject partialMockForObject:[[RNNStore alloc] init]];
+	self.eventEmmiter = [OCMockObject partialMockForObject:[RNNEventEmitter new]];
+	self.overlayManager = [OCMockObject partialMockForObject:[RNNOverlayManager new]];
+	self.controllerFactory = [OCMockObject partialMockForObject:[[RNNControllerFactory alloc] initWithRootViewCreator:nil eventEmitter:self.eventEmmiter andBridge:nil]];
+	self.uut = [[RNNCommandsHandler alloc] initWithStore:self.store overlayStore:self.overlayStore controllerFactory:self.controllerFactory eventEmitter:self.eventEmmiter stackManager:[RNNNavigationStackManager new] modalManager:[RNNModalManager new] overlayManager:self.overlayManager];
 	self.vc1 = [RNNRootViewController new];
 	self.vc2 = [RNNRootViewController new];
 	self.vc3 = [RNNRootViewController new];
@@ -67,7 +76,7 @@
 -(NSArray*) getPublicMethodNamesForObject:(NSObject*)obj{
 	NSMutableArray* skipMethods = [NSMutableArray new];
 
-	[skipMethods addObject:@"initWithStore:controllerFactory:eventEmitter:"];
+	[skipMethods addObject:@"initWithStore:overlayStore:controllerFactory:eventEmitter:stackManager:modalManager:overlayManager:"];
 	[skipMethods addObject:@"assertReady"];
 	[skipMethods addObject:@"removePopedViewControllers:"];
 	[skipMethods addObject:@".cxx_destruct"];
@@ -184,4 +193,88 @@
 	[self waitForExpectationsWithTimeout:1 handler:nil];
 }
 
+- (void)testShowOverlay_createLayout {
+	[self.store setReadyToReceiveCommands:true];
+	OCMStub([self.overlayManager showOverlay:[OCMArg any]]);
+	NSDictionary* layout = @{};
+	
+	[[self.controllerFactory expect] createLayout:layout saveToStore:self.overlayStore];
+	[self.uut showOverlay:layout completion:^{}];
+	[self.controllerFactory verify];
+}
+
+- (void)testShowOverlay_saveToOverlayStore {
+	[self.store setReadyToReceiveCommands:true];
+	OCMStub([self.overlayManager showOverlay:[OCMArg any]]);
+	OCMStub([self.controllerFactory createLayout:[OCMArg any] saveToStore:[OCMArg any]]);
+	
+	[[self.controllerFactory expect] createLayout:[OCMArg any] saveToStore:self.overlayStore];
+	[self.uut showOverlay:@{} completion:^{}];
+	[self.overlayManager verify];
+}
+
+- (void)testShowOverlay_withCreatedLayout {
+	[self.store setReadyToReceiveCommands:true];
+	UIViewController* layoutVC = [RNNRootViewController new];
+	OCMStub([self.controllerFactory createLayout:[OCMArg any] saveToStore:[OCMArg any]]).andReturn(layoutVC);
+	
+	[[self.overlayManager expect] showOverlay:layoutVC];
+	[self.uut showOverlay:@{} completion:^{}];
+	[self.overlayManager verify];
+}
+
+- (void)testShowOverlay_invokeNavigationCommandEventWithLayout {
+	[self.store setReadyToReceiveCommands:true];
+	OCMStub([self.overlayManager showOverlay:[OCMArg any]]);
+	OCMStub([self.controllerFactory createLayout:[OCMArg any] saveToStore:[OCMArg any]]);
+
+	NSDictionary* layout = @{};
+	
+	[[self.eventEmmiter expect] sendOnNavigationCommandCompletion:@"showOverlay" params:[OCMArg any]];
+	[self.uut showOverlay:layout completion:^{}];
+	[self.eventEmmiter verify];
+}
+
+- (void)testDismissOverlay_findComponentFromOverlayStore {
+	[self.store setReadyToReceiveCommands:true];
+	NSString* componentId = @"componentId";
+	[[self.overlayStore expect] findComponentForId:componentId];
+	[self.uut dismissOverlay:componentId completion:^{} rejection:^(NSString *code, NSString *message, NSError *error) {}];
+	[self.overlayStore verify];
+}
+
+- (void)testDismissOverlay_dismissReturnedViewController {
+	[self.store setReadyToReceiveCommands:true];
+	NSString* componentId = @"componentId";
+	UIViewController* returnedView = [UIViewController new];
+	OCMStub([self.overlayStore findComponentForId:componentId]).andReturn(returnedView);
+	
+	[[self.overlayManager expect] dismissOverlay:returnedView];
+	[self.uut dismissOverlay:componentId completion:^{} rejection:^(NSString *code, NSString *message, NSError *error) {}];
+	[self.overlayManager verify];
+}
+
+- (void)testDismissOverlay_handleErrorIfNoOverlayExists {
+	[self.store setReadyToReceiveCommands:true];
+	NSString* componentId = @"componentId";
+    id errorHandlerMockClass = [OCMockObject mockForClass:[RNNErrorHandler class]];
+	
+    [[errorHandlerMockClass expect] reject:[OCMArg any] withErrorCode:1010 errorDescription:[OCMArg any]];
+    [self.uut dismissOverlay:componentId completion:[OCMArg any] rejection:[OCMArg any]];
+    [errorHandlerMockClass verify];
+}
+
+- (void)testDismissOverlay_invokeNavigationCommandEvent {
+	[self.store setReadyToReceiveCommands:true];
+	NSString* componentId = @"componentId";
+	OCMStub([self.overlayStore findComponentForId:componentId]).andReturn([UIViewController new]);
+	
+	[[self.eventEmmiter expect] sendOnNavigationCommandCompletion:@"dismissOverlay" params:[OCMArg any]];
+	[self.uut dismissOverlay:componentId completion:^{
+		
+	} rejection:^(NSString *code, NSString *message, NSError *error) {}];
+	 
+	[self.eventEmmiter verify];
+}
+
 @end

lib/ios/ReactNativeNavigationTests/RNNControllerFactoryTest.m

@@ -22,7 +22,7 @@
 	[super setUp];
 	self.creator = nil;
 	self.store = [RNNStore new];
-	self.factory = [[RNNControllerFactory alloc] initWithRootViewCreator:self.creator store:self.store eventEmitter:nil andBridge:nil];
+	self.factory = [[RNNControllerFactory alloc] initWithRootViewCreator:self.creator eventEmitter:nil andBridge:nil];
 }
 
 - (void)tearDown {
@@ -30,16 +30,15 @@
 }
 
 - (void)testCreateLayout_EmptyLayout {
-	XCTAssertThrows([self.factory createLayoutAndSaveToStore:@{}]);
+	XCTAssertThrows([self.factory createLayout:@{} saveToStore:self.store]);
 }
 
 - (void)testCreateLayout_ComponentLayout {
-	
-	id ans = [self.factory createLayoutAndSaveToStore:
-			  @{@"id": @"cntId",
-				@"type": @"Component",
-				@"data": @{},
-				@"children": @[]}];
+	NSDictionary* layout = @{@"id": @"cntId",
+							 @"type": @"Component",
+							 @"data": @{},
+							 @"children": @[]};
+	id ans = [self.factory createLayout:layout saveToStore:self.store];
 	XCTAssertTrue([ans isMemberOfClass:[RNNRootViewController class]]);
 }
 
@@ -48,50 +47,50 @@
 		return [UIViewController new];
 	}];
 	
-	id ans = [self.factory createLayoutAndSaveToStore:
-			  @{@"id": @"cntId",
-				@"type": @"ExternalComponent",
-				@"data": @{@"name": @"externalComponent"},
-				@"children": @[]}];
+	NSDictionary* layout =  @{@"id": @"cntId",
+							  @"type": @"ExternalComponent",
+							  @"data": @{@"name": @"externalComponent"},
+							  @"children": @[]};
+	id ans = [self.factory createLayout:layout saveToStore:self.store];
 	XCTAssertTrue([ans isMemberOfClass:[RNNRootViewController class]]);
 }
 
 - (void)testCreateLayout_ComponentStackLayout {
-	id ans = [self.factory createLayoutAndSaveToStore:
-			  @{@"id": @"cntId",
-				@"type": @"Stack",
-				@"data": @{},
-				@"children": @[]}];
+	NSDictionary* layout = @{@"id": @"cntId",
+							 @"type": @"Stack",
+							 @"data": @{},
+							 @"children": @[]};
+	id ans = [self.factory createLayout:layout saveToStore:self.store];
 	XCTAssertTrue([ans isMemberOfClass:[RNNNavigationController class]]);
 }
 
 - (void)testCreateLayout_SplitViewLayout {
-	id ans = [self.factory createLayoutAndSaveToStore:
-			  @{@"id": @"cntId",
-				@"type": @"SplitView",
-				@"data": @{},
-				@"children": @[
-						@{@"id": @"cntId_2",
-						  @"type": @"Component",
-						  @"data": @{},
-						  @"children": @[]},
-			  @{@"id": @"cntId_3",
-				@"type": @"Component",
-				@"data": @{},
-				@"children": @[]}]}];
+	NSDictionary* layout = @{@"id": @"cntId",
+							 @"type": @"SplitView",
+							 @"data": @{},
+							 @"children": @[
+									 @{@"id": @"cntId_2",
+									   @"type": @"Component",
+									   @"data": @{},
+									   @"children": @[]},
+									 @{@"id": @"cntId_3",
+									   @"type": @"Component",
+									   @"data": @{},
+									   @"children": @[]}]};
+	id ans = [self.factory createLayout:layout saveToStore:self.store];
 	XCTAssertTrue([ans isMemberOfClass:[RNNSplitViewController class]]);
 }
 
 - (void)testCreateLayout_ComponentStackLayoutRecursive {
-	RNNNavigationController* ans = (RNNNavigationController*) [self.factory createLayoutAndSaveToStore:
-															 @{@"id": @"cntId",
-															   @"type": @"Stack",
-															   @"data": @{},
-															   @"children": @[
-																	   @{@"id": @"cntId_2",
-																		 @"type": @"Component",
-																		 @"data": @{},
-																		 @"children": @[]}]}];
+	NSDictionary* layout = @{@"id": @"cntId",
+							 @"type": @"Stack",
+							 @"data": @{},
+							 @"children": @[
+									 @{@"id": @"cntId_2",
+									   @"type": @"Component",
+									   @"data": @{},
+									   @"children": @[]}]};
+	RNNNavigationController* ans = (RNNNavigationController*) [self.factory createLayout:layout saveToStore:self.store];
 	
 	XCTAssertTrue([ans isMemberOfClass:[RNNNavigationController class]]);
 	XCTAssertTrue(ans.childViewControllers.count == 1);
@@ -99,20 +98,20 @@
 }
 
 - (void)testCreateLayout_BottomTabsLayout {
-	RNNTabBarController* tabBar = (RNNTabBarController*) [self.factory createLayoutAndSaveToStore:
-														@{
-														  @"id": @"cntId",
-														  @"type": @"BottomTabs",
-														  @"data": @{},
-														  @"children": @[
-																  @{@"id": @"cntId_2",
-																	@"type": @"Stack",
-																	@"data": @{},
-																	@"children": @[
-																			@{@"id": @"cntId_3",
-																			  @"type": @"Component",
-																			  @"data": @{},
-																			  @"children": @[]}]}]}];
+	NSDictionary* layout = @{
+							 @"id": @"cntId",
+							 @"type": @"BottomTabs",
+							 @"data": @{},
+							 @"children": @[
+									 @{@"id": @"cntId_2",
+									   @"type": @"Stack",
+									   @"data": @{},
+									   @"children": @[
+											   @{@"id": @"cntId_3",
+												 @"type": @"Component",
+												 @"data": @{},
+												 @"children": @[]}]}]};
+	RNNTabBarController* tabBar = (RNNTabBarController*) [self.factory createLayout:layout saveToStore:self.store];
 	
 	XCTAssertTrue([tabBar isMemberOfClass:[RNNTabBarController class]]);
 	XCTAssertTrue(tabBar.childViewControllers.count == 1);
@@ -124,54 +123,54 @@
 }
 
 - (void)testCreateLayout_TopTabsLayout {
-	RNNTopTabsViewController* tabBar = (RNNTopTabsViewController*) [self.factory createLayoutAndSaveToStore:
-														  @{
-															@"id": @"cntId",
-															@"type": @"TopTabs",
-															@"data": @{},
-															@"children": @[
-																	@{@"id": @"cntId_2",
-																	  @"type": @"Stack",
-																	  @"data": @{},
-																	  @"children": @[
-																			  @{@"id": @"cntId_3",
-																				@"type": @"Component",
-																				@"data": @{},
-																				@"children": @[]}]}]}];
+	NSDictionary* layout = @{
+							 @"id": @"cntId",
+							 @"type": @"TopTabs",
+							 @"data": @{},
+							 @"children": @[
+									 @{@"id": @"cntId_2",
+									   @"type": @"Stack",
+									   @"data": @{},
+									   @"children": @[
+											   @{@"id": @"cntId_3",
+												 @"type": @"Component",
+												 @"data": @{},
+												 @"children": @[]}]}]};
+	RNNTopTabsViewController* tabBar = (RNNTopTabsViewController*) [self.factory createLayout:layout saveToStore:self.store];
 	
 	XCTAssertTrue([tabBar isMemberOfClass:[RNNTopTabsViewController class]]);
 }
 
 - (void)testCreateLayout_ComponentSideMenuLayoutCenterLeftRight {
-	RNNSideMenuController *ans = (RNNSideMenuController*) [self.factory createLayoutAndSaveToStore:
-														   @{@"id": @"cntId",
-															 @"type": @"SideMenuRoot",
-															 @"data": @{},
-															 @"children": @[
-																	 @{@"id": @"cntI_2",
-																	   @"type": @"SideMenuCenter",
-																	   @"data": @{},
-																	   @"children": @[
-																			   @{@"id": @"cntId_3",
-																				 @"type": @"Component",
-																				 @"data": @{},
-																				 @"children": @[]}]},
-																	 @{@"id": @"cntI_4",
-																	   @"type": @"SideMenuLeft",
-																	   @"data": @{},
-																	   @"children": @[
-																			   @{@"id": @"cntId_5",
-																				 @"type": @"Component",
-																				 @"data": @{},
-																				 @"children": @[]}]},
-																	 @{@"id": @"cntI_6",
-																	   @"type": @"SideMenuRight",
-																	   @"data": @{},
-																	   @"children": @[
-																			   @{@"id": @"cntId_7",
-																				 @"type": @"Component",
-																				 @"data": @{},
-																				 @"children": @[]}]}]}];
+	NSDictionary* layout = @{@"id": @"cntId",
+							 @"type": @"SideMenuRoot",
+							 @"data": @{},
+							 @"children": @[
+									 @{@"id": @"cntI_2",
+									   @"type": @"SideMenuCenter",
+									   @"data": @{},
+									   @"children": @[
+											   @{@"id": @"cntId_3",
+												 @"type": @"Component",
+												 @"data": @{},
+												 @"children": @[]}]},
+									 @{@"id": @"cntI_4",
+									   @"type": @"SideMenuLeft",
+									   @"data": @{},
+									   @"children": @[
+											   @{@"id": @"cntId_5",
+												 @"type": @"Component",
+												 @"data": @{},
+												 @"children": @[]}]},
+									 @{@"id": @"cntI_6",
+									   @"type": @"SideMenuRight",
+									   @"data": @{},
+									   @"children": @[
+											   @{@"id": @"cntId_7",
+												 @"type": @"Component",
+												 @"data": @{},
+												 @"children": @[]}]}]};
+	RNNSideMenuController *ans = (RNNSideMenuController*) [self.factory createLayout:layout saveToStore:self.store];
 	XCTAssertTrue([ans isMemberOfClass:[RNNSideMenuController class]]);
 	XCTAssertTrue([ans isKindOfClass:[UIViewController class]]);
 	XCTAssertTrue([ans.center isMemberOfClass:[RNNSideMenuChildVC class]]);
@@ -190,11 +189,11 @@
 
 - (void)testCreateLayout_addComponentToStore {
 	NSString *componentId = @"cntId";
-	UIViewController *ans = [self.factory createLayoutAndSaveToStore:
-							 @{@"id": componentId,
-							   @"type": @"Component",
-							   @"data": @{},
-							   @"children": @[]}];
+	NSDictionary* layout = @{@"id": componentId,
+							 @"type": @"Component",
+							 @"data": @{},
+							 @"children": @[]};
+	UIViewController *ans = [self.factory createLayout:layout saveToStore:self.store];
 	
 	UIViewController *storeAns = [self.store findComponentForId:componentId];
 	XCTAssertEqualObjects(ans, storeAns);

lib/ios/ReactNativeNavigationTests/RNNViewControllerPresenterTest.m

@@ -2,6 +2,7 @@
 #import <OCMock/OCMock.h>
 #import "RNNViewControllerPresenter.h"
 #import "UIViewController+RNNOptions.h"
+#import "RNNReactView.h"
 
 @interface RNNViewControllerPresenterTest : XCTestCase
 
@@ -59,6 +60,13 @@
 	[(id)self.bindedViewController verify];
 }
 
+- (void)testApplyOptions_setOverlayTouchOutsideIfHasValue {
+    self.options.overlay.interceptTouchOutside = [[Bool alloc] initWithBOOL:YES];
+    [[(id)self.bindedViewController expect] rnn_setInterceptTouchOutside:YES];
+    [self.uut applyOptions:self.options];
+    [(id)self.bindedViewController verify];
+}
+
 - (void)testApplyOptionsOnInit_shouldSetModalPresentetionStyleWithDefault {
 	[[(id)self.bindedViewController expect] rnn_setModalPresentationStyle:UIModalPresentationFullScreen];
 	[self.uut applyOptionsOnInit:self.options];

lib/ios/ReactNativeNavigationTests/UIViewController+RNNOptionsTest.m

@@ -84,10 +84,10 @@
 }
 
 - (void)testSetBackgroundImageShouldAddUIImageViewSubviewWithImage {
-	UIImage* image = [UIImage new];
-	[self.uut rnn_setBackgroundImage:image];
-	UIImageView* imageView = [[[self.uut view] subviews] firstObject];
-	XCTAssertEqual(imageView.image, image);
+    UIImage* image = [UIImage new];
+    [self.uut rnn_setBackgroundImage:image];
+    UIImageView* imageView = [[[self.uut view] subviews] firstObject];
+    XCTAssertEqual(imageView.image, image);
 }
 
 @end

lib/ios/UIViewController+RNNOptions.h

@@ -32,6 +32,8 @@
 
 - (void)rnn_setBackgroundColor:(UIColor *)backgroundColor;
 
+- (void)rnn_setInterceptTouchOutside:(BOOL)interceptTouchOutside;
+
 - (BOOL)isModal;
 
 @end

lib/ios/UIViewController+RNNOptions.m

@@ -1,4 +1,6 @@
 #import "UIViewController+RNNOptions.h"
+#import <React/RCTRootView.h>
+
 #define kStatusBarAnimationDuration 0.35
 const NSInteger BLUR_STATUS_TAG = 78264801;
 
@@ -148,5 +150,11 @@ const NSInteger BLUR_STATUS_TAG = 78264801;
 	return NO;
 }
 
+- (void)rnn_setInterceptTouchOutside:(BOOL)interceptTouchOutside {
+	if ([self.view isKindOfClass:[RCTRootView class]]) {
+		RCTRootView* rootView = (RCTRootView*)self.view;
+		rootView.passThroughTouches = !interceptTouchOutside;
+	}
+}
 
 @end