Prevent scrollView to scroll with dpad when scrollEnabled property is…

… set to false.
facebook · Jun 19, 2019 · a150143 · a150143
1 parent a89e932
commit a150143
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -14,6 +14,7 @@
 import android.graphics.drawable.Drawable;
 import androidx.core.view.ViewCompat;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -300,6 +301,23 @@ public boolean onTouchEvent(MotionEvent ev) {
     return super.onTouchEvent(ev);
   }
 
+  @Override
+  public boolean executeKeyEvent(KeyEvent event) {
+    int eventKeyCode = event.getKeyCode();
+    if (!mScrollEnabled
+    && (eventKeyCode == KeyEvent.KEYCODE_DPAD_DOWN
+    || eventKeyCode == KeyEvent.KEYCODE_DPAD_DOWN_LEFT
+    || eventKeyCode == KeyEvent.KEYCODE_DPAD_DOWN_RIGHT
+    || eventKeyCode == KeyEvent.KEYCODE_DPAD_UP
+    || eventKeyCode == KeyEvent.KEYCODE_DPAD_UP_LEFT
+    || eventKeyCode == KeyEvent.KEYCODE_DPAD_UP_RIGHT
+    || eventKeyCode == KeyEvent.KEYCODE_DPAD_LEFT
+    || eventKeyCode == KeyEvent.KEYCODE_DPAD_RIGHT)) {
+      return false;
+    }
+    return super.executeKeyEvent(event);
+  }
+
   @Override
   public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
     if (removeClippedSubviews && mClippingRect == null) {