diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java index b86fc5067ae..abc92b4b14b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java @@ -499,7 +499,7 @@ public class ReactEditText extends EditText { return mTextWatcherDelegator; } - private boolean isMultiline() { + /* package */ boolean isMultiline() { return (getInputType() & InputType.TYPE_TEXT_FLAG_MULTI_LINE) != 0; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java index 0fd50130d25..d3ce4db4dc3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java @@ -6,8 +6,6 @@ */ package com.facebook.react.views.textinput; -import static android.view.View.FOCUS_FORWARD; - import android.graphics.PorterDuff; import android.graphics.Typeface; import android.graphics.drawable.Drawable; @@ -904,11 +902,9 @@ public class ReactTextInputManager extends BaseViewManager 0 || actionId == EditorInfo.IME_NULL) { + if ((actionId & EditorInfo.IME_MASK_ACTION) != 0 || actionId == EditorInfo.IME_NULL) { boolean blurOnSubmit = editText.getBlurOnSubmit(); - boolean isMultiline = - ((editText.getInputType() & InputType.TYPE_TEXT_FLAG_MULTI_LINE) != 0); + boolean isMultiline = editText.isMultiline(); // Motivation: // * blurOnSubmit && isMultiline => Clear focus; prevent default behaviour (return @@ -931,13 +927,20 @@ public class ReactTextInputManager extends BaseViewManager