diff --git a/packages/benchmarks/package.json b/packages/benchmarks/package.json
index 71522737..e092c7bb 100644
--- a/packages/benchmarks/package.json
+++ b/packages/benchmarks/package.json
@@ -12,8 +12,6 @@
"d3-scale-chromatic": "^1.3.0",
"emotion": "^9.2.4",
"fela": "^6.1.9",
- "glamor": "2.20.40",
- "radium": "^0.24.0",
"react": "^16.5.1",
"react-dom": "^16.5.1",
"react-fela": "^7.3.1",
diff --git a/packages/benchmarks/src/implementations/glamor/Box.js b/packages/benchmarks/src/implementations/glamor/Box.js
deleted file mode 100644
index 707cda0c..00000000
--- a/packages/benchmarks/src/implementations/glamor/Box.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* eslint-disable react/prop-types */
-import React from 'react';
-import View from './View';
-
-const Box = ({ color, fixed = false, layout = 'column', outer = false, ...other }) => (
-
-);
-
-const styles = {
- outer: {
- alignSelf: 'flex-start',
- padding: 4
- },
- row: {
- flexDirection: 'row'
- },
- color0: {
- backgroundColor: '#14171A'
- },
- color1: {
- backgroundColor: '#AAB8C2'
- },
- color2: {
- backgroundColor: '#E6ECF0'
- },
- color3: {
- backgroundColor: '#FFAD1F'
- },
- color4: {
- backgroundColor: '#F45D22'
- },
- color5: {
- backgroundColor: '#E0245E'
- },
- fixed: {
- width: 6,
- height: 6
- }
-};
-
-export default Box;
diff --git a/packages/benchmarks/src/implementations/glamor/Dot.js b/packages/benchmarks/src/implementations/glamor/Dot.js
deleted file mode 100644
index 53c10cb7..00000000
--- a/packages/benchmarks/src/implementations/glamor/Dot.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* eslint-disable react/prop-types */
-import React from 'react';
-import { css } from 'glamor';
-
-const Dot = ({ size, x, y, children, color }) => (
-
- {children}
-
-);
-
-const styles = {
- root: {
- position: 'absolute',
- cursor: 'pointer',
- width: 0,
- height: 0,
- borderColor: 'transparent',
- borderStyle: 'solid',
- borderTopWidth: 0,
- transform: 'translate(50%, 50%)'
- }
-};
-
-export default Dot;
diff --git a/packages/benchmarks/src/implementations/glamor/Provider.js b/packages/benchmarks/src/implementations/glamor/Provider.js
deleted file mode 100644
index 864fc43a..00000000
--- a/packages/benchmarks/src/implementations/glamor/Provider.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import View from './View';
-export default View;
diff --git a/packages/benchmarks/src/implementations/glamor/View.js b/packages/benchmarks/src/implementations/glamor/View.js
deleted file mode 100644
index 485138a5..00000000
--- a/packages/benchmarks/src/implementations/glamor/View.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* eslint-disable react/prop-types */
-import { css } from 'glamor';
-import React from 'react';
-
-class View extends React.Component {
- render() {
- const { style, ...other } = this.props;
- return ;
- }
-}
-
-const viewStyle = {
- alignItems: 'stretch',
- borderWidth: 0,
- borderStyle: 'solid',
- boxSizing: 'border-box',
- display: 'flex',
- flexBasis: 'auto',
- flexDirection: 'column',
- flexShrink: 0,
- margin: 0,
- padding: 0,
- position: 'relative',
- // fix flexbox bugs
- minHeight: 0,
- minWidth: 0
-};
-
-export default View;
diff --git a/packages/benchmarks/src/implementations/glamor/index.js b/packages/benchmarks/src/implementations/glamor/index.js
deleted file mode 100644
index f32ff155..00000000
--- a/packages/benchmarks/src/implementations/glamor/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Box from './Box';
-import Dot from './Dot';
-import Provider from './Provider';
-import View from './View';
-
-export default {
- Box,
- Dot,
- Provider,
- View
-};
diff --git a/packages/benchmarks/src/implementations/radium/Box.js b/packages/benchmarks/src/implementations/radium/Box.js
deleted file mode 100644
index 2088cd2d..00000000
--- a/packages/benchmarks/src/implementations/radium/Box.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* eslint-disable react/prop-types */
-import Radium from 'radium';
-import React from 'react';
-import View from './View';
-
-const Box = ({ color, fixed = false, layout = 'column', outer = false, ...other }) => (
-
-);
-
-const styles = {
- outer: {
- alignSelf: 'flex-start',
- padding: 4
- },
- row: {
- flexDirection: 'row'
- },
- color0: {
- backgroundColor: '#14171A'
- },
- color1: {
- backgroundColor: '#AAB8C2'
- },
- color2: {
- backgroundColor: '#E6ECF0'
- },
- color3: {
- backgroundColor: '#FFAD1F'
- },
- color4: {
- backgroundColor: '#F45D22'
- },
- color5: {
- backgroundColor: '#E0245E'
- },
- fixed: {
- width: 6,
- height: 6
- }
-};
-
-export default Radium(Box);
diff --git a/packages/benchmarks/src/implementations/radium/Dot.js b/packages/benchmarks/src/implementations/radium/Dot.js
deleted file mode 100644
index ba2e97c8..00000000
--- a/packages/benchmarks/src/implementations/radium/Dot.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* eslint-disable react/prop-types */
-import Radium from 'radium';
-import React from 'react';
-
-const Dot = ({ size, x, y, children, color }) => (
-
- {children}
-
-);
-
-const styles = {
- root: {
- position: 'absolute',
- cursor: 'pointer',
- width: 0,
- height: 0,
- borderColor: 'transparent',
- borderStyle: 'solid',
- borderTopWidth: 0,
- transform: 'translate(50%, 50%)'
- }
-};
-
-export default Radium(Dot);
diff --git a/packages/benchmarks/src/implementations/radium/Provider.js b/packages/benchmarks/src/implementations/radium/Provider.js
deleted file mode 100644
index 864fc43a..00000000
--- a/packages/benchmarks/src/implementations/radium/Provider.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import View from './View';
-export default View;
diff --git a/packages/benchmarks/src/implementations/radium/View.js b/packages/benchmarks/src/implementations/radium/View.js
deleted file mode 100644
index 19ffe06e..00000000
--- a/packages/benchmarks/src/implementations/radium/View.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* eslint-disable react/prop-types */
-import Radium from 'radium';
-import React from 'react';
-
-class View extends React.Component {
- render() {
- const { style, ...other } = this.props;
- return ;
- }
-}
-
-const styles = {
- root: {
- alignItems: 'stretch',
- borderWidth: 0,
- borderStyle: 'solid',
- boxSizing: 'border-box',
- display: 'flex',
- flexBasis: 'auto',
- flexDirection: 'column',
- flexShrink: 0,
- margin: 0,
- padding: 0,
- position: 'relative',
- // fix flexbox bugs
- minHeight: 0,
- minWidth: 0
- }
-};
-
-export default Radium(View);
diff --git a/packages/benchmarks/src/implementations/radium/index.js b/packages/benchmarks/src/implementations/radium/index.js
deleted file mode 100644
index f32ff155..00000000
--- a/packages/benchmarks/src/implementations/radium/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Box from './Box';
-import Dot from './Dot';
-import Provider from './Provider';
-import View from './View';
-
-export default {
- Box,
- Dot,
- Provider,
- View
-};
diff --git a/packages/react-native-web/src/modules/ScrollResponder/index.js b/packages/react-native-web/src/modules/ScrollResponder/index.js
index e7dd857d..cb4acce5 100644
--- a/packages/react-native-web/src/modules/ScrollResponder/index.js
+++ b/packages/react-native-web/src/modules/ScrollResponder/index.js
@@ -375,11 +375,13 @@ const ScrollResponderMixin = {
({ x, y, animated } = x || emptyObject);
}
const node = this.scrollResponderGetScrollableNode();
+ const left = x || 0;
+ const top = y || 0;
if (typeof node.scroll === 'function') {
- node.scroll({ top: y || 0, left: x || 0, behavior: !animated ? 'auto' : 'smooth' });
+ node.scroll({ top, left, behavior: !animated ? 'auto' : 'smooth' });
} else {
- node.scrollLeft = x || 0;
- node.scrollTop = y || 0;
+ node.scrollLeft = left;
+ node.scrollTop = top;
}
},