e2e

ios/RNNBridgeModule.m

@@ -1,6 +1,7 @@
 #import "RNNBridgeModule.h"
 #import "RNNStore.h"
-#import "RCTRootView.h"
+
+#import "RNNControllerFactory.h"
 
 @implementation RNNBridgeModule
 
@@ -13,13 +14,17 @@ RCT_EXPORT_MODULE(NativeNavigation);
 
 RCT_EXPORT_METHOD(startApp:(NSDictionary*)layout)
 {
-    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:RNNStore.sharedInstance.bridge moduleName:@"com.example.WelcomeScreen" initialProperties:@[@{@"containerId": @"123"}]];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        
+        RCTBridge* bridge = RNNStore.sharedInstance.bridge;
+        
+        RNNStore.appDelegate.window.rootViewController = [RNNControllerFactory createRootViewController:layout];
+        [RNNStore.appDelegate.window makeKeyAndVisible];
+    });
+    
+    
     
-    UIViewController* controller = [UIViewController new];
-    controller.view = reactView;
-
-    RNNStore.appDelegate.window.rootViewController = controller;
-    [RNNStore.appDelegate.window makeKeyAndVisible];
 }
 
 @end
+

ios/RNNCommandsHandler.h

@@ -0,0 +1,7 @@
+
+#import <Foundation/Foundation.h>
+
+@interface RNNCommandsHandler : NSObject
+
+
+@end

ios/RNNCommandsHandler.m

@@ -0,0 +1,6 @@
+
+#import "RNNCommandsHandler.h"
+
+@implementation RNNCommandsHandler
+
+@end

ios/RNNControllerFactory.h

@@ -0,0 +1,9 @@
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface RNNControllerFactory : NSObject
+
++(UIViewController*)createRootViewController:(NSDictionary*)layout;
+
+@end

ios/RNNControllerFactory.m

@@ -0,0 +1,21 @@
+
+#import "RNNControllerFactory.h"
+
+#import "RNNStore.h"
+#import "RCTRootView.h"
+
+@implementation RNNControllerFactory
+
++(UIViewController *)createRootViewController:(NSDictionary *)layout
+{
+    NSString* containerName = layout[@"container"][@"name"];
+    NSString* containerId = layout[@"container"][@"id"];
+    
+    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:RNNStore.sharedInstance.bridge moduleName:containerName initialProperties:@{@"containerId": containerId}];
+    
+    UIViewController* controller = [UIViewController new];
+    controller.view = reactView;
+    return controller;
+}
+
+@end

ios/RNNSplashScreen.h

@@ -2,6 +2,6 @@
 
 @interface RNNSplashScreen : NSObject
 
--(void)showSplashScreen;
++(void)showSplashScreenWhileLoadingJS;
 
 @end

ios/RNNSplashScreen.m

@@ -4,7 +4,7 @@
 
 @implementation RNNSplashScreen
 
--(void)showSplashScreen
++(void)showSplashScreenWhileLoadingJS
 {
     CGRect screenBounds = [UIScreen mainScreen].bounds;
     UIView *splashView = nil;
@@ -70,7 +70,6 @@
         appDelegate.window.rootViewController = splashVC;
         [appDelegate.window makeKeyAndVisible];
     }
-    
 }
 
 @end

ios/ReactNativeNavigation.m

@@ -2,6 +2,8 @@
 #import "ReactNativeNavigation.h"
 #import "RNNStore.h"
 #import "RCTBridge.h"
+#import "RNNSplashScreen.h"
+#import "RCTRootView.h";
 
 @implementation ReactNativeNavigation
 
@@ -12,11 +14,15 @@
 
 +(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions
 {
-    RNNStore.appDelegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    RNNStore.appDelegate.window.backgroundColor = [UIColor whiteColor];
     
-    RCTBridge* bridge = [[RCTBridge alloc] initWithBundleURL:jsCodeLocation moduleProvider:nil launchOptions:launchOptions];
-    RNNStore.sharedInstance.bridge = bridge;
+        RNNStore.appDelegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+        RNNStore.appDelegate.window.backgroundColor = [UIColor whiteColor];
+        
+        [RNNSplashScreen showSplashScreenWhileLoadingJS];
+        
+        RNNStore.sharedInstance.bridge = [[RCTBridge alloc] initWithBundleURL:jsCodeLocation moduleProvider:nil launchOptions:launchOptions];
+        
+    
 }
 
 @end

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -17,6 +17,8 @@
 		7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BA500771E254908001B9E1B /* RNNSplashScreen.m */; };
 		7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */; };
 		7BBFE5611E253F97002A6182 /* RNNStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BBFE5601E253F97002A6182 /* RNNStore.m */; };
