diff --git a/src/screens/userInput/UserInput.tsx b/src/screens/userInput/UserInput.tsx index fc1b6e2..22c85f8 100644 --- a/src/screens/userInput/UserInput.tsx +++ b/src/screens/userInput/UserInput.tsx @@ -138,6 +138,7 @@ export const UserInput = ({ navigation }) => { validation={validation} autoFocus={!Platform.isTV} testID="StreamNameInput" + onSubmitEditing={() => accountIdRef.current.focus()} /> @@ -151,6 +152,13 @@ export const UserInput = ({ navigation }) => { onChangeText={onChangeAccountId} validation={validation} testID="AccountIdInput" + onSubmitEditing={() => { + if (Platform.isTV && Platform.OS === 'android') { + // FIXME: Workaround in Android TV's to keep the focus directed + // to another input field otherwise the focus is lost. + streamNameRef.current.focus() + } + }} />