remove RNN.navigationEvent as it should be js-only, remove RNN.componentLifecycle

docs/_sidebar.md

@@ -2,4 +2,4 @@
   - [Installing](/docs/Installing)
   - [Working Locally](/docs/WorkingLocally)
   - [Usage](/docs/Usage)
-- API
+- [API](/api/README)

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

@@ -14,7 +14,6 @@ public class NavigationEvent {
 	private static final String componentDidAppear = "RNN.componentDidAppear";
 	private static final String componentDidDisappear = "RNN.componentDidDisappear";
 	private static final String onNavigationButtonPressed = "RNN.navigationButtonPressed";
-    private static final String componentLifecycle = "RNN.componentLifecycle";
 
 	private final RCTDeviceEventEmitter emitter;
 
@@ -28,12 +27,10 @@ public class NavigationEvent {
 
 	public void componentDidDisappear(String id, String componentName) {
 		emit(componentDidDisappear, id);
-		emit(componentLifecycle, getLifecycleEventData(id, componentName, "didDisappear"));
 	}
 
 	public void componentDidAppear(String id, String componentName) {
 		emit(componentDidAppear, id);
-        emit(componentLifecycle, getLifecycleEventData(id, componentName, "didAppear"));
 	}
 
     @NonNull

lib/ios/RNNComponentLifecycleEvent.h

@@ -1,15 +0,0 @@
-#import "RNNNavigationEvent.h"
-
-#define kDidAppear         @"didAppear"
-#define kDidDisappear      @"didDisappear"
-#define kWillUnmount       @"willUnmount"
-#define kDidMount         @"didMount"
-typedef NSString*               LifecycleEvent;
-
-@interface RNNComponentLifecycleEvent : NSObject
-
-+ (instancetype)create:(LifecycleEvent)event componentName:(NSString*)componentName componentId:(NSString*)componentId;
-
-- (NSDictionary*)body;
-
-@end

lib/ios/RNNComponentLifecycleEvent.m

@@ -1,24 +0,0 @@
-#import "RNNComponentLifecycleEvent.h"
-
-@interface RNNComponentLifecycleEvent()
-@property (nonatomic, strong) NSString* componentName;
-@property (nonatomic, strong) NSString* componentId;
-@property (nonatomic, strong) LifecycleEvent event;
-
-@end
-
-@implementation RNNComponentLifecycleEvent
-
-+ (instancetype)create:(LifecycleEvent)event componentName:(NSString *)componentName componentId:(NSString *)componentId {
-	RNNComponentLifecycleEvent* lifecycleEvent = [[RNNComponentLifecycleEvent alloc] init];
-	lifecycleEvent.componentName = componentName;
-	lifecycleEvent.componentId = componentId;
-	lifecycleEvent.event = event;
-	return lifecycleEvent;
-}
-
-- (NSDictionary *)body {
-	return @{@"event": self.event, @"componentName": self.componentName, @"componentId": self.componentId};
-}
-
-@end

lib/ios/RNNEventEmitter.h

@@ -4,8 +4,6 @@
 #import <React/RCTEventEmitter.h>
 #import <React/RCTBridgeModule.h>
 
-#import "RNNNavigationEvent.h"
-
 @interface RNNEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
 -(void)sendOnAppLaunched;
@@ -16,6 +14,4 @@
 
 -(void)sendOnNavigationButtonPressed:(NSString*)componentId buttonId:(NSString*)buttonId;
 
--(void)sendNavigationEvent:(RNNNavigationEvent*)navigationEvent;
-
 @end

lib/ios/RNNEventEmitter.m

@@ -11,10 +11,9 @@ static NSString* const onAppLaunched	= @"RNN.appLaunched";
 static NSString* const componentDidAppear	= @"RNN.componentDidAppear";
 static NSString* const componentDidDisappear	= @"RNN.componentDidDisappear";
 static NSString* const onNavigationButtonPressed	= @"RNN.navigationButtonPressed";
-static NSString* const navigationCommands	= @"RNN.navigationCommands";
 
 -(NSArray<NSString *> *)supportedEvents {
-	return @[onAppLaunched, componentDidAppear, componentDidDisappear, onNavigationButtonPressed, navigationCommands];
+	return @[onAppLaunched, componentDidAppear, componentDidDisappear, onNavigationButtonPressed];
 }
 
 # pragma mark public
@@ -27,10 +26,6 @@ static NSString* const navigationCommands	= @"RNN.navigationCommands";
 	}
 }
 
