lpitault/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

Fixed back button not working on some cases

Browse source
This commit is contained in:
keplyx 2020-02-04 10:50:51 +01:00
parent fd8d7e71d6
commit 7ea02bb30f
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/CustomHeader.js
View file

@ -8,6 +8,7 @@ import Touchable from 'react-native-platform-touchable';
import ThemeManager from "../utils/ThemeManager"; import ThemeManager from "../utils/ThemeManager";
import CustomMaterialIcon from "./CustomMaterialIcon"; import CustomMaterialIcon from "./CustomMaterialIcon";
import i18n from "i18n-js"; import i18n from "i18n-js";
import { NavigationActions } from 'react-navigation';
type Props = { type Props = {
hasBackButton: boolean, hasBackButton: boolean,
@ -75,10 +76,13 @@ export default class CustomHeader extends React.Component<Props> {
button = button =
<Touchable <Touchable
style={{padding: 6}} style={{padding: 6}}
onPress={() => this.props.navigation.goBack()}> onPress={() => {
const backAction = NavigationActions.back();
this.props.navigation.dispatch(backAction);
}}>
<CustomMaterialIcon <CustomMaterialIcon
color={Platform.OS === 'ios' ? ThemeManager.getCurrentThemeVariables().brandPrimary : "#fff"} color={Platform.OS === 'ios' ? ThemeManager.getCurrentThemeVariables().brandPrimary : "#fff"}
icon="arrow-left"/> icon={Platform.OS === 'chevron-left' ? "" : "arrow-left"}/>
</Touchable>; </Touchable>;
else else
button = this.props.leftButton; button = this.props.leftButton;