Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PATCH: Android - Fix caret resetting to the beginning of the input #52734

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions patches/react-native+0.75.2+021+ReactEditText.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -418,6 +418,10 @@ public class ReactEditText extends AppCompatEditText {
return;
}

+ maybeSetSelection(start, end);
+ }
+
+ private void maybeSetSelection(int start, int end) {
if (start != ReactConstants.UNSET && end != ReactConstants.UNSET) {
// clamp selection values for safety
start = clampToTextLength(start);
@@ -544,7 +548,8 @@ public class ReactEditText extends AppCompatEditText {
int selectionStart = getSelectionStart();
int selectionEnd = getSelectionEnd();
setInputType(mStagedInputType);
- setSelection(selectionStart, selectionEnd);
+ // Restore the selection
+ maybeSetSelection(selectionStart, selectionEnd);
}
}

@@ -1063,11 +1068,17 @@ public class ReactEditText extends AppCompatEditText {
public void onAttachedToWindow() {
super.onAttachedToWindow();

+ int selectionStart = getSelectionStart();
+ int selectionEnd = getSelectionEnd();
+
// Used to ensure that text is selectable inside of removeClippedSubviews
// See https://github.com/facebook/react-native/issues/6805 for original
// fix that was ported to here.

super.setTextIsSelectable(true);
+
+ // Restore the selection since `setTextIsSelectable` changed it.
+ maybeSetSelection(selectionStart, selectionEnd);

if (mContainsImages) {
Spanned text = getText();