Implement passProps in TopTabs screens

android/app/src/main/java/com/reactnativenavigation/screens/FragmentScreen.java

@@ -38,7 +38,10 @@ public class FragmentScreen extends Screen {
     }
 
     private void addContent() {
-        ContentView contentView = new ContentView(getContext(), screenParams, screenParams.screenId);
+        ContentView contentView = new ContentView(getContext(),
+                screenParams,
+                screenParams.screenId,
+                screenParams.passProps);
         addView(contentView, 0, 0);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         if (screenParams.styleParams.drawScreenBelowTopBar) {

android/app/src/main/java/com/reactnativenavigation/screens/SingleScreen.java

@@ -19,7 +19,7 @@ public class SingleScreen extends Screen {
 
     @Override
     protected void createContent() {
-        contentView = new ContentView(getContext(), screenParams, screenParams.screenId);
+        contentView = new ContentView(getContext(), screenParams, screenParams.screenId, screenParams.passProps);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         if (screenParams.styleParams.drawScreenBelowTopBar) {
             params.addRule(BELOW, topBar.getId());

android/app/src/main/java/com/reactnativenavigation/screens/ViewPagerScreen.java

@@ -44,8 +44,8 @@ public class ViewPagerScreen extends Screen {
 
     private void addPages() {
         contentViews = new ArrayList<>();
-        for (TopTabParams topTabParam : screenParams.topTabParams) {
-            ContentView contentView = new ContentView(getContext(), screenParams, topTabParam.screenId);
+        for (TopTabParams tab : screenParams.topTabParams) {
+            ContentView contentView = new ContentView(getContext(), screenParams, tab.screenId, tab.passProps);
             addContent(contentView);
             contentViews.add(contentView);
         }

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

@@ -14,15 +14,12 @@ public class ContentView extends ReactRootView {
     private final String screenId;
     private final String navigatorEventId;
     private final Bundle passProps;
-    private Bundle navigationParams;
 
-    public ContentView(Context context, ScreenParams screenParams, String screenId) {
+    public ContentView(Context context, ScreenParams screenParams, String screenId, Bundle passProps) {
         super(context);
         this.screenId = screenId;
         navigatorEventId = screenParams.navigatorEventId;
-
-        passProps = screenParams.passProps;
-        navigationParams = screenParams.navigationParams;
+        this.passProps = mergePropsAndNavigationParams(screenParams, passProps);
         attachToJS();
     }
 
@@ -44,10 +41,11 @@ public class ContentView extends ReactRootView {
 
     private void attachToJS() {
         ReactInstanceManager react = NavigationApplication.instance.getNavigationReactInstance().getReactInstanceManager();
-        startReactApplication(react, screenId, mergePropsAndNavigationParams());
+        startReactApplication(react, screenId, passProps);
     }
 
-    private Bundle mergePropsAndNavigationParams() {
+    private Bundle mergePropsAndNavigationParams(ScreenParams screenParams, Bundle passProps) {
+        Bundle navigationParams = (Bundle) screenParams.navigationParams.clone();
         if (passProps != null) {
             navigationParams.putAll(passProps);
         }