added side menu that works!

ios/RNNBridgeModule.m

@@ -17,7 +17,11 @@ RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout)
 {
 	[self assertReady];
 	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new]];
-	UIApplication.sharedApplication.delegate.window.rootViewController = [factory createLayout:layout];
+	UIViewController *vc = [factory createLayout:layout];
+//	if([vc isKindOfClass:[RNNSideMenuController class]]) {
+//		vc = ((RNNSideMenuController*)vc).sideMenu;
+//	}
+	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
 	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
 }
 

ios/RNNControllerFactory.m

@@ -52,14 +52,14 @@
 	}
 	
 	else if (node.isSideMenuCenter) {
-		return [self createSideMenuCenter:node];
+		return [self createSideMenuChild:node type:RNNSideMenuChildTypeCenter];
 	}
 	
 	else if (node.isSideMenuLeft) {
-		return [self createSideMenuLeft:node];
+		return [self createSideMenuChild:node type:RNNSideMenuChildTypeLeft];
 	}
 	else if (node.isSideMenuRight) {
-		return [self createSideMenuRight:node];
+		return [self createSideMenuChild:node type:RNNSideMenuChildTypeRight];
 	}
 	
 	@throw [NSException exceptionWithName:@"UnknownControllerType" reason:[@"Unknown controller type " stringByAppendingString:node.type] userInfo:nil];
@@ -101,34 +101,7 @@
 }
 
 -(UIViewController*)createSideMenu:(RNNLayoutNode*)node
-{
-	//	NSArray *childern = node.children;
-	//	id center, left, right;
-	
-	//	for (NSDictionary *child in childern) {
-	//		RNNLayoutNode *childNode = [RNNLayoutNode create:child];
-	//		UIViewController *vc = [self fromTree:child];
-	//
-	//		if ([childNode isSideMenuLeft]) {
-	//			left = vc;
-	//		}
-	//		else if ([childNode isSideMenuCenter]) {
-	//			center = vc;
-	//		}
-	//		else if ([childNode isSideMenuRight]) {
-	//			right = [self fromTree:child];
-	//		}
-	//		else {
-	//			@throw [NSException exceptionWithName:@"UnknownSideMenuType" reason:[@"Unknown side menu type for side menu root node " stringByAppendingString:childNode.type] userInfo:nil];
-	//		}
-	//	}
-	
-	//	if (!center) {
-	//		@throw [NSException exceptionWithName:@"WrongSideMenuDefinition" reason:@"Side menu without center is illigal" userInfo:nil];
-	//	}
-	//
-	//	MMDrawerController *sideMenu = [[MMDrawerController alloc] initWithCenterViewController:center leftDrawerViewController:left rightDrawerViewController:right];
-	
+{	
 	NSMutableArray* childrenVCs = [NSMutableArray new];
 	
 	
@@ -142,28 +115,14 @@
 }
 
 
--(UIViewController*)createSideMenuCenter:(RNNLayoutNode*)node {
-	UIViewController* child = [self fromTree:node.children[0]];
-	RNNSideMenuChildVC *center = [[RNNSideMenuChildVC alloc] initWithChild: child type:RNNSideMenuChildTypeCenter];
-	
-	return center;
-}
-
-
--(UIViewController*)createSideMenuLeft:(RNNLayoutNode*)node {
+-(UIViewController*)createSideMenuChild:(RNNLayoutNode*)node type:(RNNSideMenuChildType)type {
 	UIViewController* child = [self fromTree:node.children[0]];
-	RNNSideMenuChildVC *left = [[RNNSideMenuChildVC alloc] initWithChild: child type:RNNSideMenuChildTypeLeft];
+	RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc] initWithChild: child type:type];
 	
-	return left;
+	return sideMenuChild;
 }
 
 
--(UIViewController*)createSideMenuRight:(RNNLayoutNode*)node {
-	UIViewController* child = [self fromTree:node.children[0]];
-	RNNSideMenuChildVC *right = [[RNNSideMenuChildVC alloc] initWithChild: child type:RNNSideMenuChildTypeRight];
-	
-	return right;
-}
 
 
 @end

ios/RNNSideMenu/MMDrawerController/MMDrawerController.m

@@ -1526,4 +1526,4 @@ static inline CGFloat originXForDrawerOriginAndTargetOriginOffset(CGFloat origin
     return (CGRectContainsPoint(rightBezelRect, point) &&
             [self isPointContainedWithinCenterViewContentRect:point]);
 }
-@end
+@end

