iOS - refactoring side menu

ios/RNNControllerFactory.h

@@ -4,9 +4,7 @@
 #import "RNNRootViewCreator.h"
 #import "RNNRootViewController.h"
 #import "RNNSideMenuController.h"
-#import "RNNSideMenuCenterVC.h"
-#import "RNNSideMenuLeftVC.h"
-#import "RNNSideMenuRightVC.h"
+#import "RNNSideMenuChildVC.h"
 
 @interface RNNControllerFactory : NSObject
 

ios/RNNControllerFactory.m

@@ -141,25 +141,28 @@
 	return sideMenu;
 }
 
+
 -(UIViewController*)createSideMenuCenter:(RNNLayoutNode*)node {
 	UIViewController* child = [self fromTree:node.children[0]];
-	RNNSideMenuCenterVC *center = [[RNNSideMenuCenterVC alloc] initWithChild: child];
+	RNNSideMenuChildVC *center = [[RNNSideMenuChildVC alloc] initWithChild: child type:RNNSideMenuChildTypeCenter];
+	
 	return center;
 }
 
+
 -(UIViewController*)createSideMenuLeft:(RNNLayoutNode*)node {
 	UIViewController* child = [self fromTree:node.children[0]];
-	RNNSideMenuLeftVC *left = [[RNNSideMenuLeftVC alloc] initWithChild:child];
+	RNNSideMenuChildVC *left = [[RNNSideMenuChildVC alloc] initWithChild: child type:RNNSideMenuChildTypeLeft];
 	
 	return left;
 }
 
+
 -(UIViewController*)createSideMenuRight:(RNNLayoutNode*)node {
 	UIViewController* child = [self fromTree:node.children[0]];
-	RNNSideMenuRightVC *right = [[RNNSideMenuRightVC alloc] initWithChild:child];
+	RNNSideMenuChildVC *right = [[RNNSideMenuChildVC alloc] initWithChild: child type:RNNSideMenuChildTypeRight];
 	
 	return right;
-
 }
 
 

ios/RNNSideMenuCenterVC.h

@@ -1,17 +0,0 @@
-//
-//  RNNSideMenuCenterVC.h
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 09/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface RNNSideMenuCenterVC : UIViewController
-
-@property (readonly) UIViewController* child;
-
--(instancetype)initWithChild:(UIViewController*)child;
-
-@end

ios/RNNSideMenuCenterVC.m

@@ -1,24 +0,0 @@
-//
-//  RNNSideMenuCenterVC.m
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 09/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
-#import "RNNSideMenuCenterVC.h"
-
-@interface RNNSideMenuCenterVC ()
-@property (readwrite) UIViewController* child;
-@end
-
-@implementation RNNSideMenuCenterVC
-
--(instancetype)initWithChild:(UIViewController *)child
-{
-	self = [super init];
-	self.child = child;
-	return self;
-}
-
-@end

ios/RNNSideMenuChildVC.h

@@ -0,0 +1,25 @@
+//
+//  RNNSideMenuChildVC.h
+//  ReactNativeNavigation
+//
+//  Created by Ran Greenberg on 09/02/2017.
+//  Copyright © 2017 Wix. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSInteger, RNNSideMenuChildType) {
+	RNNSideMenuChildTypeCenter,
+	RNNSideMenuChildTypeLeft,
+	RNNSideMenuChildTypeRight,
+};
+
+
+@interface RNNSideMenuChildVC : UIViewController
+
+@property (readonly) RNNSideMenuChildType type;
+@property (readonly) UIViewController *child;
+
+-(instancetype) initWithChild:(UIViewController*)child type:(RNNSideMenuChildType)type;
+
+@end

ios/RNNSideMenuChildVC.m

@@ -0,0 +1,29 @@
+//
+//  RNNSideMenuChildVC.m
+//  ReactNativeNavigation
+//
+//  Created by Ran Greenberg on 09/02/2017.
+//  Copyright © 2017 Wix. All rights reserved.
+//
+
+#import "RNNSideMenuChildVC.h"
+
+@interface RNNSideMenuChildVC ()
+
+@property (readwrite) RNNSideMenuChildType type;
+@property (readwrite) UIViewController *child;
+
+@end
+
+@implementation RNNSideMenuChildVC
+
+-(instancetype) initWithChild:(UIViewController*)child type:(RNNSideMenuChildType)type {
+	self = [super init];
+	
+	self.child = child;
+	self.type = type;
+	
+	return self;
+}
+
+@end

