Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-22 08:16:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(swipe): Don't allow touch-up to re-settle already settled swipe gestures

Browse source
This commit is contained in:
Ben Gotow 2016-02-24 16:08:19 -08:00
parent f0e76019fd
commit 8e502d5fe5
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/swipe-container.jsx
View file

@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import DOMUtils from '../dom-utils';
import _ from 'underscore';
import {exec} from 'child_process';
@ -59,6 +60,7 @@ export default class SwipeContainer extends Component {
onSwipeLeftClass: React.PropTypes.string,
onSwipeRight: React.PropTypes.func,
onSwipeRightClass: React.PropTypes.string,
onSwipeCenter: React.PropTypes.func,
};
constructor(props) {
@ -155,7 +157,7 @@ export default class SwipeContainer extends Component {
_onScrollTouchEnd = ()=> {
this.tracking = false;
if (this.phase !== Phase.None) {
if ((this.phase !== Phase.None) && (this.phase !== Phase.Settling)) {
this.phase = Phase.Settling;
this.fired = false;
this.setState({
@ -244,15 +246,16 @@ export default class SwipeContainer extends Component {
const shouldFinish = (f >= 1.0);
const mostlyFinished = ((Math.abs(currentX) / Math.abs(targetX)) > 0.8);
const shouldFire = (targetX !== 0) && mostlyFinished && (this.fired === false);
const shouldFire = mostlyFinished && (this.fired === false);
if (shouldFire) {
this.fired = true;
if (targetX > 0) {
if ((targetX > 0) && this.props.onSwipeRight) {
this.props.onSwipeRight(this._onSwipeActionCompleted);
}
if (targetX < 0) {
} else if ((targetX < 0) && this.props.onSwipeLeft) {
this.props.onSwipeLeft(this._onSwipeActionCompleted);
} else if ((targetX == 0) && this.props.onSwipeCenter) {
this.props.onSwipeCenter();
}
}