commands error handling

lib/ios/RCTHelpers.m

@@ -135,4 +135,5 @@
 	return [NSString stringWithFormat:@"%lld", milliseconds];
 }
 
+
 @end

lib/ios/RNNBridgeModule.m

@@ -39,31 +39,31 @@ RCT_EXPORT_METHOD(setDefaultOptions:(NSDictionary*)options resolver:(RCTPromiseR
 RCT_EXPORT_METHOD(push:(NSString*)componentId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
 	[_commandsHandler push:componentId layout:layout completion:^{
 		resolve(componentId);
-	}];
+	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(pop:(NSString*)componentId options:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
 	[_commandsHandler pop:componentId options:(NSDictionary*)options completion:^{
 		resolve(componentId);
-	}];
+	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
 	[_commandsHandler setStackRoot:componentId layout:layout completion:^{
 		resolve(componentId);
-	}];
+	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(popTo:(NSString*)componentId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
 	[_commandsHandler popTo:componentId completion:^{
 		resolve(componentId);
-	}];
+	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(popToRoot:(NSString*)componentId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
 	[_commandsHandler popToRoot:componentId completion:^{
 		resolve(componentId);
-	}];
+	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(showModal:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {

lib/ios/RNNCommandsHandler.h

@@ -6,29 +6,29 @@
 
 @interface RNNCommandsHandler : NSObject
 
--(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter*)eventEmitter;
+-(instancetype)initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter*)eventEmitter;
 
--(void) setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
+-(void)setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 
--(void) mergeOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
+-(void)mergeOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 
--(void) setDefaultOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
+-(void)setDefaultOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 
--(void) push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
+-(void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
--(void) pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
+-(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
--(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
+-(void)popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
--(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
+-(void)popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
--(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
+-(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
--(void) showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
+-(void)showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 
--(void) dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
+-(void)dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
 
--(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion;
+-(void)dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion;
 
 -(void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion;
 

lib/ios/RNNCommandsHandler.m

@@ -78,26 +78,26 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[_controllerFactory setDefaultOptionsDict:optionsDict];
 }
 
--(void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
+-(void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	[_eventEmitter sendOnNavigationComment:push params:@{@"componentId": componentId}];
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	[_navigationStackManager push:newVc onTop:componentId completion:^{
 		completion();
-	}];
+	} rejection:rejection];
 }
 
--(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
+-(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	[_eventEmitter sendOnNavigationComment:setStackRoot params:@{@"componentId": componentId}];
 
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[_navigationStackManager setRoot:newVc fromComponent:componentId completion:^{
+	[_navigationStackManager setStackRoot:newVc fromComponent:componentId completion:^{
 		completion();
-	}];
+	} rejection:rejection];
 }
 
--(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
+-(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	[_eventEmitter sendOnNavigationComment:pop params:@{@"componentId": componentId}];
 	[CATransaction begin];
@@ -109,14 +109,14 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	RNNAnimationOptions* transitionOptions = [[RNNAnimationOptions alloc] initWithDict:animationData];
 	
 	if (transitionOptions.animations){
-		[_navigationStackManager pop:componentId withTransitionOptions:transitionOptions];
+		[_navigationStackManager pop:componentId withTransitionOptions:transitionOptions rejection:rejection];
 	} else {
-		[_navigationStackManager pop:componentId withTransitionOptions:nil];
+		[_navigationStackManager pop:componentId withTransitionOptions:nil rejection:rejection];
 	}
 	[CATransaction commit];
 }
 
--(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
+-(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	[_eventEmitter sendOnNavigationComment:popTo params:@{@"componentId": componentId}];
 	[CATransaction begin];
@@ -124,12 +124,12 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		completion();
 	}];
 	
-	[_navigationStackManager popTo:componentId];
+	[_navigationStackManager popTo:componentId rejection:rejection];
 	
 	[CATransaction commit];
 }
 
--(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
+-(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	[_eventEmitter sendOnNavigationComment:popToRoot params:@{@"componentId": componentId}];
 	[CATransaction begin];
@@ -137,7 +137,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		completion();
 	}];
 	
-	[_navigationStackManager popToRoot:componentId];
+	[_navigationStackManager popToRoot:componentId rejection:rejection];
 	
 	[CATransaction commit];
 }
@@ -166,7 +166,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationComment:dismissAllModals params:nil];
+	[_eventEmitter sendOnNavigationComment:dismissAllModals params:@{}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		completion();

lib/ios/RNNErrorHandler.h

@@ -0,0 +1,13 @@
+#import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
+
+typedef enum RNNCommandsErrorCodes {
+	RNNCommandErrorCodeNoStack = 0
+} RNNCommandsErrorCodes;
+
+@interface RNNErrorHandler : NSObject
+
++ (void)reject:(RCTPromiseRejectBlock)reject withErrorCode:(NSInteger)errorCode errorDescription:(NSString*)errorDescription;
++ (NSString *)getCallerFunctionName;
+
+@end

lib/ios/RNNErrorHandler.m

@@ -0,0 +1,22 @@
+#import "RNNErrorHandler.h"
+
+static NSString* const domain = @"com.reactnativenavigation";
+
+@implementation RNNErrorHandler
+
++ (void)reject:(RCTPromiseRejectBlock)reject withErrorCode:(NSInteger)errorCode errorDescription:(NSString*)errorDescription {
+	NSError *error = [NSError errorWithDomain:domain code:errorCode userInfo:@{NSLocalizedFailureReasonErrorKey: errorDescription}];
+	if (reject) {
+		reject([NSString stringWithFormat:@"%ld", (long)errorCode], errorDescription, error);
+	}
+}
+
++ (NSString *)getCallerFunctionName {
+	NSString *sourceString = [[NSThread callStackSymbols] objectAtIndex:2];
+	NSCharacterSet *separatorSet = [NSCharacterSet characterSetWithCharactersInString:@" -[]+?.,"];
+	NSMutableArray *array = [NSMutableArray arrayWithArray:[sourceString  componentsSeparatedByCharactersInSet:separatorSet]];
+	[array removeObject:@""];
+	return [[[array objectAtIndex:4] componentsSeparatedByString:@":"] objectAtIndex:0];
+}
+
+@end

lib/ios/RNNNavigationStackManager.h

@@ -10,10 +10,10 @@
 -(instancetype)initWithStore:(RNNStore*)store;
 
 
--(void)push:(UIViewController<RNNRootViewProtocol>*)newTop onTop:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
--(void)pop:(NSString*)componentId withTransitionOptions:(RNNAnimationOptions*)transitionOptions;
--(void)popTo:(NSString*)componentId;
--(void)popToRoot:(NSString*)componentId;
--(void)setRoot:(UIViewController<RNNRootViewProtocol> *)newRoot fromComponent:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion;
+-(void)push:(UIViewController<RNNRootViewProtocol>*)newTop onTop:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
+-(void)pop:(NSString*)componentId withTransitionOptions:(RNNAnimationOptions*)transitionOptions rejection:(RCTPromiseRejectBlock)rejection;
+-(void)popTo:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection;
+-(void)popToRoot:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection;
+-(void)setStackRoot:(UIViewController<RNNRootViewProtocol> *)newRoot fromComponent:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
 @end

lib/ios/RNNNavigationStackManager.m

@@ -1,6 +1,7 @@
 #import "RNNNavigationStackManager.h"
 #import "RNNRootViewController.h"
 #import "RNNAnimator.h"
+#import "RNNErrorHandler.h"
 
 
 dispatch_queue_t RCTGetUIManagerQueue(void);
@@ -15,9 +16,10 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	return self;
 }
 
--(void)push:(UIViewController<RNNRootViewProtocol> *)newTop onTop:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion {
+-(void)push:(UIViewController<RNNRootViewProtocol> *)newTop onTop:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	UIViewController *vc = [_store findComponentForId:componentId];
 	[self preparePush:newTop onTopVC:vc completion:completion];
+	[self assertNavigationControllerExist:vc reject:rejection];
 	if ([newTop isCustomViewController]) {
 		[self pushAfterLoad:nil];
 	} else {
@@ -65,8 +67,9 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	self.fromVC = nil;
 }
 
--(void)pop:(NSString *)componentId withTransitionOptions:(RNNAnimationOptions *)transitionOptions {
+-(void)pop:(NSString *)componentId withTransitionOptions:(RNNAnimationOptions *)transitionOptions rejection:(RCTPromiseRejectBlock)rejection {
 	RNNRootViewController* vc = (RNNRootViewController*)[_store findComponentForId:componentId];
+	[self assertNavigationControllerExist:vc reject:rejection];
 	UINavigationController* nvc = [vc navigationController];
 	if ([nvc topViewController] == vc) {
 		if (vc.options.animations.pop) {
@@ -84,9 +87,9 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	[_store removeComponent:componentId];
 }
 
--(void)popTo:(NSString*)componentId {
+-(void)popTo:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection {
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-	
+	[self assertNavigationControllerExist:vc reject:rejection];
 	if (vc) {
 		UINavigationController *nvc = [vc navigationController];
 		if(nvc) {
@@ -96,21 +99,19 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	}
 }
 
--(void)popToRoot:(NSString*)componentId {
+-(void)popToRoot:(NSString*)componentId rejection:(RCTPromiseRejectBlock)rejection {
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
+	[self assertNavigationControllerExist:vc reject:rejection];
 	UINavigationController* nvc = [vc navigationController];
 	NSArray* poppedVCs = [nvc popToRootViewControllerAnimated:vc.options.animations.pop.enable];
 	[self removePopedViewControllers:poppedVCs];
 }
 
--(void)setRoot:(UIViewController<RNNRootViewProtocol> *)newRoot fromComponent:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion {
+-(void)setStackRoot:(UIViewController<RNNRootViewProtocol> *)newRoot fromComponent:(NSString *)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	UIViewController* vc = [_store findComponentForId:componentId];
+	[self assertNavigationControllerExist:vc reject:rejection];
 	UINavigationController* nvc = [vc navigationController];
 	
-	if (!nvc) {
-		@throw [NSException exceptionWithName:@"StackNotFound" reason:@"Missing stack, setRoot should contain stack layout" userInfo:nil];
-	}
-	
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		if (completion) {
@@ -123,6 +124,13 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	[CATransaction commit];
 }
 
+- (void)assertNavigationControllerExist:(UIViewController *)viewController reject:(RCTPromiseRejectBlock)reject {
+	if (!viewController.navigationController) {
+		_completionBlock = nil;
+		[RNNErrorHandler reject:reject withErrorCode:RNNCommandErrorCodeNoStack errorDescription:[NSString stringWithFormat:@"%@ should be called from a stack child component", [RNNErrorHandler getCallerFunctionName]]];
+	}
+}
+
 -(void)removePopedViewControllers:(NSArray*)viewControllers {
 	for (UIViewController *popedVC in viewControllers) {
 		[_store removeComponentByViewControllerInstance:popedVC];

lib/ios/RNNStore.h

@@ -5,6 +5,7 @@
 #import "ReactNativeNavigation.h"
 
 typedef void (^RNNTransitionCompletionBlock)(void);
+//typedef void (^RNNTransitionRejectionBlock)(NSString *code, NSString *message, NSError *error);
 
 @interface RNNStore : NSObject
 

lib/ios/RNNUtils.m

@@ -8,6 +8,7 @@
 		return defaultResult;
 	}
 }
+
 +(BOOL)getBoolOrKey:(NSDictionary*)dict withKey:(NSString*)key withDefault:(BOOL)defaultResult {
 	if ([dict objectForKey:key]) {
 		return [dict[key] boolValue];
@@ -15,6 +16,7 @@
 		return defaultResult;
 	}
 }
+
 +(id)getObjectOrKey:(NSDictionary*)dict withKey:(NSString*)key withDefault:(id)defaultResult {
 	if ([dict objectForKey:key]) {
 		return dict[key];
@@ -22,4 +24,5 @@
 		return defaultResult;
 	}
 }
+
 @end

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -83,6 +83,8 @@
 		50570B272061473D006A1B5C /* RNNTitleOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50570B252061473D006A1B5C /* RNNTitleOptions.m */; };
 		50570BEA2063E09B006A1B5C /* RNNTitleViewHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */; };
 		50570BEB2063E09B006A1B5C /* RNNTitleViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */; };
+		506A2B1420973DFD00F43A95 /* RNNErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */; };
+		506A2B1520973DFD00F43A95 /* RNNErrorHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */; };
 		50762D08205E96C200E3D18A /* RNNModalAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 50762D06205E96C200E3D18A /* RNNModalAnimation.h */; };
 		50762D09205E96C200E3D18A /* RNNModalAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 50762D07205E96C200E3D18A /* RNNModalAnimation.m */; };
 		507E7D57201DDD3000444E6C /* RNNAnimationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 507E7D55201DDD3000444E6C /* RNNAnimationOptions.h */; };
@@ -276,6 +278,8 @@
 		50570B252061473D006A1B5C /* RNNTitleOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTitleOptions.m; sourceTree = "<group>"; };
 		50570BE82063E09B006A1B5C /* RNNTitleViewHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTitleViewHelper.h; sourceTree = "<group>"; };
 		50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTitleViewHelper.m; sourceTree = "<group>"; };
+		506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNErrorHandler.h; sourceTree = "<group>"; };
+		506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNErrorHandler.m; sourceTree = "<group>"; };
 		50762D06205E96C200E3D18A /* RNNModalAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNModalAnimation.h; sourceTree = "<group>"; };
 		50762D07205E96C200E3D18A /* RNNModalAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNModalAnimation.m; sourceTree = "<group>"; };
 		507E7D55201DDD3000444E6C /* RNNAnimationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNAnimationOptions.h; sourceTree = "<group>"; };
@@ -419,6 +423,8 @@
 				214545291F4DC85F006E8DA1 /* RCTHelpers.m */,
 				390AD475200F499D00A8250D /* RNNSwizzles.h */,
 				390AD476200F499D00A8250D /* RNNSwizzles.m */,
+				506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */,
+				506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */,
 			);
 			name = Helpers;
 			sourceTree = "<group>";
@@ -735,6 +741,7 @@
 				504AFE761FFFF1E00076E904 /* RNNNavigationOptions.h in Headers */,
 				504AFE771FFFF1E20076E904 /* RNNTopBarOptions.h in Headers */,
 				26916C981E4B9E7700D13680 /* RNNReactRootViewCreator.h in Headers */,
+				506A2B1420973DFD00F43A95 /* RNNErrorHandler.h in Headers */,
 				263905B01E4C6F440023D7D3 /* MMDrawerController+Subclass.h in Headers */,
 				E8AEDB4A1F5C0BAF000F5A6A /* RNNInteractivePopAnimator.h in Headers */,
 				7B1126A41E2D2B6C00F9B03B /* ReactNativeNavigation.h in Headers */,
@@ -936,6 +943,7 @@
 				263905B21E4C6F440023D7D3 /* MMDrawerController.m in Sources */,
 				E8AEDB3D1F55A1C2000F5A6A /* RNNElementView.m in Sources */,
 				E83BAD6B1F27363A00A9F3DD /* RNNNavigationOptions.m in Sources */,
+				506A2B1520973DFD00F43A95 /* RNNErrorHandler.m in Sources */,
 				7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */,
 				261F0E651E6EC94900989DE2 /* RNNModalManager.m in Sources */,
 				E8A5CD631F49114F00E89D0D /* RNNElement.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNNavigationStackManagerTest.m

@@ -53,7 +53,7 @@
 
 
 - (void)testPop_removeTopVCFromStore {
-	[self.uut pop:@"vc3" withTransitionOptions:nil];
+	[self.uut pop:@"vc3" withTransitionOptions:nil rejection:nil];
 	XCTAssertNil([self.store findComponentForId:@"vc3"]);
 	XCTAssertNotNil([self.store findComponentForId:@"vc2"]);
 	XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
@@ -61,7 +61,7 @@
 
 - (void)testPopToSpecificVC_removeAllPopedVCFromStore {
 	self.nvc.willReturnVCs = @[self.vc2, self.vc3];
-	[self.uut popTo:@"vc1"];
+	[self.uut popTo:@"vc1" rejection:nil];
 	
 	XCTAssertNil([self.store findComponentForId:@"vc2"]);
 	XCTAssertNil([self.store findComponentForId:@"vc3"]);
@@ -71,7 +71,7 @@
 
 - (void)testPopToRoot_removeAllTopVCsFromStore {
 	self.nvc.willReturnVCs = @[self.vc2, self.vc3];
-	[self.uut popToRoot:@"vc3"];
+	[self.uut popToRoot:@"vc3" rejection:nil];
 	
 	XCTAssertNil([self.store findComponentForId:@"vc2"]);
 	XCTAssertNil([self.store findComponentForId:@"vc3"]);
@@ -79,17 +79,10 @@
 
 }
 
-- (void)testStackRoot_navigationControllerNilShouldThrow {
-	[self.nvc setViewControllers:@[self.vc1]];
-	self.nvc.willReturnVCs = @[self.vc1];
-	
-	XCTAssertThrowsSpecificNamed([self.uut setRoot:self.vc2 fromComponent:nil completion:nil], NSException, @"StackNotFound");
-}
-
 - (void)testStackRoot_shouldUpdateNavigationControllerChildrenViewControllers {
 	self.nvc.willReturnVCs = @[self.vc1, self.vc2, self.vc3];
 	
-	[self.uut setRoot:self.vc2 fromComponent:@"vc1" completion:nil];
+	[self.uut setStackRoot:self.vc2 fromComponent:@"vc1" completion:nil rejection:nil];
 	
 	XCTAssertEqual(self.nvc.viewControllers.lastObject, self.vc2);
 	XCTAssertEqual(self.nvc.viewControllers.count, 1);

playground/ios/playground.xcodeproj/xcshareddata/xcschemes/playground.xcscheme

@@ -75,10 +75,10 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
-               BuildableName = "playgroundTests.xctest"
-               BlueprintName = "playgroundTests"
-               ReferencedContainer = "container:playground.xcodeproj">
+               BlueprintIdentifier = "7B49FEBA1E95090800DEB3EA"
+               BuildableName = "ReactNativeNavigationTests.xctest"
+               BlueprintName = "ReactNativeNavigationTests"
+               ReferencedContainer = "container:../../lib/ios/ReactNativeNavigation.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>

playground/ios/playgroundTests/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

playground/ios/playgroundTests/playgroundTests.m

@@ -0,0 +1,39 @@
+//
+//  playgroundTests.m
+//  playgroundTests
+//
+//  Created by Yogev Ben David on 30/04/2018.
+//  Copyright © 2018 Wix. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+
+@interface playgroundTests : XCTestCase
+
+@end
+
+@implementation playgroundTests
+
+- (void)setUp {
+    [super setUp];
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [super tearDown];
+}
+
+- (void)testExample {
+    // This is an example of a functional test case.
+    // Use XCTAssert and related functions to verify your tests produce the correct results.
+}
+
+- (void)testPerformanceExample {
+    // This is an example of a performance test case.
+    [self measureBlock:^{
+        // Put the code you want to measure the time of here.
+    }];
+}
+
+@end