Skip to content

Commit

Permalink
Flow strict TouchableBounce (facebook#22197)
Browse files Browse the repository at this point in the history
Summary:
Related to facebook#22100

Enhance TouchableBounce with press event types, callback and hitslop types.

There is still some work to do in order to turn flow to strict mode. (requireNativeComponent and render function)

- All flow tests succeed.

[GENERAL] [ENHANCEMENT] [TouchableBounce.js] - Flow types
Pull Request resolved: facebook#22197

Reviewed By: TheSavior

Differential Revision: D13032452

Pulled By: RSNara

fbshipit-source-id: b21140722ce924698aa15323602e2e3fc663dbb6
  • Loading branch information
exced authored and facebook-github-bot committed Nov 21, 2018
1 parent 12e37f5 commit 4e36657
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions Libraries/Components/Touchable/TouchableBounce.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ const createReactClass = require('create-react-class');
import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
import type {ViewStyleProp} from 'StyleSheet';
import type {Props as TouchableWithoutFeedbackProps} from 'TouchableWithoutFeedback';

type Event = Object;
import type {PressEvent} from 'CoreEventTypes';

type State = {
animationID: ?number,
Expand All @@ -36,8 +35,8 @@ const PRESS_RETENTION_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
type Props = $ReadOnly<{|
...TouchableWithoutFeedbackProps,

onPressWithCompletion?: ?Function,
onPressAnimationComplete?: ?Function,
onPressWithCompletion?: ?(fn: () => void) => void,
onPressAnimationComplete?: ?() => void,
pressRetentionOffset?: ?EdgeInsetsProp,
releaseVelocity?: ?number,
releaseBounciness?: ?number,
Expand Down Expand Up @@ -95,7 +94,7 @@ const TouchableBounce = ((createReactClass({
value: number,
velocity: number,
bounciness: number,
callback?: ?Function,
callback?: ?() => void,
) {
Animated.spring(this.state.scale, {
toValue: value,
Expand All @@ -116,17 +115,17 @@ const TouchableBounce = ((createReactClass({
* `Touchable.Mixin` self callbacks. The mixin will invoke these if they are
* defined on your component.
*/
touchableHandleActivePressIn: function(e: Event) {
touchableHandleActivePressIn: function(e: PressEvent) {
this.bounceTo(0.93, 0.1, 0);
this.props.onPressIn && this.props.onPressIn(e);
},

touchableHandleActivePressOut: function(e: Event) {
touchableHandleActivePressOut: function(e: PressEvent) {
this.bounceTo(1, 0.4, 0);
this.props.onPressOut && this.props.onPressOut(e);
},

touchableHandlePress: function(e: Event) {
touchableHandlePress: function(e: PressEvent) {
const onPressWithCompletion = this.props.onPressWithCompletion;
if (onPressWithCompletion) {
onPressWithCompletion(() => {
Expand Down Expand Up @@ -154,7 +153,7 @@ const TouchableBounce = ((createReactClass({
return this.props.pressRetentionOffset || PRESS_RETENTION_OFFSET;
},

touchableGetHitSlop: function(): ?Object {
touchableGetHitSlop: function(): ?EdgeInsetsProp {
return this.props.hitSlop;
},

Expand Down

0 comments on commit 4e36657

Please sign in to comment.