Merge 1.x-stable

CHANGELOG.md

@@ -9,6 +9,12 @@ timeline: true
 
 ---
 
+## 1.6.3
+
+`2016-07-04`
+
+- 修复 Transfer 的一个 unmount 的错误。[#2206](https://github.com/ant-design/ant-design/pull/2206)
+
 ## 1.6.2
 
 `2016-06-27`

components/affix/index.tsx

@@ -133,8 +133,12 @@ export default class Affix extends React.Component<AffixProps, any> {
       'ant-affix': this.state.affixStyle,
     });
 
+    const props = { ...this.props };
+    delete props.offsetTop;
+    delete props.offsetBottom;
+
     return (
-      <div {...this.props}>
+      <div {...props}>
         <div className={className} ref="fixedNode" style={this.state.affixStyle}>
           {this.props.children}
         </div>

components/form/FormItem.tsx

@@ -165,7 +165,7 @@ export default class FormItem extends React.Component {
     // remove user input colon
     let label = props.label;
     if (typeof label === 'string' && label.trim() !== '') {
-      label = props.label.replace(/：|:$/, '');
+      label = props.label.replace(/[：|:]\s*$/, '');
     }
 
     return props.label ? (

components/layout/col.tsx

@@ -5,7 +5,7 @@ const stringOrNumber = PropTypes.oneOfType([PropTypes.string, PropTypes.number])
 const objectOrNumber = PropTypes.oneOfType([PropTypes.object, PropTypes.number]);
 import splitObject from '../_util/splitObject';
 export default function Col(props) {
-  const [{span, order, offset, push, pull, className, children}, others] = splitObject(props, 
+  const [{span, order, offset, push, pull, className, children}, others] = splitObject(props,
     ['span', 'order','offset', 'push','pull', 'className','children']);
   let sizeClassObj = {};
   ['xs', 'sm', 'md', 'lg'].forEach(size => {
@@ -15,6 +15,9 @@ export default function Col(props) {
     } else if (typeof props[size] === 'object') {
       sizeProps = props[size] || {};
     }
+
+    delete others[size];
+
     sizeClassObj = assign({}, sizeClassObj, {
       [`ant-col-${size}-${sizeProps.span}`]: sizeProps.span !== undefined,
       [`ant-col-${size}-order-${sizeProps.order}`]: sizeProps.order,

components/menu/style/index.less

@@ -327,23 +327,9 @@
     top: 0;
   }
 
-  &-dark&-horizontal > &-item:hover,
-  &-dark&-horizontal > &-item-active,
-  &-dark&-horizontal > &-item-selected,
-  &-dark&-horizontal > &-submenu:hover,
-  &-dark&-horizontal > &-submenu &-submenu-title:hover {
-    &,
-    & > a {
-      color: #fff;
-      transform: translateZ(0);
-    }
-  }
-
+  &-dark &-item,
   &-dark &-item > a {
     color: #999;
-    &:hover {
-      color: #fff;
-    }
   }
 
   &-dark&-inline,
@@ -358,28 +344,29 @@
     left: 0;
   }
 
-  &-dark&-inline &-item-selected {
-    border-right: 0;
-    background-color: @primary-color;
+  &-dark &-item:hover,
+  &-dark &-item-active,
+  &-dark &-submenu-active,
+  &-dark &-submenu:hover,
+  &-dark &-submenu-title:hover {
+    background-color: transparent;
     color: #fff;
-    > a,
-    > a:hover {
+    > a {
       color: #fff;
+      transform: translateZ(0);
     }
   }
 
-  &-dark&-vertical &-item-selected {
+  &-dark &-item-selected {
+    border-right: 0;
+    color: #fff;
     > a,
     > a:hover {
-      color: @primary-color;
+      color: #fff;
     }
   }
 
-  &-dark &-item:hover,
-  &-dark &-item-active,
-  &-dark &-submenu-active,
-  &-dark &-submenu-title:hover {
-    background-color: transparent;
-    color: @primary-color;
+  &-dark&-inline &-item-selected {
+    background-color: @primary-color;
   }
 }

components/table/filterDropdown.tsx

@@ -41,14 +41,20 @@ export default class FilterMenu extends React.Component {
     this.setState({
       visible: false,
     });
-    this.props.confirmFilter(this.props.column, this.state.selectedKeys);
+    this.confirmFilter();
   }
 
   onVisibleChange = (visible) => {
     this.setState({
       visible,
     });
     if (!visible) {
+      this.confirmFilter();
+    }
+  }
+
+  confirmFilter() {
+    if (this.state.selectedKeys !== this.props.selectedKeys) {
       this.props.confirmFilter(this.props.column, this.state.selectedKeys);
     }
   }

components/tag/index.md

@@ -18,5 +18,5 @@ english: Tag
 |----------------|-------------------------------|------|--------|
 | closable       | 标签是否可以关闭               | boolean    | false  |
 | onClose        | 关闭时的回调                   | function(event) | - |
-| afterClose     | 动画关闭后的回调                | function(event) | - |
+| afterClose     | 关闭动画完成后的回调             | function(event) | - |
 | color          | 标签的色彩：`blue` `green` `yellow` `red` | string | - |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",