e2e fixes

e2e/StaticLifecycleEvents.test.js

@@ -7,12 +7,12 @@ describe('static lifecycle events', () => {
     await device.relaunchApp();
   });
 
-  it(':android: didAppear didDisappear', async () => {
+  it('didAppear didDisappear', async () => {
     await elementById(testIDs.PUSH_STATIC_LIFECYCLE_BUTTON).tap();
     await expect(elementByLabel('Static Lifecycle Events Overlay')).toBeVisible();
-    await expect(elementByLabel('didAppear | navigation.playground.StaticLifecycleOverlay')).toBeVisible();
-    await elementByLabel('PUSH').tap();
-    await expect(elementByLabel('didAppear | navigation.playground.PushedScreen')).toBeVisible();
-    await expect(elementByLabel('didDisappear | navigation.playground.WelcomeScreen')).toBeVisible();
+    await expect(elementByLabel('componentDidAppear | navigation.playground.StaticLifecycleOverlay')).toBeVisible();
+    await elementById(testIDs.PUSH_BUTTON).tap();
+    await expect(elementByLabel('componentDidAppear | navigation.playground.PushedScreen')).toBeVisible();
+    await expect(elementByLabel('componentDidDisappear | navigation.playground.WelcomeScreen')).toBeVisible();
   });
 });

lib/ios/RNNEventEmitter.m

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

lib/ios/RNNNavigationOptions.m

@@ -53,7 +53,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	}
 }
 
--(void)applyOn:(UIViewController*)viewController {	
+-(void)applyOn:(UIViewController<RNNRootViewProtocol> *)viewController {
 	[self.topBar applyOn:viewController];
 	[self.bottomTabs applyOn:viewController];
 	[self.topTab applyOn:viewController];
@@ -61,6 +61,8 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	[self.sideMenu applyOn:viewController];
 	[self.overlay applyOn:viewController];
 	[self applyOtherOptionsOn:viewController];
+	
+	[viewController optionsUpdated];
 }
 
 - (void)applyOtherOptionsOn:(UIViewController*)viewController {

lib/ios/RNNRootViewController.m

@@ -44,10 +44,7 @@
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	[self.options applyOn:self];
-
-	[self setCustomNavigationTitleView];
-	[self setCustomNavigationBarView];
-	[self setCustomNavigationComponentBackground];
+	[self optionsUpdated];
 }
 
 -(void)viewDidAppear:(BOOL)animated {
@@ -68,6 +65,12 @@
 	[super viewDidLoad];
 }
 
+- (void)optionsUpdated {
+	[self setCustomNavigationTitleView];
+	[self setCustomNavigationBarView];
+	[self setCustomNavigationComponentBackground];
+}
+
 - (void)mergeOptions:(NSDictionary *)options {
 	[self.options mergeIfEmptyWith:options];
 }

lib/ios/RNNRootViewProtocol.h

@@ -5,6 +5,7 @@
 @optional
 - (void)mergeOptions:(NSDictionary*)options;
 - (BOOL)isCustomViewController;
+- (void)optionsUpdated;
 
 @required
 - (BOOL)isCustomTransitioned;

lib/ios/RNNTitleOptions.m

@@ -1,6 +1,7 @@
 #import "RNNTitleOptions.h"
 #import "RNNTitleViewHelper.h"
 
+
 @implementation RNNTitleOptions
 
 - (void)applyOn:(UIViewController *)viewController {

playground/src/screens/CustomTopBar.js

@@ -17,19 +17,19 @@ class CustomTopBar extends Component {
   }
 
   componentDidAppear() {
-    console.log('guyca', 'componentDidAppear');
+    // console.log('guyca', 'componentDidAppear');
   }
 
   componentDidDisappear() {
-    console.log('guyca', `componentDidDisappear`);
+    // console.log('guyca', `componentDidDisappear`);
   }
 
   componentDidMount() {
-    console.log('guyca', `componentDidMount`);
+    // console.log('guyca', `componentDidMount`);
   }
 
   componentWillUnmount() {
-    console.log('guyca', `componentWillUnmount`);
+    // console.log('guyca', `componentWillUnmount`);
   }
 
   render() {

playground/src/screens/WelcomeScreen.js

@@ -261,7 +261,12 @@ class WelcomeScreen extends Component {
   onClickShowStaticLifecycleOverlay = () => {
     Navigation.showOverlay({
       component: {
-        name: 'navigation.playground.StaticLifecycleOverlay'
+        name: 'navigation.playground.StaticLifecycleOverlay',
+        options: {
+          overlay: {
+            interceptTouchOutside: false
+          }
+        }
       }
     });
   }