events onNavigationCommand support - #1078

lib/ios/RNNBridgeManager.m

@@ -64,7 +64,7 @@
 
 	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];
+	_commandsHandler = [[RNNCommandsHandler alloc] initWithStore:_store controllerFactory:controllerFactory eventEmitter:eventEmitter];
 	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
 
 	return @[bridgeModule,eventEmitter];

lib/ios/RNNCommandsHandler.h

@@ -6,7 +6,7 @@
 
 @interface RNNCommandsHandler : NSObject
 
--(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory;
+-(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter*)eventEmitter;
 
 -(void) setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
 

lib/ios/RNNCommandsHandler.m

@@ -6,18 +6,34 @@
 #import "RNNRootViewController.h"
 #import "React/RCTUIManager.h"
 
+static NSString* const setRoot	= @"setRoot";
+static NSString* const setStackRoot	= @"setStackRoot";
+static NSString* const push	= @"push";
+static NSString* const pop	= @"pop";
+static NSString* const popTo	= @"popTo";
+static NSString* const popToRoot	= @"popToRoot";
+static NSString* const showModal	= @"showModal";
+static NSString* const dismissModal	= @"dismissModal";
+static NSString* const dismissAllModals	= @"dismissAllModals";
+static NSString* const showOverlay	= @"showOverlay";
+static NSString* const dismissOverlay	= @"dismissOverlay";
+static NSString* const mergeOptions	= @"mergeOptions";
+static NSString* const setDefaultOptions	= @"setDefaultOptions";
+
 @implementation RNNCommandsHandler {
 	RNNControllerFactory *_controllerFactory;
 	RNNStore *_store;
 	RNNNavigationStackManager* _navigationStackManager;
 	RNNModalManager* _modalManager;
 	RNNOverlayManager* _overlayManager;
+	RNNEventEmitter* _eventEmitter;
 }
 
--(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory {
+-(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter {
 	self = [super init];
 	_store = store;
 	_controllerFactory = controllerFactory;
+	_eventEmitter = eventEmitter;
 	_navigationStackManager = [[RNNNavigationStackManager alloc] initWithStore:_store];
 	_modalManager = [[RNNModalManager alloc] initWithStore:_store];
 	_overlayManager = [[RNNOverlayManager alloc] initWithStore:_store];
@@ -30,7 +46,8 @@
 	[self assertReady];
 	
 	[_modalManager dismissAllModals];
-	
+	[_eventEmitter sendOnNavigationComment:setRoot params:@{@"layout": layout}];
+
 	UIViewController *vc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	
 	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
@@ -40,7 +57,8 @@
 
 -(void) mergeOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	
+	[_eventEmitter sendOnNavigationComment:mergeOptions params:@{@"componentId": componentId, @"options": options}];
+
 	UIViewController* vc = [_store findComponentForId:componentId];
 	if([vc isKindOfClass:[RNNRootViewController class]]) {
 		RNNRootViewController* rootVc = (RNNRootViewController*)vc;
@@ -56,12 +74,13 @@
 
 -(void) setDefaultOptions:(NSDictionary*)optionsDict completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
+	[_eventEmitter sendOnNavigationComment:setDefaultOptions params:@{@"options": optionsDict}];
 	[_controllerFactory setDefaultOptionsDict:optionsDict];
 }
 
 -(void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	
+	[_eventEmitter sendOnNavigationComment:push params:@{@"componentId": componentId}];
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	[_navigationStackManager push:newVc onTop:componentId completion:^{
 		completion();
@@ -70,7 +89,8 @@
 
 -(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	
+	[_eventEmitter sendOnNavigationComment:setStackRoot params:@{@"componentId": componentId}];
+
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	[_navigationStackManager setRoot:newVc fromComponent:componentId completion:^{
 		completion();
@@ -79,6 +99,7 @@
 
 -(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
+	[_eventEmitter sendOnNavigationComment:pop params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		completion();
@@ -97,6 +118,7 @@
 
 -(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
+	[_eventEmitter sendOnNavigationComment:popTo params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		completion();
@@ -109,6 +131,7 @@
 
 -(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
+	[_eventEmitter sendOnNavigationComment:popToRoot params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		completion();
@@ -121,7 +144,7 @@
 
 -(void) showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	
+	[_eventEmitter sendOnNavigationComment:showModal params:@{@"layout": layout}];
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	[_modalManager showModal:newVc completion:^{
 		completion();
@@ -130,6 +153,7 @@
 
 -(void) dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
+	[_eventEmitter sendOnNavigationComment:dismissModal params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		completion();
@@ -142,6 +166,7 @@
 
 -(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
+	[_eventEmitter sendOnNavigationComment:dismissAllModals params:nil];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		completion();
@@ -154,6 +179,7 @@
 
 -(void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
+	[_eventEmitter sendOnNavigationComment:showOverlay params:@{@"layout": layout}];
 	UIViewController<RNNRootViewProtocol>* overlayVC = [_controllerFactory createOverlay:layout];
 	[_overlayManager showOverlay:overlayVC completion:^{
 		completion();
@@ -162,6 +188,7 @@
 
 - (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
+	[_eventEmitter sendOnNavigationComment:dismissModal params:@{@"componentId": componentId}];
 	[_overlayManager dismissOverlay:componentId completion:^{	
 		completion();
 	}];

lib/ios/RNNEventEmitter.h

@@ -14,4 +14,8 @@
 
 -(void)sendOnNavigationButtonPressed:(NSString*)componentId buttonId:(NSString*)buttonId;
 
+-(void)sendOnNavigationEvent:(NSString *)commandName params:(NSDictionary*)params;
+
+-(void)sendOnNavigationComment:(NSString *)commandName params:(NSDictionary*)params;
+
 @end

lib/ios/RNNEventEmitter.m

@@ -11,6 +11,8 @@ static NSString* const onAppLaunched	= @"RNN.onAppLaunched";
 static NSString* const componentDidAppear	= @"RNN.componentDidAppear";
 static NSString* const componentDidDisappear	= @"RNN.componentDidDisappear";
 static NSString* const onNavigationButtonPressed	= @"RNN.onNavigationButtonPressed";
+static NSString* const onNavigationCommand	= @"RNN.onNavigationCommand";
+static NSString* const onNavigationEvent	= @"RNN.onNavigationEvent";
 
 -(NSArray<NSString *> *)supportedEvents {
 	return @[onAppLaunched, componentDidAppear, componentDidDisappear, onNavigationButtonPressed];
@@ -38,6 +40,14 @@ static NSString* const onNavigationButtonPressed	= @"RNN.onNavigationButtonPress
 	[self send:onNavigationButtonPressed body:@{@"componentId":componentId , @"buttonId": buttonId}];
 }
 
+-(void)sendOnNavigationComment:(NSString *)commandName params:(NSDictionary*)params {
+	[self send:onNavigationButtonPressed body:@{@"commandName":commandName , @"params": params}];
+}
+
+-(void)sendOnNavigationEvent:(NSString *)commandName params:(NSDictionary*)params {
+	[self send:onNavigationEvent body:@{@"commandName":commandName , @"params": params}];
+}
+
 - (void)addListener:(NSString *)eventName {
 	[super addListener:eventName];
 	if ([eventName isEqualToString:onAppLaunched]) {