ios/RNNSideMenuController.h

@@ -7,15 +7,13 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "RNNSideMenuCenterVC.h"
-#import "RNNSideMenuLeftVC.h"
-#import "RNNSideMenuRightVC.h"
+#import "RNNSideMenuChildVC.h"
 
 @interface RNNSideMenuController : UIViewController
 
-@property (readonly) RNNSideMenuCenterVC *center;
-@property (readonly) RNNSideMenuLeftVC *left;
-@property (readonly) RNNSideMenuRightVC *right;
+@property (readonly) RNNSideMenuChildVC *center;
+@property (readonly) RNNSideMenuChildVC *left;
+@property (readonly) RNNSideMenuChildVC *right;
 
 -(instancetype)initWithControllers:(NSArray*)controllers;
 

ios/RNNSideMenuController.m

@@ -7,13 +7,13 @@
 //
 
 #import "RNNSideMenuController.h"
-#import "RNNSideMenuCenterVC.h"
+#import "RNNSideMenuChildVC.h"
 
 @interface RNNSideMenuController ()
 
-@property (readwrite) RNNSideMenuCenterVC *center;
-@property (readwrite) RNNSideMenuLeftVC *left;
-@property (readwrite) RNNSideMenuRightVC *right;
+@property (readwrite) RNNSideMenuChildVC *center;
+@property (readwrite) RNNSideMenuChildVC *left;
+@property (readwrite) RNNSideMenuChildVC *right;
 
 @end
 
@@ -31,15 +31,20 @@
 -(void)setControllers:(NSArray*)controllers {
 	for (id controller in controllers) {
 		
-		if ([controller isKindOfClass:[RNNSideMenuCenterVC class]]) {
-			self.center = controller;
-		}
-		else if ([controller isKindOfClass:[RNNSideMenuLeftVC class]]){
-			self.left = controller;
-		}
-		else if ([controller isKindOfClass:[RNNSideMenuRightVC class]]) {
-			self.right = controller;
+		if ([controller isKindOfClass:[RNNSideMenuChildVC class]]) {
+			RNNSideMenuChildVC *child = (RNNSideMenuChildVC*)controller;
+			
+			if (child.type == RNNSideMenuChildTypeCenter) {
+				self.center = child;
+			}
+			else if(child.type == RNNSideMenuChildTypeLeft) {
+				self.left = child;
+			}
+			else if(child.type == RNNSideMenuChildTypeRight) {
+				self.right = child;
+			}
 		}
+
 		else {
 			@throw [NSException exceptionWithName:@"UnknownSideMenuControllerType" reason:[@"Unknown side menu type " stringByAppendingString:[controller description]] userInfo:nil];
 		}

ios/RNNSideMenuLeftVC.h

@@ -1,17 +0,0 @@
-//
-//  RNNSideMenuLeftVC.h
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 09/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface RNNSideMenuLeftVC : UIViewController
-
-@property (readonly) UIViewController* child;
-
--(instancetype)initWithChild:(UIViewController*)child;
-
-@end

ios/RNNSideMenuLeftVC.m

@@ -1,28 +0,0 @@
-//
-//  RNNSideMenuLeftVC.m
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 09/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
-#import "RNNSideMenuLeftVC.h"
-
-@interface RNNSideMenuLeftVC ()
-
-@property (readwrite) UIViewController *child;
-
-@end
-
-@implementation RNNSideMenuLeftVC
-
-
--(instancetype)initWithChild:(UIViewController*)child {
-	self = [super init];
-	self.child = child;
-	
-	return self;
-}
-
-
-@end

ios/RNNSideMenuRightVC.h

@@ -1,17 +0,0 @@
-//
-//  RNNSideMenuRightVC.h
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 09/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface RNNSideMenuRightVC : UIViewController
-
-@property (readonly) UIViewController *child;
-
--(instancetype)initWithChild:(UIViewController*)child;
-
-@end

ios/RNNSideMenuRightVC.m

@@ -1,26 +0,0 @@
-//
-//  RNNSideMenuRightVC.m
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 09/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
-
-#import "RNNSideMenuRightVC.h"
-
-@interface RNNSideMenuRightVC ()
-
-@property (readwrite) UIViewController *child;
-
-@end
-
-@implementation RNNSideMenuRightVC
-
-
--(instancetype)initWithChild:(UIViewController*)child {
-	self = [super init];
-	self.child = child;
-	return self;
-}
-
-@end

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -43,12 +43,8 @@
 		263905CF1E4C6F440023D7D3 /* TheSidebarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263905AD1E4C6F440023D7D3 /* TheSidebarController.m */; };
 		263905D61E4C94970023D7D3 /* RNNSideMenuController.h in Headers */ = {isa = PBXBuildFile; fileRef = 263905D41E4C94970023D7D3 /* RNNSideMenuController.h */; };
 		263905D71E4C94970023D7D3 /* RNNSideMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263905D51E4C94970023D7D3 /* RNNSideMenuController.m */; };
-		263905DA1E4C99C70023D7D3 /* RNNSideMenuCenterVC.h in Headers */ = {isa = PBXBuildFile; fileRef = 263905D81E4C99C70023D7D3 /* RNNSideMenuCenterVC.h */; };
-		263905DB1E4C99C70023D7D3 /* RNNSideMenuCenterVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 263905D91E4C99C70023D7D3 /* RNNSideMenuCenterVC.m */; };
-		263905DE1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.h in Headers */ = {isa = PBXBuildFile; fileRef = 263905DC1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.h */; };
-		263905DF1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 263905DD1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.m */; };
-		263905E21E4CA8C70023D7D3 /* RNNSideMenuRightVC.h in Headers */ = {isa = PBXBuildFile; fileRef = 263905E01E4CA8C70023D7D3 /* RNNSideMenuRightVC.h */; };
-		263905E31E4CA8C70023D7D3 /* RNNSideMenuRightVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 263905E11E4CA8C70023D7D3 /* RNNSideMenuRightVC.m */; };
+		263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */ = {isa = PBXBuildFile; fileRef = 263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */; };
+		263905E71E4CAC950023D7D3 /* RNNSideMenuChildVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 263905E51E4CAC950023D7D3 /* RNNSideMenuChildVC.m */; };
 		26916C981E4B9E7700D13680 /* RNNReactRootViewCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = 26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */; };
 		26916C991E4B9E7700D13680 /* RNNReactRootViewCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */; };
 		7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B11269F1E2D263F00F9B03B /* RNNEventEmitter.m */; };
