add container store in order to support push

ios/RNN.h

@@ -4,12 +4,14 @@
 
 #import "RNNEventEmitter.h"
 #import "RCTBridge.h"
+#import "RNNStore.h"
 
 @interface RNN : NSObject
 
 @property (readonly) BOOL isReadyToReceiveCommands;
 @property (readonly) RCTBridge* bridge;
 @property (readonly) RNNEventEmitter* eventEmitter;
+@property (readonly) RNNStore *store;
 
 +(instancetype)instance;
 

ios/RNN.m

@@ -11,12 +11,16 @@
 @property (readwrite) BOOL isReadyToReceiveCommands;
 @property (readwrite) RNNEventEmitter* eventEmitter;
 
+@property (readwrite) RNNStore *store;
+
 @end
 
 @implementation RNN
 
+
 # pragma mark public
 
+
 +(instancetype)instance
 {
 	static RNN *sharedInstance = nil;
@@ -31,10 +35,13 @@
 	return sharedInstance;
 }
 
+
 -(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions
 {
 	self.eventEmitter = [RNNEventEmitter new];
 	
+	self.store = [RNNStore new];
+	
 	UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
 	UIApplication.sharedApplication.delegate.window.backgroundColor = [UIColor whiteColor];
 	
@@ -45,8 +52,10 @@
 	self.bridge = [[RCTBridge alloc] initWithBundleURL:jsCodeLocation moduleProvider:nil launchOptions:launchOptions];
 }
 
+
 # pragma mark private
 
+
 -(void)registerForJsEvents
 {
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptLoaded) name:RCTJavaScriptDidLoadNotification object:self.bridge];
@@ -57,15 +66,18 @@
 #pragma GCC diagnostic pop
 }
 
+
 -(void)onJavaScriptLoaded
 {
 	self.isReadyToReceiveCommands = true;
 	[self.eventEmitter sendOnAppLaunched];
 }
 
+
 -(void)onJavaScriptDevReload
 {
 	UIApplication.sharedApplication.delegate.window.rootViewController = nil;
 }
 
+
 @end

ios/RNNBridgeModule.m

@@ -3,6 +3,7 @@
 #import "RNN.h"
 #import "RNNControllerFactory.h"
 #import "RNNReactRootViewCreator.h"
+#import "RNNStore.h"
 
 @implementation RNNBridgeModule
 
@@ -16,8 +17,9 @@ RCT_EXPORT_MODULE();
 RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout)
 {
 	[self assertReady];
-	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new]];
+	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
 	UIViewController *vc = [factory createLayout:layout];
+	
 	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
 	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
 }
@@ -26,9 +28,11 @@ RCT_EXPORT_METHOD(push:(NSString*)containerId layout:(NSDictionary*)layout)
 {
 	[self assertReady];
 	//TODO implement correctly
-	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new]];
+	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
 	UIViewController *newVc = [factory createLayout:layout];
-	id vc = [UIApplication.sharedApplication.delegate.window.rootViewController childViewControllers][0];
+	
+	id vc = [[RNN instance].store findContainerForId:containerId];
+	
 	[[vc navigationController]pushViewController:newVc animated:true];
 }
 

ios/RNNControllerFactory.h

@@ -5,10 +5,11 @@
 #import "RNNRootViewController.h"
 #import "RNNSideMenuController.h"
 #import "RNNSideMenuChildVC.h"
+#import "RNNStore.h"
 
 @interface RNNControllerFactory : NSObject
 
