Direct explicit focus on input fields to fix the issue where focus is…

… lost on dismissing keyboard
millicast · Jun 6, 2024 · 6b853fc · 6b853fc
1 parent 56cc63a
commit 6b853fc
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