File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 5151 "babel-plugin-object-assign" : " ^1.2.1" ,
5252 "chai" : " ^3.2.0" ,
5353 "chance" : " ^0.7.6" ,
54+ "cpy" : " ^3.4.1" ,
5455 "css-loader" : " ^0.15.6" ,
5556 "es5-shim" : " ^4.1.7" ,
5657 "eslint" : " ^0.24.0" ,
Original file line number Diff line number Diff line change 11import React , { PropTypes } from 'react' ;
22import uncontrollable from 'uncontrollable' ;
3-
3+ import cn from 'classnames' ;
44import {
55 accessor
66 , elementType
@@ -210,7 +210,10 @@ let Calendar = React.createClass({
210210 , culture
211211 , components = { }
212212 , formats = { }
213- , date : current } = this . props ;
213+ , style
214+ , className
215+ , date : current
216+ , ...props } = this . props ;
214217
215218 formats = defaultFormats ( formats )
216219
@@ -226,7 +229,8 @@ let Calendar = React.createClass({
226229
227230 return (
228231 < div { ...elementProps }
229- className = 'rbc-calendar'
232+ className = { cn ( 'rbc-calendar' , className ) }
233+ style = { style }
230234 >
231235 { toolbar &&
232236 < Toolbar
@@ -240,7 +244,7 @@ let Calendar = React.createClass({
240244 }
241245 < View
242246 ref = 'view'
243- { ...this . props }
247+ { ...props }
244248 { ...formats }
245249 formats = { undefined }
246250 events = { events }
You can’t perform that action at this time.
0 commit comments