From 8e2ec64763032336fa160f9748b9b3ce7f803a33 Mon Sep 17 00:00:00 2001 From: Krzysztof Magiera Date: Fri, 16 Oct 2015 07:43:09 -0700 Subject: [PATCH] Use RecyclerViewBackedScrollView in groups feed on Android. Differential Revision: D2549975 fb-gh-sync-id: 98689a58a69ce8425c695acf74701509816821ae --- .../ScrollView/RecyclerViewBackedScrollView.android.js | 6 +++++- .../views/recyclerview/RecyclerViewBackedScrollView.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Libraries/Components/ScrollView/RecyclerViewBackedScrollView.android.js b/Libraries/Components/ScrollView/RecyclerViewBackedScrollView.android.js index f2999b3b4..1e507ffba 100644 --- a/Libraries/Components/ScrollView/RecyclerViewBackedScrollView.android.js +++ b/Libraries/Components/ScrollView/RecyclerViewBackedScrollView.android.js @@ -55,7 +55,7 @@ var RecyclerViewBackedScrollView = React.createClass({ ...ScrollView.propTypes, }, - mixins: [ScrollResponder.Mixin, NativeMethodsMixin], + mixins: [ScrollResponder.Mixin], getInitialState: function() { return this.scrollResponderMixinGetInitialState(); @@ -69,6 +69,10 @@ var RecyclerViewBackedScrollView = React.createClass({ return React.findNodeHandle(this.refs[INNERVIEW]); }, + setNativeProps: function(props: Object) { + this.refs[INNERVIEW].setNativeProps(props); + }, + render: function() { var props = { ...this.props, diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/recyclerview/RecyclerViewBackedScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/recyclerview/RecyclerViewBackedScrollView.java index 238ad6931..22e080c83 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/recyclerview/RecyclerViewBackedScrollView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/recyclerview/RecyclerViewBackedScrollView.java @@ -17,6 +17,7 @@ import android.view.ViewGroup; import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.ReactContext; +import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.uimanager.UIManagerModule; import com.facebook.react.uimanager.events.NativeGestureUtil; import com.facebook.react.views.scroll.ScrollEvent; @@ -31,7 +32,8 @@ import com.facebook.react.views.scroll.ScrollEvent; * It works by storing all child views in an array within adapter and binding appropriate views to * rows when requested. */ -/*package*/ class RecyclerViewBackedScrollView extends RecyclerView { +@VisibleForTesting +public class RecyclerViewBackedScrollView extends RecyclerView { /** * Simple implementation of {@link ViewHolder} as it's an abstract class. The only thing we need