unmount fix

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -86,6 +86,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void newStack(final ReadableMap params) {
+        NavigationCommandsHandler.newStack(BundleConverter.toBundle(params));
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -117,4 +117,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     void popToRoot(ScreenParams params) {
         layout.popToRoot(params);
     }
+
+    void newStack(ScreenParams params) {
+        layout.newStack(params);
+    }
 }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -73,4 +73,19 @@ public class NavigationCommandsHandler {
             }
         });
     }
+
+    public static void newStack(Bundle screenParams) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+
+        final ScreenParams params = ScreenParamsParser.parse(screenParams);
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.newStack(params);
+            }
+        });
+    }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/Layout.java

@@ -14,4 +14,6 @@ public interface Layout {
     void pop(ScreenParams params);
 
     void popToRoot(ScreenParams params);
+
+    void newStack(ScreenParams params);
 }

android/app/src/main/java/com/reactnativenavigation/layouts/Screen.java

@@ -1,5 +1,8 @@
 package com.reactnativenavigation.layouts;
 
+/**
+ * Must extend View
+ */
 public interface Screen {
-    void removeAllReactViews();
+    void ensureUnmountOnDetachedFromWindow();
 }

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenImpl.java

@@ -105,7 +105,7 @@ public class ScreenImpl extends LinearLayout implements Screen, ScrollDirectionL
     }
 
     @Override
-    public void removeAllReactViews() {
-        contentView.removeFromParentAndUnmount();
+    public void ensureUnmountOnDetachedFromWindow() {
+        contentView.ensureUnmountOnDetachedFromWindow();
     }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenStack.java

@@ -29,6 +29,7 @@ public class ScreenStack extends FrameLayout {
 
     public Screen pop() {
         Screen popped = stack.pop();
+        popped.ensureUnmountOnDetachedFromWindow();
         removeView((View) popped);
         return popped;
     }
@@ -41,10 +42,8 @@ public class ScreenStack extends FrameLayout {
 
     public void destroy() {
         while (!isEmpty()) {
-            Screen screen = pop();
-            screen.removeAllReactViews();
+            pop();
         }
-        removeAllViews();
     }
 
     public boolean isEmpty() {

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -60,4 +60,9 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     public void popToRoot(ScreenParams params) {
         stack.popToRoot();
     }
+
+    @Override
+    public void newStack(ScreenParams params) {
+        stack.destroy();
+    }
 }

android/app/src/main/java/com/reactnativenavigation/views/ContentView.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.views;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.view.ViewGroup;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
@@ -38,14 +37,11 @@ public class ContentView extends ReactRootView {
         return navigationParams;
     }
 
-    public void removeFromParentWithoutUnmount() {
-        // Hack in order to prevent the react view from getting unmounted
+    public void preventUnmountOnDetachedFromWindow() {
         ReactViewHacks.preventUnmountOnDetachedFromWindow(this);
-        ((ViewGroup) getParent()).removeView(this);
     }
 
-    public void removeFromParentAndUnmount() {
+    public void ensureUnmountOnDetachedFromWindow() {
         ReactViewHacks.ensureUnmountOnDetachedFromWindow(this);
-        ((ViewGroup) getParent()).removeView(this);
     }
 }

example-redux/src/screens/PushedScreen.js

@@ -7,7 +7,7 @@ import {
   StyleSheet,
   TextInput
 } from 'react-native';
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import * as counterActions from '../reducers/counter/actions';
 
 // this is a traditional React component connected to the redux store
@@ -30,12 +30,17 @@ class PushedScreen extends Component {
   constructor(props) {
     super(props);
     this.bgColor = this.getRandomColor();
+    console.log(`constructor ${this.bgColor}`);
+  }
+
+  componentWillUnmount() {
+    console.log(`componentWillUnmount ${this.bgColor}`);
   }
 
   getRandomColor() {
     var letters = '0123456789ABCDEF'.split('');
     var color = '#';
-    for (var i = 0; i < 6; i++ ) {
+    for (var i = 0; i < 6; i++) {
       color += letters[Math.floor(Math.random() * 16)];
     }
     return color;
@@ -153,13 +158,13 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     fontSize: 18,
     marginBottom: 10,
-    marginTop:10
+    marginTop: 10
   },
   button: {
     textAlign: 'center',
     fontSize: 18,
     marginBottom: 10,
-    marginTop:10,
+    marginTop: 10,
     color: 'blue'
   }
 });