+		7BC9346B1E267BAD00EFA125 /* RNNCommandsHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC9346A1E267BAD00EFA125 /* RNNCommandsHandler.m */; };
+		7BC9346E1E26886E00EFA125 /* RNNControllerFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */; };
 		CC84A19E1C1A0C4E00B3A6A2 /* RCCManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CC84A1941C1A0C4E00B3A6A2 /* RCCManager.m */; };
 		CC84A19F1C1A0C4E00B3A6A2 /* RCCManagerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = CC84A1961C1A0C4E00B3A6A2 /* RCCManagerModule.m */; };
 		CC84A1A01C1A0C4E00B3A6A2 /* RCCNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC84A1981C1A0C4E00B3A6A2 /* RCCNavigationController.m */; };
@@ -76,6 +78,10 @@
 		7BBFE5431E25330E002A6182 /* RNNBridgeModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNBridgeModule.m; sourceTree = "<group>"; };
 		7BBFE55F1E253F97002A6182 /* RNNStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNStore.h; sourceTree = "<group>"; };
 		7BBFE5601E253F97002A6182 /* RNNStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNStore.m; sourceTree = "<group>"; };
+		7BC934691E267BAD00EFA125 /* RNNCommandsHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNCommandsHandler.h; sourceTree = "<group>"; };
+		7BC9346A1E267BAD00EFA125 /* RNNCommandsHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNCommandsHandler.m; sourceTree = "<group>"; };
+		7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNControllerFactory.h; sourceTree = "<group>"; };
+		7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNControllerFactory.m; sourceTree = "<group>"; };
 		CC84A1931C1A0C4E00B3A6A2 /* RCCManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCManager.h; sourceTree = "<group>"; };
 		CC84A1941C1A0C4E00B3A6A2 /* RCCManager.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = RCCManager.m; sourceTree = "<group>"; tabWidth = 2; };
 		CC84A1951C1A0C4E00B3A6A2 /* RCCManagerModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCCManagerModule.h; sourceTree = "<group>"; };
@@ -251,6 +257,10 @@
 		D8AFADB41BEE6F3F00A4592D = {
 			isa = PBXGroup;
 			children = (
+				7BC9346C1E26886E00EFA125 /* RNNControllerFactory.h */,
+				7BC9346D1E26886E00EFA125 /* RNNControllerFactory.m */,
+				7BC934691E267BAD00EFA125 /* RNNCommandsHandler.h */,
+				7BC9346A1E267BAD00EFA125 /* RNNCommandsHandler.m */,
 				7BA500731E2544B9001B9E1B /* ReactNativeNavigation.h */,
 				7BA500741E2544B9001B9E1B /* ReactNativeNavigation.m */,
 				7BA500761E254908001B9E1B /* RNNSplashScreen.h */,
@@ -355,6 +365,7 @@
 				D85082FC1CBCF8A800FDB961 /* MMDrawerBarButtonItem.m in Sources */,
 				D85083001CBCF8A800FDB961 /* UIViewController+MMDrawerController.m in Sources */,
 				D85082FF1CBCF8A800FDB961 /* MMExampleDrawerVisualStateManager.m in Sources */,
+				7BC9346B1E267BAD00EFA125 /* RNNCommandsHandler.m in Sources */,
 				D85082E61CBCF54200FDB961 /* SidebarFeedlyAnimation.m in Sources */,
 				CC84A1A11C1A0C4E00B3A6A2 /* RCCTabBarController.m in Sources */,
 				D85082E71CBCF54200FDB961 /* SidebarFlipboardAnimation.m in Sources */,
@@ -369,6 +380,7 @@
 				D85082FE1CBCF8A800FDB961 /* MMDrawerVisualState.m in Sources */,
 				7BBFE5611E253F97002A6182 /* RNNStore.m in Sources */,
 				D85082FD1CBCF8A800FDB961 /* MMDrawerController.m in Sources */,
+				7BC9346E1E26886E00EFA125 /* RNNControllerFactory.m in Sources */,
 				D85082E41CBCF54200FDB961 /* SidebarAnimation.m in Sources */,
 				D8E11C571CBD1F670018B644 /* RCCDrawerController.m in Sources */,
 				2636176F1E12722900D88A13 /* RNNTabBarController.m in Sources */,

playground/e2e/app.test.js

@@ -3,7 +3,8 @@ describe('app', () => {
     global.simulator.relaunchApp(done);
   });
 
-  it('shows welcome screen', () => {
+  it('shows welcome screen', (done) => {
     expect(element(by.label('React Native Navigation!'))).toBeVisible();
+    done();
   });
 });

playground/ios/playground.xcodeproj/project.pbxproj

@@ -7,24 +7,25 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
-		00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
-		00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
-		00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
-		00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
+		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
+		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
+		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
+		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
+		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
 		00E356F31AD99517003FC87E /* playgroundTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* playgroundTests.m */; };
-		133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
-		139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
-		139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
+		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
+		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
+		139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		146834051AC3E58100842450 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
+		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
 		2636F1CD1E11309B007ABB09 /* RNNViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2636F1CC1E11309B007ABB09 /* RNNViewControllerTests.m */; };
-		2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
-		7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
-		832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
+		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
+		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
+		7BC934871E268CF600EFA125 /* RNNControllerFactoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BC934861E268CF600EFA125 /* RNNControllerFactoryTest.m */; };
+		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -200,6 +201,7 @@
 		2647D6591DB175B300B23722 /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = "../node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj"; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		7B9B395C1DEB4076004A6281 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
