diff --git a/src/pages/tasks/NewTaskDescriptionPage.js b/src/pages/tasks/NewTaskDescriptionPage.js index 124a46d5065b..0d2c7ff7fff4 100644 --- a/src/pages/tasks/NewTaskDescriptionPage.js +++ b/src/pages/tasks/NewTaskDescriptionPage.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {useRef} from 'react'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import PropTypes from 'prop-types'; @@ -36,6 +36,8 @@ const defaultProps = { }; const NewTaskDescriptionPage = (props) => { + const inputRef = useRef(null); + /** * @param {Object} values - form input values passed by the Form component * @returns {Object} @@ -56,7 +58,16 @@ const NewTaskDescriptionPage = (props) => { return null; } return ( - + { + if (!inputRef.current) { + return; + } + + inputRef.current.focus(); + }} + > Navigation.dismissModal()} @@ -76,6 +87,7 @@ const NewTaskDescriptionPage = (props) => { defaultValue={props.task.description} inputID="taskDescription" label={props.translate('newTaskPage.description')} + ref={(el) => (inputRef.current = el)} /> diff --git a/src/pages/tasks/NewTaskTitlePage.js b/src/pages/tasks/NewTaskTitlePage.js index 19de502c1524..09d082fba080 100644 --- a/src/pages/tasks/NewTaskTitlePage.js +++ b/src/pages/tasks/NewTaskTitlePage.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {useRef} from 'react'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import PropTypes from 'prop-types'; @@ -37,6 +37,8 @@ const defaultProps = { }; const NewTaskTitlePage = (props) => { + const inputRef = useRef(null); + /** * @param {Object} values - form input values passed by the Form component * @returns {Boolean} @@ -64,7 +66,16 @@ const NewTaskTitlePage = (props) => { return null; } return ( - + { + if (!inputRef.current) { + return; + } + + inputRef.current.focus(); + }} + includeSafeAreaPaddingBottom={false} + > Navigation.dismissModal()} @@ -82,7 +93,7 @@ const NewTaskTitlePage = (props) => { (inputRef.current = el)} inputID="taskTitle" label={props.translate('newTaskPage.title')} />