From c0fb3508062bd032b63f3d7a74512baecabb0a1c Mon Sep 17 00:00:00 2001 From: JenLindsay Date: Wed, 10 Oct 2018 00:00:53 -0400 Subject: [PATCH 1/4] removed createReactClass from ScrollViewTestModule.js --- .../androidTest/js/ScrollViewTestModule.js | 158 ++++++++++-------- 1 file changed, 91 insertions(+), 67 deletions(-) diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js index a618361d47df..bd6f78da0cf2 100644 --- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js +++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js @@ -9,21 +9,22 @@ 'use strict'; -var BatchedBridge = require('BatchedBridge'); -var React = require('React'); -var createReactClass = require('create-react-class'); -var View = require('View'); -var ScrollView = require('ScrollView'); -var Text = require('Text'); -var StyleSheet = require('StyleSheet'); -var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); -var ScrollListener = require('NativeModules').ScrollListener; - -var NUM_ITEMS = 100; +const BatchedBridge = require('BatchedBridge'); +const React = require('React'); +const View = require('View'); +const ScrollView = require('ScrollView'); +const Text = require('Text'); +const StyleSheet = require('StyleSheet'); +const TouchableWithoutFeedback = require('TouchableWithoutFeedback'); +const ScrollListener = require('NativeModules').ScrollListener; + +const React = require('react'); + +const NUM_ITEMS = 100; // Shared by integration tests for ScrollView and HorizontalScrollView -var scrollViewApp; +let scrollViewApp; class Item extends React.Component { render() { @@ -37,54 +38,52 @@ class Item extends React.Component { } } -var getInitialState = function() { - var data = []; - for (var i = 0; i < NUM_ITEMS; i++) { - data[i] = {text: 'Item ' + i + '!'}; +class ScrollViewTestApp extends React.Component { + constructor() { + super(); + this.scrollView = React.createRef(); } - return { - data: data, - }; -}; -var onScroll = function(e) { - ScrollListener.onScroll( - e.nativeEvent.contentOffset.x, - e.nativeEvent.contentOffset.y, - ); -}; + getInitialState = () => { + var data = []; + for (var i = 0; i < NUM_ITEMS; i++) { + data[i] = {text: 'Item ' + i + '!'}; + } + return { + data: data, + }; + }; -var onScrollBeginDrag = function(e) { - ScrollListener.onScrollBeginDrag( - e.nativeEvent.contentOffset.x, - e.nativeEvent.contentOffset.y, - ); -}; + onScroll = e => { + ScrollListener.onScroll( + e.nativeEvent.contentOffset.x, + e.nativeEvent.contentOffset.y, + ); + }; -var onScrollEndDrag = function(e) { - ScrollListener.onScrollEndDrag( - e.nativeEvent.contentOffset.x, - e.nativeEvent.contentOffset.y, - ); -}; + onItemPress = itemNumber => { + ScrollListener.onItemPress(itemNumber); + }; -var onItemPress = function(itemNumber) { - ScrollListener.onItemPress(itemNumber); -}; + onScrollBeginDrag = e => { + ScrollListener.onScrollBeginDrag( + e.nativeEvent.contentOffset.x, + e.nativeEvent.contentOffset.y, + ); + }; -var ScrollViewTestApp = createReactClass({ - displayName: 'ScrollViewTestApp', - getInitialState: getInitialState, - onScroll: onScroll, - onItemPress: onItemPress, - onScrollBeginDrag: onScrollBeginDrag, - onScrollEndDrag: onScrollEndDrag, + onScrollEndDrag = e => { + ScrollListener.onScrollEndDrag( + e.nativeEvent.contentOffset.x, + e.nativeEvent.contentOffset.y, + ); + }; - scrollTo: function(destX, destY) { - this.refs.scrollView.scrollTo(destY, destX); - }, + scrollTo = (destX, destY) => { + this.scrollView.scrollTo(destY, destX); + }; - render: function() { + render() { scrollViewApp = this; var children = this.state.data.map((item, index) => ( + ref={this.scrollView}> {children} ); - }, -}); + } +} -var HorizontalScrollViewTestApp = createReactClass({ - displayName: 'HorizontalScrollViewTestApp', - getInitialState: getInitialState, - onScroll: onScroll, - onItemPress: onItemPress, +class HorizontalScrollViewTestApp extends React.Component { + constructor() { + super(); + this.scrollView = React.createRef(); + } - scrollTo: function(destX, destY) { - this.refs.scrollView.scrollTo(destY, destX); - }, + getInitialState() { + var data = []; + for (var i = 0; i < NUM_ITEMS; i++) { + data[i] = {text: 'Item ' + i + '!'}; + } + return { + data: data, + }; + } + + onScroll = e => { + ScrollListener.onScroll( + e.nativeEvent.contentOffset.x, + e.nativeEvent.contentOffset.y, + ); + }; + + onItemPress = itemNumber => { + ScrollListener.onItemPress(itemNumber); + }; - render: function() { + scrollTo = (destX, destY) => { + this.scrollView.scrollTo(destY, destX); + }; + + render() { scrollViewApp = this; var children = this.state.data.map((item, index) => ( )); return ( - + {children} ); - }, -}); + } +} var styles = StyleSheet.create({ item_container: { From 0a97013fdbaecb40b2eef395780b2a81868bb097 Mon Sep 17 00:00:00 2001 From: JenLindsay Date: Wed, 10 Oct 2018 00:16:37 -0400 Subject: [PATCH 2/4] correcting minor errors --- ReactAndroid/src/androidTest/js/ScrollViewTestModule.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js index bd6f78da0cf2..6a55b6bca676 100644 --- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js +++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js @@ -110,7 +110,7 @@ class HorizontalScrollViewTestApp extends React.Component { this.scrollView = React.createRef(); } - getInitialState() { + getInitialState = () => { var data = []; for (var i = 0; i < NUM_ITEMS; i++) { data[i] = {text: 'Item ' + i + '!'}; @@ -118,7 +118,7 @@ class HorizontalScrollViewTestApp extends React.Component { return { data: data, }; - } + }; onScroll = e => { ScrollListener.onScroll( @@ -146,9 +146,8 @@ class HorizontalScrollViewTestApp extends React.Component { )); return ( {children} From 90120638d16b9fb73448f4e46997ce6a4f090ff0 Mon Sep 17 00:00:00 2001 From: JenLindsay Date: Wed, 10 Oct 2018 00:31:01 -0400 Subject: [PATCH 3/4] removing duplicate declaration --- ReactAndroid/src/androidTest/js/ScrollViewTestModule.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js index 6a55b6bca676..c21f7b89df52 100644 --- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js +++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js @@ -18,8 +18,6 @@ const StyleSheet = require('StyleSheet'); const TouchableWithoutFeedback = require('TouchableWithoutFeedback'); const ScrollListener = require('NativeModules').ScrollListener; -const React = require('react'); - const NUM_ITEMS = 100; // Shared by integration tests for ScrollView and HorizontalScrollView From 22113ab448a767888a5ddd1622579f9e455fb34c Mon Sep 17 00:00:00 2001 From: JenLindsay Date: Thu, 11 Oct 2018 23:53:57 -0400 Subject: [PATCH 4/4] changes based on feedback from RSNara --- .../androidTest/js/ScrollViewTestModule.js | 108 +++++++----------- 1 file changed, 40 insertions(+), 68 deletions(-) diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js index c21f7b89df52..93739a272677 100644 --- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js +++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js @@ -36,46 +36,44 @@ class Item extends React.Component { } } -class ScrollViewTestApp extends React.Component { - constructor() { - super(); - this.scrollView = React.createRef(); +const getInitialState = function() { + var data = []; + for (var i = 0; i < NUM_ITEMS; i++) { + data[i] = {text: 'Item ' + i + '!'}; } - - getInitialState = () => { - var data = []; - for (var i = 0; i < NUM_ITEMS; i++) { - data[i] = {text: 'Item ' + i + '!'}; - } - return { - data: data, - }; + return { + data: data, }; +}; - onScroll = e => { - ScrollListener.onScroll( - e.nativeEvent.contentOffset.x, - e.nativeEvent.contentOffset.y, - ); - }; +const onScroll = function(e) { + ScrollListener.onScroll( + e.nativeEvent.contentOffset.x, + e.nativeEvent.contentOffset.y, + ); +}; - onItemPress = itemNumber => { - ScrollListener.onItemPress(itemNumber); - }; +const onScrollBeginDrag = function(e) { + ScrollListener.onScrollBeginDrag( + e.nativeEvent.contentOffset.x, + e.nativeEvent.contentOffset.y, + ); +}; - onScrollBeginDrag = e => { - ScrollListener.onScrollBeginDrag( - e.nativeEvent.contentOffset.x, - e.nativeEvent.contentOffset.y, - ); - }; +const onScrollEndDrag = function(e) { + ScrollListener.onScrollEndDrag( + e.nativeEvent.contentOffset.x, + e.nativeEvent.contentOffset.y, + ); +}; - onScrollEndDrag = e => { - ScrollListener.onScrollEndDrag( - e.nativeEvent.contentOffset.x, - e.nativeEvent.contentOffset.y, - ); - }; +const onItemPress = function(itemNumber) { + ScrollListener.onItemPress(itemNumber); +}; + +class ScrollViewTestApp extends React.Component { + scrollView = React.createRef(); + state = getInitialState(); scrollTo = (destX, destY) => { this.scrollView.scrollTo(destY, destX); @@ -87,14 +85,14 @@ class ScrollViewTestApp extends React.Component { )); return ( {children} @@ -103,31 +101,8 @@ class ScrollViewTestApp extends React.Component { } class HorizontalScrollViewTestApp extends React.Component { - constructor() { - super(); - this.scrollView = React.createRef(); - } - - getInitialState = () => { - var data = []; - for (var i = 0; i < NUM_ITEMS; i++) { - data[i] = {text: 'Item ' + i + '!'}; - } - return { - data: data, - }; - }; - - onScroll = e => { - ScrollListener.onScroll( - e.nativeEvent.contentOffset.x, - e.nativeEvent.contentOffset.y, - ); - }; - - onItemPress = itemNumber => { - ScrollListener.onItemPress(itemNumber); - }; + scrollView = React.createRef(); + state = getInitialState(); scrollTo = (destX, destY) => { this.scrollView.scrollTo(destY, destX); @@ -139,14 +114,11 @@ class HorizontalScrollViewTestApp extends React.Component { )); return ( - + {children} );