Skip to content

Commit 119462b

Browse files
committed
speed increase if using classes
1 parent 47e81a1 commit 119462b

6 files changed

Lines changed: 14 additions & 13 deletions

File tree

build/simple-modal.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ var Modal = (function (_React$Component) {
4444
key: 'render',
4545
value: function render() {
4646
if (!this.props.show) return null;
47-
var modalStyle = _extends({}, _styles2['default'].modal, this.props.style);
48-
var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle);
49-
5047
//completely overwrite if they use a class
5148
if (this.props.className) {
5249
modalStyle = this.props.style;
5350
containerStyle = this.props.containerStyle;
51+
} else {
52+
var modalStyle = _extends({}, _styles2['default'].modal, this.props.style);
53+
var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle);
5454
}
5555

5656
return _react2['default'].createElement(

dist/simple-react-modal.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ var Modal = (function (_React$Component) {
4646
key: 'render',
4747
value: function render() {
4848
if (!this.props.show) return null;
49-
var modalStyle = _extends({}, _styles2['default'].modal, this.props.style);
50-
var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle);
51-
5249
//completely overwrite if they use a class
5350
if (this.props.className) {
5451
modalStyle = this.props.style;
5552
containerStyle = this.props.containerStyle;
53+
} else {
54+
var modalStyle = _extends({}, _styles2['default'].modal, this.props.style);
55+
var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle);
5656
}
5757

5858
return _react2['default'].createElement(

dist/simple-react-modal.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/src/example.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ export default class App extends React.Component{
2525
show={this.state.show}
2626
onClose={this.close.bind(this)}>
2727

28-
<a style={closeStyle} onClick={this.close.bind(this)}>X</a>
29-
<div>hey</div>
28+
<a key="close" style={closeStyle} onClick={this.close.bind(this)}>X</a>
29+
<div key="content">hey</div>
3030

3131
</Modal>
3232
</div>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "simple-react-modal",
33
"description": "The simplest modal",
4-
"version": "0.3.1",
4+
"version": "0.3.2",
55
"main": "./build/simple-modal.js",
66
"directories": {
77
"example": "example"

src/simple-modal.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ export default class Modal extends React.Component{
1515

1616
render(){
1717
if(!this.props.show) return null
18-
var modalStyle = Object.assign({},styles.modal,this.props.style)
19-
var containerStyle = Object.assign({},styles.container,this.props.containerStyle)
20-
2118
//completely overwrite if they use a class
2219
if(this.props.className){
2320
modalStyle = this.props.style
2421
containerStyle = this.props.containerStyle
2522
}
23+
else{
24+
var modalStyle = Object.assign({}, styles.modal ,this.props.style)
25+
var containerStyle = Object.assign({},styles.container,this.props.containerStyle)
26+
}
2627

2728
return (
2829
<div {...this.props} style={modalStyle} onClick={this.hideOnOuterClick} data-modal="true">

0 commit comments

Comments
 (0)