-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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.
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
Keep textinput focused if no amount is entered #9064
Keep textinput focused if no amount is entered #9064
Conversation
@sobitneupane why changing the URL fixed the regression? |
@sobitneupane before we can merge this PR, it's important you explain why the changes work. |
I agree with you @rushatgabhane 👍 👍 |
Hello @rushatgabhane, you were absolutely right. While digging deeper, I found that this solution still has some issues. Even when we open Search Page with Cmd + K, the textinput remains blurred. So, I think we should dump this solution.I have come up with new solution. We can use blurOnSubmit in the textinput. This is a simple change and works well. <TextInput
disableKeyboard
autoGrow
hideFocusedState
inputStyle={[styles.iouAmountTextInput, styles.p0, styles.noLeftBorderRadius, styles.noRightBorderRadius]}
textInputContainerStyles={[styles.borderNone, styles.noLeftBorderRadius, styles.noRightBorderRadius]}
onChangeText={this.updateAmount}
ref={el => this.textInput = el}
value={formattedAmount}
placeholder={this.props.numberFormat(0)}
keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
+ blurOnSubmit={this.state.amount!==''}
/> And one question, do we still want to keep the following change ? +<TouchableOpacity onPress={() => {
+ if (this.props.hasMultipleParticipants) {
+ return Navigation.navigate(ROUTES.getIouBillCurrencyRoute(this.props.reportID));
+ }
+ return Navigation.navigate(this.props.iouType === CONST.IOU.IOU_TYPE.SEND
+ ? ROUTES.getIouSendCurrencyRoute(this.props.reportID)
+ : ROUTES.getIouRequestCurrencyRoute(this.props.reportID));
+}}
+>
-<TouchableOpacity onPress={() => Navigation.navigate(this.props.hasMultipleParticipants
- ? ROUTES.getIouBillCurrencyRoute(this.props.reportID)
- : ROUTES.getIouRequestCurrencyRoute(this.props.reportID))}
-> I will update the PR once getting approval from you.. |
@sobitneupane sounds good. Thanks for taking a look into this
CurrencySelectionPage sets a value in Onyx, and it doesn't do anything differently depending on the link. So our choice doesn't affect the functionality. But again, we're adding 2 lines of code to use the right link. Let's do it anyway. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests well!
@sobitneupane a minor code style comment and a question
src/pages/iou/steps/IOUAmountPage.js
Outdated
if (this.props.hasMultipleParticipants) { | ||
return Navigation.navigate(ROUTES.getIouBillCurrencyRoute(this.props.reportID)); | ||
} | ||
return Navigation.navigate(this.props.iouType === CONST.IOU.IOU_TYPE.SEND |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NAB (Not a Blocker): I'd somewhat prefer -
if (x) return abc
if (y) return def
return ghi
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolved.
src/pages/iou/steps/IOUAmountPage.js
Outdated
@@ -236,6 +241,7 @@ class IOUAmountPage extends React.Component { | |||
value={formattedAmount} | |||
placeholder={this.props.numberFormat(0)} | |||
keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD} | |||
blurOnSubmit={this.state.amount !== ''} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sobitneupane can we keep blurOnSubmit
always as true
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are trying to make blurOnSubmit false
when there is no amount to proceed to next step.
If You mean to keep it always false
, I am not sure. I avoid it thinking it might cause regression.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's not add extra logic if it isn't needed.
The keyboard isn't open on this page, so it should be fine
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested and pushed the change. Working fine in my side. Please test it in your side as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, thanks for testing it
src/pages/iou/steps/IOUAmountPage.js
Outdated
? ROUTES.getIouSendCurrencyRoute(this.props.reportID) | ||
: ROUTES.getIouRequestCurrencyRoute(this.props.reportID)); | ||
if (this.props.hasMultipleParticipants) { return Navigation.navigate(ROUTES.getIouBillCurrencyRoute(this.props.reportID)); } | ||
if (this.props.iouType === CONST.IOU.IOU_TYPE.SEND) { return Navigation.navigate(ROUTES.getIouSendCurrencyRoute(this.props.reportID)); } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sobitneupane please bring the return statements to a new line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolved.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Beamanator LGTM 🎉
@sobitneupane Thanks for the quick changes!
#### PR Reviewer Checklist
- I verified the correct issue is linked in the
### Fixed Issues
section above - I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the
Tests
section - I verified the steps for Staging and/or Production testing are in the
QA steps
section - I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I verified the steps for local testing are in the
- I checked that screenshots or videos are included for tests on all platforms
- I verified tests pass on all platforms & I tested again on:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- MacOS / Desktop
- I verified there are no console errors (if there’s a console error not related to the PR, report it or open an issue for it to be fixed)
- I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
toggleReport
and notonIconClick
). - I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained “why” the code was doing something instead of only explaining “what” the code was doing.
- I verified any copy / text shown in the product was added in all
src/languages/*
files - I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named “index.js”. All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in
STYLE.md
) were followed
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
- If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- I verified that this PR follows the guidelines as stated in the Review Guidelines
- I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
- If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a
/** comment above it */
- Any functional components have the
displayName
property - The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor) - Any internal methods bound to
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
) - All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose and it is broken down into smaller components in order to separate concerns and functions
- If a new CSS style is added I verified that:
- A similar style doesn’t already exist
- The style can’t be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)
- If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like
Avatar
is modified, I verified thatAvatar
is working as expected in all cases) - If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
Tested and it's working well! 👍 @sobitneupane can you please update your test steps to also include the steps followed in this issue (#8926) which is a regression your old PR caused? It looks like the test steps in this PR were copy / pasted from your old one, even though your videos show extra test steps |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by @Beamanator in version: 1.1.72-0 🚀
|
@sobitneupane #8362 is still able to reproduce. This PR is failing. 172446657-9462f9a9-96da-4dc4-bb87-a2a4d0a35c4f.mp4 |
This is weird.
|
PR #8299 is the cause. I've commented on the PR to sort it out. |
The fix is merged, I haven't applied the CP Staging label as this felt like not a deploy blocker. But if we would prefer to CP it, the PR is here and it can be done manually. Thanks for pointing to the missed prop 🙌 |
Thanks for fixing this!! @mountiny yeah no rush to deploy this |
🚀 Deployed to production by @yuwenmemon in version: 1.1.73-2 🚀
|
Details
Solves the issue : Pressing the enter/return key on Request money page, when the button is disabled, takes focus away from the input field
Platform: Web and Desktop
Fixed Issues
$ #8362
Tests
PR Review Checklist
Contributor (PR Author) Checklist
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
filesSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)PR Reviewer Checklist
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
).src/languages/*
filesSTYLE.md
) were followed/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)QA Steps
Screenshots
Web
screenrecording.mov
Mobile Web
Desktop
Screen.Recording.2022-05-18.at.16.54.11.mov
iOS
Android