Skip to content

fix: Prevent enter key press on BaseOptionsSelector if screen is not focused #19824

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

Merged
arosiclair merged 6 commits into from
Jun 2, 2023
Merged

fix: Prevent enter key press on BaseOptionsSelector if screen is not focused #19824

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c8aa69
fix: prevent enter key press on BaseOptionsSelector when screen is no…
jayeshmangwani May 30, 2023
cd90969
fixed prettier error
jayeshmangwani May 30, 2023
b8e5ea4
Merge branch 'main' into prevent_key_press_on_no_screen_focus
jayeshmangwani May 31, 2023
9b49680
fix: added withNavigationFocusPropTypes to BaseOptionsSelector
jayeshmangwani May 31, 2023
2dc92b6
Merge branch 'main' into prevent_key_press_on_no_screen_focus
jayeshmangwani May 31, 2023
f206380
Merge branch 'main' into prevent_key_press_on_no_screen_focus
jayeshmangwani Jun 1, 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
7 changes: 5 additions & 2 deletions src/components/OptionsSelector/BaseOptionsSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ import OptionsList from '../OptionsList';
import CONST from '../../CONST';
import styles from '../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import withNavigationFocus, {withNavigationFocusPropTypes} from '../withNavigationFocus';
import TextInput from '../TextInput';
import ArrowKeyFocusManager from '../ArrowKeyFocusManager';
import KeyboardShortcut from '../../libs/KeyboardShortcut';
import {propTypes as optionsSelectorPropTypes, defaultProps as optionsSelectorDefaultProps} from './optionsSelectorPropTypes';
import setSelection from '../../libs/setSelection';
import compose from '../../libs/compose';

const propTypes = {
/** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
Expand All @@ -24,6 +26,7 @@ const propTypes = {

...optionsSelectorPropTypes,
...withLocalizePropTypes,
...withNavigationFocusPropTypes,
};

const defaultProps = {
Expand Down Expand Up @@ -57,7 +60,7 @@ class BaseOptionsSelector extends Component {
enterConfig.shortcutKey,
() => {
const focusedOption = this.state.allOptions[this.state.focusedIndex];
if (!focusedOption) {
if (!focusedOption || !this.props.isFocused) {
return;
}
if (this.props.canSelectMultipleOptions) {
Expand Down Expand Up @@ -375,4 +378,4 @@ class BaseOptionsSelector extends Component {
BaseOptionsSelector.defaultProps = defaultProps;
BaseOptionsSelector.propTypes = propTypes;

export default withLocalize(BaseOptionsSelector);
export default compose(withLocalize, withNavigationFocus)(BaseOptionsSelector);