homogenous root view container protocol (#2455)

lib/ios/RNNCommandsHandler.m

@@ -56,9 +56,11 @@
 
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
-	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
+	
+	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	UIViewController *fromVc = [_store findContainerForId:containerId];
 	[_bridge.uiManager setAvailableSize:fromVc.view.bounds.size forRootView:newVc.view];
+
 	[_navigationStackManager push:newVc onTop:containerId completion:completion];
 }
 

lib/ios/RNNControllerFactory.h

@@ -4,6 +4,7 @@
 #import "RNNRootViewCreator.h"
 #import "RNNStore.h"
 #import "RNNEventEmitter.h"
+#import "RNNRootViewProtocol.h"
 
 @interface RNNControllerFactory : NSObject
 
@@ -11,6 +12,6 @@
 								 store:(RNNStore*)store
 						  eventEmitter:(RNNEventEmitter*)eventEmitter;
 
--(UIViewController*)createLayoutAndSaveToStore:(NSDictionary*)layout;
+-(UIViewController<RNNRootViewProtocol> *)createLayoutAndSaveToStore:(NSDictionary*)layout;
 
 @end

lib/ios/RNNControllerFactory.m

@@ -29,16 +29,16 @@
 	return self;
 }
 
-- (UIViewController*)createLayoutAndSaveToStore:(NSDictionary*)layout {
+- (UIViewController<RNNRootViewProtocol> *)createLayoutAndSaveToStore:(NSDictionary*)layout {
 	return [self fromTree:layout];
 }
 
 # pragma mark private
 
-- (UIViewController*)fromTree:(NSDictionary*)json {
+- (UIViewController<RNNRootViewProtocol> *)fromTree:(NSDictionary*)json {
 	RNNLayoutNode* node = [RNNLayoutNode create:json];
 	
-	UIViewController* result;
+	UIViewController<RNNRootViewProtocol> *result;
 	
 	if ( node.isContainer) {
 		result = [self createContainer:node];
@@ -76,7 +76,7 @@
 	return result;
 }
 
-- (RNNRootViewController*)createContainer:(RNNLayoutNode*)node {
+- (UIViewController<RNNRootViewProtocol> *)createContainer:(RNNLayoutNode*)node {
 	NSString* name = node.data[@"name"];
 	NSDictionary* customTransition = node.data[@"customTransition"];
 	RNNAnimator* animator = [[RNNAnimator alloc] initWithAnimationsDictionary:customTransition];
@@ -85,7 +85,7 @@
 	return [[RNNRootViewController alloc] initWithName:name withOptions:options withContainerId:containerId rootViewCreator:_creator eventEmitter:_eventEmitter animator:animator];
 }
 
-- (RNNNavigationController*)createContainerStack:(RNNLayoutNode*)node {
+- (UIViewController<RNNRootViewProtocol> *)createContainerStack:(RNNLayoutNode*)node {
 	RNNNavigationController* vc = [[RNNNavigationController alloc] init];
 	
 	NSMutableArray* controllers = [NSMutableArray new];
@@ -97,12 +97,12 @@
 	return vc;
 }
 
--(RNNTabBarController*)createTabs:(RNNLayoutNode*)node {
+-(UIViewController<RNNRootViewProtocol> *)createTabs:(RNNLayoutNode*)node {
 	RNNTabBarController* vc = [[RNNTabBarController alloc] init];
 	
 	NSMutableArray* controllers = [NSMutableArray new];
 	for (NSDictionary *child in node.children) {
-		UIViewController* childVc = [self fromTree:child];
+		UIViewController* childVc = (UIViewController*)[self fromTree:child];
 		RNNRootViewController* rootView = (RNNRootViewController *)childVc.childViewControllers.firstObject;
 		[rootView applyTabBarItem];
 		
@@ -113,7 +113,7 @@
 	return vc;
 }
 
-- (UIViewController*)createSideMenu:(RNNLayoutNode*)node {
+- (UIViewController<RNNRootViewProtocol> *)createSideMenu:(RNNLayoutNode*)node {
 	NSMutableArray* childrenVCs = [NSMutableArray new];
 	
 	
@@ -126,8 +126,8 @@
 }
 
 
-- (UIViewController*)createSideMenuChild:(RNNLayoutNode*)node type:(RNNSideMenuChildType)type {
-	UIViewController* child = [self fromTree:node.children[0]];
+- (UIViewController<RNNRootViewProtocol> *)createSideMenuChild:(RNNLayoutNode*)node type:(RNNSideMenuChildType)type {
+	UIViewController* child = (UIViewController*)[self fromTree:node.children[0]];
 	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithChild: child type:type];
 	
 	return sideMenuChild;

lib/ios/RNNNavigationController.h

@@ -1,5 +1,6 @@
 #import <UIKit/UIKit.h>
+#import "RNNRootViewProtocol.h"
 
-@interface RNNNavigationController : UINavigationController
+@interface RNNNavigationController : UINavigationController <RNNRootViewProtocol>
 
 @end

lib/ios/RNNNavigationController.m

@@ -7,4 +7,8 @@
 	return self.viewControllers.lastObject.supportedInterfaceOrientations;
 }
 
+- (BOOL)isAnimated {
+	return NO;
+}
+
 @end

lib/ios/RNNNavigationStackManager.h

@@ -5,12 +5,12 @@
 @interface RNNNavigationStackManager : NSObject
 
 @property (nonatomic, strong) UIViewController* fromVC;
-@property (nonatomic, strong) RNNRootViewController* toVC;
+@property (nonatomic, strong) UIViewController<RNNRootViewProtocol>* toVC;
 @property (nonatomic) int loadCount;
 -(instancetype)initWithStore:(RNNStore*)store;
 
 
--(void)push:(UIViewController*)newTop onTop:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion;
+-(void)push:(UIViewController<RNNRootViewProtocol>*)newTop onTop:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion;
 -(void)pop:(NSString*)containerId withAnimationData:(NSDictionary*)animationData;
 -(void)popTo:(NSString*)containerId;
 -(void)popToRoot:(NSString*)containerId;

lib/ios/RNNNavigationStackManager.m

@@ -15,19 +15,18 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	return self;
 }
 
--(void)push:(UIViewController *)newTop onTop:(NSString *)containerId completion:(RNNTransitionCompletionBlock)completion {
+-(void)push:(UIViewController<RNNRootViewProtocol> *)newTop onTop:(NSString *)containerId completion:(RNNTransitionCompletionBlock)completion {
 	UIViewController *vc = [_store findContainerForId:containerId];
 	[self preparePush:newTop onTopVC:vc completion:completion];
 	[self waitForContentToAppearAndThen:@selector(pushAfterLoad:)];
 }
 
--(void)preparePush:(UIViewController *)newTop onTopVC:(UIViewController*)vc completion:(RNNTransitionCompletionBlock)completion {
-	self.toVC = (RNNRootViewController*)newTop;
+-(void)preparePush:(UIViewController<RNNRootViewProtocol> *)newTop onTopVC:(UIViewController*)vc completion:(RNNTransitionCompletionBlock)completion {
+	self.toVC = newTop;
 	self.fromVC = vc;
 	
 	if (self.toVC.isAnimated) {
-		RNNRootViewController* newTopRootView = (RNNRootViewController*)newTop;
-		vc.navigationController.delegate = newTopRootView;
+		vc.navigationController.delegate = newTop;
 	} else {
 		vc.navigationController.delegate = nil;
 		self.fromVC.navigationController.interactivePopGestureRecognizer.delegate = nil;

lib/ios/RNNRootViewController.h

@@ -6,8 +6,10 @@
 #import "RNNEventEmitter.h"
 #import "RNNNavigationOptions.h"
 #import "RNNAnimator.h"
+#import "RNNRootViewProtocol.h"
+
+@interface RNNRootViewController : UIViewController	<RNNRootViewProtocol>
 
-@interface RNNRootViewController : UIViewController	<UINavigationControllerDelegate>
 @property (nonatomic, strong) RNNNavigationOptions* navigationOptions;
 @property (nonatomic, strong) RNNAnimator* animator;
 @property (nonatomic, strong) RNNEventEmitter *eventEmitter;
@@ -22,7 +24,6 @@
 
 
 -(void)applyNavigationButtons;
--(BOOL)isAnimated;
 -(void)applyTabBarItem;
 
 @end

lib/ios/RNNRootViewProtocol.h

@@ -0,0 +1,10 @@
+
+@protocol RNNRootViewProtocol <NSObject, UINavigationControllerDelegate>
+
+@required
+
+- (BOOL)isAnimated;
+
+@end
+
+

lib/ios/RNNSideMenuChildVC.h

@@ -7,6 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "RNNRootViewProtocol.h"
 
 typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 	RNNSideMenuChildTypeCenter,
@@ -15,7 +16,7 @@ typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
 };
 
 
-@interface RNNSideMenuChildVC : UIViewController
+@interface RNNSideMenuChildVC : UIViewController <RNNRootViewProtocol>
 
 @property (readonly) RNNSideMenuChildType type;
 @property (readonly) UIViewController *child;

lib/ios/RNNSideMenuChildVC.m

@@ -33,4 +33,8 @@
 	return self;
 }
 
+- (BOOL)isAnimated {
+	return NO;
+}
+
 @end

lib/ios/RNNSideMenuController.h

@@ -9,8 +9,9 @@
 #import <UIKit/UIKit.h>
 #import "RNNSideMenuChildVC.h"
 #import "MMDrawerController.h"
+#import "RNNRootViewProtocol.h"
 
-@interface RNNSideMenuController : UIViewController
+@interface RNNSideMenuController : UIViewController <RNNRootViewProtocol>
 
 @property (readonly) RNNSideMenuChildVC *center;
 @property (readonly) RNNSideMenuChildVC *left;

lib/ios/RNNSideMenuController.m

@@ -72,4 +72,8 @@
 	}
 }
 
+- (BOOL)isAnimated {
+	return NO;
+}
+
 @end

lib/ios/RNNTabBarController.h

@@ -1,7 +1,8 @@
 
 #import <UIKit/UIKit.h>
+#import "RNNRootViewProtocol.h"
 
-@interface RNNTabBarController : UITabBarController
+@interface RNNTabBarController : UITabBarController <RNNRootViewProtocol>
 
 - (void)setTabBarHidden:(BOOL)hidden animated:(BOOL)animated;
 - (void)setSelectedIndexByContainerID:(NSString *)containerID;

lib/ios/RNNTabBarController.m

@@ -33,4 +33,8 @@
 	}
 }
 
+- (BOOL)isAnimated {
+	return NO;
+}
+
 @end

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -57,6 +57,7 @@
 		268692831E5054F800E2C612 /* RNNStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 268692811E5054F800E2C612 /* RNNStore.m */; };
 		26916C981E4B9E7700D13680 /* RNNReactRootViewCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = 26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */; };
 		26916C991E4B9E7700D13680 /* RNNReactRootViewCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */; };
+		507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */; };
 		50CB3B691FDE911400AA153B /* RNNSideMenuOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */; };
 		50CB3B6A1FDE911400AA153B /* RNNSideMenuOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */; };
 		50EB93411FE14A3E00BD8EEE /* RNNTabItemOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50EB933F1FE14A3E00BD8EEE /* RNNTabItemOptions.h */; };
