[fixed] className and style props being applied in multiple places

appfolio · Sep 13, 2015 · a7dc435 · a7dc435
1 parent c8f8281
commit a7dc435
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -51,6 +51,7 @@
     "babel-plugin-object-assign": "^1.2.1",
     "chai": "^3.2.0",
     "chance": "^0.7.6",
+    "cpy": "^3.4.1",
     "css-loader": "^0.15.6",
     "es5-shim": "^4.1.7",
     "eslint": "^0.24.0",

diff --git a/src/Calendar.jsx b/src/Calendar.jsx
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import uncontrollable from 'uncontrollable';
-
+import cn from 'classnames';
 import {
     accessor
   , elementType
@@ -210,7 +210,10 @@ let Calendar = React.createClass({
       , culture
       , components = {}
       , formats = {}
-      , date: current } = this.props;
+      , style
+      , className
+      , date: current
+      , ...props } = this.props;
 
     formats = defaultFormats(formats)
 
@@ -226,7 +229,8 @@ let Calendar = React.createClass({
 
     return (
       <div {...elementProps}
-        className='rbc-calendar'
+        className={cn('rbc-calendar', className)}
+        style={style}
       >
         { toolbar &&
           <Toolbar
@@ -240,7 +244,7 @@ let Calendar = React.createClass({
         }
         <View
           ref='view'
-          {...this.props}
+          {...props}
           {...formats}
           formats={undefined}
           events={events}