Skip to content

Commit 2fddcf4

Browse files
committed
Update ScrollBlocker.js
2 parents c29e6fa + f4633ff commit 2fddcf4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ScrollBlocker.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3+
var assign = require('react/lib/Object.assign');
34

45
var blockerStyle = {
56
pointerEvents: 'none'
@@ -23,7 +24,7 @@ var ScrollBlocker = React.createClass({displayName: "ScrollBlocker",
2324
var { style, active, ...other } = this.props;
2425

2526
return (
26-
React.createElement("div", React.__spread({}, other, {style: active && style}),
27+
React.createElement("div", React.__spread({}, other, {style: assign({}, style, active && blockerStyle)}),
2728
this.props.children
2829
)
2930
);

0 commit comments

Comments
 (0)