+		7BC934861E268CF600EFA125 /* RNNControllerFactoryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNControllerFactoryTest.m; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -215,18 +217,18 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */,
-				2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */,
-				146834051AC3E58100842450 /* ReferenceProxy in Frameworks */,
-				00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
-				00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
-				00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
-				133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */,
-				00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
-				139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */,
-				832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */,
-				00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
-				139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */,
+				7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */,
+				2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */,
+				146834051AC3E58100842450 /* libReact.a in Frameworks */,
+				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
+				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
+				00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
+				133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
+				00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
+				139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
+				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
+				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
+				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -280,6 +282,7 @@
 			children = (
 				00E356F21AD99517003FC87E /* playgroundTests.m */,
 				2636F1CC1E11309B007ABB09 /* RNNViewControllerTests.m */,
+				7BC934861E268CF600EFA125 /* RNNControllerFactoryTest.m */,
 				00E356F01AD99517003FC87E /* Supporting Files */,
 			);
 			path = playgroundTests;
@@ -735,6 +738,7 @@
 			files = (
 				00E356F31AD99517003FC87E /* playgroundTests.m in Sources */,
 				2636F1CD1E11309B007ABB09 /* RNNViewControllerTests.m in Sources */,
+				7BC934871E268CF600EFA125 /* RNNControllerFactoryTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

playground/ios/playgroundTests/RNNControllerFactoryTest.m

@@ -0,0 +1,32 @@
+
+#import <XCTest/XCTest.h>
+#import "RNNControllerFactory.h"
+#import "RCTRootView.h"
+
+@interface RNNControllerFactoryTest : XCTestCase
+
+@end
+
+@implementation RNNControllerFactoryTest
+
+- (void)setUp {
+    [super setUp];
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+- (void)testExample {
+  NSDictionary* layout = @{
+                           @"container": @{
+                               @"name": @"myName",
+                               @"id": @"my-id"
+                               }
+                           };
+  UIViewController* rootViewController = [RNNControllerFactory createRootViewController:layout];
+  XCTAssert([((RCTRootView*)rootViewController.view).moduleName isEqualToString:@"myName"]);
+}
+
+@end

playground/ios/playgroundTests/RNNViewControllerTests.m

@@ -1,114 +1,114 @@
+////
+////  RNNViewControllerTests.m
+////
+////  Created by Ran Greenberg on 26/12/2016.
+////  Copyright © 2016 Facebook. All rights reserved.
+////
 //
-//  RNNViewControllerTests.m
-//
-//  Created by Ran Greenberg on 26/12/2016.
-//  Copyright © 2016 Facebook. All rights reserved.
-//
-
-#import <XCTest/XCTest.h>
-#import "RCCManager.h"
-#import "RNNViewController.h"
-#import "MMDrawerController.h"
-
-#define COMMAND_SINGLE_SCREEN_APP               @"singleScreenApp"
-#define COMMAND_TAB_BASED_APP                   @"tabBasedApp"
-#define COMMAND_SINGLE_WITH_LEFT_SIDE_MENU      @"singleWithLeftSideMenu"
-#define COMMAND_SINGLE_WITH_RIGHT_SIDE_MENU     @"singleWithRightSideMenu"
-#define COMMAND_SINGLE_WITH_BOTH_SIDE_MENU      @"singleWithBothMenus"
-#define COMMAND_TAB_BASED_WITH_SIDE_MENT        @"tabBasedWithSideMenu"
-
-
-@interface RNNViewControllerTests : XCTestCase
-@property (nonatomic, strong) RCTBridge *bridge;
-@property (nonatomic, strong) NSDictionary *jsonCommands;
-@end
-
-@implementation RNNViewControllerTests
-
-- (void)setUp {
-  [super setUp];
-  // Put setup code here. This method is called before the invocation of each test method in the class.
-  self.bridge = [[RCCManager sharedInstance] getBridge];
-  self.jsonCommands = [self loadCommandsJsonAsDictionary];
-}
-
-- (void)tearDown {
-  // Put teardown code here. This method is called after the invocation of each test method in the class.
-  self.bridge = nil;
-  self.jsonCommands = nil;
-  [super tearDown];
-}
-
--(NSDictionary*)loadCommandsJsonAsDictionary {
-  NSString *filePath = [[NSBundle mainBundle] pathForResource:@"commands" ofType:@"json"];
-  NSData *data = [NSData dataWithContentsOfFile:filePath];
-  NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
-  return json;
-}
-
-- (void)testWrongSyntax {
-  
-  NSDictionary *layout = @{@"key": @"com.example.FirstTabScreen"};
-  id vc = [RNNViewController controllerWithLayout:layout bridge:self.bridge];
-  XCTAssertNil(vc);
-}
-
--(void)testSingleScreenApp {
-  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_SCREEN_APP] bridge:self.bridge];
-  XCTAssertTrue([vc isKindOfClass:[UINavigationController class]]);
-}
-
--(void)testTabBasedApp {
-  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_TAB_BASED_APP] bridge:self.bridge];
-  XCTAssertTrue([vc isKindOfClass:[UITabBarController class]]);
-  UITabBarController *tabsController = (UITabBarController*)vc;
-  for (id tab in tabsController.viewControllers) {
-    XCTAssertTrue([tab isKindOfClass:[UINavigationController class]]);
-  }
-}
-
--(void)testSingleWithLeftSideMenu {
-  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_LEFT_SIDE_MENU] bridge:self.bridge];
-  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
-  MMDrawerController *sideMenuLeft = (MMDrawerController*)vc;
-  XCTAssertNotNil(sideMenuLeft.leftDrawerViewController);
-  XCTAssertNotNil(sideMenuLeft.centerViewController);
-  XCTAssertNil(sideMenuLeft.rightDrawerViewController);
-}
-
--(void)testSingleWithRightSideMenu {
-  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_RIGHT_SIDE_MENU] bridge:self.bridge];
-  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
-  MMDrawerController *sideMenuRight = (MMDrawerController*)vc;
-  XCTAssertNil(sideMenuRight.leftDrawerViewController);
-  XCTAssertNotNil(sideMenuRight.centerViewController);
-  XCTAssertNotNil(sideMenuRight.rightDrawerViewController);
-
-}
-
--(void)testSingleWithBothSideMenu {
-  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_BOTH_SIDE_MENU] bridge:self.bridge];
-  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
-  MMDrawerController *sideMenuBoth = (MMDrawerController*)vc;
-  XCTAssertNotNil(sideMenuBoth.leftDrawerViewController);
-  XCTAssertNotNil(sideMenuBoth.centerViewController);
-  XCTAssertNotNil(sideMenuBoth.rightDrawerViewController);
-}
-
--(void)testTabBasedWithBothSideMenu {
-  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_TAB_BASED_WITH_SIDE_MENT] bridge:self.bridge];
-  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
-  MMDrawerController *sideMenuBothWithTabs = (MMDrawerController*)vc;
-  XCTAssertNotNil(sideMenuBothWithTabs.leftDrawerViewController);
-  XCTAssertNotNil(sideMenuBothWithTabs.centerViewController);
-  XCTAssertNotNil(sideMenuBothWithTabs.rightDrawerViewController);
-  XCTAssertTrue([sideMenuBothWithTabs.centerViewController isKindOfClass:[UITabBarController class]]);
-}
-//- (void)testPerformanceExample {
-//  // This is an example of a performance test case.
-//  [self measureBlock:^{
-//    // Put the code you want to measure the time of here.
-//  }];
+//#import <XCTest/XCTest.h>
+//#import "RCCManager.h"
+//#import "RNNViewController.h"
+//#import "MMDrawerController.h"
+//
+//#define COMMAND_SINGLE_SCREEN_APP               @"singleScreenApp"
+//#define COMMAND_TAB_BASED_APP                   @"tabBasedApp"
+//#define COMMAND_SINGLE_WITH_LEFT_SIDE_MENU      @"singleWithLeftSideMenu"
+//#define COMMAND_SINGLE_WITH_RIGHT_SIDE_MENU     @"singleWithRightSideMenu"
+//#define COMMAND_SINGLE_WITH_BOTH_SIDE_MENU      @"singleWithBothMenus"
+//#define COMMAND_TAB_BASED_WITH_SIDE_MENT        @"tabBasedWithSideMenu"
+//
+//
+//@interface RNNViewControllerTests : XCTestCase
+//@property (nonatomic, strong) RCTBridge *bridge;
+//@property (nonatomic, strong) NSDictionary *jsonCommands;
+//@end
+//
+//@implementation RNNViewControllerTests
+//
+//- (void)setUp {
+//  [super setUp];
+//  // Put setup code here. This method is called before the invocation of each test method in the class.
+//  self.bridge = [[RCCManager sharedInstance] getBridge];
+//  self.jsonCommands = [self loadCommandsJsonAsDictionary];
+//}
+//
+//- (void)tearDown {
+//  // Put teardown code here. This method is called after the invocation of each test method in the class.
+//  self.bridge = nil;
+//  self.jsonCommands = nil;
+//  [super tearDown];
+//}
+//
+//-(NSDictionary*)loadCommandsJsonAsDictionary {
+//  NSString *filePath = [[NSBundle mainBundle] pathForResource:@"commands" ofType:@"json"];
+//  NSData *data = [NSData dataWithContentsOfFile:filePath];
+//  NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil];
+//  return json;
+//}
+//
+//- (void)testWrongSyntax {
+//  
+//  NSDictionary *layout = @{@"key": @"com.example.FirstTabScreen"};
+//  id vc = [RNNViewController controllerWithLayout:layout bridge:self.bridge];
+//  XCTAssertNil(vc);
+//}
+//
+//-(void)testSingleScreenApp {
+//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_SCREEN_APP] bridge:self.bridge];
+//  XCTAssertTrue([vc isKindOfClass:[UINavigationController class]]);
 //}
-
-@end
+//
+//-(void)testTabBasedApp {
+//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_TAB_BASED_APP] bridge:self.bridge];
+//  XCTAssertTrue([vc isKindOfClass:[UITabBarController class]]);
+//  UITabBarController *tabsController = (UITabBarController*)vc;
+//  for (id tab in tabsController.viewControllers) {
+//    XCTAssertTrue([tab isKindOfClass:[UINavigationController class]]);
+//  }
+//}
+//
+//-(void)testSingleWithLeftSideMenu {
+//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_LEFT_SIDE_MENU] bridge:self.bridge];
+//  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
+//  MMDrawerController *sideMenuLeft = (MMDrawerController*)vc;
+//  XCTAssertNotNil(sideMenuLeft.leftDrawerViewController);
+//  XCTAssertNotNil(sideMenuLeft.centerViewController);
+//  XCTAssertNil(sideMenuLeft.rightDrawerViewController);
+//}
+//
+//-(void)testSingleWithRightSideMenu {
+//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_RIGHT_SIDE_MENU] bridge:self.bridge];
+//  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
+//  MMDrawerController *sideMenuRight = (MMDrawerController*)vc;
+//  XCTAssertNil(sideMenuRight.leftDrawerViewController);
+//  XCTAssertNotNil(sideMenuRight.centerViewController);
+//  XCTAssertNotNil(sideMenuRight.rightDrawerViewController);
+//
+//}
+//
+//-(void)testSingleWithBothSideMenu {
+//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_SINGLE_WITH_BOTH_SIDE_MENU] bridge:self.bridge];
+//  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
+//  MMDrawerController *sideMenuBoth = (MMDrawerController*)vc;
+//  XCTAssertNotNil(sideMenuBoth.leftDrawerViewController);
+//  XCTAssertNotNil(sideMenuBoth.centerViewController);
+//  XCTAssertNotNil(sideMenuBoth.rightDrawerViewController);
+//}
+//
+//-(void)testTabBasedWithBothSideMenu {
+//  id vc = [RNNViewController controllerWithLayout:self.jsonCommands[COMMAND_TAB_BASED_WITH_SIDE_MENT] bridge:self.bridge];
+//  XCTAssertTrue([vc isKindOfClass:[MMDrawerController class]]);
+//  MMDrawerController *sideMenuBothWithTabs = (MMDrawerController*)vc;
+//  XCTAssertNotNil(sideMenuBothWithTabs.leftDrawerViewController);
+//  XCTAssertNotNil(sideMenuBothWithTabs.centerViewController);
+//  XCTAssertNotNil(sideMenuBothWithTabs.rightDrawerViewController);
+//  XCTAssertTrue([sideMenuBothWithTabs.centerViewController isKindOfClass:[UITabBarController class]]);
+//}
+////- (void)testPerformanceExample {
+////  // This is an example of a performance test case.
+////  [self measureBlock:^{
+////    // Put the code you want to measure the time of here.
+////  }];
+////}
+//
+//@end

playground/package.json

@@ -24,7 +24,7 @@
       "sessionId": "playground"
     },
     "ios-simulator": {
-      "app": "ios/DerivedData/playground/Build/Products/Release_Detox-iphonesimulator/playground.app",
+      "app": "ios/DerivedData/playground/Build/Products/Debug_Detox-iphonesimulator/playground.app",
       "device": "iPhone 7, iOS 10.2"
     }
   },

playground/scripts/e2e.ios.js

@@ -15,10 +15,11 @@ function kill(process) {
 function buildProjForDetox() {
   exec(`RCT_NO_LAUNCH_PACKAGER=true \
           cd ios && xcodebuild \
-            -scheme playground_release_Detox build \
+            -scheme playground_Detox build \
             -project playground.xcodeproj \
             -sdk iphonesimulator \
-            -derivedDataPath ./DerivedData/playground`);
+            -derivedDataPath ./DerivedData/playground \
+            GCC_PREPROCESSOR_DEFINITIONS="DEBUG=1 RCT_DEBUG=1 RCT_DEV=1 RCT_NSASSERT=1"`);
 }
 
 function e2e() {
@@ -28,8 +29,8 @@ function e2e() {
     exec(`BABEL_ENV=test ./node_modules/mocha/bin/mocha e2e --recursive --compilers js:babel-register`);
   } finally {
     kill(`detox-server`);
-    kill(`Simulator`);
-    kill(`CoreSimulator`);
+    //kill(`Simulator`);
+    //kill(`CoreSimulator`);
     exec(`cat ./detox-server.log`);
     exec(`rm -f ./detox-server.log`);
     exec(`sleep 5`);

playground/src/app.js

@@ -31,7 +31,7 @@ export function start() {
   Navigation.registerContainer(`com.example.WelcomeScreen`, () => WelcomeScreen);
   Navigation.startApp({
     container: {
-      key: 'com.example.WelcomeScreen'
+      name: 'com.example.WelcomeScreen'
     }
   });
 }

src/Navigation.js

@@ -1,8 +1,8 @@
 import * as ContainerRegistry from './containers/ContainerRegistry';
 import * as Commands from './commands/Commands';
 
-export function registerContainer(containerKey, getContainerFunc) {
-  ContainerRegistry.registerContainer(containerKey, getContainerFunc);
+export function registerContainer(containerName, getContainerFunc) {
+  ContainerRegistry.registerContainer(containerName, getContainerFunc);
 }
 
 export function startApp(params) {

src/Navigation.test.js

@@ -33,9 +33,9 @@ describe('Navigation', () => {
   it('registerContainer delegates to ContainerRegistry', () => {
     expect(ContainerRegistry.registerContainer).not.toHaveBeenCalled();
     const fn = jest.fn();
-    Navigation.registerContainer('key', fn);
+    Navigation.registerContainer('name', fn);
     expect(ContainerRegistry.registerContainer).toHaveBeenCalledTimes(1);
-    expect(ContainerRegistry.registerContainer).toHaveBeenCalledWith('key', fn);
+    expect(ContainerRegistry.registerContainer).toHaveBeenCalledWith('name', fn);
   });
 
   it('startApp delegates to Commands', () => {

src/commands/Commands.test.js

@@ -14,7 +14,7 @@ describe('Commands', () => {
     it('sends startApp to native', () => {
       uut.startApp({
         container: {
-          key: 'com.example.MyScreen'
+          name: 'com.example.MyScreen'
         }
       });
       expect(mockNativeNavigation.startApp).toHaveBeenCalledTimes(1);

src/commands/LayoutBuilder.test.js

@@ -16,11 +16,11 @@ describe('LayoutBuilder', () => {
     it('adds uniqueId to passed container', () => {
       expect(LayoutBuilder.parse({
         container: {
-          key: 'com.example.MyScreen'
+          name: 'com.example.MyScreen'
         }
       })).toEqual({
         container: {
-          key: 'com.example.MyScreen',
+          name: 'com.example.MyScreen',
           id: 'containerUNIQUE'
         }
       });
@@ -29,28 +29,28 @@ describe('LayoutBuilder', () => {
     it('adds uniqueId to passed sideMenu', () => {
       expect(LayoutBuilder.parse({
         container: {
-          key: 'com.example.MyScreen'
+          name: 'com.example.MyScreen'
         },
         sideMenu: {
           left: {
-            key: 'com.example.SideMenu1'
+            name: 'com.example.SideMenu1'
           },
           right: {
-            key: 'com.example.SideMenu2'
+            name: 'com.example.SideMenu2'
           }
         }
       })).toEqual({
         container: {
-          key: 'com.example.MyScreen',
+          name: 'com.example.MyScreen',
           id: 'containerUNIQUE'
         },
         sideMenu: {
           left: {
-            key: 'com.example.SideMenu1',
+            name: 'com.example.SideMenu1',
             id: 'containerUNIQUE'
           },
           right: {
-            key: 'com.example.SideMenu2',
+            name: 'com.example.SideMenu2',
             id: 'containerUNIQUE'
           }
         }
@@ -62,56 +62,56 @@ describe('LayoutBuilder', () => {
         tabs: [
           {
             container: {
-              key: 'com.example.FirstTab'
+              name: 'com.example.FirstTab'
             }
           },
           {
             container: {
-              key: 'com.example.SecondTab'
+              name: 'com.example.SecondTab'
             }
           },
           {
             container: {
-              key: 'com.example.FirstTab'
+              name: 'com.example.FirstTab'
             }
           }
         ],
         sideMenu: {
           left: {
-            key: 'com.example.Menu1'
+            name: 'com.example.Menu1'
           },
           right: {
-            key: 'com.example.Menu2'
+            name: 'com.example.Menu2'
           }
         }
       })).toEqual({
         tabs: [
           {
             container: {
-              key: 'com.example.FirstTab',
+              name: 'com.example.FirstTab',
               id: 'containerUNIQUE'
             }
           },
           {
             container: {
-              key: 'com.example.SecondTab',
+              name: 'com.example.SecondTab',
               id: 'containerUNIQUE'
             }
           },
           {
             container: {
-              key: 'com.example.FirstTab',
+              name: 'com.example.FirstTab',
               id: 'containerUNIQUE'
             }
           }
         ],
         sideMenu: {
           left: {
-            key: 'com.example.Menu1',
+            name: 'com.example.Menu1',
             id: 'containerUNIQUE'
           },
           right: {
-            key: 'com.example.Menu2',
+            name: 'com.example.Menu2',
             id: 'containerUNIQUE'
           }
         }

src/commands/ValidCommands.js

@@ -1,6 +1,6 @@
 export const singleScreenApp = {
   container: {
-    key: 'com.example.MyScreen'
+    name: 'com.example.MyScreen'
   }
 };
 
@@ -8,17 +8,17 @@ export const tabBasedApp = {
   tabs: [
     {
       container: {
-        key: 'com.example.FirstTab'
+        name: 'com.example.FirstTab'
       }
     },
     {
       container: {
-        key: 'com.example.SecondTab'
+        name: 'com.example.SecondTab'
       }
     },
     {
       container: {
-        key: 'com.example.FirstTab'
+        name: 'com.example.FirstTab'
       }
     }
   ]
@@ -26,36 +26,38 @@ export const tabBasedApp = {
 
 export const singleWithSideMenu = {
   container: {
-    key: 'com.example.MyScreen'
+    name: 'com.example.MyScreen'
   },
   sideMenu: {
     left: {
-      key: 'com.example.Menu'
+      container: {
+        name: 'com.example.MyScreen'
+      }
     }
   }
 };
 
 export const singleWithRightSideMenu = {
   container: {
-    key: 'com.example.MyScreen'
+    name: 'com.example.MyScreen'
   },
   sideMenu: {
     right: {
-      key: 'com.example.Menu'
+      name: 'com.example.Menu'
     }
   }
 };
 
 export const singleWithBothMenus = {
   container: {
-    key: 'com.example.MyScreen'
+    name: 'com.example.MyScreen'
   },
   sideMenu: {
     left: {
-      key: 'com.example.Menu1'
+      name: 'com.example.Menu1'
     },
     right: {
-      key: 'com.example.Menu2'
+      name: 'com.example.Menu2'
     }
   }
 };
@@ -64,26 +66,26 @@ export const tabBasedWithSideMenu = {
   tabs: [
     {
       container: {
-        key: 'com.example.FirstTab'
+        name: 'com.example.FirstTab'
       }
     },
     {
       container: {
-        key: 'com.example.SecondTab'
+        name: 'com.example.SecondTab'
       }
     },
     {
       container: {
-        key: 'com.example.FirstTab'
+        name: 'com.example.FirstTab'
       }
     }
   ],
   sideMenu: {
     left: {
-      key: 'com.example.Menu1'
+      name: 'com.example.Menu1'
     },
     right: {
-      key: 'com.example.Menu2'
+      name: 'com.example.Menu2'
     }
   }
 };

src/containers/ContainerRegistry.js

@@ -2,19 +2,19 @@ import React, {Component} from 'react';
 import {AppRegistry} from 'react-native';
 import * as Store from './Store';
 
-export function registerContainer(containerKey, getContainerFunc) {
+export function registerContainer(containerName, getContainerFunc) {
   const OriginalContainer = getContainerFunc();
-  const NavigationContainer = wrapContainer(containerKey, OriginalContainer);
-  Store.setContainerClass(containerKey, NavigationContainer);
-  AppRegistry.registerComponent(containerKey, () => NavigationContainer);
+  const NavigationContainer = wrapContainer(containerName, OriginalContainer);
+  Store.setContainerClass(containerName, NavigationContainer);
+  AppRegistry.registerComponent(containerName, () => NavigationContainer);
 }
 
-function wrapContainer(containerKey, OriginalContainer) {
+function wrapContainer(containerName, OriginalContainer) {
   return class extends Component {
     constructor(props) {
       super(props);
       if (!props.containerId) {
-        throw new Error(`Container ${containerKey} does not have a containerId!`);
+        throw new Error(`Container ${containerName} does not have a containerId!`);
       }
       this.state = {
         containerId: props.containerId,

src/containers/ContainerRegistry.test.js

@@ -45,15 +45,15 @@ describe('ContainerRegistry', () => {
       AppRegistry.registerComponent = jest.fn(AppRegistry.registerComponent);
     });
 
-    it('registers container component by containerKey into AppRegistry', () => {
+    it('registers container component by containerName into AppRegistry', () => {
       expect(AppRegistry.registerComponent).not.toHaveBeenCalled();
-      uut.registerContainer('example.MyContainer.key', () => MyContainer);
+      uut.registerContainer('example.MyContainer.name', () => MyContainer);
       expect(AppRegistry.registerComponent).toHaveBeenCalledTimes(1);
-      expect(AppRegistry.registerComponent.mock.calls[0][0]).toEqual('example.MyContainer.key');
+      expect(AppRegistry.registerComponent.mock.calls[0][0]).toEqual('example.MyContainer.name');
     });
 
     it('resulting in a normal component', () => {
-      uut.registerContainer('example.MyContainer.key', () => MyContainer);
+      uut.registerContainer('example.MyContainer.name', () => MyContainer);
       const Container = AppRegistry.registerComponent.mock.calls[0][1]();
       const tree = renderer.create(<Container containerId="123"/>);
       expect(tree.toJSON().children).toEqual(['Hello, World!']);
@@ -61,21 +61,21 @@ describe('ContainerRegistry', () => {
   });
 
   describe('NavigationContainer wrapping passed container', () => {
-    const containerKey = 'example.MyContainer';
+    const containerName = 'example.MyContainer';
 
     beforeEach(() => {
-      uut.registerContainer(containerKey, () => MyContainer);
+      uut.registerContainer(containerName, () => MyContainer);
     });
 
     it('must have containerId as prop', () => {
-      const NavigationContainer = store.getContainerClass(containerKey);
+      const NavigationContainer = store.getContainerClass(containerName);
       expect(() => {
         renderer.create(<NavigationContainer/>);
       }).toThrow(new Error('Container example.MyContainer does not have a containerId!'));
     });
 
     it('wraps the container and saves to store', () => {
-      const NavigationContainer = store.getContainerClass(containerKey);
+      const NavigationContainer = store.getContainerClass(containerName);
       expect(NavigationContainer).not.toBeInstanceOf(MyContainer);
       const tree = renderer.create(<NavigationContainer containerId={'container1'}/>);
       expect(tree.toJSON().children).toEqual(['Hello, World!']);
@@ -83,13 +83,13 @@ describe('ContainerRegistry', () => {
     });
 
     it('injects props from wrapper into original container', () => {
-      const NavigationContainer = store.getContainerClass(containerKey);
+      const NavigationContainer = store.getContainerClass(containerName);
       renderer.create(<NavigationContainer containerId={'container1'} myProp={'yo'}/>);
       expect(myContainerRef.props.myProp).toEqual('yo');
     });
 
     it('updates props from wrapper into original container', () => {
-      const NavigationContainer = store.getContainerClass(containerKey);
+      const NavigationContainer = store.getContainerClass(containerName);
       renderer.create(<TestParent ChildClass={NavigationContainer}/>);
       expect(myContainerRef.props.foo).toEqual(undefined);
       testParentRef.setState({propsFromState: {foo: 'yo'}});
@@ -98,13 +98,13 @@ describe('ContainerRegistry', () => {
 
     it('pulls props from the PropsStore and injects them into the inner container', () => {
       store.setPropsForContainerId('container123', {numberProp: 1, stringProp: 'hello', objectProp: {a: 2}});
-      const NavigationContainer = store.getContainerClass(containerKey);
+      const NavigationContainer = store.getContainerClass(containerName);
       renderer.create(<NavigationContainer containerId={'container123'}/>);
       expect(myContainerRef.props).toEqual({containerId: 'container123', numberProp: 1, stringProp: 'hello', objectProp: {a: 2}});
     });
 
     it('updates props from PropsStore into inner container', () => {
-      const NavigationContainer = store.getContainerClass(containerKey);
+      const NavigationContainer = store.getContainerClass(containerName);
       renderer.create(<TestParent ChildClass={NavigationContainer}/>);
       store.setPropsForContainerId('container1', {myProp: 'hello'});
       expect(myContainerRef.props.foo).toEqual(undefined);
@@ -115,7 +115,7 @@ describe('ContainerRegistry', () => {
     });
 
     it('protects containerId from change', () => {
-      const NavigationContainer = store.getContainerClass(containerKey);
+      const NavigationContainer = store.getContainerClass(containerName);
       renderer.create(<TestParent ChildClass={NavigationContainer}/>);
       expect(myContainerRef.props.containerId).toEqual('container1');
       testParentRef.setState({propsFromState: {containerId: 'ERROR'}});

src/containers/Store.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 
 const state = {
   propsByContainerId: {},
-  containersByKey: {}
+  containersByName: {}
 };
 
 export function setPropsForContainerId(containerId, props) {
@@ -13,10 +13,10 @@ export function getPropsForContainerId(containerId) {
   return _.get(state.propsByContainerId, containerId, {});
 }
 
-export function setContainerClass(containerKey, ContainerClass) {
-  state.containersByKey[containerKey] = ContainerClass;
+export function setContainerClass(containerName, ContainerClass) {
+  state.containersByName[containerName] = ContainerClass;
 }
 
-export function getContainerClass(containerKey) {
-  return state.containersByKey[containerKey];
+export function getContainerClass(containerName) {
+  return state.containersByName[containerName];
 }

src/containers/Store.test.js

@@ -20,12 +20,12 @@ describe('Store', () => {
     expect(uut.getPropsForContainerId('container1')).toEqual({});
   });
 
-  it('holds containers classes by containerKey', () => {
+  it('holds containers classes by containerName', () => {
     const MyComponent = class {
       //
     };
-    uut.setContainerClass('example.mykey', MyComponent);
-    expect(uut.getContainerClass('example.mykey')).toEqual(MyComponent);
+    uut.setContainerClass('example.mycontainer', MyComponent);
+    expect(uut.getContainerClass('example.mycontainer')).toEqual(MyComponent);
   });
 });
 

src/index.js

@@ -1,4 +1,4 @@
-import * as _Navigation from './Navigation';
+import * as Navigation from './Navigation';
 
-export default _Navigation;
-export const Navigation = _Navigation;
+module.exports = Navigation;
+module.exports.default = Navigation;

src/index.test.js

@@ -1,16 +1,14 @@
 import Navigation from './index';
-import {Navigation as inner} from './index';
 
 describe('index', () => {
   let uut;
 
   beforeEach(() => {
-    uut = require('./index').default;
+    uut = require('./index');
   });
 
-  it('exposes Navigation as default or as object', () => {
+  it('exposes Navigation', () => {
     expect(uut.startApp).toBeInstanceOf(Function);
     expect(Navigation.startApp).toBeInstanceOf(Function);
-    expect(inner.startApp).toBeInstanceOf(Function);
   });
 });