Merge branch 'dismissKeyBoardExperimental'

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

@@ -9,6 +9,7 @@ import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.utils.BridgeUtils;
+import com.reactnativenavigation.utils.ReflectionUtils;
 
 /**
  * Created by guyc on 10/03/16.
@@ -24,15 +25,7 @@ public class RctView extends FrameLayout {
         /**
          * This method will be invoked when the {@link ReactRootView} is visible.
          */
-        public void onDisplayed();
-    }
-
-    public ReactRootView getReactRootView() {
-        return mReactRootView;
-    }
-
-    public RctView(BaseReactActivity ctx, ReactInstanceManager rctInstanceManager, Screen screen) {
-        this(ctx, rctInstanceManager, screen, null);
+        void onDisplayed();
     }
 
     @SuppressWarnings("unchecked")
@@ -67,5 +60,30 @@ public class RctView extends FrameLayout {
 
         addView(mReactRootView);
     }
+
+    /**
+     * Must be called before view is removed from screen, but will be added again later. Setting mAttachScheduled
+     * to true will prevent the component from getting unmounted once view is detached from screen.
+     */
+    public void onTemporallyRemovedFromScreen() {
+        // Hack in order to prevent the react view from getting unmounted
+        ReflectionUtils.setBooleanField(mReactRootView, "mAttachScheduled", true);
+    }
+
+    /**
+     * Must be called before view is removed from screen inorder to ensure onDetachedFromScreen is properly
+     * executed and componentWillUnmount is called
+     */
+    public void onRemoveFromScreen() {
+        ReflectionUtils.setBooleanField(mReactRootView, "mAttachScheduled", false);
+    }
+
+    /**
+     * Must be called when view is added again to screen inorder to ensure onDetachedFromScreen is properly
+     * executed and componentWillUnmount is called
+     */
+    public void onReAddToScreen() {
+        ReflectionUtils.setBooleanField(mReactRootView, "mAttachScheduled", false);
+    }
 }
 

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

@@ -7,11 +7,9 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.RctManager;
 import com.reactnativenavigation.core.objects.Screen;
-import com.reactnativenavigation.utils.ReflectionUtils;
 
 import java.util.Stack;
 
@@ -60,7 +58,7 @@ public class ScreenStack extends FrameLayout {
         if (oldView != null) {
             addView(view, MATCH_PARENT, MATCH_PARENT);
 
-            ReflectionUtils.setBooleanField(oldView.getReactRootView(), "mAttachScheduled", true);
+            oldView.onTemporallyRemovedFromScreen();
             getLayoutTransition().setStartDelay(LayoutTransition.DISAPPEARING, DISAPPEAR_ANIMATION_DELAY);
             removeView(oldView);
             getLayoutTransition().setStartDelay(LayoutTransition.DISAPPEARING, 0);
@@ -76,9 +74,12 @@ public class ScreenStack extends FrameLayout {
         }
 
         ScreenView popped = mStack.pop();
-        addView(mStack.peek().view, 0);
 
-        ReflectionUtils.setBooleanField(popped.view.getReactRootView(), "mAttachScheduled", false);
+        RctView newView = mStack.peek().view;
+        addView(newView);
+        newView.onReAddToScreen();
+
+        popped.view.onRemoveFromScreen();
         removeView(popped.view);
         return popped.screen;
     }
@@ -91,7 +92,7 @@ public class ScreenStack extends FrameLayout {
         ScreenView oldScreenView = null;
         while (getStackSize() > 1) {
             ScreenView popped = mStack.pop();
-            ReflectionUtils.setBooleanField(popped.view.getReactRootView(), "mAttachScheduled", false);
+            popped.view.onRemoveFromScreen();
             removeView(popped.view);
             if (oldScreenView == null) {
                 oldScreenView = popped;
@@ -116,11 +117,11 @@ public class ScreenStack extends FrameLayout {
         ScreenView oldScreenView = null;
         if (!mStack.isEmpty()) {
             while (getStackSize() > 0) {
-                ScreenView screenView = mStack.pop();
-                ReflectionUtils.setBooleanField(screenView.view.getReactRootView(), "mAttachScheduled", false);
-                removeView(screenView.view);
+                ScreenView popped = mStack.pop();
+                popped.view.onRemoveFromScreen();
+                removeView(popped.view);
                 if (oldScreenView == null) {
-                    oldScreenView = screenView;
+                    oldScreenView = popped;
                 }
             }
         }
@@ -151,8 +152,7 @@ public class ScreenStack extends FrameLayout {
      * Remove the ScreenStack from {@code parent} while preventing all child react views from getting unmounted
      */
     public void removeFromScreen(ViewGroup parent) {
-        ReactRootView view = mStack.peek().view.getReactRootView();
-        ReflectionUtils.setBooleanField(view, "mAttachScheduled", true);
+        mStack.peek().view.onTemporallyRemovedFromScreen();
 
         parent.removeView(this);
     }
@@ -161,8 +161,7 @@ public class ScreenStack extends FrameLayout {
      * Add ScreenStack to {@code parent}
      */
     public void addToScreen(ViewGroup parent) {
-        ReactRootView view = mStack.peek().view.getReactRootView();
-        ReflectionUtils.setBooleanField(view, "mAttachScheduled", false);
+        mStack.peek().view.onReAddToScreen();
 
         parent.addView(this, new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }