Skip to content

Commit

Permalink
Fix lint warns and errors in ReactEditText (#41820)
Browse files Browse the repository at this point in the history 
Summary:
Pull Request resolved: #41820

Fix lint warns and errors in ReactEditText

changelog: [internal] internal

Reviewed By: NickGerleman

Differential Revision: D51919967

fbshipit-source-id: e32d69f7d950f2577a1fcb372d501db83322d61c
  • Loading branch information
@mdvacca @facebook-github-bot
mdvacca authored and facebook-github-bot committed Dec 7, 2023
1 parent eb661df commit 18f8a53
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 91 deletions.
14 changes: 7 additions & 7 deletions ...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ public class ReactEditText extends AppCompatEditText {
// *TextChanged events should be triggered. This is less expensive than removing the text
// listeners and adding them back again after the text change is completed.
protected boolean mIsSettingTextFromJS;
private int mDefaultGravityHorizontal;
private int mDefaultGravityVertical;
private final int mDefaultGravityHorizontal;
private final int mDefaultGravityVertical;

/** A count of events sent to JS or C++. */
protected int mNativeEventCount;
Expand Down Expand Up @@ -120,7 +120,7 @@ public class ReactEditText extends AppCompatEditText {
private boolean mDidAttachToWindow = false;
private @Nullable String mPlaceholder = null;

private ReactViewBackgroundManager mReactBackgroundManager;
private final ReactViewBackgroundManager mReactBackgroundManager;

private StateWrapper mStateWrapper = null;
protected boolean mDisableTextDiffing = false;
Expand Down Expand Up @@ -358,11 +358,11 @@ public void removeTextChangedListener(TextWatcher watcher) {
}
}

public void setContentSizeWatcher(ContentSizeWatcher contentSizeWatcher) {
public void setContentSizeWatcher(@Nullable ContentSizeWatcher contentSizeWatcher) {
mContentSizeWatcher = contentSizeWatcher;
}

public void setScrollWatcher(ScrollWatcher scrollWatcher) {
public void setScrollWatcher(@Nullable ScrollWatcher scrollWatcher) {
mScrollWatcher = scrollWatcher;
}

Expand Down Expand Up @@ -422,7 +422,7 @@ protected void onFocusChanged(boolean focused, int direction, Rect previouslyFoc
}
}

public void setSelectionWatcher(SelectionWatcher selectionWatcher) {
public void setSelectionWatcher(@Nullable SelectionWatcher selectionWatcher) {
mSelectionWatcher = selectionWatcher;
}

Expand Down Expand Up @@ -470,7 +470,7 @@ public String getSubmitBehavior() {
return mSubmitBehavior;
}

public void setSubmitBehavior(String submitBehavior) {
public void setSubmitBehavior(@Nullable String submitBehavior) {
mSubmitBehavior = submitBehavior;
}

Expand Down
159 changes: 77 additions & 82 deletions .../ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import android.text.SpannableStringBuilder;
import android.text.TextWatcher;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
Expand Down Expand Up @@ -798,9 +797,9 @@ public void setMaxLength(ReactEditText view, @Nullable Integer maxLength) {
if (maxLength == null) {
if (currentFilters.length > 0) {
LinkedList<InputFilter> list = new LinkedList<>();
for (int i = 0; i < currentFilters.length; i++) {
if (!(currentFilters[i] instanceof InputFilter.LengthFilter)) {
list.add(currentFilters[i]);
for (InputFilter currentFilter : currentFilters) {
if (!(currentFilter instanceof InputFilter.LengthFilter)) {
list.add(currentFilter);
}
}
if (!list.isEmpty()) {
Expand Down Expand Up @@ -889,14 +888,19 @@ public void setAutoCapitalize(ReactEditText view, Dynamic autoCapitalize) {
} else if (autoCapitalize.getType() == ReadableType.String) {
final String autoCapitalizeStr = autoCapitalize.asString();

if (autoCapitalizeStr.equals("none")) {
autoCapitalizeValue = 0;
} else if (autoCapitalizeStr.equals("characters")) {
autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
} else if (autoCapitalizeStr.equals("words")) {
autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_WORDS;
} else if (autoCapitalizeStr.equals("sentences")) {
autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
switch (autoCapitalizeStr) {
case "none":
autoCapitalizeValue = 0;
break;
case "characters":
autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
break;
case "words":
autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_WORDS;
break;
case "sentences":
autoCapitalizeValue = InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
break;
}
}

Expand Down Expand Up @@ -1067,7 +1071,7 @@ private final class ReactTextInputTextWatcher implements TextWatcher {
private final ReactEditText mEditText;
private final EventDispatcher mEventDispatcher;
private final int mSurfaceId;
private String mPreviousText;
@Nullable private String mPreviousText;

public ReactTextInputTextWatcher(
final ReactContext reactContext, final ReactEditText editText) {
Expand Down Expand Up @@ -1136,73 +1140,67 @@ protected void addEventEmitters(
editText.setEventDispatcher(getEventDispatcher(reactContext, editText));
editText.addTextChangedListener(new ReactTextInputTextWatcher(reactContext, editText));
editText.setOnFocusChangeListener(
new View.OnFocusChangeListener() {
public void onFocusChange(View v, boolean hasFocus) {
int surfaceId = reactContext.getSurfaceId();
EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
if (hasFocus) {
eventDispatcher.dispatchEvent(
new ReactTextInputFocusEvent(surfaceId, editText.getId()));
} else {
eventDispatcher.dispatchEvent(
new ReactTextInputBlurEvent(surfaceId, editText.getId()));

eventDispatcher.dispatchEvent(
new ReactTextInputEndEditingEvent(
surfaceId, editText.getId(), editText.getText().toString()));
}
(v, hasFocus) -> {
int surfaceId = reactContext.getSurfaceId();
EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
if (hasFocus) {
eventDispatcher.dispatchEvent(
new ReactTextInputFocusEvent(surfaceId, editText.getId()));
} else {
eventDispatcher.dispatchEvent(new ReactTextInputBlurEvent(surfaceId, editText.getId()));

eventDispatcher.dispatchEvent(
new ReactTextInputEndEditingEvent(
surfaceId, editText.getId(), editText.getText().toString()));
}
});

editText.setOnEditorActionListener(
new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent keyEvent) {
if ((actionId & EditorInfo.IME_MASK_ACTION) != 0 || actionId == EditorInfo.IME_NULL) {
boolean isMultiline = editText.isMultiline();

boolean shouldSubmit = editText.shouldSubmitOnReturn();
boolean shouldBlur = editText.shouldBlurOnReturn();

// Motivation:
// * shouldSubmit => Clear focus; prevent default behavior (return true);
// * shouldBlur => Submit; prevent default behavior (return true);
// * !shouldBlur && !shouldSubmit && isMultiline => Perform default behavior (return
// false);
// * !shouldBlur && !shouldSubmit && !isMultiline => Prevent default behavior (return
// true);
if (shouldSubmit) {
EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
eventDispatcher.dispatchEvent(
new ReactTextInputSubmitEditingEvent(
reactContext.getSurfaceId(),
editText.getId(),
editText.getText().toString()));
}

if (shouldBlur) {
editText.clearFocus();
}

// Prevent default behavior except when we want it to insert a newline.
if (shouldBlur || shouldSubmit || !isMultiline) {
return true;
}

// If we've reached this point, it means that the TextInput has 'submitBehavior' set
// nullish and 'multiline' set to true. But it's still possible to get IME_ACTION_NEXT
// and IME_ACTION_PREVIOUS here in case if 'disableFullscreenUI' is false and Android
// decides to render this EditText in the full screen mode (when a phone has the
// landscape orientation for example). The full screen EditText also renders an action
// button specified by the 'returnKeyType' prop. We have to prevent Android from
// requesting focus from the next/previous focusable view since it must only be
// controlled from JS.
return actionId == EditorInfo.IME_ACTION_NEXT
|| actionId == EditorInfo.IME_ACTION_PREVIOUS;
(v, actionId, keyEvent) -> {
if ((actionId & EditorInfo.IME_MASK_ACTION) != 0 || actionId == EditorInfo.IME_NULL) {
boolean isMultiline = editText.isMultiline();

boolean shouldSubmit = editText.shouldSubmitOnReturn();
boolean shouldBlur = editText.shouldBlurOnReturn();

// Motivation:
// * shouldSubmit => Clear focus; prevent default behavior (return true);
// * shouldBlur => Submit; prevent default behavior (return true);
// * !shouldBlur && !shouldSubmit && isMultiline => Perform default behavior (return
// false);
// * !shouldBlur && !shouldSubmit && !isMultiline => Prevent default behavior (return
// true);
if (shouldSubmit) {
EventDispatcher eventDispatcher = getEventDispatcher(reactContext, editText);
eventDispatcher.dispatchEvent(
new ReactTextInputSubmitEditingEvent(
reactContext.getSurfaceId(),
editText.getId(),
editText.getText().toString()));
}

return true;
if (shouldBlur) {
editText.clearFocus();
}

// Prevent default behavior except when we want it to insert a newline.
if (shouldBlur || shouldSubmit || !isMultiline) {
return true;
}

// If we've reached this point, it means that the TextInput has 'submitBehavior' set
// nullish and 'multiline' set to true. But it's still possible to get IME_ACTION_NEXT
// and IME_ACTION_PREVIOUS here in case if 'disableFullscreenUI' is false and Android
// decides to render this EditText in the full screen mode (when a phone has the
// landscape orientation for example). The full screen EditText also renders an action
// button specified by the 'returnKeyType' prop. We have to prevent Android from
// requesting focus from the next/previous focusable view since it must only be
// controlled from JS.
return actionId == EditorInfo.IME_ACTION_NEXT
|| actionId == EditorInfo.IME_ACTION_PREVIOUS;
}

return true;
});
}

Expand Down Expand Up @@ -1295,7 +1293,7 @@ private static class ReactScrollWatcher implements ScrollWatcher {
private final ReactEditText mReactEditText;
private final EventDispatcher mEventDispatcher;
private final int mSurfaceId;
private int mPreviousHoriz;
private int mPreviousHorizontal;
private int mPreviousVert;

public ReactScrollWatcher(ReactEditText editText) {
Expand All @@ -1307,7 +1305,7 @@ public ReactScrollWatcher(ReactEditText editText) {

@Override
public void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert) {
if (mPreviousHoriz != horiz || mPreviousVert != vert) {
if (mPreviousHorizontal != horiz || mPreviousVert != vert) {
ScrollEvent event =
ScrollEvent.obtain(
mSurfaceId,
Expand All @@ -1324,14 +1322,14 @@ public void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert) {

mEventDispatcher.dispatchEvent(event);

mPreviousHoriz = horiz;
mPreviousHorizontal = horiz;
mPreviousVert = vert;
}
}
}

@Override
public @Nullable Map getExportedViewConstants() {
public @Nullable Map<String, Object> getExportedViewConstants() {
return MapBuilder.of(
"AutoCapitalizationType",
MapBuilder.of(
Expand Down Expand Up @@ -1403,7 +1401,8 @@ public Object updateState(
TextAttributeProps.getJustificationMode(props, currentJustificationMode));
}

public Object getReactTextUpdate(ReactEditText view, ReactStylesDiffMap props, MapBuffer state) {
public @Nullable Object getReactTextUpdate(
ReactEditText view, ReactStylesDiffMap props, MapBuffer state) {
// If native wants to update the state wrapper but the state data hasn't actually
// changed, the MapBuffer may be empty
if (state.getCount() == 0) {
Expand All @@ -1412,10 +1411,6 @@ public Object getReactTextUpdate(ReactEditText view, ReactStylesDiffMap props, M

MapBuffer attributedString = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING);
MapBuffer paragraphAttributes = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES);
if (attributedString == null || paragraphAttributes == null) {
throw new IllegalArgumentException(
"Invalid TextInput State (MapBuffer) was received as a parameters");
}

Spannable spanned =
TextLayoutManagerMapBuffer.getOrCreateSpannableForText(
Expand Down
2 changes: 1 addition & 1 deletion ...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ScrollWatcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
package com.facebook.react.views.textinput;

public interface ScrollWatcher {
public void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert);
void onScrollChanged(int horiz, int vert, int oldHoriz, int oldVert);
}
2 changes: 1 addition & 1 deletion ...ative/ReactAndroid/src/main/java/com/facebook/react/views/textinput/SelectionWatcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
* the ReactTextInputManager to forward events from the EditText to JS
*/
interface SelectionWatcher {
public void onSelectionChanged(int start, int end);
void onSelectionChanged(int start, int end);
}

0 comments on commit 18f8a53

Please sign in to comment.