From 23ea16e9cf2288d65b5b4454ebaefbcb70f8303a Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Mon, 24 Sep 2018 15:37:48 -0700 Subject: [PATCH] Organize a bit more and fix RTL --- src/views/StackView/StackViewLayout.js | 88 +++++++++++++++++--------- 1 file changed, 57 insertions(+), 31 deletions(-) diff --git a/src/views/StackView/StackViewLayout.js b/src/views/StackView/StackViewLayout.js index 77ea95f..9b30d26 100644 --- a/src/views/StackView/StackViewLayout.js +++ b/src/views/StackView/StackViewLayout.js @@ -19,7 +19,10 @@ import { NavigationProvider, } from 'react-navigation'; import { ScreenContainer } from 'react-native-screens'; -import { PanGestureHandler } from 'react-native-gesture-handler'; +import { + PanGestureHandler, + NativeViewGestureHandler, +} from 'react-native-gesture-handler'; import Card from './StackViewCard'; import Header from '../Header/Header'; @@ -288,13 +291,17 @@ class StackViewLayout extends React.Component { this._getTransitionConfig().containerStyle, ]; + // TODO: activate only when within some distance of the edge of the screen + // within the GESTURE_RESPONSE_DISTANCE_HORIZONTAL / VERTICAL threshold + // https://github.com/kmagiera/react-native-gesture-handler/issues/293 return ( - + enabled={gesturesEnabled} + > {scenes.map(s => this._renderCard(s))} @@ -305,39 +312,58 @@ class StackViewLayout extends React.Component { ); } + // Without using Reanimated it's not possible to do all of the following + // stuff with native driver. _handlePanGestureEvent = ({ nativeEvent }) => { - // const startValue = this._gestureStartValue; - // const axis = isVertical ? 'dy' : 'dx'; - // const axisDistance = isVertical - // ? layout.height.__getValue() - // : layout.width.__getValue(); - // const currentValue = - // axis === 'dx' && gestureDirectionInverted - // ? startValue + gesture[axis] / axisDistance - // : startValue - gesture[axis] / axisDistance; - // const value = clamp(index - 1, currentValue, index); - // position.setValue(value); + const { mode } = this.props; + const isVertical = mode === 'modal'; + if (isVertical) { + this._handleVerticalPan(nativeEvent); + } else { + this._handleHorizontalPan(nativeEvent); + } + }; - // Without using Reanimated it's not possible to do all of the following - // stuff with native driver. - const { - transitionProps: { navigation, position, layout, scene }, - mode, - } = this.props; - const { index } = navigation.state; - const distance = layout.width.__getValue(); - const translation = nativeEvent.translationX; - const currentValue = 1 - translation / distance; - const value = clamp(index - 1, currentValue, index); - console.log({ distance, translation, currentValue }) - position.setValue(value); - } + _isGestureInverted = () => { + const { + transitionProps: { scene }, + } = this.props; + const { options } = scene.descriptor; + const { gestureDirection } = options; + + return typeof gestureDirection === 'string' + ? gestureDirection === 'inverted' + : I18nManager.isRTL; + }; + + _handleHorizontalPan = nativeEvent => { + let { + transitionProps: { navigation, position, layout }, + } = this.props; + + let { index } = navigation.state; + + let distance = layout.width.__getValue(); + let translation = nativeEvent.translationX; + + if (this._isGestureInverted()) { + translation *= -1; + } + + let currentValue = 1 - translation / distance; + let value = clamp(index - 1, currentValue, index); + position.setValue(value); + }; + + _handleVerticalPan = nativeEvent => { + // todo + }; _handlePanGestureStateChange = ({ nativeEvent }) => { const { oldState, state } = nativeEvent; // console.log({ nativeEvent }) - } + }; _getHeaderMode() { if (this.props.headerMode) {