Skip to content

Commit

Permalink
Merge pull request #1122 from oliviertassinari/patch-2
Browse files Browse the repository at this point in the history
[Dialog] fix contentClassName not used
  • Loading branch information
hai-cea committed Jul 12, 2015
2 parents 6f748fe + 4c0034e commit bda10b9
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/dialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ let TransitionItem = React.createClass({
},

render() {
return <div style={this.mergeAndPrefix(this.state.style, this.props.style)}>
let {
style,
...other,
} = this.props;

return <div {...other} style={this.mergeAndPrefix(this.state.style, style)}>
{this.props.children}
</div>;
},
Expand Down

0 comments on commit bda10b9

Please sign in to comment.