Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix what updateState in ScrollView when called from reactSmoothScrollTo

Browse Source 
Summary:
Changelog: [Internal]

# Problem

Fabric didn't know about content offset, even though `reactSmoothScrollTo` calls `updateStateOnScroll`, the value of content offset is {0, 0}.

# Fix

Call `updateStateOnScroll` from `reactSmoothScrollTo` with where the scroll view is going to be rather than where it is.

Reviewed By: JoshuaGross, mdvacca

Differential Revision: D20248959

fbshipit-source-id: b1da645576dd5e8dce29e7e1d90ab232e0df9fd5
This commit is contained in:
Samuel Susla
2020-03-04 14:20:05 -08:00
committed by Facebook Github Bot
parent 4f908a569a
commit fcec815368
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+7 -7
View File
@@ -299,7 +299,7 @@ public class ReactScrollView extends ScrollView
mVelocityHelper.calculateVelocity(ev);
int action = ev.getAction() & MotionEvent.ACTION_MASK;
if (action == MotionEvent.ACTION_UP && mDragging) {
updateStateOnScroll();
updateStateOnScroll(getScrollX(), getScrollY());
float velocityX = mVelocityHelper.getXVelocity();
float velocityY = mVelocityHelper.getYVelocity();
@@ -502,7 +502,7 @@ public class ReactScrollView extends ScrollView
ViewCompat.postOnAnimationDelayed(
ReactScrollView.this, this, ReactScrollViewHelper.MOMENTUM_DELAY);
} else {
updateStateOnScroll();
updateStateOnScroll(getScrollX(), getScrollY());
if (mPagingEnabled && !mSnappingToPage) {
// Only if we have pagingEnabled and we have not snapped to the page do we
@@ -776,7 +776,7 @@ public class ReactScrollView extends ScrollView
*/
public void reactSmoothScrollTo(int x, int y) {
smoothScrollTo(x, y);
updateStateOnScroll();
updateStateOnScroll(x, y);
}
/**
@@ -787,7 +787,7 @@ public class ReactScrollView extends ScrollView
*/
public void reactScrollTo(int x, int y) {
scrollTo(x, y);
updateStateOnScroll();
updateStateOnScroll(x, y);
}
/**
@@ -849,14 +849,14 @@ public class ReactScrollView extends ScrollView
/**
* Called on any stabilized onScroll change to propagate content offset value to a Shadow Node.
*/
private void updateStateOnScroll() {
private void updateStateOnScroll(int scrollX, int scrollY) {
if (mStateWrapper == null) {
return;
}
WritableMap map = new WritableNativeMap();
map.putDouble(CONTENT_OFFSET_LEFT, PixelUtil.toDIPFromPixel(getScrollX()));
map.putDouble(CONTENT_OFFSET_TOP, PixelUtil.toDIPFromPixel(getScrollY()));
map.putDouble(CONTENT_OFFSET_LEFT, PixelUtil.toDIPFromPixel(scrollX));
map.putDouble(CONTENT_OFFSET_TOP, PixelUtil.toDIPFromPixel(scrollY));
mStateWrapper.updateState(map);
}