From 201f2f189f2c41092397e5457eda83b0764ee4cd Mon Sep 17 00:00:00 2001 From: Matias Colotto Date: Tue, 25 Sep 2018 15:00:05 -0700 Subject: [PATCH] ReactScrollView should account for `overflow: scroll` Summary: Support for `overflow: visible` was recently added to Android ScrollView. However, it didn't account for `overflow: scroll` and changed the behavior, causing content to render when before it would be clipped. Reviewed By: achen1 Differential Revision: D10036807 fbshipit-source-id: e44a79b18eecbc7d64621f7cf5d800a00a121b13 --- .../facebook/react/views/scroll/ReactHorizontalScrollView.java | 2 +- .../java/com/facebook/react/views/scroll/ReactScrollView.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java index 228f7bbdb..c46a1ea24 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java @@ -195,7 +195,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView implements switch (mOverflow) { case ViewProps.VISIBLE: break; - case ViewProps.HIDDEN: + default: canvas.clipRect(mRect); break; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java index 8454527b0..36d02457a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java @@ -384,7 +384,7 @@ public class ReactScrollView extends ScrollView implements ReactClippingViewGrou switch (mOverflow) { case ViewProps.VISIBLE: break; - case ViewProps.HIDDEN: + default: canvas.clipRect(mRect); break; }