ios/RNNSideMenuChildVC.m

@@ -21,6 +21,13 @@
 	self = [super init];
 	
 	self.child = child;
+	[self addChildViewController:self.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;

ios/RNNSideMenuController.h

@@ -8,12 +8,14 @@
 
 #import <UIKit/UIKit.h>
 #import "RNNSideMenuChildVC.h"
+#import "MMDrawerController.h"
 
 @interface RNNSideMenuController : UIViewController
 
 @property (readonly) RNNSideMenuChildVC *center;
 @property (readonly) RNNSideMenuChildVC *left;
 @property (readonly) RNNSideMenuChildVC *right;
+@property (readonly) MMDrawerController *sideMenu;
 
 -(instancetype)initWithControllers:(NSArray*)controllers;
 

ios/RNNSideMenuController.m

@@ -8,23 +8,36 @@
 
 #import "RNNSideMenuController.h"
 #import "RNNSideMenuChildVC.h"
+#import "MMDrawerController.h"
 
 @interface RNNSideMenuController ()
 
 @property (readwrite) RNNSideMenuChildVC *center;
 @property (readwrite) RNNSideMenuChildVC *left;
 @property (readwrite) RNNSideMenuChildVC *right;
+@property (readwrite) MMDrawerController *sideMenu;
 
 @end
 
 @implementation RNNSideMenuController
 
 -(instancetype)initWithControllers:(NSArray*)controllers;
- {
+{
 	self = [super init];
-
-	 [self setControllers:controllers];
-	 
+	
+	[self setControllers:controllers];
+	
+	self.sideMenu = [[MMDrawerController alloc] initWithCenterViewController:self.center leftDrawerViewController:self.left rightDrawerViewController:self.right];
+	
+	self.sideMenu.openDrawerGestureModeMask = MMOpenDrawerGestureModeAll;
+	self.sideMenu.closeDrawerGestureModeMask = MMOpenDrawerGestureModeAll;
+	
+	[self addChildViewController:self.sideMenu];
+	[self.sideMenu.view setFrame:self.view.bounds];
+	[self.view addSubview:self.sideMenu.view];
+	[self.view bringSubviewToFront:self.sideMenu.view];
+	
+	
 	return self;
 }
 
@@ -44,7 +57,7 @@
 				self.right = child;
 			}
 		}
-
+		
 		else {
 			@throw [NSException exceptionWithName:@"UnknownSideMenuControllerType" reason:[@"Unknown side menu type " stringByAppendingString:[controller description]] userInfo:nil];
 		}

playground/e2e/app.test.js

@@ -18,9 +18,9 @@ describe('app', () => {
     expect(elementByLabel('Pushed screen')).toBeVisible();
   });
 
