Skip to content

Commit d34d580

Browse files
committed
Remove separate CSS, instead, apply inline style directly to ScrollBlocker
1 parent 4602ddb commit d34d580

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

ScrollBlocker.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

ScrollBlocker.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var cx = require('react/lib/cx');
3+
var spread = require('react/lib/Object.assign');
44

5-
var ScrollBlocker = React.createClass({displayName: 'ScrollBlocker',
5+
var style = {
6+
pointerEvents: 'none'
7+
};
8+
9+
var ScrollBlocker = React.createClass({displayName: "ScrollBlocker",
610

711
getDefaultProps: function () {
812
return {
@@ -11,12 +15,9 @@ var ScrollBlocker = React.createClass({displayName: 'ScrollBlocker',
1115
},
1216

1317
render: function () {
14-
var classes = cx({
15-
'ScrollBlocker': this.props.active
16-
});
1718

1819
return (
19-
React.DOM.div( {className:cx(this.props.className, classes)},
20+
React.createElement("div", {style: spread({}, this.props.style, this.props.active && style)},
2021
this.props.children
2122
)
2223
);

ScrollListenerMixin.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
'use strict';
2+
13
var win = typeof window !== 'undefined' ? window : false;
24
var ViewportMetrics = require('react/lib/ViewportMetrics');
35

46
var ScrollListenerMixin = {
57

6-
getDefaultProps: function() {
8+
getDefaultProps: function () {
79
return {
810
endScrollTimeout: 300
911
};
1012
},
1113

12-
getInitialState: function() {
14+
getInitialState: function () {
1315
return {
1416
scrollTop: 0,
1517
isScrolling: false

jsx/ScrollBlocker.jsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
/** @jsx React.DOM */
22
var React = require('react');
3-
var cx = require('react/lib/cx');
3+
var assign = require('react/lib/Object.assign');
4+
5+
var style = {
6+
pointerEvents: 'none'
7+
};
48

59
var ScrollBlocker = React.createClass({
610

@@ -11,12 +15,9 @@ var ScrollBlocker = React.createClass({
1115
},
1216

1317
render: function () {
14-
var classes = cx({
15-
'ScrollBlocker': this.props.active
16-
});
1718

1819
return (
19-
<div className={cx(this.props.className, classes)}>
20+
<div style={assign({}, this.props.style, this.props.active && style)}>
2021
{this.props.children}
2122
</div>
2223
);

0 commit comments

Comments
 (0)