Update ScrollBlocker.js

jeroencoumans · Apr 6, 2015 · 2fddcf4 · 2fddcf4
2 parents c29e6fa + f4633ff
commit 2fddcf4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ScrollBlocker.js b/ScrollBlocker.js
@@ -1,5 +1,6 @@
 /** @jsx React.DOM */
 var React = require('react');
+var assign = require('react/lib/Object.assign');
 
 var blockerStyle = {
   pointerEvents: 'none'
@@ -23,7 +24,7 @@ var ScrollBlocker = React.createClass({displayName: "ScrollBlocker",
     var { style, active, ...other } = this.props;
 
     return (
-      React.createElement("div", React.__spread({},  other, {style: active && style}), 
+      React.createElement("div", React.__spread({},  other, {style: assign({}, style, active && blockerStyle)}), 
         this.props.children
       )
     );