@@ -118,12 +114,8 @@
 		263905AD1E4C6F440023D7D3 /* TheSidebarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TheSidebarController.m; sourceTree = "<group>"; };
 		263905D41E4C94970023D7D3 /* RNNSideMenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuController.h; sourceTree = "<group>"; };
 		263905D51E4C94970023D7D3 /* RNNSideMenuController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuController.m; sourceTree = "<group>"; };
-		263905D81E4C99C70023D7D3 /* RNNSideMenuCenterVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuCenterVC.h; sourceTree = "<group>"; };
-		263905D91E4C99C70023D7D3 /* RNNSideMenuCenterVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuCenterVC.m; sourceTree = "<group>"; };
-		263905DC1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuLeftVC.h; sourceTree = "<group>"; };
-		263905DD1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuLeftVC.m; sourceTree = "<group>"; };
-		263905E01E4CA8C70023D7D3 /* RNNSideMenuRightVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuRightVC.h; sourceTree = "<group>"; };
-		263905E11E4CA8C70023D7D3 /* RNNSideMenuRightVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuRightVC.m; sourceTree = "<group>"; };
+		263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuChildVC.h; sourceTree = "<group>"; };
+		263905E51E4CAC950023D7D3 /* RNNSideMenuChildVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuChildVC.m; sourceTree = "<group>"; };
 		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>"; };
@@ -238,12 +230,8 @@
 				7BEF0D171E437684003E96B0 /* RNNRootViewController.m */,
 				263905D41E4C94970023D7D3 /* RNNSideMenuController.h */,
 				263905D51E4C94970023D7D3 /* RNNSideMenuController.m */,
