add pop to with store handling

lib/ios/RNNBridgeModule.m

@@ -30,8 +30,8 @@ RCT_EXPORT_METHOD(pop:(NSString*)containerId) {
 	[_commandsHandler pop:containerId];
 }
 
-RCT_EXPORT_METHOD(popTo:(NSString*)containerId toContainerId:(NSString*)toContainerId) {
-	[_commandsHandler popTo:containerId toContainerId:toContainerId];
+RCT_EXPORT_METHOD(popTo:(NSString*)fromContainerId toContainerId:(NSString*)toContainerId) {
+	[_commandsHandler popTo:toContainerId fromContainerId:fromContainerId];
 }
 
 RCT_EXPORT_METHOD(popToRoot:(NSString*)containerId) {

lib/ios/RNNCommandsHandler.h

@@ -14,7 +14,7 @@
 
 -(void) pop:(NSString*)containerId;
 
--(void) popTo:(NSString*)containerId toContainerId:(NSString*)toContainerId;
+-(void) popTo:(NSString*)containerId fromContainerId:(NSString*)fromContainerId;
 
 -(void) popToRoot:(NSString*)containerId;
 

lib/ios/RNNCommandsHandler.m

@@ -44,9 +44,9 @@
 	[_navigationStackManager pop:containerId];
 }
 
--(void) popTo:(NSString*)containerId toContainerId:(NSString*)toContainerId {
+-(void) popTo:(NSString*)containerId fromContainerId:(NSString*)fromContainerId; {
 	[self assertReady];
-	[_navigationStackManager popTo:containerId toContainerId:toContainerId];
+	[_navigationStackManager popTo:containerId fromContainerId:fromContainerId];
 }
 
 -(void) popToRoot:(NSString*)containerId {

lib/ios/RNNNavigationStackManager.h

@@ -8,7 +8,7 @@
 
 -(void)push:(UIViewController*)newTop onTop:(NSString*)containerId;
 -(void)pop:(NSString*)containerId;
--(void)popTo:(NSString*)containerId toContainerId:(NSString*)toContainerId;
--(void) popToRoot:(NSString*)containerId;
+-(void)popTo:(NSString*)toContainerId fromContainerId:(NSString*)fromContainerId;
+-(void)popToRoot:(NSString*)containerId;
 
 @end

lib/ios/RNNNavigationStackManager.m

@@ -28,15 +28,17 @@
 	[_store removeContainer:containerId];
 }
 
--(void) popTo:(NSString*)containerId toContainerId:(NSString*)toContainerId {
-	UIViewController *vc = [_store findContainerForId:containerId];
+-(void)popTo:(NSString*)toContainerId fromContainerId:(NSString*)fromContainerId {
+	UIViewController *vc = [_store findContainerForId:fromContainerId];
 	UINavigationController *nvc = [vc navigationController];
 	
 	UIViewController *toVC = [_store findContainerForId:toContainerId];
 	
 	if (vc && toVC) {
-		[nvc popToViewController:toVC animated:YES];
-		// TODO - remove the poped vcs from store
+		NSArray *popedVCs = [nvc popToViewController:toVC animated:YES];
+		for (UIViewController *popedVC in popedVCs) {
+			[_store removeContainerByViewControllerInstance:popedVC];
+		}
 	}
 }
 

lib/ios/RNNStore.h

@@ -7,6 +7,7 @@
 -(UIViewController*) findContainerForId:(NSString*)containerId;
 -(void) setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;
 -(void) removeContainer:(NSString*)containerId;
+-(void) removeContainerByViewControllerInstance:(UIViewController*)containerInstance;
 
 -(void) setReadyToReceiveCommands:(BOOL)isReady;
 -(BOOL) isReadyToReceiveCommands;

lib/ios/RNNStore.m

@@ -36,6 +36,13 @@
 	[_containerStore removeObjectForKey:containerId];
 }
 
+- (void)removeContainerByViewControllerInstance:(UIViewController*)containerInstance {
+	NSString *foundKey = [self containerKeyForInstance:containerInstance];
+	if (foundKey) {
+		[self removeContainer:foundKey];
+	}
+}
+
 -(void)setReadyToReceiveCommands:(BOOL)isReady {
 	_isReadyToReceiveCommands = isReady;
 }
@@ -54,4 +61,14 @@
 	[_containerStore removeAllObjects];
 }
 
+-(NSString*)containerKeyForInstance:(UIViewController*)instance {
+	for (NSString *key in _containerStore) {
+		UIViewController *value = [_containerStore objectForKey:key];
+		if (value == instance) {
+			return key;
+		}
+	}
+	return nil;
+}
+
 @end

playground/ios/playground.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		26070FD01E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 26070FCF1E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m */; };
 		261F0E671E6EE9EC00989DE2 /* RNNModalManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 261F0E661E6EE9EC00989DE2 /* RNNModalManagerTest.m */; };
