Skip to content
This repository was archived by the owner on Feb 25, 2020. It is now read-only.

Commit d97b172

Browse files
committed
refactor: rename gesturesEnabled to gestureEnabled for consistency
1 parent eeab763 commit d97b172

10 files changed

Lines changed: 21 additions & 19 deletions

File tree

example/src/HeaderPreset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const StackWithHeaderPreset = createStackNavigator(
110110
...TransitionPresets.SlideFromRightIOS,
111111
headerStyleInterpolator: HeaderStyleInterpolators.forUIKit,
112112
headerTitleContainerStyle: { left: null },
113-
gesturesEnabled: true,
113+
gestureEnabled: true,
114114
},
115115
}
116116
);

example/src/ModalPresentation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default createStackNavigator(
6868
defaultNavigationOptions: {
6969
...TransitionPresets.ModalPresentationIOS,
7070
cardOverlayEnabled: true,
71-
gesturesEnabled: true,
71+
gestureEnabled: true,
7272
},
7373
}
7474
);

example/src/StackWithInput.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { Button, TextInput, View } from 'react-native';
33
import {
44
createStackNavigator,
5-
TransitionPresets,
5+
CardStyleInterpolators,
66
} from 'react-navigation-stack';
77

88
class Input extends React.Component {
@@ -48,9 +48,11 @@ const App = createStackNavigator(
4848
Input: { screen: Input },
4949
},
5050
{
51+
headerMode: 'screen',
5152
defaultNavigationOptions: {
52-
...TransitionPresets.SlideFromRightIOS,
53-
gesturesEnabled: true,
53+
cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
54+
gestureDirection: 'horizontal',
55+
gestureEnabled: true,
5456
},
5557
}
5658
);

example/src/TransparentStack.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default createStackNavigator(
7676
mode: 'modal',
7777
headerMode: 'none',
7878
defaultNavigationOptions: {
79-
gesturesEnabled: false,
79+
gestureEnabled: false,
8080
cardTransparent: true,
8181
},
8282
cardStyleInterpolator: ({ progress: { current } }) => {

src/navigators/__tests__/StackNavigator.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class HomeScreen extends Component {
3030
title: `Welcome ${
3131
navigation.state.params ? navigation.state.params.user : 'anonymous'
3232
}`,
33-
gesturesEnabled: true,
33+
gestureEnabled: true,
3434
headerStyle: [{ backgroundColor: 'red' }, styles.header],
3535
});
3636

src/types.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export type NavigationStackOptions = HeaderOptions &
102102
cardTransparent?: boolean;
103103
cardStyle?: StyleProp<ViewStyle>;
104104
animationEnabled?: boolean;
105-
gesturesEnabled?: boolean;
105+
gestureEnabled?: boolean;
106106
gestureResponseDistance?: {
107107
vertical?: number;
108108
horizontal?: number;

src/views/Stack/Card.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type Props = ViewProps & {
3636
children: React.ReactNode;
3737
overlayEnabled: boolean;
3838
shadowEnabled: boolean;
39-
gesturesEnabled: boolean;
39+
gestureEnabled: boolean;
4040
gestureResponseDistance?: {
4141
vertical?: number;
4242
horizontal?: number;
@@ -98,7 +98,7 @@ export default class Card extends React.Component<Props> {
9898
static defaultProps = {
9999
overlayEnabled: Platform.OS !== 'ios',
100100
shadowEnabled: true,
101-
gesturesEnabled: true,
101+
gestureEnabled: true,
102102
};
103103

104104
componentDidUpdate(prevProps: Props) {
@@ -473,7 +473,7 @@ export default class Card extends React.Component<Props> {
473473
next,
474474
overlayEnabled,
475475
shadowEnabled,
476-
gesturesEnabled,
476+
gestureEnabled,
477477
gestureDirection,
478478
children,
479479
styleInterpolator,
@@ -516,7 +516,7 @@ export default class Card extends React.Component<Props> {
516516
>
517517
<PanGestureHandler
518518
ref={this.gestureRef}
519-
enabled={layout.width !== 0 && gesturesEnabled}
519+
enabled={layout.width !== 0 && gestureEnabled}
520520
onGestureEvent={handleGestureEvent}
521521
onHandlerStateChange={handleGestureEvent}
522522
{...this.gestureActivationCriteria()}

src/views/Stack/Stack.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ export default class Stack extends React.Component<Props, State> {
371371
cardOverlayEnabled={cardOverlayEnabled}
372372
cardShadowEnabled={cardShadowEnabled}
373373
cardStyle={cardStyle}
374-
gesturesEnabled={index !== 0 && getGesturesEnabled({ route })}
374+
gestureEnabled={index !== 0 && getGesturesEnabled({ route })}
375375
onPageChangeStart={onPageChangeStart}
376376
onPageChangeConfirm={onPageChangeConfirm}
377377
onPageChangeCancel={onPageChangeCancel}

src/views/Stack/StackItem.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type Props = TransitionPreset & {
2626
cardOverlayEnabled?: boolean;
2727
cardShadowEnabled?: boolean;
2828
cardStyle?: StyleProp<ViewStyle>;
29-
gesturesEnabled?: boolean;
29+
gestureEnabled?: boolean;
3030
getPreviousRoute: (props: { route: Route }) => Route | undefined;
3131
renderHeader: (props: HeaderContainerProps) => React.ReactNode;
3232
renderScene: (props: { route: Route }) => React.ReactNode;
@@ -97,7 +97,7 @@ export default class StackItem extends React.PureComponent<Props> {
9797
cardOverlayEnabled,
9898
cardShadowEnabled,
9999
cardStyle,
100-
gesturesEnabled,
100+
gestureEnabled,
101101
onPageChangeStart,
102102
onPageChangeCancel,
103103
gestureResponseDistance,
@@ -128,7 +128,7 @@ export default class StackItem extends React.PureComponent<Props> {
128128
onClose={this.handleClose}
129129
overlayEnabled={cardOverlayEnabled}
130130
shadowEnabled={cardShadowEnabled}
131-
gesturesEnabled={gesturesEnabled}
131+
gestureEnabled={gestureEnabled}
132132
onTransitionStart={this.handleTransitionStart}
133133
onGestureBegin={onPageChangeStart}
134134
onGestureCanceled={onPageChangeCancel}

src/views/Stack/StackView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,16 @@ class StackView extends React.Component<Props, State> {
179179
const descriptor = this.state.descriptors[route.key];
180180

181181
if (descriptor) {
182-
const { gesturesEnabled, animationEnabled } = descriptor.options;
182+
const { gestureEnabled, animationEnabled } = descriptor.options;
183183

184184
if (animationEnabled === false) {
185185
// When animation is disabled, also disable gestures
186186
// The gesture to dismiss a route will look weird when not animated
187187
return false;
188188
}
189189

190-
return gesturesEnabled !== undefined
191-
? gesturesEnabled
190+
return gestureEnabled !== undefined
191+
? gestureEnabled
192192
: Platform.OS !== 'android';
193193
}
194194

0 commit comments

Comments
 (0)