Merge branch 'master' of github.com:ant-design/ant-design

CHANGELOG.md

@@ -4,6 +4,18 @@
 
 ---
 
+## 0.12.15
+
+- 升级 rc-collapse 修复一个性能问题。
+- 修复一个 Collapse 内嵌 Tabs 的选中项样式问题。[#1451](https://github.com/ant-design/ant-design/issues/1451)
+- 修复 Input 组件服务端渲染报错的问题。[#1321](https://github.com/ant-design/ant-design/issues/1321)
+- 修复 Tag 组件调用了两次 afterClose 的问题。[#1435](https://github.com/ant-design/ant-design/issues/1435)
+- 修复一个 Table 控制模式的问题。[#1434](https://github.com/ant-design/ant-design/issues/1434)
+- 修复一个 Tabs 相互嵌套的样式问题。[#1435](https://github.com/ant-design/ant-design/issues/1435)
+- 修复 Dropdown.Button 点击右边也触发 onClick 的问题。
+- 修复 Radio.Button 在 IE8 下无法选择的问题。[#1459](https://github.com/ant-design/ant-design/issues/1459)
+- 优化了 Button 点击后仍然有 focus 效果的问题。
+
 ## 0.12.14
 
 `2016-04-13`

components/button/button.jsx

@@ -39,6 +39,13 @@ export default class Button extends React.Component {
 
     this.props.onClick(...args);
   }
+  // Handle auto focus when click button in Chrome
+  handleMouseUp(e) {
+    findDOMNode(this).blur();
+    if (this.props.onMouseUp) {
+      this.props.onMouseUp(e);
+    }
+  }
   render() {
     const props = this.props;
     const { type, shape, size, className, htmlType, children, ...others } = props;
@@ -65,6 +72,7 @@ export default class Button extends React.Component {
       <button {...others}
         type={htmlType || 'button'}
         className={classes}
+        onMouseUp={this.handleMouseUp.bind(this)}
         onClick={this.handleClick.bind(this)}>
         {kids}
       </button>

components/date-picker/demo/locale.md

@@ -2,30 +2,24 @@
 
 - order: 10
 
-通过 `locale` 配置时区、语言等, 默认支持 en_US, zh_CN
+通过 `locale` 配置时区、语言等, 默认支持 `en_US`，`zh_CN`。
 
 ---
 
 ````jsx
 import { DatePicker } from 'antd';
 import enUS from 'antd/lib/date-picker/locale/en_US';
-import assign from 'object-assign';
 
 const App = React.createClass({
-  getInitialState() {
-    return {
-      locale: assign({}, enUS, {
-        timezoneOffset: 0 * 60,
-        firstDayOfWeek: 0,
-        minimalDaysInFirstWeek: 1,
-      })
-    };
-  },
   render() {
-    return <DatePicker locale={this.state.locale} />;
+    const customLocale = {
+      timezoneOffset: 0 * 60,
+      firstDayOfWeek: 0,
+      minimalDaysInFirstWeek: 1,
+    };
+    return <DatePicker locale={{ ...enUS, ...customLocale }} />;
   }
 });
 
 ReactDOM.render(<App />, mountNode);
 ````
-

components/form/FormItem.jsx

@@ -47,6 +47,11 @@ class FormItem extends React.Component {
     );
   }
 
+  renderExtra() {
+    const { prefixCls, extra } = this.props;
+    return <div className={prefixClsFn(prefixCls, 'extra')}>{extra}</div>;
+  }
+
   getValidateStatus() {
     const { isFieldValidating, getFieldError, getFieldValue } = this.context.form;
     const field = this.getId();
@@ -142,7 +147,7 @@ class FormItem extends React.Component {
         this.renderValidateWrapper(
           children,
           this.renderHelp(),
-          props.extra
+          this.renderExtra()
         )
       ),
     ];

components/input/index.jsx

@@ -3,7 +3,7 @@ import assign from 'object-assign';
 import classNames from 'classnames';
 
 function ieGT9() {
-  if (typeof document === undefined) {
+  if (typeof document === 'undefined') {
     return false;
   }
   const documentMode = document.documentMode || 0;

components/select/index.md

@@ -31,7 +31,7 @@
 | filterOption | 是否根据输入项进行筛选，可为一个函数，返回满足要求的 option 即可 | boolean or function(inputValue, option) | true     |
 | tags | 可以把随意输入的条目作为 tag，输入项不需要与下拉选项匹配 | boolean |false |
 | onSelect | 被选中时调用，参数为选中项的 value 值 | function(value, option) | 无   |
-| onDeselect | 取消选中时调用，参数为选中项的 option value 值，仅在 multiple 或 tags 模式下生效 |  function(value, option) | 无   |
+| onDeselect | 取消选中时调用，参数为选中项的 option value 值，仅在 multiple 或 tags 模式下生效 |  function(value) | 无   |
 | onChange | 选中option，或input的value变化(combobox 模式下)时，调用此函数 | function(value, label) | 无 |
 | onSearch | 文本框值变化时回调 | function(value: String) |  |
 | placeholder | 选择框默认文字 | string | 无 |

components/table/demo/row-selection.md

@@ -49,7 +49,7 @@ const rowSelection = {
   },
   onSelectAll(selected, selectedRows, changeRows) {
     console.log(selected, selectedRows, changeRows);
-  }
+  },
 };
 
 ReactDOM.render(<Table rowSelection={rowSelection} columns={columns} dataSource={data} />

components/table/index.jsx

@@ -13,6 +13,11 @@ import { flatArray } from './util';
 function noop() {
 }
 
+function stopPropagation(e) {
+  e.stopPropagation();
+  e.nativeEvent.stopImmediatePropagation();
+}
+
 const defaultLocale = {
   filterTitle: '筛选',
   filterConfirm: '确定',
@@ -31,7 +36,7 @@ let AntTable = React.createClass({
   getInitialState() {
     return {
       // 减少状态
-      selectedRowKeys: this.props.selectedRowKeys || [],
+      selectedRowKeys: (this.props.rowSelection || {}).selectedRowKeys || [],
       filters: {},
       selectionDirty: false,
       sortColumn: '',
@@ -305,7 +310,7 @@ let AntTable = React.createClass({
                  this.getDefaultSelection().indexOf(rowIndex) >= 0);
     }
     return (
-      <Radio disabled={props.disabled}
+      <Radio disabled={props.disabled} onClick={stopPropagation}
         onChange={this.handleRadioSelect.bind(this, record, rowIndex)}
         value={rowIndex} checked={checked} />
     );
@@ -325,7 +330,7 @@ let AntTable = React.createClass({
       props = this.props.rowSelection.getCheckboxProps.call(this, record);
     }
     return (
-      <Checkbox checked={checked} disabled={props.disabled}
+      <Checkbox checked={checked} disabled={props.disabled} onClick={stopPropagation}
         onChange={this.handleSelect.bind(this, record, rowIndex)} />
     );
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "0.12.14",
+  "version": "0.12.15",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",
@@ -34,7 +34,7 @@
   "dependencies": {
     "array-tree-filter": "~1.0.0",
     "classnames": "~2.2.0",
-    "css-animation": "~1.1.0",
+    "css-animation": "~1.2.3",
     "gregorian-calendar": "~4.1.0",
     "gregorian-calendar-format": "~4.1.0",
     "object-assign": "~4.0.1",
@@ -42,7 +42,7 @@
     "rc-calendar": "~5.4.0",
     "rc-cascader": "~0.9.0",
     "rc-checkbox": "~1.3.0",
-    "rc-collapse": "~1.4.4",
+    "rc-collapse": "~1.6.0",
     "rc-dialog": "~5.4.0",
     "rc-dropdown": "~1.4.3",
     "rc-form": "~0.14.0",

style/components/collapse.less

@@ -48,8 +48,11 @@
     }
   }
 
+  &-anim-active {
+    transition: height .2s @ease-out;
+  }
+
   &-content {
-    display: none;
     overflow: hidden;
     color: @text-color;
     padding: 0 16px;
@@ -60,8 +63,8 @@
       padding-bottom: 16px;
     }
 
-    &-active {
-      display: block;
+    &-inactive {
+      display: none;
     }
   }
 

style/components/form.less

@@ -102,6 +102,11 @@ input[type="checkbox"] {
   margin-top: 3px;
 }
 
+.@{css-prefix}form-explain,
+.@{css-prefix}form-extra {
+  color: #999;
+}
+
 .@{css-prefix}form-text {
   display: inline-block;
   padding-right: 8px;

style/components/menu.less

@@ -104,6 +104,10 @@
     z-index: @zindex-dropdown;
   }
 
+  &-submenu-vertical {
+    z-index: 1;
+  }
+
   &-submenu-vertical > & {
     top: 0;
     left: 100%;

style/components/radio.less

@@ -123,7 +123,9 @@ span.@{radio-prefix-cls} + * {
 
     > span.@{radio-prefix-cls}-button {
       margin-left: 0;
-      display: none;
+      display: block;
+      width: 0;
+      height: 0;
     }
 
     .@{radio-group-prefix-cls}-large & {

style/themes/default/custom.less

@@ -22,7 +22,7 @@
 
 // ICONFONT
 @iconfont-css-prefix    : anticon;
-@icon-url               : "//at.alicdn.com/t/font_1457169990_5499172";
+@icon-url               : "//at.alicdn.com/t/font_1461567603_8950496";
 
 // LINK
 @link-color             : #2db7f5;