Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task auto focus fix #18889

Merged
merged 8 commits into from
May 14, 2023
Merged

Task auto focus fix #18889

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12b0b72
merge
dhairyasenjaliya May 12, 2023
0a1ebf8
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify
dhairyasenjaliya May 12, 2023
62b455a
Merge branch 'Expensify:main' into main
dhairyasenjaliya May 12, 2023
6f7e264
Merge branch 'Expensify:main' into main
dhairyasenjaliya May 13, 2023
928ad18
onEntryTransitionEnd added for TaskTitlePage
dhairyasenjaliya May 13, 2023
135194e
remove unused autofocus prop
dhairyasenjaliya May 13, 2023
afb11d2
Auto focus for description page
dhairyasenjaliya May 13, 2023
011e83e
Code CleanUp
dhairyasenjaliya May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/pages/tasks/NewTaskDescriptionPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -36,6 +36,8 @@ const defaultProps = {
};

const NewTaskDescriptionPage = (props) => {
const descriptionRef = useRef(null);

/**
* @param {Object} values - form input values passed by the Form component
* @returns {Object}
Expand All @@ -56,7 +58,16 @@ const NewTaskDescriptionPage = (props) => {
return null;
}
return (
<ScreenWrapper includeSafeAreaPaddingBottom={false}>
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
onEntryTransitionEnd={() => {
if (!descriptionRef.current) {
return;
}

descriptionRef.current.focus();
}}
>
<HeaderWithCloseButton
title={props.translate('newTaskPage.description')}
onCloseButtonPress={() => Navigation.dismissModal()}
Expand All @@ -76,6 +87,7 @@ const NewTaskDescriptionPage = (props) => {
defaultValue={props.task.description}
inputID="taskDescription"
label={props.translate('newTaskPage.description')}
ref={(el) => (descriptionRef.current = el)}
/>
</View>
</Form>
Expand Down
16 changes: 13 additions & 3 deletions src/pages/tasks/NewTaskTitlePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -37,6 +37,7 @@ const defaultProps = {
};

const NewTaskTitlePage = (props) => {
const titleRef = useRef(null);
/**
* @param {Object} values - form input values passed by the Form component
* @returns {Boolean}
Expand Down Expand Up @@ -64,7 +65,16 @@ const NewTaskTitlePage = (props) => {
return null;
}
return (
<ScreenWrapper includeSafeAreaPaddingBottom={false}>
<ScreenWrapper
onEntryTransitionEnd={() => {
if (!titleRef.current) {
return;
}

titleRef.current.focus();
}}
includeSafeAreaPaddingBottom={false}
>
<HeaderWithCloseButton
title={props.translate('newTaskPage.title')}
onCloseButtonPress={() => Navigation.dismissModal()}
Expand All @@ -82,7 +92,7 @@ const NewTaskTitlePage = (props) => {
<View style={styles.mb5}>
<TextInput
defaultValue={props.task.title}
autoFocus
ref={(el) => (titleRef.current = el)}
inputID="taskTitle"
label={props.translate('newTaskPage.title')}
/>
Expand Down