+		266DDDF71E8BCE9900C6F13C /* RNNNavigationStackManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 266DDDF61E8BCE9900C6F13C /* RNNNavigationStackManagerTest.m */; };
 		268692851E50572700E2C612 /* RNNStoreTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 268692841E50572700E2C612 /* RNNStoreTest.m */; };
 		26DB71671E82C65600A69712 /* RNNCommandsHandlerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 26DB71661E82C65600A69712 /* RNNCommandsHandlerTest.m */; };
 		7B8F30491E84151300110AEC /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8F2FDE1E840F3600110AEC /* libcxxreact.a */; };
@@ -236,6 +237,7 @@
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		26070FCF1E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNControllerFactoryTest.m; sourceTree = "<group>"; };
 		261F0E661E6EE9EC00989DE2 /* RNNModalManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNModalManagerTest.m; sourceTree = "<group>"; };
+		266DDDF61E8BCE9900C6F13C /* RNNNavigationStackManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationStackManagerTest.m; sourceTree = "<group>"; };
 		268692841E50572700E2C612 /* RNNStoreTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNStoreTest.m; sourceTree = "<group>"; };
 		26DB71661E82C65600A69712 /* RNNCommandsHandlerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNCommandsHandlerTest.m; sourceTree = "<group>"; };
 		7B8F2FC41E840F1A00110AEC /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = ../../lib/ios/ReactNativeNavigation.xcodeproj; sourceTree = "<group>"; };
@@ -292,6 +294,7 @@
 				268692841E50572700E2C612 /* RNNStoreTest.m */,
 				261F0E661E6EE9EC00989DE2 /* RNNModalManagerTest.m */,
 				26DB71661E82C65600A69712 /* RNNCommandsHandlerTest.m */,
+				266DDDF61E8BCE9900C6F13C /* RNNNavigationStackManagerTest.m */,
 				00E356F01AD99517003FC87E /* Supporting Files */,
 			);
 			path = playgroundTests;
@@ -823,6 +826,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				268692851E50572700E2C612 /* RNNStoreTest.m in Sources */,
+				266DDDF71E8BCE9900C6F13C /* RNNNavigationStackManagerTest.m in Sources */,
 				26DB71671E82C65600A69712 /* RNNCommandsHandlerTest.m in Sources */,
 				261F0E671E6EE9EC00989DE2 /* RNNModalManagerTest.m in Sources */,
 				26070FD01E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m in Sources */,

playground/ios/playgroundTests/RNNNavigationStackManagerTest.m

