Fixes command completion event commandId (#4766)

* Fixes command completion event commandId

* Fix e2e

e2e/StaticLifecycleEvents.test.js

@@ -17,7 +17,7 @@ describe('static lifecycle events', () => {
     await expect(elementByLabel('componentDidDisappear | EventsScreen')).toBeVisible();
   });
 
-  it(':ios: pushing and popping screen dispatch static event', async () => {
+  it('pushing and popping screen dispatch static event', async () => {
     await expect(elementByLabel('Static Lifecycle Events Overlay')).toBeVisible();
     await expect(elementByLabel('componentDidAppear | EventsOverlay')).toBeVisible();
     await elementById(TestIDs.PUSH_BTN).tap();
@@ -26,14 +26,14 @@ describe('static lifecycle events', () => {
     await expect(elementByLabel('pop')).toBeVisible();
   });
 
-  it(':ios: showModal and dismissModal dispatch static event', async () => {
+  it('showModal and dismissModal dispatch static event', async () => {
     await elementById(TestIDs.MODAL_BTN).tap();
     await expect(elementByLabel('showModal')).toBeVisible();
     await elementById(TestIDs.DISMISS_MODAL_BTN).tap();
     await expect(elementByLabel('dismissModal')).toBeVisible();
   });
 
-  it(':ios: unmounts when dismissed', async () => {
+  it('unmounts when dismissed', async () => {
     await elementById(TestIDs.PUSH_BTN).tap();
     await expect(elementByLabel('Static Lifecycle Events Overlay')).toBeVisible();
     await elementById(TestIDs.DISMISS_BTN).tap();

lib/ios/RNNBridgeModule.m

@@ -20,7 +20,7 @@ RCT_EXPORT_MODULE();
 #pragma mark - JS interface
 
 RCT_EXPORT_METHOD(setRoot:(NSString*)commandId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler setRoot:layout completion:^{
+	[_commandsHandler setRoot:layout commandId:commandId completion:^{
 		resolve(layout);
 	}];
 }
@@ -38,61 +38,61 @@ RCT_EXPORT_METHOD(setDefaultOptions:(NSDictionary*)options resolver:(RCTPromiseR
 }
 
 RCT_EXPORT_METHOD(push:(NSString*)commandId componentId:(NSString*)componentId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler push:componentId layout:layout completion:^{
+	[_commandsHandler push:componentId commandId:commandId layout:layout completion:^{
 		resolve(componentId);
 	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(pop:(NSString*)commandId componentId:(NSString*)componentId mergeOptions:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler pop:componentId mergeOptions:(NSDictionary*)options completion:^{
+	[_commandsHandler pop:componentId commandId:commandId mergeOptions:(NSDictionary*)options completion:^{
 		resolve(componentId);
 	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(setStackRoot:(NSString*)commandId componentId:(NSString*)componentId children:(NSArray*)children resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler setStackRoot:componentId children:children completion:^{
+	[_commandsHandler setStackRoot:componentId commandId:commandId children:children completion:^{
 		resolve(componentId);
 	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(popTo:(NSString*)commandId componentId:(NSString*)componentId mergeOptions:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler popTo:componentId mergeOptions:options completion:^{
+	[_commandsHandler popTo:componentId commandId:commandId mergeOptions:options completion:^{
 		resolve(componentId);
 	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(popToRoot:(NSString*)commandId componentId:(NSString*)componentId mergeOptions:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler popToRoot:componentId mergeOptions:options completion:^{
+	[_commandsHandler popToRoot:componentId commandId:commandId mergeOptions:options completion:^{
 		resolve(componentId);
 	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(showModal:(NSString*)commandId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler showModal:layout completion:^(NSString *componentId) {
+	[_commandsHandler showModal:layout commandId:commandId completion:^(NSString *componentId) {
 		resolve(componentId);
 	}];
 }
 
 RCT_EXPORT_METHOD(dismissModal:(NSString*)commandId componentId:(NSString*)componentId mergeOptions:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler dismissModal:componentId mergeOptions:options completion:^{
+	[_commandsHandler dismissModal:componentId commandId:commandId mergeOptions:options completion:^{
 		resolve(componentId);
 	} rejection:reject];
 }
 
 RCT_EXPORT_METHOD(dismissAllModals:(NSString*)commandId mergeOptions:(NSDictionary*)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler dismissAllModals:options completion:^{
+	[_commandsHandler dismissAllModals:options commandId:commandId completion:^{
 		resolve(nil);
 	}];
 }
 
 RCT_EXPORT_METHOD(showOverlay:(NSString*)commandId layout:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler showOverlay:layout completion:^{
+	[_commandsHandler showOverlay:layout commandId:commandId completion:^{
 		resolve(layout[@"id"]);
 	}];
 }
 
 RCT_EXPORT_METHOD(dismissOverlay:(NSString*)commandId componentId:(NSString*)componentId resolve:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-	[_commandsHandler dismissOverlay:componentId completion:^{
+	[_commandsHandler dismissOverlay:componentId commandId:commandId completion:^{
 		resolve(@(1));
 	} rejection:reject];
 }

lib/ios/RNNCommandsHandler.h

@@ -11,30 +11,30 @@
 
 - (instancetype)initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory eventEmitter:(RNNEventEmitter *)eventEmitter stackManager:(RNNNavigationStackManager *)stackManager modalManager:(RNNModalManager *)modalManager overlayManager:(RNNOverlayManager *)overlayManager mainWindow:(UIWindow *)mainWindow;
 
-- (void)setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion;
+- (void)setRoot:(NSDictionary*)layout commandId:(NSString*)commandId completion:(RNNTransitionCompletionBlock)completion;
 
 - (void)mergeOptions:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 
 - (void)setDefaultOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion;
 
-- (void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
+- (void)push:(NSString*)componentId commandId:(NSString*)commandId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
-- (void)pop:(NSString*)componentId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
+- (void)pop:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
-- (void)popTo:(NSString*)componentId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
+- (void)popTo:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
-- (void)popToRoot:(NSString*)componentId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
+- (void)popToRoot:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
-- (void)setStackRoot:(NSString*)componentId children:(NSArray*)children completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
+- (void)setStackRoot:(NSString*)componentId commandId:(NSString*)commandId children:(NSArray*)children completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection;
 
-- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionWithComponentIdCompletionBlock)completion;
+- (void)showModal:(NSDictionary*)layout commandId:(NSString*)commandId completion:(RNNTransitionWithComponentIdCompletionBlock)completion;
 
-- (void)dismissModal:(NSString*)componentId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject;
+- (void)dismissModal:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject;
 
-- (void)dismissAllModals:(NSDictionary *)options completion:(RNNTransitionCompletionBlock)completion;
+- (void)dismissAllModals:(NSDictionary *)options commandId:(NSString*)commandId completion:(RNNTransitionCompletionBlock)completion;
 
-- (void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion;
+- (void)showOverlay:(NSDictionary *)layout commandId:(NSString*)commandId completion:(RNNTransitionCompletionBlock)completion;
 
-- (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject;
+- (void)dismissOverlay:(NSString*)componentId commandId:(NSString*)commandId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject;
 
 @end

lib/ios/RNNCommandsHandler.m

@@ -53,7 +53,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 #pragma mark - public
 
-- (void)setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
+- (void)setRoot:(NSDictionary*)layout commandId:(NSString*)commandId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 
 	if (@available(iOS 9, *)) {
@@ -79,7 +79,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	[vc renderTreeAndWait:[vc.resolveOptions.animations.setRoot.waitForRender getWithDefaultValue:NO] perform:^{
 		_mainWindow.rootViewController = vc;
-		[_eventEmitter sendOnNavigationCommandCompletion:setRoot params:@{@"layout": layout}];
+		[_eventEmitter sendOnNavigationCommandCompletion:setRoot commandId:commandId params:@{@"layout": layout}];
 		completion() ;
 	}];
 }
@@ -111,7 +111,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	completion();
 }
 
-- (void)push:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)push:(NSString*)componentId commandId:(NSString*)commandId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	
 	UIViewController<RNNLayoutProtocol> *newVc = [_controllerFactory createLayout:layout];
@@ -131,7 +131,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 				if ([newVc.resolveOptions.preview.commit getWithDefaultValue:NO]) {
 					[CATransaction begin];
 					[CATransaction setCompletionBlock:^{
-						[self->_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
+						[self->_eventEmitter sendOnNavigationCommandCompletion:push commandId:commandId params:@{@"componentId": componentId}];
 						completion();
 					}];
 					[rvc.navigationController pushViewController:newVc animated:YES];
@@ -162,14 +162,14 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		id animationDelegate = (newVc.resolveOptions.animations.push.hasCustomAnimation || newVc.resolveOptions.customTransition.animations) ? newVc : nil;
 		[newVc renderTreeAndWait:([newVc.resolveOptions.animations.push.waitForRender getWithDefaultValue:NO] || animationDelegate) perform:^{
 			[_stackManager push:newVc onTop:fromVC animated:[newVc.resolveOptions.animations.push.enable getWithDefaultValue:YES] animationDelegate:animationDelegate completion:^{
-				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
+				[_eventEmitter sendOnNavigationCommandCompletion:push commandId:commandId params:@{@"componentId": componentId}];
 				completion();
 			} rejection:rejection];
 		}];
 	}
 }
 
-- (void)setStackRoot:(NSString*)componentId children:(NSArray*)children completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)setStackRoot:(NSString*)componentId commandId:(NSString*)commandId children:(NSArray*)children completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	
  	NSArray<RNNLayoutProtocol> *childViewControllers = [_controllerFactory createChildrenLayout:children];
@@ -180,12 +180,12 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
 	[_stackManager setStackChildren:childViewControllers fromViewController:fromVC animated:[options.animations.setStackRoot.enable getWithDefaultValue:YES] completion:^{
-		[weakEventEmitter sendOnNavigationCommandCompletion:setStackRoot params:@{@"componentId": componentId}];
+		[weakEventEmitter sendOnNavigationCommandCompletion:setStackRoot commandId:commandId params:@{@"componentId": componentId}];
 		completion();
 	} rejection:rejection];
 }
 
-- (void)pop:(NSString*)componentId mergeOptions:(NSDictionary*)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)pop:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary*)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
@@ -208,25 +208,25 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	[_stackManager pop:vc animated:[vc.resolveOptions.animations.pop.enable getWithDefaultValue:YES] completion:^{
 		[_store removeComponent:componentId];
-		[_eventEmitter sendOnNavigationCommandCompletion:pop params:@{@"componentId": componentId}];
+		[_eventEmitter sendOnNavigationCommandCompletion:pop commandId:commandId params:@{@"componentId": componentId}];
 		completion();
 	} rejection:rejection];
 }
 
-- (void)popTo:(NSString*)componentId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)popTo:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
 	[vc overrideOptions:options];
 	
 	[_stackManager popTo:vc animated:[vc.resolveOptions.animations.pop.enable getWithDefaultValue:YES] completion:^(NSArray *poppedViewControllers) {
-		[_eventEmitter sendOnNavigationCommandCompletion:popTo params:@{@"componentId": componentId}];
+		[_eventEmitter sendOnNavigationCommandCompletion:popTo commandId:commandId params:@{@"componentId": componentId}];
 		[self removePopedViewControllers:poppedViewControllers];
 		completion();
 	} rejection:rejection];
 }
 
-- (void)popToRoot:(NSString*)componentId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
+- (void)popToRoot:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
 	RNNNavigationOptions *options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
@@ -234,7 +234,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
-		[_eventEmitter sendOnNavigationCommandCompletion:popToRoot params:@{@"componentId": componentId}];
+		[_eventEmitter sendOnNavigationCommandCompletion:popToRoot commandId:commandId params:@{@"componentId": componentId}];
 		completion();
 	}];
 	
@@ -247,20 +247,20 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[CATransaction commit];
 }
 
-- (void)showModal:(NSDictionary*)layout completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
+- (void)showModal:(NSDictionary*)layout commandId:(NSString *)commandId completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
 	[self assertReady];
 	
 	UIViewController<RNNParentProtocol> *newVc = [_controllerFactory createLayout:layout];
 	
 	[newVc renderTreeAndWait:[newVc.resolveOptions.animations.showModal.waitForRender getWithDefaultValue:NO] perform:^{
 		[_modalManager showModal:newVc animated:[newVc.getCurrentChild.resolveOptions.animations.showModal.enable getWithDefaultValue:YES] hasCustomAnimation:newVc.getCurrentChild.resolveOptions.animations.showModal.hasCustomAnimation completion:^(NSString *componentId) {
-			[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
+			[_eventEmitter sendOnNavigationCommandCompletion:showModal commandId:commandId params:@{@"layout": layout}];
 			completion(componentId);
 		}];
 	}];
 }
 
-- (void)dismissModal:(NSString*)componentId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject {
+- (void)dismissModal:(NSString*)componentId commandId:(NSString*)commandId mergeOptions:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject {
 	[self assertReady];
 	
 	UIViewController<RNNParentProtocol> *modalToDismiss = (UIViewController<RNNParentProtocol>*)[_store findComponentForId:componentId];
@@ -277,7 +277,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
-		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
+		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal commandId:commandId params:@{@"componentId": componentId}];
 	}];
 	
 	[_modalManager dismissModal:modalToDismiss completion:completion];
@@ -285,12 +285,12 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[CATransaction commit];
 }
 
-- (void)dismissAllModals:(NSDictionary *)mergeOptions completion:(RNNTransitionCompletionBlock)completion {
+- (void)dismissAllModals:(NSDictionary *)mergeOptions commandId:(NSString*)commandId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
-		[_eventEmitter sendOnNavigationCommandCompletion:dismissAllModals params:@{}];
+		[_eventEmitter sendOnNavigationCommandCompletion:dismissAllModals commandId:commandId params:@{}];
 		completion();
 	}];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
@@ -299,7 +299,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[CATransaction commit];
 }
 
-- (void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion {
+- (void)showOverlay:(NSDictionary *)layout commandId:(NSString*)commandId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
 	UIViewController<RNNParentProtocol>* overlayVC = [_controllerFactory createLayout:layout];
@@ -307,17 +307,17 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 		UIWindow* overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 		overlayWindow.rootViewController = overlayVC;
 		[_overlayManager showOverlayWindow:overlayWindow];
-		[_eventEmitter sendOnNavigationCommandCompletion:showOverlay params:@{@"layout": layout}];
+		[_eventEmitter sendOnNavigationCommandCompletion:showOverlay commandId:commandId params:@{@"layout": layout}];
 		completion();
 	}];
 }
 
-- (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject {
+- (void)dismissOverlay:(NSString*)componentId commandId:(NSString*)commandId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject {
 	[self assertReady];
 	UIViewController* viewController = [_store findComponentForId:componentId];
 	if (viewController) {
 		[_overlayManager dismissOverlay:viewController];
-		[_eventEmitter sendOnNavigationCommandCompletion:dismissOverlay params:@{@"componentId": componentId}];
+		[_eventEmitter sendOnNavigationCommandCompletion:dismissOverlay commandId:commandId params:@{@"componentId": componentId}];
 		completion();
 	} else {
 		[RNNErrorHandler reject:reject withErrorCode:1010 errorDescription:@"ComponentId not found"];

lib/ios/RNNEventEmitter.h

@@ -6,23 +6,23 @@
 
 @interface RNNEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
--(void)sendOnAppLaunched;
+- (void)sendOnAppLaunched;
 
--(void)sendComponentDidAppear:(NSString*)componentId componentName:(NSString*)componentName;
+- (void)sendComponentDidAppear:(NSString*)componentId componentName:(NSString*)componentName;
 
--(void)sendComponentDidDisappear:(NSString*)componentId componentName:(NSString*)componentName;
+- (void)sendComponentDidDisappear:(NSString*)componentId componentName:(NSString*)componentName;
 
--(void)sendOnNavigationButtonPressed:(NSString*)componentId buttonId:(NSString*)buttonId;
+- (void)sendOnNavigationButtonPressed:(NSString*)componentId buttonId:(NSString*)buttonId;
 
--(void)sendBottomTabSelected:(NSNumber *)selectedTabIndex unselected:(NSNumber*)unselectedTabIndex;
+- (void)sendBottomTabSelected:(NSNumber *)selectedTabIndex unselected:(NSNumber*)unselectedTabIndex;
 
--(void)sendOnNavigationCommandCompletion:(NSString *)commandName params:(NSDictionary*)params;
+- (void)sendOnNavigationCommandCompletion:(NSString *)commandName commandId:(NSString *)commandId params:(NSDictionary*)params;
 
--(void)sendOnSearchBarUpdated:(NSString *)componentId text:(NSString*)text isFocused:(BOOL)isFocused;
+- (void)sendOnSearchBarUpdated:(NSString *)componentId text:(NSString*)text isFocused:(BOOL)isFocused;
 
--(void)sendOnSearchBarCancelPressed:(NSString *)componentId;
+- (void)sendOnSearchBarCancelPressed:(NSString *)componentId;
 
--(void)sendOnPreviewCompleted:(NSString *)componentId previewComponentId:(NSString *)previewComponentId;
+- (void)sendOnPreviewCompleted:(NSString *)componentId previewComponentId:(NSString *)previewComponentId;
 
 - (void)sendModalsDismissedEvent:(NSString *)componentId numberOfModalsDismissed:(NSNumber *)modalsDismissed;
 

lib/ios/RNNEventEmitter.m

@@ -70,9 +70,10 @@ static NSString* const PreviewCompleted         = @"RNN.PreviewCompleted";
 									  }];
 }
 
--(void)sendOnNavigationCommandCompletion:(NSString *)commandName params:(NSDictionary*)params {
+-(void)sendOnNavigationCommandCompletion:(NSString *)commandName commandId:(NSString *)commandId params:(NSDictionary*)params {
 	[self send:CommandCompleted body:@{
-									   @"commandId":commandName,
+									   @"commandId":commandId,
+									   @"commandName":commandName,
 									   @"params": params,
 									   @"completionTime": [RNNUtils getCurrentTimestamp]
 									   }];

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -82,9 +82,9 @@
 	for (NSString* methodName in methods) {
 		SEL s = NSSelectorFromString(methodName);
 		IMP imp = [self.uut methodForSelector:s];
-		void (*func)(id, SEL, id, id, id) = (void *)imp;
+		void (*func)(id, SEL, id, id, id, id, id) = (void *)imp;
 		
-		XCTAssertThrowsSpecificNamed(func(self.uut,s, nil, nil, nil), NSException, @"BridgeNotLoadedError");
+		XCTAssertThrowsSpecificNamed(func(self.uut,s, nil, nil, nil, nil, nil), NSException, @"BridgeNotLoadedError");
 	}
 }
 
@@ -168,7 +168,7 @@
 	[self.store setReadyToReceiveCommands:true];
 	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
 	
-	[self.uut pop:@"vc3" mergeOptions:nil completion:^{
+	[self.uut pop:@"vc3" commandId:@"" mergeOptions:nil completion:^{
 		XCTAssertNil([self.store findComponentForId:@"vc3"]);
 		XCTAssertNotNil([self.store findComponentForId:@"vc2"]);
 		XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
@@ -184,7 +184,7 @@
 	[self.store setReadyToReceiveCommands:true];
 	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
 	_nvc.willReturnVCs = @[self.vc2, self.vc3];
-	[self.uut popTo:@"vc1" mergeOptions:nil completion:^{
+	[self.uut popTo:@"vc1" commandId:@"" mergeOptions:nil completion:^{
 		XCTAssertNil([self.store findComponentForId:@"vc2"]);
 		XCTAssertNil([self.store findComponentForId:@"vc3"]);
 		XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
@@ -198,7 +198,7 @@
 	[self.store setReadyToReceiveCommands:true];
 	_nvc.willReturnVCs = @[self.vc2, self.vc3];
 	XCTestExpectation *expectation = [self expectationWithDescription:@"Testing Async Method"];
-	[self.uut popToRoot:@"vc3" mergeOptions:nil completion:^{
+	[self.uut popToRoot:@"vc3" commandId:@"" mergeOptions:nil completion:^{
 		XCTAssertNil([self.store findComponentForId:@"vc2"]);
 		XCTAssertNil([self.store findComponentForId:@"vc3"]);
 		XCTAssertNotNil([self.store findComponentForId:@"vc1"]);
@@ -214,7 +214,7 @@
 	NSDictionary* layout = @{};
 	
 	[[self.controllerFactory expect] createLayout:layout];
-	[self.uut showOverlay:layout completion:^{}];
+	[self.uut showOverlay:layout commandId:@"" completion:^{}];
 	[self.controllerFactory verify];
 }
 
@@ -224,7 +224,7 @@
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]);
 	
 	[[self.controllerFactory expect] createLayout:[OCMArg any]];
-	[self.uut showOverlay:@{} completion:^{}];
+	[self.uut showOverlay:@{} commandId:@"" completion:^{}];
 	[self.overlayManager verify];
 }
 
@@ -234,7 +234,7 @@
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(layoutVC);
 	
 	[[self.overlayManager expect] showOverlayWindow:[OCMArg any]];
-	[self.uut showOverlay:@{} completion:^{}];
+	[self.uut showOverlay:@{} commandId:@"" completion:^{}];
 	[self.overlayManager verify];
 }
 
@@ -246,8 +246,8 @@
 	
 	NSDictionary* layout = @{};
 	
-	[[self.eventEmmiter expect] sendOnNavigationCommandCompletion:@"showOverlay" params:[OCMArg any]];
-	[self.uut showOverlay:layout completion:^{}];
+	[[self.eventEmmiter expect] sendOnNavigationCommandCompletion:@"showOverlay" commandId:[OCMArg any] params:[OCMArg any]];
+	[self.uut showOverlay:layout commandId:@"" completion:^{}];
 	[self.eventEmmiter verify];
 }
 
@@ -255,7 +255,7 @@
 	[self.store setReadyToReceiveCommands:true];
 	NSString* componentId = @"componentId";
 	[[self.store expect] findComponentForId:componentId];
-	[self.uut dismissOverlay:componentId completion:^{} rejection:^(NSString *code, NSString *message, NSError *error) {}];
+	[self.uut dismissOverlay:componentId commandId:@"" completion:^{} rejection:^(NSString *code, NSString *message, NSError *error) {}];
 	[self.store verify];
 }
 
@@ -266,7 +266,7 @@
 	OCMStub([self.store findComponentForId:componentId]).andReturn(returnedView);
 	
 	[[self.overlayManager expect] dismissOverlay:returnedView];
-	[self.uut dismissOverlay:componentId completion:^{} rejection:^(NSString *code, NSString *message, NSError *error) {}];
+	[self.uut dismissOverlay:componentId commandId:@"" completion:^{} rejection:^(NSString *code, NSString *message, NSError *error) {}];
 	[self.overlayManager verify];
 }
 
@@ -276,7 +276,7 @@
 	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]];
+	[self.uut dismissOverlay:componentId commandId:@"" completion:[OCMArg any] rejection:[OCMArg any]];
 	[errorHandlerMockClass verify];
 }
 
@@ -285,8 +285,8 @@
 	NSString* componentId = @"componentId";
 	OCMStub([self.store findComponentForId:componentId]).andReturn([UIViewController new]);
 	
-	[[self.eventEmmiter expect] sendOnNavigationCommandCompletion:@"dismissOverlay" params:[OCMArg any]];
-	[self.uut dismissOverlay:componentId completion:^{
+	[[self.eventEmmiter expect] sendOnNavigationCommandCompletion:@"dismissOverlay" commandId:[OCMArg any] params:[OCMArg any]];
+	[self.uut dismissOverlay:componentId commandId:@"" completion:^{
 		
 	} rejection:^(NSString *code, NSString *message, NSError *error) {}];
 	
@@ -298,7 +298,7 @@
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(self.vc1);
 	
 	[[self.mainWindow expect] setRootViewController:self.vc1];
-	[self.uut setRoot:@{} completion:^{}];
+	[self.uut setRoot:@{} commandId:@"" completion:^{}];
 	[self.mainWindow verify];
 }
 
@@ -307,14 +307,14 @@
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(self.vc1);
 	
 	[[self.store expect] removeAllComponentsFromWindow:self.mainWindow];
-	[self.uut setRoot:@{} completion:^{}];
+	[self.uut setRoot:@{} commandId:@"" completion:^{}];
 	[self.store verify];
 }
 
 - (void)testSetStackRoot_resetStackWithSingleComponent {
 	OCMStub([self.controllerFactory createChildrenLayout:[OCMArg any]]).andReturn(@[self.vc2]);
 	[self.store setReadyToReceiveCommands:true];
-	[self.uut setStackRoot:@"vc1" children:nil completion:^{
+	[self.uut setStackRoot:@"vc1" commandId:@"" children:nil completion:^{
 		
 	} rejection:^(NSString *code, NSString *message, NSError *error) {
 		
@@ -327,7 +327,7 @@
 	NSArray* newViewControllers = @[_vc1, _vc3];
 	OCMStub([self.controllerFactory createChildrenLayout:[OCMArg any]]).andReturn(newViewControllers);
 	[self.store setReadyToReceiveCommands:true];
-	[self.uut setStackRoot:@"vc1" children:nil completion:^{
+	[self.uut setStackRoot:@"vc1" commandId:@"" children:nil completion:^{
 		
 	} rejection:^(NSString *code, NSString *message, NSError *error) {
 		
@@ -344,7 +344,7 @@
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(mockedVC);
 	
 	[[mockedVC expect] renderTreeAndWait:YES perform:[OCMArg any]];
-	[self.uut setRoot:@{} completion:^{}];
+	[self.uut setRoot:@{} commandId:@"" completion:^{}];
 	[mockedVC verify];
 }
 
@@ -357,7 +357,7 @@
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(mockedVC);
 	
 	[[mockedVC expect] renderTreeAndWait:NO perform:[OCMArg any]];
-	[self.uut setRoot:@{} completion:^{}];
+	[self.uut setRoot:@{} commandId:@"" completion:^{}];
 	[mockedVC verify];
 }
 

playground/src/screens/StaticLifecycleOverlay.js

@@ -31,9 +31,9 @@ class StaticLifecycleOverlay extends Component {
         events: [...this.state.events, { ...event }]
       });
     }));
-    this.listeners.push(Navigation.events().registerCommandCompletedListener(({ commandId }) => {
+    this.listeners.push(Navigation.events().registerCommandListener((commandName) => {
       this.setState({
-        events: [...this.state.events, { event: 'commandCompleted', commandId }]
+        events: [...this.state.events, { event: 'command started', commandName }]
       });
     }));
     this.listeners.push(Navigation.events().registerNavigationButtonPressedListener(({ componentId, buttonId }) => {
@@ -57,6 +57,8 @@ class StaticLifecycleOverlay extends Component {
   renderEvent(event) {
     if (event.commandId) {
       return <Text style={styles.h2}>{`${event.commandId}`}</Text>;
+    } else if (event.commandName) {
+      return <Text style={styles.h2}>{`${event.commandName}`}</Text>;
     } else if (event.componentName) {
       return <Text style={styles.h2}>{`${event.event} | ${event.componentName}`}</Text>;
     } else if (event.buttonId) {