--(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator;
+-(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator store:(RNNStore*)store;
 
 -(UIViewController*)createLayout:(NSDictionary*)layout;
 

ios/RNNControllerFactory.m

@@ -7,6 +7,7 @@
 @interface RNNControllerFactory ()
 
 @property (nonatomic, strong) id<RNNRootViewCreator> creator;
+@property (nonatomic, strong) RNNStore *store;
 
 @end
 
@@ -15,10 +16,11 @@
 # pragma mark public
 
 
--(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator {
+-(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator store:(RNNStore *)store {
 	
 	self = [super init];
 	self.creator = creator;
+	self.store = store;
 	
 	return self;
 }
@@ -34,35 +36,42 @@
 {
 	RNNLayoutNode* node = [RNNLayoutNode create:json];
 	
+	UIViewController* result;
+	
 	if ( node.isContainer) {
-		
-		return [self createContainer:node];
+		result = [self createContainer:node];
 	}
 	
 	else if (node.isContainerStack)	{
-		return [self createContainerStack:node];
+		result = [self createContainerStack:node];
 	}
 	
 	else if (node.isTabs) {
-		return [self createTabs:node];
+		result = [self createTabs:node];
 	}
 	
 	else if (node.isSideMenuRoot) {
-		return [self createSideMenu:node];
+		result = [self createSideMenu:node];
 	}
 	
 	else if (node.isSideMenuCenter) {
-		return [self createSideMenuChild:node type:RNNSideMenuChildTypeCenter];
+		result = [self createSideMenuChild:node type:RNNSideMenuChildTypeCenter];
 	}
 	
 	else if (node.isSideMenuLeft) {
-		return [self createSideMenuChild:node type:RNNSideMenuChildTypeLeft];
+		result = [self createSideMenuChild:node type:RNNSideMenuChildTypeLeft];
 	}
 	else if (node.isSideMenuRight) {
-		return [self createSideMenuChild:node type:RNNSideMenuChildTypeRight];
+		result = [self createSideMenuChild:node type:RNNSideMenuChildTypeRight];
+	}
+	
+	if (!result) {
+		@throw [NSException exceptionWithName:@"UnknownControllerType" reason:[@"Unknown controller type " stringByAppendingString:node.type] userInfo:nil];
 	}
+
+	[self.store setContainer:result containerId:node.nodeId];
 	
-	@throw [NSException exceptionWithName:@"UnknownControllerType" reason:[@"Unknown controller type " stringByAppendingString:node.type] userInfo:nil];
+	return result;
 }
 
 -(RNNRootViewController*)createContainer:(RNNLayoutNode*)node
@@ -101,7 +110,7 @@
 }
 
 -(UIViewController*)createSideMenu:(RNNLayoutNode*)node
-{	
+{
 	NSMutableArray* childrenVCs = [NSMutableArray new];
 	
 	

ios/RNNStore.h

@@ -0,0 +1,18 @@
+//
+//  RNNStore.h
+//  ReactNativeNavigation
+//
+//  Created by Ran Greenberg on 12/02/2017.
+//  Copyright © 2017 Wix. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+
+@interface RNNStore : NSObject
+
+- (UIViewController*)findContainerForId:(NSString*)containerId;
+- (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;
+
+@end

ios/RNNStore.m

@@ -0,0 +1,46 @@
+//
+//  RNNStore.m
+//  ReactNativeNavigation
+//
+//  Created by Ran Greenberg on 12/02/2017.
+//  Copyright © 2017 Wix. All rights reserved.
+//
+
+#import "RNNStore.h"
+
+@interface RNNStore ()
+
+@property NSMutableDictionary *containerStore;
+
+@end
+
+@implementation RNNStore
+
+
+-(instancetype)init {
+	self = [super init];
+	self.containerStore = [NSMutableDictionary new];
+	
+	return self;
+}
+
+
+-(UIViewController *)findContainerForId:(NSString *)containerId {
+	return [self.containerStore valueForKey:containerId];
+}
+
+
+- (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId {
+	if (!containerId) {
+		return;
+	}
+	
+	UIViewController *existingVewController = [self findContainerForId:containerId];
+	if (existingVewController) {
+		@throw [NSException exceptionWithName:@"MultipleContainerId" reason:[@"Container id already exists " stringByAppendingString:containerId] userInfo:nil];	}
+	
+	[self.containerStore setObject:viewController forKey:containerId];
+}
+
+
+@end

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -45,6 +45,8 @@
 		263905D71E4C94970023D7D3 /* RNNSideMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 263905D51E4C94970023D7D3 /* RNNSideMenuController.m */; };
 		263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */ = {isa = PBXBuildFile; fileRef = 263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */; };
 		263905E71E4CAC950023D7D3 /* RNNSideMenuChildVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 263905E51E4CAC950023D7D3 /* RNNSideMenuChildVC.m */; };
+		268692821E5054F800E2C612 /* RNNStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 268692801E5054F800E2C612 /* RNNStore.h */; };
+		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 */; };
 		7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B11269F1E2D263F00F9B03B /* RNNEventEmitter.m */; };
@@ -116,6 +118,8 @@
 		263905D51E4C94970023D7D3 /* RNNSideMenuController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuController.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>"; };
+		268692801E5054F800E2C612 /* RNNStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNStore.h; sourceTree = "<group>"; };
+		268692811E5054F800E2C612 /* RNNStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNStore.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>"; };
@@ -232,6 +236,8 @@
 				263905D51E4C94970023D7D3 /* RNNSideMenuController.m */,
 				263905E41E4CAC950023D7D3 /* RNNSideMenuChildVC.h */,
 				263905E51E4CAC950023D7D3 /* RNNSideMenuChildVC.m */,
+				268692801E5054F800E2C612 /* RNNStore.h */,
+				268692811E5054F800E2C612 /* RNNStore.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -300,6 +306,7 @@
 				263905BE1E4C6F440023D7D3 /* RCCTheSideBarManagerViewController.h in Headers */,
 				263905CE1E4C6F440023D7D3 /* TheSidebarController.h in Headers */,
 				7B1126A71E2D2B6C00F9B03B /* RNNEventEmitter.h in Headers */,
+				268692821E5054F800E2C612 /* RNNStore.h in Headers */,
 				263905CA1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.h in Headers */,
 				263905B11E4C6F440023D7D3 /* MMDrawerController.h in Headers */,
 				263905B91E4C6F440023D7D3 /* RCCDrawerController.h in Headers */,
@@ -392,6 +399,7 @@
 				263905CF1E4C6F440023D7D3 /* TheSidebarController.m in Sources */,
 				263905AF1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m in Sources */,
 				7BBFE5611E253F97002A6182 /* RNN.m in Sources */,
+				268692831E5054F800E2C612 /* RNNStore.m in Sources */,
 				7BC9346E1E26886E00EFA125 /* RNNControllerFactory.m in Sources */,
 				263905B61E4C6F440023D7D3 /* MMExampleDrawerVisualStateManager.m in Sources */,
 				263905C91E4C6F440023D7D3 /* SidebarFlipboardAnimation.m in Sources */,

playground/ios/playground.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
 		26070FD01E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 26070FCF1E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m */; };
 		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
+		268692851E50572700E2C612 /* RNNStoreTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 268692841E50572700E2C612 /* RNNStoreTest.m */; };
 		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
 		7BD721FF1E2E421E00724059 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
@@ -211,6 +212,7 @@
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
 		26070FCF1E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNControllerFactoryTest.m; sourceTree = "<group>"; };
 		2647D6591DB175B300B23722 /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = "../node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj"; sourceTree = "<group>"; };
