Include props in new ListView and ScrollView mocks

Summary:
Hi,

The (as of yet unreleased) commit 5537055bf8 added some ListView and ScrollView mocks, but they leave out the original properties passed into them, which broke some of my tests (e.g. by excluding some properties like `testID`, for example, from the render tree) and I assume might break others' as well.

This PR makes it so the ListView mock directly returns the scroll component (instead of wrapping it in a View), and has ListViewMock and ScrollViewMock pass their given properties through.
Closes https://github.com/facebook/react-native/pull/11847

Differential Revision: D4408497

Pulled By: sahrens

fbshipit-source-id: 7ec01c35d6b8efeb97761cddffdb4075d09c7d70
This commit is contained in:
Dan Hassin 2017-01-12 10:44:00 -08:00 committed by Facebook Github Bot
parent d12d0b4c53
commit dbe555ba78
2 changed files with 2 additions and 7 deletions

View File

@ -20,7 +20,7 @@ const RCTScrollView = requireNativeComponent('RCTScrollView');
class ScrollViewMock extends React.Component {
render() {
return (
<RCTScrollView>
<RCTScrollView {...this.props}>
{this.props.refreshControl}
<View>
{this.props.children}

View File

@ -14,7 +14,6 @@ const ListViewDataSource = require('ListViewDataSource');
const React = require('React');
const ScrollView = require('ScrollView');
const StaticRenderer = require('StaticRenderer');
const View = require('View');
class ListViewMock extends React.Component {
static latestRef: ?ListViewMock;
@ -48,11 +47,7 @@ class ListViewMock extends React.Component {
}
}
renderFooter && rows.push(renderFooter());
return (
<View>
{this.props.renderScrollComponent({children: rows})}
</View>
);
return this.props.renderScrollComponent({...this.props, children: rows});
}
static DataSource = ListViewDataSource;
}