@@ -168,6 +169,12 @@ const Tabs = React.createClass({
...props
} = this.props;
+ delete props.classPrefix;
+ delete props.activeKey;
+ delete props.defaultActiveKey;
+ delete props.inset;
+ delete props.onAction;
+
return (
{
styles.map((amStyle, i) => {
@@ -39,7 +38,6 @@ const BadgeExample = React.createClass({
{
styles.map((amStyle, i) => {
diff --git a/kitchen-sink/pages/ButtonExample.js b/kitchen-sink/pages/ButtonExample.js
index 56bda87..9940c38 100644
--- a/kitchen-sink/pages/ButtonExample.js
+++ b/kitchen-sink/pages/ButtonExample.js
@@ -15,14 +15,12 @@ const ButtonExample = React.createClass({
基本样式
@@ -34,7 +32,6 @@ const ButtonExample = React.createClass({
@@ -42,7 +39,6 @@ const ButtonExample = React.createClass({
diff --git a/kitchen-sink/pages/SliderExample.js b/kitchen-sink/pages/SliderExample.js
index ac4ef19..ac3c964 100644
--- a/kitchen-sink/pages/SliderExample.js
+++ b/kitchen-sink/pages/SliderExample.js
@@ -86,7 +86,7 @@ const sliderCaption = (
const sliderThumbs = (
{data.map(function(item, i) {
return (
diff --git a/package.json b/package.json
index 1decc08..053b3a3 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
"clipboard": "^1.5.12",
"css-loader": "^0.23.1",
"del": "^2.2.1",
- "eslint": "^2.12.0",
+ "eslint": "^3.0.0",
"eslint-config-airbnb": "^9.0.1",
"eslint-plugin-import": "^1.10.0",
"eslint-plugin-jsx-a11y": "^1.4.2",
@@ -73,9 +73,9 @@
"marked": "^0.3.5",
"node-sass-import-once": "^1.2.0",
"postcss-loader": "^0.9.1",
- "react": "^15.1.0",
- "react-addons-css-transition-group": "^15.1.0",
- "react-dom": "^15.1.0",
+ "react": "^15.2.0",
+ "react-addons-css-transition-group": "^15.2.0",
+ "react-dom": "^15.2.0",
"react-router": "^2.5.1",
"run-sequence": "^1.2.2",
"sass-loader": "^4.0.0",
@@ -91,8 +91,8 @@
"classnames": "^2.2.5"
},
"peerDependencies": {
- "react": "^15.1.0",
- "react-dom": "^15.1.0",
- "react-addons-css-transition-group": "^15.1.0"
+ "react": "^15.2.0",
+ "react-dom": "^15.2.0",
+ "react-addons-css-transition-group": "^15.2.0"
}
}