diff --git a/src/TappableMixin.js b/src/TappableMixin.js index 3641443..f3664fb 100644 --- a/src/TappableMixin.js +++ b/src/TappableMixin.js @@ -201,13 +201,17 @@ var Mixin = { if (movement.x > (this.props.moveXThreshold || this.props.moveThreshold) || movement.y > (this.props.moveYThreshold || this.props.moveThreshold)) { if (this.state.isActive) { - this.setState({ - isActive: false - }); + if (this.props.allowReactivation) { + this.setState({ + isActive: false + }); + } else { + return this.endTouch(event); + } } else if (this._activeTimeout) { this.clearActiveTimeout(); } - } else if (this.props.allowReactivation) { + } else { if (!this.state.isActive && !this._activeTimeout) { this.setState({ isActive: true diff --git a/src/getComponent.js b/src/getComponent.js index 9d03c25..6e4ed3f 100644 --- a/src/getComponent.js +++ b/src/getComponent.js @@ -50,6 +50,7 @@ module.exports = function (mixins) { }, this.handlers()); delete newComponentProps.activeDelay; + delete newComponentProps.allowReactivation; delete newComponentProps.classBase; delete newComponentProps.classes; delete newComponentProps.handlers; @@ -58,7 +59,11 @@ module.exports = function (mixins) { delete newComponentProps.onPinchStart; delete newComponentProps.onPinchMove; delete newComponentProps.onPinchEnd; + delete newComponentProps.onDeactivate; + delete newComponentProps.onReactivate; delete newComponentProps.moveThreshold; + delete newComponentProps.moveXThreshold; + delete newComponentProps.moveYThreshold; delete newComponentProps.pressDelay; delete newComponentProps.pressMoveThreshold; delete newComponentProps.preventDefault;