Implement ContextualMenu in Modals

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

@@ -175,14 +175,14 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void showContextualMenu(final ReadableMap params, final Callback onButtonClicked) {
+    public void showContextualMenu(final String screenInstanceId, final ReadableMap params, final Callback onButtonClicked) {
         ContextualMenuParams contextualMenuParams =
                 new ContextualMenuParamsParser().parse(BundleConverter.toBundle(params));
-        NavigationCommandsHandler.showContextualMenu(contextualMenuParams, onButtonClicked);
+        NavigationCommandsHandler.showContextualMenu(screenInstanceId, contextualMenuParams, onButtonClicked);
     }
 
     @ReactMethod
-    public void dismissContextualMenu() {
-        NavigationCommandsHandler.dismissContextualMenu();
+    public void dismissContextualMenu(String screenInstanceId) {
+        NavigationCommandsHandler.dismissContextualMenu(screenInstanceId);
     }
 }

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

@@ -6,10 +6,12 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.Window;
 import android.view.WindowManager;
 
+import com.facebook.react.bridge.Callback;
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.ModalScreenLayout;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
+import com.reactnativenavigation.params.ContextualMenuParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
@@ -43,6 +45,14 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         layout.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButton);
     }
 
+    public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
+        layout.showContextualMenu(screenInstanceId, params, onButtonClicked);
+    }
+
+    public void dismissContextualMenu(String screenInstanceId) {
+        layout.dismissContextualMenu(screenInstanceId);
+    }
+
     @Override
     public boolean onTitleBarBackButtonClick() {
         if (!layout.onBackPressed()) {

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

@@ -2,9 +2,11 @@ package com.reactnativenavigation.controllers;
 
 import android.support.v7.app.AppCompatActivity;
 
+import com.facebook.react.bridge.Callback;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ModalDismissedEvent;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
+import com.reactnativenavigation.params.ContextualMenuParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
@@ -119,6 +121,18 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
         }
     }
 
+    public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
+        for (Modal modal : stack) {
+            modal.showContextualMenu(screenInstanceId, params, onButtonClicked);
+        }
+    }
+
+    public void dismissContextualMenu(String screenInstanceId) {
+        for (Modal modal : stack) {
+            modal.dismissContextualMenu(screenInstanceId);
+        }
+    }
+
     @Override
     public boolean onTitleBarBackButtonClick() {
         // Do nothing and let the layout handle the back button click

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

@@ -250,12 +250,14 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         layout.showSnackbar(params);
     }
 
-    public void showContextualMenu(ContextualMenuParams params, Callback onButtonClicked) {
-        layout.showContextualMenu(params, onButtonClicked);
+    public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
+        layout.showContextualMenu(screenInstanceId, params, onButtonClicked);
+        modalController.showContextualMenu(screenInstanceId, params, onButtonClicked);
     }
 
-    public void dismissContextualMenu() {
-        layout.dismissContextualMenu();
+    public void dismissContextualMenu(String screenInstanceId) {
+        layout.dismissContextualMenu(screenInstanceId);
+        modalController.dismissContextualMenu(screenInstanceId);
     }
 
     @Override

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

@@ -331,7 +331,7 @@ public class NavigationCommandsHandler {
         });
     }
 
-    public static void showContextualMenu(final ContextualMenuParams params, final Callback onButtonClicked) {
+    public static void showContextualMenu(final String screenInstanceId, final ContextualMenuParams params, final Callback onButtonClicked) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;
@@ -340,12 +340,12 @@ public class NavigationCommandsHandler {
         NavigationApplication.instance.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                currentActivity.showContextualMenu(params, onButtonClicked);
+                currentActivity.showContextualMenu(screenInstanceId, params, onButtonClicked);
             }
         });
     }
 
-    public static void dismissContextualMenu() {
+    public static void dismissContextualMenu(final String screenInstanceId) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;
@@ -354,7 +354,7 @@ public class NavigationCommandsHandler {
         NavigationApplication.instance.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                currentActivity.dismissContextualMenu();
+                currentActivity.dismissContextualMenu(screenInstanceId);
             }
         });
     }

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

