From 3d3c5f208196178aad3d8116ce61bfe5b9ad14f7 Mon Sep 17 00:00:00 2001 From: Vidocq Date: Mon, 27 Nov 2023 06:39:17 +0800 Subject: [PATCH] fix(android): menu shows when disabled set in some cases --- .../mpiannucci/reactnativecontextmenu/ContextMenuView.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/mpiannucci/reactnativecontextmenu/ContextMenuView.java b/android/src/main/java/com/mpiannucci/reactnativecontextmenu/ContextMenuView.java index 291d8a8..7554774 100644 --- a/android/src/main/java/com/mpiannucci/reactnativecontextmenu/ContextMenuView.java +++ b/android/src/main/java/com/mpiannucci/reactnativecontextmenu/ContextMenuView.java @@ -67,7 +67,7 @@ public ContextMenuView(final Context context) { gestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() { @Override public boolean onSingleTapConfirmed(MotionEvent e) { - if (dropdownMenuMode) { + if (dropdownMenuMode && !disabled) { contextMenu.show(); } return super.onSingleTapConfirmed(e); @@ -75,7 +75,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) { @Override public void onLongPress(MotionEvent e) { - if (!dropdownMenuMode) { + if (!dropdownMenuMode && !disabled) { contextMenu.show(); } } @@ -107,8 +107,6 @@ public void setActions(@Nullable ReadableArray actions) { Menu menu = contextMenu.getMenu(); menu.clear(); - if (disabled) { return; } - for (int i = 0; i < actions.size(); i++) { ReadableMap action = actions.getMap(i); @Nullable Drawable systemIcon = getResourceWithName(getContext(), action.getString("systemIcon"));