Added static events e2e

e2e/StaticLifecycleEvents.test.js

@@ -16,6 +16,26 @@ describe('static lifecycle events', () => {
     await expect(elementByLabel('componentDidDisappear | navigation.playground.WelcomeScreen')).toBeVisible();
   });
 
+  it('pushing and poping screen dispatch static event', async () => {
+    await elementById(testIDs.PUSH_STATIC_LIFECYCLE_BUTTON).tap();
+    await expect(elementByLabel('Static Lifecycle Events Overlay')).toBeVisible();
+    await expect(elementByLabel('componentDidAppear | navigation.playground.StaticLifecycleOverlay')).toBeVisible();
+    await elementById(testIDs.PUSH_BUTTON).tap();
+    await expect(elementByLabel('push')).toBeVisible();
+    await elementById(testIDs.POP_BUTTON).tap();
+    await expect(elementByLabel('pop')).toBeVisible();
+  });
+
+  it('showModal and dismissModal dispatch static event', async () => {
+    await elementById(testIDs.PUSH_STATIC_LIFECYCLE_BUTTON).tap();
+    await expect(elementByLabel('Static Lifecycle Events Overlay')).toBeVisible();
+    await expect(elementByLabel('componentDidAppear | navigation.playground.StaticLifecycleOverlay')).toBeVisible();
+    await elementById(testIDs.SHOW_MODAL_BUTTON).tap();
+    await expect(elementByLabel('showModal')).toBeVisible();
+    await elementById(testIDs.DISMISS_MODAL_BUTTON).tap();
+    await expect(elementByLabel('dismissModal')).toBeVisible();
+  });
+
   it(':ios: unmounts when dismissed', async () => {
     await elementById(testIDs.PUSH_STATIC_LIFECYCLE_BUTTON).tap();
     await expect(elementByLabel('Static Lifecycle Events Overlay')).toBeVisible();

lib/ios/RNNCommandsHandler.m

@@ -127,7 +127,6 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 			[rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:elementView];
 		}
 	} else {
-		[_eventEmitter sendOnNavigationCommand:push params:@{@"componentId": componentId}];
 		[_navigationStackManager push:newVc onTop:componentId completion:^{
 			[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
 			completion();
@@ -137,7 +136,6 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void)setStackRoot:(NSString*)componentId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:setStackRoot params:@{@"componentId": componentId}];
 	
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
@@ -149,7 +147,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:pop params:@{@"componentId": componentId}];
+
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:pop params:@{@"componentId": componentId}];
@@ -169,7 +167,6 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:popTo params:@{@"componentId": componentId}];
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:popTo params:@{@"componentId": componentId}];
@@ -183,7 +180,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:popToRoot params:@{@"componentId": componentId}];
+
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:popToRoot params:@{@"componentId": componentId}];
@@ -197,7 +194,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void) showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:showModal params:@{@"layout": layout}];
+
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	[_modalManager showModal:newVc completion:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
@@ -207,7 +204,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void) dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:dismissModal params:@{@"componentId": componentId}];
+
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
@@ -221,7 +218,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:dismissAllModals params:@{}];
+
 	[CATransaction begin];
 	[CATransaction setCompletionBlock:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:dismissAllModals params:@{}];
@@ -235,7 +232,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 -(void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:showOverlay params:@{@"layout": layout}];
+
 	UIViewController<RNNRootViewProtocol>* overlayVC = [_controllerFactory createOverlay:layout];
 	[_overlayManager showOverlay:overlayVC completion:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:showOverlay params:@{@"layout": layout}];
@@ -245,7 +242,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 
 - (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	[_eventEmitter sendOnNavigationCommand:dismissModal params:@{@"componentId": componentId}];
+
 	[_overlayManager dismissOverlay:componentId completion:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
 		completion();

lib/ios/RNNEventEmitter.m

@@ -45,9 +45,7 @@ static NSString* const navigationEvent	= @"RNN.nativeEvent";
 }
 
 -(void)sendOnNavigationCommandCompletion:(NSString *)commandName params:(NSDictionary*)params {
-	NSMutableDictionary* mutableParams = [NSMutableDictionary dictionaryWithDictionary:params];
-	[mutableParams setObject:[RNNUtils getCurrentTimestamp] forKey:@"timestamp"];
-	[self send:commandComplete body:@{@"name":commandName , @"params": mutableParams}];
+	[self send:commandComplete body:@{@"commandId":commandName , @"params": params, @"completionTime": [RNNUtils getCurrentTimestamp] }];
 }
 
 -(void)sendOnNavigationEvent:(NSString *)commandName params:(NSDictionary*)params {

playground/src/screens/StaticLifecycleOverlay.js

@@ -22,9 +22,10 @@ class StaticLifecycleOverlay extends Component {
         events: [...this.state.events, { event: 'componentDidDisappear', componentId, componentName }]
       });
     }));
-    this.listeners.push(Navigation.events().registerCommandListener((name, params) => {
-      // console.log('RNN', `name: ${JSON.stringify(name)}`);
-      // console.log('RNN', `params: ${JSON.stringify(params)}`);
+    this.listeners.push(Navigation.events().registerCommandCompletedListener((commandId, completionTime, params) => {
+      this.setState({
+        events: [...this.state.events, { event: 'commandCompleted', commandId }]
+      });
     }));
   }
 
@@ -34,11 +35,19 @@ class StaticLifecycleOverlay extends Component {
     alert('Overlay Unmounted');
   }
 
+  renderEvent(event) {
+    if (event.commandId) {
+      return <Text style={styles.h2}>{`${event.commandId}`}</Text>;
+    } else {
+      return <Text style={styles.h2}>{`${event.event} | ${event.componentName}`}</Text>;
+    }
+  }
+
   render() {
     const events = this.state.events.map((event, idx) =>
       (
         <View key={`${event.componentId}${idx}`}>
-          <Text style={styles.h2}>{`${event.event} | ${event.componentName}`}</Text>
+          {this.renderEvent(event)}
         </View>
       ));
     return (