mirror of
https://github.com/zhigang1992/react-navigation.git
synced 2026-04-27 21:08:02 +08:00
refactor: rename gesturesEnabled to gestureEnabled for consistency
This commit is contained in:
@@ -110,7 +110,7 @@ const StackWithHeaderPreset = createStackNavigator(
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
headerStyleInterpolator: HeaderStyleInterpolators.forUIKit,
|
||||
headerTitleContainerStyle: { left: null },
|
||||
gesturesEnabled: true,
|
||||
gestureEnabled: true,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
@@ -68,7 +68,7 @@ export default createStackNavigator(
|
||||
defaultNavigationOptions: {
|
||||
...TransitionPresets.ModalPresentationIOS,
|
||||
cardOverlayEnabled: true,
|
||||
gesturesEnabled: true,
|
||||
gestureEnabled: true,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
@@ -76,7 +76,7 @@ export default createStackNavigator(
|
||||
mode: 'modal',
|
||||
headerMode: 'none',
|
||||
defaultNavigationOptions: {
|
||||
gesturesEnabled: false,
|
||||
gestureEnabled: false,
|
||||
cardTransparent: true,
|
||||
},
|
||||
cardStyleInterpolator: ({ progress: { current } }) => {
|
||||
|
||||
@@ -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],
|
||||
});
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ export type NavigationStackOptions = HeaderOptions &
|
||||
cardTransparent?: boolean;
|
||||
cardStyle?: StyleProp<ViewStyle>;
|
||||
animationEnabled?: boolean;
|
||||
gesturesEnabled?: boolean;
|
||||
gestureEnabled?: boolean;
|
||||
gestureResponseDistance?: {
|
||||
vertical?: number;
|
||||
horizontal?: number;
|
||||
|
||||
@@ -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<Props> {
|
||||
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<Props> {
|
||||
next,
|
||||
overlayEnabled,
|
||||
shadowEnabled,
|
||||
gesturesEnabled,
|
||||
gestureEnabled,
|
||||
gestureDirection,
|
||||
children,
|
||||
styleInterpolator,
|
||||
@@ -516,7 +516,7 @@ export default class Card extends React.Component<Props> {
|
||||
>
|
||||
<PanGestureHandler
|
||||
ref={this.gestureRef}
|
||||
enabled={layout.width !== 0 && gesturesEnabled}
|
||||
enabled={layout.width !== 0 && gestureEnabled}
|
||||
onGestureEvent={handleGestureEvent}
|
||||
onHandlerStateChange={handleGestureEvent}
|
||||
{...this.gestureActivationCriteria()}
|
||||
|
||||
@@ -371,7 +371,7 @@ export default class Stack extends React.Component<Props, State> {
|
||||
cardOverlayEnabled={cardOverlayEnabled}
|
||||
cardShadowEnabled={cardShadowEnabled}
|
||||
cardStyle={cardStyle}
|
||||
gesturesEnabled={index !== 0 && getGesturesEnabled({ route })}
|
||||
gestureEnabled={index !== 0 && getGesturesEnabled({ route })}
|
||||
onPageChangeStart={onPageChangeStart}
|
||||
onPageChangeConfirm={onPageChangeConfirm}
|
||||
onPageChangeCancel={onPageChangeCancel}
|
||||
|
||||
@@ -26,7 +26,7 @@ type Props = TransitionPreset & {
|
||||
cardOverlayEnabled?: boolean;
|
||||
cardShadowEnabled?: boolean;
|
||||
cardStyle?: StyleProp<ViewStyle>;
|
||||
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<Props> {
|
||||
cardOverlayEnabled,
|
||||
cardShadowEnabled,
|
||||
cardStyle,
|
||||
gesturesEnabled,
|
||||
gestureEnabled,
|
||||
onPageChangeStart,
|
||||
onPageChangeCancel,
|
||||
gestureResponseDistance,
|
||||
@@ -128,7 +128,7 @@ export default class StackItem extends React.PureComponent<Props> {
|
||||
onClose={this.handleClose}
|
||||
overlayEnabled={cardOverlayEnabled}
|
||||
shadowEnabled={cardShadowEnabled}
|
||||
gesturesEnabled={gesturesEnabled}
|
||||
gestureEnabled={gestureEnabled}
|
||||
onTransitionStart={this.handleTransitionStart}
|
||||
onGestureBegin={onPageChangeStart}
|
||||
onGestureCanceled={onPageChangeCancel}
|
||||
|
||||
@@ -179,7 +179,7 @@ class StackView extends React.Component<Props, State> {
|
||||
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<Props, State> {
|
||||
return false;
|
||||
}
|
||||
|
||||
return gesturesEnabled !== undefined
|
||||
? gesturesEnabled
|
||||
return gestureEnabled !== undefined
|
||||
? gestureEnabled
|
||||
: Platform.OS !== 'android';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user