CR fixes

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

@@ -65,12 +65,12 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     private void createAndAddScreens(int position) {
         ScreenParams screenParams = params.tabParams.get(position);
-        ScreenStack newStack = new ScreenStack(activity, getContentContainer(), screenParams.navigatorId, this);
+        ScreenStack newStack = new ScreenStack(activity, getScreenStackParent(), screenParams.navigatorId, this);
         newStack.pushInitialScreen(screenParams, createScreenLayoutParams(screenParams));
         screenStacks[position] = newStack;
     }
 
-    private RelativeLayout getContentContainer() {
+    private RelativeLayout getScreenStackParent() {
         return sideMenu == null ? this : sideMenu.getContentContainer();
     }
 
@@ -91,7 +91,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     private void addBottomTabs() {
         LayoutParams lp = new LayoutParams(MATCH_PARENT, WRAP_CONTENT);
         lp.addRule(ALIGN_PARENT_BOTTOM);
-        getContentContainer().addView(bottomTabs, lp);
+        getScreenStackParent().addView(bottomTabs, lp);
     }
 
     private void showInitialScreenStack() {
@@ -197,7 +197,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         currentScreenStack.destroy();
         removeView(currentScreenStack.peek());
 
-        ScreenStack newStack = new ScreenStack(activity, this, params.navigatorId, this);
+        ScreenStack newStack = new ScreenStack(activity, getScreenStackParent(), params.navigatorId, this);
         LayoutParams lp = createScreenLayoutParams(params);
         newStack.pushInitialScreen(params, lp);
         screenStacks[currentStackIndex] = newStack;

android/app/src/main/java/com/reactnativenavigation/params/SideMenuParams.java

@@ -6,5 +6,4 @@ public class SideMenuParams {
     public String screenId;
     public Bundle navigationParams;
     public boolean disableOpenGesture;
-    public Bundle passProps;
 }

android/app/src/main/java/com/reactnativenavigation/params/parsers/SideMenuParamsParser.java

@@ -11,7 +11,6 @@ public class SideMenuParamsParser extends Parser {
         result.screenId = sideMenu.getString("screenId");
         result.navigationParams = sideMenu.getBundle("navigationParams");
         result.disableOpenGesture = sideMenu.getBoolean("disableOpenGesture", false);
-        result.passProps = sideMenu.getBundle("passProps");
         return result;
     }
 }

src/deprecated/platformSpecificDeprecated.android.js

@@ -144,7 +144,7 @@ function convertDrawerParamsToSideMenuParams(drawerParams) {
   result.screenId = drawer.left.screen;
   addNavigatorParams(result);
   result = adaptNavigationParams(result);
-
+  result.passProps = drawer.passProps;
   return result;
 }
 

src/platformSpecific.android.js

@@ -78,6 +78,10 @@ function savePassProps(params) {
       savePassProps(tab);
     });
   }
+
+  if (params.sideMenu) {
+    PropRegistry.save(params.sideMenu.navigationParams.screenInstanceID, params.sideMenu.passProps);
+  }
 }
 
 function toggleSideMenuVisible(animated) {