-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #52734 from ikevin127/ikevin127-textInputCaretSele…
…ctionPatch PATCH: Android - Fix caret resetting to the beginning of the input
- Loading branch information
Showing
1 changed file
with
42 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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(); |