From a38166cfa43472035c403ef9c6aee5a0d13a8a19 Mon Sep 17 00:00:00 2001 From: Vojtech Novak Date: Sun, 26 Apr 2020 17:02:25 +0200 Subject: [PATCH] ScrollView, HorizontalScrollView: consider contentOffset --- .../react/views/scroll/ReactHorizontalScrollViewManager.java | 2 ++ .../com/facebook/react/views/scroll/ReactScrollViewManager.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java index ecb72fff78746f..35a0bdaf204a93 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java @@ -307,6 +307,8 @@ public void setContentOffset(ReactHorizontalScrollView view, ReadableMap value) double x = value.getDouble("x"); double y = value.getDouble("y"); view.reactScrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y)); + } else { + view.reactScrollTo(0, 0); } } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java index ed7cd05778836e..8ff358bac6cfbf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java @@ -311,6 +311,8 @@ public void setContentOffset(ReactScrollView view, ReadableMap value) { double x = value.getDouble("x"); double y = value.getDouble("y"); view.reactScrollTo((int) PixelUtil.toPixelFromDIP(x), (int) PixelUtil.toPixelFromDIP(y)); + } else { + view.reactScrollTo(0, 0); } }