ios - pop

ios/RNNBridgeModule.m

@@ -27,21 +27,20 @@ RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout)
 RCT_EXPORT_METHOD(push:(NSString*)containerId layout:(NSDictionary*)layout)
 {
 	[self assertReady];
-	//TODO implement correctly
 	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
 	UIViewController *newVc = [factory createLayout:layout];
+	UIViewController *vc = [[RNN instance].store findContainerForId:containerId];
 	
-	id vc = [[RNN instance].store findContainerForId:containerId];
-	
-	[[vc navigationController]pushViewController:newVc animated:true];
+	[[vc navigationController] pushViewController:newVc animated:true];
 }
 
 RCT_EXPORT_METHOD(pop:(NSString*)containerId)
 {
 	[self assertReady];
-	//TODO implement correctly
-	id vc = [UIApplication.sharedApplication.delegate.window.rootViewController childViewControllers][0];
+	UIViewController *vc = [[RNN instance].store findContainerForId:containerId];
+	
 	[[vc navigationController] popViewControllerAnimated:true];
+	[[RNN instance].store removeContainer:containerId];
 }
 
 - (void)assertReady

ios/RNNStore.h

@@ -14,5 +14,6 @@
 
 - (UIViewController*)findContainerForId:(NSString*)containerId;
 - (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;
+- (void)removeContainer:(NSString*)containerId;
 
 @end

ios/RNNStore.m

@@ -31,16 +31,21 @@
 
 
 - (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];	}
+		@throw [NSException exceptionWithName:@"MultipleContainerId" reason:[@"Container id already exists " stringByAppendingString:containerId] userInfo:nil];
+	}
 	
 	[self.containerStore setObject:viewController forKey:containerId];
 }
 
 
+- (void)removeContainer:(NSString*)containerId {
+	[self.containerStore removeObjectForKey:containerId];
+}
+
+
+
+
 @end

playground/ios/playgroundTests/RNNStoreTest.m

@@ -40,16 +40,15 @@
 	XCTAssertNotEqualObjects(vc2, ans);
 }
 
-- (void)testFindContainerForId_setNilContainerId {
+- (void)testSetContainer_setNilContainerId {
 	NSString *containerId1 = nil;
 	UIViewController *vc1 = [UIViewController new];
-	[self.store setContainer:vc1 containerId:containerId1];
+	XCTAssertThrows([self.store setContainer:vc1 containerId:containerId1]);
+	XCTAssertNil([self.store findContainerForId:containerId1]);
 	
-	UIViewController *ans = [self.store findContainerForId:containerId1];
-	XCTAssertNil(ans);
 }
 
-- (void)testFindContainerForId_setDoubleContainerId {
+- (void)testSetContainer_setDoubleContainerId {
 	NSString *containerId1 = @"cntId1";
 	
 	UIViewController *vc1 = [UIViewController new];
@@ -62,6 +61,20 @@
 	XCTAssertThrows([self.store setContainer:vc2 containerId:containerId1]);
 }
 
+- (void)testRemoveContainer_removeExistContainer {
+	NSString *containerId1 = @"cntId1";
+	UIViewController *vc1 = [UIViewController new];
+	
+	[self.store setContainer:vc1 containerId:containerId1];
+	
+	UIViewController *ans = [self.store findContainerForId:containerId1];
+	XCTAssertEqualObjects(vc1, ans);
+	
+	[self.store removeContainer:containerId1];
+	
+	XCTAssertNil([self.store findContainerForId:containerId1]);
+}
+
 
 
 @end