+		268692841E50572700E2C612 /* RNNStoreTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNStoreTest.m; 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>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
@@ -294,6 +296,7 @@
 			children = (
 				26070FCF1E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m */,
 				00E356F01AD99517003FC87E /* Supporting Files */,
+				268692841E50572700E2C612 /* RNNStoreTest.m */,
 			);
 			path = playgroundTests;
 			sourceTree = "<group>";
@@ -734,6 +737,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				268692851E50572700E2C612 /* RNNStoreTest.m in Sources */,
 				26070FD01E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

playground/ios/playgroundTests/RNNControllerFactoryTest.m

@@ -14,6 +14,7 @@
 
 @property (nonatomic, strong) id<RNNRootViewCreator> creator;
 @property (nonatomic, strong) RNNControllerFactory *factory;
+@property (nonatomic, strong) RNNStore *store;
 
 @end
 
@@ -22,8 +23,8 @@
 - (void)setUp {
 	[super setUp];
 	self.creator = nil;
-	self.factory = [[RNNControllerFactory alloc] initWithRootViewCreator:self.creator];
-	
+	self.store = [RNNStore new];
+	self.factory = [[RNNControllerFactory alloc] initWithRootViewCreator:self.creator store:self.store];
 }
 
 - (void)tearDown {
@@ -125,7 +126,7 @@
 																	   @"type": @"SideMenuRight",
 																	   @"data": @{},
 																	   @"children": @[
-																			   @{@"id": @"cntId_5",
+																			   @{@"id": @"cntId_7",
 																				 @"type": @"Container",
 																				 @"data": @{},
 																				 @"children": @[]}]}]}];
@@ -189,6 +190,18 @@
 	
 }
 
+- (void)testCreateLayout_addContainerToStore {
+	NSString *containerId = @"cntId";
+	UIViewController *ans = [self.factory createLayout:
+							 @{@"id": containerId,
+							   @"type": @"Container",
+							   @"data": @{},
+							   @"children": @[]}];
+	
+	UIViewController *storeAns = [self.store findContainerForId:containerId];
+	XCTAssertEqualObjects(ans, storeAns);
+}
+
 
 
 @end

playground/ios/playgroundTests/RNNStoreTest.m

@@ -0,0 +1,67 @@
+//
+//  RNNStoreTest.m
+//  playground
+//
+//  Created by Ran Greenberg on 12/02/2017.
+//  Copyright © 2017 Wix. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "RNNStore.m"
+
+@interface RNNStoreTest : XCTestCase
+
+@property (nonatomic, strong) RNNStore *store;
+
+@end
+
+@implementation RNNStoreTest
+
+- (void)setUp {
+    [super setUp];
+	
+	self.store = [RNNStore new];
+}
+
+
+- (void)testFindContainerForId_setAndGetsimpleContainerId {
+	NSString *containerId1 = @"cntId1";
+	NSString *containerId2 = @"cntId2";
+	
+	UIViewController *vc1 = [UIViewController new];
+	UIViewController *vc2 = [UIViewController new];
+	
+	[self.store setContainer:vc1 containerId:containerId1];
+	[self.store setContainer:vc2 containerId:containerId2];
+	
+	UIViewController *ans = [self.store findContainerForId:containerId1];
+	
+	XCTAssertEqualObjects(vc1, ans);
+	XCTAssertNotEqualObjects(vc2, ans);
+}
+
+- (void)testFindContainerForId_setNilContainerId {
+	NSString *containerId1 = nil;
+	UIViewController *vc1 = [UIViewController new];
+	[self.store setContainer:vc1 containerId:containerId1];
+	
+	UIViewController *ans = [self.store findContainerForId:containerId1];
+	XCTAssertNil(ans);
+}
+
+- (void)testFindContainerForId_setDoubleContainerId {
+	NSString *containerId1 = @"cntId1";
+	
+	UIViewController *vc1 = [UIViewController new];
+	UIViewController *vc2 = [UIViewController new];
+	
+	[self.store setContainer:vc1 containerId:containerId1];
+	
+	UIViewController *ans = [self.store findContainerForId:containerId1];
+	XCTAssertEqualObjects(vc1, ans);
+	XCTAssertThrows([self.store setContainer:vc2 containerId:containerId1]);
+}
+
+
+
+@end