From a7dc43550383a4682ac119f0796ce1df5ed9cdb6 Mon Sep 17 00:00:00 2001 From: jquense Date: Sun, 13 Sep 2015 13:07:26 +0300 Subject: [PATCH] [fixed] className and style props being applied in multiple places --- package.json | 1 + src/Calendar.jsx | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 85e1c1699..83f4bc238 100644 --- 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 index f046be19e..b05a27edf 100644 --- 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 (
{ toolbar &&