bump 2.13.8 - change version

bump 2.13.8

.eslintrc.js

@@ -30,6 +30,7 @@ const eslintrc = {
     'import/extensions': 0,
     'import/no-unresolved': 0,
     'import/no-extraneous-dependencies': 0,
+    'prefer-destructuring': 0,
     'no-param-reassign': 0,
     'no-return-assign': 0,
     'max-len': 0,
@@ -38,8 +39,13 @@ const eslintrc = {
     'react/require-extension': 0,
     'jsx-a11y/no-static-element-interactions': 0,
     'jsx-a11y/anchor-has-content': 0,
+    'jsx-a11y/click-events-have-key-events': 0,
+    'jsx-a11y/anchor-is-valid': 0,
     'react/no-danger': 0,
     'comma-dangle': ['error', 'always-multiline'],
+    'function-paren-newline': 0,
+    'object-curly-newline': 0,
+    'no-restricted-globals': 0,
   },
 };
 
@@ -51,6 +57,7 @@ if (process.env.RUN_ENV === 'DEMO') {
   };
 
   Object.assign(eslintrc.rules, {
+    indent: 0,
     'no-console': 0,
     'no-plusplus': 0,
     'eol-last': 0,

.gitignore

@@ -32,6 +32,7 @@ config/base.yaml
 /.vscode/
 /coverage
 yarn.lock
+package-lock.json
 components/**/*.js
 components/**/*.jsx
 !components/**/__tests__/*.js

.travis.yml

@@ -3,13 +3,14 @@ sudo: false
 language: node_js
 
 node_js:
-  - "6"
+  - "8.5"
 
 env:
   matrix:
     - TEST_TYPE=lint
-    - TEST_TYPE=dist
-    - TEST_TYPE=compile
+    - TEST_TYPE=test:dist
+    - TEST_TYPE=test:lib
+    - TEST_TYPE=test:es
     - TEST_TYPE=test:dom
     - TEST_TYPE=test:node
 
@@ -17,18 +18,18 @@ script:
   - |
     if [ "$TEST_TYPE" = lint ]; then
       npm run lint
-    elif [ "$TEST_TYPE" = dist ]; then
+    elif [ "$TEST_TYPE" = test:dist ]; then
       npm run dist && \
       node ./tests/dekko/dist.test.js && \
-      LIB_DIR=dist npm test -- --coverage -w 2
-    elif [ "$TEST_TYPE" = compile ]; then
-      npm run dist && \
+      LIB_DIR=dist npm test -- -w 2
+    elif [ "$TEST_TYPE" = test:lib ]; then
       npm run compile && \
       node ./tests/dekko/lib.test.js && \
-      LIB_DIR=es npm test -- --coverage -w 2 && \
-      LIB_DIR=lib npm test -- --coverage -w 2
+      LIB_DIR=lib npm test -- -w 2
+    elif [ "$TEST_TYPE" = test:es ]; then
+      npm run compile && \
+      LIB_DIR=es npm test -- -w 2
     elif [ "$TEST_TYPE" = test:dom ]; then
-      npm run dist && \
       npm test -- --coverage -w 2 && \
       bash <(curl -s https://codecov.io/bash)
     elif [ "$TEST_TYPE" = test:node ]; then

CHANGELOG.en-US.md

@@ -17,6 +17,51 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
 
 ---
 
+## 2.13.8
+
+`2017-10-27`
+
+- 🌟 Add a mirror site in China: [http://ant-design.gitee.io](http://ant-design.gitee.io)
+- 🐞 Fix `ref warning` of Menu in React 16. [#8037](https://github.com/ant-design/ant-design/pull/8037) [@vgeyi](https://github.com/vgeyi)
+- 🐞 Fix extra padding of loading Card when it is too wide. [ad9809ec](https://github.com/ant-design/ant-design/commit/ad9809ec2e29275c9348537b04584dcfdc96659a)
+- 📝 Add sorted API to enhance readability of docs. [#7896](https://github.com/ant-design/ant-design/pull/7896)[@monkindey](https://github.com/monkindey)
+- 📝 Improve Modal docs of how to setting styles. [#7840](https://github.com/ant-design/ant-design/issues/7840) [@kossel](https://github.com/kossel)
+- 🐞 Fix the inner shadow of Input on IOS. [#7974](https://github.com/ant-design/ant-design/pull/7974) [@cnahliu](https://github.com/cnahliu)
+
+## 2.13.7
+
+`2017-10-22`
+
+- 🐞 Fix input height in AutoComplete. [#7918](https://github.com/ant-design/ant-design/issues/7918)
+- 🐞 Fix Cascader `inputPrefixCls` can not be fully effective. [#7945](https://github.com/ant-design/ant-design/pull/7945) [@vgeyi](https://github.com/vgeyi)
+- 🐞 Fix extra margin in sider Layout. [#7967](https://github.com/ant-design/ant-design/issues/7967)
+- 🐞 Fix RangePicker can not close panel when click presetted ranges. [#7747](https://github.com/ant-design/ant-design/issues/7747)
+- Table
+  - 🐞 Fix Radio can not be centered in Table column. [#7969](https://github.com/ant-design/ant-design/issues/7969)
+  - 🐞 Fix Table filter can't show after remove fixed setting. [#7909](https://github.com/ant-design/ant-design/issues/7909)
+- 🌟 Add `scrollNumberPrefixCls` prop for Badge. [#7882](https://github.com/ant-design/ant-design/pull/7882) [@vgeyi](https://github.com/vgeyi)
+- 🌟 Add some less variables. [#7886](https://github.com/ant-design/ant-design/issues/7886) [@syssam](https://github.com/syssam)
+
+## 2.13.6
+
+`2017-10-12`
+
+- 🐞 Fix issue that `beforeUpload` will stop uploading when return undefined. [#7870](https://github.com/ant-design/ant-design/issues/7870)
+
+## 2.13.5
+
+`2017-10-11`
+
+- 🐞 Fix issue resulting in FormItem throws error when use with reac-hot-loader. [#7775](https://github.com/ant-design/ant-design/issues/7775)
+- 🐞 Fix not working less variable `@link-hover-decoration`. [#7821](https://github.com/ant-design/ant-design/issues/7821)
+- 🐞 Fix issue resulting in Upload's `beforeUpload` method not returning promise properly. [#7833](https://github.com/ant-design/ant-design/issues/7833)
+- 🐞 Fix issue resulting in Input.Search's search icon being covered with Form's feedback icon. [#7854](https://github.com/ant-design/ant-design/issues/7854)
+- AutoComplete
+  - 🐞 Fix circular reference with infinite children [#7742](https://github.com/ant-design/ant-design/pull/7742) [@menberg](https://github.com/ant-design/ant-design/pull/7742)
+  - 🐞 Fix style when use with TextArea. [#7801](https://github.com/ant-design/ant-design/issues/7800)
+- 🌟 Improve TypeScript definition. [cf788d7](https://github.com/ant-design/ant-design/commit/cf788d7b4dda58f61da91086ccfe0c67872fc709) [d4c75d43](https://github.com/ant-design/ant-design/commit/d4c75d43a1824d36583d9d8f9b209a4b9526a3af)
+- 🌟 Add new less variable. [2e2acb5](https://github.com/ant-design/ant-design/commit/2e2acb5be9a171f217f2a1a143b34b2624b49b06)
+
 ## 2.13.4
 
 `2017-09-29`

CHANGELOG.zh-CN.md

@@ -17,6 +17,51 @@ timeline: true
 
 ---
 
+## 2.13.8
+
+`2017-10-27`
+
+- 🌟 新增国内镜像文档站点：[http://ant-design.gitee.io](http://ant-design.gitee.io)
+- 🐞 修复了 Menu 在 React 16 下 `ref warning` 的问题。[#8037](https://github.com/ant-design/ant-design/pull/8037) [@vgeyi](https://github.com/vgeyi)
+- 🐞 修复了 Card 在比较宽的时候 `loading` 样式的问题。[ad9809ec](https://github.com/ant-design/ant-design/commit/ad9809ec2e29275c9348537b04584dcfdc96659a)
+- 📝 引入了 API 展示排序规则，增强文档易读性。[#7896](https://github.com/ant-design/ant-design/pull/7896)[@monkindey](https://github.com/monkindey)
+- 📝 优化了 Modal 设置样式的文档。[#7840](https://github.com/ant-design/ant-design/issues/7840) [@kossel](https://github.com/kossel)
+- 🐞 修复了 IOS 下 Input 有内阴影的样式问题。[#7974](https://github.com/ant-design/ant-design/pull/7974) [@cnahliu](https://github.com/cnahliu)
+
+## 2.13.7
+
+`2017-10-22`
+
+- 🐞 修复了 AutoComplete 的 input 高度。 [#7918](https://github.com/ant-design/ant-design/issues/7918)
+- 🐞 修复了 Cascader `inputPrefixCls` 不能完全生效的问题。[#7945](https://github.com/ant-design/ant-design/pull/7945) [@vgeyi](https://github.com/vgeyi)
+- 🐞 修复了有侧边栏的 Layout 存在多余外边距的问题。[#7967](https://github.com/ant-design/ant-design/issues/7967)
+- 🐞 修复了 RangePicker 在选中预设范围时间时不能关闭选择面板的问题。[#7747](https://github.com/ant-design/ant-design/issues/7747)
+- Table
+  - 🐞 修复了 Table 列中 Radio 选择框无法居中的问题。[#7969](https://github.com/ant-design/ant-design/issues/7969)
+  - 🐞 修复了去掉 `fixed` 属性设置后 Table 列无法进行筛选的问题。[#7909](https://github.com/ant-design/ant-design/issues/7909)
+- 🌟 Badge 新增 `scrollNumberPrefixCls` 属性。[#7882](https://github.com/ant-design/ant-design/pull/7882) [@vgeyi](https://github.com/vgeyi)
+- 🌟 补充了一些 less 变量。[#7886](https://github.com/ant-design/ant-design/issues/7886) [@syssam](https://github.com/syssam)
+
+## 2.13.6
+
+`2017-10-12`
+
+- 🐞 修复 `beforeUpload` 未指定返回值时会阻止上传的问题。[#7870](https://github.com/ant-design/ant-design/issues/7870)
+
+## 2.13.5
+
+`2017-10-11`
+
+- 🐞 修复 FormItem 不能跟 reac-hot-loader 一起使用的问题。[#7775](https://github.com/ant-design/ant-design/issues/7775)
+- 🐞 修复 less 变量 `@link-hover-decoration` 没按预期工作的问题。[#7821](https://github.com/ant-design/ant-design/issues/7821)
+- 🐞 修复 Uploade 的 `beforeUpload` 没返回 promise 的问题。[#7833](https://github.com/ant-design/ant-design/issues/7833)
+- 🐞 修复 Input.Search 的搜索图标会被 Form 的验证图标遮住的问题。[#7854](https://github.com/ant-design/ant-design/issues/7854)
+- AutoComplete
+  - 🐞 修复循环引用问题。[#7742](https://github.com/ant-design/ant-design/pull/7742) [@menberg](https://github.com/ant-design/ant-design/pull/7742)
+  - 🐞 修复使用 TextArea 并拖动输入框大小时的样式错乱问题。[#7801](https://github.com/ant-design/ant-design/issues/7800)
+- 🌟 改进一些 TypeScript 定义。[cf788d7](https://github.com/ant-design/ant-design/commit/cf788d7b4dda58f61da91086ccfe0c67872fc709) [d4c75d43](https://github.com/ant-design/ant-design/commit/d4c75d43a1824d36583d9d8f9b209a4b9526a3af)
+- 🌟 新增 less 变量 [2e2acb5](https://github.com/ant-design/ant-design/commit/2e2acb5be9a171f217f2a1a143b34b2624b49b06)
+
 ## 2.13.4
 
 `2017-09-29`

components/affix/__tests__/Affix.test.js

@@ -18,30 +18,32 @@ class AffixMounter extends React.Component {
     return this.container;
   }
   render() {
-    return (<div
-      style={{
-        height: 100,
-        overflowY: 'scroll',
-      }}
-      ref={(node) => { this.container = node; }}
-    >
+    return (
       <div
-        className="background"
         style={{
-          paddingTop: 60,
-          height: 300,
+          height: 100,
+          overflowY: 'scroll',
         }}
+        ref={(node) => { this.container = node; }}
       >
-        <Affix
-          target={() => this.container}
-          ref={ele => this.affix = ele}
+        <div
+          className="background"
+          style={{
+            paddingTop: 60,
+            height: 300,
+          }}
         >
-          <Button type="primary" >
-            Fixed at the top of container
-          </Button>
-        </Affix>
+          <Affix
+            target={() => this.container}
+            ref={ele => this.affix = ele}
+          >
+            <Button type="primary" >
+              Fixed at the top of container
+            </Button>
+          </Affix>
+        </div>
       </div>
-    </div>);
+    );
   }
 }
 

components/affix/index.en-US.md

@@ -14,12 +14,12 @@ Please note that Affix should not cover other content on the page, especially wh
 
 ## API
 
-| Property     | Description           | Type     | Default      |
-|--------------|-----------------------|----------|--------------|
-| offsetTop    | Pixels to offset from top when calculating position of scroll | number | 0 |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
 | offsetBottom | Pixels to offset from bottom when calculating position of scroll | number | - |
+| offsetTop | Pixels to offset from top when calculating position of scroll | number | 0 |
 | target | specifies the scrollable area dom node | () => HTMLElement | () => window |
-| onChange     | Callback for when affix state is changed | Function(affixed) | - |
+| onChange | Callback for when affix state is changed | Function(affixed) | - |
 
 **Note:** Children of `Affix` can not be `position: absolute`, but you can set `Affix` as `position: absolute`:
 

components/affix/index.zh-CN.md

@@ -15,12 +15,12 @@ title: Affix
 
 ## API
 
-| 成员        | 说明           | 类型               | 默认值       |
-|-------------|----------------|--------------------|--------------|
-| offsetTop    | 距离窗口顶部达到指定偏移量后触发   | number |         |
-| offsetBottom | 距离窗口底部达到指定偏移量后触发   | number |         |
+| 成员 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| offsetBottom | 距离窗口底部达到指定偏移量后触发 | number |  |
+| offsetTop | 距离窗口顶部达到指定偏移量后触发 | number |  |
 | target | 设置 `Affix` 需要监听其滚动事件的元素，值为一个返回对应 DOM 元素的函数 | () => HTMLElement | () => window |
-| onChange | 固定状态改变时触发的回调函数   | Function(affixed) | 无        |
+| onChange | 固定状态改变时触发的回调函数 | Function(affixed) | 无 |
 
 **注意：**`Affix` 内的元素不要使用绝对定位，如需要绝对定位的效果，可以直接设置 `Affix` 为绝对定位：
 

components/alert/demo/closable.md

@@ -20,17 +20,21 @@ const onClose = function (e) {
   console.log(e, 'I was closed.');
 };
 
-ReactDOM.render(<div>
-  <Alert message="Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text"
-    type="warning"
-    closable
-    onClose={onClose}
-  />
-  <Alert message="Error Text"
-    description="Error Description Error Description Error Description Error Description Error Description Error Description"
-    type="error"
-    closable
-    onClose={onClose}
-  />
-</div>, mountNode);
+ReactDOM.render(
+  <div>
+    <Alert
+      message="Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text"
+      type="warning"
+      closable
+      onClose={onClose}
+    />
+    <Alert
+      message="Error Text"
+      description="Error Description Error Description Error Description Error Description Error Description Error Description"
+      type="error"
+      closable
+      onClose={onClose}
+    />
+  </div>
+, mountNode);
 ````

components/alert/demo/description.md

@@ -16,26 +16,28 @@ Additional description for alert message.
 ````jsx
 import { Alert } from 'antd';
 
-ReactDOM.render(<div>
-  <Alert
-    message="Success Text"
-    description="Success Description Success Description Success Description"
-    type="success"
-  />
-  <Alert
-    message="Info Text"
-    description="Info Description Info Description Info Description Info Description"
-    type="info"
-  />
-  <Alert
-    message="Warning Text"
-    description="Warning Description Warning Description Warning Description Warning Description"
-    type="warning"
-  />
-  <Alert
-    message="Error Text"
-    description="Error Description Error Description Error Description Error Description"
-    type="error"
-  />
-</div>, mountNode);
+ReactDOM.render(
+  <div>
+    <Alert
+      message="Success Text"
+      description="Success Description Success Description Success Description"
+      type="success"
+    />
+    <Alert
+      message="Info Text"
+      description="Info Description Info Description Info Description Info Description"
+      type="info"
+    />
+    <Alert
+      message="Warning Text"
+      description="Warning Description Warning Description Warning Description Warning Description"
+      type="warning"
+    />
+    <Alert
+      message="Error Text"
+      description="Error Description Error Description Error Description Error Description"
+      type="error"
+    />
+  </div>
+, mountNode);
 ````

components/alert/demo/icon.md

@@ -16,34 +16,36 @@ Decent icon make information more clear and more friendly.
 ````jsx
 import { Alert } from 'antd';
 
-ReactDOM.render(<div>
-  <Alert message="Success Tips" type="success" showIcon />
-  <Alert message="Informational Notes" type="info" showIcon />
-  <Alert message="Warning" type="warning" showIcon />
-  <Alert message="Error" type="error" showIcon />
-  <Alert
-    message="success tips"
-    description="Detailed description and advices about successful copywriting."
-    type="success"
-    showIcon
-  />
-  <Alert
-    message="Informational Notes"
-    description="Additional description and informations about copywriting."
-    type="info"
-    showIcon
-  />
-  <Alert
-    message="Warning"
-    description="This is a warning notice about copywriting."
-    type="warning"
-    showIcon
-  />
-  <Alert
-    message="Error"
-    description="This is an error message about copywriting."
-    type="error"
-    showIcon
-  />
-</div>, mountNode);
+ReactDOM.render(
+  <div>
+    <Alert message="Success Tips" type="success" showIcon />
+    <Alert message="Informational Notes" type="info" showIcon />
+    <Alert message="Warning" type="warning" showIcon />
+    <Alert message="Error" type="error" showIcon />
+    <Alert
+      message="success tips"
+      description="Detailed description and advices about successful copywriting."
+      type="success"
+      showIcon
+    />
+    <Alert
+      message="Informational Notes"
+      description="Additional description and informations about copywriting."
+      type="info"
+      showIcon
+    />
+    <Alert
+      message="Warning"
+      description="This is a warning notice about copywriting."
+      type="warning"
+      showIcon
+    />
+    <Alert
+      message="Error"
+      description="This is an error message about copywriting."
+      type="error"
+      showIcon
+    />
+  </div>
+, mountNode);
 ````

components/alert/demo/style.md

@@ -16,10 +16,12 @@ There are 4 types of Alert: `success`, `info`, `warning`, `error`.
 ````jsx
 import { Alert } from 'antd';
 
-ReactDOM.render(<div>
-  <Alert message="Success Text" type="success" />
-  <Alert message="Info Text" type="info" />
-  <Alert message="Warning Text" type="warning" />
-  <Alert message="Error Text" type="error" />
-</div>, mountNode);
+ReactDOM.render(
+  <div>
+    <Alert message="Success Text" type="success" />
+    <Alert message="Info Text" type="info" />
+    <Alert message="Warning Text" type="warning" />
+    <Alert message="Error Text" type="error" />
+  </div>
+, mountNode);
 ````

components/alert/index.en-US.md

@@ -13,13 +13,13 @@ Alert component for feedback.
 
 ## API
 
-| Property   | Description                                               | Type       | Default |
-|----------- |---------------------------------------------------------  | ---------- |-------|
-| type       | Type of Alert styles, options: `success`, `info`, `warning`, `error` | string | `info`, in `banner` mode default is `warning` |
-| closable   | Whether Alert can be closed | boolean | - |
-| closeText  | Close text to show | string\|ReactNode | - |
-| message    | Content of Alert | string\|ReactNode | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| banner | Whether to show as banner | boolean | false |
+| closable | Whether Alert can be closed | boolean | - |
+| closeText | Close text to show | string\|ReactNode | - |
 | description | Additional content of Alert | string\|ReactNode | - |
-| onClose    | Callback when Alert is closed | Function | - |
-| showIcon   | Whether to show icon | boolean | false, in `banner` mode default is true |
-| banner   | Whether to show as banner | boolean | false |
+| message | Content of Alert | string\|ReactNode | - |
+| showIcon | Whether to show icon | boolean | false, in `banner` mode default is true |
+| type | Type of Alert styles, options: `success`, `info`, `warning`, `error` | string | `info`, in `banner` mode default is `warning` |
+| onClose | Callback when Alert is closed | Function | - |

components/alert/index.zh-CN.md

@@ -14,13 +14,13 @@ title: Alert
 
 ## API
 
-| 参数        | 说明                                                      | 类型        | 默认值 |
-|----------- |---------------------------------------------------------  | ---------- |-------|
-| type       | 指定警告提示的样式，有四种选择 `success`、`info`、`warning`、`error`   | string     | `info`，`banner` 模式下默认值为 `warning`    |
-| closable   | 默认不显示关闭按钮                                  | boolean   | 无    |
-| closeText  | 自定义关闭按钮                                     | string\|ReactNode   | 无    |
-| message    | 警告提示内容                                       | string\|ReactNode   | 无    |
-| description | 警告提示的辅助性文字介绍                            | string\|ReactNode   | 无    |
-| onClose     | 关闭时触发的回调函数                                | Function   | 无    |
-| showIcon   | 是否显示辅助图标                                 | boolean   | false，`banner` 模式下默认值为 true    |
-| banner   | 是否用作顶部公告                                 | boolean   | false    |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| banner | 是否用作顶部公告 | boolean | false |
+| closable | 默认不显示关闭按钮 | boolean | 无 |
+| closeText | 自定义关闭按钮 | string\|ReactNode | 无 |
+| description | 警告提示的辅助性文字介绍 | string\|ReactNode | 无 |
+| message | 警告提示内容 | string\|ReactNode | 无 |
+| showIcon | 是否显示辅助图标 | boolean | false，`banner` 模式下默认值为 true |
+| type | 指定警告提示的样式，有四种选择 `success`、`info`、`warning`、`error` | string | `info`，`banner` 模式下默认值为 `warning` |
+| onClose | 关闭时触发的回调函数 | Function | 无 |

components/anchor/index.en-US.md

@@ -15,17 +15,17 @@ For displaying anchor hyperlinks on page and jumping between them.
 
 ### Anchor Props
 
-| Property     | Description           | Type     | Default      |
-|--------------|-----------------------|----------|--------------|
-| offsetTop    | Pixels to offset from top when calculating position of scroll | number | 0 |
-| offsetBottom | Pixels to offset from bottom when calculating position of scroll | number | - |
-| bounds     | Bounding distance of anchor area | number | 5(px) |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
 | affix | Fixed mode of Anchor | boolean | false |
+| bounds | Bounding distance of anchor area | number | 5(px) |
+| offsetBottom | Pixels to offset from bottom when calculating position of scroll | number | - |
+| offsetTop | Pixels to offset from top when calculating position of scroll | number | 0 |
 | showInkInFixed | Whether show ink-balls in Fixed mode | boolean | false |
 
 ### Link Props
 
-| Property        | Description           | Type               | Default       |
-|-------------|----------------|--------------------|--------------|
-| href    | target of hyperlink  | string |         |
-| title | content of  hyperlink | string\|ReactNode |         |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| href | target of hyperlink | string |  |
+| title | content of  hyperlink | string\|ReactNode |  |

components/anchor/index.zh-CN.md

@@ -16,17 +16,17 @@ title: Anchor
 
 ### Anchor Props
 
-| 成员        | 说明           | 类型               | 默认值       |
-|-------------|----------------|--------------------|--------------|
-| offsetTop    | 距离窗口顶部达到指定偏移量后触发   | number |         |
-| offsetBottom | 距离窗口底部达到指定偏移量后触发   | number |         |
-| bounds | 锚点区域边界 | number | 5(px) |
+| 成员 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
 | affix | 固定模式 | boolean | false |
+| bounds | 锚点区域边界 | number | 5(px) |
+| offsetBottom | 距离窗口底部达到指定偏移量后触发 | number |  |
+| offsetTop | 距离窗口顶部达到指定偏移量后触发 | number |  |
 | showInkInFixed | 固定模式是否显示小圆点 | boolean | false |
 
 ### Link Props
 
-| 成员        | 说明           | 类型               | 默认值       |
-|-------------|----------------|--------------------|--------------|
-| href    | 锚点链接   | string |         |
-| title | 文字内容   | string\|ReactNode |         |
+| 成员 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| href | 锚点链接 | string |  |
+| title | 文字内容 | string\|ReactNode |  |

components/auto-complete/__tests__/__snapshots__/demo.test.js.snap

@@ -1,59 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`renders ./components/auto-complete/demo/antd.md correctly 1`] = `
-<div
-  class="ant-select-show-search ant-select-auto-complete ant-select ant-select-combobox ant-select-enabled"
-  style="width:200px;height:50px;"
->
-  <div
-    aria-autocomplete="list"
-    aria-expanded="false"
-    aria-haspopup="true"
-    class="ant-select-selection
-              ant-select-selection--single"
-    role="combobox"
-  >
-    <div
-      class="ant-select-selection__rendered"
-    >
-      <div
-        class="ant-select-selection__placeholder"
-        style="display:block;user-select:none;-webkit-user-select:none;"
-        unselectable="unselectable"
-      >
-        input here
-      </div>
-      <ul>
-        <li
-          class="ant-select-search ant-select-search--inline"
-        >
-          <div
-            class="ant-select-search__field__wrap"
-          >
-            <textarea
-              class="ant-input ant-select-search__field"
-              style="height:50px;"
-            />
-            <span
-              class="ant-select-search__field__mirror"
-            >
-               
-            </span>
-          </div>
-        </li>
-      </ul>
-    </div>
-    <span
-      class="ant-select-arrow"
-      style="user-select:none;-webkit-user-select:none;"
-      unselectable="unselectable"
-    >
-      <b />
-    </span>
-  </div>
-</div>
-`;
-
 exports[`renders ./components/auto-complete/demo/basic.md correctly 1`] = `
 <div
   class="ant-select-show-search ant-select-auto-complete ant-select ant-select-combobox ant-select-enabled"
@@ -64,7 +10,7 @@ exports[`renders ./components/auto-complete/demo/basic.md correctly 1`] = `
     aria-expanded="false"
     aria-haspopup="true"
     class="ant-select-selection
-              ant-select-selection--single"
+            ant-select-selection--single"
     role="combobox"
   >
     <div
@@ -123,7 +69,7 @@ exports[`renders ./components/auto-complete/demo/certain-category.md correctly 1
       aria-expanded="false"
       aria-haspopup="true"
       class="ant-select-selection
-                ant-select-selection--single"
+            ant-select-selection--single"
       role="combobox"
     >
       <div
@@ -180,6 +126,54 @@ exports[`renders ./components/auto-complete/demo/certain-category.md correctly 1
 </div>
 `;
 
+exports[`renders ./components/auto-complete/demo/custom.md correctly 1`] = `
+<div
+  class="ant-select-show-search ant-select-auto-complete ant-select ant-select-combobox ant-select-enabled"
+  style="width:200px;"
+>
+  <div
+    aria-autocomplete="list"
+    aria-expanded="false"
+    aria-haspopup="true"
+    class="ant-select-selection
+            ant-select-selection--single"
+    role="combobox"
+  >
+    <div
+      class="ant-select-selection__rendered"
+    >
+      <ul>
+        <li
+          class="ant-select-search ant-select-search--inline"
+        >
+          <div
+            class="ant-select-search__field__wrap"
+          >
+            <textarea
+              class="ant-input custom ant-select-search__field"
+              placeholder="input here"
+              style="height:50px;"
+            />
+            <span
+              class="ant-select-search__field__mirror"
+            >
+               
+            </span>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <span
+      class="ant-select-arrow"
+      style="user-select:none;-webkit-user-select:none;"
+      unselectable="unselectable"
+    >
+      <b />
+    </span>
+  </div>
+</div>
+`;
+
 exports[`renders ./components/auto-complete/demo/non-case-sensitive.md correctly 1`] = `
 <div
   class="ant-select-show-search ant-select-auto-complete ant-select ant-select-combobox ant-select-enabled"
@@ -190,7 +184,7 @@ exports[`renders ./components/auto-complete/demo/non-case-sensitive.md correctly
     aria-expanded="false"
     aria-haspopup="true"
     class="ant-select-selection
-              ant-select-selection--single"
+            ant-select-selection--single"
     role="combobox"
   >
     <div
@@ -245,7 +239,7 @@ exports[`renders ./components/auto-complete/demo/options.md correctly 1`] = `
     aria-expanded="false"
     aria-haspopup="true"
     class="ant-select-selection
-              ant-select-selection--single"
+            ant-select-selection--single"
     role="combobox"
   >
     <div
@@ -304,7 +298,7 @@ exports[`renders ./components/auto-complete/demo/uncertain-category.md correctly
       aria-expanded="false"
       aria-haspopup="true"
       class="ant-select-selection
-                ant-select-selection--single"
+            ant-select-selection--single"
       role="combobox"
     >
       <div

components/auto-complete/demo/custom.md

@@ -45,12 +45,16 @@ class Complete extends React.Component {
     return (
       <AutoComplete
         dataSource={dataSource}
-        style={{ width: 200, height: 50 }}
+        style={{ width: 200 }}
         onSelect={onSelect}
         onSearch={this.handleSearch}
-        placeholder="input here"
       >
-        <TextArea onKeyPress={this.handleKeyPress} style={{ height: 50 }} />
+        <TextArea
+          placeholder="input here"
+          className="custom"
+          style={{ height: 50 }}
+          onKeyPress={this.handleKeyPress}
+        />
       </AutoComplete>
     );
   }

components/auto-complete/index.en-US.md

@@ -18,20 +18,20 @@ const dataSource = ['12345', '23456', '34567'];
 <AutoComplete dataSource={dataSource} />
 ```
 
-| Property           | Description                             |  Type | Default |
-|----------------|----------------------------------|------------|--------|
-| dataSource          | Data source for autocomplete | [DataSourceItemType](https://git.io/vMMKF)[]     |      |
-| value    | selected option | string\|string[]\|{ key: string, label: string\|ReactNode }\|Array<{ key: string, label: string\|ReactNode }>   |  -  |
-| defaultValue | Initial selected option. | string\|string[]\|{ key: string, label: string\|ReactNode }\|Array<{ key: string, label: string\|ReactNode }> |  -  |
-| allowClear   | Show clear button, effective in multiple mode only. | boolean | false |
-| onChange | Called when select an option or input value change, or value of input is changed | function(value, label) | - |
-| onSelect | Called when a option is selected. param is option's value and option instance. | function(value, option) | -   |
-| onSearch | Called when searching items. | function(value) | - |
-| disabled | Whether disabled select | boolean | false |
-| defaultActiveFirstOption | Whether active first option by default | boolean | true |
-| placeholder | placeholder of input | string | - |
-| children (for dataSource) | Data source for autocomplet | React.ReactElement<OptionProps> /  Array<React.ReactElement<OptionProps>> | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| allowClear | Show clear button, effective in multiple mode only. | boolean | false |
+| backfill | backfill selected item the input when using keyboard | boolean | false |
 | children (for customize input element) | customize input element | HTMLInputElement / HTMLTextAreaElement / React.ReactElement<InputProps> | `<Input />` |
+| children (for dataSource) | Data source for autocomplet | React.ReactElement<OptionProps> /  Array&lt;React.ReactElement<OptionProps>> | - |
+| dataSource | Data source for autocomplete | [DataSourceItemType](https://git.io/vMMKF)\[] |  |
+| defaultActiveFirstOption | Whether active first option by default | boolean | true |
+| defaultValue | Initial selected option. | string\|string\[]\|{ key: string, label: string\|ReactNode }\|Array&lt;{ key: string, label: string\|ReactNode }> | - |
+| disabled | Whether disabled select | boolean | false |
+| filterOption | If true, filter options by input, if function, filter options against it. The function will receive two arguments, `inputValue` and `option`, if the function returns `true`, the option will be included in the filtered set; Otherwise, it will be excluded. | boolean or function(inputValue, option) | true |
 | optionLabelProp | Which prop value of option will render as content of select. | string | `children` |
-| filterOption | If true, filter options by input, if function, filter options against it. The function will receive two arguments, `inputValue` and `option`, if the function returns `true`, the option will be included in the filtered set; Otherwise, it will be excluded. | boolean or function(inputValue, option) | true     |
-| backfill | backfill selected item the input when using keyboard  | boolean | false |
+| placeholder | placeholder of input | string | - |
+| value | selected option | string\|string\[]\|{ key: string, label: string\|ReactNode }\|Array&lt;{ key: string, label: string\|ReactNode }> | - |
+| onChange | Called when select an option or input value change, or value of input is changed | function(value, label) | - |
+| onSearch | Called when searching items. | function(value) | - |
+| onSelect | Called when a option is selected. param is option's value and option instance. | function(value, option) | - |

components/auto-complete/index.tsx

@@ -51,8 +51,11 @@ export default class AutoComplete extends React.Component<AutoCompleteProps, any
     const { children } = this.props;
     const element = children && React.isValidElement(children) && children.type !== Option ?
       React.Children.only(this.props.children) : <Input />;
+    const elementProps = { ...element.props };
+    // https://github.com/ant-design/ant-design/pull/7742
+    delete elementProps.children;
     return (
-      <InputElement>{element}</InputElement>
+      <InputElement {...elementProps}>{element}</InputElement>
     );
   }
 

components/auto-complete/index.zh-CN.md

@@ -19,20 +19,20 @@ const dataSource = ['12345', '23456', '34567'];
 <AutoComplete dataSource={dataSource} />
 ```
 
-| 参数           | 说明                             | 类型        | 默认值 |
-|----------------|----------------------------------|------------|---------|
-| dataSource          | 自动完成的数据源 | [DataSourceItemType](https://git.io/vMMKF)[]     |         |
-| value    | 指定当前选中的条目 | string\|string[]\|{ key: string, label: string\|ReactNode }\|Array<{ key: string, label: string\|ReactNode }>   |  无  |
-| defaultValue | 指定默认选中的条目 | string\|string[]\|{ key: string, label: string\|ReactNode }\|Array<{ key: string, label: string\|ReactNode}>   |  无  |
-| allowClear   | 支持清除, 单选模式有效 | boolean | false |
-| onChange | 选中 option，或 input 的 value 变化时，调用此函数 | function(value) | 无 |
-| onSelect | 被选中时调用，参数为选中项的 value 值	| function(value, option)	| 无 |
-| onSearch | 搜索补全项的时候调用 | function(value) | 无 |
-| disabled | 是否禁用 | boolean | false |
-| defaultActiveFirstOption | 是否默认高亮第一个选项。 | boolean | true
-| placeholder | 输入框提示 | string | - |
-| children (自动完成的数据源) | 自动完成的数据源 | React.ReactElement<OptionProps> / Array<React.ReactElement<OptionProps>> | - |
-| children (自定义输入框) | 自定义输入框 |  HTMLInputElement / HTMLTextAreaElement / React.ReactElement<InputProps> | `<Input />` |
-| optionLabelProp | 回填到选择框的 Option 的属性值，默认是 Option 的子元素。比如在子元素需要高亮效果时，此值可以设为 `value`。 | string | `children` |
-| filterOption | 是否根据输入项进行筛选。当其为一个函数时，会接收 `inputValue` `option` 两个参数，当 `option` 符合筛选条件时，应返回 `true`，反之则返回 `false`。 | boolean or function(inputValue, option) | true     |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| allowClear | 支持清除, 单选模式有效 | boolean | false |
 | backfill | 使用键盘选择选项的时候把选中项回填到输入框中 | boolean | false |
+| children (自动完成的数据源) | 自动完成的数据源 | React.ReactElement<OptionProps> / Array&lt;React.ReactElement<OptionProps>> | - |
+| children (自定义输入框) | 自定义输入框 | HTMLInputElement / HTMLTextAreaElement / React.ReactElement<InputProps> | `<Input />` |
+| dataSource | 自动完成的数据源 | [DataSourceItemType](https://git.io/vMMKF)\[] |  |
+| defaultActiveFirstOption | 是否默认高亮第一个选项。 | boolean | true |
+| defaultValue | 指定默认选中的条目 | string\|string\[]\|{ key: string, label: string\|ReactNode }\|Array&lt;{ key: string, label: string\|ReactNode}> | 无 |
+| disabled | 是否禁用 | boolean | false |
+| filterOption | 是否根据输入项进行筛选。当其为一个函数时，会接收 `inputValue` `option` 两个参数，当 `option` 符合筛选条件时，应返回 `true`，反之则返回 `false`。 | boolean or function(inputValue, option) | true |
+| optionLabelProp | 回填到选择框的 Option 的属性值，默认是 Option 的子元素。比如在子元素需要高亮效果时，此值可以设为 `value`。 | string | `children` |
+| placeholder | 输入框提示 | string | - |
+| value | 指定当前选中的条目 | string\|string\[]\|{ key: string, label: string\|ReactNode }\|Array&lt;{ key: string, label: string\|ReactNode }> | 无 |
+| onChange | 选中 option，或 input 的 value 变化时，调用此函数 | function(value) | 无 |
+| onSearch | 搜索补全项的时候调用 | function(value) | 无 |
+| onSelect | 被选中时调用，参数为选中项的 value 值 | function(value, option) | 无 |

components/auto-complete/style/index.less

@@ -19,12 +19,22 @@
           line-height: @input-height-base;
         }
         &__placeholder {
-          margin-left: (@input-padding-horizontal + 1px);
-          margin-right: (@input-padding-horizontal + 1px);
+          margin-left: (@input-padding-horizontal-base + 1px);
+          margin-right: (@input-padding-horizontal-base + 1px);
+        }
+
+        &--single {
+          height: auto;
         }
       }
     }
 
+    // Fix https://github.com/ant-design/ant-design/issues/7800
+    .@{select-prefix-cls}-search--inline {
+      position: static;
+      float: left;
+    }
+
     &-allow-clear {
       .@{select-prefix-cls}-selection:hover .@{select-prefix-cls}-selection__rendered {
         margin-right: 0 !important;
@@ -35,6 +45,7 @@
       background: transparent;
       border-width: @border-width-base;
       line-height: @line-height-base;
+      height: @input-height-base;
       &:focus,
       &:hover {
         .hover;

components/avatar/index.en-US.md

@@ -8,9 +8,9 @@ Avatars can be used to represent people or objects. It supports images, `Icon`s,
 
 ## API
 
-| Property   | Description                                               | Type       | Default |
-|----------- |---------------------------------------------------------  | ---------- |-------|
-| shape       | the shape of avatar                            | `circle` \| `square` | `circle` |
-| size   | the size of the avatar                  | `large` \| `small` \| `default` | `default` |
-| src  | the address of the image for an image avatar                       | string | - |
-| icon    | the `Icon` type for an icon avatar, see `Icon` Component        | string | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| icon | the `Icon` type for an icon avatar, see `Icon` Component | string | - |
+| shape | the shape of avatar | `circle` \| `square` | `circle` |
+| size | the size of the avatar | `large` \| `small` \| `default` | `default` |
+| src | the address of the image for an image avatar | string | - |

components/avatar/index.zh-CN.md

@@ -9,9 +9,9 @@ title: Avatar
 
 ## API
 
-| 参数        | 说明                                                      | 类型        | 默认值 |
-|----------- |--------------------------------------------------------- | ----------  | ------- |
-| shape       | 指定头像的形状                          | Enum{ 'circle', 'square' }     | `circle`  |
-| size       | 设置头像的大小                           | Enum{ 'large', 'small', 'default' }       | `default` |
-| src  | 图片类头像的资源地址                                     | string   | -    |
-| icon    | 设置头像的图标类型，参考 `Icon` 组件                                       | string   | -    |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| icon | 设置头像的图标类型，参考 `Icon` 组件 | string | - |
+| shape | 指定头像的形状 | Enum{ 'circle', 'square' } | `circle` |
+| size | 设置头像的大小 | Enum{ 'large', 'small', 'default' } | `default` |
+| src | 图片类头像的资源地址 | string | - |

components/avatar/style/index.less

@@ -28,6 +28,7 @@
   & > img {
     width: 100%;
     height: 100%;
+    display: block;
   }
 }
 

components/back-top/index.en-US.md

@@ -14,12 +14,11 @@ title: BackTop
 ## API
 
 > The distance to the bottom is set to `50px` by default, which is overridable.
-
+>
 > If you decide to use custom styles, please note the size limit: no more than `40px * 40px`.
 
-
-Property | Description | Type | Default
------|-----|-----|------
-visibilityHeight | the `BackTop` button will not show until the scroll height reaches this value | number | 400
-onClick | a callback function, which can be executed when you click the button | Function | -
-target | specifies the scrollable area dom node | () => HTMLElement | () => window
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| target | specifies the scrollable area dom node | () => HTMLElement | () => window |
+| visibilityHeight | the `BackTop` button will not show until the scroll height reaches this value | number | 400 |
+| onClick | a callback function, which can be executed when you click the button | Function | - |

components/back-top/index.zh-CN.md

@@ -15,11 +15,11 @@ title: BackTop
 ## API
 
 > 有默认样式，距离底部 `50px`，可覆盖。
+>
+> 自定义样式宽高不大于 40px \* 40px。
 
-> 自定义样式宽高不大于 40px * 40px。
-
-| 参数        | 说明           | 类型               | 默认值       |
-|-------------|----------------|--------------------|--------------|
-| visibilityHeight    | 滚动高度达到此参数值才出现 `BackTop`   | number | 400        |
-| onClick | 点击按钮的回调函数   | Function | -        |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
 | target | 设置需要监听其滚动事件的元素，值为一个返回对应 DOM 元素的函数 | Function | () => window |
+| visibilityHeight | 滚动高度达到此参数值才出现 `BackTop` | number | 400 |
+| onClick | 点击按钮的回调函数 | Function | - |

components/badge/index.en-US.md

@@ -18,16 +18,15 @@ Badge normally appears in proximity to notifications or user avatars with eye-ca
 </Badge>
 ```
 
-
 ```jsx
 <Badge count={5} />
 ```
 
-| Property       | Description             | Type       | Default |
-|----------------|-------------------------|------------|---------|
-| count          | Number to show in badge | number     |         |
-| overflowCount  | Max count to show       | number     | 99      |
-| showZero       | Whether to show badge when `count` is zero   | boolean | `false` |
-| dot            | Whether to display a red dot instead of `count` | boolean | `false`  |
-| status         | Set Badge as a status dot | `success` \| `processing` \| `default` \| `error` \| `warning` | `''` |
-| text           | If `status` is set, `text` sets the display text of the status `dot` | string | `''` |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| count | Number to show in badge | number |  |
+| dot | Whether to display a red dot instead of `count` | boolean | `false` |
+| overflowCount | Max count to show | number | 99 |
+| showZero | Whether to show badge when `count` is zero | boolean | `false` |
+| status | Set Badge as a status dot | `success` \| `processing` \| `default` \| `error` \| `warning` | `''` |
+| text | If `status` is set, `text` sets the display text of the status `dot` | string | `''` |

components/badge/index.tsx

@@ -15,6 +15,7 @@ export interface BadgeProps {
   dot?: boolean;
   style?: React.CSSProperties;
   prefixCls?: string;
+  scrollNumberPrefixCls?: string;
   className?: string;
   status?: 'success' | 'processing' | 'default' | 'error' | 'warning';
   text?: string;
@@ -23,6 +24,7 @@ export interface BadgeProps {
 export default class Badge extends React.Component<BadgeProps, any> {
   static defaultProps = {
     prefixCls: 'ant-badge',
+    scrollNumberPrefixCls: 'ant-scroll-number',
     count: null,
     showZero: false,
     dot: false,
@@ -44,6 +46,7 @@ export default class Badge extends React.Component<BadgeProps, any> {
       count,
       showZero,
       prefixCls,
+      scrollNumberPrefixCls,
       overflowCount,
       className,
       style,
@@ -92,6 +95,7 @@ export default class Badge extends React.Component<BadgeProps, any> {
 
     const scrollNumber = hidden ? null : (
       <ScrollNumber
+        prefixCls={scrollNumberPrefixCls}
         data-show={!hidden}
         className={scrollNumberCls}
         count={displayCount}

components/badge/index.zh-CN.md

@@ -19,16 +19,15 @@ title: Badge
 </Badge>
 ```
 
-
 ```jsx
 <Badge count={5} />
 ```
 
-| 参数           | 说明                             | 类型       | 默认值 |
-|----------------|----------------------------------|------------|---------|
-| count          | 展示的数字，大于 overflowCount 时显示为 `${overflowCount}+`，为 0 时隐藏 | number | |
-| overflowCount  | 展示封顶的数字值                 | number | 99 |
-| showZero       | 当数值为 0 时，是否展示 Badge   | boolean | false |
-| dot            | 不展示数字，只有一个小红点       | boolean | false  |
-| status         | 设置 Badge 为状态点            | Enum{ 'success', 'processing, 'default', 'error', 'warning' } | '' |
-| text           | 在设置了 `status` 的前提下有效，设置状态点的文本  | string | '' |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| count | 展示的数字，大于 overflowCount 时显示为 `${overflowCount}+`，为 0 时隐藏 | number |  |
+| dot | 不展示数字，只有一个小红点 | boolean | false |
+| overflowCount | 展示封顶的数字值 | number | 99 |
+| showZero | 当数值为 0 时，是否展示 Badge | boolean | false |
+| status | 设置 Badge 为状态点 | Enum{ 'success', 'processing, 'default', 'error', 'warning' } | '' |
+| text | 在设置了 `status` 的前提下有效，设置状态点的文本 | string | '' |

components/breadcrumb/index.en-US.md

@@ -15,12 +15,12 @@ A breadcrumb displays the current location within a hierarchy. It allows going b
 
 ## API
 
-| Property      | Description                              | Type              |  Optional | Default |
-|-----------|-----------------------------------|-----------------|---------|--------|
-| routes    | The routing stack information of router | object[]             |         | -      |
-| params    | Routing parameters                        | object            |         | -      |
-| separator | Custom separator                      | string\|ReactNode |         | `/`    |
-| itemRender | Custom item renderer | (route, params, routes, paths) => ReactNode | | - |
+| Property | Description | Type | Optional | Default |
+| -------- | ----------- | ---- | -------- | ------- |
+| itemRender | Custom item renderer | (route, params, routes, paths) => ReactNode |  | - |
+| params | Routing parameters | object |  | - |
+| routes | The routing stack information of router | object\[] |  | - |
+| separator | Custom separator | string\|ReactNode |  | `/` |
 
 > `linkRender` and `nameRender` were removed after `antd@2.0`, please use `itemRender` instead.
 
@@ -31,10 +31,20 @@ The link of Breadcrumb item targets `#` by default, you can use `itemRender` to
 ```jsx
 import { Link } from 'react-router';
 
+const routes = [{
+  path: 'index',
+  breadcrumbName: 'home'
+}, {
+  path: 'first',
+  breadcrumbName: 'first'
+}, {
+  path: 'second',
+  breadcrumbName: 'second'
+}];
 function itemRender(route, params, routes, paths) {
   const last = routes.indexOf(route) === routes.length - 1;
   return last ? <span>{route.breadcrumbName}</span> : <Link to={paths.join('/')}>{route.breadcrumbName}</Link>;
 }
 
-return <Breadcrumb itemRender={itemRender} />;
+return <Breadcrumb itemRender={itemRender} routes={routes} />;
 ```

components/breadcrumb/index.zh-CN.md

@@ -15,12 +15,12 @@ title: Breadcrumb
 
 ## API
 
-| 参数      | 说明                              | 类型              |  可选值 | 默认值 |
-|-----------|-----------------------------------|-----------------|---------|--------|
-| routes    | router 的路由栈信息               | object[]             |         | -      |
-| params    | 路由的参数                        | object            |         | -      |
-| separator | 分隔符自定义                      | string\|ReactNode |         | '/'    |
-| itemRender | 自定义链接函数，和 react-router 配置使用 | (route, params, routes, paths) => ReactNode | | - |
+| 参数 | 说明 | 类型 | 可选值 | 默认值 |
+| --- | --- | --- | --- | --- |
+| itemRender | 自定义链接函数，和 react-router 配置使用 | (route, params, routes, paths) => ReactNode |  | - |
+| params | 路由的参数 | object |  | - |
+| routes | router 的路由栈信息 | object\[] |  | - |
+| separator | 分隔符自定义 | string\|ReactNode |  | '/' |
 
 > 2.0 之后，`linkRender` 和 `nameRender` 被移除，请使用 `itemRender` 来代替。
 
@@ -31,10 +31,20 @@ title: Breadcrumb
 ```jsx
 import { Link } from 'react-router';
 
+const routes = [{
+  path: 'index',
+  breadcrumbName: '首页'
+}, {
+  path: 'first',
+  breadcrumbName: '一级面包屑'
+}, {
+  path: 'second',
+  breadcrumbName: '当前页面'
+}];
 function itemRender(route, params, routes, paths) {
   const last = routes.indexOf(route) === routes.length - 1;
   return last ? <span>{route.breadcrumbName}</span> : <Link to={paths.join('/')}>{route.breadcrumbName}</Link>;
 }
 
-return <Breadcrumb itemRender={itemRender} />;
+return <Breadcrumb itemRender={itemRender} routes={routes}/>;
 ```

components/button/button-group.tsx

@@ -11,7 +11,7 @@ export interface ButtonGroupProps {
 }
 
 const ButtonGroup: React.SFC<ButtonGroupProps> = (props) => {
-  const { prefixCls = 'ant-btn-group', size = '', className, ...others } = props;
+  const { prefixCls = 'ant-btn-group', size, className, ...others } = props;
 
   // large => lg
   // small => sm

components/button/button.tsx

@@ -61,7 +61,6 @@ export default class Button extends React.Component<ButtonProps, any> {
   static defaultProps = {
     prefixCls: 'ant-btn',
     loading: false,
-    clicked: false,
     ghost: false,
   };
 
@@ -83,6 +82,7 @@ export default class Button extends React.Component<ButtonProps, any> {
     super(props);
     this.state = {
       loading: props.loading,
+      clicked: false,
     };
   }
 
@@ -124,7 +124,7 @@ export default class Button extends React.Component<ButtonProps, any> {
 
   render() {
     const {
-      type, shape, size = '', className, htmlType, children, icon, prefixCls, ghost, ...others,
+      type, shape, size, className, htmlType, children, icon, prefixCls, ghost, ...others,
     } = this.props;
 
     const { loading, clicked } = this.state;
@@ -159,7 +159,7 @@ export default class Button extends React.Component<ButtonProps, any> {
 
     return (
       <button
-        {...omit(others, ['loading', 'clicked'])}
+        {...omit(others, ['loading'])}
         type={htmlType || 'button'}
         className={classes}
         onClick={this.handleClick}

components/button/index.en-US.md

@@ -14,18 +14,18 @@ A button means an operation (or a series of operations). Clicking a button will
 
 To get a customized button, just set `type`/`shape`/`size`/`loading`/`disabled`.
 
-Property | Description | Type | Default
------|-----|-----|------
-type | can be set to `primary` `ghost` `dashed` `danger`(added in 2.7) or omitted (meaning `default`) | string | `default`
-htmlType | set the original html `type` of `button`, see: [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button`
-icon | set the icon of button, see: Icon component | string | -
-shape | can be set to `circle` or omitted | string | -
-size | can be set to `small` `large` or omitted | string | `default`
-loading | set the loading status of button | boolean \| { delay: number } | false
-onClick | set the handler to handle `click` event | function | -
-ghost | make background transparent and invert text and border colors, added in 2.7 | boolean | false
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| ghost | make background transparent and invert text and border colors, added in 2.7 | boolean | false |
+| htmlType | set the original html `type` of `button`, see: [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button` |
+| icon | set the icon of button, see: Icon component | string | - |
+| loading | set the loading status of button | boolean \| { delay: number } | false |
+| shape | can be set to `circle` or omitted | string | - |
+| size | can be set to `small` `large` or omitted | string | `default` |
+| type | can be set to `primary` `ghost` `dashed` `danger`(added in 2.7) or omitted (meaning `default`) | string | `default` |
+| onClick | set the handler to handle `click` event | function | - |
 
-`<Button>Hello world!</Button>` will be rendered into `<button>Hello world!</button>`, and all the properties which are not listed above will be transferred to the `<button>` tag.
+`<Button>Hello world!</Button>` will be rendered into `<button><span>Hello world!</span></button>`, and all the properties which are not listed above will be transferred to the `<button>` tag.
 
 <style>
 [id^=components-button-demo-] .ant-btn {

components/button/index.zh-CN.md

@@ -17,18 +17,18 @@ subtitle: 按钮
 
 按钮的属性说明如下：
 
-属性 | 说明 | 类型 | 默认值
------|-----|-----|------
-type | 设置按钮类型，可选值为 `primary` `dashed` `danger`(版本 2.7 中增加) 或者不设 | string | -
-htmlType | 设置 `button` 原生的 `type` 值，可选值请参考 [HTML 标准](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button`
-icon | 设置按钮的图标类型 | string | -
-shape | 设置按钮形状，可选值为 `circle` 或者不设 | string | -
-size | 设置按钮大小，可选值为 `small` `large` 或者不设 | string | `default`
-loading | 设置按钮载入状态 | boolean \| { delay: number } | `false`
-onClick | `click` 事件的 handler | function | -
-ghost | 幽灵属性，使按钮背景透明，版本 2.7 中增加 | boolean | false
+| 属性 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| ghost | 幽灵属性，使按钮背景透明，版本 2.7 中增加 | boolean | false |
+| htmlType | 设置 `button` 原生的 `type` 值，可选值请参考 [HTML 标准](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button` |
+| icon | 设置按钮的图标类型 | string | - |
+| loading | 设置按钮载入状态 | boolean \| { delay: number } | `false` |
+| shape | 设置按钮形状，可选值为 `circle` 或者不设 | string | - |
+| size | 设置按钮大小，可选值为 `small` `large` 或者不设 | string | `default` |
+| type | 设置按钮类型，可选值为 `primary` `dashed` `danger`(版本 2.7 中增加) 或者不设 | string | - |
+| onClick | `click` 事件的 handler | function | - |
 
-`<Button>Hello world!</Button>` 最终会被渲染为 `<button>Hello world!</button>`，并且除了上表中的属性，其它属性都会直接传到 `<button></button>`。
+`<Button>Hello world!</Button>` 最终会被渲染为 `<button><span>Hello world!</span></button>`，并且除了上表中的属性，其它属性都会直接传到 `<button></button>`。
 
 <style>
 [id^="components-button-demo-"] .ant-btn {

components/calendar/__tests__/__snapshots__/demo.test.js.snap

@@ -15,7 +15,7 @@ exports[`renders ./components/calendar/demo/basic.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -47,7 +47,7 @@ exports[`renders ./components/calendar/demo/basic.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -1022,7 +1022,7 @@ exports[`renders ./components/calendar/demo/card.md correctly 1`] = `
           aria-expanded="false"
           aria-haspopup="true"
           class="ant-select-selection
-                    ant-select-selection--single"
+            ant-select-selection--single"
           role="combobox"
           tabindex="0"
         >
@@ -1054,7 +1054,7 @@ exports[`renders ./components/calendar/demo/card.md correctly 1`] = `
           aria-expanded="false"
           aria-haspopup="true"
           class="ant-select-selection
-                    ant-select-selection--single"
+            ant-select-selection--single"
           role="combobox"
           tabindex="0"
         >
@@ -2027,7 +2027,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -2059,7 +2059,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -3346,7 +3346,7 @@ exports[`renders ./components/calendar/demo/select.md correctly 1`] = `
           aria-expanded="false"
           aria-haspopup="true"
           class="ant-select-selection
-                    ant-select-selection--single"
+            ant-select-selection--single"
           role="combobox"
           tabindex="0"
         >
@@ -3378,7 +3378,7 @@ exports[`renders ./components/calendar/demo/select.md correctly 1`] = `
           aria-expanded="false"
           aria-haspopup="true"
           class="ant-select-selection
-                    ant-select-selection--single"
+            ant-select-selection--single"
           role="combobox"
           tabindex="0"
         >

components/calendar/demo/notice-calendar.md

@@ -68,10 +68,12 @@ function getMonthData(value) {
 
 function monthCellRender(value) {
   const num = getMonthData(value);
-  return num ? <div className="notes-month">
-    <section>{num}</section>
-    <span>Backlog number</span>
-  </div> : null;
+  return num ? (
+    <div className="notes-month">
+      <section>{num}</section>
+      <span>Backlog number</span>
+    </div>
+  ) : null;
 }
 
 ReactDOM.render(

components/calendar/index.en-US.md

@@ -30,17 +30,17 @@ moment.locale('zh-cn');
 />
 ```
 
-| Property         | Description           | Type     | Default       |
-|--------------|----------------|----------|--------------|
-| value        | The current selected date | [moment](http://momentjs.com/) | current date     |
-| defaultValue | The date selected by default | [moment](http://momentjs.com/) | default date     |
-| mode         | The display mode of the calendar | `month` \| `year` | `month`  |
-| fullscreen   | Whether to display in full-screen   | boolean     | `true`         |
-| dateCellRender      | Customize the display of the date cell, the returned content will be appended to the cell | function(date: moment): ReactNode | - |
-| monthCellRender     | Customize the display of the month cell, the returned content will be appended to the cell | function(date: moment): ReactNode | - |
-| dateFullCellRender  | Customize the display of the date cell, the returned content will override the cell | function(date: moment): ReactNode | - |
-| monthFullCellRender | Customize the display of the month cell, the returned content will override the cell | function(date: moment): ReactNode | - |
-| locale       | The calendar's locale | object   | [default](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
-| onPanelChange| Callback for when panel changes | function(date: moment, mode: string) | - |
-| onSelect     | Callback for when a date is selected | function(date: moment）              | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| dateCellRender | Customize the display of the date cell, the returned content will be appended to the cell | function(date: moment): ReactNode | - |
+| dateFullCellRender | Customize the display of the date cell, the returned content will override the cell | function(date: moment): ReactNode | - |
+| defaultValue | The date selected by default | [moment](http://momentjs.com/) | default date |
 | disabledDate | Function that specifies the dates that cannot be selected | (currentDate: moment) => boolean | - |
+| fullscreen | Whether to display in full-screen | boolean | `true` |
+| locale | The calendar's locale | object | [default](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json) |
+| mode | The display mode of the calendar | `month` \| `year` | `month` |
+| monthCellRender | Customize the display of the month cell, the returned content will be appended to the cell | function(date: moment): ReactNode | - |
+| monthFullCellRender | Customize the display of the month cell, the returned content will override the cell | function(date: moment): ReactNode | - |
+| value | The current selected date | [moment](http://momentjs.com/) | current date |
+| onPanelChange | Callback for when panel changes | function(date: moment, mode: string) | - |
+| onSelect | Callback for when a date is selected | function(date: moment） | - |

components/calendar/index.zh-CN.md

@@ -12,7 +12,6 @@ title: Calendar
 
 当数据是日期或按照日期划分时，例如日程、课表、价格日历等，农历等。目前支持年/月切换。
 
-
 ## API
 
 **注意：**Calendar 部分 locale 是从 value 中读取，所以请先正确设置 moment 的 locale。
@@ -32,17 +31,17 @@ moment.locale('zh-cn');
 />
 ```
 
-| 参数         | 说明           | 类型     | 默认值       |
-|--------------|----------------|----------|--------------|
-| value        | 展示日期       | [moment](http://momentjs.com/)     | 当前日期     |
-| defaultValue | 默认展示的日期  | [moment](http://momentjs.com/)     | 默认日期     |
-| mode         | 初始模式，`month/year` | string | month  |
-| fullscreen   | 是否全屏显示   | boolean     | true         |
-| dateCellRender      | 自定义渲染日期单元格，返回内容会被追加到单元格| function(date: moment): ReactNode   | 无 |
-| monthCellRender     | 自定义渲染月单元格，返回内容会被追加到单元格  | function(date: moment): ReactNode   | 无 |
-| dateFullCellRender  | 自定义渲染日期单元格，返回内容覆盖单元格| function(date: moment): ReactNode   | 无 |
-| monthFullCellRender | 自定义渲染月单元格，返回内容覆盖单元格  | function(date: moment): ReactNode   | 无 |
-| locale       | 国际化配置     | object   | [默认配置](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
-| onPanelChange| 日期面板变化回调 | function(date: moment, mode: string) | 无 |
-| onSelect     | 点击选择日期回调 | function(date: moment）              | 无 |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| dateCellRender | 自定义渲染日期单元格，返回内容会被追加到单元格 | function(date: moment): ReactNode | 无 |
+| dateFullCellRender | 自定义渲染日期单元格，返回内容覆盖单元格 | function(date: moment): ReactNode | 无 |
+| defaultValue | 默认展示的日期 | [moment](http://momentjs.com/) | 默认日期 |
 | disabledDate | 不可选择的日期 | (currentDate: moment) => boolean | 无 |
+| fullscreen | 是否全屏显示 | boolean | true |
+| locale | 国际化配置 | object | [默认配置](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json) |
+| mode | 初始模式，`month/year` | string | month |
+| monthCellRender | 自定义渲染月单元格，返回内容会被追加到单元格 | function(date: moment): ReactNode | 无 |
+| monthFullCellRender | 自定义渲染月单元格，返回内容覆盖单元格 | function(date: moment): ReactNode | 无 |
+| value | 展示日期 | [moment](http://momentjs.com/) | 当前日期 |
+| onPanelChange | 日期面板变化回调 | function(date: moment, mode: string) | 无 |
+| onSelect | 点击选择日期回调 | function(date: moment） | 无 |

components/card/index.en-US.md

@@ -19,18 +19,18 @@ A card can be used to display content related to a single subject. The content c
 
 ### Card
 
-| Property     | Description           | Type     | Default       |
-|----------|----------------|----------|--------------|
-| title    | Card title | string\|ReactNode   |  -  |
-| extra    | Content to render in the top-right corner of the card | string\|ReactNode   | - |
-| bordered | Toggles rendering of the border around the card | boolean   |  `true`  |
-| bodyStyle | Inline style to apply to the card content | object   |  -  |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| bodyStyle | Inline style to apply to the card content | object | - |
+| bordered | Toggles rendering of the border around the card | boolean | `true` |
+| extra | Content to render in the top-right corner of the card | string\|ReactNode | - |
+| loading | Shows a loading indicator while the contents of the card are being fetched | boolean | `false` |
 | noHovering | Whether to disable hover effect on mouse over | boolean | `false` |
-| loading | Shows a loading indicator while the contents of the card are being fetched | boolean   |  `false`  |
+| title | Card title | string\|ReactNode | - |
 
 ### Card.Grid
 
-Property | Description | Type | Default
----------|-------------|------|---------
-className | className of container | string | -
-style | style object of container | object | -
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| className | className of container | string | - |
+| style | style object of container | object | - |

components/card/index.zh-CN.md

@@ -20,18 +20,18 @@ cols: 1
 
 ### Card
 
-| 参数     | 说明           | 类型     | 默认值       |
-|----------|----------------|----------|--------------|
-| title    | 卡片标题 | string\|ReactNode   |  -  |
-| extra    | 卡片右上角的操作区域 | string\|ReactNode   | - |
-| bordered | 是否有边框 | boolean   |  true  |
-| bodyStyle | 内容区域自定义样式 | object   |  -  |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| bodyStyle | 内容区域自定义样式 | object | - |
+| bordered | 是否有边框 | boolean | true |
+| extra | 卡片右上角的操作区域 | string\|ReactNode | - |
+| loading | 当卡片内容还在加载中时，可以用 loading 展示一个占位 | boolean | false |
 | noHovering | 取消鼠标移过浮起 | boolean | false |
-| loading | 当卡片内容还在加载中时，可以用 loading 展示一个占位 | boolean   |  false  |
+| title | 卡片标题 | string\|ReactNode | - |
 
 ### Card.Grid
 
-Property | Description | Type | Default
----------|-------------|------|---------
-className | 网格容器类名 | string | -
-style | 定义网格容器类名的样式 | object | -
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| className | 网格容器类名 | string | - |
+| style | 定义网格容器类名的样式 | object | - |

components/card/style/index.less

@@ -14,7 +14,7 @@
 
   &:not(&-no-hovering):hover {
     box-shadow: @box-shadow-base;
-    border-color: transparent;
+    border-color: @shadow-color;
   }
 
   &-bordered {
@@ -57,25 +57,6 @@
     .clearfix;
   }
 
-  &-loading &-body {
-    user-select: none;
-    padding: 0;
-  }
-
-  &-loading-content {
-    padding: @card-padding-base;
-  }
-
-  &-loading-block {
-    display: inline-block;
-    margin: 5px 1% 0;
-    height: 14px;
-    border-radius: @border-radius-sm;
-    background: linear-gradient(90deg, rgba(207, 216, 220, .2), rgba(207, 216, 220, .4), rgba(207, 216, 220, .2));
-	  animation: card-loading 1.4s ease infinite;
-    background-size: 600% 600%;
-  }
-
   &-contain-grid &-body {
     margin: -1px 0 0 -1px;
     padding: 0;
@@ -116,6 +97,25 @@
   &-padding-transition &-extra {
     transition: right .3s;
   }
+
+  &-loading &-body {
+    user-select: none;
+    padding: 0;
+  }
+
+  &-loading-content {
+    padding: @card-padding-base;
+  }
+
+  &-loading-block {
+    display: inline-block;
+    margin: 5px 1% 0;
+    height: 14px;
+    border-radius: @border-radius-sm;
+    background: linear-gradient(90deg, rgba(207, 216, 220, .2), rgba(207, 216, 220, .4), rgba(207, 216, 220, .2));
+    animation: card-loading 1.4s ease infinite;
+    background-size: 600% 600%;
+  }
 }
 
 @keyframes card-loading {

components/carousel/__tests__/index.test.js

@@ -5,7 +5,7 @@ import Carousel from '..';
 describe('Carousel', () => {
   it('should has innerSlider', () => {
     const wrapper = mount(<Carousel><div /></Carousel>);
-    const innerSlider = wrapper.node.innerSlider;
+    const { innerSlider } = wrapper.node;
     const innerSliderFromRefs = wrapper.node.refs.slick.innerSlider;
     expect(innerSlider).toBe(innerSliderFromRefs);
     expect(typeof innerSlider.slickNext).toBe('function');

components/carousel/index.en-US.md

@@ -14,14 +14,14 @@ A carousel component. Scales with its container.
 
 ## API
 
-| Property             | Description                                         | Type     | Default                          |
-|------------------|----------------------------------------------|----------|---------------------------------|
-| effect           | Transition effect   | `scrollx` \| `fade` | `scrollx` |
-| dots | Whether to show the dots at the bottom of the gallery                | boolean    | `true` |
-| vertical | Whether to use a vertical display                               | boolean   | `false` |
-| autoplay | Whether to scroll automatically                                 | boolean   | `false` |
-| easing | Transition interpolation function name                            | string   | `linear` |
-| beforeChange | Callback function called before the current index changes   | function(from, to) | - |
-| afterChange  | Callback function called after the current index changes    | function(current)  | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| afterChange | Callback function called after the current index changes | function(current) | - |
+| autoplay | Whether to scroll automatically | boolean | `false` |
+| beforeChange | Callback function called before the current index changes | function(from, to) | - |
+| dots | Whether to show the dots at the bottom of the gallery | boolean | `true` |
+| easing | Transition interpolation function name | string | `linear` |
+| effect | Transition effect | `scrollx` \| `fade` | `scrollx` |
+| vertical | Whether to use a vertical display | boolean | `false` |
 
-For more info on the parameters, refer to the https://github.com/akiran/react-slick
+For more info on the parameters, refer to the <https://github.com/akiran/react-slick>

components/carousel/index.zh-CN.md

@@ -15,14 +15,14 @@ subtitle: 走马灯
 
 ## API
 
-| 参数             | 说明                                         | 类型     | 默认值                          |
-|------------------|----------------------------------------------|----------|---------------------------------|
-| effect           | 动画效果函数，可取 scrollx, fade | string | scrollx |
-| dots | 是否显示面板指示点 | boolean   | true |
-| vertical | 垂直显示 | boolean   | false |
-| autoplay | 是否自动切换 | boolean   | false |
-| easing | 动画效果 | string   | linear |
-| beforeChange      | 切换面板的回调                              | function(from, to) | 无 |
-| afterChange       | 切换面板的回调                              | function(current)  | 无 |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| afterChange | 切换面板的回调 | function(current) | 无 |
+| autoplay | 是否自动切换 | boolean | false |
+| beforeChange | 切换面板的回调 | function(from, to) | 无 |
+| dots | 是否显示面板指示点 | boolean | true |
+| easing | 动画效果 | string | linear |
+| effect | 动画效果函数，可取 scrollx, fade | string | scrollx |
+| vertical | 垂直显示 | boolean | false |
 
-更多参数可参考：https://github.com/akiran/react-slick
+更多参数可参考：<https://github.com/akiran/react-slick>

components/cascader/demo/lazy.md

@@ -32,14 +32,10 @@ const options = [{
 
 class LazyOptions extends React.Component {
   state = {
-    inputValue: '',
     options,
   };
   onChange = (value, selectedOptions) => {
     console.log(value, selectedOptions);
-    this.setState({
-      inputValue: selectedOptions.map(o => o.label).join(', '),
-    });
   }
   loadData = (selectedOptions) => {
     const targetOption = selectedOptions[selectedOptions.length - 1];

components/cascader/index.en-US.md

@@ -6,7 +6,6 @@ title: Cascader
 
 Cascade selection box.
 
-
 ## When To Use
 
 - When you need to select from a set of associated data set. Such as province/city/district, company level, things classification.
@@ -20,36 +19,36 @@ Cascade selection box.
 ```
 
 | Property | Description | Type | Default |
-|------|------|------|--------|
-| options | data options of cascade | object | - |
-| defaultValue | initial selected value | [CascaderOptionType](https://git.io/vMMoK)[]  |[] |
-| value | selected value | [CascaderOptionType](https://git.io/vMMoK)[] | - |
-| onChange | callback when finishing cascader select | `(value, selectedOptions) => void` | - |
-| onPopupVisibleChange | callback when popup shown or hidden | `(value) => void` | - |
-| displayRender | render function of displaying selected options | `(label, selectedOptions) => ReactNode` | `label => label.join(' / ')` |
-| style | additional style | string | - |
+| -------- | ----------- | ---- | ------- |
+| allowClear | whether allow clear | boolean | true |
+| changeOnSelect | change value on each selection if set to true, see above demo for details | boolean | false |
 | className | additional css class | string | - |
+| defaultValue | initial selected value | [CascaderOptionType](https://git.io/vMMoK)\[] | \[] |
+| disabled | whether disabled select | boolean | false |
+| displayRender | render function of displaying selected options | `(label, selectedOptions) => ReactNode` | `label => label.join(' / ')` |
+| expandTrigger | expand current item when click or hover, one of 'click' 'hover' | string | 'click' |
+| getPopupContainer | Parent Node which the selector should be rendered to. Default to `body`. When position issues happen, try to modify it into scrollable content and position it relative.[example](https://codepen.io/afc163/pen/zEjNOy?editors=0010) | Function(triggerNode) | () => document.body |
+| loadData | To load option lazily, and it cannot work with `showSearch` | `(selectedOptions) => void` | - |
+| notFoundContent | Specify content to show when no result matches. | string | 'Not Found' |
+| options | data options of cascade | object | - |
+| placeholder | input placeholder | string | 'Please select' |
 | popupClassName | additional className of popup overlay | string | - |
 | popupPlacement | use preset popup align config from builtinPlacements：`bottomLeft` `bottomRight` `topLeft` `topRight` | string | `bottomLeft` |
-| placeholder | input placeholder | string | 'Please select' |
-| size | input size, one of `large` `default` `small` | string | `default` |
-| disabled | whether disabled select | boolean | false |
-| allowClear | whether allow clear | boolean | true |
-| expandTrigger | expand current item when click or hover, one of 'click' 'hover' | string | 'click' |
-| changeOnSelect | change value on each selection if set to true, see above demo for details | boolean | false |
 | showSearch | Whether show search input in single mode. | boolean\|object | false |
-| notFoundContent | Specify content to show when no result matches. | string | 'Not Found' |
-| loadData  | To load option lazily, and it cannot work with `showSearch` | `(selectedOptions) => void`  | - |
-| getPopupContainer | Parent Node which the selector should be rendered to. Default to `body`. When position issues happen, try to modify it into scrollable content and position it relative.[example](http://codepen.io/anon/pen/xVBOVQ?editors=001) | Function(triggerNode) | () => document.body |
+| size | input size, one of `large` `default` `small` | string | `default` |
+| style | additional style | string | - |
+| value | selected value | [CascaderOptionType](https://git.io/vMMoK)\[] | - |
+| onChange | callback when finishing cascader select | `(value, selectedOptions) => void` | - |
+| onPopupVisibleChange | callback when popup shown or hidden | `(value) => void` | - |
 
 Fields in `showSearch`:
 
 | Property | Description | Type | Default |
-|----------|-------------|------|---------|
-| filter | The function will receive two arguments, inputValue and option, if the function returns true, the option will be included in the filtered set; Otherwise, it will be excluded. | `function(inputValue, path): boolean` | |
-| render | Used to render filtered options. | `function(inputValue, path): ReactNode` | |
-| sort | Used to sort filtered options. | `function(a, b, inputValue)` | |
-| matchInputWidth | Whether the width of result list equals to input's | boolean | |
+| -------- | ----------- | ---- | ------- |
+| filter | The function will receive two arguments, inputValue and option, if the function returns true, the option will be included in the filtered set; Otherwise, it will be excluded. | `function(inputValue, path): boolean` |  |
+| matchInputWidth | Whether the width of result list equals to input's | boolean |  |
+| render | Used to render filtered options. | `function(inputValue, path): ReactNode` |  |
+| sort | Used to sort filtered options. | `function(a, b, inputValue)` |  |
 
 <style>
 .ant-cascader-picker {

components/cascader/index.tsx

@@ -150,7 +150,7 @@ export default class Cascader extends React.Component<CascaderProps, any> {
       popupVisible,
       inputFocused: popupVisible,
       inputValue: popupVisible ? this.state.inputValue : '',
-     });
+    });
 
     const onPopupVisibleChange = this.props.onPopupVisibleChange;
     if (onPopupVisibleChange) {
@@ -336,6 +336,7 @@ export default class Cascader extends React.Component<CascaderProps, any> {
         <Input
           {...inputProps}
           ref="input"
+          prefixCls={inputPrefixCls}
           placeholder={value && value.length > 0 ? undefined : placeholder}
           className={`${prefixCls}-input ${sizeCls}`}
           value={state.inputValue}

components/cascader/index.zh-CN.md

@@ -7,7 +7,6 @@ subtitle: 级联选择
 
 级联选择框。
 
-
 ## 何时使用
 
 - 需要从一组相关联的数据集合进行选择，例如省市区，公司层级，事物分类等。
@@ -21,36 +20,36 @@ subtitle: 级联选择
 ```
 
 | 参数 | 说明 | 类型 | 默认值 |
-|------|------|------|--------|
-| options | 可选项数据源 | object | - |
-| defaultValue | 默认的选中项 | [CascaderOptionType](https://git.io/vMMoK)[]  |[] |
-| value | 指定选中项 | [CascaderOptionType](https://git.io/vMMoK)[] | - |
-| onChange | 选择完成后的回调 | `(value, selectedOptions) => void` | - |
-| onPopupVisibleChange | 显示/隐藏浮层的回调 | `(value) => void` | - |
-| displayRender | 选择后展示的渲染函数 | `(label, selectedOptions) => ReactNode` | `label => label.join(' / ')` |
-| style | 自定义样式 | string | - |
+| --- | --- | --- | --- |
+| allowClear | 是否支持清除 | boolean | true |
+| changeOnSelect | 当此项为 true 时，点选每级菜单选项值都会发生变化，具体见上面的演示 | boolean | false |
 | className | 自定义类名 | string | - |
+| defaultValue | 默认的选中项 | [CascaderOptionType](https://git.io/vMMoK)\[] | \[] |
+| disabled | 禁用 | boolean | false |
+| displayRender | 选择后展示的渲染函数 | `(label, selectedOptions) => ReactNode` | `label => label.join(' / ')` |
+| expandTrigger | 次级菜单的展开方式，可选 'click' 和 'hover' | string | 'click' |
+| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](https://codepen.io/afc163/pen/zEjNOy?editors=0010) | Function(triggerNode) | () => document.body |
+| loadData | 用于动态加载选项，无法与 `showSearch` 一起使用 | `(selectedOptions) => void` | - |
+| notFoundContent | 当下拉列表为空时显示的内容 | string | 'Not Found' |
+| options | 可选项数据源 | object | - |
+| placeholder | 输入框占位文本 | string | '请选择' |
 | popupClassName | 自定义浮层类名 | string | - |
 | popupPlacement | 浮层预设位置：`bottomLeft` `bottomRight` `topLeft` `topRight` | Enum | `bottomLeft` |
-| placeholder | 输入框占位文本 | string | '请选择' |
-| size | 输入框大小，可选 `large` `default` `small` | string | `default` |
-| disabled | 禁用 | boolean | false |
-| allowClear | 是否支持清除 | boolean | true |
-| expandTrigger | 次级菜单的展开方式，可选 'click' 和 'hover' | string | 'click' |
-| changeOnSelect | 当此项为 true 时，点选每级菜单选项值都会发生变化，具体见上面的演示 | boolean | false |
 | showSearch | 在选择框中显示搜索框 | boolean | false |
-| notFoundContent | 当下拉列表为空时显示的内容 | string | 'Not Found' |
-| loadData  | 用于动态加载选项，无法与 `showSearch` 一起使用 | `(selectedOptions) => void`  | - |
-| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](http://codepen.io/anon/pen/xVBOVQ?editors=001) | Function(triggerNode) | () => document.body |
+| size | 输入框大小，可选 `large` `default` `small` | string | `default` |
+| style | 自定义样式 | string | - |
+| value | 指定选中项 | [CascaderOptionType](https://git.io/vMMoK)\[] | - |
+| onChange | 选择完成后的回调 | `(value, selectedOptions) => void` | - |
+| onPopupVisibleChange | 显示/隐藏浮层的回调 | `(value) => void` | - |
 
 `showSearch` 为对象时，其中的字段：
 
 | 参数 | 说明 | 类型 | 默认值 |
-|------|------|------|--------|
-| filter | 接收 `inputValue` `path` 两个参数，当 `path` 符合筛选条件时，应返回 true，反之则返回 false。 | `function(inputValue, path): boolean` | |
-| render | 用于渲染 filter 后的选项 | `function(inputValue, path): ReactNode` | |
-| sort | 用于排序 filter 后的选项 | `function(a, b, inputValue)` | |
-| matchInputWidth | 搜索结果列表是否与输入框同宽 | boolean | |
+| --- | --- | --- | --- |
+| filter | 接收 `inputValue` `path` 两个参数，当 `path` 符合筛选条件时，应返回 true，反之则返回 false。 | `function(inputValue, path): boolean` |  |
+| matchInputWidth | 搜索结果列表是否与输入框同宽 | boolean |  |
+| render | 用于渲染 filter 后的选项 | `function(inputValue, path): ReactNode` |  |
+| sort | 用于排序 filter 后的选项 | `function(a, b, inputValue)` |  |
 
 <style>
 .ant-cascader-picker {

components/checkbox/index.en-US.md

@@ -15,19 +15,19 @@ Checkbox.
 
 ### Checkbox
 
-| Property      | Description             | Type      | Default  |
-|----------|------------------|----------|--------|
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
 | checked | Specifies whether the checkbox is selected. | boolean | false |
 | defaultChecked | Specifies the initial state: whether or not the checkbox is selected. | boolean | false |
+| disabled | Disable checkbox | boolean | false |
 | onChange | The callback function that is triggered when the state changes. | Function(e:Event) | - |
-| disabled | Disable checkbox | boolean | false| 
 
 ### Checkbox Group
 
-| Property      | Description             | Type      | Default  |
-|----------|------------------|----------|--------|
-| defaultValue | Default selected value | string[] | [] |
-| value | Used for setting the currently selected value. | string[] | [] |
-| options  | Specifies options | string[] | [] |
-| onChange | The callback function that is triggered when the state changes. | Function(checkedValue) | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| defaultValue | Default selected value | string\[] | \[] |
 | disabled | Disable all checkboxes | boolean | false |
+| options | Specifies options | string\[] | \[] |
+| value | Used for setting the currently selected value. | string\[] | \[] |
+| onChange | The callback function that is triggered when the state changes. | Function(checkedValue) | - |

components/checkbox/index.zh-CN.md

@@ -16,18 +16,18 @@ title: Checkbox
 
 ### Checkbox
 
-| 参数      | 说明             | 类型      | 默认值  |
-|----------|------------------|----------|--------|
-| checked | 指定当前是否选中 | boolean  | false |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| checked | 指定当前是否选中 | boolean | false |
 | defaultChecked | 初始是否选中 | boolean | false |
-| onChange | 变化时回调函数 | Function(e:Event) | - |
 | indeterminate | 设置 indeterminate 状态，只负责样式控制 | boolean | false |
+| onChange | 变化时回调函数 | Function(e:Event) | - |
 
 ### Checkbox Group
 
-| 参数      | 说明             | 类型      | 默认值  |
-|----------|------------------|----------|--------|
-| defaultValue | 默认选中的选项 | string[] | [] |
-| value | 指定选中的选项| string[] | [] |
-| options  | 指定可选项 | string[] | [] |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| defaultValue | 默认选中的选项 | string\[] | \[] |
+| options | 指定可选项 | string\[] | \[] |
+| value | 指定选中的选项 | string\[] | \[] |
 | onChange | 变化时回调函数 | Function(checkedValue) | - |

components/checkbox/style/mixin.less

@@ -166,6 +166,13 @@
     font-size: @font-size-base;
     &-item {
       display: inline-block;
+      margin-right: 8px;
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+    &-item + &-item {
+      margin-left: 0;
     }
   }
 

components/collapse/__tests__/__snapshots__/demo.test.js.snap

@@ -75,10 +75,10 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
       >
         <p>
           
-            A dog is a type of domesticated animal.
-            Known for its loyalty and faithfulness,
-            it can be found as a welcome guest in many households across the world.
-          
+  A dog is a type of domesticated animal.
+  Known for its loyalty and faithfulness,
+  it can be found as a welcome guest in many households across the world.
+
         </p>
       </div>
     </div>
@@ -140,10 +140,10 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
       >
         <p>
           
-            A dog is a type of domesticated animal.
-            Known for its loyalty and faithfulness,
-            it can be found as a welcome guest in many households across the world.
-          
+  A dog is a type of domesticated animal.
+  Known for its loyalty and faithfulness,
+  it can be found as a welcome guest in many households across the world.
+
         </p>
       </div>
     </div>
@@ -206,10 +206,10 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
       >
         <p>
           
-            A dog is a type of domesticated animal.
-            Known for its loyalty and faithfulness,
-            it can be found as a welcome guest in many households across the world.
-          
+  A dog is a type of domesticated animal.
+  Known for its loyalty and faithfulness,
+  it can be found as a welcome guest in many households across the world.
+
         </p>
       </div>
     </div>

components/collapse/demo/accordion.md

@@ -1,6 +1,6 @@
 ---
 order: 1
-title: 
+title:
   zh-CN: 手风琴
   en-US: Accordion
 ---
@@ -25,13 +25,13 @@ const text = `
 
 ReactDOM.render(
   <Collapse accordion>
-    <Panel header={'This is panel header 1'} key="1">
+    <Panel header="This is panel header 1" key="1">
       <p>{text}</p>
     </Panel>
-    <Panel header={'This is panel header 2'} key="2">
+    <Panel header="This is panel header 2" key="2">
       <p>{text}</p>
     </Panel>
-    <Panel header={'This is panel header 3'} key="3">
+    <Panel header="This is panel header 3" key="3">
       <p>{text}</p>
     </Panel>
   </Collapse>

components/collapse/demo/mix.md

@@ -29,17 +29,17 @@ const text = `
 
 ReactDOM.render(
   <Collapse onChange={callback}>
-    <Panel header={'This is panel header 1'} key="1">
+    <Panel header="This is panel header 1" key="1">
       <Collapse defaultActiveKey="1">
-        <Panel header={'This is panel nest panel'} key="1">
+        <Panel header="This is panel nest panel" key="1">
           <p>{text}</p>
         </Panel>
       </Collapse>
     </Panel>
-    <Panel header={'This is panel header 2'} key="2">
+    <Panel header="This is panel header 2" key="2">
       <p>{text}</p>
     </Panel>
-    <Panel header={'This is panel header 3'} key="3">
+    <Panel header="This is panel header 3" key="3">
       <p>{text}</p>
     </Panel>
   </Collapse>

components/collapse/index.en-US.md

@@ -16,16 +16,16 @@ A content area which can be collapsed and expanded.
 
 ### Collapse
 
-| Property     | Description           | Type     | Default       |
-|----------|----------------|----------|--------------|
-| activeKey    | Key of the active panel | string[]\|string   | No default value. In `accordion` mode, it's the key of the first panel.  |
-| defaultActiveKey    | Key of the initial active panel | string   | - |
-| onChange | Callback function executed when active panel is changed | Function   |  -  |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| activeKey | Key of the active panel | string\[]\|string | No default value. In `accordion` mode, it's the key of the first panel. |
+| defaultActiveKey | Key of the initial active panel | string | - |
+| onChange | Callback function executed when active panel is changed | Function | - |
 
 ### Collapse.Panel
 
-| Property     | Description           | Type     | Default       |
-|----------|----------------|----------|--------------|
-| key    | Unique key identifying the panel from among its siblings | string   |  -  |
-| header    | Title of the panel | string\|ReactNode   | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
 | disabled | If `true`, panel cannot be opened or closed | boolean | `false` |
+| header | Title of the panel | string\|ReactNode | - |
+| key | Unique key identifying the panel from among its siblings | string | - |

components/collapse/index.zh-CN.md

@@ -17,17 +17,16 @@ cols: 1
 
 ### Collapse
 
-| 参数             | 说明                                         | 类型     | 默认值                          |
-|------------------|----------------------------------------------|----------|---------------------------------|
-| activeKey        | 当前激活 tab 面板的 key| string[]\|string   | 默认无，accordion模式下默认第一个元素|
-| defaultActiveKey | 初始化选中面板的 key | string   | 无 |
-| onChange         | 切换面板的回调                               | Function | 无                              |
-
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| activeKey | 当前激活 tab 面板的 key | string\[]\|string | 默认无，accordion模式下默认第一个元素 |
+| defaultActiveKey | 初始化选中面板的 key | string | 无 |
+| onChange | 切换面板的回调 | Function | 无 |
 
 ### Collapse.Panel
 
-| 参数 | 说明             | 类型                    | 默认值 |
-|------|------------------|-------------------------|--------|
-| key  | 对应 activeKey   | string                  | 无     |
-| header | 面板头内容 | string\|ReactNode | 无     |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
 | disabled | 禁用后的面板展开与否将无法通过用户交互改变 | boolean | false |
+| header | 面板头内容 | string\|ReactNode | 无 |
+| key | 对应 activeKey | string | 无 |

components/date-picker/RangePicker.tsx

@@ -111,7 +111,9 @@ export default class RangePicker extends React.Component<any, any> {
   }
 
   handleOpenChange = (open) => {
-    this.setState({ open });
+    if (!('open' in this.props)) {
+      this.setState({ open });
+    }
 
     const { onOpenChange } = this.props;
     if (onOpenChange) {
@@ -123,9 +125,9 @@ export default class RangePicker extends React.Component<any, any> {
 
   handleHoverChange = hoverValue => this.setState({ hoverValue });
 
-  setValue(value) {
+  setValue(value, hidePanel?) {
     this.handleChange(value);
-    if (!this.props.showTime) {
+    if ((hidePanel || !this.props.showTime) && !('open' in this.props)) {
       this.setState({ open: false });
     }
   }
@@ -145,7 +147,7 @@ export default class RangePicker extends React.Component<any, any> {
       return (
         <a
           key={range}
-          onClick={() => this.setValue(value)}
+          onClick={() => this.setValue(value, true)}
           onMouseEnter={() => this.setState({ hoverValue: value })}
           onMouseLeave={this.clearHoverValue}
         >

components/date-picker/index.en-US.md

@@ -14,9 +14,9 @@ By clicking the input box, you can select a date from a popup calendar.
 
 There are three kinds of picker:
 
-* DatePicker
-* MonthPicker
-* RangePicker
+- DatePicker
+- MonthPicker
+- RangePicker
 
 **Note:** Part of locale of DatePicker, MonthPicker, RangePicker is read from value. So, please set the locale of moment correctly.
 
@@ -34,59 +34,59 @@ moment.locale('zh-cn');
 
 The following APIs are shared by DatePicker, MonthPicker, RangePicker.
 
-| Property     | Description    | Type     | Default      |
-|--------------|----------------|----------|--------------|
-| allowClear   | Whether to show clear button | boolean | true |
-| disabled     | determine whether the DatePicker is disabled           | boolean     | false        |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| allowClear | Whether to show clear button | boolean | true |
 | className | picker className | string | '' |
-| style        | to customize the style of the input box     | object     | {}   |
-| popupStyle   | to customize the style of the popup calendar   | object     | {}   |
-| size         | determine the size of the input box, the height of `large` and `small`, are 32px and 22px respectively, while default size is 28px | string   | -  |
-| locale       | localization configuration | object   | [default](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
-| disabledDate | specify the date that cannot be selected | (currentDate: moment) => boolean | -           |
+| disabled | determine whether the DatePicker is disabled | boolean | false |
+| disabledDate | specify the date that cannot be selected | (currentDate: moment) => boolean | - |
 | getCalendarContainer | to set the container of the floating layer, while the default is to create a `div` element in `body` | function(trigger) | - |
+| locale | localization configuration | object | [default](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json) |
 | open | open state of picker | boolean | - |
-| onOpenChange   | a callback function, can be executed whether the popup calendar is popped up or closed | function(status) | - |
-| placeholder  | placeholder of date input | string\|RangePicker[] | - |
+| placeholder | placeholder of date input | string\|RangePicker\[] | - |
+| popupStyle | to customize the style of the popup calendar | object | {} |
+| size | determine the size of the input box, the height of `large` and `small`, are 32px and 22px respectively, while default size is 28px | string | - |
+| style | to customize the style of the input box | object | {} |
+| onOpenChange | a callback function, can be executed whether the popup calendar is popped up or closed | function(status) | - |
 
 ### DatePicker
 
-| Property         | Description           | Type     | Default       |
-|--------------|----------------|----------|--------------|
-| value        | to set date           | [moment](http://momentjs.com/)   | -           |
-| defaultValue | to set default date        | [moment](http://momentjs.com/)   | -           |
-| format       | to set the date format, refer to [moment.js](http://momentjs.com/) | string   | "YYYY-MM-DD" |
-| onChange     | a callback function, can be executed when the selected time is changing | function(date: moment, dateString: string) | -           |
-| showTime     | to provide an additional time selection  | object\|boolean | [TimePicker Options](/components/time-picker/#API) |
-| showTime.defaultValue | to set default time of selected date, [demo](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/) | moment() |
-| showToday    | whether to show "Today" button | boolean | true |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| defaultValue | to set default date | [moment](http://momentjs.com/) | - |
 | disabledTime | to specify the time that cannot be selected | function(date) | - |
-| onOk | callback when click ok button | function() | - |
+| format | to set the date format, refer to [moment.js](http://momentjs.com/) | string | "YYYY-MM-DD" |
 | renderExtraFooter | render extra footer in panel | () => React.ReactNode | - |
+| showTime | to provide an additional time selection | object\|boolean | [TimePicker Options](/components/time-picker/#API) |
+| showTime.defaultValue | to set default time of selected date, [demo](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/) | moment() |
+| showToday | whether to show "Today" button | boolean | true |
+| value | to set date | [moment](http://momentjs.com/) | - |
+| onChange | a callback function, can be executed when the selected time is changing | function(date: moment, dateString: string) | - |
+| onOk | callback when click ok button | function() | - |
 
 ### MonthPicker
 
-| Property         | Description           | Type     | Default       |
-|--------------|----------------|----------|--------------|
-| value        | to set date          | [moment](http://momentjs.com/)   | -           |
-| defaultValue | to set default date       | [moment](http://momentjs.com/)   | -           |
-| format       | to set the date format, refer to [moment.js](http://momentjs.com/) | string   | "YYYY-MM" |
-| onChange     | a callback function, can be executed when the selected time is changing | function(date: moment, dateString: string) | -           |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| defaultValue | to set default date | [moment](http://momentjs.com/) | - |
+| format | to set the date format, refer to [moment.js](http://momentjs.com/) | string | "YYYY-MM" |
 | monthCellContentRender | Custom month cell content render method | function(date, locale): ReactNode | - |
+| value | to set date | [moment](http://momentjs.com/) | - |
+| onChange | a callback function, can be executed when the selected time is changing | function(date: moment, dateString: string) | - |
 
 ### RangePicker
 
-| Property         | Description           | Type     | Default       |
-|--------------|----------------|----------|--------------|
-| value        | to set date          | [[moment](http://momentjs.com/), [moment](http://momentjs.com/)]   | -           |
-| defaultValue | to set default date       | [[moment](http://momentjs.com/), [moment](http://momentjs.com/)]   | -           |
-| format       | to set the date format  | string    | "YYYY-MM-DD HH:mm:ss" |
-| onChange     | a callback function, can be executed when the selected time is changing | function(dates: [moment, moment], dateStrings: [string, string]) | -           |
-| showTime     | to provide an additional time selection  | object\|boolean | [TimePicker Options](/components/time-picker/#API) |
-| showTime.defaultValue | to set default time of selected date, [demo](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)[] | [moment(), moment()] |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| defaultValue | to set default date | \[[moment](http://momentjs.com/), [moment](http://momentjs.com/)] | - |
 | disabledTime | to specify the time that cannot be selected | function(dates: [moment, moment], partial: `'start'|'end'`) | - |
-| ranges       | preseted ranges for quick selection | { [range: string]: [moment](http://momentjs.com/)[] } | - |
+| format | to set the date format | string | "YYYY-MM-DD HH:mm:ss" |
+| ranges | preseted ranges for quick selection | { [range: string]: [moment](http://momentjs.com/)\[] } | - |
 | renderExtraFooter | render extra footer in panel | () => React.ReactNode | - |
+| showTime | to provide an additional time selection | object\|boolean | [TimePicker Options](/components/time-picker/#API) |
+| showTime.defaultValue | to set default time of selected date, [demo](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)\[] | [moment(), moment()] |
+| value | to set date | \[[moment](http://momentjs.com/), [moment](http://momentjs.com/)] | - |
+| onChange | a callback function, can be executed when the selected time is changing | function(dates: [moment, moment], dateStrings: [string, string]) | - |
 | onOk | callback when click ok button | function() | - |
 
 <style>

components/date-picker/index.zh-CN.md

@@ -15,9 +15,9 @@ subtitle: 日期选择框
 
 日期类组件包括以下三种形式。
 
-* DatePicker
-* MonthPicker
-* RangePicker
+- DatePicker
+- MonthPicker
+- RangePicker
 
 **注意：**DatePicker、MonthPicker、RangePicker 部分 locale 是从 value 中读取，所以请先正确设置 moment 的 locale。
 
@@ -35,59 +35,59 @@ moment.locale('zh-cn');
 
 以下 API 为 DatePicker、MonthPicker、RangePicker 共享的 API。
 
-| 参数          | 说明            | 类型     | 默认值        |
-|--------------|----------------|----------|--------------|
-| allowClear   | 是否显示清除按钮 | boolean     | true         |
-| disabled     | 禁用           | boolean     | false        |
-| className    | 选择器 className | string | '' |
-| style        | 自定义输入框样式     | object     | {}   |
-| popupStyle   | 格外的弹出日历样式   | object     | {}   |
-| size         | 输入框大小，`large` 高度为 32px，`small` 为 22px，默认是 28px | string   | 无  |
-| locale       | 国际化配置 | object   | [默认配置](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
-| disabledDate | 不可选择的日期 | (currentDate: moment) => boolean | 无           |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| allowClear | 是否显示清除按钮 | boolean | true |
+| className | 选择器 className | string | '' |
+| disabled | 禁用 | boolean | false |
+| disabledDate | 不可选择的日期 | (currentDate: moment) => boolean | 无 |
 | getCalendarContainer | 定义浮层的容器，默认为 body 上新建 div | function(trigger) | 无 |
+| locale | 国际化配置 | object | [默认配置](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json) |
 | open | 控制弹层是否展开 | boolean | - |
-| onOpenChange   | 弹出日历和关闭日历的回调 | function(status) | 无 |
-| placeholder  | 输入框提示文字 | string\|RangePicker[] | - |
+| placeholder | 输入框提示文字 | string\|RangePicker\[] | - |
+| popupStyle | 格外的弹出日历样式 | object | {} |
+| size | 输入框大小，`large` 高度为 32px，`small` 为 22px，默认是 28px | string | 无 |
+| style | 自定义输入框样式 | object | {} |
+| onOpenChange | 弹出日历和关闭日历的回调 | function(status) | 无 |
 
 ### DatePicker
 
-| 参数         | 说明           | 类型     | 默认值       |
-|--------------|----------------|----------|--------------|
-| value        | 日期           | [moment](http://momentjs.com/)   | 无           |
-| defaultValue | 默认日期       | [moment](http://momentjs.com/)   | 无           |
-| format       | 展示的日期格式，配置参考 [moment.js](http://momentjs.com/) | string   | "YYYY-MM-DD" |
-| onChange     | 时间发生变化的回调 | function(date: moment, dateString: string) | 无           |
-| showTime     | 增加时间选择功能  | Object\|boolean | [TimePicker Options](/components/time-picker/#API) |
-| showTime.defaultValue | 设置用户选择日期时默认的时分秒，[例子](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/) | moment() |
-| showToday    | 是否展示“今天”按钮 | boolean | true |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| defaultValue | 默认日期 | [moment](http://momentjs.com/) | 无 |
 | disabledTime | 不可选择的时间 | function(date) | 无 |
-| onOk | 点击确定按钮的回调 | function() | - |
+| format | 展示的日期格式，配置参考 [moment.js](http://momentjs.com/) | string | "YYYY-MM-DD" |
 | renderExtraFooter | 在面板中添加额外的页脚 | () => React.ReactNode | - |
+| showTime | 增加时间选择功能 | Object\|boolean | [TimePicker Options](/components/time-picker/#API) |
+| showTime.defaultValue | 设置用户选择日期时默认的时分秒，[例子](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/) | moment() |
+| showToday | 是否展示“今天”按钮 | boolean | true |
+| value | 日期 | [moment](http://momentjs.com/) | 无 |
+| onChange | 时间发生变化的回调 | function(date: moment, dateString: string) | 无 |
+| onOk | 点击确定按钮的回调 | function() | - |
 
 ### MonthPicker
 
-| 参数         | 说明           | 类型     | 默认值       |
-|--------------|----------------|----------|--------------|
-| value        | 日期           | [moment](http://momentjs.com/)   | 无           |
-| defaultValue | 默认日期       | [moment](http://momentjs.com/)   | 无           |
-| format       | 展示的日期格式，配置参考 [moment.js](http://momentjs.com/) | string   | "YYYY-MM" |
-| onChange     | 时间发生变化的回调，发生在用户选择时间时 | function(date: moment, dateString: string) | -           |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| defaultValue | 默认日期 | [moment](http://momentjs.com/) | 无 |
+| format | 展示的日期格式，配置参考 [moment.js](http://momentjs.com/) | string | "YYYY-MM" |
 | monthCellContentRender | 自定义的月份内容渲染方法 | function(date, locale): ReactNode | - |
+| value | 日期 | [moment](http://momentjs.com/) | 无 |
+| onChange | 时间发生变化的回调，发生在用户选择时间时 | function(date: moment, dateString: string) | - |
 
 ### RangePicker
 
-| 参数         | 说明           | 类型     | 默认值       |
-|--------------|----------------|----------|--------------|
-| value        | 日期          | [moment](http://momentjs.com/)[] | 无           |
-| defaultValue | 默认日期       | [moment](http://momentjs.com/)[]   | 无           |
-| format       | 展示的日期格式  | string    | "YYYY-MM-DD HH:mm:ss" |
-| onChange     | 时间发生变化的回调，发生在用户选择时间时 | function(dates: [moment, moment], dateStrings: [string, string]) | 无           |
-| showTime     | 增加时间选择功能  | Object\|boolean | [TimePicker Options](/components/time-picker/#API) |
-| showTime.defaultValue | 设置用户选择日期时默认的时分秒，[例子](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)[] | [moment(), moment()] |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| defaultValue | 默认日期 | [moment](http://momentjs.com/)\[] | 无 |
 | disabledTime | 不可选择的时间 | function(dates: [moment, moment], partial: `'start'|'end'`) | 无 |
-| ranges       | 预设时间范围快捷选择 | { [range: string]: [moment](http://momentjs.com/)[] } | 无 |
+| format | 展示的日期格式 | string | "YYYY-MM-DD HH:mm:ss" |
+| ranges       | 预设时间范围快捷选择 | { [range: string]: [moment](http://momentjs.com/)\[] } | 无 |
 | renderExtraFooter | 在面板中添加额外的页脚 | () => React.ReactNode | - |
+| showTime | 增加时间选择功能 | Object\|boolean | [TimePicker Options](/components/time-picker/#API) |
+| showTime.defaultValue | 设置用户选择日期时默认的时分秒，[例子](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)\[] | [moment(), moment()] |
+| value | 日期 | [moment](http://momentjs.com/)\[] | 无 |
+| onChange | 时间发生变化的回调，发生在用户选择时间时 | function(dates: [moment, moment], dateStrings: [string, string]) | 无 |
 | onOk | 点击确定按钮的回调 | function() | - |
 
 <style>

components/dropdown/__tests__/__snapshots__/demo.test.js.snap

@@ -174,15 +174,13 @@ exports[`renders ./components/dropdown/demo/sub-menu.md correctly 1`] = `
 `;
 
 exports[`renders ./components/dropdown/demo/trigger.md correctly 1`] = `
-<div>
-  <a
-    class="ant-dropdown-link ant-dropdown-trigger"
-    href="#"
-  >
-    Click me 
-    <i
-      class="anticon anticon-down"
-    />
-  </a>
-</div>
+<a
+  class="ant-dropdown-link ant-dropdown-trigger"
+  href="#"
+>
+  Click me 
+  <i
+    class="anticon anticon-down"
+  />
+</a>
 `;

components/dropdown/demo/basic.md

@@ -25,7 +25,7 @@ const menu = (
       <a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">2nd menu item</a>
     </Menu.Item>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">3d menu item</a>
+      <a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">3rd menu item</a>
     </Menu.Item>
   </Menu>
 );

components/dropdown/demo/dropdown-button.md

@@ -30,7 +30,7 @@ const menu = (
   <Menu onClick={handleMenuClick}>
     <Menu.Item key="1">1st menu item</Menu.Item>
     <Menu.Item key="2">2nd menu item</Menu.Item>
-    <Menu.Item key="3">3d menu item</Menu.Item>
+    <Menu.Item key="3">3rd item</Menu.Item>
   </Menu>
 );
 

components/dropdown/demo/event.md

@@ -23,7 +23,7 @@ const menu = (
   <Menu onClick={onClick}>
     <Menu.Item key="1">1st menu item</Menu.Item>
     <Menu.Item key="2">2nd memu item</Menu.Item>
-    <Menu.Item key="3">3d menu item</Menu.Item>
+    <Menu.Item key="3">3rd menu item</Menu.Item>
   </Menu>
 );
 

components/dropdown/demo/item.md

@@ -25,7 +25,7 @@ const menu = (
       <a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">2nd menu item</a>
     </Menu.Item>
     <Menu.Divider />
-    <Menu.Item key="3" disabled>3d menu item（disabled）</Menu.Item>
+    <Menu.Item key="3" disabled>3rd menu item（disabled）</Menu.Item>
   </Menu>
 );
 

components/dropdown/demo/placement.md

@@ -25,7 +25,7 @@ const menu = (
       <a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">2nd menu item</a>
     </Menu.Item>
     <Menu.Item>
-      <a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">3d menu item</a>
+      <a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">3rd menu item</a>
     </Menu.Item>
   </Menu>
 );

components/dropdown/demo/sub-menu.md

@@ -22,7 +22,7 @@ const menu = (
     <Menu.Item>1st menu item</Menu.Item>
     <Menu.Item>2nd menu item</Menu.Item>
     <SubMenu title="sub menu">
-      <Menu.Item>3d menu item</Menu.Item>
+      <Menu.Item>3rd menu item</Menu.Item>
       <Menu.Item>4th menu item</Menu.Item>
     </SubMenu>
     <SubMenu title="disabled sub menu" disabled>

components/dropdown/demo/trigger.md

@@ -25,15 +25,15 @@ const menu = (
       <a href="http://www.taobao.com/">2nd menu item</a>
     </Menu.Item>
     <Menu.Divider />
-    <Menu.Item key="3">3d menu item</Menu.Item>
+    <Menu.Item key="3">3rd menu item</Menu.Item>
   </Menu>
 );
 
-ReactDOM.render(<div>
+ReactDOM.render(
   <Dropdown overlay={menu} trigger={['click']}>
     <a className="ant-dropdown-link" href="#">
       Click me <Icon type="down" />
     </a>
   </Dropdown>
-</div>, mountNode);
+, mountNode);
 ````

components/dropdown/index.en-US.md

@@ -14,32 +14,32 @@ If there are too many operations to display, you can wrap them in a `Dropdown`.
 
 ### Dropdown
 
-| Property         | Description           | Type     | Default       |
-|--------------|----------------|----------|--------------|
-| trigger        | the trigger mode which executes the drop-down action  | Array<`click`\|`hover`>   | [`hover`]           |
-| overlay | the dropdown menu       | [Menu](/components/menu)   | -           |
-| getPopupContainer       | to set the container of the dropdown menu. The default is to create a `div` element in `body`, you can reset it to the scrolling area and make a relative reposition. [example](http://codepen.io/anon/pen/xVBOVQ?editors=001)   | Function(triggerNode)   | () => document.body |
-| visible | whether the dropdown menu is visible | boolean | -           |
-| disabled| whether the dropdown menu is disabled| boolean | -           |
-| onVisibleChange     | a callback function takes an argument: `visible`, is executed when the visible state is changed | Function(visible) | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| disabled | whether the dropdown menu is disabled | boolean | - |
+| getPopupContainer | to set the container of the dropdown menu. The default is to create a `div` element in `body`, you can reset it to the scrolling area and make a relative reposition. [example](https://codepen.io/afc163/pen/zEjNOy?editors=0010) | Function(triggerNode) | () => document.body |
+| overlay | the dropdown menu | [Menu](/components/menu) | - |
 | placement | placement of pop menu: `bottomLeft` `bottomCenter` `bottomRight` `topLeft` `topCenter` `topRight` | String | `bottomLeft` |
+| trigger | the trigger mode which executes the drop-down action | Array&lt;`click`\|`hover`> | [`hover`] |
+| visible | whether the dropdown menu is visible | boolean | - |
+| onVisibleChange | a callback function takes an argument: `visible`, is executed when the visible state is changed | Function(visible) | - |
 
-You can get the menu list by `antd.Menu`, and set a callback function `onSelect` for it if you need. The menu items and the dividers are also available, by using `Menu.Item` and `Menu.Divider` respectively.
+You should use [Menu](/components/menu/) as `overlay`. The menu items and dividers are also available by using `Menu.Item` and `Menu.Divider`.
 
 > Warning: You must set a unique `key` for `Menu.Item`.
-
+>
 > Menu of Dropdown is unselectable by default, you can make it selectable via `<Menu selectable>`.
 
 ### Dropdown.Button
 
-| Property         | Description           | Type     | Default       |
-|--------------|----------------|----------|--------------|
-| type        | type of the button, the same as [Button](/components/button)   | string   | `default`           |
-| size        | size of the button, the same as [Button](/components/button)   | string   | `default`           |
-| onClick | a callback function, the same as [Button](/components/button), which will be executed when you click the button on the left       | Function   | -           |
-| trigger       | the trigger mode which executes the drop-down action | Array<'click'\|`hover`>   | [`hover`] |
-| overlay | the dropdown menu | [Menu](/components/menu) | -           |
-| visible     | whether the dropdown menu is visible | boolean | -           |
-| disabled    | whether the dropdown menu is disabled| boolean | -           |
-| onVisibleChange     | a callback function takes an argument: `visible`, is executed when the visible state is changed | Function     | -        |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| disabled | whether the dropdown menu is disabled | boolean | - |
+| overlay | the dropdown menu | [Menu](/components/menu) | - |
 | placement | placement of pop menu: `bottomLeft` `bottomCenter` `bottomRight` `topLeft` `topCenter` `topRight` | String | `bottomLeft` |
+| size | size of the button, the same as [Button](/components/button) | string | `default` |
+| trigger | the trigger mode which executes the drop-down action | Array&lt;'click'\|`hover`> | [`hover`] |
+| type | type of the button, the same as [Button](/components/button) | string | `default` |
+| visible | whether the dropdown menu is visible | boolean | - |
+| onClick | a callback function, the same as [Button](/components/button), which will be executed when you click the button on the left | Function | - |
+| onVisibleChange | a callback function takes an argument: `visible`, is executed when the visible state is changed | Function | - |

components/dropdown/index.zh-CN.md

@@ -15,32 +15,32 @@ title: Dropdown
 
 属性如下
 
-| 参数        | 说明             | 类型               | 默认值       |
-|-------------|------------------|--------------------|--------------|
-| trigger     | 触发下拉的行为   | Array<'click'\|'hover'> | ['hover']        |
-| overlay     | 菜单         | [Menu](/components/menu) | -     |
-| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](http://codepen.io/anon/pen/xVBOVQ?editors=001) | Function(triggerNode) | () => document.body |
-| visible     | 菜单是否显示 | boolean   | -           |
-| disabled    | 菜单是否禁用 | boolean   | -           |
-| onVisibleChange  | 菜单显示状态改变时调用，参数为 visible | Function(visible) | - |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| disabled | 菜单是否禁用 | boolean | - |
+| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](https://codepen.io/afc163/pen/zEjNOy?editors=0010) | Function(triggerNode) | () => document.body |
+| overlay | 菜单 | [Menu](/components/menu) | - |
 | placement | 菜单弹出位置：`bottomLeft` `bottomCenter` `bottomRight` `topLeft` `topCenter` `topRight` | String | `bottomLeft` |
+| trigger | 触发下拉的行为 | Array&lt;'click'\|'hover'> | ['hover'] |
+| visible | 菜单是否显示 | boolean | - |
+| onVisibleChange | 菜单显示状态改变时调用，参数为 visible | Function(visible) | - |
 
-菜单可由 `antd.Menu` 取得，可设置 `onSelect` 回调，菜单还包括菜单项 `Menu.Item`，分割线 `Menu.Divider`。
+`overlay` 菜单使用 [Menu](/components/menu/)，还包括菜单项 `Menu.Item`，分割线 `Menu.Divider`。
 
 > 注意： Menu.Item 必须设置唯一的 key 属性。
-
+>
 > Dropdown 下的 Menu 默认不可选中。如果需要菜单可选中，可以指定 `<Menu selectable>`.
 
 ### Dropdown.Button
 
-| 参数        | 说明             | 类型               | 默认值       |
-|-------------|------------------|--------------------|--------------|
-| type        | 按钮类型，和 [Button](/components/button/) 一致 | string | 'default' |
-| size        | 按钮大小，和 [Button](/components/button/) 一致 | string | 'default' |
-| onClick     | 点击左侧按钮的回调，和 [Button](/components/button/) 一致 | Function   | - |
-| trigger     | 触发下拉的行为   | Array<'click'\|'hover'> | ['hover']        |
-| overlay     | 菜单         | [Menu](/components/menu/) | -     |
-| visible     | 菜单是否显示 | boolean   | -           |
-| disabled    | 菜单是否禁用 | boolean   | -           |
-| onVisibleChange  | 菜单显示状态改变时调用，参数为 visible | Function | - |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| disabled | 菜单是否禁用 | boolean | - |
+| overlay | 菜单 | [Menu](/components/menu/) | - |
 | placement | 菜单弹出位置：`bottomLeft` `bottomCenter` `bottomRight` `topLeft` `topCenter` `topRight` | String | `bottomLeft` |
+| size | 按钮大小，和 [Button](/components/button/) 一致 | string | 'default' |
+| trigger | 触发下拉的行为 | Array&lt;'click'\|'hover'> | ['hover'] |
+| type | 按钮类型，和 [Button](/components/button/) 一致 | string | 'default' |
+| visible | 菜单是否显示 | boolean | - |
+| onClick | 点击左侧按钮的回调，和 [Button](/components/button/) 一致 | Function | - |
+| onVisibleChange | 菜单显示状态改变时调用，参数为 visible | Function | - |

components/form/Form.tsx

@@ -54,7 +54,7 @@ export type ValidationRule = {
   validator?: (rule: any, value: any, callback: any, source?: any, options?: any) => any;
 };
 
-export type ValidateCallback = (erros: any, values: any) => void;
+export type ValidateCallback = (errors: any, values: any) => void;
 
 export type GetFieldDecoratorOptions = {
   /** 子节点的值的属性，如 Checkbox 的是 'checked' */

components/form/FormItem.tsx

@@ -89,7 +89,8 @@ export default class FormItem extends React.Component<FormItemProps, any> {
       }
 
       const child = childrenArray[i] as React.ReactElement<any>;
-      if (child.type as any === FormItem) {
+      if (child.type &&
+          (child.type as any === FormItem || (child.type as any).displayName === 'FormItem')) {
         continue;
       }
       if (!child.props) {

components/form/__tests__/__snapshots__/demo.test.js.snap

@@ -475,7 +475,7 @@ exports[`renders ./components/form/demo/coordinated.md correctly 1`] = `
             aria-expanded="false"
             aria-haspopup="true"
             class="ant-select-selection
-                      ant-select-selection--single"
+            ant-select-selection--single"
             role="combobox"
             tabindex="0"
           >
@@ -565,7 +565,7 @@ exports[`renders ./components/form/demo/customized-form-controls.md correctly 1`
               aria-expanded="false"
               aria-haspopup="true"
               class="ant-select-selection
-                        ant-select-selection--single"
+            ant-select-selection--single"
               role="combobox"
               tabindex="0"
             >
@@ -837,10 +837,10 @@ exports[`renders ./components/form/demo/global-state.md correctly 1`] = `
     class="language-bash"
   >
     {
-      "username": {
-        "value": "benjycui"
-      }
-    }
+  "username": {
+    "value": "benjycui"
+  }
+}
   </pre>
 </div>
 `;
@@ -1439,7 +1439,7 @@ exports[`renders ./components/form/demo/register.md correctly 1`] = `
                   aria-expanded="false"
                   aria-haspopup="true"
                   class="ant-select-selection
-                            ant-select-selection--single"
+            ant-select-selection--single"
                   role="combobox"
                   tabindex="0"
                 >
@@ -1504,7 +1504,7 @@ exports[`renders ./components/form/demo/register.md correctly 1`] = `
             aria-expanded="false"
             aria-haspopup="true"
             class="ant-select-selection
-                      ant-select-selection--single"
+            ant-select-selection--single"
             role="combobox"
           >
             <div
@@ -2009,7 +2009,7 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
             aria-expanded="false"
             aria-haspopup="true"
             class="ant-select-selection
-                      ant-select-selection--single"
+            ant-select-selection--single"
             role="combobox"
             tabindex="0"
           >
@@ -2064,7 +2064,7 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
             aria-expanded="false"
             aria-haspopup="true"
             class="ant-select-selection
-                      ant-select-selection--multiple"
+            ant-select-selection--multiple"
             role="combobox"
           >
             <div
@@ -2876,7 +2876,7 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
             aria-expanded="false"
             aria-haspopup="true"
             class="ant-select-selection
-                      ant-select-selection--single"
+            ant-select-selection--single"
             role="combobox"
             tabindex="0"
           >

components/form/index.en-US.md

@@ -34,15 +34,15 @@ A form field is defined using `<Form.Item />`.
 
 **more example [rc-form](http://react-component.github.io/form/)**。
 
-| Property  | Description                              | Type       | Default Value |
-|-----------|------------------------------------------|------------|---------|
-| form | Decorated by `Form.create()` will be automatically set `this.props.form` property, so just pass to form, you don't need to set it by yourself after 1.7.0. | object | n/a
-| layout | Define form layout(Support after 2.8) | 'horizontal'\|'vertical'\|'inline' | 'horizontal' |
-| horizontal | Use horizontal layout(Deprecated after 2.8) | boolean | true |
-| vertical | Use vertical layout(Deprecated after 2.8) | boolean | false |
-| inline | Use inline alignment(Deprecated after 2.8) | boolean | false |
-| onSubmit | Defines a function will be called if form data validation is successful. | Function(e:Event) |  |
+| Property | Description | Type | Default Value |
+| -------- | ----------- | ---- | ------------- |
+| form | Decorated by `Form.create()` will be automatically set `this.props.form` property, so just pass to form, you don't need to set it by yourself after 1.7.0. | object | n/a |
 | hideRequiredMark | Hide required mark of all form items | Boolean | false |
+| horizontal | Use horizontal layout(Deprecated after 2.8) | boolean | true |
+| inline | Use inline alignment(Deprecated after 2.8) | boolean | false |
+| layout | Define form layout(Support after 2.8) | 'horizontal'\|'vertical'\|'inline' | 'horizontal' |
+| vertical | Use vertical layout(Deprecated after 2.8) | boolean | false |
+| onSubmit | Defines a function will be called if form data validation is successful. | Function(e:Event) |  |
 
 ### Form.create(options)
 
@@ -56,106 +56,106 @@ CustomizedForm = Form.create({})(CustomizedForm);
 
 The following `options` are available:
 
-| Property      | Description                          | Type       |
-|-----------|------------------------------------------|------------|
-| onFieldsChange | Specify a function that will be called when the value a `Form.Item` gets changed. Usage example: saving the field's value to Redux store. | Function(props, fields) |
+| Property | Description | Type |
+| -------- | ----------- | ---- |
 | mapPropsToFields | Convert props to field value. Usage example: reading the values from Redux store. | Function(props): Object{ fieldName: Object{ value } } |
+| onFieldsChange | Specify a function that will be called when the value a `Form.Item` gets changed. Usage example: saving the field's value to Redux store. | Function(props, fields) |
 | onValuesChange | A handler while value of any field is changed | (props, values) => void |
 
 If the form has been decorated by `Form.create` then it has `this.props.form` property. `this.props.form` provides some APIs as follows:
 
 > Note: Before using `getFieldsValue` `getFieldValue` `setFieldsValue` and so on, please make sure that corresponding field had been registered with `getFieldDecorator`.
 
-| Method    | Description                              | Type       |
-|-----------|------------------------------------------|------------|
-| getFieldsValue | Get the specified fields' values. If you don't specify a parameter, you will get all fields' values. | Function([fieldNames: string[]]) |
-| getFieldValue | Get the value of a field. | Function(fieldName: string) |
-| setFieldsValue | Set the value of a field.(Note: please don't use it in `componentWillReceiveProps`, otherwise, it will cause an endless loop, [more](https://github.com/ant-design/ant-design/issues/2985)) | Function({ [fieldName]: value } |
-| setFields |  | Function(obj: object) |
-| setFields | Set the value and error of a field. [Code Sample](https://github.com/react-component/form/blob/3b9959b57ab30b41d8890ff30c79a7e7c383cad3/examples/server-validate.js#L74-L79) | Function({ [fieldName]: { value: any, errors: [Error] } }) |
-| validateFields | Validate the specified fields and get theirs values and errors. If you don't specify the parameter of fieldNames, you will vaildate all fields.  | Function([fieldNames: string[]], [options: object], callback: Function(errors, values)) |
-| validateFieldsAndScroll | This function is similar to `validateFields`, but after validation, if the target field is not in visible area of form, form will be automatically scrolled to the target field area. | same as `validateFields` |
+| Method | Description | Type |
+| ------ | ----------- | ---- |
+| getFieldDecorator | Two-way binding for form, please read below for details. |  |
 | getFieldError | Get the error of a field. | Function(name) |
-| getFieldsError | Get the specified fields' error. If you don't specify a parameter, you will get all fields' error. | Function([names: string[]]) |
-| isFieldValidating | Check if the specified field is being validated. | Function(name) |
+| getFieldsError | Get the specified fields' error. If you don't specify a parameter, you will get all fields' error. | Function(\[names: string\[]]) |
+| getFieldsValue | Get the specified fields' values. If you don't specify a parameter, you will get all fields' values. | Function(\[fieldNames: string\[]]) |
+| getFieldValue | Get the value of a field. | Function(fieldName: string) |
+| isFieldsTouched | Check whether any of fields is touched by `getFieldDecorator`'s `options.trigger` event | (names?: string\[]) => boolean |
 | isFieldTouched | Check whether a field is touched by `getFieldDecorator`'s `options.trigger` event | (name: string) => boolean |
-| isFieldsTouched | Check whether any of fields is touched by `getFieldDecorator`'s `options.trigger` event | (names?: string[]) => boolean |
-| resetFields | Reset the specified fields' value(to `initialValue`) and status. If you don't specify a parameter, all the fields will be reset. | Function([names: string[]]) |
-| getFieldDecorator | Two-way binding for form, please read below for details. | |
+| isFieldValidating | Check if the specified field is being validated. | Function(name) |
+| resetFields | Reset the specified fields' value(to `initialValue`) and status. If you don't specify a parameter, all the fields will be reset. | Function(\[names: string\[]]) |
+| setFields | Set the value and error of a field. [Code Sample](https://github.com/react-component/form/blob/3b9959b57ab30b41d8890ff30c79a7e7c383cad3/examples/server-validate.js#L74-L79) | Function({ [fieldName]&#x3A; { value: any, errors: [Error] } }) |
+| setFields |  | Function(obj: object) |
+| setFieldsValue | Set the value of a field.(Note: please don't use it in `componentWillReceiveProps`, otherwise, it will cause an endless loop, [more](https://github.com/ant-design/ant-design/issues/2985)) | Function({ [fieldName]&#x3A; value } |
+| validateFields | Validate the specified fields and get theirs values and errors. If you don't specify the parameter of fieldNames, you will vaildate all fields. | Function(\[fieldNames: string\[]], [options: object], callback: Function(errors, values)) |
+| validateFieldsAndScroll | This function is similar to `validateFields`, but after validation, if the target field is not in visible area of form, form will be automatically scrolled to the target field area. | same as `validateFields` |
 
-### this.props.form.validateFields/validateFieldsAndScroll([fieldNames: string[]], [options: object], callback: Function(errors, values))
+### this.props.form.validateFields/validateFieldsAndScroll(\[fieldNames: string\[]], [options: object], callback: Function(errors, values))
 
 | Method | Description | Type | Default |
-|-----|-----|------|-------|
+| ------ | ----------- | ---- | ------- |
 | options.first | If `true`, every field will stop validation at first failed rule | boolean | false |
-| options.firstFields | Those fields will stop validation at first failed rule | String[] | [] |
+| options.firstFields | Those fields will stop validation at first failed rule | String\[] | \[] |
 | options.force | Should validate validated field again when `validateTrigger` is been triggered again | boolean | false |
 | options.scroll | Config scroll behavior of `validateFieldsAndScroll`, more: [dom-scroll-into-view's config](https://github.com/yiminghe/dom-scroll-into-view#function-parameter) | Object | {} |
 
-
 ### this.props.form.getFieldDecorator(id, options)
 
 After wrapped by `getFieldDecorator`, `value`(or other property defined by `valuePropName`) `onChange`(or other property defined by `trigger`) props will be added to form controls，the flow of form data will be handled by Form which will cause:
 
-1. You shouldn't to use `onChange` to collect data, but you still can listen to `onChange`(and so on) events.
+1. You shouldn't use `onChange` to collect data, but you still can listen to `onChange`(and so on) events.
 2. You can not set value of form control via `value` `defaultValue` prop, and you should set default value with `initialValue` in `getFieldDecorator` instead.
-3. You shouldn't to call `setState` manually, please use `this.props.form.setFieldsValue` to change value programmatically.
+3. You shouldn't call `setState` manually, please use `this.props.form.setFieldsValue` to change value programmatically.
 
 #### Special attention
 
 1. `getFieldDecorator` can not be used to decorate stateless component.
-1. If you use `react@<15.3.0`, then, you can't use `getFieldDecorator` in stateless component: https://github.com/facebook/react/pull/6534
+2. If you use `react@<15.3.0`, then, you can't use `getFieldDecorator` in stateless component: <https://github.com/facebook/react/pull/6534>
 
 #### getFieldDecorator(id, options) parameters
 
-| Property  | Description                             | Type | Default Value |
-|-----------|-----------------------------------------|------|---------------|
-| id | The unique identifier is required. support [nested fields format](https://github.com/react-component/form/pull/48). | string | |
-| options.valuePropName | Props of children node, for example, the prop of Switch is 'checked'. | string | 'value' |
-| options.initialValue | You can specify initial value, type, optional value of children node. (Note: Because `Form` will test equality with `===` internaly, we recommend to use vairable as `initialValue`, instead of literal) | | n/a |
-| options.trigger | When to collect the value of children node | string | 'onChange' |
-| options.getValueFromEvent | Specify how to get value from event or other onChange arguments | function(..args) | [reference](https://github.com/react-component/form#option-object) |
-| options.validateTrigger | When to validate the value of children node. | string\|string[] | 'onChange' |
-| options.rules | Includes validation rules. Please refer to "Validation Rules" part for details. | object[] | n/a |
-| options.validateFirst | Whether stop validate on first rule of error for this field. | boolean | false |
+| Property | Description | Type | Default Value |
+| -------- | ----------- | ---- | ------------- |
+| id | The unique identifier is required. support [nested fields format](https://github.com/react-component/form/pull/48). | string |  |
 | options.exclusive | Whether it is exclusive with other controls, particularly for Radio. | boolean | false |
+| options.getValueFromEvent | Specify how to get value from event or other onChange arguments | function(..args) | [reference](https://github.com/react-component/form#option-object) |
+| options.initialValue | You can specify initial value, type, optional value of children node. (Note: Because `Form` will test equality with `===` internaly, we recommend to use vairable as `initialValue`, instead of literal) |  | n/a |
 | options.normalize | Normalize value to form component, [a select-all example](https://codepen.io/afc163/pen/JJVXzG?editors=001) | function(value, prevValue, allValues): any | - |
+| options.rules | Includes validation rules. Please refer to "Validation Rules" part for details. | object\[] | n/a |
+| options.trigger | When to collect the value of children node | string | 'onChange' |
+| options.validateFirst | Whether stop validate on first rule of error for this field. | boolean | false |
+| options.validateTrigger | When to validate the value of children node. | string\|string\[] | 'onChange' |
+| options.valuePropName | Props of children node, for example, the prop of Switch is 'checked'. | string | 'value' |
 
 More option at [rc-form option](https://github.com/react-component/form#option-object)。
 
 ### Form.Item
 
 Note:
-* If Form.Item has multiple children that had been decorated by `getFieldDecorator`, `help` and `required` and `validateStatus` can't be generated automatically.
-* Before `2.2.0`, form controls must be child of Form.Item, otherwise, you need to set `help`, `required` and `validateStatus` by yourself.
 
-| Property      | Description                          | Type   | Default Value |
-|---------------|--------------------------------------|--------|---------------|
-| label | Label text | string\|ReactNode |   |
-| labelCol | The layout of label. You can set `span` `offset` to something like `{span: 3, offset: 12}` or `sm: {span: 3, offset: 12}` same as with `<Col>` | [object](https://ant.design/components/grid/#Col) |  |
-| wrapperCol | The layout for input controls, same as `labelCol` | [object](https://ant.design/components/grid/#Col) |  |
-| help | The prompt message. If not provided, the prompt message will be generated by the validation rule. | string\|ReactNode |  |
+- If Form.Item has multiple children that had been decorated by `getFieldDecorator`, `help` and `required` and `validateStatus` can't be generated automatically.
+- Before `2.2.0`, form controls must be child of Form.Item, otherwise, you need to set `help`, `required` and `validateStatus` by yourself.
+
+| Property | Description | Type | Default Value |
+| -------- | ----------- | ---- | ------------- |
+| colon | Used with `label`, whether to display `:` after label text. | boolean | true |
 | extra | The extra prompt message. It is similar to help. Usage example: to display error message and prompt message at the same time. | string\|ReactNode |  |
+| hasFeedback | Used with `validateStatus`, this option specifies the validation status icon. Recommended to be used only with `Input`. | boolean | false |
+| help | The prompt message. If not provided, the prompt message will be generated by the validation rule. | string\|ReactNode |  |
+| label | Label text | string\|ReactNode |  |
+| labelCol | The layout of label. You can set `span` `offset` to something like `{span: 3, offset: 12}` or `sm: {span: 3, offset: 12}` same as with `<Col>` | [object](https://ant.design/components/grid/#Col) |  |
 | required | Whether provided or not, it will be generated by the validation rule. | boolean | false |
 | validateStatus | The validation status. If not provided, it will be generated by validation rule. options: 'success' 'warning' 'error' 'validating' | string |  |
-| hasFeedback | Used with `validateStatus`, this option specifies the validation status icon. Recommended to be used only with `Input`. | boolean | false |
-| colon | Used with `label`, whether to display `:` after label text. | boolean | true |
+| wrapperCol | The layout for input controls, same as `labelCol` | [object](https://ant.design/components/grid/#Col) |  |
 
 ### Validation Rules
 
-Property | Description | Type | Default Value
----------|-------------|------|--------------
-message | validation error message | string | -
-type | built-in validation type, [available options](https://github.com/yiminghe/async-validator#type) | string | 'string'
-required | indicates whether field is required | boolean | `false`
-whitespace | treat required fields that only contain whitespace as errors | boolean | `false`
-len | validate an exact length of a field | number | -
-min | validate a min length of a field | number | -
-max | validate a max length of a field | number | -
-enum | validate a value from a list of possible values | string | -
-pattern | validate from a regular expression | RegExp | -
-transform | transform a value before validation | function(value) => transformedValue:any | -
-validator | custom validate function (Note: [callback must be called](https://github.com/ant-design/ant-design/issues/5155)) | function(rule, value, callback) | -
+| Property | Description | Type | Default Value |
+| -------- | ----------- | ---- | ------------- |
+| enum | validate a value from a list of possible values | string | - |
+| len | validate an exact length of a field | number | - |
+| max | validate a max length of a field | number | - |
+| message | validation error message | string | - |
+| min | validate a min length of a field | number | - |
+| pattern | validate from a regular expression | RegExp | - |
+| required | indicates whether field is required | boolean | `false` |
+| transform | transform a value before validation | function(value) => transformedValue:any | - |
+| type | built-in validation type, [available options](https://github.com/yiminghe/async-validator#type) | string | 'string' |
+| validator | custom validate function (Note: [callback must be called](https://github.com/ant-design/ant-design/issues/5155)) | function(rule, value, callback) | - |
+| whitespace | treat required fields that only contain whitespace as errors | boolean | `false` |
 
 See more advanced usage at [async-validator](https://github.com/yiminghe/async-validator).
 
@@ -165,7 +165,6 @@ See more advanced usage at [async-validator](https://github.com/yiminghe/async-v
 }
 </style>
 
-
 ## Using in TypeScript
 
 ```jsx
@@ -180,4 +179,4 @@ interface UserFormProps extends FormComponentProps {
 class UserForm extends React.Component<UserFormProps, any> {
 
 }
-
+```

components/form/index.zh-CN.md

@@ -36,15 +36,15 @@ title: Form
 
 **更多示例参考 [rc-form](http://react-component.github.io/form/)**。
 
-| 参数      | 说明                                     | 类型       | 默认值 |
-|-----------|------------------------------------------|------------|-------|
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
 | form | 经 `Form.create()` 包装过的组件会自带 `this.props.form` 属性，直接传给 Form 即可。1.7.0 之后无需设置 | object | 无 |
-| layout | 表单布局(2.8 之后支持) | 'horizontal'\|'vertical'\|'inline' | 'horizontal' |
-| horizontal | 水平排列布局(2.8 之后废弃) | boolean | true |
-| vertical | 垂直排列布局(2.8 之后废弃) | boolean | false |
-| inline | 行内排列布局(2.8 之后废弃) | boolean | false |
-| onSubmit | 数据验证成功后回调事件 | Function(e:Event) |  |
 | hideRequiredMark | 隐藏所有表单项的必选标记 | Boolean | false |
+| horizontal | 水平排列布局(2.8 之后废弃) | boolean | true |
+| inline | 行内排列布局(2.8 之后废弃) | boolean | false |
+| layout | 表单布局(2.8 之后支持) | 'horizontal'\|'vertical'\|'inline' | 'horizontal' |
+| vertical | 垂直排列布局(2.8 之后废弃) | boolean | false |
+| onSubmit | 数据验证成功后回调事件 | Function(e:Event) |  |
 
 ### Form.create(options)
 
@@ -58,10 +58,10 @@ CustomizedForm = Form.create({})(CustomizedForm);
 
 `options` 的配置项如下。
 
-| 参数      | 说明                                     | 类型       |
-|-----------|------------------------------------------|------------|
-| onFieldsChange | 当 `Form.Item` 子节点的值发生改变时触发，可以把对应的值转存到 Redux store | Function(props, fields) |
+| 参数 | 说明 | 类型 |
+| --- | --- | --- |
 | mapPropsToFields | 把父组件的属性映射到表单项上（可用于把 Redux store 中的值读出） | Function(props): Object{ fieldName: Object{ value } } |
+| onFieldsChange | 当 `Form.Item` 子节点的值发生改变时触发，可以把对应的值转存到 Redux store | Function(props, fields) |
 | onValuesChange | 任一表单域的值发生改变时的回调 | (props, values) => void |
 
 经过 `Form.create` 包装的组件将会自带 `this.props.form` 属性，`this.props.form` 提供的 API 如下：
@@ -69,27 +69,27 @@ CustomizedForm = Form.create({})(CustomizedForm);
 > 注意：使用 `getFieldsValue` `getFieldValue` `setFieldsValue` 等时，应确保对应的 field 已经用 `getFieldDecorator` 注册过了。
 
 | 方法      | 说明                                     | 类型       |
-|-----------|------------------------------------------|------------|
-| getFieldsValue | 获取一组输入控件的值，如不传入参数，则获取全部组件的值 | Function([fieldNames: string[]]) |
-| getFieldValue | 获取一个输入控件的值 | Function(fieldName: string) |
-| setFieldsValue | 设置一组输入控件的值（注意：不要在 `componentWillReceiveProps` 内使用，否则会导致死循环，[更多](https://github.com/ant-design/ant-design/issues/2985)） | Function({ [fieldName]: value } |
-| setFields | 设置一组输入控件的值与 Error。 [代码](https://github.com/react-component/form/blob/3b9959b57ab30b41d8890ff30c79a7e7c383cad3/examples/server-validate.js#L74-L79) | Function({ [fieldName]: { value: any, errors: [Error] } }) |
-| validateFields | 校验并获取一组输入域的值与 Error，若 fieldNames 参数为空，则校验全部组件 | Function([fieldNames: string[]], [options: object], callback: Function(errors, values)) |
-| validateFieldsAndScroll | 与 `validateFields` 相似，但校验完后，如果校验不通过的菜单域不在可见范围内，则自动滚动进可见范围 | 参考 `validateFields` |
+| ------- | -------------------------------------- | -------- |
+| getFieldDecorator | 用于和表单进行双向绑定，详见下方描述 |  |
 | getFieldError | 获取某个输入控件的 Error | Function(name) |
-| getFieldsError | 获取一组输入控件的 Error ，如不传入参数，则获取全部组件的 Error | Function([names: string[]]) |
-| isFieldValidating | 判断一个输入控件是否在校验状态 | Function(name) |
+| getFieldsError | 获取一组输入控件的 Error ，如不传入参数，则获取全部组件的 Error | Function(\[names: string\[]]) |
+| getFieldsValue | 获取一组输入控件的值，如不传入参数，则获取全部组件的值 | Function(\[fieldNames: string\[]]) |
+| getFieldValue | 获取一个输入控件的值 | Function(fieldName: string) |
+| isFieldsTouched | 判断是否任一输入控件经历过 `getFieldDecorator` 的值收集时机 `options.trigger` | (names?: string\[]) => boolean |
 | isFieldTouched | 判断一个输入控件是否经历过 `getFieldDecorator` 的值收集时机 `options.trigger` | (name: string) => boolean |
-| isFieldsTouched | 判断是否任一输入控件经历过 `getFieldDecorator` 的值收集时机 `options.trigger` | (names?: string[]) => boolean |
-| resetFields | 重置一组输入控件的值（为 `initialValue`）与状态，如不传入参数，则重置所有组件 | Function([names: string[]]) |
-| getFieldDecorator | 用于和表单进行双向绑定，详见下方描述 | |
+| isFieldValidating | 判断一个输入控件是否在校验状态 | Function(name) |
+| resetFields | 重置一组输入控件的值（为 `initialValue`）与状态，如不传入参数，则重置所有组件 | Function(\[names: string\[]]) |
+| setFields | 设置一组输入控件的值与 Error。 [代码](https://github.com/react-component/form/blob/3b9959b57ab30b41d8890ff30c79a7e7c383cad3/examples/server-validate.js#L74-L79) | Function({ [fieldName]: { value: any, errors: [Error] } }) |
+| setFieldsValue | 设置一组输入控件的值（注意：不要在 `componentWillReceiveProps` 内使用，否则会导致死循环，[更多](https://github.com/ant-design/ant-design/issues/2985)） | Function({ [fieldName]: value } |
+| validateFields | 校验并获取一组输入域的值与 Error，若 fieldNames 参数为空，则校验全部组件 | Function(\[fieldNames: string\[]], [options: object], callback: Function(errors, values)) |
+| validateFieldsAndScroll | 与 `validateFields` 相似，但校验完后，如果校验不通过的菜单域不在可见范围内，则自动滚动进可见范围 | 参考 `validateFields` |
 
-### this.props.form.validateFields/validateFieldsAndScroll([fieldNames: string[]], [options: object], callback: Function(errors, values))
+### this.props.form.validateFields/validateFieldsAndScroll(\[fieldNames: string\[]], [options: object], callback: Function(errors, values))
 
 | 参数 | 说明 | 类型 | 默认值 |
-|-----|-----|------|-------|
+| --- | --- | --- | --- |
 | options.first | 若为 true，则每一表单域的都会在碰到第一个失败了的校验规则后停止校验 | boolean | false |
-| options.firstFields | 指定表单域会在碰到第一个失败了的校验规则后停止校验 | String[] | [] |
+| options.firstFields | 指定表单域会在碰到第一个失败了的校验规则后停止校验 | String\[] | \[] |
 | options.force | 对已经校验过的表单域，在 validateTrigger 再次被触发时是否再次校验 | boolean | false |
 | options.scroll | 定义 validateFieldsAndScroll 的滚动行为，详细配置见 [dom-scroll-into-view config](https://github.com/yiminghe/dom-scroll-into-view#function-parameter) | Object | {} |
 
@@ -104,58 +104,59 @@ CustomizedForm = Form.create({})(CustomizedForm);
 #### 特别注意
 
 1. `getFieldDecorator` 不能用于装饰纯函数组件。
-1. 如果使用的是 `react@<15.3.0`，则 `getFieldDecorator` 调用不能位于纯函数组件中: https://github.com/facebook/react/pull/6534
+2. 如果使用的是 `react@<15.3.0`，则 `getFieldDecorator` 调用不能位于纯函数组件中: <https://github.com/facebook/react/pull/6534>
 
 #### getFieldDecorator(id, options) 参数
 
-| 参数      | 说明                                     | 类型 | 默认值 |
-|-----------|-----------------------------------------|-----|--------|
-| id | 必填输入控件唯一标志。支持嵌套式的[写法](https://github.com/react-component/form/pull/48)。 | string | |
-| options.valuePropName | 子节点的值的属性，如 Switch 的是 'checked' | string | 'value' |
-| options.initialValue | 子节点的初始值，类型、可选值均由子节点决定(注意：由于内部校验时使用 `===` 判断是否变化，建议使用变量缓存所需设置的值而非直接使用字面量)) | | |
-| options.trigger | 收集子节点的值的时机 | string | 'onChange' |
-| options.getValueFromEvent | 可以把 onChange 的参数（如 event）转化为控件的值 | function(..args) | [reference](https://github.com/react-component/form#option-object) |
-| options.validateTrigger | 校验子节点值的时机 | string\|string[] | 'onChange' |
-| options.rules | 校验规则，参考下方文档 | object[] | |
-| options.validateFirst | 当某一规则校验不通过时，是否停止剩下的规则的校验 | boolean | false |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| id | 必填输入控件唯一标志。支持嵌套式的[写法](https://github.com/react-component/form/pull/48)。 | string |  |
 | options.exclusive | 是否和其他控件互斥，特别用于 Radio 单选控件 | boolean | false |
+| options.getValueFromEvent | 可以把 onChange 的参数（如 event）转化为控件的值 | function(..args) | [reference](https://github.com/react-component/form#option-object) |
+| options.initialValue | 子节点的初始值，类型、可选值均由子节点决定(注意：由于内部校验时使用 `===` 判断是否变化，建议使用变量缓存所需设置的值而非直接使用字面量)) |  |  |
 | options.normalize | 转换默认的 value 给控件，[一个选择全部的例子](https://codepen.io/afc163/pen/JJVXzG?editors=001) | function(value, prevValue, allValues): any | - |
+| options.rules | 校验规则，参考下方文档 | object\[] |  |
+| options.trigger | 收集子节点的值的时机 | string | 'onChange' |
+| options.validateFirst | 当某一规则校验不通过时，是否停止剩下的规则的校验 | boolean | false |
+| options.validateTrigger | 校验子节点值的时机 | string\|string\[] | 'onChange' |
+| options.valuePropName | 子节点的值的属性，如 Switch 的是 'checked' | string | 'value' |
 
 更多参数请查看 [rc-form option](https://github.com/react-component/form#option-object)。
 
 ### Form.Item
 
 注意：
-* 一个 Form.Item 建议只放一个被 getFieldDecorator 装饰过的 child，当有多个被装饰过的 child 时，`help` `required` `validateStatus` 无法自动生成。
-* `2.2.0` 之前，只有当表单域为 Form.Item 的子元素时，才会自动生成 `help` `required` `validateStatus`，嵌套情况需要自行设置。
 
-| 参数      | 说明                                     | 类型       | 默认值 |
-|-----------|-----------------------------------------|-----------|--------|
+- 一个 Form.Item 建议只放一个被 getFieldDecorator 装饰过的 child，当有多个被装饰过的 child 时，`help` `required` `validateStatus` 无法自动生成。
+- `2.2.0` 之前，只有当表单域为 Form.Item 的子元素时，才会自动生成 `help` `required` `validateStatus`，嵌套情况需要自行设置。
+
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| colon | 配合 label 属性使用，表示是否显示 label 后面的冒号 | boolean | true |
+| extra | 额外的提示信息，和 help 类似，当需要错误信息和提示文案同时出现时，可以使用这个。 | string\|ReactNode |  |
+| hasFeedback | 配合 validateStatus 属性使用，展示校验状态图标，建议只配合 Input 组件使用 | boolean | false |
+| help | 提示信息，如不设置，则会根据校验规则自动生成 | string\|ReactNode |  |
 | label | label 标签的文本 | string\|ReactNode |  |
-| labelCol | label 标签布局，同 `<Col>` 组件，设置 `span` `offset` 值，如 `{span: 3, offset: 12}` 或 `sm: {span: 3, offset: 12}` | [object](https://ant.design/components/grid/#Col) | |
-| wrapperCol | 需要为输入控件设置布局样式时，使用该属性，用法同 labelCol | [object](https://ant.design/components/grid/#Col) | |
-| help | 提示信息，如不设置，则会根据校验规则自动生成 | string\|ReactNode | |
-| extra | 额外的提示信息，和 help 类似，当需要错误信息和提示文案同时出现时，可以使用这个。 | string\|ReactNode | |
+| labelCol | label 标签布局，同 `<Col>` 组件，设置 `span` `offset` 值，如 `{span: 3, offset: 12}` 或 `sm: {span: 3, offset: 12}` | [object](https://ant.design/components/grid/#Col) |  |
 | required | 是否必填，如不设置，则会根据校验规则自动生成 | boolean | false |
 | validateStatus | 校验状态，如不设置，则会根据校验规则自动生成，可选：'success' 'warning' 'error' 'validating' | string |  |
-| hasFeedback | 配合 validateStatus 属性使用，展示校验状态图标，建议只配合 Input 组件使用 | boolean | false  |
-| colon | 配合 label 属性使用，表示是否显示 label 后面的冒号 | boolean | true |
+| wrapperCol | 需要为输入控件设置布局样式时，使用该属性，用法同 labelCol | [object](https://ant.design/components/grid/#Col) |  |
 
 ### 校验规则
 
-参数  | 说明  | 类型 | 默认值
------|------|------|------
-message | 校验文案 | string | -
-type | 内建校验类型，[可选项](https://github.com/yiminghe/async-validator#type) | string | 'string'
-required | 是否必选 | boolean | `false`
-whitespace | 必选时，空格是否会被视为错误 | boolean | `false`
-len | 字段长度 | number | -
-min | 最小长度 | number | -
-max | 最大长度 | number | -
-enum | 枚举类型 | string | -
-pattern | 正则表达式校验 | RegExp | -
-transform | 校验前转换字段值 | function(value) => transformedValue:any | -
-validator | 自定义校验（注意，[callback 必须被调用](https://github.com/ant-design/ant-design/issues/5155)） | function(rule, value, callback) | -
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| enum | 枚举类型 | string | - |
+| len | 字段长度 | number | - |
+| max | 最大长度 | number | - |
+| message | 校验文案 | string | - |
+| min | 最小长度 | number | - |
+| pattern | 正则表达式校验 | RegExp | - |
+| required | 是否必选 | boolean | `false` |
+| transform | 校验前转换字段值 | function(value) => transformedValue:any | - |
+| type | 内建校验类型，[可选项](https://github.com/yiminghe/async-validator#type) | string | 'string' |
+| validator | 自定义校验（注意，[callback 必须被调用](https://github.com/ant-design/ant-design/issues/5155)） | function(rule, value, callback) | - |
+| whitespace | 必选时，空格是否会被视为错误 | boolean | `false` |
 
 更多高级用法可研究 [async-validator](https://github.com/yiminghe/async-validator)。
 
@@ -165,7 +166,6 @@ validator | 自定义校验（注意，[callback 必须被调用](https://github
 }
 </style>
 
-
 ## 在 TypeScript 中使用
 
 ```jsx
@@ -180,3 +180,4 @@ interface UserFormProps extends FormComponentProps {
 class UserForm extends React.Component<UserFormProps, any> {
 
 }
+```

components/form/style/index.less

@@ -71,7 +71,7 @@ input[type="checkbox"] {
   vertical-align: top;
 
   // nested FormItem
-  & > &,
+  & > &:last-child,
   & :not(.@{form-prefix-cls}) > & {
     margin-bottom: -@form-item-margin-bottom;
   }
@@ -170,6 +170,13 @@ form {
       }
     }
 
+    // Fix issue: https://github.com/ant-design/ant-design/issues/7854
+    .@{ant-prefix}-input-search {
+      .@{ant-prefix}-input-suffix {
+        right: 28px;
+      }
+    }
+
     // Fix issue: https://github.com/ant-design/ant-design/issues/4783
     .@{ant-prefix}-calendar-picker,
     .@{ant-prefix}-time-picker {
@@ -278,7 +285,8 @@ form {
 // Form layout
 //== Vertical Form
 .make-vertical-layout() {
-  padding: 0 0 8px;
+  padding: @form-vertical-label-padding;
+  margin: @form-vertical-label-margin;
   display: block;
   text-align: left;
   line-height: @line-height-base;
@@ -435,6 +443,10 @@ form {
       border-color: @warning-color;
     }
   }
+
+  .@{ant-prefix}-cascader-picker:focus .@{ant-prefix}-cascader-input {
+    .active(@warning-color);
+  }
 }
 
 .has-error {
@@ -496,6 +508,10 @@ form {
       .active(@error-color);
     }
   }
+
+  .@{ant-prefix}-cascader-picker:focus .@{ant-prefix}-cascader-input {
+    .active(@error-color);
+  }
 }
 
 .is-validating {

components/grid/__tests__/__snapshots__/demo.test.js.snap

@@ -700,11 +700,11 @@ exports[`renders ./components/grid/demo/playground.md correctly 1`] = `
   </div>
   <pre>
     &lt;Row gutter={16}&gt;
-      &lt;Col span={6} /&gt;
-      &lt;Col span={6} /&gt;
-      &lt;Col span={6} /&gt;
-      &lt;Col span={6} /&gt;
-    &lt;/Row&gt;
+  &lt;Col span={6} /&gt;
+  &lt;Col span={6} /&gt;
+  &lt;Col span={6} /&gt;
+  &lt;Col span={6} /&gt;
+&lt;/Row&gt;
   </pre>
 </div>
 `;

components/grid/index.en-US.md

@@ -68,10 +68,10 @@ In the grid system, we define the frame outside the information area based on `r
 
 Following is a brief look at how it works:
 
-* Establish a set of `column` in the horizontal space defined by `row` (abbreviated col)
-* Your content elements should be placed directly in the `col`, and only `col` should be placed directly in `row`
-* The column grid system is a value of 1-24 to represent its range spans. For example, three columns of equal width can be created by `.col-8` (`span=8`).
-* If the sum of `col` spans in a `row` are more than 24, then the overflowing `col` as a whole will start a new line arrangement.
+- Establish a set of `column` in the horizontal space defined by `row` (abbreviated col)
+- Your content elements should be placed directly in the `col`, and only `col` should be placed directly in `row`
+- The column grid system is a value of 1-24 to represent its range spans. For example, three columns of equal width can be created by `.col-8` (`span=8`).
+- If the sum of `col` spans in a `row` are more than 24, then the overflowing `col` as a whole will start a new line arrangement.
 
 ## Flex layout
 
@@ -88,26 +88,26 @@ If the Ant Design grid layout component does not meet your needs, you can use th
 
 ### Row
 
-| Property       | Description           | Type     | Default       |
-|------------|-----------------|--------------------|-------------|
-| gutter     | spacing between grids   | number | 0        |
-| type     | layout mode, optional `flex`, [browser support](http://caniuse.com/#search=flex) | string |         |
-| align     | the vertical alignment of the flex layout: `top` `middle` `bottom`  | string | `top`      |
-| justify   | horizontal arrangement of the flex layout: `start` `end` `center` `space-around` `space-between`   | string | `start`        |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| align | the vertical alignment of the flex layout: `top` `middle` `bottom` | string | `top` |
+| gutter | spacing between grids | number | 0 |
+| justify | horizontal arrangement of the flex layout: `start` `end` `center` `space-around` `space-between` | string | `start` |
+| type | layout mode, optional `flex`, [browser support](http://caniuse.com/#search=flex) | string |  |
 
 ### Col
 
-| Property       | Description           | Type     | Default       |
-|------------|-----------------|--------------------|-------------|
-| span     | raster number of cells to occupy, 0 corresponds to `display: none`  | number | none        |
-| order     | raster order, used in `flex` layout mode   | number | 0        |
-| offset     | the number of cells to offset Col from the left  | number | 0        |
-| push     | the number of cells that raster is moved to the right | number | 0        |
-| pull     | the number of cells that raster is moved to the left   | number | 0        |
-| xs       | `<768px` and also default setting, could be a `span` value or an object containing above props | number\|object | - |
-| sm       | `≥768px`, could be a `span` value or an object containing above props | number\|object | - |
-| md       | `≥992px`, could be a `span` value or an object containing above props | number\|object | - |
-| lg       | `≥1200px`, could be a `span` value or an object containing above props | number\|object | - |
-| xl       | `≥1600px`, could be a `span` value or an object containing above props | number\|object | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| offset | the number of cells to offset Col from the left | number | 0 |
+| order | raster order, used in `flex` layout mode | number | 0 |
+| pull | the number of cells that raster is moved to the left | number | 0 |
+| push | the number of cells that raster is moved to the right | number | 0 |
+| span | raster number of cells to occupy, 0 corresponds to `display: none` | number | none |
+| xs | `<768px` and also default setting, could be a `span` value or an object containing above props | number\|object | - |
+| sm | `≥768px`, could be a `span` value or an object containing above props | number\|object | - |
+| md | `≥992px`, could be a `span` value or an object containing above props | number\|object | - |
+| lg | `≥1200px`, could be a `span` value or an object containing above props | number\|object | - |
+| xl | `≥1600px`, could be a `span` value or an object containing above props | number\|object | - |
 
 The breakpoints of responsive grid follow [BootStrap 3 media queries rules](https://getbootstrap.com/docs/3.3/css/#responsive-utilities-classes)(not including `occasionally part`).

components/grid/index.zh-CN.md

@@ -67,10 +67,10 @@ title: Grid
 
 布局的栅格化系统，我们是基于行（row）和列（col）来定义信息区块的外部框架，以保证页面的每个区域能够稳健地排布起来。下面简单介绍一下它的工作原理：
 
-* 通过`row`在水平方向建立一组`column`（简写col）
-* 你的内容应当放置于`col`内，并且，只有`col`可以作为`row`的直接元素
-* 栅格系统中的列是指1到24的值来表示其跨越的范围。例如，三个等宽的列可以使用`.col-8`来创建
-* 如果一个`row`中的`col`总和超过 24，那么多余的`col`会作为一个整体另起一行排列
+- 通过`row`在水平方向建立一组`column`（简写col）
+- 你的内容应当放置于`col`内，并且，只有`col`可以作为`row`的直接元素
+- 栅格系统中的列是指1到24的值来表示其跨越的范围。例如，三个等宽的列可以使用`.col-8`来创建
+- 如果一个`row`中的`col`总和超过 24，那么多余的`col`会作为一个整体另起一行排列
 
 ## Flex 布局
 
@@ -87,26 +87,26 @@ Ant Design 的布局组件若不能满足你的需求，你也可以直接使用
 
 ### Row
 
-| 成员       | 说明             | 类型               | 默认值       |
-|-----------|-----------------|--------------------|-------------|
-| gutter    | 栅格间隔   | number | 0        |
-| type      | 布局模式，可选 `flex`，[现代浏览器](http://caniuse.com/#search=flex) 下有效 | string |         |
-| align     | flex 布局下的垂直对齐方式：`top` `middle` `bottom`  | string | `top`      |
-| justify   | flex 布局下的水平排列方式：`start` `end` `center` `space-around` `space-between`   | string | `start`        |
+| 成员 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| align | flex 布局下的垂直对齐方式：`top` `middle` `bottom` | string | `top` |
+| gutter | 栅格间隔 | number | 0 |
+| justify | flex 布局下的水平排列方式：`start` `end` `center` `space-around` `space-between` | string | `start` |
+| type | 布局模式，可选 `flex`，[现代浏览器](http://caniuse.com/#search=flex) 下有效 | string |  |
 
 ### Col
 
-| 成员      | 说明             | 类型               | 默认值       |
-|----------|-----------------|--------------------|-------------|
-| span     | 栅格占位格数，为 0 时相当于 `display: none`   | number | -        |
-| order    | 栅格顺序，`flex` 布局模式下有效   | number | 0        |
-| offset   | 栅格左侧的间隔格数，间隔内不可以有栅格  | number | 0        |
-| push     | 栅格向右移动格数   | number | 0        |
-| pull     | 栅格向左移动格数   | number | 0        |
-| xs       | `<768px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
-| sm       | `≥768px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
-| md       | `≥992px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
-| lg       | `≥1200px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
-| xl       | `≥1600px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
+| 成员 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| offset | 栅格左侧的间隔格数，间隔内不可以有栅格 | number | 0 |
+| order | 栅格顺序，`flex` 布局模式下有效 | number | 0 |
+| pull | 栅格向左移动格数 | number | 0 |
+| push | 栅格向右移动格数 | number | 0 |
+| span | 栅格占位格数，为 0 时相当于 `display: none` | number | - |
+| xs | `<768px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
+| sm | `≥768px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
+| md | `≥992px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
+| lg | `≥1200px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
+| xl | `≥1600px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
 
 响应式栅格的断点遵循了 [BootStrap 3 的规则](https://getbootstrap.com/docs/3.3/css/#responsive-utilities-classes)（不包含链接里 `occasionally` 的部分)。

components/grid/row.tsx

@@ -13,7 +13,7 @@ export interface RowProps {
   prefixCls?: string;
 }
 
-export default class Row extends React.Component<RowProps, any> {
+export default class Row extends React.Component<RowProps, {}> {
   static defaultProps = {
     gutter: 0,
   };
@@ -40,8 +40,8 @@ export default class Row extends React.Component<RowProps, any> {
       marginLeft: (gutter as number) / -2,
       marginRight: (gutter as number) / -2,
       ...style,
-     } : style;
-    const cols = Children.map(children, (col: React.ReactElement<any>) => {
+    } : style;
+    const cols = Children.map(children, (col: React.ReactElement<HTMLDivElement>) => {
       if (!col) {
         return null;
       }

components/icon/index.en-US.md

@@ -70,8 +70,8 @@ You can set `style` and `className` for size and color of icons because they are
 <Icon type="question" style={{ fontSize: 16, color: '#08c' }} />
 ```
 
-| Property | Description      | Type   | Default |
-|----------|------------------|------- |---------|
-| type | Type of ant design icon | string | - |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
 | spin | Rotate icon with animation | boolean | false |
 | style | style properties of icon, like fontSize and color | object | - |
+| type | Type of ant design icon | string | - |

components/icon/index.zh-CN.md

@@ -71,8 +71,8 @@ ReactDOM.render(<IconSet className="icons" catigory="logo" />, mountNode);
 <Icon type="question" style={{ fontSize: 16, color: '#08c' }} />
 ```
 
-| 参数      | 说明             | 类型      | 默认值  |
-|----------|------------------|----------|--------|
-| type | 图标类型 | string | - |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
 | spin | 是否有旋转动画 | boolean | false |
 | style | 设置图标的样式，例如 fontSize 和 color | object | - |
+| type | 图标类型 | string | - |

components/input-number/index.en-US.md

@@ -12,16 +12,16 @@ When a numeric value needs to be provided.
 
 ## API
 
-| property    | description           | type               | default       |
-|-------------|----------------|--------------------|--------------|
-| min     | min value   | number | -Infinity        |
-| max     | max vale       | number      | Infinity           |
-| value     | current value       | number      |            |
-| step     | The number to which the current value is increased or decreased. It can be an integer or decimal.  | number\|string      |  1      |
-| precision | precision of input value | number | - |
-| defaultValue     | initial value       | number      |            |
-| onChange     | The callback triggered when the value is changed.     | function(value: number \| string) |            |
-| disabled     | disable the input       | boolean      |      false      |
-| size    | width of input box  | string      | - |
+| property | description | type | default |
+| -------- | ----------- | ---- | ------- |
+| defaultValue | initial value | number |  |
+| disabled | disable the input | boolean | false |
 | formatter | Specifies the format of the value presented | function(value: number \| string): string | - |
+| max | max vale | number | Infinity |
+| min | min value | number | -Infinity |
 | parser | Specifies the value extracted from formatter | function( string): number | - |
+| precision | precision of input value | number | - |
+| size | width of input box | string | - |
+| step | The number to which the current value is increased or decreased. It can be an integer or decimal. | number\|string | 1 |
+| value | current value | number |  |
+| onChange | The callback triggered when the value is changed. | function(value: number \| string) |  |

components/input-number/index.zh-CN.md

@@ -15,16 +15,16 @@ title: InputNumber
 
 属性如下
 
-| 成员        | 说明           | 类型               | 默认值       |
-|-------------|----------------|--------------------|--------------|
-| min     | 最小值   | number | -Infinity        |
-| max     | 最大值       | number      | Infinity           |
-| value     | 当前值       | number      |            |
-| step     | 每次改变步数，可以为小数  | number\|string      |  1      |
-| precision | 数值精度 | number | - |
-| defaultValue     | 初始值       | number      |            |
-| onChange     | 变化回调       | Function(value: number \| string) |            |
-| disabled     | 禁用       | boolean      |      false      |
-| size    | 输入框大小  | string      |      无      |
+| 成员 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| defaultValue | 初始值 | number |  |
+| disabled | 禁用 | boolean | false |
 | formatter | 指定输入框展示值的格式 | function(value: number \| string): string | - |
+| max | 最大值 | number | Infinity |
+| min | 最小值 | number | -Infinity |
 | parser | 指定从 formatter 里转换回数字的方式，和 formatter 搭配使用 | function( string): number | - |
+| precision | 数值精度 | number | - |
+| size | 输入框大小 | string | 无 |
+| step | 每次改变步数，可以为小数 | number\|string | 1 |
+| value | 当前值 | number |  |
+| onChange | 变化回调 | Function(value: number \| string) |  |

components/input/__tests__/__snapshots__/demo.test.js.snap

@@ -50,7 +50,7 @@ exports[`renders ./components/input/demo/addon.md correctly 1`] = `
               aria-expanded="false"
               aria-haspopup="true"
               class="ant-select-selection
-                        ant-select-selection--single"
+            ant-select-selection--single"
               role="combobox"
               tabindex="0"
             >
@@ -92,7 +92,7 @@ exports[`renders ./components/input/demo/addon.md correctly 1`] = `
               aria-expanded="false"
               aria-haspopup="true"
               class="ant-select-selection
-                        ant-select-selection--single"
+            ant-select-selection--single"
               role="combobox"
               tabindex="0"
             >
@@ -224,7 +224,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -267,7 +267,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -383,7 +383,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -415,7 +415,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -452,7 +452,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -508,7 +508,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >
@@ -541,7 +541,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
       >
         <div
@@ -598,7 +598,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
         aria-expanded="false"
         aria-haspopup="true"
         class="ant-select-selection
-                  ant-select-selection--single"
+            ant-select-selection--single"
         role="combobox"
         tabindex="0"
       >

components/input/index.en-US.md

@@ -16,22 +16,22 @@ Keyboard and mouse can be used for providing or changing data.
 
 ### Input
 
-| Property       | Description           | Type     | Default       |
-|----------------|-----------------------|----------|---------------|
-| type | The type of input, `text` or `textarea`(`type=textarea` are deprecated after `2.12`, please use `Input.TextArea`) | string  | `text`    |
-| id | The ID for input | string |   |
-| value | The input content value | string |   |
-| defaultValue | The initial input content | string |   |
-| size | The size of the input box. Note: in the context of a form, the `large` size is used. Available: `large` `default` `small` | string | `default` |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| addonAfter | The label text displayed after (on the right side of) the input field. | string\|ReactNode |  |
+| addonBefore | The label text displayed before (on the left side of) the input field. | string\|ReactNode |  |
+| defaultValue | The initial input content | string |  |
 | disabled | Whether the input is disabled. | boolean | false |
-| addonBefore | The label text displayed before (on the left side of) the input field. | string\|ReactNode |   |
-| addonAfter | The label text displayed after (on the right side of) the input field. | string\|ReactNode  |   |
-| prefix | The prefix icon for the Input. | string\|ReactNode | |
-| suffix | The suffix icon for the Input. | string\|ReactNode | |
-| onPressEnter | The callback function that is triggered when Enter key is pressed. | function(e) |   |
+| id | The ID for input | string |  |
+| prefix | The prefix icon for the Input. | string\|ReactNode |  |
+| size | The size of the input box. Note: in the context of a form, the `large` size is used. Available: `large` `default` `small` | string | `default` |
+| suffix | The suffix icon for the Input. | string\|ReactNode |  |
+| type | The type of input, `text` or `textarea`(`type=textarea` are deprecated after `2.12`, please use `Input.TextArea`) | string | `text` |
+| value | The input content value | string |  |
+| onPressEnter | The callback function that is triggered when Enter key is pressed. | function(e) |  |
 
 > When `Input` is used in a `Form.Item` context, if the `Form.Item` has the `id` and `options` props defined
-then `value`, `defaultValue`, and `id` props of `Input` are automatically set.
+> then `value`, `defaultValue`, and `id` props of `Input` are automatically set.
 
 The rest of the props of Input are exactly the same as the original [input](https://facebook.github.io/react/docs/events.html#supported-events).
 
@@ -39,12 +39,12 @@ The rest of the props of Input are exactly the same as the original [input](http
 
 > If you are using `antd@<2.12`, please use `Input[type=textarea]`.
 
-| Property       | Description           | Type     | Default       |
-|----------------|-----------------------|----------|---------------|
-| defaultValue | The initial input content | string |   |
-| value | The input content value | string |   |
-| onPressEnter | The callback function that is triggered when Enter key is pressed. | function(e) |   |
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
 | autosize | Height autosize feature, can be set to `true|false` or an object `{ minRows: 2, maxRows: 6 }` | boolean\|object | false |
+| defaultValue | The initial input content | string |  |
+| value | The input content value | string |  |
+| onPressEnter | The callback function that is triggered when Enter key is pressed. | function(e) |  |
 
 The rest of the props of `Input.TextArea` are the same as the original [textarea](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea).
 
@@ -52,19 +52,18 @@ The rest of the props of `Input.TextArea` are the same as the original [textarea
 
 `Added in 2.5.0`
 
-| Property  | Description                          | Type       | Default |
-|-----------|--------------------------------------|------------|---------|
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
 | onSearch | The callback function that is triggered when you click on the search-icon or press Enter key. | function(value) |  |
 
 Supports all props of `Input`.
 
 #### Input.Group
 
-| Property  | Description                      | Type   | Default   |
-|-----------|----------------------------------|--------|-----------|
-|  size | The size of `Input.Group` specifies the size of the included `Input` fields. Available: `large` `default` `small` | string | `default` |
-|  compact | Whether use compact style | boolean | false |
-
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| compact | Whether use compact style | boolean | false |
+| size | The size of `Input.Group` specifies the size of the included `Input` fields. Available: `large` `default` `small` | string | `default` |
 
 ```html
 <Input.Group>

components/input/index.zh-CN.md

@@ -16,19 +16,19 @@ title: Input
 
 ### Input
 
-| 参数      | 说明                                     | 类型       | 默认值 |
-|-----------|-----------------------------------------|------------|-------|--------|
-| type | 声明 input 类型，同原生 input 标签的 type 属性。另外提供 `type="textarea"`(该 type `2.12` 后废弃，请直接使用 `Input.TextArea`)。 | string  | `text` |
-| id | 输入框的 id | string | |
-| value | 输入框内容 | string | |
-| defaultValue | 输入框默认内容 | string | |
-| size | 控件大小。注：标准表单内的输入框大小限制为 `large`。可选 `large` `default` `small` | string | `default` |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| addonAfter | 带标签的 input，设置后置标签 | string\|ReactNode |  |
+| addonBefore | 带标签的 input，设置前置标签 | string\|ReactNode |  |
+| defaultValue | 输入框默认内容 | string |  |
 | disabled | 是否禁用状态，默认为 false | boolean | false |
-| addonBefore | 带标签的 input，设置前置标签 | string\|ReactNode | |
-| addonAfter | 带标签的 input，设置后置标签 | string\|ReactNode | |
-| prefix | 带有前缀图标的 input | string\|ReactNode | |
-| suffix | 带有后缀图标的 input | string\|ReactNode | |
-| onPressEnter | 按下回车的回调 | function(e) | |
+| id | 输入框的 id | string |  |
+| prefix | 带有前缀图标的 input | string\|ReactNode |  |
+| size | 控件大小。注：标准表单内的输入框大小限制为 `large`。可选 `large` `default` `small` | string | `default` |
+| suffix | 带有后缀图标的 input | string\|ReactNode |  |
+| type | 声明 input 类型，同原生 input 标签的 type 属性。另外提供 `type="textarea"`(该 type `2.12` 后废弃，请直接使用 `Input.TextArea`)。 | string | `text` |
+| value | 输入框内容 | string |  |
+| onPressEnter | 按下回车的回调 | function(e) |  |
 
 > 如果 `Input` 在 `Form.Item` 内，并且 `Form.Item` 设置了 `id` 和 `options` 属性，则 `value` `defaultValue` 和 `id` 属性会被自动设置。
 
@@ -38,12 +38,12 @@ Input 的其他属性和 React 自带的 [input](https://facebook.github.io/reac
 
 > `2.12` 后新增的组件，旧版请使用 `Input[type=textarea]`。
 
-| 参数      | 说明                                     | 类型       | 默认值 |
-|-----------|-----------------------------------------|------------|-------|--------|
-| defaultValue | 输入框默认内容 | string | |
-| value | 输入框内容 | string | |
-| onPressEnter | 按下回车的回调 | function(e) | |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
 | autosize | 自适应内容高度，可设置为 `true|false` 或对象：`{ minRows: 2, maxRows: 6 }` | boolean\|object | false |
+| defaultValue | 输入框默认内容 | string |  |
+| value | 输入框内容 | string |  |
+| onPressEnter | 按下回车的回调 | function(e) |  |
 
 `Input.TextArea` 的其他属性和浏览器自带的 [textarea](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea) 一致。
 
@@ -51,19 +51,18 @@ Input 的其他属性和 React 自带的 [input](https://facebook.github.io/reac
 
 `Added in 2.5.0`
 
-| 参数      | 说明                                     | 类型       | 默认值 |
-|-----------|-----------------------------------------|-----------|-------|
-| onSearch | 点击搜索或按下回车键时的回调                 | function(value) |  |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| onSearch | 点击搜索或按下回车键时的回调 | function(value) |  |
 
 其余属性和 Input 一致。
 
 #### Input.Group
 
-| 参数      | 说明                                     | 类型         | 默认值 |
-|-----------|-----------------------------------------|-------------|-------|
-|  size | `Input.Group` 中所有的 `Input` 的大小，可选 `large` `default` `small` | string | `default` |
-|  compact | 是否用紧凑模式 | boolean | false |
-
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| compact | 是否用紧凑模式 | boolean | false |
+| size | `Input.Group` 中所有的 `Input` 的大小，可选 `large` `default` `small` | string | `default` |
 
 ```html
 <Input.Group>

components/input/style/mixin.less

@@ -5,12 +5,12 @@
 
 // size mixins for input
 .input-lg() {
-  padding: @input-padding-vertical-lg @input-padding-horizontal;
+  padding: @input-padding-vertical-lg @input-padding-horizontal-lg;
   height: @input-height-lg;
 }
 
 .input-sm() {
-  padding: @input-padding-vertical-sm @input-padding-horizontal;
+  padding: @input-padding-vertical-sm @input-padding-horizontal-sm;
   height: @input-height-sm;
 }
 
@@ -41,7 +41,7 @@
 .input() {
   position: relative;
   display: inline-block;
-  padding: @input-padding-vertical-base @input-padding-horizontal;
+  padding: @input-padding-vertical-base @input-padding-horizontal-base;
   width: 100%;
   height: @input-height-base;
   font-size: @font-size-base;
@@ -137,7 +137,7 @@
   }
 
   &-addon {
-    padding: @input-padding-vertical-base @input-padding-horizontal;
+    padding: @input-padding-vertical-base @input-padding-horizontal-base;
     font-size: @font-size-base;
     font-weight: normal;
     line-height: 1;
@@ -151,7 +151,7 @@
 
     // Reset Select's style in addon
     .@{ant-prefix}-select {
-      margin: -(@input-padding-vertical-base + 1px) (-@input-padding-horizontal);  // lesshint spaceAroundOperator: false
+      margin: -(@input-padding-vertical-base + 1px) (-@input-padding-horizontal-base);  // lesshint spaceAroundOperator: false
 
       .@{ant-prefix}-select-selection {
         background-color: inherit;
@@ -328,18 +328,18 @@
   }
 
   .@{inputClass}-prefix {
-    left: @input-padding-horizontal;
+    left: @input-padding-horizontal-base;
   }
 
   .@{inputClass}-suffix {
-    right: @input-padding-horizontal;
+    right: @input-padding-horizontal-base;
   }
 
   .@{inputClass}:not(:first-child) {
-    padding-left: @input-padding-horizontal + @input-affix-width;
+    padding-left: @input-padding-horizontal-base + @input-affix-width;
   }
 
   .@{inputClass}:not(:last-child) {
-    padding-right: @input-padding-horizontal + @input-affix-width;
+    padding-right: @input-padding-horizontal-base + @input-affix-width;
   }
 }

components/layout/__tests__/__snapshots__/demo.test.js.snap

@@ -253,7 +253,7 @@ exports[`renders ./components/layout/demo/fixed.md correctly 1`] = `
   >
     <div
       class="ant-breadcrumb"
-      style="margin:12px 0;"
+      style="margin:16px 0;"
     >
       <span>
         <span
@@ -806,7 +806,7 @@ exports[`renders ./components/layout/demo/side.md correctly 1`] = `
     >
       <div
         class="ant-breadcrumb"
-        style="margin:12px 0;"
+        style="margin:16px 0;"
       >
         <span>
           <span
@@ -895,7 +895,7 @@ exports[`renders ./components/layout/demo/top.md correctly 1`] = `
   >
     <div
       class="ant-breadcrumb"
-      style="margin:12px 0;"
+      style="margin:16px 0;"
     >
       <span>
         <span
@@ -995,7 +995,7 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
   >
     <div
       class="ant-breadcrumb"
-      style="margin:12px 0;"
+      style="margin:16px 0;"
     >
       <span>
         <span
@@ -1324,7 +1324,7 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
     >
       <div
         class="ant-breadcrumb"
-        style="margin:12px 0;"
+        style="margin:16px 0;"
       >
         <span>
           <span

components/layout/demo/fixed.md

@@ -34,7 +34,7 @@ ReactDOM.render(
       </Menu>
     </Header>
     <Content style={{ padding: '0 50px', marginTop: 64 }}>
-      <Breadcrumb style={{ margin: '12px 0' }}>
+      <Breadcrumb style={{ margin: '16px 0' }}>
         <Breadcrumb.Item>Home</Breadcrumb.Item>
         <Breadcrumb.Item>List</Breadcrumb.Item>
         <Breadcrumb.Item>App</Breadcrumb.Item>

components/layout/demo/responsive.md

@@ -21,44 +21,46 @@ Layout.Sider supports responsive layout.
 import { Layout, Menu, Icon } from 'antd';
 const { Header, Content, Footer, Sider } = Layout;
 
-ReactDOM.render(<Layout>
-  <Sider
-    breakpoint="lg"
-    collapsedWidth="0"
-    onCollapse={(collapsed, type) => { console.log(collapsed, type); }}
-  >
-    <div className="logo" />
-    <Menu theme="dark" mode="inline" defaultSelectedKeys={['4']}>
-      <Menu.Item key="1">
-        <Icon type="user" />
-        <span className="nav-text">nav 1</span>
-      </Menu.Item>
-      <Menu.Item key="2">
-        <Icon type="video-camera" />
-        <span className="nav-text">nav 2</span>
-      </Menu.Item>
-      <Menu.Item key="3">
-        <Icon type="upload" />
-        <span className="nav-text">nav 3</span>
-      </Menu.Item>
-      <Menu.Item key="4">
-        <Icon type="user" />
-        <span className="nav-text">nav 4</span>
-      </Menu.Item>
-    </Menu>
-  </Sider>
+ReactDOM.render(
   <Layout>
-    <Header style={{ background: '#fff', padding: 0 }} />
-    <Content style={{ margin: '24px 16px 0' }}>
-      <div style={{ padding: 24, background: '#fff', minHeight: 360 }}>
-        content
-      </div>
-    </Content>
-    <Footer style={{ textAlign: 'center' }}>
-      Ant Design ©2016 Created by Ant UED
-    </Footer>
+    <Sider
+      breakpoint="lg"
+      collapsedWidth="0"
+      onCollapse={(collapsed, type) => { console.log(collapsed, type); }}
+    >
+      <div className="logo" />
+      <Menu theme="dark" mode="inline" defaultSelectedKeys={['4']}>
+        <Menu.Item key="1">
+          <Icon type="user" />
+          <span className="nav-text">nav 1</span>
+        </Menu.Item>
+        <Menu.Item key="2">
+          <Icon type="video-camera" />
+          <span className="nav-text">nav 2</span>
+        </Menu.Item>
+        <Menu.Item key="3">
+          <Icon type="upload" />
+          <span className="nav-text">nav 3</span>
+        </Menu.Item>
+        <Menu.Item key="4">
+          <Icon type="user" />
+          <span className="nav-text">nav 4</span>
+        </Menu.Item>
+      </Menu>
+    </Sider>
+    <Layout>
+      <Header style={{ background: '#fff', padding: 0 }} />
+      <Content style={{ margin: '24px 16px 0' }}>
+        <div style={{ padding: 24, background: '#fff', minHeight: 360 }}>
+          content
+        </div>
+      </Content>
+      <Footer style={{ textAlign: 'center' }}>
+        Ant Design ©2016 Created by Ant UED
+      </Footer>
+    </Layout>
   </Layout>
-</Layout>, mountNode);
+, mountNode);
 ````
 
 ````css

components/layout/demo/side.md

@@ -75,7 +75,7 @@ class SiderDemo extends React.Component {
         <Layout>
           <Header style={{ background: '#fff', padding: 0 }} />
           <Content style={{ margin: '0 16px' }}>
-            <Breadcrumb style={{ margin: '12px 0' }}>
+            <Breadcrumb style={{ margin: '16px 0' }}>
               <Breadcrumb.Item>User</Breadcrumb.Item>
               <Breadcrumb.Item>Bill</Breadcrumb.Item>
             </Breadcrumb>

components/layout/demo/top-side-2.md

@@ -62,7 +62,7 @@ ReactDOM.render(
         </Menu>
       </Sider>
       <Layout style={{ padding: '0 24px 24px' }}>
-        <Breadcrumb style={{ margin: '12px 0' }}>
+        <Breadcrumb style={{ margin: '16px 0' }}>
           <Breadcrumb.Item>Home</Breadcrumb.Item>
           <Breadcrumb.Item>List</Breadcrumb.Item>
           <Breadcrumb.Item>App</Breadcrumb.Item>

components/layout/demo/top-side.md

@@ -34,7 +34,7 @@ ReactDOM.render(
       </Menu>
     </Header>
     <Content style={{ padding: '0 50px' }}>
-      <Breadcrumb style={{ margin: '12px 0' }}>
+      <Breadcrumb style={{ margin: '16px 0' }}>
         <Breadcrumb.Item>Home</Breadcrumb.Item>
         <Breadcrumb.Item>List</Breadcrumb.Item>
         <Breadcrumb.Item>App</Breadcrumb.Item>

components/layout/demo/top.md

@@ -40,7 +40,7 @@ ReactDOM.render(
       </Menu>
     </Header>
     <Content style={{ padding: '0 50px' }}>
-      <Breadcrumb style={{ margin: '12px 0' }}>
+      <Breadcrumb style={{ margin: '16px 0' }}>
         <Breadcrumb.Item>Home</Breadcrumb.Item>
         <Breadcrumb.Item>List</Breadcrumb.Item>
         <Breadcrumb.Item>App</Breadcrumb.Item>

components/layout/index.en-US.md

@@ -73,10 +73,10 @@ The first level navigation is inclined left near a logo, and the secondary menu
 
 The wrapper.
 
-Property | Description | Type | Default
------|-----|-----|------
-style | to customize the styles | object | -
-className | container className | string | -
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| className | container className | string | - |
+| style | to customize the styles | object | - |
 
 > APIs of `Layout.Header` `Layout.Footer` `Layout.Content` are the same as that of `Layout`.
 
@@ -84,19 +84,19 @@ className | container className | string | -
 
 The sidebar.
 
-Property | Description | Type | Default
------|-----|-----|------
-collapsible | whether can be collapsed | boolean | false
-defaultCollapsed | to set the initial status | boolean | false  |
-reverseArrow | reverse direction of arrow, for a sider that expands from the right | boolean | false  |
-collapsed | to set the current status | boolean | -
-onCollapse | the callback function, executed by clicking the trigger or activating the responsive layout | (collapsed, type) => {}  | -
-trigger | specify the customized trigger, set to null to hide the trigger | string\|ReactNode| - |
-width | width of the sidebar | number\|string | 200
-collapsedWidth | width of the collapsed sidebar, by setting to `0` a special trigger will appear | number | 64
-breakpoint | breakpoint of the responsive layout | Enum { 'xs', 'sm', 'md', 'lg', 'xl' } | - |
-style | to customize the styles | object | -
-className | container className | string | -
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| breakpoint | breakpoint of the responsive layout | Enum { 'xs', 'sm', 'md', 'lg', 'xl' } | - |
+| className | container className | string | - |
+| collapsed | to set the current status | boolean | - |
+| collapsedWidth | width of the collapsed sidebar, by setting to `0` a special trigger will appear | number | 64 |
+| collapsible | whether can be collapsed | boolean | false |
+| defaultCollapsed | to set the initial status | boolean | false |
+| reverseArrow | reverse direction of arrow, for a sider that expands from the right | boolean | false |
+| style | to customize the styles | object | - |
+| trigger | specify the customized trigger, set to null to hide the trigger | string\|ReactNode | - |
+| width | width of the sidebar | number\|string | 200 |
+| onCollapse | the callback function, executed by clicking the trigger or activating the responsive layout | (collapsed, type) => {} | - |
 
 #### breakpoint width
 

components/layout/index.zh-CN.md

@@ -74,10 +74,10 @@ title: Layout
 
 布局容器。
 
-| 参数      | 说明                                      | 类型         | 默认值 |
-|----------|------------------------------------------|-------------|-------|
-| style | 指定样式 | object | - |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
 | className | 容器 className | string | - |
+| style | 指定样式 | object | - |
 
 > `Layout.Header` `Layout.Footer` `Layout.Content` API 与 `Layout` 相同
 
@@ -85,19 +85,19 @@ title: Layout
 
 侧边栏。
 
-| 参数      | 说明                                     | 类型       | 默认值 |
-|----------|-----------------------------------------|------------|-------|
-| collapsible | 是否可收起 | boolean | false  |
-| defaultCollapsed | 是否默认收起 | boolean | false  |
-| reverseArrow | 翻转折叠提示箭头的方向，当 Sider 在右边时可以使用 | boolean | false  |
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| breakpoint | 触发响应式布局的断点 | Enum { 'xs', 'sm', 'md', 'lg', 'xl' } | - |
+| className | 容器 className | string | - |
 | collapsed | 当前收起状态 | boolean | - |
-| onCollapse | 展开-收起时的回调函数，有点击 trigger 以及响应式反馈两种方式可以触发 | (collapsed, type) => {} | - |
+| collapsedWidth | 收缩宽度，设置为 0 会出现特殊 trigger | number | 64 |
+| collapsible | 是否可收起 | boolean | false |
+| defaultCollapsed | 是否默认收起 | boolean | false |
+| reverseArrow | 翻转折叠提示箭头的方向，当 Sider 在右边时可以使用 | boolean | false |
+| style | 指定样式 | object | - |
 | trigger | 自定义 trigger，设置为 null 时隐藏 trigger | string\|ReactNode | - |
 | width | 宽度 | number\|string | 200 |
-| collapsedWidth | 收缩宽度，设置为 0 会出现特殊 trigger | number | 64 |
-| breakpoint | 触发响应式布局的断点 | Enum { 'xs', 'sm', 'md', 'lg', 'xl' } | - |
-| style | 指定样式 | object | - |
-| className | 容器 className | string | - |
+| onCollapse | 展开-收起时的回调函数，有点击 trigger 以及响应式反馈两种方式可以触发 | (collapsed, type) => {} | - |
 
 #### breakpoint width
 

components/layout/style/index.less

@@ -30,6 +30,7 @@
   }
 
   &-footer {
+    background: @layout-footer-background;
     padding: @layout-footer-padding;
     color: @text-color;
     font-size: @font-size-base;
@@ -49,6 +50,11 @@
 
     &-children {
       height: 100%;
+      // Hack for fixing margin collaspe bug
+      // https://github.com/ant-design/ant-design/issues/7967
+      // solution from https://stackoverflow.com/a/33132624/3040605
+      padding-top: 0.1px;
+      margin-top: -0.1px;
     }
 
     &-has-trigger {

components/locale-provider/__tests__/__snapshots__/demo.test.js.snap

@@ -138,7 +138,7 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = `
               aria-expanded="false"
               aria-haspopup="true"
               class="ant-select-selection
-                        ant-select-selection--single"
+            ant-select-selection--single"
               role="combobox"
               tabindex="0"
             >
@@ -177,7 +177,7 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = `
           aria-expanded="false"
           aria-haspopup="true"
           class="ant-select-selection
-                    ant-select-selection--single"
+            ant-select-selection--single"
           role="combobox"
           tabindex="0"
         >
@@ -484,7 +484,7 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = `
               aria-expanded="false"
               aria-haspopup="true"
               class="ant-select-selection
-                        ant-select-selection--single"
+            ant-select-selection--single"
               role="combobox"
               tabindex="0"
             >
@@ -516,7 +516,7 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = `
               aria-expanded="false"
               aria-haspopup="true"
               class="ant-select-selection
-                        ant-select-selection--single"
+            ant-select-selection--single"
               role="combobox"
               tabindex="0"
             >
@@ -1626,7 +1626,7 @@ exports[`renders ./components/locale-provider/demo/basic.md correctly 1`] = `
           aria-expanded="false"
           aria-haspopup="true"
           class="ant-select-selection
-                    ant-select-selection--single"
+            ant-select-selection--single"
           role="combobox"
           tabindex="0"
         >