From 1f3ae5a6d1a0f853ebac9849371bdf0ea20b801b Mon Sep 17 00:00:00 2001
From: minwe <minwe@yunshipei.com>
Date: Mon, 4 Jul 2016 15:54:23 +0800
Subject: [PATCH] [+] upgrade React 15.2.0

---
 js/Accordion.js                     | 20 ++++++++--
 js/Badge.js                         |  5 +++
 js/Button.js                        | 15 +++++++-
 js/ButtonGroup.js                   |  2 +
 js/ButtonToolbar.js                 | 14 +++++--
 js/Card.js                          | 10 ++++-
 js/Col.js                           |  4 +-
 js/Container.js                     |  2 +
 js/Field.js                         |  8 ++++
 js/Grid.js                          |  4 +-
 js/Group.js                         |  6 ++-
 js/Icon.js                          |  3 ++
 js/List.js                          | 12 ++++--
 js/Loader.js                        |  4 ++
 js/Modal/Modal.js                   | 18 ++++++++-
 js/NavBar.js                        | 17 ++++++++-
 js/Notification.js                  |  6 +++
 js/OffCanvas.js                     |  3 ++
 js/Popover.js                       |  3 ++
 js/Slider.js                        | 22 ++++++++---
 js/Switch.js                        |  2 +
 js/TabBar.js                        | 58 ++++++++++++++++++-----------
 js/Tabs.js                          | 20 +++++++++-
 js/Touchable.js                     | 15 ++++++++
 js/View.js                          |  2 +
 kitchen-sink/pages/BadgeExample.js  |  2 -
 kitchen-sink/pages/ButtonExample.js |  4 --
 kitchen-sink/pages/SliderExample.js |  2 +-
 package.json                        | 14 +++----
 29 files changed, 233 insertions(+), 64 deletions(-)

