fix for \#878

wix · Mar 20, 2017 · 73927dc · 73927dc
1 parent 1438041
commit 73927dc
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/ios/RNNCommandsHandler.m b/ios/RNNCommandsHandler.m
@@ -24,6 +24,9 @@ -(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerF
 
 -(void) setRoot:(NSDictionary*)layout {
 	[self assertReady];
+
+	[_modalManager dismissAllModals];
+
 	UIViewController *vc = [_controllerFactory createLayoutAndSaveToStore:layout];
 
 	UIApplication.sharedApplication.delegate.window.rootViewController = vc;

diff --git a/ios/RNNReactRootViewCreator.m b/ios/RNNReactRootViewCreator.m
@@ -8,7 +8,7 @@ @interface RNNReactRootView : RCTRootView
 
 @implementation RNNReactRootView
 
--(void) dealloc {
+-(void)dealloc {
 
 }
 

diff --git a/ios/RNNRootViewController.m b/ios/RNNRootViewController.m
@@ -1,6 +1,5 @@
 
 #import "RNNRootViewController.h"
-#import <React/RCTRootView.h>
 
 @interface RNNRootViewController()
 @property NSString* containerId;
@@ -17,19 +16,33 @@ -(instancetype)initWithNode:(RNNLayoutNode*)node rootViewCreator:(id<RNNRootView
 	self.eventEmitter = eventEmitter;
 
 	self.view = [creator createRootView:self.containerName rootViewId:self.containerId];
+
+//	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJsReload) name:RCTJavaScriptWillStartLoadingNotification object:nil];
+
 	return self;
 }
 
--(void)viewDidAppear:(BOOL)animated
-{
+-(void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
 	[self.eventEmitter sendContainerStart:self.containerId];
 }
 
--(void)viewDidDisappear:(BOOL)animated
-{
+-(void)viewDidDisappear:(BOOL)animated {
 	[super viewDidDisappear:animated];
 	[self.eventEmitter sendContainerStop:self.containerId];
 }
 
+///**
+// * fix for 
+// */
+//-(void)onJsReload {
+//	[[NSNotificationCenter defaultCenter] removeObserver:self];
+//	[[NSNotificationCenter defaultCenter] removeObserver:self.view];
+//	self.view = nil;
+//}
+
+-(void)dealloc {
+
+}
+
 @end
diff --git a/ios/ReactNativeNavigation.m b/ios/ReactNativeNavigation.m
@@ -113,4 +113,5 @@ -(void)resetRootViewControllerOnlyOnJSDevReload {
 }
 
 
+
 @end
diff --git a/playground/e2e/app.test.js b/playground/e2e/app.test.js
@@ -169,10 +169,6 @@ describe('reload app', () => {
   it('show welcome screen after reload', () => {
     expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
-
-  it('show modal then reload will not cause a leak', () => {
-    elementByLabel('Show Modal').tap();
-  });
 });
 
 function elementByLabel(label) {

diff --git a/playground/src/containers/ModalScreen.js b/playground/src/containers/ModalScreen.js
@@ -67,9 +67,14 @@ class ModalScreen extends Component {
   onClickDismissFirstInStack() {
     Navigation.dismissModal(_.head(this.props.previousModalIds));
   }
-  
+
   onClickDismissAllModals() {
-    Navigation.dismissAllModals();
+    // Navigation.dismissAllModals();
+    Navigation.setRoot({
+      container: {
+        name: 'navigation.playground.WelcomeScreen'
+      }
+    });
   }
 
   getModalPosition() {