-				263905D81E4C99C70023D7D3 /* RNNSideMenuCenterVC.h */,
-				263905D91E4C99C70023D7D3 /* RNNSideMenuCenterVC.m */,
-				263905E01E4CA8C70023D7D3 /* RNNSideMenuRightVC.h */,
-				263905E11E4CA8C70023D7D3 /* RNNSideMenuRightVC.m */,
-				263905DC1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.h */,
-				263905DD1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.m */,
+				263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */,
+				263905E51E4CAC950023D7D3 /* RNNSideMenuChildVC.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -294,7 +282,6 @@
 				26916C981E4B9E7700D13680 /* RNNReactRootViewCreator.h in Headers */,
 				263905B01E4C6F440023D7D3 /* MMDrawerController+Subclass.h in Headers */,
 				7B1126A41E2D2B6C00F9B03B /* ReactNativeNavigation.h in Headers */,
-				263905DE1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.h in Headers */,
 				263905B71E4C6F440023D7D3 /* UIViewController+MMDrawerController.h in Headers */,
 				263905BB1E4C6F440023D7D3 /* RCCDrawerHelper.h in Headers */,
 				263905CC1E4C6F440023D7D3 /* SidebarWunderlistAnimation.h in Headers */,
@@ -306,17 +293,16 @@
 				7B1126A31E2D2B6C00F9B03B /* RNNSplashScreen.h in Headers */,
 				7B1126A51E2D2B6C00F9B03B /* RNN.h in Headers */,
 				263905C01E4C6F440023D7D3 /* SidebarAirbnbAnimation.h in Headers */,
+				263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */,
 				263905C41E4C6F440023D7D3 /* SidebarFacebookAnimation.h in Headers */,
 				7BEF0D181E437684003E96B0 /* RNNRootViewController.h in Headers */,
 				7B1126A61E2D2B6C00F9B03B /* RNNBridgeModule.h in Headers */,
-				263905DA1E4C99C70023D7D3 /* RNNSideMenuCenterVC.h in Headers */,
 				263905BE1E4C6F440023D7D3 /* RCCTheSideBarManagerViewController.h in Headers */,
 				263905CE1E4C6F440023D7D3 /* TheSidebarController.h in Headers */,
 				7B1126A71E2D2B6C00F9B03B /* RNNEventEmitter.h in Headers */,
 				263905CA1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.h in Headers */,
 				263905B11E4C6F440023D7D3 /* MMDrawerController.h in Headers */,
 				263905B91E4C6F440023D7D3 /* RCCDrawerController.h in Headers */,
-				263905E21E4CA8C70023D7D3 /* RNNSideMenuRightVC.h in Headers */,
 				263905B31E4C6F440023D7D3 /* MMDrawerVisualState.h in Headers */,
 				7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */,
 				263905D61E4C94970023D7D3 /* RNNSideMenuController.h in Headers */,
@@ -390,26 +376,24 @@
 				263905BF1E4C6F440023D7D3 /* RCCTheSideBarManagerViewController.m in Sources */,
 				7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */,
 				263905CB1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.m in Sources */,
+				263905E71E4CAC950023D7D3 /* RNNSideMenuChildVC.m in Sources */,
 				7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */,
 				263905B21E4C6F440023D7D3 /* MMDrawerController.m in Sources */,
 				7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */,
 				7BEF0D1D1E43771B003E96B0 /* RNNLayoutNode.m in Sources */,
 				7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */,
 				263905BA1E4C6F440023D7D3 /* RCCDrawerController.m in Sources */,
-				263905E31E4CA8C70023D7D3 /* RNNSideMenuRightVC.m in Sources */,
 				263905BC1E4C6F440023D7D3 /* RCCDrawerHelper.m in Sources */,
 				263905C11E4C6F440023D7D3 /* SidebarAirbnbAnimation.m in Sources */,
 				263905D71E4C94970023D7D3 /* RNNSideMenuController.m in Sources */,
 				26916C991E4B9E7700D13680 /* RNNReactRootViewCreator.m in Sources */,
 				263905B81E4C6F440023D7D3 /* UIViewController+MMDrawerController.m in Sources */,