diff --git a/js/Accordion.js b/js/Accordion.js
index 1b7a15f..898005d 100644
--- a/js/Accordion.js
+++ b/js/Accordion.js
@@ -78,14 +78,24 @@ const Accordion = React.createClass({
   },
 
   render() {
+    let {
+      className,
+      inset,
+      ...props
+    } = this.props;
     let classSet = this.getClassSet();
 
-    classSet[this.prefixClass('inset')] = this.props.inset;
+    delete props.classPrefix;
+    delete props.activeKey;
+    delete props.defaultActiveKey;
+    delete props.onAction;
+
+    classSet[this.prefixClass('inset')] = inset;
 
     return (
       <section
-        {...this.props}
-        className={classNames(classSet, this.props.className)}
+        {...props}
+        className={classNames(classSet, className)}
       >
         {this.renderItems()}
       </section>
@@ -93,7 +103,7 @@ const Accordion = React.createClass({
   }
 });
 
-Accordion.Item = React.createClass({
+const AccordionItem = React.createClass({
   mixins: [ClassNameMixin, CollapseMixin],
 
   propTypes: {
@@ -165,4 +175,6 @@ Accordion.Item = React.createClass({
   }
 });
 
+Accordion.Item = AccordionItem;
+
 export default Accordion;
diff --git a/js/Badge.js b/js/Badge.js
index 4931df0..9a8aa38 100644
--- a/js/Badge.js
+++ b/js/Badge.js
@@ -33,6 +33,11 @@ const Badge = React.createClass({
       href,
       ...props
     } = this.props;
+
+    delete props.classPrefix;
+    delete props.amStyle;
+    delete props.rounded;
+
     Component = href ? 'a' : Component;
 
     return (
diff --git a/js/Button.js b/js/Button.js
index 254ac3d..81550ff 100644
--- a/js/Button.js
+++ b/js/Button.js
@@ -30,6 +30,17 @@ const Button = React.createClass({
     };
   },
 
+  removeUnknownProp(props) {
+    delete props.classPrefix;
+    delete props.amStyle;
+    delete props.amSize;
+    delete props.hollow;
+    delete props.block;
+    delete props.active;
+
+    return props;
+  },
+
   renderAnchor(classes) {
     let {
       href,
@@ -43,7 +54,7 @@ const Button = React.createClass({
 
     return (
       <Component
-        {...props}
+        {...this.removeUnknownProp(props)}
         href={href}
         className={classes}
         role="button"
@@ -63,7 +74,7 @@ const Button = React.createClass({
 
     return (
       <Component
-        {...props}
+        {...this.removeUnknownProp(props)}
         className={classes}
       >
         {children}
diff --git a/js/ButtonGroup.js b/js/ButtonGroup.js
index ef32567..59e4dac 100644
--- a/js/ButtonGroup.js
+++ b/js/ButtonGroup.js
@@ -37,6 +37,8 @@ const ButtonGroup = React.createClass({
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+
     classSet[this.prefixClass('stacked')] = stacked;
     classSet[this.prefixClass('justify')] = justify;
 
diff --git a/js/ButtonToolbar.js b/js/ButtonToolbar.js
index 559d9ce..40a3ac0 100644
--- a/js/ButtonToolbar.js
+++ b/js/ButtonToolbar.js
@@ -1,5 +1,4 @@
 import React, {
-  cloneElement,
   PropTypes,
 } from 'react';
 import classNames from 'classnames';
@@ -22,13 +21,20 @@ const ButtonToolbar = React.createClass({
 
   render() {
     let classSet = this.getClassSet();
+    let {
+      className,
+      children,
+      ...props
+    } = this.props;
+
+    delete props.classPrefix;
 
     return (
       <div
-        {...this.props}
-        className={classNames(this.props.className, classSet)}
+        {...props}
+        className={classNames(className, classSet)}
       >
-        {this.props.children}
+        {children}
       </div>
     );
   }
diff --git a/js/Card.js b/js/Card.js
index ec0159c..7032c09 100644
--- a/js/Card.js
+++ b/js/Card.js
@@ -50,6 +50,8 @@ const Card = React.createClass({
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+
     return (
       <div
         {...props}
@@ -68,7 +70,7 @@ const Card = React.createClass({
   }
 });
 
-Card.Child = React.createClass({
+const CardChild = React.createClass({
   mixins: [ClassNameMixin],
 
   propTypes: {
@@ -85,7 +87,7 @@ Card.Child = React.createClass({
   },
 
   render() {
-    const {
+    let {
       role,
       className,
       cover,
@@ -103,6 +105,8 @@ Card.Child = React.createClass({
       }
     }
 
+    delete props.classPrefix;
+
     return (
       <div
         {...props}
@@ -116,4 +120,6 @@ Card.Child = React.createClass({
   }
 });
 
+Card.Child = CardChild;
+
 export default Card;
diff --git a/js/Col.js b/js/Col.js
index 11f5dd9..a8093e7 100644
--- a/js/Col.js
+++ b/js/Col.js
@@ -26,15 +26,17 @@ const Col = React.createClass({
 
   render() {
     let {
+      component: Component,
       cols,
       offset,
       shrink,
-      component: Component,
       className,
       ...props,
     } = this.props;
     let classSet = this.getClassSet();
 
+    delete props.classPrefix;
+
     if (cols) {
       classSet[this.prefixClass(cols)] = true;
     }
diff --git a/js/Container.js b/js/Container.js
index 2fa5698..ea502d7 100644
--- a/js/Container.js
+++ b/js/Container.js
@@ -119,6 +119,8 @@ let Container = React.createClass({
     } = this.props;
     let classSet = this.getClassSet();
 
+    delete props.classPrefix;
+
     // As view transition container
     if (transition) {
       return (
diff --git a/js/Field.js b/js/Field.js
index f5b1e55..929fc6a 100644
--- a/js/Field.js
+++ b/js/Field.js
@@ -106,6 +106,14 @@ const Field = React.createClass({
       ...commonProps,
     };
 
+    delete assignedProps.classPrefix;
+    delete assignedProps.containerClassName;
+    delete assignedProps.label;
+    delete assignedProps.btnBefore;
+    delete assignedProps.btnAfter;
+    delete assignedProps.labelBefore;
+    delete assignedProps.labelAfter;
+
     switch (this.props.type) {
       case 'select':
         field = (
diff --git a/js/Grid.js b/js/Grid.js
index b13fe23..8c21272 100644
--- a/js/Grid.js
+++ b/js/Grid.js
@@ -30,15 +30,17 @@ const Grid = React.createClass({
     let classSet = this.getClassSet();
     let {
       component: Component,
+      className,
       collapse,
       bordered,
-      className,
       avg,
       align,
       wrap,
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+
     // .g-collapse
     classSet[this.prefixClass('collapse')] = collapse;
 
diff --git a/js/Group.js b/js/Group.js
index c890508..803471e 100644
--- a/js/Group.js
+++ b/js/Group.js
@@ -36,13 +36,15 @@ let Group = React.createClass({
     let {
       component: Component,
       className,
-      header,
-      footer,
       noPadded,
       ...props,
     } = this.props;
     let classSet = this.getClassSet();
 
+    delete props.classPrefix;
+    delete props.header;
+    delete props.footer;
+
     classSet[this.prefixClass('no-padded')] = noPadded;
 
     let bodyClasses = {
diff --git a/js/Icon.js b/js/Icon.js
index b3d4c91..c4b0485 100644
--- a/js/Icon.js
+++ b/js/Icon.js
@@ -34,6 +34,9 @@ const Icon = React.createClass({
       name,
       ...props
     } = this.props;
+
+    delete props.classPrefix;
+
     Component = props.href ? 'a' : Component;
 
     // icon-[iconName]
diff --git a/js/List.js b/js/List.js
index 98c0870..0d79a27 100644
--- a/js/List.js
+++ b/js/List.js
@@ -29,9 +29,11 @@ const List = React.createClass({
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+
     classSet[this.prefixClass('inset')] = inset;
 
-    // TODO: 使用 ul 可能不是太好的选择，再一些需要定义 component 的场合缺乏灵活性
+    // TODO: 使用 ul 可能不是太好的选择，在一些需要定义 component 的场合缺乏灵活性
     return (
       <ul
         {...props}
@@ -163,10 +165,8 @@ List.Item = React.createClass({
     let {
       className,
       role,
-      title,
       subTitle,
       href,
-      after,
       media,
       children,
       linkComponent,
@@ -174,6 +174,12 @@ List.Item = React.createClass({
       nested,
       ...props
     } = this.props;
+
+    delete props.classPrefix;
+    delete props.title;
+    delete props.after;
+    delete props.linkProps;
+
     let itemChildren = [
       this.renderAddon('media'),
       this.renderMain(),
diff --git a/js/Loader.js b/js/Loader.js
index 230f216..503218c 100644
--- a/js/Loader.js
+++ b/js/Loader.js
@@ -31,6 +31,10 @@ const Loader = React.createClass({
       ...props,
     } = this.props;
 
+    delete props.classPrefix;
+    delete props.amStyle;
+    delete props.rounded;
+
     return (
       <Component
         {...props}
diff --git a/js/Modal/Modal.js b/js/Modal/Modal.js
index cb16762..fd0f271 100644
--- a/js/Modal/Modal.js
+++ b/js/Modal/Modal.js
@@ -166,6 +166,20 @@ const Modal = createClass({
     this.props.onClosed();
   },
 
+  removeUnknownProp(props) {
+    delete props.isOpen;
+    delete props.onDismiss;
+    delete props.onOpen;
+    delete props.onClosed;
+    delete props.onAction;
+    delete props.classPrefix;
+    delete props.confirmText;
+    delete props.cancelText;
+    delete props.closeBtn;
+
+    return props;
+  },
+
   renderActions(classSet) {
     classSet[this.props.classPrefix] = false;
 
@@ -201,7 +215,7 @@ const Modal = createClass({
 
     return (
       <div
-        {...props}
+        {...this.removeUnknownProp(props)}
         className={classNames(className, classSet, this.setClassNS('popup'))}
         key="modalPopup"
         ref="modal"
@@ -401,7 +415,7 @@ const Modal = createClass({
 
       modal = (
         <div
-          {...props}
+          {...this.removeUnknownProp(props)}
           style={style}
           ref="modalContainer"
           className={classNames(classSet, className)}
diff --git a/js/NavBar.js b/js/NavBar.js
index 1550e80..5754b87 100644
--- a/js/NavBar.js
+++ b/js/NavBar.js
@@ -12,6 +12,14 @@ const NavBar = React.createClass({
 
   propTypes: {
     classPrefix: PropTypes.string,
+    amStyle: PropTypes.oneOf([
+      'primary',
+      'secondary',
+      'success',
+      'warning',
+      'alert',
+      'dark',
+    ]),
     title: PropTypes.node,
     leftNav: PropTypes.array,
     rightNav: PropTypes.array,
@@ -143,11 +151,18 @@ const NavBar = React.createClass({
   render() {
     let classSet = this.getClassSet();
     let {
-      title,
       className,
       ...props
     } = this.props;
 
+    delete props.title;
+    delete props.classPrefix;
+    delete props.leftNav;
+    delete props.rightNav;
+    delete props.amStyle;
+    delete props.onAction;
+    delete props.titleOnLeft;
+
     return (
       <header
         {...props}
diff --git a/js/Notification.js b/js/Notification.js
index bc0d826..9a7b3ae 100644
--- a/js/Notification.js
+++ b/js/Notification.js
@@ -66,6 +66,12 @@ const Notification = React.createClass({
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+    delete props.amStyle;
+    delete props.static;
+    delete props.closeBtn;
+    delete props.onDismiss;
+
     classSet[this.prefixClass('animated')] = animated;
 
     let notificationBar = visible ? (
diff --git a/js/OffCanvas.js b/js/OffCanvas.js
index d9465b8..a8865b2 100644
--- a/js/OffCanvas.js
+++ b/js/OffCanvas.js
@@ -48,6 +48,9 @@ const OffCanvas = React.createClass({
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+    delete props.onDismiss;
+
     classSet[this.prefixClass('out')] = isClosing;
     classSet[this.prefixClass(placement)] = !!placement;
     classSet[this.prefixClass(animation)] = !!animation;
diff --git a/js/Popover.js b/js/Popover.js
index 488f40e..5f97a4f 100644
--- a/js/Popover.js
+++ b/js/Popover.js
@@ -60,6 +60,9 @@ const Popover = React.createClass({
       top: angleTop,
     };
 
+    delete props.classPrefix;
+    delete props.onDismiss;
+
     classSet[this.prefixClass('out')] = isClosing;
     classSet[this.prefixClass(placement)] = placement;
 
diff --git a/js/Slider.js b/js/Slider.js
index 9500d9d..3f36c01 100644
--- a/js/Slider.js
+++ b/js/Slider.js
@@ -65,7 +65,7 @@ const Slider = React.createClass({
   },
 
   componentWillReceiveProps(nextProps) {
-    var activeIndex = this.getActiveIndex();
+    let activeIndex = this.getActiveIndex();
 
     if (nextProps.activeIndex != null &&
       nextProps.activeIndex !== activeIndex) {
@@ -97,8 +97,8 @@ const Slider = React.createClass({
   next(e) {
     e && e.preventDefault();
 
-    var index = this.getActiveIndex() + 1;
-    var count = React.Children.count(this.props.children);
+    let index = this.getActiveIndex() + 1;
+    let count = React.Children.count(this.props.children);
 
     if (index > count - 1) {
       if (!this.props.loop) {
@@ -113,7 +113,7 @@ const Slider = React.createClass({
   prev(e) {
     e && e.preventDefault();
 
-    var index = this.getActiveIndex() - 1;
+    let index = this.getActiveIndex() - 1;
 
     if (index < 0) {
       if (!this.props.loop) {
@@ -298,6 +298,16 @@ const Slider = React.createClass({
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+    delete props.onAction;
+    delete props.pager;
+    delete props.controls;
+    delete props.slide;
+    delete props.interval;
+    delete props.pauseOnHover;
+    delete props.prevIcon;
+    delete props.nextIcon;
+
     // TODO: 优化 swipe，左右方向阻止默认事件，垂直方向不阻止
     return (
       <Touchable
@@ -321,7 +331,7 @@ const Slider = React.createClass({
   }
 });
 
-Slider.Item = React.createClass({
+const SliderItem = React.createClass({
   propTypes: {
     direction: PropTypes.oneOf(['prev', 'next']),
     onAnimateOutEnd: PropTypes.func,
@@ -408,4 +418,6 @@ Slider.Item = React.createClass({
   }
 });
 
+Slider.Item = SliderItem;
+
 export default Slider;
diff --git a/js/Switch.js b/js/Switch.js
index 7058179..edf3722 100644
--- a/js/Switch.js
+++ b/js/Switch.js
@@ -40,6 +40,8 @@ const Switch = React.createClass({
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+
     return (
       <label
         {...props}
diff --git a/js/TabBar.js b/js/TabBar.js
index 6658752..2ebb7d9 100644
--- a/js/TabBar.js
+++ b/js/TabBar.js
@@ -1,4 +1,6 @@
-import React from 'react';
+import React, {
+  PropTypes,
+} from 'react';
 import classNames from 'classnames';
 import ClassNameMixin from './mixins/ClassNameMixin';
 import Icon from './Icon';
@@ -11,10 +13,10 @@ let TabBar = React.createClass({
   mixins: [ClassNameMixin],
 
   propTypes: {
-    classPrefix: React.PropTypes.string,
-    component: React.PropTypes.node,
-    amStyle: React.PropTypes.string,
-    onAction: React.PropTypes.func,
+    classPrefix: PropTypes.string,
+    component: PropTypes.node,
+    amStyle: PropTypes.string,
+    onAction: PropTypes.func,
   },
 
   getDefaultProps() {
@@ -35,6 +37,9 @@ let TabBar = React.createClass({
       ...props
     } = this.props;
 
+    delete props.classPrefix;
+    delete props.amStyle;
+
     return (
       <Component
         {...props}
@@ -68,31 +73,31 @@ let TabBar = React.createClass({
 //   Icon 应该支持用户自定义：
 //   React-native 采用 require('path/to/icon') 的形式，
 //   这里可能需要再添加一个属性
-TabBar.Item = React.createClass({
+const TabBarItem = React.createClass({
   mixins: [ClassNameMixin],
 
   propTypes: {
-    classPrefix: React.PropTypes.string,
-    component: React.PropTypes.any,
-    icon: React.PropTypes.string, // icon name
-    title: React.PropTypes.string,
-    href: React.PropTypes.string,
-    eventKey: React.PropTypes.any,
-    badge: React.PropTypes.oneOfType([
-      React.PropTypes.string,
-      React.PropTypes.number,
+    classPrefix: PropTypes.string,
+    component: PropTypes.any,
+    icon: PropTypes.string, // icon name
+    title: PropTypes.string,
+    href: PropTypes.string,
+    eventKey: PropTypes.any,
+    badge: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
     ]),
-    badgeStyle: React.PropTypes.string,
-    selected: React.PropTypes.bool, // alias of `active`
-    selectedIcon: React.PropTypes.node, // not supported now
+    badgeStyle: PropTypes.string,
+    selected: PropTypes.bool, // alias of `active`
+    selectedIcon: PropTypes.node, // not supported now
+    onAction: PropTypes.func,
   },
 
   getDefaultProps() {
     return {
       classPrefix: 'tabbar',
       component: 'span',
-      onAction: function() {
-      }
+      onAction: () => {},
     };
   },
 
@@ -105,7 +110,8 @@ TabBar.Item = React.createClass({
     return badge ? (
       <Badge
         amStyle={badgeStyle || 'alert'}
-        rounded>
+        rounded
+      >
         {badge}
       </Badge>
     ) : null;
@@ -145,7 +151,15 @@ TabBar.Item = React.createClass({
       className,
       ...props
     } = this.props;
+
+    delete props.classPrefix;
+    delete props.badge;
+    delete props.badgeStyle;
+    delete props.eventKey;
+    delete props.onAction;
+
     Component = this.props.href ? 'a' : Component;
+
     // TODO: how to display badge when icon not set?
 
     return (
@@ -162,4 +176,6 @@ TabBar.Item = React.createClass({
   }
 });
 
+TabBar.Item = TabBarItem;
+
 export default TabBar;
diff --git a/js/Tabs.js b/js/Tabs.js
index 128f577..ab50f93 100644
--- a/js/Tabs.js
+++ b/js/Tabs.js
@@ -16,6 +16,7 @@ const Tabs = React.createClass({
     activeKey: PropTypes.any,
     defaultActiveKey: PropTypes.any,
     onAction: PropTypes.func,
+    inset: PropTypes.bool,
   },
 
   getDefaultProps() {
@@ -143,7 +144,7 @@ const Tabs = React.createClass({
       return (
         <Tabs.Item
           active={eventKey === activeKey}
-          enventKey={eventKey}
+          eventKey={eventKey}
           key={'tabPanel' + index}
           {...props}
         >
@@ -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 (
       <div
         {...props}
@@ -180,7 +187,7 @@ const Tabs = React.createClass({
   }
 });
 
-Tabs.Item = React.createClass({
+const TabsItem = React.createClass({
   mixins: [ClassNameMixin],
 
   propTypes: {
@@ -210,6 +217,13 @@ Tabs.Item = React.createClass({
     } = this.props;
     const elementName = 'panel';
 
+    delete props.classPrefix;
+    delete props.eventKey;
+    delete props.active;
+    delete props.noPadded;
+    delete props.navSize;
+    delete props.navStyle;
+
     classSet[this.prefixClass(elementName)] = true;
     classSet[this.prefixClass(`${elementName}-no-padded`)] = noPadded;
 
@@ -224,6 +238,8 @@ Tabs.Item = React.createClass({
   }
 });
 
+Tabs.Item = TabsItem;
+
 export default Tabs;
 
 // TODO: Nav 的可定制性，如允许传入 Router 的 Link 组件
diff --git a/js/Touchable.js b/js/Touchable.js
index 0ea28ea..e7ed33f 100644
--- a/js/Touchable.js
+++ b/js/Touchable.js
@@ -44,6 +44,21 @@ const Touchable = React.createClass({
       props.onClick = createChainedFunction(props.onClick, onTap);
     }
 
+    delete props.moveThreshold;
+    delete props.tapDelay;
+    delete props.pressDelay;
+    delete props.preventDefault;
+    delete props.stopPropagation;
+    delete props.onSwipe;
+    delete props.onSwipeLeft;
+    delete props.onSwipeUp;
+    delete props.onSwipeRight;
+    delete props.onSwipeDown;
+    delete props.onTap;
+    delete props.onSingleTap;
+    delete props.onDoubleTap;
+    delete props.onPress;
+
     return (
       <Component
         {...props}
diff --git a/js/View.js b/js/View.js
index 97ff1bf..746472f 100644
--- a/js/View.js
+++ b/js/View.js
@@ -28,6 +28,8 @@ const View = React.createClass({
       ...props,
     } = this.props;
 
+    delete props.classPrefix;
+
     return React.createElement(component, {
       ...props,
       className: classNames(className, this.getClassSet()),
diff --git a/kitchen-sink/pages/BadgeExample.js b/kitchen-sink/pages/BadgeExample.js
index 3dfcafa..870f45c 100644
--- a/kitchen-sink/pages/BadgeExample.js
+++ b/kitchen-sink/pages/BadgeExample.js
@@ -21,7 +21,6 @@ const BadgeExample = React.createClass({
       <Container {...this.props}>
         <Group
           header="默认形状"
-          padded
         >
           {
             styles.map((amStyle, i) => {
@@ -39,7 +38,6 @@ const BadgeExample = React.createClass({
 
         <Group
           header="Rounded"
-          padded
         >
         {
           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({
         <h2>基本样式</h2>
         <Group
           header="默认样式"
-          padded
         >
           <Button>Default</Button>
         </Group>
 
         <Group
           header="颜色样式"
-          padded
         >
           <Button amStyle="primary">Primary</Button>
           <Button amStyle="secondary">Secondary</Button>
@@ -34,7 +32,6 @@ const ButtonExample = React.createClass({
 
         <Group
           header="块级显示"
-          padded
         >
           <Button block>Default Block</Button>
           <Button amStyle="primary" block>Primary Block</Button>
@@ -42,7 +39,6 @@ const ButtonExample = React.createClass({
 
         <Group
           header="按钮大小"
-          padded
         >
           <Button amSize="xs">Default xs</Button>
           <Button amSize="sm">Default sm</Button>
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 = (
   <Slider
-    directionNav={false}
+    controls={false}
   >
     {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"
   }
 }