send params from native

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationEvent.java

@@ -26,21 +26,20 @@ public class NavigationEvent {
 	}
 
 	public void componentDidDisappear(String id, String componentName) {
-		emit(componentDidDisappear, id);
+		WritableMap map = Arguments.createMap();
+		map.putString("componentId", id);
+		map.putString("componentName", componentName);
+
+		emit(componentDidDisappear, map);
 	}
 
 	public void componentDidAppear(String id, String componentName) {
-		emit(componentDidAppear, id);
-	}
+		WritableMap map = Arguments.createMap();
+		map.putString("componentId", id);
+		map.putString("componentName", componentName);
 
-    @NonNull
-    private WritableMap getLifecycleEventData(String id, String componentName, String didAppear) {
-        WritableMap map = Arguments.createMap();
-        map.putString("componentId", id);
-        map.putString("componentName", componentName);
-        map.putString("event", didAppear);
-        return map;
-    }
+		emit(componentDidAppear, map);
+	}
 
     public void sendOnNavigationButtonPressed(String id, String buttonId) {
 		WritableMap map = Arguments.createMap();
@@ -57,8 +56,4 @@ public class NavigationEvent {
 	private void emit(String eventName, WritableMap data) {
 		emitter.emit(eventName, data);
 	}
-
-	private void emit(String eventName, String param) {
-		emitter.emit(eventName, param);
-	}
 }

lib/ios/RNNEventEmitter.h

@@ -8,9 +8,9 @@
 
 -(void)sendOnAppLaunched;
 
--(void)sendComponentDidAppear:(NSString*)componentId;
+-(void)sendComponentDidAppear:(NSString*)componentId componentName:(NSString*)componentName;
 
--(void)sendComponentDidDisappear:(NSString*)componentId;
+-(void)sendComponentDidDisappear:(NSString*)componentId componentName:(NSString*)componentName;
 
 -(void)sendOnNavigationButtonPressed:(NSString*)componentId buttonId:(NSString*)buttonId;
 

lib/ios/RNNEventEmitter.m

@@ -26,11 +26,11 @@ static NSString* const onNavigationButtonPressed	= @"RNN.onNavigationButtonPress
 	}
 }
 
--(void)sendComponentDidAppear:(NSString *)componentId {
+-(void)sendComponentDidAppear:(NSString *)componentId componentName:(NSString *)componentName {
 	[self send:componentDidAppear body:@{@"componentId":componentId}];
 }
 
--(void)sendComponentDidDisappear:(NSString *)componentId {
+-(void)sendComponentDidDisappear:(NSString *)componentId componentName:(NSString *)componentName{
 	[self send:componentDidDisappear body:@{@"componentId":componentId}];
 }
 

lib/ios/RNNRootViewController.m

@@ -52,7 +52,7 @@
 
 -(void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
-	[self.eventEmitter sendComponentDidAppear:self.componentId];
+	[self.eventEmitter sendComponentDidAppear:self.componentId componentName:self.componentName];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -61,7 +61,7 @@
 
 -(void)viewDidDisappear:(BOOL)animated {
 	[super viewDidDisappear:animated];
-	[self.eventEmitter sendComponentDidDisappear:self.componentId];
+	[self.eventEmitter sendComponentDidDisappear:self.componentId componentName:self.componentName];
 }
 
 - (void)viewDidLoad {

lib/src/events/ComponentEventsRegistry.ts

@@ -29,7 +29,6 @@ export class ComponentEventsRegistry {
   }
 
   private onNavigationButtonPressed(componentId: string, buttonId: string) {
-    console.log(componentId, buttonId); //tslint:disable-line
     const componentRef = this.store.getRefForId(componentId);
     if (componentRef && componentRef.onNavigationButtonPressed) {
       componentRef.onNavigationButtonPressed(buttonId);

lib/src/events/EventsRegistry.test.ts

@@ -32,8 +32,8 @@ describe('EventsRegistry', () => {
     expect(result).toBe(subscription);
     expect(mockNativeEventsReceiver.registerComponentDidAppear).toHaveBeenCalledTimes(1);
 
-    mockNativeEventsReceiver.registerComponentDidAppear.mock.calls[0][0]({ componentId: 'theId' });
-    expect(cb).toHaveBeenCalledWith('theId', '');
+    mockNativeEventsReceiver.registerComponentDidAppear.mock.calls[0][0]({ componentId: 'theId', componentName: 'theName' });
+    expect(cb).toHaveBeenCalledWith('theId', 'theName');
   });
 
   it('exposes componentDidDisappear event', () => {
@@ -46,8 +46,8 @@ describe('EventsRegistry', () => {
     expect(result).toBe(subscription);
     expect(mockNativeEventsReceiver.registerComponentDidDisappear).toHaveBeenCalledTimes(1);
 
-    mockNativeEventsReceiver.registerComponentDidDisappear.mock.calls[0][0]({ componentId: 'theId' });
-    expect(cb).toHaveBeenCalledWith('theId', '');
+    mockNativeEventsReceiver.registerComponentDidDisappear.mock.calls[0][0]({ componentId: 'theId', componentName: 'theName' });
+    expect(cb).toHaveBeenCalledWith('theId', 'theName');
   });
 
   it('exposes onNavigationButtonPressed event', () => {

lib/src/events/EventsRegistry.ts

@@ -12,11 +12,11 @@ export class EventsRegistry {
   }
 
   public componentDidAppear(callback: (componentId: string, componentName: string) => void): EventSubscription {
-    return this.nativeEventsReceiver.registerComponentDidAppear(({ componentId }) => callback(componentId, ''));
+    return this.nativeEventsReceiver.registerComponentDidAppear(({ componentId, componentName }) => callback(componentId, componentName));
   }
 
   public componentDidDisappear(callback: (componentId: string, componentName: string) => void): EventSubscription {
-    return this.nativeEventsReceiver.registerComponentDidDisappear(({ componentId }) => callback(componentId, ''));
+    return this.nativeEventsReceiver.registerComponentDidDisappear(({ componentId, componentName }) => callback(componentId, componentName));
   }
 
   public onNavigationButtonPressed(callback: (componentId: string, buttonId: string) => void): EventSubscription {