From 12b0b72f0fb8b1c4e19db7431e501aa8105ca0b9 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Fri, 12 May 2023 22:18:49 +0530 Subject: [PATCH 1/5] merge --- src/pages/signin/SignInPageLayout/Footer.js | 7 +++---- src/styles/getModalStyles/getBaseModalStyles.js | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pages/signin/SignInPageLayout/Footer.js b/src/pages/signin/SignInPageLayout/Footer.js index cb8acb5d1e1f..b17e0faee990 100644 --- a/src/pages/signin/SignInPageLayout/Footer.js +++ b/src/pages/signin/SignInPageLayout/Footer.js @@ -25,8 +25,7 @@ const propTypes = { scrollPageToTop: PropTypes.func.isRequired, }; -const defaultProps = { -}; +const defaultProps = {}; const navigateHome = (scrollPageToTop) => { scrollPageToTop(); @@ -35,7 +34,7 @@ const navigateHome = (scrollPageToTop) => { Session.clearSignInData(); }; -const columns = ({scrollPageToTop}) => ([ +const columns = ({scrollPageToTop}) => [ { translationPath: 'footer.features', rows: [ @@ -148,7 +147,7 @@ const columns = ({scrollPageToTop}) => ([ }, ], }, -]); +]; const Footer = (props) => { const isVertical = props.isSmallScreenWidth; diff --git a/src/styles/getModalStyles/getBaseModalStyles.js b/src/styles/getModalStyles/getBaseModalStyles.js index 90e309dee1c0..ddc926b3ce09 100644 --- a/src/styles/getModalStyles/getBaseModalStyles.js +++ b/src/styles/getModalStyles/getBaseModalStyles.js @@ -3,7 +3,6 @@ import variables from '../variables'; import themeColors from '../themes/default'; import styles from '../styles'; - const getCenteredModalStyles = (windowWidth, isSmallScreenWidth) => ({ borderWidth: styles.centeredModalStyles(isSmallScreenWidth).borderWidth, width: isSmallScreenWidth ? '100%' : windowWidth - styles.centeredModalStyles(isSmallScreenWidth).marginHorizontal * 2, From 928ad18128c6b1a5fa55a7bb286166e441f2d798 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Sat, 13 May 2023 20:35:04 +0530 Subject: [PATCH 2/5] onEntryTransitionEnd added for TaskTitlePage --- src/pages/tasks/NewTaskTitlePage.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/pages/tasks/NewTaskTitlePage.js b/src/pages/tasks/NewTaskTitlePage.js index 19de502c1524..ceb22566cd44 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,7 @@ const defaultProps = { }; const NewTaskTitlePage = (props) => { + const titleRef = useRef(null); /** * @param {Object} values - form input values passed by the Form component * @returns {Boolean} @@ -64,7 +65,16 @@ const NewTaskTitlePage = (props) => { return null; } return ( - + { + if (!titleRef.current) { + return; + } + + titleRef.current.focus(); + }} + includeSafeAreaPaddingBottom={false} + > Navigation.dismissModal()} @@ -82,7 +92,8 @@ const NewTaskTitlePage = (props) => { (titleRef.current = el)} inputID="taskTitle" label={props.translate('newTaskPage.title')} /> From 135194e5b19a85b0e0f91856724f3f7f81bae8d8 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Sat, 13 May 2023 20:36:00 +0530 Subject: [PATCH 3/5] remove unused autofocus prop --- src/pages/tasks/NewTaskTitlePage.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/tasks/NewTaskTitlePage.js b/src/pages/tasks/NewTaskTitlePage.js index ceb22566cd44..ea39198d7da4 100644 --- a/src/pages/tasks/NewTaskTitlePage.js +++ b/src/pages/tasks/NewTaskTitlePage.js @@ -92,7 +92,6 @@ const NewTaskTitlePage = (props) => { (titleRef.current = el)} inputID="taskTitle" label={props.translate('newTaskPage.title')} From afb11d2b1965778f212a3e4a7c9120071b55c440 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Sat, 13 May 2023 21:18:32 +0530 Subject: [PATCH 4/5] Auto focus for description page --- src/pages/tasks/NewTaskDescriptionPage.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/pages/tasks/NewTaskDescriptionPage.js b/src/pages/tasks/NewTaskDescriptionPage.js index 124a46d5065b..4a27ad90c7a3 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 descriptionRef = 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 (!descriptionRef.current) { + return; + } + + descriptionRef.current.focus(); + }} + > Navigation.dismissModal()} @@ -76,6 +87,7 @@ const NewTaskDescriptionPage = (props) => { defaultValue={props.task.description} inputID="taskDescription" label={props.translate('newTaskPage.description')} + ref={(el) => (descriptionRef.current = el)} /> From 011e83e337ab23aadff37e84405223cb164f3bae Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Sun, 14 May 2023 18:03:36 +0530 Subject: [PATCH 5/5] Code CleanUp --- src/pages/tasks/NewTaskDescriptionPage.js | 8 ++++---- src/pages/tasks/NewTaskTitlePage.js | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/pages/tasks/NewTaskDescriptionPage.js b/src/pages/tasks/NewTaskDescriptionPage.js index 4a27ad90c7a3..0d2c7ff7fff4 100644 --- a/src/pages/tasks/NewTaskDescriptionPage.js +++ b/src/pages/tasks/NewTaskDescriptionPage.js @@ -36,7 +36,7 @@ const defaultProps = { }; const NewTaskDescriptionPage = (props) => { - const descriptionRef = useRef(null); + const inputRef = useRef(null); /** * @param {Object} values - form input values passed by the Form component @@ -61,11 +61,11 @@ const NewTaskDescriptionPage = (props) => { { - if (!descriptionRef.current) { + if (!inputRef.current) { return; } - descriptionRef.current.focus(); + inputRef.current.focus(); }} > { defaultValue={props.task.description} inputID="taskDescription" label={props.translate('newTaskPage.description')} - ref={(el) => (descriptionRef.current = el)} + ref={(el) => (inputRef.current = el)} /> diff --git a/src/pages/tasks/NewTaskTitlePage.js b/src/pages/tasks/NewTaskTitlePage.js index ea39198d7da4..09d082fba080 100644 --- a/src/pages/tasks/NewTaskTitlePage.js +++ b/src/pages/tasks/NewTaskTitlePage.js @@ -37,7 +37,8 @@ const defaultProps = { }; const NewTaskTitlePage = (props) => { - const titleRef = useRef(null); + const inputRef = useRef(null); + /** * @param {Object} values - form input values passed by the Form component * @returns {Boolean} @@ -67,11 +68,11 @@ const NewTaskTitlePage = (props) => { return ( { - if (!titleRef.current) { + if (!inputRef.current) { return; } - titleRef.current.focus(); + inputRef.current.focus(); }} includeSafeAreaPaddingBottom={false} > @@ -92,7 +93,7 @@ const NewTaskTitlePage = (props) => { (titleRef.current = el)} + ref={(el) => (inputRef.current = el)} inputID="taskTitle" label={props.translate('newTaskPage.title')} />