File tree 2 files changed +9
-4
lines changed
2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 51
51
"babel-plugin-object-assign" : " ^1.2.1" ,
52
52
"chai" : " ^3.2.0" ,
53
53
"chance" : " ^0.7.6" ,
54
+ "cpy" : " ^3.4.1" ,
54
55
"css-loader" : " ^0.15.6" ,
55
56
"es5-shim" : " ^4.1.7" ,
56
57
"eslint" : " ^0.24.0" ,
Original file line number Diff line number Diff line change 1
1
import React , { PropTypes } from 'react' ;
2
2
import uncontrollable from 'uncontrollable' ;
3
-
3
+ import cn from 'classnames' ;
4
4
import {
5
5
accessor
6
6
, elementType
@@ -210,7 +210,10 @@ let Calendar = React.createClass({
210
210
, culture
211
211
, components = { }
212
212
, formats = { }
213
- , date : current } = this . props ;
213
+ , style
214
+ , className
215
+ , date : current
216
+ , ...props } = this . props ;
214
217
215
218
formats = defaultFormats ( formats )
216
219
@@ -226,7 +229,8 @@ let Calendar = React.createClass({
226
229
227
230
return (
228
231
< div { ...elementProps }
229
- className = 'rbc-calendar'
232
+ className = { cn ( 'rbc-calendar' , className ) }
233
+ style = { style }
230
234
>
231
235
{ toolbar &&
232
236
< Toolbar
@@ -240,7 +244,7 @@ let Calendar = React.createClass({
240
244
}
241
245
< View
242
246
ref = 'view'
243
- { ...this . props }
247
+ { ...props }
244
248
{ ...formats }
245
249
formats = { undefined }
246
250
events = { events }
You can’t perform that action at this time.
0 commit comments