--(void)sendNavigationEvent:(RNNNavigationEvent *)navigationEvent {
-	[self send:navigationCommands body:navigationEvent.body];
-}
-
 -(void)sendComponentDidAppear:(NSString *)componentId {
 	[self send:componentDidAppear body:componentId];
 }

lib/ios/RNNNavigationEvent.h

@@ -1,20 +0,0 @@
-#import <Foundation/Foundation.h>
-
-#define kPush              @"push"
-#define kPop               @"pop"
-#define kPopTo             @"popTo"
-#define kPopToRoot         @"popToRoot"
-#define kShowModal         @"showModal"
-#define kDismissModal      @"dismissModal"
-#define kDismissAllModals  @"dismissAllModals"
-#define kShowOverlay       @"showOverlay"
-#define kDismissOverlay    @"dismissOverlay"
-typedef NSString*               NavigationCommand;
-
-@interface RNNNavigationEvent : NSObject
-
-@property (nonatomic, strong) NSDictionary* body;
-
-+ (instancetype)create:(NavigationCommand)commandType fromComponent:(NSString *)fromComponentId toComponent:(NSString *)toComponentId;
-
-@end

lib/ios/RNNNavigationEvent.m

@@ -1,26 +0,0 @@
-#import "RNNNavigationEvent.h"
-
-@interface RNNNavigationEvent ()
-	@property (nonatomic, strong) NavigationCommand command;
-	@property (nonatomic, strong) NSString* toComponentId;
-	@property (nonatomic, strong) NSString* fromComponentId;
-@end
-
-@implementation RNNNavigationEvent
-
-+ (instancetype)create:(NavigationCommand)commandType fromComponent:(NSString *)fromComponentId toComponent:(NSString *)toComponentId {
-	RNNNavigationEvent* navigationCommand = [[RNNNavigationEvent alloc] init];
-	navigationCommand.command = commandType;
-	navigationCommand.fromComponentId = fromComponentId;
-	navigationCommand.toComponentId = toComponentId;
-	return navigationCommand;
-}
-
-- (NSDictionary *)body {
-	NSMutableDictionary* mutableParams = [NSMutableDictionary new];
-	self.fromComponentId ? [mutableParams setObject:self.fromComponentId forKey:@"fromComponentId"] : nil;
-	self.toComponentId ? [mutableParams setObject:self.toComponentId forKey:@"toComponentId"] : nil;
-	return @{@"commandName": self.command, @"params": mutableParams};
-}
-
-@end

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -63,10 +63,6 @@
 		390AD478200F499D00A8250D /* RNNSwizzles.m in Sources */ = {isa = PBXBuildFile; fileRef = 390AD476200F499D00A8250D /* RNNSwizzles.m */; };
 		5016E8EF20209690009D4F7C /* RNNCustomTitleView.h in Headers */ = {isa = PBXBuildFile; fileRef = 5016E8ED2020968F009D4F7C /* RNNCustomTitleView.h */; };
 		5016E8F020209690009D4F7C /* RNNCustomTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5016E8EE2020968F009D4F7C /* RNNCustomTitleView.m */; };
-		5032774E2015E86D00ECD75D /* RNNNavigationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5032774C2015E86D00ECD75D /* RNNNavigationEvent.h */; };
-		5032774F2015E86D00ECD75D /* RNNNavigationEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 5032774D2015E86D00ECD75D /* RNNNavigationEvent.m */; };
-		503277602016302900ECD75D /* RNNComponentLifecycleEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5032775E2016302900ECD75D /* RNNComponentLifecycleEvent.h */; };
-		503277612016302900ECD75D /* RNNComponentLifecycleEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 5032775F2016302900ECD75D /* RNNComponentLifecycleEvent.m */; };
 		50415CBA20553B8E00BB682E /* RNNScreenTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = 50415CB820553B8E00BB682E /* RNNScreenTransition.h */; };
 		50415CBB20553B8E00BB682E /* RNNScreenTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50415CB920553B8E00BB682E /* RNNScreenTransition.m */; };
 		50451D052042DAEB00695F00 /* RNNPushAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 50451D032042DAEB00695F00 /* RNNPushAnimation.h */; };
