Skip to content

Fix android navigation back #8897

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
MonilBhavsar merged 2 commits into from
May 10, 2022
Merged

Fix android navigation back #8897

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8ccd19
Fix android navigation back
phivh May 7, 2022
8ebb9a0
Cleanup
phivh May 8, 2022
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
10 changes: 8 additions & 2 deletions src/components/HeaderWithCloseButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {
View, TouchableOpacity,
View, TouchableOpacity, Keyboard,
} from 'react-native';
import styles from '../styles/styles';
import Header from './Header';
Expand All @@ -12,6 +12,7 @@ import * as Expensicons from './Icon/Expensicons';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import Tooltip from './Tooltip';
import ThreeDotsMenu, {ThreeDotsMenuItemPropTypes} from './ThreeDotsMenu';
import VirtualKeyboard from '../libs/VirtualKeyboard';

const propTypes = {
/** Title of the Header */
Expand Down Expand Up @@ -113,7 +114,12 @@ const HeaderWithCloseButton = props => (
{props.shouldShowBackButton && (
<Tooltip text={props.translate('common.back')}>
<TouchableOpacity
onPress={props.onBackButtonPress}
onPress={() => {
if (VirtualKeyboard.isOpen()) {
Keyboard.dismiss();
}
props.onBackButtonPress();
}}
style={[styles.touchableButtonImage]}
>
<Icon src={Expensicons.BackArrow} />
Expand Down