Add a navigator instance to SideMenu

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

@@ -24,7 +24,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     private final SideMenuParams sideMenuParams;
     private ScreenStack stack;
     private TitleBarBackButtonListener titleBarBackButtonListener;
-    private SideMenu sideMenu;
+    private @Nullable SideMenu sideMenu;
 
     public SingleScreenLayout(AppCompatActivity activity, ScreenParams screenParams,
                               TitleBarBackButtonListener titleBarBackButtonListener) {
@@ -44,15 +44,16 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
         if (sideMenuParams == null) {
             createStack(this);
         } else {
-            createSideMenu();
+            sideMenu = createSideMenu();
             createStack(sideMenu.getContentContainer());
         }
     }
 
-    private void createSideMenu() {
-        sideMenu = new SideMenu(getContext(), sideMenuParams);
+    private SideMenu createSideMenu() {
+        SideMenu sideMenu = new SideMenu(getContext(), sideMenuParams);
         RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         addView(sideMenu, lp);
+        return sideMenu;
     }
 
     private void createStack(RelativeLayout parent) {
@@ -78,6 +79,9 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     @Override
     public void destroy() {
         stack.destroy();
+        if (sideMenu != null) {
+            sideMenu.destroy();
+        }
     }
 
     @Override
@@ -98,7 +102,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
 
     @Override
     public void newStack(ScreenParams params) {
-        RelativeLayout parent = sideMenuParams == null ? this : sideMenu.getContentContainer();
+        RelativeLayout parent = sideMenu == null ? this : sideMenu.getContentContainer();
         createStack(parent);
     }
 

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

@@ -6,4 +6,5 @@ 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

@@ -9,7 +9,9 @@ public class SideMenuParamsParser extends Parser {
     public static SideMenuParams parse(Bundle sideMenu) {
         SideMenuParams result = new SideMenuParams();
         result.screenId = sideMenu.getString("screenId");
+        result.navigationParams = sideMenu.getBundle("navigationParams");
         result.disableOpenGesture = sideMenu.getBoolean("disableOpenGesture", false);
+        result.passProps = sideMenu.getBundle("passProps");
         return result;
     }
 }

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

@@ -18,6 +18,11 @@ public class SideMenu extends DrawerLayout {
         return contentContainer;
     }
 
+    public void destroy() {
+        sideMenuView.ensureUnmountOnDetachedFromWindow();
+        removeView(sideMenuView);
+    }
+
     public SideMenu(Context context, SideMenuParams sideMenuParams) {
         super(context);
         createContentContainer();

src/deprecated/platformSpecificDeprecated.android.js

@@ -143,6 +143,7 @@ function convertDrawerParamsToSideMenuParams(drawerParams) {
   result.disableOpenGesture = drawer.disableOpenGesture !== undefined;
   result.screenId = drawer.left.screen;
   addNavigatorParams(result);
+  result = adaptNavigationParams(result);
 
   return result;
 }