receive generic params from native

lib/ios/RNNEventEmitter.m

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

lib/src/adapters/NativeEventsReceiver.ts

@@ -14,15 +14,15 @@ export class NativeEventsReceiver {
     return this.emitter.addListener('RNN.onAppLaunched', callback);
   }
 
-  registerComponentDidAppear(callback: (componentId: string, componentName: string) => void): EventSubscription {
+  registerComponentDidAppear(callback: (params) => void): EventSubscription {
     return this.emitter.addListener('RNN.componentDidAppear', callback);
   }
 
-  registerComponentDidDisappear(callback: (componentId: string, componentName: string) => void): EventSubscription {
+  registerComponentDidDisappear(callback: (params) => void): EventSubscription {
     return this.emitter.addListener('RNN.componentDidDisappear', callback);
   }
 
-  registerOnNavigationButtonPressed(callback: (componentId: string, buttonId: string) => void): EventSubscription {
-    return this.emitter.addListener('RNN.onNavigationButtonPressed', ({ componentId, buttonId }) => callback(componentId, buttonId));
+  registerOnNavigationButtonPressed(callback: (params) => void): EventSubscription {
+    return this.emitter.addListener('RNN.onNavigationButtonPressed', callback);
   }
 }

lib/src/events/EventsRegistry.test.ts

@@ -31,7 +31,9 @@ describe('EventsRegistry', () => {
 
     expect(result).toBe(subscription);
     expect(mockNativeEventsReceiver.registerComponentDidAppear).toHaveBeenCalledTimes(1);
-    expect(mockNativeEventsReceiver.registerComponentDidAppear).toHaveBeenCalledWith(cb);
+
+    mockNativeEventsReceiver.registerComponentDidAppear.mock.calls[0][0]({ componentId: 'theId' });
+    expect(cb).toHaveBeenCalledWith('theId', '');
   });
 
   it('exposes componentDidDisappear event', () => {
@@ -43,7 +45,9 @@ describe('EventsRegistry', () => {
 
     expect(result).toBe(subscription);
     expect(mockNativeEventsReceiver.registerComponentDidDisappear).toHaveBeenCalledTimes(1);
-    expect(mockNativeEventsReceiver.registerComponentDidDisappear).toHaveBeenCalledWith(cb);
+
+    mockNativeEventsReceiver.registerComponentDidDisappear.mock.calls[0][0]({ componentId: 'theId' });
+    expect(cb).toHaveBeenCalledWith('theId', '');
   });
 
   it('exposes onNavigationButtonPressed event', () => {
@@ -55,6 +59,8 @@ describe('EventsRegistry', () => {
 
     expect(result).toBe(subscription);
     expect(mockNativeEventsReceiver.registerOnNavigationButtonPressed).toHaveBeenCalledTimes(1);
-    expect(mockNativeEventsReceiver.registerOnNavigationButtonPressed).toHaveBeenCalledWith(cb);
+
+    mockNativeEventsReceiver.registerOnNavigationButtonPressed.mock.calls[0][0]({ componentId: 'theId', buttonId: 'theBtnId' });
+    expect(cb).toHaveBeenCalledWith('theId', 'theBtnId');
   });
 });

lib/src/events/EventsRegistry.ts

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