RNNRootViewProtocol refactor

lib/ios/RNNCommandsHandler.m

@@ -142,9 +142,10 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 	
 	UIViewController<RNNRootViewProtocol> *newVC = [_controllerFactory createLayoutAndSaveToStore:layout];
+	RNNNavigationOptions* options = [newVC getLeafViewController].options;
 	UIViewController *fromVC = [_store findComponentForId:componentId];
 	__weak typeof(RNNEventEmitter*) weakEventEmitter = _eventEmitter;
-	[_stackManager setStackRoot:newVC fromViewController:fromVC animated:newVC.options.animations.push.enable completion:^{
+	[_stackManager setStackRoot:newVC fromViewController:fromVC animated:options.animations.push.enable completion:^{
 		[weakEventEmitter sendOnNavigationCommandCompletion:setStackRoot params:@{@"componentId": componentId}];
 		completion();
 	} rejection:rejection];

lib/ios/RNNControllerFactory.m

@@ -1,7 +1,6 @@
 
 #import "RNNControllerFactory.h"
 #import "RNNLayoutNode.h"
-#import "RNNRootViewController.h"
 #import "RNNSplitViewController.h"
 #import "RNNSplitViewOptions.h"
 #import "RNNSideMenuController.h"
@@ -104,7 +103,7 @@
 		CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
 		[_bridge.uiManager setAvailableSize:availableSize forRootView:component.view];
 	}
-	return component;
+	return (UIViewController<RNNRootViewProtocol> *)component;
 }
 
 - (UIViewController<RNNRootViewProtocol> *)createExternalComponent:(RNNLayoutNode*)node {
@@ -121,7 +120,7 @@
 	[component.view addSubview:externalVC.view];
 	[externalVC didMoveToParentViewController:component];
 	
-	return component;
+	return (UIViewController<RNNRootViewProtocol> *)component;
 }
 
 
@@ -134,7 +133,7 @@
 		[controllers addObject:[self fromTree:child]];
 	}
 	[vc setViewControllers:controllers];
-	[vc mergeOptions:options];
+	[vc.getLeafViewController mergeOptions:options];
 	
 	return vc;
 }
@@ -152,7 +151,7 @@
 		[controllers addObject:childVc];
 	}
 	[vc setViewControllers:controllers];
-	[vc mergeOptions:options];
+	[vc.getLeafViewController mergeOptions:options];
 	
 	return vc;
 }
@@ -163,7 +162,7 @@
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary *child in node.children) {
 		RNNRootViewController* childVc = (RNNRootViewController*)[self fromTree:child];
-		childVc.topTabsViewController = vc;
+//		childVc.topTabsViewController = vc;
 		[controllers addObject:childVc];
 		[_bridge.uiManager setAvailableSize:vc.contentView.bounds.size forRootView:childVc.view];
 	}
@@ -181,7 +180,7 @@
 		[childrenVCs addObject:vc];
 	}
 	RNNSideMenuController *sideMenu = [[RNNSideMenuController alloc] initWithControllers:childrenVCs];
-	[sideMenu mergeOptions:[self createOptions:node.data[@"options"]]];
+	[sideMenu.getLeafViewController mergeOptions:[self createOptions:node.data[@"options"]]];
 	return sideMenu;
 }
 

lib/ios/RNNModalManager.m