@@ -207,6 +208,7 @@
 		26916C941E4B9CCC00D13680 /* RNNRootViewCreator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNRootViewCreator.h; sourceTree = "<group>"; };
 		26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNReactRootViewCreator.h; sourceTree = "<group>"; };
 		26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNReactRootViewCreator.m; sourceTree = "<group>"; };
+		507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNRootViewProtocol.h; sourceTree = "<group>"; };
 		50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuOptions.h; sourceTree = "<group>"; };
 		50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuOptions.m; sourceTree = "<group>"; };
 		50EB933F1FE14A3E00BD8EEE /* RNNTabItemOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTabItemOptions.h; sourceTree = "<group>"; };
@@ -438,6 +440,7 @@
 				A7626C001FC5796200492FB8 /* RNNTabBarOptions.m */,
 				50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */,
 				50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */,
+				507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -607,6 +610,7 @@
 				268692821E5054F800E2C612 /* RNNStore.h in Headers */,
 				E8AEDB3C1F55A1C2000F5A6A /* RNNElementView.h in Headers */,
 				E8E518321F83B3E0000467AC /* RNNUtils.h in Headers */,
+				507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */,
 				263905CA1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.h in Headers */,
 				263905B11E4C6F440023D7D3 /* MMDrawerController.h in Headers */,
 				50EB93411FE14A3E00BD8EEE /* RNNTabItemOptions.h in Headers */,

lib/src/params/containers/Container.js

@@ -5,6 +5,7 @@ class Container {
    * @property {string} name The container's registered name
    * @property {Container[]} [topTabs]
    * @property {object} [passProps] props
+   * @property {object} [customTransition]
    * @property {NavigationOptions} navigationOptions
    */
   constructor(params) {
@@ -14,6 +15,7 @@ class Container {
       this.topTabs = params.topTabs;
     }
     this.passProps = params.passProps;
+    this.customTransition = params.customTransition;
     this.navigationOptions = params.navigationOptions && new NavigationOptions(params.navigationOptions);
   }
 }