diff --git a/packages/stack/example/src/HeaderPreset.js b/packages/stack/example/src/HeaderPreset.js index 11755d6d..b56e51ac 100644 --- a/packages/stack/example/src/HeaderPreset.js +++ b/packages/stack/example/src/HeaderPreset.js @@ -110,7 +110,7 @@ const StackWithHeaderPreset = createStackNavigator( ...TransitionPresets.SlideFromRightIOS, headerStyleInterpolator: HeaderStyleInterpolators.forUIKit, headerTitleContainerStyle: { left: null }, - gesturesEnabled: true, + gestureEnabled: true, }, } ); diff --git a/packages/stack/example/src/ModalPresentation.js b/packages/stack/example/src/ModalPresentation.js index cacacfda..37a8177c 100644 --- a/packages/stack/example/src/ModalPresentation.js +++ b/packages/stack/example/src/ModalPresentation.js @@ -68,7 +68,7 @@ export default createStackNavigator( defaultNavigationOptions: { ...TransitionPresets.ModalPresentationIOS, cardOverlayEnabled: true, - gesturesEnabled: true, + gestureEnabled: true, }, } ); diff --git a/packages/stack/example/src/StackWithInput.js b/packages/stack/example/src/StackWithInput.js index 344ecf26..d7d0e2b0 100644 --- a/packages/stack/example/src/StackWithInput.js +++ b/packages/stack/example/src/StackWithInput.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { Button, TextInput, View } from 'react-native'; import { createStackNavigator, - TransitionPresets, + CardStyleInterpolators, } from 'react-navigation-stack'; class Input extends React.Component { @@ -48,9 +48,11 @@ const App = createStackNavigator( Input: { screen: Input }, }, { + headerMode: 'screen', defaultNavigationOptions: { - ...TransitionPresets.SlideFromRightIOS, - gesturesEnabled: true, + cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS, + gestureDirection: 'horizontal', + gestureEnabled: true, }, } ); diff --git a/packages/stack/example/src/TransparentStack.js b/packages/stack/example/src/TransparentStack.js index bda5ad70..03c5432d 100644 --- a/packages/stack/example/src/TransparentStack.js +++ b/packages/stack/example/src/TransparentStack.js @@ -76,7 +76,7 @@ export default createStackNavigator( mode: 'modal', headerMode: 'none', defaultNavigationOptions: { - gesturesEnabled: false, + gestureEnabled: false, cardTransparent: true, }, cardStyleInterpolator: ({ progress: { current } }) => { diff --git a/packages/stack/src/navigators/__tests__/StackNavigator.test.tsx b/packages/stack/src/navigators/__tests__/StackNavigator.test.tsx index ed2df43b..51a1c8df 100644 --- a/packages/stack/src/navigators/__tests__/StackNavigator.test.tsx +++ b/packages/stack/src/navigators/__tests__/StackNavigator.test.tsx @@ -30,7 +30,7 @@ class HomeScreen extends Component { title: `Welcome ${ navigation.state.params ? navigation.state.params.user : 'anonymous' }`, - gesturesEnabled: true, + gestureEnabled: true, headerStyle: [{ backgroundColor: 'red' }, styles.header], }); diff --git a/packages/stack/src/types.tsx b/packages/stack/src/types.tsx index 907fac71..5d016eb8 100644 --- a/packages/stack/src/types.tsx +++ b/packages/stack/src/types.tsx @@ -102,7 +102,7 @@ export type NavigationStackOptions = HeaderOptions & cardTransparent?: boolean; cardStyle?: StyleProp; animationEnabled?: boolean; - gesturesEnabled?: boolean; + gestureEnabled?: boolean; gestureResponseDistance?: { vertical?: number; horizontal?: number; diff --git a/packages/stack/src/views/Stack/Card.tsx b/packages/stack/src/views/Stack/Card.tsx index 69673e95..cebefd9b 100755 --- a/packages/stack/src/views/Stack/Card.tsx +++ b/packages/stack/src/views/Stack/Card.tsx @@ -36,7 +36,7 @@ type Props = ViewProps & { children: React.ReactNode; overlayEnabled: boolean; shadowEnabled: boolean; - gesturesEnabled: boolean; + gestureEnabled: boolean; gestureResponseDistance?: { vertical?: number; horizontal?: number; @@ -98,7 +98,7 @@ export default class Card extends React.Component { static defaultProps = { overlayEnabled: Platform.OS !== 'ios', shadowEnabled: true, - gesturesEnabled: true, + gestureEnabled: true, }; componentDidUpdate(prevProps: Props) { @@ -473,7 +473,7 @@ export default class Card extends React.Component { next, overlayEnabled, shadowEnabled, - gesturesEnabled, + gestureEnabled, gestureDirection, children, styleInterpolator, @@ -516,7 +516,7 @@ export default class Card extends React.Component { > { cardOverlayEnabled={cardOverlayEnabled} cardShadowEnabled={cardShadowEnabled} cardStyle={cardStyle} - gesturesEnabled={index !== 0 && getGesturesEnabled({ route })} + gestureEnabled={index !== 0 && getGesturesEnabled({ route })} onPageChangeStart={onPageChangeStart} onPageChangeConfirm={onPageChangeConfirm} onPageChangeCancel={onPageChangeCancel} diff --git a/packages/stack/src/views/Stack/StackItem.tsx b/packages/stack/src/views/Stack/StackItem.tsx index 7a2cec83..758ddcfa 100644 --- a/packages/stack/src/views/Stack/StackItem.tsx +++ b/packages/stack/src/views/Stack/StackItem.tsx @@ -26,7 +26,7 @@ type Props = TransitionPreset & { cardOverlayEnabled?: boolean; cardShadowEnabled?: boolean; cardStyle?: StyleProp; - gesturesEnabled?: boolean; + gestureEnabled?: boolean; getPreviousRoute: (props: { route: Route }) => Route | undefined; renderHeader: (props: HeaderContainerProps) => React.ReactNode; renderScene: (props: { route: Route }) => React.ReactNode; @@ -97,7 +97,7 @@ export default class StackItem extends React.PureComponent { cardOverlayEnabled, cardShadowEnabled, cardStyle, - gesturesEnabled, + gestureEnabled, onPageChangeStart, onPageChangeCancel, gestureResponseDistance, @@ -128,7 +128,7 @@ export default class StackItem extends React.PureComponent { onClose={this.handleClose} overlayEnabled={cardOverlayEnabled} shadowEnabled={cardShadowEnabled} - gesturesEnabled={gesturesEnabled} + gestureEnabled={gestureEnabled} onTransitionStart={this.handleTransitionStart} onGestureBegin={onPageChangeStart} onGestureCanceled={onPageChangeCancel} diff --git a/packages/stack/src/views/Stack/StackView.tsx b/packages/stack/src/views/Stack/StackView.tsx index 393e85c6..05793b77 100644 --- a/packages/stack/src/views/Stack/StackView.tsx +++ b/packages/stack/src/views/Stack/StackView.tsx @@ -179,7 +179,7 @@ class StackView extends React.Component { const descriptor = this.state.descriptors[route.key]; if (descriptor) { - const { gesturesEnabled, animationEnabled } = descriptor.options; + const { gestureEnabled, animationEnabled } = descriptor.options; if (animationEnabled === false) { // When animation is disabled, also disable gestures @@ -187,8 +187,8 @@ class StackView extends React.Component { return false; } - return gesturesEnabled !== undefined - ? gesturesEnabled + return gestureEnabled !== undefined + ? gestureEnabled : Platform.OS !== 'android'; }