@@ -207,12 +207,12 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     @Override
-    public void showContextualMenu(ContextualMenuParams params, Callback onButtonClicked) {
+    public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
         getCurrentScreenStack().peek().showContextualMenu(params, onButtonClicked);
     }
 
     @Override
-    public void dismissContextualMenu() {
+    public void dismissContextualMenu(String screenInstanceId) {
         getCurrentScreenStack().peek().dismissContextualMenu();
     }
 

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

@@ -35,7 +35,7 @@ public interface Layout extends ScreenStackContainer {
 
     boolean containsNavigator(String navigatorId);
 
-    void showContextualMenu(ContextualMenuParams params, Callback onButtonClicked);
+    void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked);
 
-    void dismissContextualMenu();
+    void dismissContextualMenu(String screenInstanceId);
 }

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

@@ -212,13 +212,13 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     }
 
     @Override
-    public void showContextualMenu(ContextualMenuParams params, Callback onButtonClicked) {
-        stack.peek().showContextualMenu(params, onButtonClicked);
+    public void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked) {
+        stack.showContextualMenu(screenInstanceId, params, onButtonClicked);
     }
 
     @Override
-    public void dismissContextualMenu() {
-        stack.peek().dismissContextualMenu();
+    public void dismissContextualMenu(String screenInstanceId) {
+        stack.dismissContextualMenu(screenInstanceId);
     }
 
     @Override

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

@@ -7,7 +7,9 @@ import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 
+import com.facebook.react.bridge.Callback;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.params.ContextualMenuParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -236,6 +238,24 @@ public class ScreenStack {
         });
     }
 
+    public void showContextualMenu(String screenInstanceId, final ContextualMenuParams params, final Callback onButtonClicked) {
+        performOnScreen(screenInstanceId, new Task<Screen>() {
+            @Override
+            public void run(Screen screen) {
+                screen.showContextualMenu(params, onButtonClicked);
+            }
+        });
+    }
+
+    public void dismissContextualMenu(String screenInstanceId) {
+        performOnScreen(screenInstanceId, new Task<Screen>() {
+            @Override
+            public void run(Screen screen) {
+                screen.dismissContextualMenu();
+            }
+        });
+    }
+
     public StyleParams getCurrentScreenStyleParams() {
         return stack.peek().getStyleParams();
     }

src/deprecated/platformSpecificDeprecated.android.js

@@ -466,7 +466,7 @@ function showSnackbar(navigator, params) {
   return newPlatformSpecific.showSnackbar(params);
 }
 
-function showContextualMenu(navigator, params, onButtonPressed) {
+function showContextualMenu(navigator, params) {
   const contextualMenu = {
     buttons: [],
     backButton: {id: 'back'},
@@ -483,7 +483,7 @@ function showContextualMenu(navigator, params, onButtonPressed) {
     contextualMenu.buttons.push(btn);
   });
 
-  newPlatformSpecific.showContextualMenu(contextualMenu, onButtonPressed);
+  newPlatformSpecific.showContextualMenu(navigator.screenInstanceID, contextualMenu, params.onButtonPressed);
 }
 
 function dismissContextualMenu() {

src/platformSpecific.android.js

@@ -120,12 +120,12 @@ function showSnackbar(params) {
   NativeReactModule.showSnackbar(params);
 }
 
-function showContextualMenu(params, onButtonPressed) {
-  NativeReactModule.showContextualMenu(params, onButtonPressed);
+function showContextualMenu(screenInstanceID, params, onButtonPressed) {
+  NativeReactModule.showContextualMenu(screenInstanceID, params, onButtonPressed);
 }
 
-function dismissContextualMenu() {
-  NativeReactModule.dismissContextualMenu();
+function dismissContextualMenu(screenInstanceID) {
+  NativeReactModule.dismissContextualMenu(screenInstanceID);
 }
 
 module.exports = {