-  xit('switch to tabs with side menus', () => {
-    elementByLabel('Switch to tab based app with side menus').tap();
-    elementByLabel('Switch to tab based app with side menus').swipeRight();
+  it('switch to tabs with side menus', () => {
+    elementByLabel('Switch to app with side menus').tap();
+    elementByLabel('This is a side menu center screen').swipe('right');
     expect(elementByLabel('This is a side menu screen')).toBeVisible();
   });
 

playground/ios/playgroundTests/RNNControllerFactoryTest.m

@@ -100,34 +100,35 @@
 
 
 - (void)testCreateLayout_ContainerSideMenuLayoutCenterLeftRight {
-	RNNSideMenuController *ans = (RNNSideMenuController*) [self.factory createLayout:@{@"id": @"cntId",
-																					   @"type": @"SideMenuRoot",
-																					   @"data": @{},
-																					   @"children": @[
-																							   @{@"id": @"cntI_2",
-																								 @"type": @"SideMenuCenter",
-																								 @"data": @{},
-																								 @"children": @[
-																										 @{@"id": @"cntId_3",
-																										   @"type": @"Container",
-																										   @"data": @{},
-																										   @"children": @[]}]},
-																							   @{@"id": @"cntI_4",
-																								 @"type": @"SideMenuLeft",
-																								 @"data": @{},
-																								 @"children": @[
-																										 @{@"id": @"cntId_5",
-																										   @"type": @"Container",
-																										   @"data": @{},
-																										   @"children": @[]}]},
-																							   @{@"id": @"cntI_6",
-																								 @"type": @"SideMenuRight",
-																								 @"data": @{},
-																								 @"children": @[
-																										 @{@"id": @"cntId_5",
-																										   @"type": @"Container",
-																										   @"data": @{},
-																										   @"children": @[]}]}]}];
+	RNNSideMenuController *ans = (RNNSideMenuController*) [self.factory createLayout:
+														   @{@"id": @"cntId",
+															 @"type": @"SideMenuRoot",
+															 @"data": @{},
+															 @"children": @[
+																	 @{@"id": @"cntI_2",
+																	   @"type": @"SideMenuCenter",
+																	   @"data": @{},
+																	   @"children": @[
+																			   @{@"id": @"cntId_3",
+																				 @"type": @"Container",
+																				 @"data": @{},
+																				 @"children": @[]}]},
+																	 @{@"id": @"cntI_4",
+																	   @"type": @"SideMenuLeft",
+																	   @"data": @{},
+																	   @"children": @[
+																			   @{@"id": @"cntId_5",
+																				 @"type": @"Container",
+																				 @"data": @{},
+																				 @"children": @[]}]},
+																	 @{@"id": @"cntI_6",
+																	   @"type": @"SideMenuRight",
+																	   @"data": @{},
+																	   @"children": @[
+																			   @{@"id": @"cntId_5",
+																				 @"type": @"Container",
+																				 @"data": @{},
+																				 @"children": @[]}]}]}];
 	XCTAssertTrue([ans isMemberOfClass:[RNNSideMenuController class]]);
 	XCTAssertTrue([ans isKindOfClass:[UIViewController class]]);
 	XCTAssertTrue([ans.center isMemberOfClass:[RNNSideMenuChildVC class]]);
@@ -144,6 +145,50 @@
 	XCTAssertTrue([right.child isMemberOfClass:[RNNRootViewController class]]);
 }
 
+- (void)testCreateLayout_ContainerSideMenuLayoutCenterTabBar {
+	RNNSideMenuController *ans = (RNNSideMenuController*) [self.factory createLayout:
+														   @{@"id": @"cntId",
+															 @"type": @"SideMenuRoot",
+															 @"data": @{},
+															 @"children": @[
+																	 @{@"id": @"cntI_2",
+																	   @"type": @"SideMenuCenter",
+																	   @"data": @{},
+																	   @"children": @[
+																			   @{@"id": @"cntId_3",
+																				 @"type": @"BottomTabs",
+																				 @"data": @{},
+																				 @"children": @[
+																						 @{@"id": @"cntId_4",
+																						   @"type": @"ContainerStack",
+																						   @"data": @{},
+																						   @"children": @[
+																								   @{@"id": @"cntId_2",
+																									 @"type": @"Container",
+																									 @"data": @{},
+																									 @"children": @[]}]}]}]}]}
+														   ];
+	
+	XCTAssertTrue([ans isMemberOfClass:[RNNSideMenuController class]]);
+	XCTAssertTrue([ans isKindOfClass:[UIViewController class]]);
+	XCTAssertTrue([ans.center isMemberOfClass:[RNNSideMenuChildVC class]]);
+	
+	RNNSideMenuChildVC *center = (RNNSideMenuChildVC*)ans.center;
+	XCTAssertTrue(center.type == RNNSideMenuChildTypeCenter);
+	XCTAssertTrue([center.child isMemberOfClass:[UITabBarController class]]);
+	
+	UITabBarController *tabbBar = (UITabBarController*)center.child;
+	XCTAssertTrue(tabbBar.viewControllers.count == 1);
+	
+	UINavigationController *navController = (UINavigationController*)(tabbBar.viewControllers[0]);
+	XCTAssertTrue([navController isMemberOfClass:[UINavigationController class]]);
+	XCTAssertTrue(navController.viewControllers.count == 1);
+	
+	RNNRootViewController *rootViewController = (RNNRootViewController*)navController.viewControllers[0];
+	XCTAssertTrue([rootViewController isMemberOfClass:[RNNRootViewController class]]);
+	
+}
+
 
 
 @end

playground/src/containers/WelcomeScreen.js

@@ -51,7 +51,10 @@ class WelcomeScreen extends Component {
       tabs: [
         {
           container: {
-            name: 'navigation.playground.SimpleScreen'
+            name: 'navigation.playground.SimpleScreen',
+            passProps: {
+              text: 'This is a side menu center screen'
+            }
           }
         },
         {
@@ -68,7 +71,10 @@ class WelcomeScreen extends Component {
       sideMenu: {
         left: {
           container: {
-            name: 'navigation.playground.SimpleScreen'
+            name: 'navigation.playground.SimpleScreen',
+            passProps: {
+              text: 'This is a side menu screen'
+            }
           }
         },
         right: {