Merge pull request #147 from millicast/bugfix/direct-focus-on-input-f…

…ields Force focus on input fields
millicast · Jun 6, 2024 · 02e6d48 · 02e6d48
2 parents 56cc63a + 6b853fc
commit 02e6d48
Showing 1 changed file with 8 additions and 0 deletions.
diff --git 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()}
             />
           </FocusedComponent>
           <FocusedComponent testID="AccountIdFocusElement" componentRef={accountIdRef}>
@@ -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()
+                }
+              }}
             />
           </FocusedComponent>
           <Button