Merge pull request #15184 from daraksha-dk/daraksha-dk-fix-new-room-k…

…eyboard
Expensify · Feb 16, 2023 · 356543f · 356543f
2 parents 2445604 + 02460af
commit 356543f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/components/RoomNameInput/index.native.js b/src/components/RoomNameInput/index.native.js
@@ -46,6 +46,7 @@ class RoomNameInput extends Component {
                 onBlur={this.props.onBlur}
                 autoFocus={this.props.autoFocus}
                 autoCapitalize="none"
+                shouldDelayFocus={this.props.shouldDelayFocus}
             />
         );
     }

diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -27,6 +27,9 @@ const propTypes = {
 
     /** AutoFocus */
     autoFocus: PropTypes.bool,
+
+    /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
+    shouldDelayFocus: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -39,6 +42,7 @@ const defaultProps = {
     inputID: undefined,
     onBlur: () => {},
     autoFocus: false,
+    shouldDelayFocus: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -19,6 +19,7 @@ import Permissions from '../../libs/Permissions';
 import Log from '../../libs/Log';
 import * as ValidationUtils from '../../libs/ValidationUtils';
 import Form from '../../components/Form';
+import shouldDelayFocus from '../../libs/shouldDelayFocus';
 
 const propTypes = {
     /** All reports shared with the user */
@@ -141,6 +142,7 @@ class WorkspaceNewRoomPage extends React.Component {
                         <RoomNameInput
                             inputID="roomName"
                             autoFocus
+                            shouldDelayFocus={shouldDelayFocus}
                         />
                     </View>
                     <View style={styles.mb5}>