ios - change store to have NSMapTable instead of NSMutableDictionary

ios/RNNBridgeModule.m

@@ -39,7 +39,7 @@ RCT_EXPORT_METHOD(pop:(NSString*)containerId)
 	[self assertReady];
 	UIViewController *vc = [[RNN instance].store findContainerForId:containerId];
 	
-	[[vc navigationController] popViewControllerAnimated:true];
+	[[vc navigationController] popViewControllerAnimated:YES];
 	[[RNN instance].store removeContainer:containerId];
 }
 

ios/RNNStore.m

@@ -10,7 +10,7 @@
 
 @interface RNNStore ()
 
-@property NSMutableDictionary *containerStore;
+@property NSMapTable *containerStore;
 
 @end
 
@@ -19,14 +19,14 @@
 
 -(instancetype)init {
 	self = [super init];
-	self.containerStore = [NSMutableDictionary new];
-	
+	self.containerStore = [NSMapTable strongToWeakObjectsMapTable];
 	return self;
 }
 
 
 -(UIViewController *)findContainerForId:(NSString *)containerId {
-	return [self.containerStore valueForKey:containerId];
+	return [self.containerStore objectForKey:containerId];
+	
 }
 
 
@@ -46,6 +46,4 @@
 }
 
 
-
-
 @end

playground/ios/playground.xcodeproj/project.pbxproj

@@ -295,8 +295,8 @@
 			isa = PBXGroup;
 			children = (
 				26070FCF1E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m */,
-				00E356F01AD99517003FC87E /* Supporting Files */,
 				268692841E50572700E2C612 /* RNNStoreTest.m */,
+				00E356F01AD99517003FC87E /* Supporting Files */,
 			);
 			path = playgroundTests;
 			sourceTree = "<group>";

playground/ios/playgroundTests/RNNStoreTest.m

@@ -18,7 +18,7 @@
 @implementation RNNStoreTest
 
 - (void)setUp {
-    [super setUp];
+	[super setUp];
 	
 	self.store = [RNNStore new];
 }
@@ -43,7 +43,7 @@
 - (void)testSetContainer_setNilContainerId {
 	NSString *containerId1 = nil;
 	UIViewController *vc1 = [UIViewController new];
-	XCTAssertThrows([self.store setContainer:vc1 containerId:containerId1]);
+	[self.store setContainer:vc1 containerId:containerId1];
 	XCTAssertNil([self.store findContainerForId:containerId1]);
 	
 }
@@ -71,10 +71,25 @@
 	XCTAssertEqualObjects(vc1, ans);
 	
 	[self.store removeContainer:containerId1];
-	
 	XCTAssertNil([self.store findContainerForId:containerId1]);
 }
 
+-(void)testPopWillRemoveVcFromStore {
+	NSString *vcId = @"cnt_vc_2";
+	
+	[self setContainerAndRelease:vcId];
+	
+	
+	XCTAssertNil([self.store findContainerForId:vcId]); // PASS
+}
 
+-(void) setContainerAndRelease:(NSString*)vcId {
+	@autoreleasepool {
+		UIViewController *vc2 = [UIViewController new];
+		[self.store setContainer:vc2 containerId:vcId];
+		
+		XCTAssertNotNil([self.store findContainerForId:vcId]); // PASS
+	}
+}
 
 @end

playground/src/containers/SimpleScreen.js

@@ -7,13 +7,16 @@ class SimpleScreen extends Component {
   constructor(props) {
     super(props);
     this.onClickPop = this.onClickPop.bind(this);
+    this.onClickPush = this.onClickPush.bind(this);
   }
 
   render() {
     return (
       <View style={styles.root}>
         <Text style={styles.h1}>{this.props.text || 'Simple Screen'}</Text>
+        <Text style={styles.h2}>{this.props.stackPosition}</Text>
         {this.renderTextFromFunctionInProps()}
+        <Button title="Push" onPress={this.onClickPush} />
         <Button title="Pop" onPress={this.onClickPop} />
       </View>
     );
@@ -31,6 +34,16 @@ class SimpleScreen extends Component {
   onClickPop() {
     Navigation.on(this.props.id).pop();
   }
+  
+  onClickPush() {
+    Navigation.on(this.props.id).push({
+      name: 'navigation.playground.SimpleScreen',
+      passProps: {
+        stackPosition: this.props.stackPosition + 1,
+      }
+    });
+  }
+
 }
 export default SimpleScreen;
 
@@ -45,5 +58,10 @@ const styles = {
     fontSize: 24,
     textAlign: 'center',
     margin: 10
+  },
+  h2: {
+    fontSize: 12,
+    textAlign: 'center',
+    margin: 10
   }
 };

playground/src/containers/WelcomeScreen.js

@@ -7,6 +7,7 @@ class WelcomeScreen extends Component {
   constructor(props) {
     super(props);
     this.onClickPush = this.onClickPush.bind(this);
+    this.onShowModal = this.onShowModal.bind(this);
   }
 
   render() {
@@ -17,6 +18,7 @@ class WelcomeScreen extends Component {
         <Button title="Switch to app with side menus" onPress={this.onClickSwitchToSideMenus} />
         <Button title="Switch to lifecycle screen" onPress={this.onClickLifecycleScreen} />
         <Button title="Push" onPress={this.onClickPush} />
+        <Button title="Show Modal" onPress={this.onClickPush} />
         <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
       </View>
     );
@@ -90,7 +92,8 @@ class WelcomeScreen extends Component {
     Navigation.on(this.props.id).push({
       name: 'navigation.playground.SimpleScreen',
       passProps: {
-        text: 'Pushed screen'
+        text: 'Pushed screen',
+        stackPosition: 1
       }
     });
   }
@@ -102,6 +105,10 @@ class WelcomeScreen extends Component {
       }
     });
   }
+  
+  onShowModal() {
+    Navigation.on(this.props.id).show
+  }
 }
 
 export default WelcomeScreen;