@@ -14,14 +14,15 @@
 }
 
 -(void)showModalAfterLoad:(NSDictionary*)notif {
-	RNNRootViewController *topVC = (RNNRootViewController*)[self topPresentedVC];
+	UIViewController<RNNRootViewProtocol>* topVC = (UIViewController<RNNRootViewProtocol>*)[self topPresentedVC];
 	topVC.definesPresentationContext = YES;
-	
-	if (topVC.options.animations.showModal.hasCustomAnimation) {
+	RNNNavigationOptions* options = topVC.getLeafViewController.options;
+
+	if (options.animations.showModal.hasCustomAnimation) {
 		self.toVC.transitioningDelegate = topVC;
 	}
 	
-	[topVC presentViewController:self.toVC animated:self.toVC.options.animations.showModal.enable completion:^{
+	[topVC presentViewController:self.toVC animated:options.animations.showModal.enable completion:^{
 		if (_completionBlock) {
 			_completionBlock();
 			_completionBlock = nil;
@@ -32,18 +33,20 @@
 
 -(void)showModal:(UIViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
 	self.toVC = (UIViewController<RNNRootViewProtocol>*)viewController;
+	RNNNavigationOptions* options = self.toVC.getLeafViewController.options;
+
 	_completionBlock = completion;
 	
     if ([self.toVC respondsToSelector:@selector(applyModalOptions)]) {
-        [self.toVC applyModalOptions];
+        [self.toVC.getLeafViewController applyModalOptions];
     }
     
     if ([self.toVC respondsToSelector:@selector(isCustomViewController)] &&
-        [self.toVC isCustomViewController]
+        [self.toVC.getLeafViewController isCustomViewController]
     ) {
 		[self showModalAfterLoad:nil];
 	} else {
-		[self.toVC waitForReactViewRender:self.toVC.options.animations.showModal.waitForRender perform:^{
+		[self.toVC.getLeafViewController waitForReactViewRender:options.animations.showModal.waitForRender perform:^{
 			[self showModalAfterLoad:nil];
 		}];
 	}
@@ -65,8 +68,8 @@
 
 -(void)removePendingNextModalIfOnTop {
 	NSString *componentId = [[_store pendingModalIdsToDismiss] lastObject];
-
 	UIViewController<RNNRootViewProtocol> *modalToDismiss = (UIViewController<RNNRootViewProtocol>*)[_store findComponentForId:componentId];
+	RNNNavigationOptions* options = modalToDismiss.getLeafViewController.options;
 
 	if(!modalToDismiss) {
 		return;
@@ -74,12 +77,12 @@
 
 	UIViewController* topPresentedVC = [self topPresentedVC];
 
-	if ([modalToDismiss.options.animations.showModal hasCustomAnimation]) {
+	if ([options.animations.showModal hasCustomAnimation]) {
 		modalToDismiss.transitioningDelegate = modalToDismiss;
 	}
 
 	if (modalToDismiss == topPresentedVC || [[topPresentedVC childViewControllers] containsObject:modalToDismiss]) {
-		[modalToDismiss dismissViewControllerAnimated:modalToDismiss.options.animations.dismissModal.enable completion:^{
+		[modalToDismiss dismissViewControllerAnimated:options.animations.dismissModal.enable completion:^{
 			[[_store pendingModalIdsToDismiss] removeObject:componentId];
 			[_store removeComponent:componentId];
 			[self removePendingNextModalIfOnTop];

lib/ios/RNNNavigationController.m

@@ -12,14 +12,6 @@
 	return self;
 }
 
-- (BOOL)isCustomViewController {
-	return [self.getLeafViewController isCustomViewController];
-}
-
-- (void)mergeOptions:(RNNOptions *)options {
-	[self.getLeafViewController mergeOptions:options];
-}
-
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return self.getLeafViewController.preferredStatusBarStyle;
 }
@@ -28,10 +20,6 @@
 	return self.getLeafViewController.modalPresentationStyle;
 }
 
-- (void)applyModalOptions {
-	[self.getLeafViewController applyModalOptions];
-}
-
 - (UIViewController *)popViewControllerAnimated:(BOOL)animated {
 	return [super popViewControllerAnimated:animated];
 }
@@ -41,25 +29,17 @@
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.options.animations.showModal isDismiss:NO];
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.options.animations.showModal isDismiss:NO];
 }
 
 - (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.options.animations.dismissModal isDismiss:YES];
-}
-
-- (RNNNavigationOptions *)options {
-	return self.getLeafViewController.options;
+	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getLeafViewController.options.animations.dismissModal isDismiss:YES];
 }
 
 - (UIViewController *)getLeafViewController {
 	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController);
 }
 
-- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	[self.getLeafViewController waitForReactViewRender:wait perform:readyBlock];
-}
-
 - (UIViewController *)childViewControllerForStatusBarStyle {
 	return self.topViewController;
 }

lib/ios/RNNNavigationOptions.m

@@ -54,7 +54,7 @@ RCT_ENUM_CONVERTER(UIModalTransitionStyle,
 	[self.layout applyOn:viewController];
 	[self applyOtherOptionsOn:viewController];
 	
-	[viewController optionsUpdated];
+	[viewController.getLeafViewController optionsUpdated];
 }
 
 - (void)applyOtherOptionsOn:(UIViewController*)viewController {

lib/ios/RNNOverlayManager.h

@@ -1,6 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "RNNStore.h"
+#import "RNNOverlayWindow.h"
 
 @interface RNNOverlayManager : NSObject
 
@@ -9,4 +10,6 @@
 - (void)showOverlay:(UIViewController*)viewController completion:(RNNTransitionCompletionBlock)completion;
 - (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject;
 
+@property (nonatomic, retain) RNNOverlayWindow *overlayWindow;
+
 @end

lib/ios/RNNRootViewController.h

@@ -1,4 +1,3 @@
-
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "RNNLayoutNode.h"
@@ -6,30 +5,33 @@
 #import "RNNEventEmitter.h"
 #import "RNNNavigationOptions.h"
 #import "RNNAnimator.h"
-#import "RNNTopTabsViewController.h"
-#import "RNNRootViewProtocol.h"
 
-@class RNNRootViewController;
+typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
-@interface RNNRootViewController : UIViewController	<RNNRootViewProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate>
+@interface RNNRootViewController : UIViewController	<UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate, UINavigationControllerDelegate, UISplitViewControllerDelegate>
 
 @property (nonatomic, strong) RNNNavigationOptions* options;
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 @property (nonatomic, strong) NSString* componentId;
-@property (nonatomic, strong) RNNTopTabsViewController* topTabsViewController;
 @property (nonatomic) id<RNNRootViewCreator> creator;
 @property (nonatomic, strong) RNNAnimator* animator;
 @property (nonatomic, strong) UIViewController* previewController;
 
 
--(instancetype)initWithName:(NSString*)name
+- (instancetype)initWithName:(NSString*)name
 				withOptions:(RNNNavigationOptions*)options
 			withComponentId:(NSString*)componentId
 			rootViewCreator:(id<RNNRootViewCreator>)creator
 			   eventEmitter:(RNNEventEmitter*)eventEmitter
 		  isExternalComponent:(BOOL)isExternalComponent;
 
--(void)applyTabBarItem;
--(void)applyTopTabsOptions;
+- (void)applyTabBarItem;
+- (void)applyTopTabsOptions;
+- (BOOL)isCustomViewController;
+- (BOOL)isCustomTransitioned;
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
+- (void)mergeOptions:(RNNOptions*)options;
+- (void)applyModalOptions;
+- (void)optionsUpdated;
 
 @end

lib/ios/RNNRootViewController.m

@@ -60,7 +60,6 @@
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	[self.options applyOn:self];
-	[self optionsUpdated];
 }
 
 -(void)viewDidAppear:(BOOL)animated {

lib/ios/RNNRootViewProtocol.h

@@ -1,21 +1,14 @@
 #import "RNNNavigationOptions.h"
-typedef void (^RNNReactViewReadyCompletionBlock)(void);
+#import "RNNRootViewController.h"
 
 @protocol RNNRootViewProtocol <NSObject, UINavigationControllerDelegate, UIViewControllerTransitioningDelegate, UISplitViewControllerDelegate>
 
 @optional
-- (void)mergeOptions:(RNNOptions*)options;
-- (BOOL)isCustomViewController;
+
 - (void)performOnRotation:(void (^)(void))block;
-- (void)optionsUpdated;
-- (void)applyModalOptions;
-- (BOOL)isCustomTransitioned;
-- (RNNNavigationOptions*)options;
 
 @required
-- (NSString *)componentId;
-- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
-- (UIViewController<RNNRootViewProtocol> *)getLeafViewController;
+- (RNNRootViewController *)getLeafViewController;
 
 @end
 

lib/ios/RNNSideMenuChildVC.m

@@ -31,24 +31,12 @@
 	return self;
 }
 
-- (void)mergeOptions:(RNNOptions *)options {
-	[self.child mergeOptions:options];
-}
-
-- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	[self.child waitForReactViewRender:wait perform:readyBlock];
-}
-
-- (UIViewController *)getLeafViewController {
-	return self.child;
+- (RNNRootViewController *)getLeafViewController {
+	return [self.child getLeafViewController];
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return self.child.preferredStatusBarStyle;
 }
 
-- (NSString *)componentId {
-	return _child.componentId;
-}
-
 @end

lib/ios/RNNSideMenuController.m

@@ -89,20 +89,12 @@
 	}
 }
 
-- (UIViewController *)getLeafViewController {
-	return self.center;
+- (RNNRootViewController *)getLeafViewController {
+	return [self.center getLeafViewController];
 }
 
 - (void)mergeOptions:(RNNOptions *)options {
-	[self.center mergeOptions:options];
-}
-
-- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	[self.center waitForReactViewRender:wait perform:readyBlock];
-}
-
-- (NSString *)componentId {
-	return _center.componentId;
+	[self.center.getLeafViewController mergeOptions:options];
 }
 
 @end

lib/ios/RNNSplitViewController.m

@@ -1,5 +1,3 @@
-
-#import "RNNRootViewController.h"
 #import "RNNSplitViewController.h"
 
 @interface RNNSplitViewController()
@@ -27,10 +25,6 @@
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	[self.options applyOn:self];
-	[self optionsUpdated];
-}
-
-- (void)optionsUpdated {
 }
 
 - (UIViewController *)getLeafViewController {

lib/ios/RNNStore.h

@@ -1,7 +1,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "RNNRootViewController.h"
+#import "RNNRootViewProtocol.h"
 #import "ReactNativeNavigation.h"
 
 typedef void (^RNNTransitionCompletionBlock)(void);

lib/ios/RNNStore.m

@@ -1,6 +1,6 @@
 
 #import "RNNStore.h"
-#import "RNNRootViewController.h"
+
 @interface RNNStore ()
 
 @end

lib/ios/RNNTabBarController.m

@@ -1,6 +1,6 @@
 
 #import "RNNTabBarController.h"
-#import "RNNRootViewController.h"
+
 #define kTabBarHiddenDuration 0.3
 
 @implementation RNNTabBarController {
@@ -42,23 +42,11 @@
 }
 
 - (void)mergeOptions:(RNNOptions *)options {
-	[((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) mergeOptions:options];
-}
-
-- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	[((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) waitForReactViewRender:wait perform:readyBlock];
-}
-
-- (RNNNavigationOptions *)options {
-	return [((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) options];
+	[self.getLeafViewController mergeOptions:options];
 }
 
 - (UIViewController *)getLeafViewController {
-	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController);
-}
-
-- (NSString *)componentId {
-	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController).componentId;
+	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController).getLeafViewController;
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {

lib/ios/RNNTopTabOptions.m

@@ -5,7 +5,7 @@
 
 - (void)applyOn:(RNNRootViewController*)viewController {
 	if (self.title) {
-		[viewController.topTabsViewController viewController:viewController changedTitle:self.title];
+//		[viewController.topTabsViewController viewController:viewController changedTitle:self.title];
 	}
 }
 

lib/ios/RNNTopTabsViewController.m

@@ -1,6 +1,5 @@
 #import "RNNTopTabsViewController.h"
 #import "RNNSegmentedControl.h"
-#import "RNNRootViewController.h"
 #import "ReactNativeNavigation.h"
 
 @interface RNNTopTabsViewController () {
@@ -72,16 +71,8 @@
     [super viewDidLoad];
 }
 
-- (NSString *)componentId {
-	return _currentViewController.componentId;
-}
-
 #pragma mark RNNRootViewProtocol
 
-- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	[_currentViewController waitForReactViewRender:wait perform:readyBlock];
-}
-
 - (UIViewController *)getLeafViewController {
 	return _currentViewController;
 }