toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Navigation swiping fix (#311)

Browse source 
* Navigation swiping fix

* Review feedback
This commit is contained in:
Chris Duarte 2017-03-01 07:34:01 -08:00 committed by Harrison Healey
parent 8a12b6ea3f
commit 8ae59996a5
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/navigation/router.js
View file

@ -3,6 +3,7 @@
import React from 'react';
import {
Dimensions,
Easing,
NavigationExperimental,
View
@ -18,6 +19,8 @@ import {getTheme} from 'service/selectors/entities/preferences';
import NavigationModal from './navigation_modal';
const navigationPanResponder = NavigationExperimental.Card.CardStackPanResponder;
class Router extends React.Component {
static propTypes = {
navigation: React.PropTypes.object,
@ -102,9 +105,14 @@ class Router extends React.Component {
};
}
// NavigationExperimental only creates the correct panHandlers if the panHandlers prop === undefined
const panHandlers = navigationProps.allowSceneSwipe ? undefined : null; // eslint-disable-line
let panHandlers = null;
if (navigationProps.allowSceneSwipe) {
panHandlers = navigationPanResponder.forHorizontal({
...cardProps,
gestureResponseDistance: (Dimensions.get('window').width / 2), // sets the distance from the edge for swiping
onNavigateBack: this.props.actions.goBack
});
}
return (
<NavigationExperimental.Card
{...cardProps}
@ -203,7 +211,7 @@ class Router extends React.Component {
tapToClose={true}
openDrawerOffset={0.2}
onRequestClose={this.props.actions.closeDrawers}
panOpenMask={0.1}
panOpenMask={0.4}
panCloseMask={0.2}
panThreshold={0.2}
acceptPan={navigationProps.allowMenuSwipe}
@ -219,7 +227,7 @@ class Router extends React.Component {
tapToClose={true}
openDrawerOffset={0.2}
onRequestClose={this.props.actions.closeDrawers}
panOpenMask={0.1}
panOpenMask={0.4}
panCloseMask={0.2}
panThreshold={0.2}
acceptPan={navigationProps.allowMenuSwipe}