Merge 1.x-stable

GaoHuijian · Jul 8, 2016 · 94fe25f · 94fe25f
2 parents f675b63 + 45db4ca
commit 94fe25f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/components/badge/index.tsx b/components/badge/index.tsx
@@ -21,7 +21,7 @@ export default class Badge extends React.Component {
   }
 
   render() {
-    let { count, prefixCls, overflowCount, className, style, children, dot, ...restProps } = this.props;
+    let { count, prefixCls, overflowCount, className, style, children, dot } = this.props;
 
     count = count > overflowCount ? `${overflowCount}+` : count;
 
@@ -40,17 +40,21 @@ export default class Badge extends React.Component {
     });
 
     return (
-      <span className={badgeCls} title={count} {...restProps} style={null}>
+      <span className={badgeCls} title={count} style={null}>
         {children}
-        <Animate component=""
+        <Animate
+          component=""
           showProp="data-show"
           transitionName={`${prefixCls}-zoom`}
           transitionAppear
         >
           {
             hidden ? null :
-              <ScrollNumber data-show={!hidden} className={scrollNumberCls}
-                count={count} style={style}
+              <ScrollNumber
+                data-show={!hidden}
+                className={scrollNumberCls}
+                count={count}
+                style={style}
               />
           }
         </Animate>

diff --git a/components/transfer/list.tsx b/components/transfer/list.tsx
@@ -6,7 +6,6 @@ import Animate from 'rc-animate';
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 import assign from 'object-assign';
 import { TransferItem } from './index';
-import omit from 'object.omit';
 
 function noop() {
 }
@@ -133,17 +132,9 @@ export default class TransferList extends React.Component<TransferListProps, any
 
   render() {
     const { prefixCls, dataSource, titleText, filter, checkedKeys,
-            checkStatus, body, footer, showSearch, render, ...otherProps } = this.props;
+            checkStatus, body, footer, showSearch, render, style } = this.props;
 
-    let { searchPlaceholder, notFoundContent, ...restProps } = otherProps;
-
-    // fix https://fb.me/react-unknown-prop
-    const lastProps = omit(restProps, [
-      'handleClear',
-      'handleFilter',
-      'handleSelect',
-      'handleSelectAll',
-    ]);
+    let { searchPlaceholder, notFoundContent } = this.props;
 
     // Custom Layout
     const footerDom = footer(assign({}, this.props));
@@ -192,7 +183,7 @@ export default class TransferList extends React.Component<TransferListProps, any
     }
 
     return (
-      <div className={listCls} {...lastProps}>
+      <div className={listCls} style={style}>
         <div className={`${prefixCls}-header`}>
           {this.renderCheckbox({
             prefixCls: 'ant-transfer',