@@ -0,0 +1,103 @@
+#import <XCTest/XCTest.h>
+//#import <objc/runtime.h>
+#import "RNNStore.h"
+#import "RNNNavigationStackManager.h"
+
+@interface MockUINavigationController : UINavigationController
+@property (nonatomic, strong) NSArray* willReturnVCs;
+@end
+
+@implementation MockUINavigationController
+
+-(NSArray<UIViewController *> *)popToViewController:(UIViewController *)viewController animated:(BOOL)animated {
+	return self.willReturnVCs;
+}
+
+@end
+
+
+@interface RNNNavigationStackManagerTest : XCTestCase
+
+@end
+
+@implementation RNNNavigationStackManagerTest
+
+- (void)setUp {
+    [super setUp];
+	
+}
+
+
+- (void)testPop {
+	RNNStore *store = [RNNStore new];
+	RNNNavigationStackManager *uut = [[RNNNavigationStackManager alloc] initWithStore:store];
+	
+	UINavigationController *nvc = [[UINavigationController alloc] init];
+	
+	UIViewController *vc1 = [UIViewController new];
+	UIViewController *vc2 = [UIViewController new];
+
+	
+	NSArray *vcArray = @[vc1, vc2];
+	[nvc setViewControllers:vcArray];
+	[store setContainer:vc1 containerId:@"vc1"];
+	[store setContainer:vc2 containerId:@"vc2"];
+	[uut pop:@"vc2"];
+	
+	XCTAssertNil([store findContainerForId:@"vc2"]);
+	XCTAssertNotNil([store findContainerForId:@"vc1"]);
+	
+}
+
+- (void)testPopTo_singleVc {
+	RNNStore *store = [RNNStore new];
+	RNNNavigationStackManager *uut = [[RNNNavigationStackManager alloc] initWithStore:store];
+	
+	UIViewController *vc1 = [UIViewController new];
+	UIViewController *vc2 = [UIViewController new];
+	UIViewController *vc3 = [UIViewController new];
+	MockUINavigationController *nvc = [[MockUINavigationController alloc] initWithRootViewController:vc1];
+	[nvc pushViewController:vc2 animated:NO];
+	[nvc pushViewController:vc3 animated:NO];
+	nvc.willReturnVCs = @[vc2, vc3];
+	
+	[store setContainer:vc1 containerId:@"vc1"];
+	[store setContainer:vc2 containerId:@"vc2"];
+	[store setContainer:vc3 containerId:@"vc3"];
+	[uut popTo:@"vc1" fromContainerId:@"vc3"];
+	
+	XCTAssertNil([store findContainerForId:@"vc2"]);
+	XCTAssertNotNil([store findContainerForId:@"vc1"]);
+	
+}
+
+
+//- (void)testPopTo {
+//	RNNStore *store = [RNNStore new];
+//	RNNNavigationStackManager *uut = [[RNNNavigationStackManager alloc] initWithStore:store];
+//	
+//	UINavigationController *nvc = [[UINavigationController alloc] init];
+//	
+//	UIViewController *vc1 = [UIViewController new];
+//	UIViewController *vc2 = [UIViewController new];
+//	UIViewController *vc3 = [UIViewController new];
+//	UIViewController *vc4 = [UIViewController new];
+//	
+//	NSArray *vcArray = @[vc1, vc2, vc3, vc4];
+//	[nvc setViewControllers:vcArray];
+//	[store setContainer:vc1 containerId:@"vc1"];
+//	[store setContainer:vc2 containerId:@"vc2"];
+//	[store setContainer:vc3 containerId:@"vc3"];
+//	[store setContainer:vc4 containerId:@"vc4"];
+//	[store setContainer:nvc containerId:@"nvc"];
+//	
+//	[uut popTo:@"vc1" fromContainerId:@"vc4"];
+//	
+//	XCTAssertNil([store findContainerForId:@"vc4"]);
+//	XCTAssertNil([store findContainerForId:@"vc3"]);
+//	XCTAssertNil([store findContainerForId:@"vc2"]);
+//	
+//}
+
+
+@end

playground/ios/playgroundTests/RNNStoreTest.m

@@ -76,6 +76,21 @@
 	XCTAssertNil([self.store findContainerForId:vcId]);
 }
 
+
+-(void)testRemoveContainerByInstance {
+	NSString *containerId1 = @"cntId1";
+	UIViewController *vc1 = [UIViewController new];
+	
+	[self.store setContainer:vc1 containerId:containerId1];
+	[self.store removeContainerByViewControllerInstance:vc1];
+	
+	XCTAssertNil([self.store findContainerForId:@"cntId1"]);
+}
+
+
+#pragma mark - private
+
+
 -(void)setContainerAndRelease:(NSString*)vcId {
 	@autoreleasepool {
 		UIViewController *vc2 = [UIViewController new];
@@ -85,4 +100,6 @@
 	}
 }
 
+
+
 @end