diff --git a/packages/react-native-web/src/exports/ScrollView/__tests__/__snapshots__/index-test.js.snap b/packages/react-native-web/src/exports/ScrollView/__tests__/__snapshots__/index-test.js.snap
new file mode 100644
index 00000000..6aa3dea5
--- /dev/null
+++ b/packages/react-native-web/src/exports/ScrollView/__tests__/__snapshots__/index-test.js.snap
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`components/ScrollView prop "refreshControl" with 1`] = `
+
+`;
+
+exports[`components/ScrollView prop "refreshControl" without 1`] = `
+
+`;
diff --git a/packages/react-native-web/src/exports/ScrollView/__tests__/index-test.js b/packages/react-native-web/src/exports/ScrollView/__tests__/index-test.js
index f93e3c54..9fcc6c75 100644
--- a/packages/react-native-web/src/exports/ScrollView/__tests__/index-test.js
+++ b/packages/react-native-web/src/exports/ScrollView/__tests__/index-test.js
@@ -86,4 +86,21 @@ describe('components/ScrollView', () => {
expect(typeof node.scrollResponderScrollNativeHandleToKeyboard === 'function').toBe(true);
});
});
+
+ describe('prop "refreshControl"', () => {
+ test('without', () => {
+ const { container } = render();
+ expect(container.firstChild).toMatchSnapshot();
+ });
+
+ test('with', () => {
+ const { container } = render(
+ }
+ style={{ backgroundColor: 'red' }}
+ />
+ );
+ expect(container.firstChild).toMatchSnapshot();
+ });
+ });
});
diff --git a/packages/react-native-web/src/exports/ScrollView/index.js b/packages/react-native-web/src/exports/ScrollView/index.js
index 9486e467..9f14ad87 100644
--- a/packages/react-native-web/src/exports/ScrollView/index.js
+++ b/packages/react-native-web/src/exports/ScrollView/index.js
@@ -223,21 +223,17 @@ const ScrollView = ((createReactClass({
invariant(ScrollViewClass !== undefined, 'ScrollViewClass must not be undefined');
- if (refreshControl) {
- return React.cloneElement(
- refreshControl,
- { style: props.style },
-
- {contentContainer}
-
- );
- }
-
- return (
+ const scrollView = (
{contentContainer}
);
+
+ if (refreshControl) {
+ return React.cloneElement(refreshControl, { style: props.style }, scrollView);
+ }
+
+ return scrollView;
},
_handleContentOnLayout(e: Object) {