[+] upgrade React 15.2.0

amazeui · Jul 4, 2016 · 1f3ae5a · 1f3ae5a
1 parent 5c6fe2b
commit 1f3ae5a
Show file tree

Hide file tree

Showing 29 changed files with 233 additions and 64 deletions.
diff --git a/js/Accordion.js b/js/Accordion.js
@@ -78,22 +78,32 @@ 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>
     );
   }
 });
 
-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,17 +165,21 @@ List.Item = React.createClass({
     let {
       className,
       role,
-      title,
       subTitle,
       href,
-      after,
       media,
       children,
       linkComponent,
       linked,
       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
@@ -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
@@ -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
@@ -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
@@ -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 ? (