Closes #3697

lib/ios/RNNBasePresenter.h

@@ -20,8 +20,6 @@
 
 - (void)presentOn:(UIViewController *)viewController;
 
-- (void)presentOnLoad:(UIViewController *)viewController;
-
 - (void)overrideOptions:(RNNNavigationOptions *)options;
 
 @end

lib/ios/RNNBasePresenter.m

@@ -15,7 +15,7 @@
 }
 
 - (void)present:(RNNNavigationOptions *)options on:(UIViewController *)viewController {
-	
+	[options applyOn:viewController];
 }
 
 - (RNNNavigationOptions *)presentWithChildOptions:(RNNNavigationOptions *)childOptions on:(UIViewController *)viewController {
@@ -25,10 +25,6 @@
 	return options;
 }
 
-- (void)presentOnLoad:(UIViewController *)viewController {
-	
-}
-
 - (void)overrideOptions:(RNNNavigationOptions *)options {
 	[_options mergeOptions:options overrideOptions:YES];
 }

lib/ios/RNNControllerFactory.m

@@ -181,14 +181,16 @@
 
 - (UIViewController<RNNParentProtocol> *)createSideMenu:(RNNLayoutNode*)node {
 	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] initWithNode:node];
-
+	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
+	RNNBasePresenter* presenter = [[RNNBasePresenter alloc] initWithOptions:options];
+	
 	NSMutableArray* childrenVCs = [NSMutableArray new];
 	
 	for (NSDictionary *child in node.children) {
 		UIViewController *vc = [self fromTree:child];
 		[childrenVCs addObject:vc];
 	}
-	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithControllers:childrenVCs];
+	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithControllers:childrenVCs presenter:presenter];
 	sideMenu.layoutInfo = layoutInfo;
 	
 	return sideMenu;
@@ -197,7 +199,9 @@
 
 - (UIViewController<RNNParentProtocol> *)createSideMenuChild:(RNNLayoutNode*)node type:(RNNSideMenuChildType)type {
 	UIViewController<RNNParentProtocol>* child = [self fromTree:node.children[0]];
+	RNNNavigationOptions* options = [_optionsManager createOptions:node.data[@"options"]];
 	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithChild: child type:type];
+	sideMenuChild.presenter = [[RNNBasePresenter alloc] initWithOptions:options];
 	
 	return sideMenuChild;
 }

lib/ios/RNNParentProtocol.h

@@ -6,9 +6,6 @@
 @required
 
 - (UIViewController<RNNLeafProtocol> *)getLeafViewController;
-
-@optional
-
 - (void)performOnChildWillAppear:(RNNNavigationOptions *)options;
 - (void)performOnChildLoad:(RNNNavigationOptions *)options;
 

lib/ios/RNNSideMenu/MMDrawerController/MMDrawerController.m

@@ -21,6 +21,7 @@
 
 #import "MMDrawerController.h"
 #import "UIViewController+MMDrawerController.h"
+#import "RNNNavigationOptions.h"
 
 #import <QuartzCore/QuartzCore.h>
 
@@ -462,7 +463,7 @@ static NSString *MMDrawerOpenSideKey = @"MMDrawerOpenSide";
     
     _centerViewController = centerViewController;
     
-    [self addChildViewController:self.centerViewController];
+	[self addChildViewController:self.centerViewController];
     [self.centerViewController.view setFrame:self.childControllerContainerView.bounds];
     [self.centerContainerView addSubview:self.centerViewController.view];
     [self.childControllerContainerView bringSubviewToFront:self.centerContainerView];
@@ -479,6 +480,24 @@ static NSString *MMDrawerOpenSideKey = @"MMDrawerOpenSide";
     }
 }
 
+- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:childOptions];
+	}
+}
+
+- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:childOptions];
+	}
+}
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:nil];
+	}
+}
+
 -(void)setCenterViewController:(UIViewController *)newCenterViewController withCloseAnimation:(BOOL)animated completion:(void(^)(BOOL finished))completion{
     
     if(self.openSide == MMDrawerSideNone){
@@ -911,7 +930,7 @@ static NSString *MMDrawerOpenSideKey = @"MMDrawerOpenSide";
     
     if(viewController){
         [self addChildViewController:viewController];
-        
+		
         if((self.openSide == drawerSide) &&
            [self.childControllerContainerView.subviews containsObject:self.centerContainerView]){
             [self.childControllerContainerView insertSubview:viewController.view belowSubview:self.centerContainerView];

lib/ios/RNNSideMenuChildVC.m

@@ -20,12 +20,12 @@
 -(instancetype) initWithChild:(UIViewController<RNNParentProtocol>*)child type:(RNNSideMenuChildType)type {
 	self = [super init];
 	
-	self.child = child;	
+	self.child = child;
 	[self addChildViewController:self.child];
 	[self.child.view setFrame:self.view.bounds];
 	[self.view addSubview:self.child.view];
 	[self.view bringSubviewToFront:self.child.view];
-	
+
 	self.type = type;
 	
 	return self;
@@ -35,6 +35,26 @@
 	return [self.child getLeafViewController];
 }
 
+- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
+	}
+}
+
+- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
+	}
+}
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:_presenter.options];
+	}
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return self.child.preferredStatusBarStyle;
 }

lib/ios/RNNSideMenuController.h

@@ -21,7 +21,7 @@
 @property (nonatomic, retain) RNNLayoutInfo* layoutInfo;
 @property (nonatomic, retain) RNNBasePresenter* presenter;
 
--(instancetype)initWithControllers:(NSArray*)controllers;
+-(instancetype)initWithControllers:(NSArray*)controllers presenter:(RNNBasePresenter *)presenter;
 
 -(void)showSideMenu:(MMDrawerSide)side animated:(BOOL)animated;
 -(void)hideSideMenu:(MMDrawerSide)side animated:(BOOL)animated;

lib/ios/RNNSideMenuController.m

@@ -21,9 +21,10 @@
 
 @implementation RNNSideMenuController
 
--(instancetype)initWithControllers:(NSArray*)controllers;
+-(instancetype)initWithControllers:(NSArray*)controllers presenter:(RNNBasePresenter *)presenter
 {
 	self = [super init];
+	self.presenter = presenter;
 	
 	[self setControllers:controllers];
 	
@@ -93,5 +94,25 @@
 	return [self.center getLeafViewController];
 }
 
+- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
+	}
+}
+
+- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+		if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
+	}
+}
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:_presenter.options];
+	}
+}
+
 
 @end

lib/ios/RNNSplitViewController.m

@@ -26,4 +26,18 @@
 	return self;
 }
 
+- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
+	}
+}
+
+- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
+	}
+}
+
 @end

lib/ios/RNNTabBarController.m

@@ -16,9 +16,16 @@
 }
 
 - (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
-	[_presenter presentWithChildOptions:childOptions on:self];
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
 	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
-		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:childOptions];
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
+	}
+}
+
+- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
 	}
 }
 

lib/ios/RNNTopTabsViewController.m

@@ -78,4 +78,18 @@
 	return _currentViewController;
 }
 
+- (void)performOnChildLoad:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildLoad:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildLoad:) withObject:combinedOptions];
+	}
+}
+
+- (void)performOnChildWillAppear:(RNNNavigationOptions *)childOptions {
+	RNNNavigationOptions* combinedOptions = [_presenter presentWithChildOptions:childOptions on:self];
+	if ([self.parentViewController respondsToSelector:@selector(performOnChildWillAppear:)]) {
+		[self.parentViewController performSelector:@selector(performOnChildWillAppear:) withObject:combinedOptions];
+	}
+}
+
 @end

playground/src/components/Bounds.js

@@ -11,4 +11,4 @@ module.exports = (props) => {
       {props.children}
     </View>
   );
-};
+};

playground/src/screens/ComplexLayout.js

@@ -109,7 +109,7 @@ class ComplexLayout extends Component {
            ]
         }
       }
-    })
+    });
   }
 }