@@ -252,10 +248,6 @@
 		390AD476200F499D00A8250D /* RNNSwizzles.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSwizzles.m; sourceTree = "<group>"; };
 		5016E8ED2020968F009D4F7C /* RNNCustomTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNCustomTitleView.h; sourceTree = "<group>"; };
 		5016E8EE2020968F009D4F7C /* RNNCustomTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNCustomTitleView.m; sourceTree = "<group>"; };
-		5032774C2015E86D00ECD75D /* RNNNavigationEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNNavigationEvent.h; sourceTree = "<group>"; };
-		5032774D2015E86D00ECD75D /* RNNNavigationEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationEvent.m; sourceTree = "<group>"; };
-		5032775E2016302900ECD75D /* RNNComponentLifecycleEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNComponentLifecycleEvent.h; sourceTree = "<group>"; };
-		5032775F2016302900ECD75D /* RNNComponentLifecycleEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNComponentLifecycleEvent.m; sourceTree = "<group>"; };
 		50415CB820553B8E00BB682E /* RNNScreenTransition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNScreenTransition.h; sourceTree = "<group>"; };
 		50415CB920553B8E00BB682E /* RNNScreenTransition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNScreenTransition.m; sourceTree = "<group>"; };
 		50451D032042DAEB00695F00 /* RNNPushAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNPushAnimation.h; sourceTree = "<group>"; };
@@ -538,10 +530,6 @@
 				E8AEDB461F58414D000F5A6A /* Animations */,
 				504AFE611FFE52EF0076E904 /* Options */,
 				50D031312005146C00386B3D /* Managers */,
-				5032774C2015E86D00ECD75D /* RNNNavigationEvent.h */,
-				5032774D2015E86D00ECD75D /* RNNNavigationEvent.m */,
-				5032775E2016302900ECD75D /* RNNComponentLifecycleEvent.h */,
-				5032775F2016302900ECD75D /* RNNComponentLifecycleEvent.m */,
 				26916C941E4B9CCC00D13680 /* RNNRootViewCreator.h */,
 				26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */,
 				26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */,
@@ -725,7 +713,6 @@
 				507F43F41FF4FCFE00D9425B /* HMSegmentedControl.h in Headers */,
 				50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */,
 				7B4928081E70415400555040 /* RNNCommandsHandler.h in Headers */,
-				5032774E2015E86D00ECD75D /* RNNNavigationEvent.h in Headers */,
 				263905AE1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h in Headers */,
 				50F5DFC11F407A8C001A00BC /* RNNTabBarController.h in Headers */,
 				50CB3B691FDE911400AA153B /* RNNSideMenuOptions.h in Headers */,
@@ -743,7 +730,6 @@
 				263905C01E4C6F440023D7D3 /* SidebarAirbnbAnimation.h in Headers */,
 				E8367B801F7A8A4700675C05 /* VICMAImageView.h in Headers */,
 				263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */,
-				503277602016302900ECD75D /* RNNComponentLifecycleEvent.h in Headers */,
 				263905C41E4C6F440023D7D3 /* SidebarFacebookAnimation.h in Headers */,
 				50F5DFC51F407AA0001A00BC /* RNNNavigationController.h in Headers */,
 				21B85E5F1F44482A00B314B5 /* RNNNavigationButtons.h in Headers */,
@@ -928,8 +914,6 @@
 				263905C11E4C6F440023D7D3 /* SidebarAirbnbAnimation.m in Sources */,
 				263905D71E4C94970023D7D3 /* RNNSideMenuController.m in Sources */,
 				507F43CA1FF4F9CC00D9425B /* RNNTopTabOptions.m in Sources */,
-				503277612016302900ECD75D /* RNNComponentLifecycleEvent.m in Sources */,
-				5032774F2015E86D00ECD75D /* RNNNavigationEvent.m in Sources */,
 				26916C991E4B9E7700D13680 /* RNNReactRootViewCreator.m in Sources */,
 				214545251F4DC125006E8DA1 /* RNNUIBarButtonItem.m in Sources */,
 				263905B81E4C6F440023D7D3 /* UIViewController+MMDrawerController.m in Sources */,

lib/src/adapters/NativeEventsReceiver.ts

@@ -19,14 +19,6 @@ export class NativeEventsReceiver {
     this.emitter.addListener('RNN.appLaunched', callback);
   }
 
-  registerNavigationCommands(callback) {
-    this.emitter.addListener('RNN.navigationCommands', callback);
-  }
-
-  registerComponentLifecycle(callback) {
-    this.emitter.addListener('RNN.componentLifecycle', callback);
-  }
-
   registerNavigationButtonPressed(callback) {
     this.emitter.addListener('RNN.navigationButtonPressed', callback);
   }