Skip to content

Commit

Permalink
Fix TouchNativeFeedback so that the ripple starts from where a person…
Browse files Browse the repository at this point in the history 
… touches

Summary:
It needs the touch coordinates for with-in the element, not for on the page.
Closes #5400

Reviewed By: svcscm

Differential Revision: D2848834

Pulled By: androidtrunkagent

fb-gh-sync-id: 88cf0fd7bd2332eb3db835b26438064412c8358c
  • Loading branch information
Jeff Berg authored and facebook-github-bot-2 committed Jan 21, 2016
1 parent f3e2c29 commit 48117ce
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Libraries/Components/Touchable/Touchable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,9 @@ var TouchableMixin = {
var touch = TouchEventUtils.extractSingleTouch(e.nativeEvent);
var pageX = touch && touch.pageX;
var pageY = touch && touch.pageY;
this.pressInLocation = {pageX: pageX, pageY: pageY};
var locationX = touch && touch.locationX;
var locationY = touch && touch.locationY;
this.pressInLocation = {pageX, pageY, locationX, locationY};
},

_getDistanceBetweenPoints: function (aX, aY, bX, bY) {
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Components/Touchable/TouchableNativeFeedback.android.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ var TouchableNativeFeedback = React.createClass({
touchableHandleActivePressIn: function() {
this.props.onPressIn && this.props.onPressIn();
this._dispatchPressedStateChange(true);
this._dispatchHotspotUpdate(this.pressInLocation.pageX, this.pressInLocation.pageY);
this._dispatchHotspotUpdate(this.pressInLocation.locationX, this.pressInLocation.locationY);
},

touchableHandleActivePressOut: function() {
Expand Down

1 comment on commit 48117ce

@fabianmuecke
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still doesn't work for me. When I adjust TouchableNativeFeedback.android.js like this, it seems to work most of the time, but still animates the ripple in weird locations sometimes:

_handleResponderMove: function(e) {
    this.touchableHandleResponderMove(e);
    this._dispatchHotspotUpdate(e.nativeEvent.locationX, e.nativeEvent.locationY);
  },

Please sign in to comment.