-				263905DB1E4C99C70023D7D3 /* RNNSideMenuCenterVC.m in Sources */,
 				263905CD1E4C6F440023D7D3 /* SidebarWunderlistAnimation.m in Sources */,
 				263905CF1E4C6F440023D7D3 /* TheSidebarController.m in Sources */,
 				263905AF1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m in Sources */,
 				7BBFE5611E253F97002A6182 /* RNN.m in Sources */,
 				7BC9346E1E26886E00EFA125 /* RNNControllerFactory.m in Sources */,
 				263905B61E4C6F440023D7D3 /* MMExampleDrawerVisualStateManager.m in Sources */,
-				263905DF1E4CA5B70023D7D3 /* RNNSideMenuLeftVC.m in Sources */,
 				263905C91E4C6F440023D7D3 /* SidebarFlipboardAnimation.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

playground/ios/playgroundTests/RNNControllerFactoryTest.m

@@ -98,55 +98,6 @@
 	
 }
 
-- (void)testCreateLayout_ContainerSideMenuLayoutCenterOnly {
-	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": @[]}]}]}];
-	XCTAssertTrue([ans isMemberOfClass:[RNNSideMenuController class]]);
-	XCTAssertTrue([ans isKindOfClass:[UIViewController class]]);
-	XCTAssertTrue([ans.center isMemberOfClass:[RNNSideMenuCenterVC class]]);
-	XCTAssertTrue([ans.center.child isMemberOfClass:[RNNRootViewController class]]);
-}
-
-
-- (void)testCreateLayout_ContainerSideMenuLayoutCenterAndLeft {
-	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": @[]}]}]}];
-	XCTAssertTrue([ans isMemberOfClass:[RNNSideMenuController class]]);
-	XCTAssertTrue([ans isKindOfClass:[UIViewController class]]);
-	XCTAssertTrue([ans.center isMemberOfClass:[RNNSideMenuCenterVC class]]);
-	XCTAssertTrue([ans.center.child isMemberOfClass:[RNNRootViewController class]]);
-	XCTAssertTrue([ans.left isMemberOfClass:[RNNSideMenuLeftVC class]]);
-	
-	RNNSideMenuLeftVC *left = (RNNSideMenuLeftVC*)ans.left;
-	XCTAssertTrue([left.child isMemberOfClass:[RNNRootViewController class]]);
-}
 
 - (void)testCreateLayout_ContainerSideMenuLayoutCenterLeftRight {
 	RNNSideMenuController *ans = (RNNSideMenuController*) [self.factory createLayout:@{@"id": @"cntId",
@@ -179,15 +130,17 @@
 																										   @"children": @[]}]}]}];
 	XCTAssertTrue([ans isMemberOfClass:[RNNSideMenuController class]]);
 	XCTAssertTrue([ans isKindOfClass:[UIViewController class]]);
-	XCTAssertTrue([ans.center isMemberOfClass:[RNNSideMenuCenterVC class]]);
-	XCTAssertTrue([ans.center.child isMemberOfClass:[RNNRootViewController class]]);
-	XCTAssertTrue([ans.left isMemberOfClass:[RNNSideMenuLeftVC class]]);
+	XCTAssertTrue([ans.center isMemberOfClass:[RNNSideMenuChildVC class]]);
+	RNNSideMenuChildVC *center = (RNNSideMenuChildVC*)ans.center;
+	XCTAssertTrue(center.type == RNNSideMenuChildTypeCenter);
+	XCTAssertTrue([center.child isMemberOfClass:[RNNRootViewController class]]);
 	
-	RNNSideMenuLeftVC *left = (RNNSideMenuLeftVC*)ans.left;
+	RNNSideMenuChildVC *left = (RNNSideMenuChildVC*)ans.left;
+	XCTAssertTrue(left.type == RNNSideMenuChildTypeLeft);
 	XCTAssertTrue([left.child isMemberOfClass:[RNNRootViewController class]]);
 	
-	XCTAssertTrue([ans.right isMemberOfClass:[RNNSideMenuRightVC class]]);
-	RNNSideMenuRightVC *right = (RNNSideMenuRightVC*)ans.right;
+	RNNSideMenuChildVC *right = (RNNSideMenuChildVC*)ans.right;
+	XCTAssertTrue(right.type == RNNSideMenuChildTypeRight);
 	XCTAssertTrue([right.child isMemberOfClass:[RNNRootViewController class]]);
 }