Fix escape key for modal closing #2695
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marcaaron
commented
May 5, 2021
| @@ -79,7 +79,10 @@ class AttachmentModal extends PureComponent { | |||
| return; | |||
| } | |||
|
|
|||
| this.props.onConfirm(this.state.file); | |||
| if (this.props.onConfirm) { | |||
| this.props.onConfirm(this.state.file); | |||
There was a problem hiding this comment.
This change is unrelated. I just noticed that if we press Enter on a regular attachment modal it throws a TypeError so I fixed that up.
marcaaron
commented
May 5, 2021
| */ | ||
| subscribe(key, callback, modifiers = 'shift', captureOnInputs = false) { | ||
| const keyCode = this.getKeyCode(key); | ||
| if (events[keyCode] === undefined) { | ||
| events[keyCode] = []; | ||
| } | ||
| events[keyCode].push({callback, modifiers: _.isArray(modifiers) ? modifiers : [modifiers], captureOnInputs}); | ||
| return () => this.unsubscribe(key); |
There was a problem hiding this comment.
This is kind of extra. Probably didn't need to do it, but I like this pattern for cleaning up subscriptions.
thienlnam
approved these changes
May 5, 2021
|
✋ 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 in version: 1.0.38-1🚀
|
|
🚀 Deployed to production in version: 1.0.39-5🚀
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Details
There are two situations where
Escapekey was not workingPopovercomponent becausereact-native-modalis registering theEscapekey press as a "back button press" and we are trying to close it twice (rather we toggle it so it just reopens again)react-navigationwe lost the ability to close viaEscape. This should add that behavior back in at theScreenWrapperlevel so that any screen wrapped in that component should be able to trigger agoBack()if theesckey is pressedFixed Issues
Fixes #1039
Tests
QA Steps
Escapeafter the right panel opensEscapeEscapeTested On
These platforms have no hardware keyboard so I did not bother to test them beyond ensuring no broken behaviors were introduced
Screenshots
Web
Mobile Web
Desktop
iOS
Android