Fix bad merge (#55)

Author: mpiannucci

android/src/main/java/com/mpiannucci/reactnativecontextmenu/ContextMenuManager.java

@@ -40,6 +40,11 @@ public void setActions(ContextMenuView view, @Nullable ReadableArray actions) {
         view.setActions(actions);
     }
 
+    @ReactProp(name = "dropdownMenuMode")
+    public void setDropdownMenuMode(ContextMenuView view, @Nullable boolean enabled) {
+        view.setDropdownMenuMode(enabled);
+    }
+
     @androidx.annotation.Nullable
     @Override
     public Map<String, Object> getExportedCustomDirectEventTypeConstants() {

android/src/main/java/com/mpiannucci/reactnativecontextmenu/ContextMenuView.java

@@ -43,6 +43,8 @@ public Action(String title, boolean disabled) {
 
     boolean cancelled = true;
 
+    protected boolean dropdownMenuMode = false;
+
     public ContextMenuView(final Context context) {
         super(context);
 
@@ -51,9 +53,19 @@ public ContextMenuView(final Context context) {
         contextMenu.setOnDismissListener(this);
 
         gestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapConfirmed(MotionEvent e) {
+                if (dropdownMenuMode) {
+                    contextMenu.show();
+                }
+                return super.onSingleTapConfirmed(e);
+            }
+
             @Override
             public void onLongPress(MotionEvent e) {
-                contextMenu.show();
+                if (!dropdownMenuMode) {
+                    contextMenu.show();
+                }
             }
         });
     }
@@ -88,6 +100,10 @@ public void setActions(@Nullable ReadableArray actions) {
         }
     }
 
+    public void setDropdownMenuMode(@Nullable boolean enabled) {
+        this.dropdownMenuMode = enabled;
+    }
+
     @Override
     public boolean onMenuItemClick(MenuItem menuItem) {
         cancelled = false;

ios/ContextMenu.m

@@ -6,7 +6,8 @@ @implementation ContextMenu
 RCT_EXPORT_MODULE()
 
 - (UIView *) view {
-  return [[ContextMenuView alloc] init];
+    ContextMenuView *contextMenuView = [[ContextMenuView alloc] init];
+    return contextMenuView;
 }
 
 RCT_EXPORT_VIEW_PROPERTY(title, NSString)
@@ -16,5 +17,12 @@ - (UIView *) view {
 RCT_CUSTOM_VIEW_PROPERTY(previewBackgroundColor, UIColor, ContextMenuView) {
   view.previewBackgroundColor = json != nil ? [RCTConvert UIColor:json] : nil;
 }
+RCT_CUSTOM_VIEW_PROPERTY(dropdownMenuMode, BOOL, ContextMenuView) {
+    if (@available(iOS 14.0, *)) {
+        view.showsMenuAsPrimaryAction = json != nil ? [RCTConvert BOOL:json] : view.showsMenuAsPrimaryAction;
+    } else {
+        // This is not available on other versions... sorry!
+    }
+}
 
 @end

ios/ContextMenuView.m

@@ -20,6 +20,18 @@ @implementation ContextMenuView {
   UIView *_customView;
 }
 
+- (id) init {
+    self = [super init];
+    
+    if (@available(iOS 14.0, *)) {
+        self.contextMenuInteractionEnabled = true;
+    } else {
+        // Fallback on earlier versions
+    }
+    
+    return self;
+}
+
 - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
 {
   if ([subview.nativeID isEqualToString:@"ContextMenuPreview"]) {