Skip to content

fix(TextInput): report correct selection after autofill on Android #57809

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.

Sign up for GitHub

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

Open
stareezy-1 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

fix(TextInput): report correct selection after autofill on Android #57809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions ...eactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputTextWatcher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ internal class ReactTextInputTextWatcher(
private val eventDispatcher: EventDispatcher? = UIManagerHelper.getEventDispatcher(reactContext)
private val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
private var previousText: String? = null
private var shouldDispatchChange: Boolean = false

override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
// Incoming charSequence gets mutated before onTextChanged() is invoked
Expand All @@ -46,6 +47,15 @@ internal class ReactTextInputTextWatcher(
return
}

shouldDispatchChange = true
}

override fun afterTextChanged(s: Editable) {
if (!shouldDispatchChange) {
return
}
shouldDispatchChange = false

val stateWrapper = editText.stateWrapper

if (stateWrapper != null) {
Expand All @@ -55,7 +65,10 @@ internal class ReactTextInputTextWatcher(
stateWrapper.updateState(newStateData)
}

// The event that contains the event counter and updates it must be sent first.
// Dispatch in afterTextChanged so that the selection reflects the final cursor
// position. During autofill, onTextChanged fires before Android updates the
// selection, causing {start: 0, end: 0} to be reported instead of the actual
// cursor position.
eventDispatcher?.dispatchEvent(
ReactTextChangedEvent(
surfaceId,
Expand All @@ -67,6 +80,4 @@ internal class ReactTextInputTextWatcher(
),
)
}

override fun afterTextChanged(s: Editable) = Unit
}