From 9e6405e16764a162b0f0c90220c1a8bf857f8760 Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Wed, 17 Oct 2018 13:13:34 -0700 Subject: [PATCH] No need to add PanGestureHandler on Android, no gestures there anyhow --- .../src/views/StackView/StackViewLayout.js | 65 ++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/packages/stack/src/views/StackView/StackViewLayout.js b/packages/stack/src/views/StackView/StackViewLayout.js index cb7229df..4d74fb94 100644 --- a/packages/stack/src/views/StackView/StackViewLayout.js +++ b/packages/stack/src/views/StackView/StackViewLayout.js @@ -271,36 +271,43 @@ class StackViewLayout extends React.Component { this._getTransitionConfig().containerStyle, ]; - return ( - 0 && gesturesEnabled} - > - - - - {scenes.map(s => this._renderCard(s))} - - {floatingHeader} - - - + let content = ( + + + + {scenes.map(s => this._renderCard(s))} + + {floatingHeader} + + ); + if (Platform.OS === 'ios') { + return ( + 0 && gesturesEnabled} + > + {content} + + ); + } else { + return content; + } } _getGestureResponseDistance = () => {