status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-25 15:45:32 +00:00
Code Issues Projects Releases Wiki Activity

Implement HorizontalScrollView component

Browse Source 
Summary: This diff implements the HorizontalScrollView component for Android Fabric C++, as part of this diff I also re-named the components AndroidHorizontalScrollContentView for RCTAndroidHorizontalScrollContentView and AndroidHorizontalScrollView for RCTAndroidHorizontalScrollView. This might sound against our plan of removing the RCT preffix, but it is to make it simpler to map components between current implementation of RN and Fabric (otherwise we don't know when to add the RCT preffix in Android side to find the right View Manager), later we can just remove the preffix from C++, Android, iOS and JS.

Reviewed By: shergin, achen1

Differential Revision: D9122729

fbshipit-source-id: e9299552857c6dd0c18abfa5fa49a3d50e221729
This commit is contained in:
David Vacca 2018-08-28 22:49:21 -07:00 committed by Facebook Github Bot
parent 01580de613
commit 575f7d478d
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Libraries/Components/ScrollView/ScrollView.js
View File

@ -47,10 +47,10 @@ let RCTScrollContentView;
if (Platform.OS === 'android') { if (Platform.OS === 'android') {
AndroidScrollView = requireNativeComponent('RCTScrollView'); AndroidScrollView = requireNativeComponent('RCTScrollView');
AndroidHorizontalScrollView = requireNativeComponent( AndroidHorizontalScrollView = requireNativeComponent(
'AndroidHorizontalScrollView', 'RCTAndroidHorizontalScrollView',
); );
AndroidHorizontalScrollContentView = requireNativeComponent( AndroidHorizontalScrollContentView = requireNativeComponent(
'AndroidHorizontalScrollContentView', 'RCTAndroidHorizontalScrollContentView',
); );
} else if (Platform.OS === 'ios') { } else if (Platform.OS === 'ios') {
RCTScrollView = requireNativeComponent('RCTScrollView'); RCTScrollView = requireNativeComponent('RCTScrollView');

2
ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.java
View File

@ -14,7 +14,7 @@ import com.facebook.react.uimanager.ViewGroupManager;
public class ReactHorizontalScrollContainerViewManager public class ReactHorizontalScrollContainerViewManager
extends ViewGroupManager<ReactHorizontalScrollContainerView> { extends ViewGroupManager<ReactHorizontalScrollContainerView> {
protected static final String REACT_CLASS = "AndroidHorizontalScrollContentView"; protected static final String REACT_CLASS = "RCTAndroidHorizontalScrollContentView";
public ReactHorizontalScrollContainerViewManager() {} public ReactHorizontalScrollContainerViewManager() {}

2
ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
View File

@ -37,7 +37,7 @@ public class ReactHorizontalScrollViewManager
extends ViewGroupManager<ReactHorizontalScrollView> extends ViewGroupManager<ReactHorizontalScrollView>
implements ReactScrollViewCommandHelper.ScrollCommandHandler<ReactHorizontalScrollView> { implements ReactScrollViewCommandHelper.ScrollCommandHandler<ReactHorizontalScrollView> {
protected static final String REACT_CLASS = "AndroidHorizontalScrollView"; protected static final String REACT_CLASS = "RCTAndroidHorizontalScrollView";
private static final int[] SPACING_TYPES = { private static final int[] SPACING_TYPES = {
Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM, Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,

8
ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
View File

@ -22,10 +22,10 @@ extern const char ScrollViewComponentName[];
*/ */
class ScrollViewShadowNode final: class ScrollViewShadowNode final:
public ConcreteViewShadowNode< public ConcreteViewShadowNode<
ScrollViewComponentName, ScrollViewComponentName,
ScrollViewProps, ScrollViewProps,
ScrollViewEventEmitter ScrollViewEventEmitter
> { > {
public: public:

7
ReactCommon/fabric/uimanager/FabricUIManager.cpp
View File

@ -65,6 +65,10 @@ static const std::string componentNameByReactViewName(std::string viewName) {
return "Image"; return "Image";
} }
if (viewName == "AndroidHorizontalScrollView") {
return "ScrollView";
}
// We need this temporarly for testing purposes until we have proper // We need this temporarly for testing purposes until we have proper
// implementation of core components. // implementation of core components.
if ( if (
@ -72,7 +76,8 @@ static const std::string componentNameByReactViewName(std::string viewName) {
viewName == "MultilineTextInputView" || viewName == "MultilineTextInputView" ||
viewName == "RefreshControl" || viewName == "RefreshControl" ||
viewName == "SafeAreaView" || viewName == "SafeAreaView" ||
viewName == "ScrollContentView" viewName == "ScrollContentView" ||
viewName == "AndroidHorizontalScrollContentView" // Android
) { ) {
return "View"; return "View";
} }