kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-04-29 04:45:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: gesture vertical inverted (#281)

Browse Source
This commit is contained in:
Michał Osadnik
2019-11-05 13:37:18 +01:00
parent ca24b90e31
commit 59dd0451ff
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/stack/src/views/Stack/Card.tsx
View File

@@ -412,8 +412,10 @@ export default class Card extends React.Component<Props> {
cond( cond(
eq(this.props.current, isVisible), eq(this.props.current, isVisible),
call( call(
[this.didMovementHappen, this.isVisible], [this.didMovementHappen, isVisible],
([didMovementHappen]: ReadonlyArray<Binary>) => { ([didMovementHappen, isVisibleVal]: ReadonlyArray<
Binary | number
>) => {
if (didMovementHappen) { if (didMovementHappen) {
// if we go back to the same position, // if we go back to the same position,
// let's pretend that whole animation happen // let's pretend that whole animation happen
@@ -421,9 +423,14 @@ export default class Card extends React.Component<Props> {
// It's especially vital for having inputs properly focused. // It's especially vital for having inputs properly focused.
this.handleStartInteraction(); this.handleStartInteraction();
const { onTransitionStart } = this.props; const { onTransitionStart } = this.props;
onTransitionStart && onTransitionStart({ closing: false }); onTransitionStart &&
onTransitionStart({ closing: !isVisibleVal });
this.handleTransitionEnd(); this.handleTransitionEnd();
this.props.onOpen(true); if (isVisibleVal) {
this.props.onOpen(true);
} else {
this.props.onClose(true);
}
} }
} }
), ),
@@ -514,7 +521,6 @@ export default class Card extends React.Component<Props> {
call([this.isVisible], ([value]: ReadonlyArray<Binary>) => { call([this.isVisible], ([value]: ReadonlyArray<Binary>) => {
const isOpen = Boolean(value); const isOpen = Boolean(value);
const { onOpen, onClose } = this.props; const { onOpen, onClose } = this.props;
this.handleTransitionEnd(); this.handleTransitionEnd();
if (isOpen) { if (isOpen) {
@@ -544,14 +550,18 @@ export default class Card extends React.Component<Props> {
this.gestureUntraversed, this.gestureUntraversed,
I18nManager.isRTL ? MINUS_ONE_NODE : TRUE_NODE I18nManager.isRTL ? MINUS_ONE_NODE : TRUE_NODE
), ),
this.gestureUntraversed multiply(this.gestureUntraversed, this.verticalGestureDirection)
) )
), ),
set( set(
this.velocity, this.velocity,
multiply( cond(
this.velocityUntraversed, eq(this.direction, DIRECTION_HORIZONTAL),
I18nManager.isRTL ? MINUS_ONE_NODE : TRUE_NODE multiply(
this.velocityUntraversed,
I18nManager.isRTL ? MINUS_ONE_NODE : TRUE_NODE
),
multiply(this.velocityUntraversed, this.verticalGestureDirection)
) )
), ),
onChange( onChange(
@@ -636,7 +646,10 @@ export default class Card extends React.Component<Props> {
this.gestureUntraversed, this.gestureUntraversed,
I18nManager.isRTL ? MINUS_ONE_NODE : TRUE_NODE I18nManager.isRTL ? MINUS_ONE_NODE : TRUE_NODE
), ),
this.gestureUntraversed multiply(
this.gestureUntraversed,
this.verticalGestureDirection
)
), ),
this.distance this.distance
), ),