From 9f00d60bdb7d6f02996f4fa7dfc09b890ebe22f9 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 16 May 2021 07:48:20 +0200 Subject: [PATCH] fix: don't allow overriding gestureEnabled on first screen --- packages/stack/src/views/Stack/CardContainer.tsx | 4 +++- packages/stack/src/views/Stack/CardStack.tsx | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/stack/src/views/Stack/CardContainer.tsx b/packages/stack/src/views/Stack/CardContainer.tsx index 9fcca9dd..4e9b64f2 100644 --- a/packages/stack/src/views/Stack/CardContainer.tsx +++ b/packages/stack/src/views/Stack/CardContainer.tsx @@ -15,6 +15,7 @@ import useKeyboardManager from '../../utils/useKeyboardManager'; import type { Layout, Scene } from '../../types'; type Props = { + index: number; interpolationIndex: number; active: boolean; focused: boolean; @@ -53,6 +54,7 @@ type Props = { const EPSILON = 0.1; function CardContainer({ + index, active, closing, gesture, @@ -231,7 +233,7 @@ function CardContainer({ onGestureBegin={handleGestureBegin} onGestureCanceled={handleGestureCanceled} onGestureEnd={handleGestureEnd} - gestureEnabled={gestureEnabled} + gestureEnabled={index === 0 ? false : gestureEnabled} gestureResponseDistance={gestureResponseDistance} gestureVelocityImpact={gestureVelocityImpact} transitionSpec={transitionSpec} diff --git a/packages/stack/src/views/Stack/CardStack.tsx b/packages/stack/src/views/Stack/CardStack.tsx index 46be239d..26cb5f4d 100755 --- a/packages/stack/src/views/Stack/CardStack.tsx +++ b/packages/stack/src/views/Stack/CardStack.tsx @@ -231,9 +231,7 @@ export default class CardStack extends React.Component { animationEnabled = Platform.OS !== 'web' && Platform.OS !== 'windows' && Platform.OS !== 'macos', - gestureEnabled = index !== 0 && - Platform.OS === 'ios' && - animationEnabled, + gestureEnabled = Platform.OS === 'ios' && animationEnabled, gestureDirection = defaultTransitionPreset.gestureDirection, transitionSpec = defaultTransitionPreset.transitionSpec, cardStyleInterpolator = animationEnabled === false @@ -588,6 +586,7 @@ export default class CardStack extends React.Component { pointerEvents="box-none" >