From d2c00fae4bb55022f8d8e6c7862220627a90f6df Mon Sep 17 00:00:00 2001
From: ddcat1115 <ddcat1115@gmail.com>
Date: Fri, 20 Jan 2017 20:09:59 +0800
Subject: [PATCH 01/51] fix Layout demo (#4661)

* fix Layout demo

* update snapshot
---
 components/layout/__tests__/__snapshots__/demo.test.js.snap | 3 ++-
 components/layout/demo/top-side.md                          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/layout/__tests__/__snapshots__/demo.test.js.snap b/components/layout/__tests__/__snapshots__/demo.test.js.snap
index eaab32241..72a567c68 100644
--- a/components/layout/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/layout/__tests__/__snapshots__/demo.test.js.snap
@@ -461,11 +461,12 @@ exports[`test renders ./components/layout/demo/top-side.md correctly 1`] = `
       style="padding:24px 0;background:#fff;">
       <div
         class="ant-layout-sider"
-        style="flex:0 0 200px;">
+        style="background:#fff;flex:0 0 200px;">
         <ul
           aria-activedescendant=""
           class="ant-menu ant-menu-inline  ant-menu-light ant-menu-root"
           role="menu"
+          style="height:100%;"
           tabindex="0">
           <li
             class="ant-menu-submenu-inline ant-menu-submenu-open ant-menu-submenu-selected ant-menu-submenu">
diff --git a/components/layout/demo/top-side.md b/components/layout/demo/top-side.md
index d36293d2c..773a6da69 100644
--- a/components/layout/demo/top-side.md
+++ b/components/layout/demo/top-side.md
@@ -40,11 +40,12 @@ ReactDOM.render(
         <Breadcrumb.Item>App</Breadcrumb.Item>
       </Breadcrumb>
       <Layout style={{ padding: '24px 0', background: '#fff' }}>
-        <Sider width={200}>
+        <Sider width={200} style={{ background: '#fff' }}>
           <Menu
             mode="inline"
             defaultSelectedKeys={['1']}
             defaultOpenKeys={['sub1']}
+            style={{ height: '100%' }}
           >
             <SubMenu key="sub1" title={<span><Icon type="user" />subnav 1</span>}>
               <Menu.Item key="1">option1</Menu.Item>

From 77b78a93892847ca69cdbb21d52b7a531fdc3bc0 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Fri, 20 Jan 2017 20:10:50 +0800
Subject: [PATCH 02/51] docs: Unify type naming (#4636)

* Unify name of ReactNode type in document

* Lowser all string type name

* Lowercase all number type name

* Lowercase all boolean type name

* Unify array type

* Lowercase all object type name

* Unify mutilple types
---
 components/affix/index.en-US.md           |  4 +-
 components/affix/index.zh-CN.md           |  4 +-
 components/alert/index.en-US.md           | 14 ++---
 components/alert/index.zh-CN.md           | 14 ++---
 components/anchor/AnchorLink.tsx          |  2 +-
 components/anchor/index.en-US.md          | 10 ++--
 components/anchor/index.zh-CN.md          | 10 ++--
 components/auto-complete/index.en-US.md   |  6 +--
 components/auto-complete/index.zh-CN.md   |  6 +--
 components/back-top/index.en-US.md        |  2 +-
 components/back-top/index.zh-CN.md        |  2 +-
 components/badge/index.en-US.md           |  8 +--
 components/badge/index.zh-CN.md           |  8 +--
 components/breadcrumb/Breadcrumb.tsx      |  7 +--
 components/breadcrumb/index.en-US.md      |  8 +--
 components/breadcrumb/index.zh-CN.md      |  8 +--
 components/calendar/index.en-US.md        |  2 +-
 components/calendar/index.zh-CN.md        |  2 +-
 components/card/index.en-US.md            |  8 +--
 components/card/index.zh-CN.md            |  8 +--
 components/carousel/index.en-US.md        | 10 ++--
 components/carousel/index.zh-CN.md        | 10 ++--
 components/cascader/index.en-US.md        | 12 ++---
 components/cascader/index.zh-CN.md        | 32 ++++++------
 components/checkbox/index.en-US.md        | 10 ++--
 components/checkbox/index.zh-CN.md        | 12 ++---
 components/collapse/index.en-US.md        |  8 +--
 components/collapse/index.zh-CN.md        |  8 +--
 components/date-picker/index.en-US.md     | 32 ++++++------
 components/date-picker/index.zh-CN.md     | 22 ++++----
 components/dropdown/index.en-US.md        | 10 ++--
 components/dropdown/index.zh-CN.md        | 10 ++--
 components/form/index.en-US.md            | 10 ++--
 components/form/index.zh-CN.md            | 10 ++--
 components/grid/index.zh-CN.md            |  8 +--
 components/input-number/index.en-US.md    | 14 ++---
 components/input-number/index.zh-CN.md    | 14 ++---
 components/input/index.en-US.md           | 10 ++--
 components/input/index.zh-CN.md           | 10 ++--
 components/layout/index.en-US.md          | 16 +++---
 components/layout/index.zh-CN.md          | 16 +++---
 components/locale-provider/index.en-US.md |  2 +-
 components/locale-provider/index.zh-CN.md |  2 +-
 components/mention/index.en-US.md         | 16 +++---
 components/mention/index.zh-CN.md         | 16 +++---
 components/menu/index.en-US.md            | 26 ++++-----
 components/menu/index.zh-CN.md            | 26 ++++-----
 components/message/index.en-US.md         |  6 +--
 components/message/index.zh-CN.md         |  6 +--
 components/modal/index.en-US.md           | 34 ++++++------
 components/modal/index.zh-CN.md           | 34 ++++++------
 components/notification/index.en-US.md    | 16 +++---
 components/notification/index.tsx         |  4 +-
 components/notification/index.zh-CN.md    | 16 +++---
 components/pagination/index.en-US.md      | 20 +++----
 components/pagination/index.zh-CN.md      | 20 +++----
 components/popconfirm/index.en-US.md      |  6 +--
 components/popconfirm/index.zh-CN.md      |  6 +--
 components/popover/index.en-US.md         |  4 +-
 components/popover/index.zh-CN.md         |  4 +-
 components/progress/index.en-US.md        | 14 ++---
 components/progress/index.zh-CN.md        | 14 ++---
 components/radio/index.en-US.md           |  6 +--
 components/radio/index.zh-CN.md           |  6 +--
 components/rate/index.en-US.md            | 12 ++---
 components/rate/index.zh-CN.md            | 12 ++---
 components/select/index.en-US.md          | 24 ++++-----
 components/select/index.zh-CN.md          | 24 ++++-----
 components/slider/index.en-US.md          | 22 ++++----
 components/slider/index.zh-CN.md          | 22 ++++----
 components/steps/index.en-US.md           | 18 +++----
 components/steps/index.zh-CN.md           | 16 +++---
 components/switch/index.en-US.md          | 10 ++--
 components/switch/index.zh-CN.md          | 10 ++--
 components/table/index.en-US.md           | 64 +++++++++++------------
 components/table/index.zh-CN.md           | 64 +++++++++++------------
 components/tabs/index.en-US.md            |  2 +-
 components/tabs/index.zh-CN.md            |  2 +-
 components/time-picker/index.en-US.md     |  2 +-
 components/time-picker/index.zh-CN.md     |  2 +-
 components/timeline/Timeline.tsx          |  2 +-
 components/timeline/index.en-US.md        |  4 +-
 components/timeline/index.zh-CN.md        |  4 +-
 components/tooltip/index.en-US.md         |  2 +-
 components/tooltip/index.zh-CN.md         |  2 +-
 components/transfer/index.en-US.md        | 20 +++----
 components/transfer/index.zh-CN.md        | 20 +++----
 components/transfer/list.tsx              |  2 +-
 components/tree-select/index.en-US.md     | 50 +++++++++---------
 components/tree-select/index.zh-CN.md     | 50 +++++++++---------
 components/tree/index.en-US.md            | 34 ++++++------
 components/tree/index.zh-CN.md            | 34 ++++++------
 components/upload/index.en-US.md          | 26 ++++-----
 components/upload/index.zh-CN.md          | 26 ++++-----
 94 files changed, 650 insertions(+), 653 deletions(-)

diff --git a/components/affix/index.en-US.md b/components/affix/index.en-US.md
index 6bed2669d..202962a70 100644
--- a/components/affix/index.en-US.md
+++ b/components/affix/index.en-US.md
@@ -16,8 +16,8 @@ Please note that Affix should not cover other content on the page, especially wh
 
 | 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 | - |
+| 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 | - |
 | onChange     | Callback when affix state is changed | Function(affixed) | - |
 
 **Note:** Children of `Affix` can not be `position: absolute`, but you can set `Affix` as `position: absolute`:
diff --git a/components/affix/index.zh-CN.md b/components/affix/index.zh-CN.md
index 1248efc39..7c1582c9a 100644
--- a/components/affix/index.zh-CN.md
+++ b/components/affix/index.zh-CN.md
@@ -17,8 +17,8 @@ title: Affix
 
 | 成员        | 说明           | 类型               | 默认值       |
 |-------------|----------------|--------------------|--------------|
-| offsetTop    | 距离窗口顶部达到指定偏移量后触发   | Number |         |
-| offsetBottom | 距离窗口底部达到指定偏移量后触发   | Number |         |
+| offsetTop    | 距离窗口顶部达到指定偏移量后触发   | number |         |
+| offsetBottom | 距离窗口底部达到指定偏移量后触发   | number |         |
 | target | 设置 `Affix` 需要监听其滚动事件的元素，值为一个返回对应 DOM 元素的函数 | Function | () => window |
 | onChange | 固定状态改变时触发的回调函数   | Function(affixed) | 无        |
 
diff --git a/components/alert/index.en-US.md b/components/alert/index.en-US.md
index bcabca5cb..8e9986453 100644
--- a/components/alert/index.en-US.md
+++ b/components/alert/index.en-US.md
@@ -15,11 +15,11 @@ Alert component for feedback.
 
 | Property   | Description                                               | Type       | Default |
 |----------- |---------------------------------------------------------  | ---------- |-------|
-| type       | Type of Alert styles, options:`success`, `info`, `warning`, `error` | String | `info` |
-| closable   | Whether Alert can be closed | Boolean | - |
-| closeText  | Close text to show | React.Node | - |
-| message    | Content of Alert | React.Node | - |
-| description | Additional content of Alert | React.Node | - |
+| type       | Type of Alert styles, options:`success`, `info`, `warning`, `error` | string | `info` |
+| closable   | Whether Alert can be closed | boolean | - |
+| closeText  | Close text to show | string\|ReactNode | - |
+| message    | Content of Alert | string\|ReactNode | - |
+| description | Additional content of Alert | string\|ReactNode | - |
 | onClose    | Callback when close Alert | Function | - |
-| showIcon   | Whether to show icon | Boolean | false |
-| banner   | Whether to show as banner | Boolean | false |
+| showIcon   | Whether to show icon | boolean | false |
+| banner   | Whether to show as banner | boolean | false |
diff --git a/components/alert/index.zh-CN.md b/components/alert/index.zh-CN.md
index 9bf91f7e6..d9f5e0f0a 100644
--- a/components/alert/index.zh-CN.md
+++ b/components/alert/index.zh-CN.md
@@ -16,12 +16,12 @@ title: Alert
 
 | 参数        | 说明                                                      | 类型        | 默认值 |
 |----------- |---------------------------------------------------------  | ---------- |-------|
-| type       | 指定警告提示的样式，有四种选择 `success`、`info`、`warning`、`error`   | String     | `info`    |
-| closable   | 默认不显示关闭按钮                                  | Boolean   | 无    |
-| closeText  | 自定义关闭按钮                                     | React.Node   | 无    |
-| message    | 警告提示内容                                       | React.Node   | 无    |
-| description | 警告提示的辅助性文字介绍                            | React.Node   | 无    |
+| type       | 指定警告提示的样式，有四种选择 `success`、`info`、`warning`、`error`   | string     | `info`    |
+| closable   | 默认不显示关闭按钮                                  | boolean   | 无    |
+| closeText  | 自定义关闭按钮                                     | string\|ReactNode   | 无    |
+| message    | 警告提示内容                                       | string\|ReactNode   | 无    |
+| description | 警告提示的辅助性文字介绍                            | string\|ReactNode   | 无    |
 | onClose     | 关闭时触发的回调函数                                | Function   | 无    |
-| showIcon   | 是否显示辅助图标                                 | Boolean   | false    |
-| banner   | 是否用作顶部公告                                 | Boolean   | false    |
+| showIcon   | 是否显示辅助图标                                 | boolean   | false    |
+| banner   | 是否用作顶部公告                                 | boolean   | false    |
 
diff --git a/components/anchor/AnchorLink.tsx b/components/anchor/AnchorLink.tsx
index 3c5a513ff..df94e9aab 100644
--- a/components/anchor/AnchorLink.tsx
+++ b/components/anchor/AnchorLink.tsx
@@ -8,7 +8,7 @@ export interface AnchorLinkProps {
   active?: boolean;
   prefixCls?: string;
   children?: any;
-  title?: Element;
+  title?: React.ReactNode;
   bounds: number;
   target?: () => HTMLElement | Window;
   affix?: boolean;
diff --git a/components/anchor/index.en-US.md b/components/anchor/index.en-US.md
index fadf07ced..78ebcf8b8 100644
--- a/components/anchor/index.en-US.md
+++ b/components/anchor/index.en-US.md
@@ -17,13 +17,13 @@ For displaying anchor hyperlinks on page and jumping between them.
 
 | 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) |
+| 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) |
 
 ### Link Props
 
 | Property        | Description           | Type               | Default       |
 |-------------|----------------|--------------------|--------------|
-| href    | target of hyperlink  | String |         |
-| title | content of  hyperlink | React.Node |         |
+| href    | target of hyperlink  | string |         |
+| title | content of  hyperlink | string\|ReactNode |         |
diff --git a/components/anchor/index.zh-CN.md b/components/anchor/index.zh-CN.md
index c4d0fb51a..5b7441422 100644
--- a/components/anchor/index.zh-CN.md
+++ b/components/anchor/index.zh-CN.md
@@ -18,13 +18,13 @@ title: Anchor
 
 | 成员        | 说明           | 类型               | 默认值       |
 |-------------|----------------|--------------------|--------------|
-| offsetTop    | 距离窗口顶部达到指定偏移量后触发   | Number |         |
-| offsetBottom | 距离窗口底部达到指定偏移量后触发   | Number |         |
-| bounds | 锚点区域边界 | Number | 5(px) |
+| offsetTop    | 距离窗口顶部达到指定偏移量后触发   | number |         |
+| offsetBottom | 距离窗口底部达到指定偏移量后触发   | number |         |
+| bounds | 锚点区域边界 | number | 5(px) |
 
 ### Link Props
 
 | 成员        | 说明           | 类型               | 默认值       |
 |-------------|----------------|--------------------|--------------|
-| href    | 锚点链接   | String |         |
-| title | 文字内容   | React.Node |         |
+| href    | 锚点链接   | string |         |
+| title | 文字内容   | string\|ReactNode |         |
diff --git a/components/auto-complete/index.en-US.md b/components/auto-complete/index.en-US.md
index 079fcd6da..0f484d35b 100644
--- a/components/auto-complete/index.en-US.md
+++ b/components/auto-complete/index.en-US.md
@@ -21,9 +21,9 @@ Since `AutoComplete` is based on `Select`, so besides the following API, `AutoCo
 
 | Property           | Description                             |  Type | Default |
 |----------------|----------------------------------|------------|--------|
-| dataSource          | Data source for autocomplete | Array     |      |
-| value    | selected option | String/Array<String>/{key: String, label: React.Node}/Array<{key, label}>   |  -  |
-| defaultValue | Initial selected option. | string/Array<String>   |  -  |
+| 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) | -   |
diff --git a/components/auto-complete/index.zh-CN.md b/components/auto-complete/index.zh-CN.md
index f10a60a93..ecbadd31b 100644
--- a/components/auto-complete/index.zh-CN.md
+++ b/components/auto-complete/index.zh-CN.md
@@ -22,9 +22,9 @@ const dataSource = ['12345', '23456', '34567'];
 
 | 参数           | 说明                             | 类型        | 默认值 |
 |----------------|----------------------------------|------------|---------|
-| dataSource          | 自动完成的数据源 | Array     |         |
-| value    | 指定当前选中的条目 | String/Array<String>/{key: String, label: React.Node}/Array<{key, label}>   |  无  |
-| defaultValue | 指定默认选中的条目 | String/Array<String>/{key: String, label: React.Node}/Array<{key, label}>   |  无  |
+| 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)	| 无 |
diff --git a/components/back-top/index.en-US.md b/components/back-top/index.en-US.md
index 0c04f4161..9d3874d17 100644
--- a/components/back-top/index.en-US.md
+++ b/components/back-top/index.en-US.md
@@ -20,6 +20,6 @@ title: BackTop
 
 Property | Description | Type | Default
 -----|-----|-----|------
-visibilityHeight | the `BackTop` button will not show until the scroll height reaches this value | Number | 400
+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 | -
 
diff --git a/components/back-top/index.zh-CN.md b/components/back-top/index.zh-CN.md
index f6dc13920..2d227ca44 100644
--- a/components/back-top/index.zh-CN.md
+++ b/components/back-top/index.zh-CN.md
@@ -20,5 +20,5 @@ title: BackTop
 
 | 参数        | 说明           | 类型               | 默认值       |
 |-------------|----------------|--------------------|--------------|
-| visibilityHeight    | 滚动高度达到此参数值才出现 `BackTop`   | Number | 400        |
+| visibilityHeight    | 滚动高度达到此参数值才出现 `BackTop`   | number | 400        |
 | onClick | 点击按钮的回调函数   | Function | -        |
diff --git a/components/badge/index.en-US.md b/components/badge/index.en-US.md
index 9385059bc..2ec2c7637 100644
--- a/components/badge/index.en-US.md
+++ b/components/badge/index.en-US.md
@@ -25,8 +25,8 @@ Badge normally appears in proximity to notification or head picture with eye-cat
 
 | Property       | Description             | Type       | Default |
 |----------------|-------------------------|------------|---------|
-| count          | Number to show in badge | Number     |         |
-| overflowCount  | Max count to show       | Number     | 99      |
-| dot            | Whether to show red dot without number | Boolean | false  |
+| count          | Number to show in badge | number     |         |
+| overflowCount  | Max count to show       | number     | 99      |
+| dot            | Whether to show red dot without number | boolean | false  |
 | status         | Set Badge as a status dot | Enum{ 'success', 'processing, 'default', 'error', 'warning' } | '' |
-| text           | If `status` is set, `text` is to set the text of status dot | String | '' |
+| text           | If `status` is set, `text` is to set the text of status dot | string | '' |
diff --git a/components/badge/index.zh-CN.md b/components/badge/index.zh-CN.md
index 27eb3986a..41a8a4fe6 100644
--- a/components/badge/index.zh-CN.md
+++ b/components/badge/index.zh-CN.md
@@ -26,8 +26,8 @@ title: Badge
 
 | 参数           | 说明                             | 类型       |  可选值 | 默认值 |
 |----------------|----------------------------------|------------|---------|--------|
-| count          | 展示的数字，大于 overflowCount 时显示为 `${overflowCount}+`，为 0 时隐藏 | Number     |         |        |
-| overflowCount  | 展示封顶的数字值                 | Number     |         | 99     |
-| dot            | 不展示数字，只有一个小红点       | Boolean    |         | false  |
+| count          | 展示的数字，大于 overflowCount 时显示为 `${overflowCount}+`，为 0 时隐藏 | number     |         |        |
+| overflowCount  | 展示封顶的数字值                 | number     |         | 99     |
+| dot            | 不展示数字，只有一个小红点       | boolean    |         | false  |
 | status         | 设置 Badge 为状态点            | Enum      | 'success'、'processing'、'default'、'error'、'warning' | '' |
-| text           | 在设置了 `status` 的前提下有效，设置状态点的文本  | String | | '' |
+| text           | 在设置了 `status` 的前提下有效，设置状态点的文本  | string | | '' |
diff --git a/components/breadcrumb/Breadcrumb.tsx b/components/breadcrumb/Breadcrumb.tsx
index 198134967..ef1e5a64d 100755
--- a/components/breadcrumb/Breadcrumb.tsx
+++ b/components/breadcrumb/Breadcrumb.tsx
@@ -8,7 +8,7 @@ export interface BreadcrumbProps {
   prefixCls?: string;
   routes?: Array<any>;
   params?: Object;
-  separator?: string | React.ReactNode;
+  separator?: React.ReactNode;
   itemRender?: (route: any, params: any, routes: Array<any>, paths: Array<string>) => React.ReactNode;
   style?: React.CSSProperties;
   className?: string;
@@ -44,10 +44,7 @@ export default class Breadcrumb extends React.Component<BreadcrumbProps, any> {
 
   static propTypes = {
     prefixCls: React.PropTypes.string,
-    separator: React.PropTypes.oneOfType([
-      React.PropTypes.string,
-      React.PropTypes.element,
-    ]),
+    separator: React.PropTypes.node,
     routes: React.PropTypes.array,
     params: React.PropTypes.object,
     linkRender: React.PropTypes.func,
diff --git a/components/breadcrumb/index.en-US.md b/components/breadcrumb/index.en-US.md
index b318b4fd8..46ac3f498 100644
--- a/components/breadcrumb/index.en-US.md
+++ b/components/breadcrumb/index.en-US.md
@@ -17,10 +17,10 @@ A breadcrumb displays the current location within a hierarchy. It allows going b
 
 | Property      | Description                              | Type              |  Optional | Default |
 |-----------|-----------------------------------|-----------------|---------|--------|
-| routes    | The routing stack information of router | Array             |         | -      |
-| params    | Routing parameter                        | Object            |         | -      |
-| separator | Custom separator                      | String or Element |         | '/'    |
-| itemRender | Custom item renderer | (route, params, routes, paths) => React.ReactNode | | - |
+| routes    | The routing stack information of router | object[]             |         | -      |
+| params    | Routing parameter                        | object            |         | -      |
+| separator | Custom separator                      | string\|ReactNode |         | '/'    |
+| itemRender | Custom item renderer | (route, params, routes, paths) => ReactNode | | - |
 
 > `linkRender` and `nameRender` were removed after `antd@2.0`, please use `itemRender` instead.
 
diff --git a/components/breadcrumb/index.zh-CN.md b/components/breadcrumb/index.zh-CN.md
index f8248f714..28e7bafec 100644
--- a/components/breadcrumb/index.zh-CN.md
+++ b/components/breadcrumb/index.zh-CN.md
@@ -17,10 +17,10 @@ title: Breadcrumb
 
 | 参数      | 说明                              | 类型              |  可选值 | 默认值 |
 |-----------|-----------------------------------|-----------------|---------|--------|
-| routes    | router 的路由栈信息               | Array             |         | -      |
-| params    | 路由的参数                        | Object            |         | -      |
-| separator | 分隔符自定义                      | String or Element |         | '/'    |
-| itemRender | 自定义链接函数，和 react-router 配置使用 | (route, params, routes, paths) => React.ReactNode | | - |
+| routes    | router 的路由栈信息               | object[]             |         | -      |
+| params    | 路由的参数                        | object            |         | -      |
+| separator | 分隔符自定义                      | string\|ReactNode |         | '/'    |
+| itemRender | 自定义链接函数，和 react-router 配置使用 | (route, params, routes, paths) => ReactNode | | - |
 
 > 2.0 之后，`linkRender` 和 `nameRender` 被移除，请使用 `itemRender` 来代替。
 
diff --git a/components/calendar/index.en-US.md b/components/calendar/index.en-US.md
index d64c71119..73e720a67 100644
--- a/components/calendar/index.en-US.md
+++ b/components/calendar/index.en-US.md
@@ -29,5 +29,5 @@ When data is in the form of date, such as schedule, timetable, prices calendar,
 | fullscreen   | to set whether full-screen display   | boolean     | true         |
 | dateCellRender     | to set the way of renderer the date cell | function(date: moment): ReactNode | - |
 | monthCellRender    | to set the way of renderer the month cell | function(date: moment): ReactNode | - |
-| locale       | set locale | Object   | [default](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
+| locale       | set locale | object   | [default](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
 | onPanelChange| the callback when panel change | function(date: moment, mode: string) | - |
diff --git a/components/calendar/index.zh-CN.md b/components/calendar/index.zh-CN.md
index 2df4ef480..2c1022125 100644
--- a/components/calendar/index.zh-CN.md
+++ b/components/calendar/index.zh-CN.md
@@ -31,5 +31,5 @@ title: Calendar
 | fullscreen   | 是否全屏显示   | boolean     | true         |
 | dateCellRender     | 自定义渲染日期单元格| function(date: moment): ReactNode   | 无 |
 | monthCellRender    | 自定义渲染月单元格  | function(date: moment): ReactNode   | 无 |
-| locale       | 国际化配置     | Object   | [默认配置](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
+| locale       | 国际化配置     | object   | [默认配置](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
 | onPanelChange| 日期面板变化回调 | function(date: moment, mode: string) | 无 |
diff --git a/components/card/index.en-US.md b/components/card/index.en-US.md
index d40391c00..30e8a3072 100644
--- a/components/card/index.en-US.md
+++ b/components/card/index.en-US.md
@@ -19,7 +19,7 @@ A card can be used to display content related to a single subject. The content c
 
 | Property     | Description           | Type     | Default       |
 |----------|----------------|----------|--------------|
-| title    | Card title | React.Element   |  -  |
-| extra    | Content to render in the top-right corner of the card | React.Element   | - |
-| bordered | Toggles rendering of the border around the card | Boolean   |  true  |
-| bodyStyle | Inline style to apply to the card content | Object   |  -  |
+| 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   |  -  |
diff --git a/components/card/index.zh-CN.md b/components/card/index.zh-CN.md
index 4b1a8f4df..e6877ce27 100644
--- a/components/card/index.zh-CN.md
+++ b/components/card/index.zh-CN.md
@@ -20,7 +20,7 @@ cols: 1
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| title    | 卡片标题 | React.Element   |  -  |
-| extra    | 卡片右上角的操作区域 | React.Element   | - |
-| bordered | 是否有边框 | Boolean   |  true  |
-| bodyStyle | 内容区域自定义样式 | Object   |  -  |
+| title    | 卡片标题 | string\|ReactNode   |  -  |
+| extra    | 卡片右上角的操作区域 | string\|ReactNode   | - |
+| bordered | 是否有边框 | boolean   |  true  |
+| bodyStyle | 内容区域自定义样式 | object   |  -  |
diff --git a/components/carousel/index.en-US.md b/components/carousel/index.en-US.md
index 0cfb09606..abba45992 100644
--- a/components/carousel/index.en-US.md
+++ b/components/carousel/index.en-US.md
@@ -16,11 +16,11 @@ A carousel component. Scales with its container.
 
 | Property             | Description                                         | Type     | Default                          |
 |------------------|----------------------------------------------|----------|---------------------------------|
-| effect           | Animation effect, either `scrollx` or `fade`   | String | 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 name                                                   | String   | linear |
+| effect           | Animation effect, either `scrollx` or `fade`   | string | 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 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)  |
 
diff --git a/components/carousel/index.zh-CN.md b/components/carousel/index.zh-CN.md
index e8db4547c..c369d4957 100644
--- a/components/carousel/index.zh-CN.md
+++ b/components/carousel/index.zh-CN.md
@@ -17,11 +17,11 @@ subtitle: 走马灯
 
 | 参数             | 说明                                         | 类型     | 默认值                          |
 |------------------|----------------------------------------------|----------|---------------------------------|
-| effect           | 动画效果函数，可取 scrollx, fade | String | scrollx |
-| dots | 是否显示面板指示点 | Boolean   | true |
-| vertical | 垂直显示 | Boolean   | false |
-| autoplay | 是否自动切换 | Boolean   | false |
-| easing | 动画效果 | String   | linear |
+| effect           | 动画效果函数，可取 scrollx, fade | string | scrollx |
+| dots | 是否显示面板指示点 | boolean   | true |
+| vertical | 垂直显示 | boolean   | false |
+| autoplay | 是否自动切换 | boolean   | false |
+| easing | 动画效果 | string   | linear |
 | beforeChange      | 切换面板的回调                              | function(from, to) | 无
 | afterChange       | 切换面板的回调                              | function(current)  | 无
 
diff --git a/components/cascader/index.en-US.md b/components/cascader/index.en-US.md
index b48d1f718..af9f0aae8 100644
--- a/components/cascader/index.en-US.md
+++ b/components/cascader/index.en-US.md
@@ -22,10 +22,10 @@ Cascade selection box.
 | Property | Description | Type | Default |
 |------|------|------|--------|
 | options | data options of cascade | object | - |
-| defaultValue | initial selected value | array  |[] |
-| value | selected value | array  | - |
+| 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` | - |
-| displayRender | render function of displaying selected options | `(label, selectedOptions) => React.ReactNode` | `label => label.join(' / ')` |
+| displayRender | render function of displaying selected options | `(label, selectedOptions) => ReactNode` | `label => label.join(' / ')` |
 | style | additional style | string | - |
 | className | additional css class | string | - |
 | popupClassName | additional className of popup overlay | string | - |
@@ -36,8 +36,8 @@ Cascade selection box.
 | 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 or Object | false |
-| notFoundContent | Specify content to show when no result matches. | String | 'Not Found' |
+| 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 |
 
@@ -46,7 +46,7 @@ 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): React.ReactNode` | |
+| 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 | |
 
diff --git a/components/cascader/index.zh-CN.md b/components/cascader/index.zh-CN.md
index 163aa938f..efd82ad12 100644
--- a/components/cascader/index.zh-CN.md
+++ b/components/cascader/index.zh-CN.md
@@ -22,23 +22,23 @@ subtitle: 级联选择
 
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|------|--------|
-| options | 可选项数据源 | Object | - |
-| defaultValue | 默认的选中项 | Array  |[] |
-| value | 指定选中项 | Array  | - |
+| options | 可选项数据源 | object | - |
+| defaultValue | 默认的选中项 | [CascaderOptionType](https://git.io/vMMoK)[]  |[] |
+| value | 指定选中项 | [CascaderOptionType](https://git.io/vMMoK)[] | - |
 | onChange | 选择完成后的回调 | `(value, selectedOptions) => void` | - |
-| displayRender | 选择后展示的渲染函数 | `(label, selectedOptions) => React.ReactNode` | `label => label.join(' / ')` |
-| style | 自定义样式 | String | - |
-| className | 自定义类名 | String | - |
-| popupClassName | 自定义浮层类名 | String | - |
+| displayRender | 选择后展示的渲染函数 | `(label, selectedOptions) => ReactNode` | `label => label.join(' / ')` |
+| style | 自定义样式 | string | - |
+| className | 自定义类名 | 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' |
+| 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 |
 
@@ -47,7 +47,7 @@ subtitle: 级联选择
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|------|--------|
 | filter | 接收 `inputValue` `path` 两个参数，当 `path` 符合筛选条件时，应返回 true，反之则返回 false。 | `function(inputValue, path): boolean` | |
-| render | 用于渲染 filter 后的选项 | `function(inputValue, path): React.ReactNode` | |
+| render | 用于渲染 filter 后的选项 | `function(inputValue, path): ReactNode` | |
 | sort | 用于排序 filter 后的选项 | `function(a, b, inputValue)` | |
 | matchInputWidth | 搜索结果列表是否与输入框同宽 | boolean | |
 
diff --git a/components/checkbox/index.en-US.md b/components/checkbox/index.en-US.md
index 43b5a54a1..b92f556bb 100644
--- a/components/checkbox/index.en-US.md
+++ b/components/checkbox/index.en-US.md
@@ -17,15 +17,15 @@ Checkbox.
 
 | 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 |
+| checked | Specifies whether the checkbox is selected. | boolean | false |
+| defaultChecked | Specifies the initial state: whether or not the checkbox is selected. | boolean | false |
 | onChange | The callback function that is triggered when the state changes. | Function(e:Event) | - |
 
 ### Checkbox Group
 
 | Property      | Description             | Type      | Default  |
 |----------|------------------|----------|--------|
-| defaultValue | Default selected value | Array | [] |
-| value | Used for setting the currently selected value. | Array | [] |
-| options  | Specifies options | Array | [] |
+| 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) | - |
diff --git a/components/checkbox/index.zh-CN.md b/components/checkbox/index.zh-CN.md
index 599230455..6e03f9aea 100644
--- a/components/checkbox/index.zh-CN.md
+++ b/components/checkbox/index.zh-CN.md
@@ -18,16 +18,16 @@ title: Checkbox
 
 | 参数      | 说明             | 类型      | 默认值  |
 |----------|------------------|----------|--------|
-| checked | 指定当前是否选中 | Boolean  | false |
-| defaultChecked | 初始是否选中 | Boolean | false |
+| checked | 指定当前是否选中 | boolean  | false |
+| defaultChecked | 初始是否选中 | boolean | false |
 | onChange | 变化时回调函数 | Function(e:Event) | - |
-| indeterminate | 设置 indeterminate 状态，只负责样式控制 | Boolean | false |
+| indeterminate | 设置 indeterminate 状态，只负责样式控制 | boolean | false |
 
 ### Checkbox Group
 
 | 参数      | 说明             | 类型      | 默认值  |
 |----------|------------------|----------|--------|
-| defaultValue | 默认选中的选项 | Array | [] |
-| value | 指定选中的选项| Array | [] |
-| options  | 指定可选项 | Array | [] |
+| defaultValue | 默认选中的选项 | string | [] |
+| value | 指定选中的选项| string | [] |
+| options  | 指定可选项 | string | [] |
 | onChange | 变化时回调函数 | Function(checkedValue) | - |
diff --git a/components/collapse/index.en-US.md b/components/collapse/index.en-US.md
index 2d0fa95d9..4b109e312 100644
--- a/components/collapse/index.en-US.md
+++ b/components/collapse/index.en-US.md
@@ -18,13 +18,13 @@ A content area which can be collapsed and expanded.
 
 | Property     | Description           | Type     | Default       |
 |----------|----------------|----------|--------------|
-| activeKey    | key of the active panel | Array or String   | No default value. In `accordion` mode, it's the key of the first panel.  |
-| defaultActiveKey    | key of the initialized active panel | String   | - |
+| 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 initialized active panel | string   | - |
 | onChange | a callback function, which can be executed when you switch the panels | Function   |  -  |
 
 ### Collapse.Panel
 
 | Property     | Description           | Type     | Default       |
 |----------|----------------|----------|--------------|
-| key    | corresponds to the `activeKey` | String   |  -  |
-| header    | title of the panel | React.Element or String   | - |
+| key    | corresponds to the `activeKey` | string   |  -  |
+| header    | title of the panel | string\|ReactNode   | - |
diff --git a/components/collapse/index.zh-CN.md b/components/collapse/index.zh-CN.md
index ff2cebf21..d65f48669 100644
--- a/components/collapse/index.zh-CN.md
+++ b/components/collapse/index.zh-CN.md
@@ -19,8 +19,8 @@ cols: 1
 
 | 参数             | 说明                                         | 类型     | 默认值                          |
 |------------------|----------------------------------------------|----------|---------------------------------|
-| activeKey        | 当前激活 tab 面板的 key| Array or String   | 默认无，accordion模式下默认第一个元素|
-| defaultActiveKey | 初始化选中面板的 key | String   | 无 |
+| activeKey        | 当前激活 tab 面板的 key| string[]\|string   | 默认无，accordion模式下默认第一个元素|
+| defaultActiveKey | 初始化选中面板的 key | string   | 无 |
 | onChange         | 切换面板的回调                               | Function | 无                              |
 
 
@@ -28,5 +28,5 @@ cols: 1
 
 | 参数 | 说明             | 类型                    | 默认值 |
 |------|------------------|-------------------------|--------|
-| key  | 对应 activeKey   | String                  | 无     |
-| header | 面板头内容 | React.Element or String | 无     |
+| key  | 对应 activeKey   | string                  | 无     |
+| header | 面板头内容 | string\|ReactNode | 无     |
diff --git a/components/date-picker/index.en-US.md b/components/date-picker/index.en-US.md
index d26a92158..f615930c9 100644
--- a/components/date-picker/index.en-US.md
+++ b/components/date-picker/index.en-US.md
@@ -36,17 +36,17 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker.
 
 | Property     | Description    | Type     | Default      |
 |--------------|----------------|----------|--------------|
-| allowClear   | Whether to show clear button | bool | true |
-| disabled     | determine whether the DatePicker is disabled           | Boolean     | false        |
-| 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)  |
+| allowClear   | Whether to show clear button | boolean | true |
+| disabled     | determine whether the DatePicker is disabled           | boolean     | false        |
+| 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 | to specify the date that cannot be selected | function | -           |
 | getCalendarContainer | to set the container of the floating layer, while the default is to create a `div` element in `body` | function(trigger) | - |
-| open | open state of picker | bool | - |
+| 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 or array (RangePicker) | - |
+| placeholder  | placeholder of date input | string\|RangePicker[] | - |
 
 ### DatePicker
 
@@ -54,10 +54,10 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker.
 |--------------|----------------|----------|--------------|
 | 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" |
+| 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) |
-| showToday    | whether to show "Today" button | Boolean | true |
+| showTime     | to provide an additional time selection  | object\|boolean | [TimePicker Options](/components/time-picker/#api) |
+| showToday    | whether to show "Today" button | boolean | true |
 | disabledTime | to specify the time that cannot be selected | function(date) | - |
 
 ### MonthPicker
@@ -66,9 +66,9 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker.
 |--------------|----------------|----------|--------------|
 | 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" |
+| 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) | -           |
-| monthCellContentRender | Custom month cell content render method | function(date, locale): React.Node | - |
+| monthCellContentRender | Custom month cell content render method | function(date, locale): ReactNode | - |
 
 ### RangePicker
 
@@ -76,11 +76,11 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker.
 |--------------|----------------|----------|--------------|
 | 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" |
+| 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     | to provide an additional time selection  | object\|boolean | [TimePicker Options](/components/time-picker/#api) |
 | disabledTime | to specify the time that cannot be selected | function(dates: [moment, moment], partial: `'start'|'end'`) | - |
-| ranges       | preseted ranges for quick selection | Object { [range: string]: [moment, moment] } | - |
+| ranges       | preseted ranges for quick selection | { [range: string]: [moment](http://momentjs.com/)[] } | - |
 
 <style>
 .code-box-demo .ant-calendar-picker {
diff --git a/components/date-picker/index.zh-CN.md b/components/date-picker/index.zh-CN.md
index 84be53847..a5ecb88de 100644
--- a/components/date-picker/index.zh-CN.md
+++ b/components/date-picker/index.zh-CN.md
@@ -37,17 +37,17 @@ moment.locale('zh-cn');
 
 | 参数          | 说明            | 类型     | 默认值        |
 |--------------|----------------|----------|--------------|
-| allowClear   | 是否显示清除按钮 | bool     | true         |
-| disabled     | 禁用           | bool     | false        |
+| allowClear   | 是否显示清除按钮 | boolean     | true         |
+| disabled     | 禁用           | boolean     | false        |
 | 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 | 不可选择的日期 | function | 无           |
 | getCalendarContainer | 定义浮层的容器，默认为 body 上新建 div | function(trigger) | 无 |
-| open | 控制弹层是否展开 | bool | - |
+| open | 控制弹层是否展开 | boolean | - |
 | onOpenChange   | 弹出日历和关闭日历的回调 | function(status) | 无 |
-| placeholder  | 输入框提示文字 | string or array (RangePicker) | - |
+| placeholder  | 输入框提示文字 | string\|RangePicker[] | - |
 
 ### DatePicker
 
@@ -57,8 +57,8 @@ moment.locale('zh-cn');
 | defaultValue | 默认日期       | [moment](http://momentjs.com/)   | 无           |
 | format       | 展示的日期格式，配置参考 [moment.js](http://momentjs.com/) | string   | "YYYY-MM-DD" |
 | onChange     | 时间发生变化的回调 | function(date: moment, dateString: string) | 无           |
-| showTime     | 增加时间选择功能  | Object or Boolean | [TimePicker Options](/components/time-picker/#api) |
-| showToday    | 是否展示“今天”按钮 | Boolean | true |
+| showTime     | 增加时间选择功能  | Object\|boolean | [TimePicker Options](/components/time-picker/#api) |
+| showToday    | 是否展示“今天”按钮 | boolean | true |
 | disabledTime | 不可选择的时间 | function(date) | 无 |
 
 ### MonthPicker
@@ -69,19 +69,19 @@ moment.locale('zh-cn');
 | defaultValue | 默认日期       | [moment](http://momentjs.com/)   | 无           |
 | format       | 展示的日期格式，配置参考 [moment.js](http://momentjs.com/) | string   | "YYYY-MM" |
 | onChange     | 时间发生变化的回调，发生在用户选择时间时 | function(date: moment, dateString: string) | -           |
-| monthCellContentRender | 自定义的月份内容渲染方法 | function(date, locale): React.Node | - |
+| monthCellContentRender | 自定义的月份内容渲染方法 | function(date, locale): ReactNode | - |
 
 ### RangePicker
 
 | 参数         | 说明           | 类型     | 默认值       |
 |--------------|----------------|----------|--------------|
-| value        | 日期          | [[moment](http://momentjs.com/), [moment](http://momentjs.com/)]   | 无           |
-| defaultValue | 默认日期       | [[moment](http://momentjs.com/), [moment](http://momentjs.com/)]   | 无           |
+| 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 or Boolean | [TimePicker Options](/components/time-picker/#api) |
+| showTime     | 增加时间选择功能  | Object\|boolean | [TimePicker Options](/components/time-picker/#api) |
 | disabledTime | 不可选择的时间 | function(dates: [moment, moment], partial: `'start'|'end'`) | 无 |
-| ranges       | 预设事件范围快捷选择 | Object { [range: string]: [moment, moment] } | 无 |
+| ranges       | 预设事件范围快捷选择 | { [range: string]: [moment](http://momentjs.com/)[] } | 无 |
 
 <style>
 .code-box-demo .ant-calendar-picker {
diff --git a/components/dropdown/index.en-US.md b/components/dropdown/index.en-US.md
index 3b56c4815..eebfbd6d8 100644
--- a/components/dropdown/index.en-US.md
+++ b/components/dropdown/index.en-US.md
@@ -16,10 +16,10 @@ If there are too many operations to display, you can wrap them in a `Dropdown`.
 
 | Property         | Description           | Type     | Default       |
 |--------------|----------------|----------|--------------|
-| trigger        | the trigger mode which can execute the drop-down action  | ['click'] or ['hover']   | ['hover']           |
+| trigger        | the trigger mode which can execute 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 | determine whether the dropdown menu is visible | Boolean | -           |
+| visible | determine whether the dropdown menu is visible | boolean | -           |
 | onVisibleChange     | a callback function takes an argument: `visible`, can be executed when the visible state is changing | Function           | - |
 
 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 `antd.Menu.Item` and `antd.Menu.Divider` respectively.
@@ -31,9 +31,9 @@ You can get the menu list by `antd.Menu`, and set a callback function `onSelect`
 
 | Property         | Description           | Type     | Default       |
 |--------------|----------------|----------|--------------|
-| type        | type of the button, the same as [Button](/components/button)   | String   | 'default'           |
+| type        | type 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 can execute the drop-down action | ['click'] or ['hover']   | ['hover'] |
+| trigger       | the trigger mode which can execute the drop-down action | Array<'click'\|'hover'>   | ['hover'] |
 | overlay | the dropdown menu | [Menu](/components/menu) | -           |
-| visible     | determine whether the dropdown menu is visible | Boolean | -           |
+| visible     | determine whether the dropdown menu is visible | boolean | -           |
 | onVisibleChange     | a callback function takes an argument: `visible`, can be executed when the visible state is changing | Function     | -        |
diff --git a/components/dropdown/index.zh-CN.md b/components/dropdown/index.zh-CN.md
index 1ac4cb72a..9a55748af 100644
--- a/components/dropdown/index.zh-CN.md
+++ b/components/dropdown/index.zh-CN.md
@@ -17,10 +17,10 @@ title: Dropdown
 
 | 参数        | 说明             | 类型               | 默认值       |
 |-------------|------------------|--------------------|--------------|
-| trigger     | 触发下拉的行为   | ['click'] or ['hover'] | ['hover']        |
+| 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   | -           |
+| visible     | 菜单是否显示 | boolean   | -           |
 | onVisibleChange  | 菜单显示状态改变时调用，参数为 visible | Function | - |
 
 菜单可由 `antd.Menu` 取得，可设置 `onSelect` 回调，菜单还包括菜单项 `antd.Menu.Item`，分割线 `antd.Menu.Divider`。
@@ -31,9 +31,9 @@ title: Dropdown
 
 | 参数        | 说明             | 类型               | 默认值       |
 |-------------|------------------|--------------------|--------------|
-| type        | 按钮类型，和 [Button](/components/button/) 一致 | String | 'default' |
+| type        | 按钮类型，和 [Button](/components/button/) 一致 | string | 'default' |
 | onClick     | 点击左侧按钮的回调，和 [Button](/components/button/) 一致 | Function   | - |
-| trigger     | 触发下拉的行为   | ['click'] or ['hover'] | ['hover']        |
+| trigger     | 触发下拉的行为   | Array<'click'\|'hover'> | ['hover']        |
 | overlay     | 菜单         | [Menu](/components/menu/) | -     |
-| visible     | 菜单是否显示 | Boolean   | -           |
+| visible     | 菜单是否显示 | boolean   | -           |
 | onVisibleChange  | 菜单显示状态改变时调用，参数为 visible | Function | - |
diff --git a/components/form/index.en-US.md b/components/form/index.en-US.md
index cd0646daf..ce5aab94d 100644
--- a/components/form/index.en-US.md
+++ b/components/form/index.en-US.md
@@ -95,8 +95,8 @@ If you use `react@<15.3.0`, then, you can't use `getFieldDecorator` in stateless
 | options.initialValue | You can specify initial value, type, optional value of children node. | | n/a |
 | options.trigger | When to collect the value of children node | string | 'onChange' |
 | options.getValueFromEvent | To convert parameters of onChange to the value of control | function(..args) | [reference](https://github.com/react-component/form#optiongetvaluefromevent) |
-| options.validateTrigger | When to validate the value of children node. | string \| string[] | 'onChange' |
-| options.rules | Includes validation rules. Please refer to [async-validator](https://github.com/yiminghe/async-validator#rules) for details. | array | n/a |
+| options.validateTrigger | When to validate the value of children node. | string\|string[] | 'onChange' |
+| options.rules | Includes validation rules. Please refer to [async-validator](https://github.com/yiminghe/async-validator#rules) for details. | object[] | n/a |
 | options.exclusive | Whether it is exclusive with other controls, particularly for Radio. | boolean | false |
 
 ### Form.Item
@@ -107,11 +107,11 @@ Note:
 
 | Property      | Description                          | Type   | Default Value |
 |---------------|--------------------------------------|--------|---------------|
-| label | Label text | React.Node |   |
+| label | Label text | string\|ReactNode |   |
 | labelCol | The layout of label. You can set `span` `offset` to something like `{span: 3, offset: 12}` same as with `<Col>` | object |  |
 | wrapperCol | The layout for input controls. Same as `labelCol` | object |  |
-| help | The prompt message. If not provided, the prompt message will be generated by the validation rule. | React.Node |  |
-| extra | The extra prompt message. It is similar to help. Usage example: to display error message and prompt message at the same time. | React.Node |  |
+| help | The prompt message. If not provided, the prompt message will be generated by the validation rule. | string\|ReactNode |  |
+| 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 |  |
 | 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 |
diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md
index 70690d300..b27f05416 100644
--- a/components/form/index.zh-CN.md
+++ b/components/form/index.zh-CN.md
@@ -96,8 +96,8 @@ CustomizedForm = Form.create({})(CustomizedForm);
 | options.initialValue | 子节点的初始值，类型、可选值均由子节点决定  | | |
 | options.trigger | 收集子节点的值的时机 | string | 'onChange' |
 | options.getValueFromEvent | 可以把 onChange 的参数转化为控件的值 | function(..args) | [reference](https://github.com/react-component/form#optiongetvaluefromevent) |
-| options.validateTrigger | 校验子节点值的时机 | string \| string[] | 'onChange' |
-| options.rules | 校验规则，参见 [async-validator](https://github.com/yiminghe/async-validator#rules) | array | |
+| options.validateTrigger | 校验子节点值的时机 | string\|string[] | 'onChange' |
+| options.rules | 校验规则，参见 [async-validator](https://github.com/yiminghe/async-validator#rules) | object[] | |
 | options.exclusive | 是否和其他控件互斥，特别用于 Radio 单选控件 | boolean | false |
 
 ### Form.Item
@@ -108,11 +108,11 @@ CustomizedForm = Form.create({})(CustomizedForm);
 
 | 参数      | 说明                                     | 类型       | 默认值 |
 |-----------|-----------------------------------------|-----------|--------|
-| label | label 标签的文本 | React.Node |  |
+| label | label 标签的文本 | string\|ReactNode |  |
 | labelCol | label 标签布局，通 `<Col>` 组件，设置 `span` `offset` 值，如 `{span: 3, offset: 12}` | object | |
 | wrapperCol | 需要为输入控件设置布局样式时，使用该属性，用法同 labelCol | object | |
-| help | 提示信息，如不设置，则会根据校验规则自动生成 | React.Node | |
-| extra | 额外的提示信息，和 help 类似，当需要错误信息和提示文案同时出现时，可以使用这个。 | React.Node | |
+| help | 提示信息，如不设置，则会根据校验规则自动生成 | string\|ReactNode | |
+| extra | 额外的提示信息，和 help 类似，当需要错误信息和提示文案同时出现时，可以使用这个。 | string\|ReactNode | |
 | required | 是否必填，如不设置，则会根据校验规则自动生成 | boolean | false |
 | validateStatus | 校验状态，如不设置，则会根据校验规则自动生成，可选：'success' 'warning' 'error' 'validating' | string |  |
 | hasFeedback | 配合 validateStatus 属性使用，展示校验状态图标，建议只配合 Input 组件使用 | boolean | false  |
diff --git a/components/grid/index.zh-CN.md b/components/grid/index.zh-CN.md
index afb0fb948..c28ca1847 100644
--- a/components/grid/index.zh-CN.md
+++ b/components/grid/index.zh-CN.md
@@ -103,7 +103,7 @@ Ant Design 的布局组件若不能满足你的需求，你也可以直接使用
 | offset   | 栅格左侧的间隔格数，间隔内不可以有栅格  | number | 0        |
 | push     | 栅格向右移动格数   | number | 0        |
 | pull     | 栅格向左移动格数   | number | 0        |
-| xs       | `<768px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number or object | - |
-| sm       | `≥768px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number or object | - |
-| md       | `≥992px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number or object | - |
-| lg       | `≥1200px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number or object | - |
+| xs       | `<768px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
+| sm       | `≥768px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
+| md       | `≥992px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
+| lg       | `≥1200px` 响应式栅格，可为栅格数或一个包含其他属性的对象 | number\|object | - |
diff --git a/components/input-number/index.en-US.md b/components/input-number/index.en-US.md
index 1cd9dd7b5..9d8527e49 100644
--- a/components/input-number/index.en-US.md
+++ b/components/input-number/index.en-US.md
@@ -14,11 +14,11 @@ When a numeric value needs to be provided.
 
 | 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 or String      |  1      |
-| defaultValue     | initial value       | Number      |            |
+| 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      |
+| defaultValue     | initial value       | number      |            |
 | onChange     | The callback triggered when the value is changed.     | Function      |            |
-| disabled     | disable the input       | Boolean      |      false      |
-| size    | width of input box  | String      |      none      |
+| disabled     | disable the input       | boolean      |      false      |
+| size    | width of input box  | string      |      none      |
diff --git a/components/input-number/index.zh-CN.md b/components/input-number/index.zh-CN.md
index cf8072193..7a84a2fd5 100644
--- a/components/input-number/index.zh-CN.md
+++ b/components/input-number/index.zh-CN.md
@@ -17,11 +17,11 @@ title: InputNumber
 
 | 成员        | 说明           | 类型               | 默认值       |
 |-------------|----------------|--------------------|--------------|
-| min     | 最小值   | Number | -Infinity        |
-| max     | 最大值       | Number      | Infinity           |
-| value     | 当前值       | Number      |            |
-| step     | 每次改变步数，可以为小数  | Number or String      |  1      |
-| defaultValue     | 初始值       | Number      |            |
+| min     | 最小值   | number | -Infinity        |
+| max     | 最大值       | number      | Infinity           |
+| value     | 当前值       | number      |            |
+| step     | 每次改变步数，可以为小数  | number\|string      |  1      |
+| defaultValue     | 初始值       | number      |            |
 | onChange     | 变化回调       | Function      |            |
-| disabled     | 禁用       | Boolean      |      false      |
-| size    | 输入框大小  | String      |      无      |
+| disabled     | 禁用       | boolean      |      false      |
+| size    | 输入框大小  | string      |      无      |
diff --git a/components/input/index.en-US.md b/components/input/index.en-US.md
index ecc9ea587..04f0e195b 100644
--- a/components/input/index.en-US.md
+++ b/components/input/index.en-US.md
@@ -24,12 +24,12 @@ Keyboard and mouse can be used for providing or changing data.
 | 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` |
 | disabled | Tell if the input is disabled. | boolean | false |
-| addonBefore | The label text displayed before (on the left side of) the input field. | React.Node |   |
-| addonAfter | The label text displayed after (on the right side of) the input field. | React.Node  |   |
-| prefix | The Input with prefix icon. | React.Node | |
-| suffix | The Input with suffix icon. | React.Node | |
+| 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 Input with prefix icon. | string\|ReactNode | |
+| suffix | The Input with suffix icon. | string\|ReactNode | |
 | onPressEnter | The callback function that is triggered when pressing Enter key. | function(e) |   |
-| autosize | Height autosize feature, available when type="textarea", can be set to `true|false` or a object `{ minRows: 2, maxRows: 6 }` | boolean or object | false |
+| autosize | Height autosize feature, available when type="textarea", can be set to `true|false` or a object `{ minRows: 2, maxRows: 6 }` | boolean\|object | false |
 
 > 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 are automatically set.
diff --git a/components/input/index.zh-CN.md b/components/input/index.zh-CN.md
index 980ed8107..b44f23954 100644
--- a/components/input/index.zh-CN.md
+++ b/components/input/index.zh-CN.md
@@ -24,12 +24,12 @@ title: Input
 | defaultValue | 输入框默认内容 | string | |
 | size | 控件大小。注：标准表单内的输入框大小限制为 `large`。可选 `large` `default` `small` | string | `default` |
 | disabled | 是否禁用状态，默认为 false | boolean | false |
-| addonBefore | 带标签的 input，设置前置标签 | React.Node | |
-| addonAfter | 带标签的 input，设置后置标签 | React.Node | |
-| prefix | 带有前缀图标的 input | React.Node | |
-| suffix | 带有后缀图标的 input | React.Node | |
+| addonBefore | 带标签的 input，设置前置标签 | string\|ReactNode | |
+| addonAfter | 带标签的 input，设置后置标签 | string\|ReactNode | |
+| prefix | 带有前缀图标的 input | string\|ReactNode | |
+| suffix | 带有后缀图标的 input | string\|ReactNode | |
 | onPressEnter | 按下回车的回调 | function(e) | |
-| autosize | 自适应内容高度，只对 `type="textarea"` 有效，可设置为 `true|false` 或对象：`{ minRows: 2, maxRows: 6 }` | boolean or object | false |
+| autosize | 自适应内容高度，只对 `type="textarea"` 有效，可设置为 `true|false` 或对象：`{ minRows: 2, maxRows: 6 }` | boolean\|object | false |
 
 > 如果 `Input` 在 `Form.Item` 内，并且 `Form.Item` 设置了 `id` 和 `options` 属性，则 `value` `defaultValue` 和 `id` 属性会被自动设置。
 
diff --git a/components/layout/index.en-US.md b/components/layout/index.en-US.md
index adad92df3..e0d9fca31 100644
--- a/components/layout/index.en-US.md
+++ b/components/layout/index.en-US.md
@@ -37,7 +37,7 @@ The wrapper.
 
 Property | Description | Type | Default
 -----|-----|-----|------
-style | to custom the styles | Object | -
+style | to custom the styles | object | -
 className | container className | string | -
 
 > API of `Layout.Header` `Layout.Footer` `Layout.Content` is the same with `Layout`.
@@ -48,12 +48,12 @@ The sidebar.
 
 Property | Description | Type | Default
 -----|-----|-----|------
-collapsible | whether can be collapsed | Boolean | false
-defaultCollapsed | to set the initial status | Boolean | false  |
-collapsed | to set the current status | Boolean | -
+collapsible | whether can be collapsed | boolean | false
+defaultCollapsed | to set the initial status | boolean | false  |
+collapsed | to set the current status | boolean | -
 onCollapse | the callback function, can be executed when you switch the sidebar, available only `collapsible: true` | (collapsed) => {}  | -
-trigger | specify the customized trigger, set to null to hide the trigger | React.ReactNode or null | - |
-width | width of the sidebar | Number or String | 200
-collapsedWidth | width of the collapsed sidebar, available only `collapsible: true` | Number | 64
-style | to custom 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
+collapsedWidth | width of the collapsed sidebar, available only `collapsible: true` | number | 64
+style | to custom the styles | object | -
 className | container className | string | -
diff --git a/components/layout/index.zh-CN.md b/components/layout/index.zh-CN.md
index 4cb0080a8..8898f4809 100644
--- a/components/layout/index.zh-CN.md
+++ b/components/layout/index.zh-CN.md
@@ -38,7 +38,7 @@ title: Layout
 
 | 参数      | 说明                                      | 类型         | 默认值 |
 |----------|------------------------------------------|-------------|-------|
-| style | 指定样式 | Object | - |
+| style | 指定样式 | object | - |
 | className | 容器 className | string | - |
 
 > `Layout.Header` `Layout.Footer` `Layout.Content` API 与 `Layout` 相同
@@ -49,12 +49,12 @@ title: Layout
 
 | 参数      | 说明                                     | 类型       | 默认值 |
 |----------|-----------------------------------------|------------|-------|
-| collapsible | 是否可收起 | Boolean | false  |
-| defaultCollapsed | 是否默认收起 | Boolean | false  |
-| collapsed | 当前收起状态 | Boolean | - |
+| collapsible | 是否可收起 | boolean | false  |
+| defaultCollapsed | 是否默认收起 | boolean | false  |
+| collapsed | 当前收起状态 | boolean | - |
 | onCollapse | 展开-收起时的回调函数，仅当 `collapsible:true` 时生效 | (collapsed) => {} | - |
-| trigger | 自定义 trigger，设置为 null 时隐藏 trigger | React.ReactNode or null | - |
-| width | 宽度 | Number or String | 200 |
-| collapsedWidth | 收缩宽度，仅当 `collapsible:true` 时生效 | Number | 64 |
-| style | 指定样式 | Object | - |
+| trigger | 自定义 trigger，设置为 null 时隐藏 trigger | string\|ReactNode | - |
+| width | 宽度 | number\|string | 200 |
+| collapsedWidth | 收缩宽度，仅当 `collapsible:true` 时生效 | number | 64 |
+| style | 指定样式 | object | - |
 | className | 容器 className | string | - |
diff --git a/components/locale-provider/index.en-US.md b/components/locale-provider/index.en-US.md
index 5dd129e0c..4dd190d8f 100644
--- a/components/locale-provider/index.en-US.md
+++ b/components/locale-provider/index.en-US.md
@@ -32,4 +32,4 @@ This component aims for localization of the built-in text, if you want to suppor
 
 Property | Description | Type | Default
 -----|-----|-----|------
-locale | language package setting, you can find the packages in this path: `antd/lib/locale-provider/` | Object | -
+locale | language package setting, you can find the packages in this path: `antd/lib/locale-provider/` | object | -
diff --git a/components/locale-provider/index.zh-CN.md b/components/locale-provider/index.zh-CN.md
index 5cd04cd98..d1edb3d1f 100644
--- a/components/locale-provider/index.zh-CN.md
+++ b/components/locale-provider/index.zh-CN.md
@@ -33,4 +33,4 @@ We supply an English locale package. Other language users can create a locale pa
 
 | 参数    | 说明           | 类型              | 默认值        |
 |--------|----------------|------------------|--------------|
-| locale | 语言包配置，语言包可到 `antd/lib/locale-provider/` 目录下寻找 | Object | - |
+| locale | 语言包配置，语言包可到 `antd/lib/locale-provider/` 目录下寻找 | object | - |
diff --git a/components/mention/index.en-US.md b/components/mention/index.en-US.md
index 9d4dc831e..017271a94 100644
--- a/components/mention/index.en-US.md
+++ b/components/mention/index.en-US.md
@@ -23,20 +23,20 @@ When need to mention someone or something.
 
 | API     | Description           | Type     |
 |----------|---------------|----------|--------------|
-| toString    | convert EditorState to string | Function(editorState: EditorState): String |
-| toEditorState    | convert string to  EditorState | Function(string: String): EditorState |
-| getMentions    | get mentioned people in current editorState | Function(editorState: EditorState): Array<String> |
+| toString    | convert EditorState to string | Function(editorState: EditorState): string |
+| toEditorState    | convert string to  EditorState | Function(value: string): EditorState |
+| getMentions    | get mentioned people in current editorState | Function(editorState: EditorState): string[] |
 
 
 ### Mention props
 
 | Property     | Description          | Type     | Default       |
 |----------|---------------|----------|--------------|
-| suggestions    | suggestion content | Array<string> or Array<Mention.Nav> | [] |
-| suggestionStyle | style of suggestion container | Object | {} |
-| onSearchChange | Callback function called when search content changes | function(value:String) | [] |
+| suggestions    | suggestion content | Array<string\|Mention.Nav> | [] |
+| suggestionStyle | style of suggestion container | object | {} |
+| onSearchChange | Callback function called when search content changes | function(value:string) | [] |
 | onChange | Callback function called when content of input changes | function(editorState: EditorState) | null |
-| onSelect | Callback function called when select from suggestions | function(suggestion: String, data?: any) | null |
+| onSelect | Callback function called when select from suggestions | function(suggestion: string, data?: any) | null |
 | notFoundContent| suggestion when suggestions empty | string | '无匹配结果，轻敲空格完成输入' |
 | loading | loading mode | boolean | false |
 | multiLines | multilines mode | boolean | false |
@@ -53,4 +53,4 @@ When need to mention someone or something.
 | Property     | Description           | Type     | Default       |
 |----------|---------------|----------|--------------|
 | value    | value of suggestion，the value will insert into input filed while selected | string | "" |
-| children | suggestion content | Object | {} |
+| children | suggestion content | object | {} |
diff --git a/components/mention/index.zh-CN.md b/components/mention/index.zh-CN.md
index 89267bb5d..77a83b74d 100644
--- a/components/mention/index.zh-CN.md
+++ b/components/mention/index.zh-CN.md
@@ -24,19 +24,19 @@ title: Mention
 
 | API     | 说明           | 类型     |
 |----------|---------------|----------|
-| toString    | 把 EditorState 转成字符串 | Function(editorState: EditorState): String |
-| toEditorState    | 把字符串转成 EditorState | Function(string: String): EditorState |
-| getMentions    | 获取当前 editorState 中提到的人的列表 | Function(editorState: EditorState): Array<String> |
+| toString    | 把 EditorState 转成字符串 | Function(editorState: EditorState): string |
+| toEditorState    | 把字符串转成 EditorState | Function(value: string): EditorState |
+| getMentions    | 获取当前 editorState 中提到的人的列表 | Function(editorState: EditorState): string[] |
 
 ### Mention props
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|---------------|----------|--------------|
-| suggestions    | 建议内容 | Array<string> or Array<Mention.Nav> | [] |
-| suggestionStyle | 弹出下拉框样式 | Object | {} |
-| onSearchChange | 输入框中 @ 变化时回调 | function(value:String) | [] |
+| suggestions    | 建议内容 | Array<string\|Mention.Nav> | [] |
+| suggestionStyle | 弹出下拉框样式 | object | {} |
+| onSearchChange | 输入框中 @ 变化时回调 | function(value:string) | [] |
 | onChange | 输入框内容变化时回调 | function(editorState: EditorState) | null |
-| onSelect | 下拉框选择建议时回调 | function(suggestion: String, data?: any) | null |
+| onSelect | 下拉框选择建议时回调 | function(suggestion: string, data?: any) | null |
 | notFoundContent| 未找到时的内容 | string | '无匹配结果，轻敲空格完成输入' |
 | loading | 加载中 | boolean | false |
 | multiLines | 多行模式 | boolean | false |
@@ -53,4 +53,4 @@ title: Mention
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|---------------|----------|--------------|
 | value    | 建议值，选择建议时，用此值插入到输入框中 | string | "" |
-| children | 建议内容 | Object | {} |
+| children | 建议内容 | object | {} |
diff --git a/components/menu/index.en-US.md b/components/menu/index.en-US.md
index 7abd934c8..11ba4ec00 100644
--- a/components/menu/index.en-US.md
+++ b/components/menu/index.en-US.md
@@ -28,17 +28,17 @@ More layout and samples: [layout](/docs/spec/layout).
 
 | Param    | Description   | Type     | Default value       |
 |----------|---------------|----------|--------------|
-| theme    | color of the theme | String: `light` `dark` | `light` |
-| mode | type of the menu; vertical, horizontal, and inline modes are supported | String: vertical horizontal inline | vertical |
-| selectedKeys | array with the keys of currently selected menu items | Array |      |
-| defaultSelectedKeys | array with the keys of default selected menu items | Array |      |
-| openKeys | array with the keys of currently opened sub menus | Array |  |
+| theme    | color of the theme | string: `light` `dark` | `light` |
+| mode | type of the menu; vertical, horizontal, and inline modes are supported | string: vertical horizontal inline | vertical |
+| selectedKeys | array with the keys of currently selected menu items | string[] |      |
+| defaultSelectedKeys | array with the keys of default selected menu items | string[] |      |
+| openKeys | array with the keys of currently opened sub menus | string[] |  |
 | defaultOpenKeys | array with the keys of default opened sub menus |  |      |
 | onOpenChange | called when open/close sub menu | Function(openKeys: string[]) | noop |
 | onSelect | callback of the selected item | Function({ item, key, selectedKeys }) | none   |
 | onDeselect | callback of the deselected item, only supported for multiple mode | Function({ item, key, selectedKeys }) | - |
 | onClick | callback of the clicked menu item, params: {item, key, keyPath} | function | - |
-| style | style of the root node | Object | |
+| style | style of the root node | object | |
 | inlineIndent | indent px of inline menu item on each level | number | 24 |
 
 > More options in [rc-menu](https://github.com/react-component/menu#api)
@@ -47,24 +47,24 @@ More layout and samples: [layout](/docs/spec/layout).
 
 | Param    | Description    | Type     | Default value       |
 |----------|----------------|----------|--------------|
-| disabled    | disabled or not | Boolean   |  false  |
-| key   | unique id of the menu item |  String |  |
+| disabled    | disabled or not | boolean   |  false  |
+| key   | unique id of the menu item |  string |  |
 
 ### Menu.SubMenu props
 
 | Param    | Description    | Type     | Default value       |
 |----------|----------------|----------|--------------|
-| disabled    | disabled or not | Boolean   |  false  |
-| key   | unique id of the menu item |  String |  |
-| title    | title of the sub menu | String or React.Element   |    |
-| children | sub menus or sub menu items | (MenuItem or SubMenu)[] |  |
+| disabled    | disabled or not | boolean   |  false  |
+| key   | unique id of the menu item |  string |  |
+| title    | title of the sub menu | string\|ReactNode   |    |
+| children | sub menus or sub menu items | Arrat<MenuItem\|SubMenu> |  |
 | onTitleClick | callback of the clicked sub menu title | Function({ eventKey, domEvent }) |  |
 
 ### Menu.ItemGroup props
 
 | Param    | Description    | Type     | Default value       |
 |----------|----------------|----------|--------------|
-| title    | title of the group       | String or React.Element |    |
+| title    | title of the group       | string\|ReactNode |    |
 | children | sub menu items    | MenuItem[] |  |
 
 ### Menu.Divider
diff --git a/components/menu/index.zh-CN.md b/components/menu/index.zh-CN.md
index 930243cd0..aaf13285a 100644
--- a/components/menu/index.zh-CN.md
+++ b/components/menu/index.zh-CN.md
@@ -29,17 +29,17 @@ subtitle: 导航菜单
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|---------------|----------|--------------|
-| theme    | 主题颜色 | String: `light` `dark` | `light` |
-| mode | 菜单类型，现在支持垂直、水平、和内嵌模式三种 | String: `vertical` `horizontal` `inline` | `vertical` |
-| selectedKeys | 当前选中的菜单项 key 数组 | Array |      |
-| defaultSelectedKeys | 初始选中的菜单项 key 数组 | Array |      |
-| openKeys | 当前展开的 SubMenu 菜单项 key 数组 | Array |  |
+| theme    | 主题颜色 | string: `light` `dark` | `light` |
+| mode | 菜单类型，现在支持垂直、水平、和内嵌模式三种 | string: `vertical` `horizontal` `inline` | `vertical` |
+| selectedKeys | 当前选中的菜单项 key 数组 | string[] |      |
+| defaultSelectedKeys | 初始选中的菜单项 key 数组 | string[] |      |
+| openKeys | 当前展开的 SubMenu 菜单项 key 数组 | string[] |  |
 | defaultOpenKeys | 初始展开的 SubMenu 菜单项 key 数组 |  |      |
 | onOpenChange | SubMenu 展开/关闭的回调 | Function(openKeys: string[]) | noop |
 | onSelect | 被选中时调 | Function({ item, key, selectedKeys }) | 无   |
 | onDeselect | 取消选中时调用，仅在 multiple 生效 | Function({ item, key, selectedKeys }) | - |
 | onClick | 点击 menuitem 调用此函数，参数为 {item, key, keyPath} | function | - |
-| style | 根节点样式 | Object | |
+| style | 根节点样式 | object | |
 | inlineIndent | inline 模式的菜单缩进宽度 | number | 24 |
 
 > More options in [rc-menu](https://github.com/react-component/menu#api)
@@ -48,24 +48,24 @@ subtitle: 导航菜单
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| disabled    | 是否禁用 | Boolean   |  false  |
-| key   | item 的唯一标志 |  String |  |
+| disabled    | 是否禁用 | boolean   |  false  |
+| key   | item 的唯一标志 |  string |  |
 
 ### Menu.SubMenu props
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| disabled    | 是否禁用 | Boolean   |  false  |
-| key | 唯一标志 |  String |  |
-| title    | 子菜单项值 | String or React.Element   |    |
-| children | 子菜单的菜单项 | (MenuItem or SubMenu)[] |  |
+| disabled    | 是否禁用 | boolean   |  false  |
+| key | 唯一标志 |  string |  |
+| title    | 子菜单项值 | string\|ReactNode |    |
+| children | 子菜单的菜单项 | Array<MenuItem\|SubMenu> |  |
 | onTitleClick | 点击子菜单标题 | Function({ eventKey, domEvent }) |  |
 
 ### Menu.ItemGroup props
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| title    | 分组标题       | String or React.Element |    |
+| title    | 分组标题       | string\|ReactNode |    |
 | children | 分组的菜单项    | MenuItem[] |  |
 
 ### Menu.Divider
diff --git a/components/message/index.en-US.md b/components/message/index.en-US.md
index 388fcb87c..88c7063f5 100644
--- a/components/message/index.en-US.md
+++ b/components/message/index.en-US.md
@@ -25,7 +25,7 @@ This components provides 4 static methods, with arguments as following:
 
 | Argument   | Description                        | Type                     | Default      |
 |------------|------------------------------------|--------------------------|--------------|
-| content    | content of the message             | React.Element or String  | -            |
+| content    | content of the message             | string\|ReactNode | -            |
 | duration   | time before auto-dismiss,in seconds | number                   | 1.5          |
 
 Methods for global configuration and destruction are also provided:
@@ -42,5 +42,5 @@ message.config({
 
 | Argument   | Description                        | Type                     | Default     |
 |------------|------------------------------------|--------------------------|-------------|
-| top        | distance to top                    | Number                   | 24px        |
-| duration   | time before auto-dismiss,in seconds | Number                   | 1.5         |
+| top        | distance to top                    | number                   | 24px        |
+| duration   | time before auto-dismiss,in seconds | number                   | 1.5         |
diff --git a/components/message/index.zh-CN.md b/components/message/index.zh-CN.md
index d47a4d286..23205b3ad 100644
--- a/components/message/index.zh-CN.md
+++ b/components/message/index.zh-CN.md
@@ -26,7 +26,7 @@ title: Message
 
 | 参数       | 说明           | 类型                       | 默认值       |
 |------------|----------------|--------------------------|--------------|
-| content    | 提示内容       | React.Element or String    | -           |
+| content    | 提示内容       | string\|ReactNode | -           |
 | duration   | 自动关闭的延时，单位秒 | number               | 1.5          |
 
 还提供了全局配置和全局销毁方法：
@@ -43,5 +43,5 @@ message.config({
 
 | 参数       | 说明                | 类型                       | 默认值       |
 |------------|--------------------|--------------------------|-------------|
-| top        | 消息距离顶部的位置 | Number                      | 24px        |
-| duration   | 默认自动关闭延时，单位秒 | Number                 | 1.5         |
+| top        | 消息距离顶部的位置 | number                      | 24px        |
+| duration   | 默认自动关闭延时，单位秒 | number                 | 1.5         |
diff --git a/components/modal/index.en-US.md b/components/modal/index.en-US.md
index f97042842..bc52eed51 100644
--- a/components/modal/index.en-US.md
+++ b/components/modal/index.en-US.md
@@ -18,19 +18,19 @@ and so on.
 
 | Property       | Description           | Type             | Default       |
 |------------|----------------|------------------|--------------|
-| visible    | Determine whether a modal dialog is visible or not | Boolean | no |
-| confirmLoading | Determine whether to apply loading visual effect for OK button or not  | Boolean    | no           |
-| title      | The modal dialog's title          | React.Element    | no           |
-| closable   | Determine whether a close (x) button is visible on top right of the modal dialog or not | Boolean    | true        |
+| visible    | Determine whether a modal dialog is visible or not | boolean | no |
+| confirmLoading | Determine whether to apply loading visual effect for OK button or not  | boolean    | no           |
+| title      | The modal dialog's title          | string\|ReactNode | no           |
+| closable   | Determine whether a close (x) button is visible on top right of the modal dialog or not | boolean    | true        |
 | onOk       | Specify a function that will be called when a user clicked OK button | function | no |
 | onCancel   | Specify a function that will be called when a user clicked mask, close button on top right or cancel button | function(e)  | no         |
-| width      | Width of a modal dialog           | String or Number | 520           |
-| footer     | Footer content       | React.Element    | OK and cancel button |
-| okText     | Text of the OK button    | String           | OK       |
-| cancelText | Text of the Cancel button    | String           | Cancel       |
-| maskClosable | Determine whether to close the modal dialog when clicked mask of it. | Boolean   | true       |
-| style | Style of floating layer, typically used at least for adjusting the position. | Object   | - |
-| wrapClassName | The class name of the container of the modal dialog | String   | - |
+| width      | Width of a modal dialog           | string\|number | 520           |
+| footer     | Footer content       | string\|ReactNode | OK and cancel button |
+| okText     | Text of the OK button    | string           | OK       |
+| cancelText | Text of the Cancel button    | string           | Cancel       |
+| maskClosable | Determine whether to close the modal dialog when clicked mask of it. | boolean   | true       |
+| style | Style of floating layer, typically used at least for adjusting the position. | object   | - |
+| wrapClassName | The class name of the container of the modal dialog | string   | - |
 | afterClose | Specify a function that will be called when modal is closed completely. | function | - |
 
 #### Destroy on close
@@ -57,14 +57,14 @@ The properties of the object are follows:
 
 | Property   | Description    | Type             | Default       |
 |------------|----------------|------------------|---------------|
-| title      | Title           | React.Element or String    | no           |
-| content    | Content           | React.Element or String    | no          |
+| title      | Title           | string\|ReactNode | no           |
+| content    | Content           | string\|ReactNode | no          |
 | onOk       | Specify a function that will be called when a user clicked OK button. The parameter of this function is a function whose execution should include closing the dialog. You can also just return a promise and when the promise is resolved, the modal dialog will also be closed    | function         | no           |
 | onCancel   | Specify a function that will be called when a user clicked Cancel button. The parameter of this function is a function whose execution should include closing the dialog. You can also just return a promise and when the promise is resolved, the modal dialog will also be closed       | function         | no           |
-| width      | Width of dialog           | String or Number | 416           |
-| iconType   | Type of Icon component    | String | question-circle |
-| okText     | Text of OK button    | String           | OK       |
-| cancelText | Text of cancel button    | String           | Cancel       |
+| width      | Width of dialog           | string\|number | 416           |
+| iconType   | Type of Icon component    | string | question-circle |
+| okText     | Text of OK button    | string           | OK       |
+| cancelText | Text of cancel button    | string           | Cancel       |
 
 <style>
 .code-box-demo .ant-btn {
diff --git a/components/modal/index.zh-CN.md b/components/modal/index.zh-CN.md
index e59ed8f28..23342c5ca 100644
--- a/components/modal/index.zh-CN.md
+++ b/components/modal/index.zh-CN.md
@@ -17,19 +17,19 @@ title: Modal
 
 | 参数       | 说明           | 类型             | 默认值       |
 |------------|----------------|------------------|--------------|
-| visible    | 对话框是否可见 | Boolean          | 无           |
-| confirmLoading | 确定按钮 loading | Boolean    | 无           |
-| title      | 标题           | React.Element    | 无           |
-| closable   | 是否显示右上角的关闭按钮 | Boolean    | true        |
+| visible    | 对话框是否可见 | boolean          | 无           |
+| confirmLoading | 确定按钮 loading | boolean    | 无           |
+| title      | 标题           | string\|ReactNode | 无           |
+| closable   | 是否显示右上角的关闭按钮 | boolean    | true        |
 | onOk       | 点击确定回调       | function     | 无           |
 | onCancel   | 点击遮罩层或右上角叉或取消按钮的回调  | function(e)  | 无         |
-| width      | 宽度           | String or Number | 520           |
-| footer     | 底部内容       | React.Element    | 确定取消按钮 |
-| okText     | 确认按钮文字    | String           | 确定       |
-| cancelText | 取消按钮文字    | String           | 取消       |
-| maskClosable | 点击蒙层是否允许关闭 | Boolean   | true       |
-| style | 可用于设置浮层的样式，调整浮层位置等 | Object   | - |
-| wrapClassName | 对话框外层容器的类名 | String   | - |
+| width      | 宽度           | string\|number | 520           |
+| footer     | 底部内容       | string\|ReactNode | 确定取消按钮 |
+| okText     | 确认按钮文字    | string           | 确定       |
+| cancelText | 取消按钮文字    | string           | 取消       |
+| maskClosable | 点击蒙层是否允许关闭 | boolean   | true       |
+| style | 可用于设置浮层的样式，调整浮层位置等 | object   | - |
+| wrapClassName | 对话框外层容器的类名 | string   | - |
 | afterClose | Modal 完全关闭后的回调 | function | 无 |
 
 #### 清空旧数据
@@ -55,14 +55,14 @@ title: Modal
 
 | 参数       | 说明           | 类型             | 默认值       |
 |------------|----------------|------------------|--------------|
-| title      | 标题           | React.Element or String    | 无           |
-| content    | 内容           | React.Element or String    | 无           |
+| title      | 标题           | string\|ReactNode | 无           |
+| content    | 内容           | string\|ReactNode | 无           |
 | onOk       | 点击确定回调，参数为关闭函数，返回 promise 时 resolve 后自动关闭      | function         | 无           |
 | onCancel   | 取消回调，参数为关闭函数，返回 promise 时 resolve 后自动关闭       | function         | 无           |
-| width      | 宽度           | String or Number | 416           |
-| iconType   | 图标 Icon 类型    | String | question-circle |
-| okText     | 确认按钮文字    | String           | 确定       |
-| cancelText | 取消按钮文字    | String           | 取消       |
+| width      | 宽度           | string\|number | 416           |
+| iconType   | 图标 Icon 类型    | string | question-circle |
+| okText     | 确认按钮文字    | string           | 确定       |
+| cancelText | 取消按钮文字    | string           | 取消       |
 
 <style>
 .code-box-demo .ant-btn {
diff --git a/components/notification/index.en-US.md b/components/notification/index.en-US.md
index 64df249b7..f87347780 100644
--- a/components/notification/index.en-US.md
+++ b/components/notification/index.en-US.md
@@ -30,13 +30,13 @@ The properties of config are as follows:
 
 | Property   | Description                                     | Type         | Default |
 |----------- |---------------------------------------------    | ----------- |--------|
-| message    | The title of notification box (required)        | React.Node      | -     |
-| description | The content of notification box (required)     | React.Node      | -     |
-| btn        | Customized close button                         | React.Node      | -     |
-| icon       | Customized icon                                 | React.Node      | _     |
-| key        | The unique identifier of current notification                                 | String      | -     |
+| message    | The title of notification box (required)        | string\|ReactNode      | -     |
+| description | The content of notification box (required)     | string\|ReactNode      | -     |
+| btn        | Customized close button                         | ReactNode      | -     |
+| icon       | Customized icon                                 | ReactNode      | _     |
+| key        | The unique identifier of current notification                                 | string      | -     |
 | onClose    | Specify a function that will be called after clicking the default close button  | Function    | -     |
-| duration   | A notification box is closed after 4.5s by default. When specifying `duration` to null or 0, it will never be closed automatically | Number    | 4.5     |
+| duration   | A notification box is closed after 4.5s by default. When specifying `duration` to null or 0, it will never be closed automatically | number    | 4.5     |
 
 
 `notification` also provide a global `config()` method that can be used for specifying the default options. Once this method is used, all the notification boxes
@@ -53,5 +53,5 @@ notification.config({
 
 | Property       | Description    | Type                       | Default       |
 |------------|--------------------|----------------------------|--------------|
-| top        | Offset to top of message | Number                     | 24px         |
-| duration   | A duration to close notification automatically by default (unit: second) | Number                   | 4.5         |
+| top        | Offset to top of message | number                     | 24px         |
+| duration   | A duration to close notification automatically by default (unit: second) | number                   | 4.5         |
diff --git a/components/notification/index.tsx b/components/notification/index.tsx
index 2849d9868..86094dc4f 100755
--- a/components/notification/index.tsx
+++ b/components/notification/index.tsx
@@ -7,8 +7,8 @@ let notificationInstance;
 let defaultDuration = 4.5;
 
 export interface ArgsProps {
-  message: React.ReactNode | string;
-  description: React.ReactNode | string;
+  message: React.ReactNode;
+  description: React.ReactNode;
   btn?: React.ReactNode;
   key?: string;
   onClose?: () => void;
diff --git a/components/notification/index.zh-CN.md b/components/notification/index.zh-CN.md
index b578b825e..50da1fa5c 100644
--- a/components/notification/index.zh-CN.md
+++ b/components/notification/index.zh-CN.md
@@ -30,13 +30,13 @@ config 参数如下：
 
 | 参数        | 说明                                            | 类型         | 默认值 |
 |----------- |---------------------------------------------    | ----------- |--------|
-| message    | 通知提醒标题，必选                                 | React.Node  | -     |
-| description | 通知提醒内容，必选                                | React.Node  | -     |
-| btn        | 自定义关闭按钮                                    | React.Node  | -     |
-| icon       | 自定义图标                                       | React.Node   | -     |
-| key        | 当前通知唯一标志                                   | String      | -     |
+| message    | 通知提醒标题，必选                                 | string\|ReactNode  | -     |
+| description | 通知提醒内容，必选                                | string\|ReactNode  | -     |
+| btn        | 自定义关闭按钮                                    | ReactNode  | -     |
+| icon       | 自定义图标                                       | ReactNode   | -     |
+| key        | 当前通知唯一标志                                   | string      | -     |
 | onClose    | 点击默认关闭按钮时触发的回调函数                     | Function    | -     |
-| duration   | 默认 4.5 秒后自动关闭，配置为 null 则不自动关闭         | Number    | 4.5     |
+| duration   | 默认 4.5 秒后自动关闭，配置为 null 则不自动关闭         | number    | 4.5     |
 
 还提供了一个全局配置方法，在调用前提前配置，全局一次生效。
 
@@ -51,5 +51,5 @@ notification.config({
 
 | 参数       | 说明               | 类型                       | 默认值       |
 |------------|--------------------|----------------------------|--------------|
-| top        | 消息距离顶部的位置 | Number                     | 24px         |
-| duration   | 默认自动关闭延时，单位秒 | Number                   | 4.5         |
+| top        | 消息距离顶部的位置 | number                     | 24px         |
+| duration   | 默认自动关闭延时，单位秒 | number                   | 4.5         |
diff --git a/components/pagination/index.en-US.md b/components/pagination/index.en-US.md
index 5da0b1ec9..6a0c10044 100644
--- a/components/pagination/index.en-US.md
+++ b/components/pagination/index.en-US.md
@@ -19,16 +19,16 @@ A long list can be divided into several pages by `Pagination`, and only one page
 
 Property | Description | Type | Default
 -----|-----|-----|------
-current | current page number | Number | -
-defaultCurrent | default current page number | Number | 1
-total | total number of data | Number | 0
-defaultPageSize | default number of data per page | Number | 10
-pageSize | number of data per page | Number | -
+current | current page number | number | -
+defaultCurrent | default current page number | number | 1
+total | total number of data | number | 0
+defaultPageSize | default number of data per page | number | 10
+pageSize | number of data per page | number | -
 onChange | a callback function, can be executed when the page number is changing, and it takes the resulting page number as an argument | Function(page) | noop
-showSizeChanger | determine whether `pageSize` can be changed | Boolean | false
-pageSizeOptions | specify the sizeChanger selections | Array | ['10', '20', '30', '40']
+showSizeChanger | determine whether `pageSize` can be changed | boolean | false
+pageSizeOptions | specify the sizeChanger selections | string[] | ['10', '20', '30', '40']
 onShowSizeChange | a callback function, can be executed when `pageSize` is changing | Function(current, size) | noop
-showQuickJumper | determine whether you can jump to a page directly | Boolean | false
-size | specify the size of `Pagination`, can be set to `small` | String | ""
-simple | whether to use simple mode | Object | -
+showQuickJumper | determine whether you can jump to a page directly | boolean | false
+size | specify the size of `Pagination`, can be set to `small` | string | ""
+simple | whether to use simple mode | object | -
 showTotal | to display the total number and range | Function(total, range) | -
diff --git a/components/pagination/index.zh-CN.md b/components/pagination/index.zh-CN.md
index 712ba8ea5..6e82bb910 100644
--- a/components/pagination/index.zh-CN.md
+++ b/components/pagination/index.zh-CN.md
@@ -20,16 +20,16 @@ title: Pagination
 
 | 参数             | 说明                               | 类型          | 默认值                   |
 |------------------|------------------------------------|---------------|--------------------------|
-| current          | 当前页数                           | Number        | -                   |
-| defaultCurrent   | 默认的当前页数                     | Number        | 1                        |
-| total            | 数据总数                           | Number        | 0                        |
-| defaultPageSize  | 默认的每页条数                      | Number        | 10                       |
-| pageSize         | 每页条数                           | Number        | -                         |
+| current          | 当前页数                           | number        | -                   |
+| defaultCurrent   | 默认的当前页数                     | number        | 1                        |
+| total            | 数据总数                           | number        | 0                        |
+| defaultPageSize  | 默认的每页条数                      | number        | 10                       |
+| pageSize         | 每页条数                           | number        | -                         |
 | onChange         | 页码改变的回调，参数是改变后的页码 | Function(page)      | noop                     |
-| showSizeChanger  | 是否可以改变 pageSize              | Boolean        | false                    |
-| pageSizeOptions  | 指定每页可以显示多少条             | Array<String> | ['10', '20', '30', '40'] |
+| showSizeChanger  | 是否可以改变 pageSize              | boolean        | false                    |
+| pageSizeOptions  | 指定每页可以显示多少条             | string[] | ['10', '20', '30', '40'] |
 | onShowSizeChange | pageSize 变化的回调                | Function(current, size)      | noop                     |
-| showQuickJumper  | 是否可以快速跳转至某页             | Boolean         | false                    |
-| size             | 当为「small」时，是小尺寸分页      | String        | ""                       |
-| simple           | 当添加该属性时，显示为简单分页     | Object        | -                       |
+| showQuickJumper  | 是否可以快速跳转至某页             | boolean         | false                    |
+| size             | 当为「small」时，是小尺寸分页      | string        | ""                       |
+| simple           | 当添加该属性时，显示为简单分页     | object        | -                       |
 | showTotal        | 用于显示数据总量和当前数据顺序     | Function(total, range) | -              |
diff --git a/components/popconfirm/index.en-US.md b/components/popconfirm/index.en-US.md
index ede6261cc..c0253ac15 100644
--- a/components/popconfirm/index.en-US.md
+++ b/components/popconfirm/index.en-US.md
@@ -16,10 +16,10 @@ The difference with `confirm` is more lightweight than the static popped full-sc
 
 | Param     | Description   | Type     | Default value       |
 |-----------|------------------------------------------|---------------|--------|
-| title     | title of the confirmation box                             | React.Element | none     |
+| title     | title of the confirmation box                             | string\|ReactNode | none     |
 | onConfirm | callback of confirmation                           | function      | none     |
 | onCancel  | callback of cancel                           | function      | none     |
-| okText    | text of the confirmation button                              | String        | Confirm   |
-| cancelText| text of the cancel button                              | String        | Cancel   |
+| okText    | text of the confirmation button                              | string        | Confirm   |
+| cancelText| text of the cancel button                              | string        | Cancel   |
 
 Consult [Tooltip's documentation](https://ant.design/components/tooltip/#API) to find more APIs.
diff --git a/components/popconfirm/index.zh-CN.md b/components/popconfirm/index.zh-CN.md
index 542117cda..0acde7e66 100644
--- a/components/popconfirm/index.zh-CN.md
+++ b/components/popconfirm/index.zh-CN.md
@@ -17,10 +17,10 @@ title: Popconfirm
 
 | 参数      | 说明                                     | 类型          | 默认值 |
 |-----------|------------------------------------------|---------------|--------|
-| title     | 确认框的描述                             | React.Element | 无     |
+| title     | 确认框的描述                             | string\|ReactNode | 无     |
 | onConfirm | 点击确认的回调                           | function      | 无     |
 | onCancel  | 点击取消的回调                           | function      | 无     |
-| okText    | 确认按钮文字                              | String        | 确定   |
-| cancelText| 取消按钮文字                              | String        | 取消   |
+| okText    | 确认按钮文字                              | string        | 确定   |
+| cancelText| 取消按钮文字                              | string        | 取消   |
 
 更多属性请参考 [Tooltip](/components/tooltip-cn/#API)。
diff --git a/components/popover/index.en-US.md b/components/popover/index.en-US.md
index 1b009c1d2..0c76190c7 100644
--- a/components/popover/index.en-US.md
+++ b/components/popover/index.en-US.md
@@ -16,7 +16,7 @@ Comparing with `Tooltip`, besides information `Popover` card can also provide ac
 
 | Param     | Description   | Type     | Default value       |
 |-----------|------------------------------------------|---------------|--------|
-| title     | title of the card                                 | React.Element | none     |
-| content   | content of the card                            | React.Element | none     |
+| title     | title of the card                                 | string\|ReactNode | none     |
+| content   | content of the card                            | string\|ReactNode | none     |
 
 Consult [Tooltip's documentation](https://ant.design/components/tooltip/#API) to find more APIs.
diff --git a/components/popover/index.zh-CN.md b/components/popover/index.zh-CN.md
index e44680404..2395e4be9 100644
--- a/components/popover/index.zh-CN.md
+++ b/components/popover/index.zh-CN.md
@@ -17,7 +17,7 @@ title: Popover
 
 | 参数      | 说明                                     | 类型          | 默认值 |
 |-----------|------------------------------------------|---------------|--------|
-| title     | 卡片标题                                 | React.Element | 无     |
-| content   | 卡片内容                            | React.Element | 无     |
+| title     | 卡片标题                                 | string\|ReactNode | 无     |
+| content   | 卡片内容                            | string\|ReactNode | 无     |
 
 更多属性请参考 [Tooltip](/components/tooltip-cn/#API)。
diff --git a/components/progress/index.en-US.md b/components/progress/index.en-US.md
index 595386f8e..b00f560b7 100644
--- a/components/progress/index.en-US.md
+++ b/components/progress/index.en-US.md
@@ -17,12 +17,12 @@ If it will take a long time to complete the operation, you can use `Progress` to
 
 Property | Description | Type | Default
 -----|-----|-----|------
-type | to set the type, options: `line` `circle` | String | line
-percent | to set the completion percentage | Number | 0
+type | to set the type, options: `line` `circle` | string | line
+percent | to set the completion percentage | number | 0
 format | template function of the content | function(percent) | `percent => percent + '%'`
-status | to set the status of the progress, options: `success` `exception` `active` | String | -
-showInfo | determine whether to display the progress value and the status icon | Boolean | true
-strokeWidth `(type=line)` | to set the width of the progress bar, unit: `px` | Number | 10
-strokeWidth `(type=circle)` | to set the width of the circular progress bar, unit: percentage of the canvas width | Number | 6
-width `(type=circle)` | to set the canvas width of the circular progress bar, unit: `px` | Number | 132
+status | to set the status of the progress, options: `success` `exception` `active` | string | -
+showInfo | determine whether to display the progress value and the status icon | boolean | true
+strokeWidth `(type=line)` | to set the width of the progress bar, unit: `px` | number | 10
+strokeWidth `(type=circle)` | to set the width of the circular progress bar, unit: percentage of the canvas width | number | 6
+width `(type=circle)` | to set the canvas width of the circular progress bar, unit: `px` | number | 132
 
diff --git a/components/progress/index.zh-CN.md b/components/progress/index.zh-CN.md
index 512d73beb..ba2e69748 100644
--- a/components/progress/index.zh-CN.md
+++ b/components/progress/index.zh-CN.md
@@ -19,11 +19,11 @@ title: Progress
 
 | 属性      | 说明           | 类型     | 默认值         |
 |----------|---------------|----------|---------------|
-| type     | 类型，可选 `line` `circle` | String   | line      |
-| percent  | 百分比 | Number | 0 |
+| type     | 类型，可选 `line` `circle` | string   | line      |
+| percent  | 百分比 | number | 0 |
 | format   | 内容的模板函数 | function(percent)   | `percent => percent + '%'` |
-| status   | 状态，可选：`success` `exception` `active` | String   | - |
-| showInfo | 是否显示进度数值或状态图标 | Boolean | true  |
-| strokeWidth `(type=line)` | 进度条线的宽度，单位 px | Number | 10 |
-| strokeWidth `(type=circle)` | 圆形进度条线的宽度，单位是进度条画布宽度的百分比 | Number | 6 |
-| width `(type=circle)` | 圆形进度条画布宽度，单位 px | Number | 132 |
+| status   | 状态，可选：`success` `exception` `active` | string   | - |
+| showInfo | 是否显示进度数值或状态图标 | boolean | true  |
+| strokeWidth `(type=line)` | 进度条线的宽度，单位 px | number | 10 |
+| strokeWidth `(type=circle)` | 圆形进度条线的宽度，单位是进度条画布宽度的百分比 | number | 6 |
+| width `(type=circle)` | 圆形进度条画布宽度，单位 px | number | 132 |
diff --git a/components/radio/index.en-US.md b/components/radio/index.en-US.md
index 9f5ab373a..b2d4c2395 100644
--- a/components/radio/index.en-US.md
+++ b/components/radio/index.en-US.md
@@ -17,8 +17,8 @@ Radio.
 
 | Property           | Description                                     | Type       |  optional | Default |
 |----------------|------------------------------------------|------------|---------|--------|
-| checked | Specifies whether the radio is selected. | Boolean | false |
-| defaultChecked | Specifies the initial state: whether or not the radio is selected. | Boolean | false |
+| checked | Specifies whether the radio is selected. | boolean | | false |
+| defaultChecked | Specifies the initial state: whether or not the radio is selected. | boolean | | false |
 | value          | According to value for comparison, to determine whether the selected        | any     |         | none     |
 
 ### RadioGroup
@@ -30,4 +30,4 @@ radio group，wrap a group of `Radio`。
 | onChange | The callback function that is triggered when the state changes. | Function(e:Event) | none     | none     |
 | value | Used for setting the currently selected value. | any            | none     | none     |
 | defaultValue   | Default selected value                     | any            | none     | none     |
-| size           | Size, only on radio style           | String            | `large` `default` `small` | `default` |
+| size           | Size, only on radio style           | string            | `large` `default` `small` | `default` |
diff --git a/components/radio/index.zh-CN.md b/components/radio/index.zh-CN.md
index 15573ef75..13e20d26c 100644
--- a/components/radio/index.zh-CN.md
+++ b/components/radio/index.zh-CN.md
@@ -18,8 +18,8 @@ title: Radio
 
 | 参数           | 说明                                     | 类型       |  可选值 | 默认值 |
 |----------------|------------------------------------------|------------|---------|--------|
-| checked        | 指定当前是否选中                         | Boolean    |         | false  |
-| defaultChecked | 初始是否选中                             | Boolean    |         | false  |
+| checked        | 指定当前是否选中                         | boolean    |         | false  |
+| defaultChecked | 初始是否选中                             | boolean    |         | false  |
 | value          | 根据 value 进行比较，判断是否选中        | any     |         | 无     |
 
 ### RadioGroup
@@ -31,4 +31,4 @@ title: Radio
 | onChange       | 选项变化时的回调函数             | Function(e:Event) | 无     | 无     |
 | value          | 用于设置当前选中的值             | any            | 无     | 无     |
 | defaultValue   | 默认选中的值                     | any            | 无     | 无     |
-| size           | 大小，只对按钮样式生效           | String            | `large` `default` `small` | `default` |
+| size           | 大小，只对按钮样式生效           | string            | `large` `default` `small` | `default` |
diff --git a/components/rate/index.en-US.md b/components/rate/index.en-US.md
index 2f3a5c8d3..df846bc1a 100644
--- a/components/rate/index.en-US.md
+++ b/components/rate/index.en-US.md
@@ -15,9 +15,9 @@ Rate component.
 
 | Property        | Description           | type               | Default       |
 |------------|----------------|-------------------|-------------|
-| count    | star count | Number | 5 |
-| value | current value | Number | - |
-| defaultValue | default value | Number | 0 |
-| onChange | callback | Function(value: Number) | - |
-| allowHalf | whether to allow semi selection   | Boolean | false |
-| disabled | read only, unable to interact | Boolean | false |
+| count    | star count | number | 5 |
+| value | current value | number | - |
+| defaultValue | default value | number | 0 |
+| onChange | callback | Function(value: number) | - |
+| allowHalf | whether to allow semi selection   | boolean | false |
+| disabled | read only, unable to interact | boolean | false |
diff --git a/components/rate/index.zh-CN.md b/components/rate/index.zh-CN.md
index 13bb171fb..66b30cc0a 100644
--- a/components/rate/index.zh-CN.md
+++ b/components/rate/index.zh-CN.md
@@ -16,9 +16,9 @@ title: Rate
 
 | 属性        | 说明           | 类型               | 默认值       |
 |------------|----------------|-------------------|-------------|
-| count    | star 总数 | Number | 5 |
-| value | 当前数，受控值 | Number | - |
-| defaultValue | 默认值 | Number | 0 |
-| onChange | 回调 | Function(value: Number) | - |
-| allowHalf | 是否允许半选   | Boolean | false |
-| disabled | 只读，无法进行交互 | Boolean | false |
+| count    | star 总数 | number | 5 |
+| value | 当前数，受控值 | number | - |
+| defaultValue | 默认值 | number | 0 |
+| onChange | 回调 | Function(value: number) | - |
+| allowHalf | 是否允许半选   | boolean | false |
+| disabled | 只读，无法进行交互 | boolean | false |
diff --git a/components/select/index.en-US.md b/components/select/index.en-US.md
index cc605644b..44f3e9bd0 100644
--- a/components/select/index.en-US.md
+++ b/components/select/index.en-US.md
@@ -23,8 +23,8 @@ A Selector similar to Select2.
 
 | Property     | Description           | Type     | Default       |
 |----------|----------------|----------|--------------|
-| value    | Current selected option. | string/Array<String>   |  -  |
-| defaultValue | Initial selected option. | string/Array<String>   |  -  |
+| value    | Current selected option. | string\|string[]   |  -  |
+| defaultValue | Initial selected option. | string\|string[]   |  -  |
 | multiple   | Allow multiple select. | boolean | false |
 | allowClear   | Show clear button, working in single mode only. | 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     |
@@ -32,7 +32,7 @@ A Selector similar to Select2.
 | onSelect | Called when a option is selected, the params are option's value (or key) and option instance. | function(value, option) | -   |
 | onDeselect | Called when a option is deselected, the params are option's value (or key) . only called for multiple or tags, effective in multiple or tags mode only. |  function(value) | -   |
 | onChange | Called when select an option or input value change, or value of input is changed in combobox mode | function(value, label) | - |
-| onSearch | Callback function that is fired when input changed. | function(value: String) |  |
+| onSearch | Callback function that is fired when input changed. | function(value: string) |  |
 | onBlur | Called when blur | function | - |
 | onFocus | Called when focus | function | - |
 | placeholder | Placeholder of select | string | - |
@@ -41,29 +41,29 @@ A Selector similar to Select2.
 | optionFilterProp | Which prop value of option will be used for filter if filterOption is true | string | value |
 | optionLabelProp | Which prop value of option will render as content of select. | string | `children` |
 | combobox | Enable combobox mode(can not set multiple at the same time). | boolean | false |
-| size    | Size of Select input. `large` `small`  | String      |      default      |
+| size    | Size of Select input. `large` `small`  | string      |      default      |
 | showSearch | Whether show search input in single mode.| boolean | false |
 | disabled | Whether disabled select | boolean | false |
 | defaultActiveFirstOption | Whether active first option by default | boolean | true |
 | dropdownStyle | style of dropdown menu | object | - |
 | dropdownClassName | className of dropdown menu | string | - |
 | 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 |
-| labelInValue | whether to embed label in value, turn the format of value from `string` to `{key: String, label: React.Node}` | boolean | false |
-| tokenSeparators | Separator used to tokenize on tag/multiple mode | string[]? |  |
+| labelInValue | whether to embed label in value, turn the format of value from `string` to `{key: string, label: ReactNode}` | boolean | false |
+| tokenSeparators | Separator used to tokenize on tag/multiple mode | string[] |  |
 
 
 ### Option props
 
 | Property     | Description         | Type    | Default       |
 |----------|----------------|----------|--------------|
-| disabled    | Disable this option | Boolean   |  false  |
-| value | default to filter with this property | String | - |
-| key   | Same usage as `value`. If React request you to set this property, you can set it to value of option, and then omit value property. | String |  |
-| title | `title` of Select after select this Option | String | - |
+| disabled    | Disable this option | boolean   |  false  |
+| value | default to filter with this property | string | - |
+| key   | Same usage as `value`. If React request you to set this property, you can set it to value of option, and then omit value property. | string |  |
+| title | `title` of Select after select this Option | string | - |
 
 ### OptGroup props
 
 | Property     | Description           | Type     | Default          |
 |----------|----------------|----------|-----------------|
-| label    | Group label           | String/React.Element | -  |
-| key      |                |  String  | -               |
+| label    | Group label           | string\|React.Element | -  |
+| key      |                |  string  | -               |
diff --git a/components/select/index.zh-CN.md b/components/select/index.zh-CN.md
index 6280e79d9..ad096cadb 100644
--- a/components/select/index.zh-CN.md
+++ b/components/select/index.zh-CN.md
@@ -24,8 +24,8 @@ title: Select
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| value    | 指定当前选中的条目 | string/Array<String> |  -  |
-| defaultValue | 指定默认选中的条目 | string/Array<String> |  -  |
+| value    | 指定当前选中的条目 | string\|string[] |  -  |
+| defaultValue | 指定默认选中的条目 | string\|string[] |  -  |
 | multiple   | 支持多选 | boolean | false |
 | allowClear   | 支持清除, 单选模式有效 | boolean | false |
 | filterOption | 是否根据输入项进行筛选。当其为一个函数时，会接收 `inputValue` `option` 两个参数，当 `option` 符合筛选条件时，应返回 `true`，反之则返回 `false`。 | boolean or function(inputValue, option) | true     |
@@ -33,7 +33,7 @@ title: Select
 | onSelect | 被选中时调用，参数为选中项的 value (或 key) 值 | function(value, option) | -   |
 | onDeselect | 取消选中时调用，参数为选中项的 value (或 key) 值，仅在 multiple 或 tags 模式下生效 |  function(value) | -   |
 | onChange | 选中 option，或 input 的 value 变化（combobox 模式下）时，调用此函数 | function(value) | - |
-| onSearch | 文本框值变化时回调 | function(value: String) |  |
+| onSearch | 文本框值变化时回调 | function(value: string) |  |
 | onBlur | 失去焦点的时回调 | function | - |
 | onFocus | 获得焦点时回调 | function | - |
 | placeholder | 选择框默认文字 | string | - |
@@ -42,28 +42,28 @@ title: Select
 | optionFilterProp | 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索 | string | value |
 | optionLabelProp | 回填到选择框的 Option 的属性值，默认是 Option 的子元素。比如在子元素需要高亮效果时，此值可以设为 `value`。 | string | `children` （combobox 模式下为 `value`） |
 | combobox | 输入框自动提示模式 | boolean | false |
-| size    | 选择框大小，可选 `large` `small`  | String      |      default      |
+| size    | 选择框大小，可选 `large` `small`  | string      |      default      |
 | showSearch | 在选择框中显示搜索框 | boolean | false |
 | disabled | 是否禁用 | boolean | false |
 | defaultActiveFirstOption | 是否默认高亮第一个选项。 | boolean | true
 | dropdownStyle | 下拉菜单的 style 属性 | object | - |
 | dropdownClassName | 下拉菜单的 className 属性 | string | - |
 | getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](http://codepen.io/anon/pen/xVBOVQ?editors=001) | Function(triggerNode) | () => document.body |
-| labelInValue | 是否把每个选项的 label 包装到 value 中，会把 Select 的 value 类型从 `string` 变为 `{key: String, label: React.Node}` 的格式 | boolean | false |
-| tokenSeparators | 在 tags 和 multiple 模式下自动分词的分隔符 | string[]? |  |
+| labelInValue | 是否把每个选项的 label 包装到 value 中，会把 Select 的 value 类型从 `string` 变为 `{key: string, label: ReactNode}` 的格式 | boolean | false |
+| tokenSeparators | 在 tags 和 multiple 模式下自动分词的分隔符 | string[] |  |
 
 ### Option props
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| disabled    | 是否禁用 | Boolean   |  false  |
-| value | 默认根据此属性值进行筛选 | String | - |
-| key   | 和 value 含义一致。如果 React 需要你设置此项，此项值与 value 的值相同，然后可以省略 value 设置 | String |  |
-| title | 选中该 Option 后，Select 的 title | String | - |
+| disabled    | 是否禁用 | boolean   |  false  |
+| value | 默认根据此属性值进行筛选 | string | - |
+| key   | 和 value 含义一致。如果 React 需要你设置此项，此项值与 value 的值相同，然后可以省略 value 设置 | string |  |
+| title | 选中该 Option 后，Select 的 title | string | - |
 
 ### OptGroup props
 
 | 参数     | 说明           | 类型     | 默认值          |
 |----------|----------------|----------|-----------------|
-| label    | 组名           | String/React.Element | 无  |
-| key      |                |  String  | -               |
+| label    | 组名           | string\|React.Element | 无  |
+| key      |                |  string  | -               |
diff --git a/components/slider/index.en-US.md b/components/slider/index.en-US.md
index 06a10940c..86f9b1beb 100644
--- a/components/slider/index.en-US.md
+++ b/components/slider/index.en-US.md
@@ -14,16 +14,16 @@ To input a value in a range.
 
 | Property     | Description           | Type     | Default       |
 |------------|----------------|-------------|--------------|
-| range          | dual thumb mode | Boolean          | false
-| min            | The minimum value the slider can slide to. | Number			| 0
-| max            | The maximum value the slider can slide to | Number			| 100
-| step           | The granularity the slider can step through values. Must greater than 0, and be divided by (max - min) . When  `marks` no null, `step` can be `null`. | Number or null	| 1
-| marks          | Tick mark of Slider, type of key must be `Number`, and must in closed interval [min, max] ，each mark can declare its own style. | Object{} | Object{Number: String or React.Component} or Object{Number: { style, label}}
-| dots           | Whether the thumb can drag over tick only. | Boolean | false
-| value          | The value of slider. When `range` is `false`, use `Number`, otherwise, use `[Number, Number]`   | Number or [Number, Number] |
-| defaultValue   | The default value of slider. When `range` is `false`, use `Number`, otherwise, use `[Number, Number]`   | Number or [Number, Number] | 0 or [0, 0]
-| included       | Make effect when `marks` not null，`true` means containment and `false` means coordinative | Boolean			 | true
-| disabled       | If true, the slider will not be interactable. | Boolean 			| false
+| range          | dual thumb mode | boolean          | false
+| min            | The minimum value the slider can slide to. | number			| 0
+| max            | The maximum value the slider can slide to | number			| 100
+| step           | The granularity the slider can step through values. Must greater than 0, and be divided by (max - min) . When  `marks` no null, `step` can be `null`. | number\|null	| 1
+| marks          | Tick mark of Slider, type of key must be `number`, and must in closed interval [min, max] ，each mark can declare its own style. | object | { number: string\|ReactNode } or { number: { style: object, label: string\|ReactNode } }
+| dots           | Whether the thumb can drag over tick only. | boolean | false
+| value          | The value of slider. When `range` is `false`, use `number`, otherwise, use `[number, number]`   | number\|number[] |
+| defaultValue   | The default value of slider. When `range` is `false`, use `number`, otherwise, use `[number, number]`   | number\|number[] | 0 or [0, 0]
+| included       | Make effect when `marks` not null，`true` means containment and `false` means coordinative | boolean			 | true
+| disabled       | If true, the slider will not be interactable. | boolean 			| false
 | onChange       | Callback function that is fired when the user changes the slider's value. | Function(value) | NOOP
 | onAfterChange  | Fire when  `onmouseup` is fired. | Function(value) | NOOP
-| tipFormatter   | Slider will pass its value to `tipFormatter`, and display its value in Tooltip, and hide Tooltip when return value is null. | Function or null | IDENTITY
+| tipFormatter   | Slider will pass its value to `tipFormatter`, and display its value in Tooltip, and hide Tooltip when return value is null. | Function\|null | IDENTITY
diff --git a/components/slider/index.zh-CN.md b/components/slider/index.zh-CN.md
index 90f02cb61..380742c5e 100644
--- a/components/slider/index.zh-CN.md
+++ b/components/slider/index.zh-CN.md
@@ -15,16 +15,16 @@ title: Slider
 
 | 参数       | 说明            | 类型         | 默认值       |
 |------------|----------------|-------------|--------------|
-| range          | 双滑块模式 | Boolean          | false
-| min            | 最小值 | Number			| 0
-| max            | 最大值 | Number			| 100
-| step           | 步长，取值必须大于 0，并且可被 (max - min) 整除。当 `marks` 不为空对象时，可以设置 `step` 为 `null`，此时 Slider 的可选值仅有 marks 标出来的部分。 | Number or null	| 1
-| marks          | 刻度标记，key 的类型必须为 `Number` 且取值在闭区间 [min, max] 内，每个标签可以单独设置样式 | Object{} | Object{Number: String or React.Component} or Object{Number: { style, label}}
-| dots           | 是否只能拖拽到刻度上 | Boolean | false
-| value          | 设置当前取值。当 `range` 为 `false` 时，使用 `Number`，否则用 `[Number, Number]`   | Number or [Number, Number] |
-| defaultValue   | 设置初始取值。当 `range` 为 `false` 时，使用 `Number`，否则用 `[Number, Number]`   | Number or [Number, Number] | 0 or [0, 0]
-| included       | `marks` 不为空对象时有效，值为 true 时表示值为包含关系，false 表示并列 | Boolean			 | true
-| disabled       | 值为 `true` 时，滑块为禁用状态 | Boolean 			| false
+| range          | 双滑块模式 | boolean          | false
+| min            | 最小值 | number			| 0
+| max            | 最大值 | number			| 100
+| step           | 步长，取值必须大于 0，并且可被 (max - min) 整除。当 `marks` 不为空对象时，可以设置 `step` 为 `null`，此时 Slider 的可选值仅有 marks 标出来的部分。 | number\|null	| 1
+| marks          | 刻度标记，key 的类型必须为 `number` 且取值在闭区间 [min, max] 内，每个标签可以单独设置样式 | object | { number: string\|ReactNode } or { number: { style: object, label: string\|ReactNode } }
+| dots           | 是否只能拖拽到刻度上 | boolean | false
+| value          | 设置当前取值。当 `range` 为 `false` 时，使用 `number`，否则用 `[number, number]`   | number\|number[] |
+| defaultValue   | 设置初始取值。当 `range` 为 `false` 时，使用 `number`，否则用 `[number, number]`   | number\|number[] | 0 or [0, 0]
+| included       | `marks` 不为空对象时有效，值为 true 时表示值为包含关系，false 表示并列 | boolean			 | true
+| disabled       | 值为 `true` 时，滑块为禁用状态 | boolean 			| false
 | onChange       | 当 Slider 的值发生改变时，会触发 onChange 事件，并把改变后的值作为参数传入。 | Function(value) | NOOP
 | onAfterChange  | 与 `onmouseup` 触发时机一致，把当前值作为参数传入。 | Function(value) | NOOP
-| tipFormatter   | Slider 会把当前值传给 `tipFormatter`，并在 Tooltip 中显示 `tipFormatter` 的返回值，若为 null，则隐藏 Tooltip。 | Function or null | IDENTITY
+| tipFormatter   | Slider 会把当前值传给 `tipFormatter`，并在 Tooltip 中显示 `tipFormatter` 的返回值，若为 null，则隐藏 Tooltip。 | Function\|null | IDENTITY
diff --git a/components/steps/index.en-US.md b/components/steps/index.en-US.md
index 61f1f8250..46a8185f8 100644
--- a/components/steps/index.en-US.md
+++ b/components/steps/index.en-US.md
@@ -5,7 +5,7 @@ cols: 1
 title: Steps
 ---
 
-`Steps` is a navigation bar that guides users through the steps of a task. 
+`Steps` is a navigation bar that guides users through the steps of a task.
 
 ## When To Use
 
@@ -27,10 +27,10 @@ The whole of the step bar.
 
 Property | Description | Type | Default
 -----|-----|-----|------
-current | to set the current step, counting from 0. You can overwrite this state by using `status` of `Step` | Number | 0
-status | to specify the status of current step, can be set to one of the following values: `wait` `process` `finish` `error` | String | `process`
-size | to specify the size of the step bar, `default` and `small` are currently supported | String | `default`
-direction | to specify the direction of the step bar, `horizontal` and `vertical` are currently supported | String | horizontal
+current | to set the current step, counting from 0. You can overwrite this state by using `status` of `Step` | number | 0
+status | to specify the status of current step, can be set to one of the following values: `wait` `process` `finish` `error` | string | `process`
+size | to specify the size of the step bar, `default` and `small` are currently supported | string | `default`
+direction | to specify the direction of the step bar, `horizontal` and `vertical` are currently supported | string | horizontal
 
 ### Steps.Step
 
@@ -38,7 +38,7 @@ A single step in the step bar.
 
 Property | Description | Type | Default
 -----|-----|-----|------
-status | to specify the status. It will be automatically set by `current` of `Steps` if not configured. Optional values are: `wait` `process` `finish` `error` | String | wait
-title | title of the step | React.ReactNode | -
-description | detail of the step, optional property | React.ReactNode | -
-icon | icon of the step, optional property | string or React.ReactNode | -
+status | to specify the status. It will be automatically set by `current` of `Steps` if not configured. Optional values are: `wait` `process` `finish` `error` | string | wait
+title | title of the step | string\|ReactNode | -
+description | detail of the step, optional property | string\|ReactNode | -
+icon | icon of the step, optional property | string\|ReactNode | -
diff --git a/components/steps/index.zh-CN.md b/components/steps/index.zh-CN.md
index 83a40d8ff..7a86b1d1b 100644
--- a/components/steps/index.zh-CN.md
+++ b/components/steps/index.zh-CN.md
@@ -28,10 +28,10 @@ title: Steps
 
 | 参数      | 说明                                      | 类型         | 默认值 |
 |----------|------------------------------------------|-------------|-------|
-| current | 指定当前步骤，从 0 开始记数。在子 Step 元素中，可以通过 `status` 属性覆盖状态 | Number | 0 |
-| status | 指定当前步骤的状态，可选 `wait` `process` `finish` `error` | String | process |
-| size | 指定大小，目前支持普通（`default`）和迷你（`small`）| String | default |
-| direction | 指定步骤条方向。目前支持水平（`horizontal`）和竖直（`vertical`）两种方向 | String | horizontal  |
+| current | 指定当前步骤，从 0 开始记数。在子 Step 元素中，可以通过 `status` 属性覆盖状态 | number | 0 |
+| status | 指定当前步骤的状态，可选 `wait` `process` `finish` `error` | string | process |
+| size | 指定大小，目前支持普通（`default`）和迷你（`small`）| string | default |
+| direction | 指定步骤条方向。目前支持水平（`horizontal`）和竖直（`vertical`）两种方向 | string | horizontal  |
 
 ### Steps.Step
 
@@ -39,7 +39,7 @@ title: Steps
 
 | 参数      | 说明                                     | 类型       | 默认值 |
 |----------|-----------------------------------------|------------|-------|
-| status | 指定状态。当不配置该属性时，会使用 Steps 的 `current` 来自动指定状态。可选：`wait` `process` `finish` `error` | String | wait |
-| title | 标题 | React.ReactNode | -     |
-| description | 步骤的详情描述，可选 | React.ReactNode | -  |
-| icon | 步骤图标的类型，可选 | string or React.ReactNode | - |
+| status | 指定状态。当不配置该属性时，会使用 Steps 的 `current` 来自动指定状态。可选：`wait` `process` `finish` `error` | string | wait |
+| title | 标题 | string\|ReactNode | -     |
+| description | 步骤的详情描述，可选 | string\|ReactNode | -  |
+| icon | 步骤图标的类型，可选 | string\|ReactNode | - |
diff --git a/components/switch/index.en-US.md b/components/switch/index.en-US.md
index c1c827d06..2fe7419e1 100644
--- a/components/switch/index.en-US.md
+++ b/components/switch/index.en-US.md
@@ -18,9 +18,9 @@ Switching Selector.
 
 Property | Description | Type | Default |
 -----|-----|-----|------|
-checked | determine whether the `Switch` is checked  | Boolean | false |
-defaultChecked | to set the initial state | Boolean | false |
+checked | determine whether the `Switch` is checked  | boolean | false |
+defaultChecked | to set the initial state | boolean | false |
 onChange | a callback function, can be executed when the checked state is changing | Function(checked:Boolean) | |
-checkedChildren | content to be shown when the state is checked | React Node  | |
-unCheckedChildren | content to be shown when the state is unchecked | React Node  | |
-size | the size of the `Switch`, options: `default` `small` | String | default |
+checkedChildren | content to be shown when the state is checked | string\|ReactNode  | |
+unCheckedChildren | content to be shown when the state is unchecked | string\|ReactNode  | |
+size | the size of the `Switch`, options: `default` `small` | string | default |
diff --git a/components/switch/index.zh-CN.md b/components/switch/index.zh-CN.md
index ad73e2de5..fdd7c23a1 100644
--- a/components/switch/index.zh-CN.md
+++ b/components/switch/index.zh-CN.md
@@ -18,9 +18,9 @@ title: Switch
 
 | 参数      | 说明                                     | 类型        |默认值 |
 |-----------|------------------------------------------|------------|--------|
-| checked | 指定当前是否选中 | Boolean    | false    |
-| defaultChecked | 初始是否选中 | Boolean  | false |
+| checked | 指定当前是否选中 | boolean    | false    |
+| defaultChecked | 初始是否选中 | boolean  | false |
 | onChange | 变化时回调函数 | Function(checked:Boolean) |   |
-| checkedChildren | 选中时的内容 | React Node |   |
-| unCheckedChildren | 非选中时的内容 | React Node |  |
-| size | 开关大小，可选值：`default` `small` | String  | default |
+| checkedChildren | 选中时的内容 | string\|ReactNode |   |
+| unCheckedChildren | 非选中时的内容 | string\|ReactNode |  |
+| size | 开关大小，可选值：`default` `small` | string  | default |
diff --git a/components/table/index.en-US.md b/components/table/index.en-US.md
index 43b9212df..8817890d0 100644
--- a/components/table/index.en-US.md
+++ b/components/table/index.en-US.md
@@ -52,29 +52,29 @@ const columns = [{
 
 | Property      | Description              | Type            | Default      |
 |---------------|--------------------------|-----------------|--------------|
-| rowSelection  | row selection [config](#rowSelection)  | Object  | null  |
-| pagination    | pagination [config](/components/pagination/), hide it via setting to `false` | Object |  |
-| size          | size of table: `default` or `small`  | String | `default` |
-| dataSource    | data record array to be rendered | Array |            |
-| columns       | columns of table | Array | - |
-| rowKey        | get row's key, could be a string or function | String or Function(record):string | 'key' |
+| rowSelection  | row selection [config](#rowSelection)  | object  | null  |
+| pagination    | pagination [config](/components/pagination/), hide it via setting to `false` | object |  |
+| size          | size of table: `default` or `small`  | string | `default` |
+| dataSource    | data record array to be rendered | any[] |            |
+| columns       | columns of table | [ColumnProps](https://git.io/vMMXC)[] | - |
+| rowKey        | get row's key, could be a string or function | string\|Function(record):string | 'key' |
 | rowClassName  | get row's className | Function(record, index):string | - |
 | expandedRowRender  | expanded container render for each row | Function | - |
-| defaultExpandedRowKeys | initial expanded row keys | Array | - |
-| expandedRowKeys | current expanded rows keys | Array | - |
-| defaultExpandAllRows | expand all rows initially | Boolean | false |
+| defaultExpandedRowKeys | initial expanded row keys | string[] | - |
+| expandedRowKeys | current expanded rows keys | string[] | - |
+| defaultExpandAllRows | expand all rows initially | boolean | false |
 | onExpandedRowsChange | function to call when the expanded rows change | Function(expandedRows) | |
 | onExpand      | function to call when click expand icon | Function(expanded, record) | |
 | onChange      | callback that is called when pagination, filters, sorter is changed | Function(pagination, filters, sorter) |  |
-| loading       | loading status of table | Boolean | false |
-| locale        | i18n text include filter, sort, empty text...etc | Object | filterConfirm: 'Ok' <br> filterReset: 'Reset' <br> emptyText: 'No Data' <br> [Default](https://github.com/ant-design/ant-design/issues/575#issuecomment-159169511) |
-| indentSize    | index pixel size of tree data | Number   | 15 |
+| loading       | loading status of table | boolean | false |
+| locale        | i18n text include filter, sort, empty text...etc | object | filterConfirm: 'Ok' <br> filterReset: 'Reset' <br> emptyText: 'No Data' <br> [Default](https://github.com/ant-design/ant-design/issues/575#issuecomment-159169511) |
+| indentSize    | index pixel size of tree data | number   | 15 |
 | onRowClick    | callback that is called when click a row | Function(record, index)   | - |
-| bordered  | whether to show table border completely | Boolean | false      |
-| showHeader  | whether to show table header | Boolean          | true      |
+| bordered  | whether to show table border completely | boolean | false      |
+| showHeader  | whether to show table header | boolean          | true      |
 | footer | table footer renderer      | Function(currentPageData)   | |
 | title  | table title renderer       | Function(currentPageData)   | |
-| scroll | whether table can be scroll in x/y direction, `x` or `y` can be a number that indicated the width and height of table body | Object   | -  |
+| scroll | whether table can be scroll in x/y direction, `x` or `y` can be a number that indicated the width and height of table body | object   | -  |
 
 ### Column
 
@@ -82,30 +82,30 @@ One of Property `columns` for descriping column, Column has the same API.
 
 | Property      | Description              | Type            |  Default     |
 |---------------|--------------------------|-----------------|--------------|
-| title      | title of this column        | String or React.Element | - |
-| key        | key of this column | String          | - |
-| dataIndex  | display field of the data record, could be set like `a.b.c` | String | - |
+| title      | title of this column        | string\|ReactNode | - |
+| key        | key of this column | string          | - |
+| dataIndex  | display field of the data record, could be set like `a.b.c` | string | - |
 | render     | renderer of table cell, has three params: text, record and index of this row. The render value should be a ReactNode, or a object for [colSpan/rowSpan config](#demo-colspan-rowspan) | Function(text, record, index) {} | - |
-| filters    | filter menu config        | Array       | - |
+| filters    | filter menu config        | object[]       | - |
 | onFilter   | callback that is called when when click confirm filter button | Function | - |
-| filterMultiple | whether to select multiple filtered item | Boolean    | true    |
-| filterDropdown | customized filter overlay | React.Element | - |
-| filterDropdownVisible | whether filterDropdown is visible | Boolean | - |
+| filterMultiple | whether to select multiple filtered item | boolean    | true    |
+| filterDropdown | customized filter overlay | ReactNode | - |
+| filterDropdownVisible | whether filterDropdown is visible | boolean | - |
 | onFilterDropdownVisibleChange | called when filterDropdownVisible is changed | function(visible) {} | - |
-| filteredValue | controlled filtered value | Array | - |
-| sorter     | sort function for local sort. If you need sort buttons only, set it `true` | Function or Boolean | - |
-| colSpan    | span of this column's title | Number |         |
-| width      | width of this column | String or Number | -  |
-| className  | className of this column            | String          |  -      |
-| fixed      | set column to be fixed: `true`(same as left) `'left'` `'right'` | Boolean or String | false |
-| sortOrder | controlled sorted value: `'ascend'` `'descend'` `false` | Boolean or String | - |
+| filteredValue | controlled filtered value | string[] | - |
+| sorter     | sort function for local sort. If you need sort buttons only, set it `true` | Function\|boolean | - |
+| colSpan    | span of this column's title | number |         |
+| width      | width of this column | string\|number | -  |
+| className  | className of this column            | string          |  -      |
+| fixed      | set column to be fixed: `true`(same as left) `'left'` `'right'` | boolean\|string | false |
+| sortOrder | controlled sorted value: `'ascend'` `'descend'` `false` | boolean\|string | - |
 | onCellClick | callback when click cell | Function(record, event) | - |
 
 ### ColumnGroup
 
 | Property      | Description              | Type            |  Default     |
 |---------------|--------------------------|-----------------|--------------|
-| title      | title of the column group   | String or React.Element | - |
+| title      | title of the column group   | string\|ReactNode | - |
 
 ### rowSelection
 
@@ -113,8 +113,8 @@ Properties for selection.
 
 | Property      | Description              | Type            |  Default     |
 |---------------|--------------------------|-----------------|--------------|
-| type | `checkbox` or `radio` | String | `checkbox`  |
-| selectedRowKeys | controlled selected row keys | Array | []  |
+| type | `checkbox` or `radio` | string | `checkbox`  |
+| selectedRowKeys | controlled selected row keys | string[] | []  |
 | onChange | callback that is called when selected rows change | Function(selectedRowKeys, selectedRows) | -   |
 | getCheckboxProps | get Checkbox or Radio props | Function(record) |  -   |
 | onSelect | callback that is called when select/deselect one row | Function(record, selected, selectedRows) |   -   |
diff --git a/components/table/index.zh-CN.md b/components/table/index.zh-CN.md
index c3bb542dd..edde2bfe5 100644
--- a/components/table/index.zh-CN.md
+++ b/components/table/index.zh-CN.md
@@ -53,29 +53,29 @@ const columns = [{
 
 | 参数           | 说明                     | 类型             | 默认值   |
 |---------------|--------------------------|-----------------|---------|
-| rowSelection  | 列表项是否可选择，[配置项](#rowSelection) | Object  | null  |
-| pagination    | 分页器，配置项参考 [pagination](/components/pagination/)，设为 false 时不展示和进行分页 | Object |  |
-| size          | 正常或迷你类型，`default` or `small`  | String | default |
-| dataSource    | 数据数组 | Array |            |
-| columns       | 表格列的配置描述，具体项见下表 | Array | - |
-| rowKey        | 表格行 key 的取值，可以是字符串或一个函数 | String or Function(record):string | 'key' |
+| rowSelection  | 列表项是否可选择，[配置项](#rowSelection) | object  | null  |
+| pagination    | 分页器，配置项参考 [pagination](/components/pagination/)，设为 false 时不展示和进行分页 | object |  |
+| size          | 正常或迷你类型，`default` or `small`  | string | default |
+| dataSource    | 数据数组 | any[] |            |
+| columns       | 表格列的配置描述，具体项见下表 | [ColumnProps](https://git.io/vMMXC)[] | - |
+| rowKey        | 表格行 key 的取值，可以是字符串或一个函数 | string\|Function(record):string | 'key' |
 | rowClassName  | 表格行的类名      | Function(record, index):string | - |
 | expandedRowRender  | 额外的展开行 | Function | - |
-| defaultExpandedRowKeys | 默认展开的行 | Array | - |
-| expandedRowKeys | 展开的行，控制属性 | Array | - |
-| defaultExpandAllRows | 初始时，是否展开所有行 | Boolean | false |
+| defaultExpandedRowKeys | 默认展开的行 | string[] | - |
+| expandedRowKeys | 展开的行，控制属性 | string[] | - |
+| defaultExpandAllRows | 初始时，是否展开所有行 | boolean | false |
 | onExpandedRowsChange | 展开的行变化时触发 | Function(expandedRows) | |
 | onExpand      | 点击展开图标时触发 | Function(expanded, record) | |
 | onChange      | 分页、排序、筛选变化时触发 | Function(pagination, filters, sorter) |  |
-| loading       | 页面是否加载中 | Boolean | false |
-| locale        | 默认文案设置，目前包括排序、过滤、空数据文案 | Object | filterConfirm: '确定' <br> filterReset: '重置' <br> emptyText: '暂无数据' <br> [默认值](https://github.com/ant-design/ant-design/issues/575#issuecomment-159169511) |
-| indentSize    | 展示树形数据时，每层缩进的宽度，以 px 为单位 | Number   | 15 |
+| loading       | 页面是否加载中 | boolean | false |
+| locale        | 默认文案设置，目前包括排序、过滤、空数据文案 | object | filterConfirm: '确定' <br> filterReset: '重置' <br> emptyText: '暂无数据' <br> [默认值](https://github.com/ant-design/ant-design/issues/575#issuecomment-159169511) |
+| indentSize    | 展示树形数据时，每层缩进的宽度，以 px 为单位 | number   | 15 |
 | onRowClick    | 处理行点击事件 | Function(record, index)   | - |
-| bordered  | 是否展示外边框和列边框 | Boolean | false      |
-| showHeader  | 是否显示表头 | Boolean          | true      |
+| bordered  | 是否展示外边框和列边框 | boolean | false      |
+| showHeader  | 是否显示表头 | boolean          | true      |
 | footer | 表格尾部         | Function(currentPageData)   | |
 | title  | 表格标题         | Function(currentPageData)   | |
-| scroll | 横向或纵向支持滚动，也可用于指定滚动区域的宽高度：`{{ x: true, y: 300 }}` | Object   | -  |
+| scroll | 横向或纵向支持滚动，也可用于指定滚动区域的宽高度：`{{ x: true, y: 300 }}` | object   | -  |
 
 ### Column
 
@@ -83,30 +83,30 @@ const columns = [{
 
 | 参数       | 说明                       | 类型            |  默认值  |
 |-----------|----------------------------|-----------------|---------|
-| title      | 列头显示文字               | String or React.Element | - |
-| key        | React 需要的 key，建议设置 | String          | - |
-| dataIndex  | 列数据在数据项中对应的 key，支持 `a.b.c` 的嵌套写法 | String | - |
+| title      | 列头显示文字               | string\|ReactNode | - |
+| key        | React 需要的 key，建议设置 | string          | - |
+| dataIndex  | 列数据在数据项中对应的 key，支持 `a.b.c` 的嵌套写法 | string | - |
 | render     | 生成复杂数据的渲染函数，参数分别为当前行的值，当前行数据，行索引，@return里面可以设置表格[行/列合并](#demo-colspan-rowspan) | Function(text, record, index) {} | - |
-| filters    | 表头的筛选菜单项           | Array           | - |
+| filters    | 表头的筛选菜单项           | object[]           | - |
 | onFilter   | 本地模式下，确定筛选的运行函数 | Function    | - |
-| filterMultiple | 是否多选 | Boolean    | true    |
-| filterDropdown | 可以自定义筛选菜单，此函数只负责渲染图层，需要自行编写各种交互 | React.Element | - |
-| filterDropdownVisible | 用于控制自定义筛选菜单是否可见 | Boolean | - |
+| filterMultiple | 是否多选 | boolean    | true    |
+| filterDropdown | 可以自定义筛选菜单，此函数只负责渲染图层，需要自行编写各种交互 | ReactNode | - |
+| filterDropdownVisible | 用于控制自定义筛选菜单是否可见 | boolean | - |
 | onFilterDropdownVisibleChange | 自定义筛选菜单可见变化时调用 | function(visible) {} | - |
-| filteredValue | 筛选的受控属性，外界可用此控制列的筛选状态，值为已筛选的 value 数组 | Array | - |
-| sorter     | 排序函数，本地排序使用一个函数，需要服务端排序可设为 true | Function or Boolean | - |
-| colSpan    | 表头列合并,设置为 0 时，不渲染 | Number      |         |
-| width      | 列宽度 | String or Number | -  |
-| className  | 列的 className             | String          |  -      |
-| fixed      | 列是否固定，可选 `true`(等效于 left) `'left'` `'right'` | Boolean or String | false |
-| sortOrder | 排序的受控属性，外界可用此控制列的排序，可设置为 `'ascend'` `'descend'` `false` | Boolean or String | - |
+| filteredValue | 筛选的受控属性，外界可用此控制列的筛选状态，值为已筛选的 value 数组 | string[] | - |
+| sorter     | 排序函数，本地排序使用一个函数，需要服务端排序可设为 true | Function\|boolean | - |
+| colSpan    | 表头列合并,设置为 0 时，不渲染 | number      |         |
+| width      | 列宽度 | string\|number | -  |
+| className  | 列的 className             | string          |  -      |
+| fixed      | 列是否固定，可选 `true`(等效于 left) `'left'` `'right'` | boolean\|string | false |
+| sortOrder | 排序的受控属性，外界可用此控制列的排序，可设置为 `'ascend'` `'descend'` `false` | boolean\|string | - |
 | onCellClick | 单元格点击回调 | Function(record, event) | - |
 
 ### ColumnGroup
 
 | 参数       | 说明                       | 类型            |  默认值  |
 |-----------|----------------------------|-----------------|---------|
-| title      | 列头显示文字               | String or React.Element | - |
+| title      | 列头显示文字               | string\|ReactNode | - |
 
 ### rowSelection
 
@@ -114,8 +114,8 @@ const columns = [{
 
 | 参数              | 说明                     | 类型             |  默认值   |
 |------------------|--------------------------|-----------------|---------------------|---------|
-| type | 多选/单选，`checkbox` or `radio` | String | `checkbox`  |
-| selectedRowKeys | 指定选中项的 key 数组，需要和 onChange 进行配合 | Array | []  |
+| type | 多选/单选，`checkbox` or `radio` | string | `checkbox`  |
+| selectedRowKeys | 指定选中项的 key 数组，需要和 onChange 进行配合 | string[] | []  |
 | onChange | 选中项发生变化的时的回调 | Function(selectedRowKeys, selectedRows) | -   |
 | getCheckboxProps | 选择框的默认属性配置        | Function(record) |  -   |
 | onSelect | 用户手动选择/取消选择某列的回调         | Function(record, selected, selectedRows) |   -   |
diff --git a/components/tabs/index.en-US.md b/components/tabs/index.en-US.md
index 79eedae57..672354b2f 100644
--- a/components/tabs/index.en-US.md
+++ b/components/tabs/index.en-US.md
@@ -36,4 +36,4 @@ Ant Design has 3 types Tabs for different situation.
 | Property     | Description           | Type     | Default      |
 |--------------|-----------------------|----------|--------------|
 | key          | TabPane's key         | string   | _            |
-| tab          | Show text in TabPane's head | React.ReactNode | _ |
+| tab          | Show text in TabPane's head | string\|ReactNode | _ |
diff --git a/components/tabs/index.zh-CN.md b/components/tabs/index.zh-CN.md
index f755fd37d..271d93e38 100644
--- a/components/tabs/index.zh-CN.md
+++ b/components/tabs/index.zh-CN.md
@@ -40,4 +40,4 @@ Ant Design 依次提供了三级选项卡，分别用于不同的场景。
 | 参数 | 说明             | 类型                    | 默认值 |
 |------|------------------|-------------------------|--------|
 | key  | 对应 activeKey   | string                  | 无     |
-| tab  | 选项卡头显示文字 | React.ReactNode | 无     |
+| tab  | 选项卡头显示文字 | string\|ReactNode | 无     |
diff --git a/components/time-picker/index.en-US.md b/components/time-picker/index.en-US.md
index 580c6269a..e59767b45 100644
--- a/components/time-picker/index.en-US.md
+++ b/components/time-picker/index.en-US.md
@@ -28,7 +28,7 @@ import moment from 'moment';
 | placeholder         | display when there's no value | string | "Select a time" |
 | onChange            | a callback function, can be executed when the selected time is changing    | function(time: moment, timeString: string): void | - |
 | format              | to set the time format | string | "HH:mm:ss"、"HH:mm"、"mm:ss" |
-| disabled            | determine whether the TimePicker is disabled | bool | false |
+| disabled            | determine whether the TimePicker is disabled | boolean | false |
 | disabledHours       | to specify the hours that cannot be selected | function() | - |
 | disabledMinutes     | to specify the minutes that cannot be selected | function(selectedHour) | - |
 | disabledSeconds     | to specify the seconds that cannot be selected | function(selectedHour, selectedMinute) | - |
diff --git a/components/time-picker/index.zh-CN.md b/components/time-picker/index.zh-CN.md
index d79501d8e..e8aaeb3c1 100644
--- a/components/time-picker/index.zh-CN.md
+++ b/components/time-picker/index.zh-CN.md
@@ -29,7 +29,7 @@ import moment from 'moment';
 | placeholder         | 没有值的时候显示的内容 | string | "请选择时间" |
 | onChange            | 时间发生变化的回调     | function(time: moment, timeString: string): void | 无 |
 | format              | 展示的时间格式 | string | "HH:mm:ss"、"HH:mm"、"mm:ss" |
-| disabled            | 禁用全部操作 | bool | false |
+| disabled            | 禁用全部操作 | boolean | false |
 | disabledHours       | 禁止选择部分小时选项 | function() | 无 |
 | disabledMinutes     | 禁止选择部分分钟选项 | function(selectedHour) | 无 |
 | disabledSeconds     | 禁止选择部分秒选项 | function(selectedHour, selectedMinute) | 无 |
diff --git a/components/timeline/Timeline.tsx b/components/timeline/Timeline.tsx
index a1ecb5239..d9e3cedc0 100644
--- a/components/timeline/Timeline.tsx
+++ b/components/timeline/Timeline.tsx
@@ -6,7 +6,7 @@ export interface TimelineProps {
   prefixCls?: string;
   className?: string;
   /** 指定最后一个幽灵节点是否存在或内容 */
-  pending?: boolean | React.ReactNode;
+  pending?: React.ReactNode;
   style?: React.CSSProperties;
 }
 
diff --git a/components/timeline/index.en-US.md b/components/timeline/index.en-US.md
index 1a71e8b7e..eba186adb 100644
--- a/components/timeline/index.en-US.md
+++ b/components/timeline/index.en-US.md
@@ -28,7 +28,7 @@ Timeline
 
 | Property      | Description                                     | Type       | Default |
 |----------|----------------------------------------|------------|-------|
-| pending  | to set the last ghost node's existence or its content | boolean or React.Element | false  |
+| pending  | to set the last ghost node's existence or its content | boolean\|string\|ReactNode | false  |
 
 ### Timeline.Item
 
@@ -37,4 +37,4 @@ Node of timeline
 | Property      | Description                                     | Type       | Default |
 |----------|------------------------------------------|------------|-------|
 | color   | to set the circle's color to `blue, red, green` or other custom colors | string | blue  |
-| dot   | custom timeline dot | React.Element | -  |
+| dot   | custom timeline dot | string\|ReactNode | -  |
diff --git a/components/timeline/index.zh-CN.md b/components/timeline/index.zh-CN.md
index c633961ef..cf586a34b 100644
--- a/components/timeline/index.zh-CN.md
+++ b/components/timeline/index.zh-CN.md
@@ -29,7 +29,7 @@ title: Timeline
 
 | 参数      | 说明                                     | 类型       | 默认值 |
 |----------|----------------------------------------|------------|-------|
-| pending  | 指定最后一个幽灵节点是否存在或内容 | boolean or React.Element | false  |
+| pending  | 指定最后一个幽灵节点是否存在或内容 | boolean\|string\|ReactNode | false  |
 
 ### Timeline.Item
 
@@ -38,4 +38,4 @@ title: Timeline
 | 参数      | 说明                                     | 类型       | 默认值 |
 |----------|------------------------------------------|------------|-------|
 | color   | 指定圆圈颜色 `blue, red, green`，或自定义的色值 | string | blue  |
-| dot   | 自定义时间轴点 | React.Element | -  |
+| dot   | 自定义时间轴点 | string\|ReactNode | -  |
diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md
index c232c25d2..eafe6fe59 100644
--- a/components/tooltip/index.en-US.md
+++ b/components/tooltip/index.en-US.md
@@ -25,7 +25,7 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 |-----------|------------------------------------------|------------|--------|
 | placement | to set the position, which can be one of `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string     | top    |
 | getPopupContainer | to set the container of the tip, while the default is to create a `div` element in `body`. Use `getTooltipContainer` if you are using `antd@<2.5.2` | Function(triggerNode) | () => document.body |
-| arrowPointAtCenter | whether arrow pointed at the center of target, supported after `antd@1.11+` | Boolean | `false` |
+| arrowPointAtCenter | whether arrow pointed at the center of target, supported after `antd@1.11+` | boolean | `false` |
 | visible   | make the float card visible or not                     | boolean       | false  |
 | onVisibleChange | callback of the visible attribute changed            | (visible) => void | none     |
 | trigger | triggering mode: can be hover, focus, or click. | string | hover |
diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md
index 1610786c0..834c83e3e 100644
--- a/components/tooltip/index.zh-CN.md
+++ b/components/tooltip/index.zh-CN.md
@@ -27,7 +27,7 @@ title: Tooltip
 |-----------|------------------------------------------|------------|--------|
 | placement | 气泡框位置，可选 `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string     | top    |
 | getPopupContainer | 浮层渲染父节点，默认渲染到 body 上。`2.5.2` 之前请使用 `getTooltipContainer` | Function(triggerNode) | () => document.body |
-| arrowPointAtCenter | 箭头是否指向目标元素中心，`antd@1.11+` 支持 | Boolean | `false` |
+| arrowPointAtCenter | 箭头是否指向目标元素中心，`antd@1.11+` 支持 | boolean | `false` |
 | visible   | 用于手动控制浮层显隐                     | boolean       | false  |
 | onVisibleChange | 显示隐藏的回调                      | (visible) => void | 无     |
 | trigger   | 触发行为，可选 `hover/focus/click`       | string        | hover  |
diff --git a/components/transfer/index.en-US.md b/components/transfer/index.en-US.md
index 9544e0ec0..70ee39c37 100644
--- a/components/transfer/index.en-US.md
+++ b/components/transfer/index.en-US.md
@@ -17,22 +17,22 @@ One or more elements can be selected from either column, one click on the proper
 
 | Property      | Description                                     | Type       | Default |
 |-----------|------------------------------------------|------------|--------|
-| dataSource | Used for setting the source data. The elements that are part of this array will be present the left column. Except the elements whose keys are included in `targetKeys` prop. | Array | [] |
+| dataSource | Used for setting the source data. The elements that are part of this array will be present the left column. Except the elements whose keys are included in `targetKeys` prop. | [TransferItem](https://git.io/vMM64)[] | [] |
 | render | The function to generate the item shown on a column. Based on an record (element of the dataSource array), this function should return a React element which is generated from that record. | Function(record) |     |
 | targetKeys | A set of keys of elements that are listed on the right column. | string[] | [] |
 | selectedKeys | A set of keys of selected items. | string[] | [] |
 | onChange | A callback function that is executed when the transfer between columns is complete. | (targetKeys, direction, moveKeys): void |  |
 | onSelectChange | A callback function which is executed when selected items are changed. | (sourceSelectedKeys, targetSelectedKeys): void | |
-| listStyle | A custom CSS style used for rendering the transfer columns. | Object |  |
-| className | A custom CSS class. | String | ['', ''] |
-| titles | A set of titles that are sorted from left to right. | Array | - |
-| operations | A set of operations that are sorted from top to bottom. | Array | [] |
-| showSearch | If included, a search box is shown on each column. | Boolean | false |
+| listStyle | A custom CSS style used for rendering the transfer columns. | object |  |
+| className | A custom CSS class. | string | ['', ''] |
+| titles | A set of titles that are sorted from left to right. | string[] | - |
+| operations | A set of operations that are sorted from top to bottom. | string[] | [] |
+| showSearch | If included, a search box is shown on each column. | boolean | false |
 | filterOption | A function to determine whether an item should show in search result list | (inputValue, option): boolean | |
-| searchPlaceholder | The hint text of the search box. | String | 'Search here' |
-| notFoundContent | Text to display when a column is empty. | React.ReactNode | 'The list is empty'  |
-| footer | A function used for rendering the footer. | (props): React.ReactNode |  |
-| lazy | property of [react-lazy-load](https://github.com/loktar00/react-lazy-load) for lazy rendering items | Object | `{ height: 32, offset: 32 }` |
+| searchPlaceholder | The hint text of the search box. | string | 'Search here' |
+| notFoundContent | Text to display when a column is empty. | string\|ReactNode | 'The list is empty'  |
+| footer | A function used for rendering the footer. | (props): ReactNode |  |
+| lazy | property of [react-lazy-load](https://github.com/loktar00/react-lazy-load) for lazy rendering items | object | `{ height: 32, offset: 32 }` |
 
 ## Warning
 
diff --git a/components/transfer/index.zh-CN.md b/components/transfer/index.zh-CN.md
index 4c9be7581..354770b0e 100644
--- a/components/transfer/index.zh-CN.md
+++ b/components/transfer/index.zh-CN.md
@@ -19,22 +19,22 @@ title: Transfer
 
 | 参数      | 说明                                     | 类型       | 默认值 |
 |-----------|------------------------------------------|------------|--------|
-| dataSource | 数据源，其中的数据将会被渲染到左边一栏中，`targetKeys` 中指定的除外。 | Array | [] |
-| render | 每行数据渲染函数，该函数的入参为 `dataSource` 中的项，返回值为 React element | Function(record)  |     |
+| dataSource | 数据源，其中的数据将会被渲染到左边一栏中，`targetKeys` 中指定的除外。 | [TransferItem](https://git.io/vMM64)[] | [] |
+| render | 每行数据渲染函数，该函数的入参为 `dataSource` 中的项，返回值为 ReactElement | Function(record)  |     |
 | targetKeys | 显示在右侧框数据的key集合 | string[]  | [] |
 | selectedKeys | 设置哪些项应该被选中 | string[] | [] |
 | onChange | 选项在两栏之间转移时的回调函数 | (targetKeys, direction, moveKeys): void |  |
 | onSelectChange | 选中项发生改变时的回调函数 | (sourceSelectedKeys, targetSelectedKeys): void | |
-| listStyle | 两个穿梭框的自定义样式 | Object |  |
-| className | 自定义类 | String |  |
-| titles | 标题集合,顺序从左至右 | Array | ['', ''] |
-| operations | 操作文案集合,顺序从上至下 | Array | [] |
-| showSearch | 是否显示搜索框 | Boolean | false |
+| listStyle | 两个穿梭框的自定义样式 | object |  |
+| className | 自定义类 | string |  |
+| titles | 标题集合,顺序从左至右 | string[] | ['', ''] |
+| operations | 操作文案集合,顺序从上至下 | string[] | [] |
+| showSearch | 是否显示搜索框 | boolean | false |
 | filterOption | 接收 `inputValue` `option` 两个参数，当 `option` 符合筛选条件时，应返回 `true`，反之则返回 `false`。| (inputValue, option): boolean | |
 | searchPlaceholder | 搜索框的默认值 | string | '请输入搜索内容' |
-| notFoundContent | 当列表为空时显示的内容 | React.ReactNode | '列表为空'  |
-| footer | 底部渲染函数 | (props): React.ReactNode |  |
-| lazy | Transfer 使用了 [react-lazy-load](https://github.com/loktar00/react-lazy-load) 优化性能，这里可以设置相关参数 | Object | `{ height: 32, offset: 32 }` |
+| notFoundContent | 当列表为空时显示的内容 | string\|ReactNode | '列表为空'  |
+| footer | 底部渲染函数 | (props): ReactNode |  |
+| lazy | Transfer 使用了 [react-lazy-load](https://github.com/loktar00/react-lazy-load) 优化性能，这里可以设置相关参数 | object | `{ height: 32, offset: 32 }` |
 
 ## 注意
 
diff --git a/components/transfer/list.tsx b/components/transfer/list.tsx
index 08ac20b0e..fff525c37 100644
--- a/components/transfer/list.tsx
+++ b/components/transfer/list.tsx
@@ -29,7 +29,7 @@ export interface TransferListProps {
   checkedKeys: string[];
   checkStatus?: boolean;
   position?: string;
-  notFoundContent?: React.ReactNode | string;
+  notFoundContent?: React.ReactNode;
   filterOption: (filterText: any, item: any) => boolean;
   lazy?: boolean | {};
 }
diff --git a/components/tree-select/index.en-US.md b/components/tree-select/index.en-US.md
index 893abd511..d143c751c 100644
--- a/components/tree-select/index.en-US.md
+++ b/components/tree-select/index.en-US.md
@@ -18,30 +18,30 @@ Any data whose entries are defined in a hierarchical manner is fit to use this c
 
 Property | Description | Type | Default
 -----|-----|-----|------
-value | To set the current selected treeNode(s). | __Default:__ String/Array<String>. __With `labelInValue` set:__ { value: String, label: React.Node }/Array<{ value, label }>. __With `treeCheckStrictly` set(`halfChecked` is set to `false`):__ { value: String, label: React.Node, halfChecked }/Array<{ value, label, halfChecked }>. | -
-labelInValue | Determine whether to put `label` into `value`, the type of `value` as specified in the above | Boolean | false
-defaultValue | To set the initial selected treeNode(s).  | String/Array<String> | -
-multiple | Support multiple or not, will be `true` when enable `treeCheckable`. | Boolean | false
+value | To set the current selected treeNode(s). | __Default:__ string\|string[]. __With `labelInValue` set:__ { value: string, label: ReactNode }/Array<{ value: string, label: ReactNode }>. __With `treeCheckStrictly` set(`halfChecked` is set to `false`):__ { value: string, label: ReactNode, halfChecked: string[] }/Array<{ value: string, label: ReactNode, halfChecked: string[] }>. | -
+labelInValue | Determine whether to put `label` into `value`, the type of `value` as specified in the above | boolean | false
+defaultValue | To set the initial selected treeNode(s).  | string\|string[] | -
+multiple | Support multiple or not, will be `true` when enable `treeCheckable`. | boolean | false
 onSelect | A callback function, can be executed when you select a treeNode. | function(value, node, extra) | -
 onChange | A callback function, can be executed when selected treeNodes or input value change  | function(value, label, extra) | -
-allowClear | Whether allow clear  | Boolean | false
-onSearch | A callback function, can be executed when the search input changes. | function(value: String) | -
-placeholder | Placeholder of the select input | String | -
-searchPlaceholder | Placeholder of the search input  | String | -
-dropdownStyle | To set the style of the dropdown menu  | Object | -
-dropdownMatchSelectWidth | Determine whether the dropdown menu and the select input are the same width  | Boolean | -
-size | To set the size of the select input, options: `large` `small`  | String | default
-showSearch | Whether to display a search input in the dropdown menu(valid only in the single mode) | Boolean | false
-disabled | Disabled or not  | Boolean | false
+allowClear | Whether allow clear  | boolean | false
+onSearch | A callback function, can be executed when the search input changes. | function(value: string) | -
+placeholder | Placeholder of the select input | string | -
+searchPlaceholder | Placeholder of the search input  | string | -
+dropdownStyle | To set the style of the dropdown menu  | object | -
+dropdownMatchSelectWidth | Determine whether the dropdown menu and the select input are the same width  | boolean | -
+size | To set the size of the select input, options: `large` `small`  | string | default
+showSearch | Whether to display a search input in the dropdown menu(valid only in the single mode) | boolean | false
+disabled | Disabled or not  | boolean | false
 showCheckedStrategy | __Default:__ just show child nodes. __`TreeSelect.SHOW_ALL`:__ show all checked treeNodes (include parent treeNode). __`TreeSelect.SHOW_PARENT`:__ show checked treeNodes (just show parent treeNode). | enum{TreeSelect.SHOW_ALL, TreeSelect.SHOW_PARENT, TreeSelect.SHOW_CHILD } | TreeSelect.SHOW_CHILD
-treeDefaultExpandAll | Whether to expand all treeNodes by default | Boolean | false
-treeCheckable | Whether to show checkbox on the treeNodes | Boolean | false
-treeCheckStrictly | Whether to check nodes precisely(in the `checkable` mode), means parent and child nodes are not associated | Boolean | false
-filterTreeNode | Whether to filter treeNodes by input value. The value of `treeNodeFilterProp` is used for filtering by default. | Boolean/Function(inputValue: string, treeNode: TreeNode) (should return Boolean) | Function
-treeNodeFilterProp | Will be used for filtering if `filterTreeNode` returns true | String | 'value'
-treeNodeLabelProp | Will render as content of select  | String | 'title'
+treeDefaultExpandAll | Whether to expand all treeNodes by default | boolean | false
+treeCheckable | Whether to show checkbox on the treeNodes | boolean | false
+treeCheckStrictly | Whether to check nodes precisely(in the `checkable` mode), means parent and child nodes are not associated | boolean | false
+filterTreeNode | Whether to filter treeNodes by input value. The value of `treeNodeFilterProp` is used for filtering by default. | boolean\|Function(inputValue: string, treeNode: TreeNode) (should return boolean) | Function
+treeNodeFilterProp | Will be used for filtering if `filterTreeNode` returns true | string | 'value'
+treeNodeLabelProp | Will render as content of select  | string | 'title'
 treeData | Data of the treeNodes, manual construction work is no longer needed if this property has been set(ensure the Uniqueness of each value) | array<{ value, label, children, [disabled, selectable] }> | []
-treeDataSimpleMode | Enable simple mode of treeData.(treeData should like this: [{id:1, pId:0, value:'1', label:"test1",...},...], pId is parent node's id)  | Boolean/Object{ id: 'id', pId: 'pId', rootPId: null } | false
+treeDataSimpleMode | Enable simple mode of treeData.(treeData should like this: [{id:1, pId:0, value:'1', label:"test1",...},...], pId is parent node's id)  | false\|Array<{ id: string, pId: string, rootPId: null }> | false
 loadData | Load data asynchronously.  | function(node) | -
 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
 
@@ -51,9 +51,9 @@ getPopupContainer | To set the container of the dropdown menu. The default is to
 
 Property | Description | Type | Default
 -----|-----|-----|------
-disabled | Disabled or not | Boolean | false
-key | Required property, should be unique in the tree  | String | -
-value | Will be treated as `treeNodeFilterProp` by default, should be unique in the tree | String | -
-title | Content showed on the treeNodes | String/element | '---'
-isLeaf | Leaf node or not   | Boolean | false
+disabled | Disabled or not | boolean | false
+key | Required property, should be unique in the tree  | string | -
+value | Will be treated as `treeNodeFilterProp` by default, should be unique in the tree | string | -
+title | Content showed on the treeNodes | string\|ReactNode | '---'
+isLeaf | Leaf node or not   | boolean | false
 
diff --git a/components/tree-select/index.zh-CN.md b/components/tree-select/index.zh-CN.md
index 767dbe06c..2561e3da5 100644
--- a/components/tree-select/index.zh-CN.md
+++ b/components/tree-select/index.zh-CN.md
@@ -17,30 +17,30 @@ title: TreeSelect
 
 | 参数       | 说明                                      | 类型       | 默认值 |
 |-----------|------------------------------------------|------------|--------|
-| value    | 指定当前选中的条目 | 通常: String/Array<String>. 设置 labelInValue: {value: String, label: React.Node}/Array<{value, label}>. 设置 treeCheckStrictly(halfChecked 默认为 false): {value: String, label: React.Node, halfChecked}/Array<{value, label, halfChecked}>. |  -  |
-| labelInValue | 是否把 label 嵌入到 value 里，设置后参考以上 value 类型写法  | Boolean | false |
-| defaultValue | 指定默认选中的条目 | String/Array<String>   |  -  |
-| multiple   | 支持多选（当设置 treeCheckable 时自动变为true） | Boolean | false |
+| value    | 指定当前选中的条目 | 通常: string/string[]. 设置 labelInValue: { value: string, label: ReactNode }/Array<{ value: string, label: ReactNode }>. 设置 treeCheckStrictly(halfChecked 默认为 false): { value: string, label: ReactNode, halfChecked: string[] }/Array<{ value: string, label: ReactNode, halfChecked: string[] }>. |  -  |
+| labelInValue | 是否把 label 嵌入到 value 里，设置后参考以上 value 类型写法  | boolean | false |
+| defaultValue | 指定默认选中的条目 | string/string[]   |  -  |
+| multiple   | 支持多选（当设置 treeCheckable 时自动变为true） | boolean | false |
 | onSelect | 被选中时调用 | function(value, node, extra) | -   |
 | onChange | 选中树节点时调用此函数 | function(value, label, extra) | - |
-| allowClear | 显示清除按钮 | Boolean | false |
-| onSearch | 文本框值变化时回调 | function(value: String) | - |
-| placeholder | 选择框默认文字 | String | - |
-| searchPlaceholder | 搜索框默认文字 | String | - |
-| dropdownStyle | 下拉菜单的样式 | Object | - |
-| dropdownMatchSelectWidth | 下拉菜单和选择器同宽 | Boolean | true |
-| size    | 选择框大小，可选 `large` `small`  | String      |      default      |
-| showSearch | 在下拉中显示搜索框(仅在单选模式下生效) | Boolean | false |
-| disabled | 是否禁用 | Boolean | false |
+| allowClear | 显示清除按钮 | boolean | false |
+| onSearch | 文本框值变化时回调 | function(value: string) | - |
+| placeholder | 选择框默认文字 | string | - |
+| searchPlaceholder | 搜索框默认文字 | string | - |
+| dropdownStyle | 下拉菜单的样式 | object | - |
+| dropdownMatchSelectWidth | 下拉菜单和选择器同宽 | boolean | true |
+| size    | 选择框大小，可选 `large` `small`  | string      |      default      |
+| showSearch | 在下拉中显示搜索框(仅在单选模式下生效) | boolean | false |
+| disabled | 是否禁用 | boolean | false |
 | showCheckedStrategy | `TreeSelect.SHOW_ALL`: 显示所有选中节点(包括父节点). `TreeSelect.SHOW_PARENT`: 只显示父节点(当父节点下所有子节点都选中时). 默认只显示子节点. | enum{TreeSelect.SHOW_ALL, TreeSelect.SHOW_PARENT, TreeSelect.SHOW_CHILD } | TreeSelect.SHOW_CHILD |
-| treeDefaultExpandAll | 默认展开所有树节点 | Boolean | false |
-| treeCheckable | 显示 checkbox | Boolean | false |
-| treeCheckStrictly | checkable 状态下节点选择完全受控（父子节点选中状态不再关联）| Boolean | false |
-| filterTreeNode | 是否根据输入项进行筛选，默认用 treeNodeFilterProp 的值作为要筛选的 TreeNode 的属性值 | Boolean/Function(inputValue: string, treeNode: TreeNode) (函数需要返回bool值) | Function |
-| treeNodeFilterProp | 输入项过滤对应的 treeNode 属性 | String | 'value' |
-| treeNodeLabelProp | 作为显示的 prop 设置 | String | 'title' |
+| treeDefaultExpandAll | 默认展开所有树节点 | boolean | false |
+| treeCheckable | 显示 checkbox | boolean | false |
+| treeCheckStrictly | checkable 状态下节点选择完全受控（父子节点选中状态不再关联）| boolean | false |
+| filterTreeNode | 是否根据输入项进行筛选，默认用 treeNodeFilterProp 的值作为要筛选的 TreeNode 的属性值 | boolean\|Function(inputValue: string, treeNode: TreeNode) (函数需要返回bool值) | Function |
+| treeNodeFilterProp | 输入项过滤对应的 treeNode 属性 | string | 'value' |
+| treeNodeLabelProp | 作为显示的 prop 设置 | string | 'title' |
 | treeData | treeNodes 数据，如果设置则不需要手动构造 TreeNode 节点（value 在整个树范围内唯一）| array<{value, label, children, [disabled, selectable]}> | [] |
-|treeDataSimpleMode | 使用简单格式的 treeData，具体设置参考可设置的类型 (此时 treeData 应变为这样的数据结构: [{id:1, pId:0, value:'1', label:"test1",...},...], `pId` 是父节点的 id) | Boolean/Object{id: 'id', pId: 'pId', rootPId: null} | false |
+|treeDataSimpleMode | 使用简单格式的 treeData，具体设置参考可设置的类型 (此时 treeData 应变为这样的数据结构: [{id:1, pId:0, value:'1', label:"test1",...},...], `pId` 是父节点的 id) | false\|Array<{ id: string, pId: string, rootPId: null }> | false |
 | loadData | 异步加载数据 | function(node) | - |
 | getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](http://codepen.io/anon/pen/xVBOVQ?editors=001) | Function(triggerNode) | () => document.body |
 
@@ -50,8 +50,8 @@ title: TreeSelect
 
 | 参数       | 说明                                      | 类型       | 默认值 |
 |-----------|------------------------------------------|------------|--------|
-| disabled    | 是否禁用 | Boolean   |  false  |
-| key   | 此项必须设置（其值在整个树范围内唯一） |  String | - |
-| value   | 默认根据此属性值进行筛选（其值在整个树范围内唯一） | String | - |
-| title | 树节点显示的内容 | String/element | '---' |
-| isLeaf | 是否是叶子节点 | Boolean | false |
+| disabled    | 是否禁用 | boolean   |  false  |
+| key   | 此项必须设置（其值在整个树范围内唯一） |  string | - |
+| value   | 默认根据此属性值进行筛选（其值在整个树范围内唯一） | string | - |
+| title | 树节点显示的内容 | string\|ReactNode | '---' |
+| isLeaf | 是否是叶子节点 | boolean | false |
diff --git a/components/tree/index.en-US.md b/components/tree/index.en-US.md
index e8633f1a3..5061f1de6 100644
--- a/components/tree/index.en-US.md
+++ b/components/tree/index.en-US.md
@@ -14,24 +14,24 @@ Directory, organization, biological classification, country, and etc. Almost thi
 
 | Property       | Description                                      | Type       | Default |
 |----------------|--------------------------------------------------|------------|---------|
-|multiple | Whether allow to select multiple treeNodes | bool | false |
-|checkable | Whether support add Checkbox before treeNode | bool | false |
-|defaultExpandAll | Whether default to expand all treeNodes | bool | false |
-|defaultExpandedKeys | Specify keys of default expanded treeNodes | String[] | [] |
-|expandedKeys |(controlled) Specifies keys of expanded treeNodes | String[] | [] |
-|autoExpandParent | Whether to automatically expand a parent treeNode | bool | true |
-|defaultCheckedKeys | Specifies keys of default checked treeNodes | String[] | [] |
-|checkedKeys |(controlled) Specifies keys of checked treeNodes（PS： When specifies a key of treeNode which is a parent treeNode, all children treeNodes of its will be checked; And vice versa, when specifies a key of treeNode which is a child treeNode, its parent treeNode will also be checked. When `checkable` and `checkStrictly` is true, it'a object has `checked` and `halfChecked` property, and no matter child treeNode or parent treeNode is checked, they won't impact on eachother. | String[]/{checked:Array<String>,halfChecked:Array<String>} | [] |
-|checkStrictly| Check treeNode precisely, parent treeNode and children treeNodes are not associated | bool | false |
-|defaultSelectedKeys | Specifies keys of default selected treeNodes | String[] | [] |
-|selectedKeys |(controlled) Specifies keys of selected treeNode | String[] | - |
+|multiple | Whether allow to select multiple treeNodes | boolean | false |
+|checkable | Whether support add Checkbox before treeNode | boolean | false |
+|defaultExpandAll | Whether default to expand all treeNodes | boolean | false |
+|defaultExpandedKeys | Specify keys of default expanded treeNodes | string[] | [] |
+|expandedKeys |(controlled) Specifies keys of expanded treeNodes | string[] | [] |
+|autoExpandParent | Whether to automatically expand a parent treeNode | boolean | true |
+|defaultCheckedKeys | Specifies keys of default checked treeNodes | string[] | [] |
+|checkedKeys |(controlled) Specifies keys of checked treeNodes（PS： When specifies a key of treeNode which is a parent treeNode, all children treeNodes of its will be checked; And vice versa, when specifies a key of treeNode which is a child treeNode, its parent treeNode will also be checked. When `checkable` and `checkStrictly` is true, it'a object has `checked` and `halfChecked` property, and no matter child treeNode or parent treeNode is checked, they won't impact on eachother. | string[]/{checked:string[],halfChecked:string[]} | [] |
+|checkStrictly| Check treeNode precisely, parent treeNode and children treeNodes are not associated | boolean | false |
+|defaultSelectedKeys | Specifies keys of default selected treeNodes | string[] | [] |
+|selectedKeys |(controlled) Specifies keys of selected treeNode | string[] | - |
 |onExpand | Defines a function will be called when expand or collapse a treeNode | function(expandedKeys, {expanded: bool, node}) | - |
 |onCheck | Defines a function will be called when the onCheck event occurs | function(checkedKeys, e:{checked: bool, checkedNodes, node, event}) | - |
 |onSelect | The callback will be invoked when the user clicks a treeNode | function(selectedKeys, e:{selected: bool, selectedNodes, node, event}) | - |
 |filterTreeNode | Defines a function to filter treeNodes（highlight），when return true, corresponding treeNode will be highlight | function(node) | - |
 |loadData | load data asynchronously | function(node)| - |
 |onRightClick | The call back will be invoked when the user right clicks a treeNode | function({event,node}) | - |
-|draggable | Specifies whether this Tree is draggable（IE>8） | bool | false |
+|draggable | Specifies whether this Tree is draggable（IE>8） | boolean | false |
 |onDragStart | Defines a function will be called when the onDragStart event occurs | function({event,node}) | - |
 |onDragEnter | Defines a function will be called when the onDragEnter event occurs | function({event,node,expandedKeys}) | - |
 |onDragOver  | Defines a function will be called when the onDragOver event occurs | function({event,node}) | - |
@@ -43,11 +43,11 @@ Directory, organization, biological classification, country, and etc. Almost thi
 
 | Property  | Description                              | Type    | Default |
 |-----------|------------------------------------------|---------|---------|
-|disabled | whether disabled the treeNode | bool | false |
-|disableCheckbox | whether disable the checkbox of treeNode | bool | false |
-|title | title | String/element | '---' |
-|key | it's used with (default)ExpandedKeys / (default)CheckedKeys / (default)SelectedKeys. P.S.: it must be unique in all of treeNodes of the tree! | String | internal calculated position of treeNode |
-|isLeaf | whether it's leaf node | bool | false |
+|disabled | whether disabled the treeNode | boolean | false |
+|disableCheckbox | whether disable the checkbox of treeNode | boolean | false |
+|title | title | string\|ReactNode | '---' |
+|key | it's used with (default)ExpandedKeys / (default)CheckedKeys / (default)SelectedKeys. P.S.: it must be unique in all of treeNodes of the tree! | string | internal calculated position of treeNode |
+|isLeaf | whether it's leaf node | boolean | false |
 
 ## Note
 
diff --git a/components/tree/index.zh-CN.md b/components/tree/index.zh-CN.md
index 7d37b51fe..c4a4f33fd 100644
--- a/components/tree/index.zh-CN.md
+++ b/components/tree/index.zh-CN.md
@@ -15,24 +15,24 @@ subtitle: 树形控件
 
 | 参数       | 说明                                      | 类型       | 默认值 |
 |-----------|------------------------------------------|------------|--------|
-|multiple | 支持点选多个节点（节点本身） | bool | false |
-|checkable | 节点前添加 Checkbox 复选框 | bool | false |
-|defaultExpandAll | 默认展开所有树节点 | bool | false |
-|defaultExpandedKeys | 默认展开指定的树节点 | String[] | [] |
-|expandedKeys | （受控）展开指定的树节点 | String[] | [] |
-|autoExpandParent | 是否自动展开父节点 | bool | true |
-|defaultCheckedKeys | 默认选中复选框的树节点 | String[] | [] |
-|checkedKeys | （受控）选中复选框的树节点（注意：父子节点有关联，如果传入父节点key，则子节点自动选中；相应当子节点key都传入，父节点也自动选中。当设置`checkable`和`checkStrictly`，它是一个有`checked`和`halfChecked`属性的对象，并且父子节点的选中与否不再关联 | String[]/{checked:Array<String>,halfChecked:Array<String>} | [] |
-|checkStrictly| checkable状态下节点选择完全受控（父子节点选中状态不再关联）| bool | false |
-|defaultSelectedKeys | 默认选中的树节点 | String[] | [] |
-|selectedKeys | （受控）设置选中的树节点 | String[] | - |
+|multiple | 支持点选多个节点（节点本身） | boolean | false |
+|checkable | 节点前添加 Checkbox 复选框 | boolean | false |
+|defaultExpandAll | 默认展开所有树节点 | boolean | false |
+|defaultExpandedKeys | 默认展开指定的树节点 | string[] | [] |
+|expandedKeys | （受控）展开指定的树节点 | string[] | [] |
+|autoExpandParent | 是否自动展开父节点 | boolean | true |
+|defaultCheckedKeys | 默认选中复选框的树节点 | string[] | [] |
+|checkedKeys | （受控）选中复选框的树节点（注意：父子节点有关联，如果传入父节点key，则子节点自动选中；相应当子节点key都传入，父节点也自动选中。当设置`checkable`和`checkStrictly`，它是一个有`checked`和`halfChecked`属性的对象，并且父子节点的选中与否不再关联 | string[]\|{checked:string[],halfChecked:string[]} | [] |
+|checkStrictly| checkable状态下节点选择完全受控（父子节点选中状态不再关联）| boolean | false |
+|defaultSelectedKeys | 默认选中的树节点 | string[] | [] |
+|selectedKeys | （受控）设置选中的树节点 | string[] | - |
 |onExpand | 展开/收起节点时触发 | function(expandedKeys, {expanded: bool, node}) | - |
 |onCheck | 点击复选框触发 | function(checkedKeys, e:{checked: bool, checkedNodes, node, event}) | - |
 |onSelect | 点击树节点触发 | function(selectedKeys, e:{selected: bool, selectedNodes, node, event}) | - |
 |filterTreeNode | 按需筛选树节点（高亮），返回true | function(node) | - |
 |loadData | 异步加载数据 | function(node)| - |
 |onRightClick | 响应右键点击 | function({event,node}) | - |
-|draggable | 设置节点可拖拽（IE>8） | bool | false |
+|draggable | 设置节点可拖拽（IE>8） | boolean | false |
 |onDragStart | 开始拖拽时调用 | function({event,node}) | - |
 |onDragEnter | dragenter 触发时调用 | function({event,node,expandedKeys}) | - |
 |onDragOver | dragover 触发时调用 | function({event,node}) | - |
@@ -44,11 +44,11 @@ subtitle: 树形控件
 
 | 参数       | 说明                                      | 类型       | 默认值 |
 |-----------|------------------------------------------|------------|--------|
-|disabled | 禁掉响应 | bool | false |
-|disableCheckbox | 禁掉 checkbox | bool | false |
-|title | 标题 | String/element | '---' |
-|key | 被树的 (default)ExpandedKeys / (default)CheckedKeys / (default)SelectedKeys 属性所用。注意：整个树范围内的所有节点的 key 值不能重复！ | String | 内部计算出的节点位置 |
-|isLeaf | 设置为叶子节点 | bool | false |
+|disabled | 禁掉响应 | boolean | false |
+|disableCheckbox | 禁掉 checkbox | boolean | false |
+|title | 标题 | string\|ReactNode | '---' |
+|key | 被树的 (default)ExpandedKeys / (default)CheckedKeys / (default)SelectedKeys 属性所用。注意：整个树范围内的所有节点的 key 值不能重复！ | string | 内部计算出的节点位置 |
+|isLeaf | 设置为叶子节点 | boolean | false |
 
 ## 注意
 
diff --git a/components/upload/index.en-US.md b/components/upload/index.en-US.md
index d6a85f54e..dd35c8252 100644
--- a/components/upload/index.en-US.md
+++ b/components/upload/index.en-US.md
@@ -20,24 +20,24 @@ Uploading is the process of publishing information (web pages, text, pictures, v
 
 | Property       | Description                                    | Type        | Default|
 |------------|----------------------------------------------------| ----------- |--------|
-| name       | The name of uploading file               | String      | 'file' |
-| defaultFileList | Default list of files that have been uploaded.                   | Array[Object] | -  |
-| fileList   | List of files that have been uploaded (controlled). Here is a common issue [#2423](https://github.com/ant-design/ant-design/issues/2423) when using it | Array[Object] | - |
-| action     | Required. Uploading URL                            | String      | -    |
-| data       | Uploading params or function which can return uploading params. | Object or function(file) | - |
-| headers    | Set request headers, valid above IE10.   | Object      | -    |
-| showUploadList | Whether to show uploadList.          | Boolean     | true  |
-| multiple   | Whether to support selected multiple file. `IE10+` supported. You can select multiple files with CTRL holding down while multiple is set to be true  | Boolean     | false |
-| accept     | File types that can be accepted. See [input accept Attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-accept)    | String      | -   |
+| name       | The name of uploading file               | string      | 'file' |
+| defaultFileList | Default list of files that have been uploaded.                   | object[] | -  |
+| fileList   | List of files that have been uploaded (controlled). Here is a common issue [#2423](https://github.com/ant-design/ant-design/issues/2423) when using it | object[] | - |
+| action     | Required. Uploading URL                            | string      | -    |
+| data       | Uploading params or function which can return uploading params. | object\|function(file) | - |
+| headers    | Set request headers, valid above IE10.   | object      | -    |
+| showUploadList | Whether to show uploadList.          | boolean     | true  |
+| multiple   | Whether to support selected multiple file. `IE10+` supported. You can select multiple files with CTRL holding down while multiple is set to be true  | boolean     | false |
+| accept     | File types that can be accepted. See [input accept Attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-accept)    | string      | -   |
 | beforeUpload | Hook function which will be executed before uploading. Uploading will be stopped with `false` or a rejected Promise returned. **Warning：this function is not supported by old IE**。 | (file, fileList) => `boolean | Promise`    | -    |
 | customRequest | override for the default xhr behavior allowing for additional customization and ability to implement your own XMLHttpRequest | Function | - |
 | onChange   | A callback function, can be executed when uploading state is changing. See [onChange](#onChange)                | Function    | -   |
-| listType   | Built-in stylesheets, support for two types: `text` or `picture`     | String      | 'text'|
+| listType   | Built-in stylesheets, support for two types: `text` or `picture`     | string      | 'text'|
 | onPreview  | A callback function, will be executed when file link is clicked.  | Function(file) | -  |
 | onRemove   | A callback function, will be executed when removing file button is clicked                                       | Function(file) | -   |
-| supportServerRender | Need to be turned on while the server side is rendering.| Boolean | false    |
-| disabled | disable upload button | Boolean | false    |
-| withCredentials | ajax upload with cookie sent | Boolean | false |
+| supportServerRender | Need to be turned on while the server side is rendering.| boolean | false    |
+| disabled | disable upload button | boolean | false    |
+| withCredentials | ajax upload with cookie sent | boolean | false |
 
 ### onChange
 
diff --git a/components/upload/index.zh-CN.md b/components/upload/index.zh-CN.md
index 56a90eae5..977a1e0ca 100644
--- a/components/upload/index.zh-CN.md
+++ b/components/upload/index.zh-CN.md
@@ -21,24 +21,24 @@ title: Upload
 
 | 参数       | 说明                                                         | 类型        | 默认值|
 |------------|--------------------------------------------------------------| ----------- |-------|
-| name       | 发到后台的文件参数名                                         | String      | 'file'  |
-| defaultFileList | 默认已经上传的文件列表                           | Array[Object] | 无  |
-| fileList   | 已经上传的文件列表（受控），使用此参数时，如果遇到 `onChange` 只调用一次的问题，请参考 [#2423](https://github.com/ant-design/ant-design/issues/2423) | Array[Object] | 无 |
-| action     | 必选参数, 上传的地址                                         | String      | 无    |
-| data       | 上传所需参数或返回上传参数的方法                   | Object or function(file) | 无    |
-| headers    | 设置上传的请求头部，IE10 以上有效                    | Object      | 无    |
-| showUploadList | 是否展示 uploadList, 默认开启                  | Boolean     | true  |
-| multiple   | 是否支持多选文件，`ie10+` 支持。开启后按住 ctrl 可选择多个文件。  | Boolean     | false |
-| accept     | 接受上传的文件类型, 详见 [input accept Attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-accept)    | String      | 无    |
+| name       | 发到后台的文件参数名                                         | string      | 'file'  |
+| defaultFileList | 默认已经上传的文件列表                           | object[] | 无  |
+| fileList   | 已经上传的文件列表（受控），使用此参数时，如果遇到 `onChange` 只调用一次的问题，请参考 [#2423](https://github.com/ant-design/ant-design/issues/2423) | object[] | 无 |
+| action     | 必选参数, 上传的地址                                         | string      | 无    |
+| data       | 上传所需参数或返回上传参数的方法                   | object\|function(file) | 无    |
+| headers    | 设置上传的请求头部，IE10 以上有效                    | object      | 无    |
+| showUploadList | 是否展示 uploadList, 默认开启                  | boolean     | true  |
+| multiple   | 是否支持多选文件，`ie10+` 支持。开启后按住 ctrl 可选择多个文件。  | boolean     | false |
+| accept     | 接受上传的文件类型, 详见 [input accept Attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-accept)    | string      | 无    |
 | beforeUpload | 上传文件之前的钩子，参数为上传的文件，若返回 `false` 或者 Promise 则停止上传。**注意：该方法不支持老 IE**。 | (file, fileList) => `boolean | Promise`    | 无    |
 | customRequest | 通过覆盖默认的上传行为，可以自定义自己的上传实现 | Function | 无 |
 | onChange   | 上传文件改变时的状态，详见 onChange                | Function    | 无    |
-| listType   | 上传列表的内建样式，支持两种基本样式 `text` or `picture`     | String      | 'text'|
+| listType   | 上传列表的内建样式，支持两种基本样式 `text` or `picture`     | string      | 'text'|
 | onPreview  | 点击文件链接时的回调                                       | Function(file) | 无    |
 | onRemove   | 点击移除文件时的回调                                       | Function(file) | 无    |
-| supportServerRender | 服务端渲染时需要打开这个                           | Boolean | false    |
-| disabled | 是否禁用                           | Boolean | false    |
-| withCredentials | 上传请求时是否携带 cookie | Boolean | false |
+| supportServerRender | 服务端渲染时需要打开这个                           | boolean | false    |
+| disabled | 是否禁用                           | boolean | false    |
+| withCredentials | 上传请求时是否携带 cookie | boolean | false |
 
 ### onChange
 

From 703ccadb832243b031869df80706b4c82d446ee0 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Fri, 20 Jan 2017 20:23:43 +0800
Subject: [PATCH 03/51] Add 2.6.4 CHANGELOG (#4667)

---
 CHANGELOG.en-US.md | 15 +++++++++++++++
 CHANGELOG.zh-CN.md | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 63242f168..92d425ccc 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -9,6 +9,21 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
 
 ---
 
+## 2.6.4
+
+`2017-01-20`
+
+* Improve RangePicker when selecting a preset date.[#4561](https://github.com/ant-design/ant-design/issues/4561)
+* Fix DatePicker select time scroll issue.[#4412](https://github.com/ant-design/ant-design/issues/4412)
+* Fix issue resulting in vertical Menu can't be controlled.[#3783](https://github.com/ant-design/ant-design/issues/3783)
+* Fix Cascader's style when it's disabled.[#4648](https://github.com/ant-design/ant-design/issues/4648)
+* Table
+  * Improve Table fixed header's scrollbar style.[#4637](https://github.com/ant-design/ant-design/issues/4637)
+  * Fix issue resulting in Table's header flashes when `loading` is true in Safari.[#4622](https://github.com/ant-design/ant-design/issues/4622)
+  * Fix multiple border issues. [#4647](https://github.com/ant-design/ant-design/issues/4647)、[#4635](https://github.com/ant-design/ant-design/issues/4635)
+  * Fix `showHeader`'s default value.[#4658](https://github.com/ant-design/ant-design/issues/4658)
+  * Fix missing `TableColumnConfig` type.[#4660](https://github.com/ant-design/ant-design/issues/4660)
+
 ## 2.6.3
 
 `2017-01-15`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index db944b3ed..01b536427 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -9,6 +9,21 @@ timeline: true
 
 ---
 
+## 2.6.4
+
+`2017-01-20`
+
+* 优化 RangePicker 选择预设时间时的界面显示。[#4561](https://github.com/ant-design/ant-design/issues/4561)
+* 修复 DatePicker 选择时间界面的滚动问题。[#4412](https://github.com/ant-design/ant-design/issues/4412)
+* 修复 Menu 在 `vertical` 的受控模式下，子菜单不会弹出的问题。[#3783](https://github.com/ant-design/ant-design/issues/3783)
+* 修复 Cascader 禁用时的值显示样式问题。[#4648](https://github.com/ant-design/ant-design/issues/4648)
+* Table
+  * 优化固定表头的滚动条显示。[#4637](https://github.com/ant-design/ant-design/issues/4637)
+  * 修复在 Safari 下显示 loading 效果时表头会闪烁的问题。[#4622](https://github.com/ant-design/ant-design/issues/4622)
+  * 修复多处边框问题。[#4647](https://github.com/ant-design/ant-design/issues/4647)、[#4635](https://github.com/ant-design/ant-design/issues/4635)
+  * 修复 showHeader 的默认值不为 `false` 的问题。[#4658](https://github.com/ant-design/ant-design/issues/4658)
+  * 修复找不到 `TableColumnConfig` 的类型定义的问题。[#4660](https://github.com/ant-design/ant-design/issues/4660)
+
 ## 2.6.3
 
 `2017-01-15`

From 5a8d15333dac644d1ae2275fafa253210ec4e94c Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 20 Jan 2017 20:52:12 +0800
Subject: [PATCH 04/51] site: update header style

---
 site/theme/static/header.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/theme/static/header.less b/site/theme/static/header.less
index 52a8cf0a8..2f1412980 100644
--- a/site/theme/static/header.less
+++ b/site/theme/static/header.less
@@ -6,7 +6,7 @@
   border-bottom: 1px solid #eee;
   height: @header-height;
   margin-bottom: 24px;
-  padding: 0 4%;
+  padding: 0 48px;
   width: 100%;
 
   &.home-nav-bottom {

From d59629921035ec0ff4dd130b31c0ab05496159e4 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Fri, 20 Jan 2017 21:34:34 +0800
Subject: [PATCH 05/51] Bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c3b829139..a07a5a61f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "title": "Ant Design",
   "description": "An enterprise-class UI design language and React-based implementation",
   "homepage": "http://ant.design/",

From 896bd7e55b7495bf5a22b292c512bb5bd76e5389 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 20 Jan 2017 21:40:53 +0800
Subject: [PATCH 06/51] fix site style breaks when there is lib directory

---
 site/bisheng.config.js                | 11 +----------
 site/theme/template/Layout/Footer.jsx |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/site/bisheng.config.js b/site/bisheng.config.js
index fabdb50da..a8b328560 100644
--- a/site/bisheng.config.js
+++ b/site/bisheng.config.js
@@ -54,7 +54,7 @@ module.exports = {
   webpackConfig(config) {
     config.resolve.alias = {
       'antd/lib': path.join(process.cwd(), 'components'),
-      antd: process.cwd(),
+      antd: path.join(process.cwd(), 'index'),
       site: path.join(process.cwd(), 'site'),
       'react-router': 'react-router/umd/ReactRouter',
     };
@@ -67,15 +67,6 @@ module.exports = {
       },
     ]);
 
-    config.babel.plugins.push([
-      require.resolve('babel-plugin-import'),
-      {
-        style: true,
-        libraryName: 'antd',
-        libraryDirectory: 'components',
-      },
-    ]);
-
     return config;
   },
 };
diff --git a/site/theme/template/Layout/Footer.jsx b/site/theme/template/Layout/Footer.jsx
index 3427e197c..93a38f0b4 100644
--- a/site/theme/template/Layout/Footer.jsx
+++ b/site/theme/template/Layout/Footer.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import { Select, Modal } from 'antd';
-import { version as antdVersion } from 'antd/package.json';
+import { version as antdVersion } from '../../../../package.json';
 import * as utils from '../utils';
 
 const Option = Select.Option;

From c681e8acf2380ad297e977cb1fcf1b0cabdbbf52 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Sat, 21 Jan 2017 22:35:42 +0800
Subject: [PATCH 07/51] docs: Add backquote to default value

---
 components/button/index.en-US.md | 2 +-
 components/button/index.zh-CN.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/button/index.en-US.md b/components/button/index.en-US.md
index 7f90e4407..d2925422a 100644
--- a/components/button/index.en-US.md
+++ b/components/button/index.en-US.md
@@ -21,7 +21,7 @@ htmlType | to set the original `type` of `button`, see: [MDN](https://developer.
 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 | to set the loading status of button | boolean | false
+loading | to set the loading status of button | boolean | `false`
 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.
diff --git a/components/button/index.zh-CN.md b/components/button/index.zh-CN.md
index 3eb69b06e..f23758ddb 100644
--- a/components/button/index.zh-CN.md
+++ b/components/button/index.zh-CN.md
@@ -24,7 +24,7 @@ htmlType | 设置 `button` 原生的 `type` 值，可选值请参考 [HTML 标
 icon | 设置按钮的图标类型 | string | -
 shape | 设置按钮形状，可选值为 `circle` 或者不设 | string | -
 size | 设置按钮大小，可选值为 `small` `large` 或者不设 | string | `default`
-loading | 设置按钮载入状态 | boolean | false
+loading | 设置按钮载入状态 | boolean | `false`
 onClick | `click` 事件的 handler | function | -
 
 `<Button>Hello world!</Button>` 最终会被渲染为 `<button>Hello world!</button>`，并且除了上表中的属性，其它属性都会直接传到 `<button></button>`。

From 2292a8e6c5735accf1a5f5d9ea8680f3a241b7dc Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 22 Jan 2017 01:15:14 +0800
Subject: [PATCH 08/51] update README.md

---
 README-zh_CN.md               | 4 ++--
 README.md                     | 4 ++--
 docs/react/introduce.en-US.md | 7 ++++---
 docs/react/introduce.zh-CN.md | 5 +++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README-zh_CN.md b/README-zh_CN.md
index 775cbee05..e3d4fa362 100644
--- a/README-zh_CN.md
+++ b/README-zh_CN.md
@@ -21,8 +21,8 @@
 
 ## 特性
 
-- 提炼和服务企业级中后台产品的交互语言和视觉风格。
-- [React Component](http://react-component.github.io/badgeboard/) 基础上精心封装的高质量 UI 组件。
+- 提炼自企业级中后台产品的交互语言和视觉风格。
+- 开箱即用的高质量 React 组件。
 - 使用 TypeScript 构建，提供完整的类型定义文件。
 - 基于 npm + webpack + [dva](https://github.com/dvajs/dva) 的企业级开发框架。
 
diff --git a/README.md b/README.md
index 02414de25..1710eacfa 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@ An enterprise-class UI design language and React-based implementation.
 
 ## Features
 
-- An enterprise-class design language and high quality UI.
-- Graceful UI components out of the box, based on [React Component](http://react-component.github.io/badgeboard/).
+- An enterprise-class UI design language came from background applications.
+- A set of high-quality React components out of the box.
 - Written in TypeScript with complete define types.
 - A npm + webpack + [dva](https://github.com/dvajs/dva) front-end development workflow.
 
diff --git a/docs/react/introduce.en-US.md b/docs/react/introduce.en-US.md
index 6bada141e..dd6388942 100644
--- a/docs/react/introduce.en-US.md
+++ b/docs/react/introduce.en-US.md
@@ -27,9 +27,10 @@ Following Ant Design specification, We develop a React UI library `antd` that co
 
 ## Features
 
-- Following Ant Design desktop specification.
-- It is a set of high quality UI components and based on [React Component](http://react-component.github.io/badgeboard/).
-- Provides a work flow which is based on npm, webpack, and babel, supporting ES2015 and TypeScript.
+- An enterprise-class UI design language came from background applications.
+- A set of high-quality React components out of the box.
+- Written in TypeScript with complete define types.
+- A npm + webpack + [dva](https://github.com/dvajs/dva) front-end development workflow.
 
 ## Compatibility
 
diff --git a/docs/react/introduce.zh-CN.md b/docs/react/introduce.zh-CN.md
index 95a70138b..a96561811 100644
--- a/docs/react/introduce.zh-CN.md
+++ b/docs/react/introduce.zh-CN.md
@@ -27,8 +27,9 @@ title: Ant Design of React
 
 ## 特性
 
-- Designed as Ant Design，提炼和服务企业级中后台产品的交互语言和视觉风格。
-- [React Component](http://react-component.github.io/badgeboard/) 基础上精心封装的高质量 UI 组件。
+- 提炼自企业级中后台产品的交互语言和视觉风格。
+- 开箱即用的高质量 React 组件。
+- 使用 TypeScript 构建，提供完整的类型定义文件。
 - 基于 npm + webpack + babel 的工作流，支持 ES2015 和 TypeScript。
 
 ## 浏览器支持

From 0b2342f9c277f3ae46b1039e03cc222ab90479eb Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 22 Jan 2017 01:19:04 +0800
Subject: [PATCH 09/51] update README.md

---
 README.md                     | 2 +-
 docs/react/introduce.en-US.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1710eacfa..36ed98e5b 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ An enterprise-class UI design language and React-based implementation.
 
 ## Features
 
-- An enterprise-class UI design language came from background applications.
+- An enterprise-class UI design language for web applications.
 - A set of high-quality React components out of the box.
 - Written in TypeScript with complete define types.
 - A npm + webpack + [dva](https://github.com/dvajs/dva) front-end development workflow.
diff --git a/docs/react/introduce.en-US.md b/docs/react/introduce.en-US.md
index dd6388942..e1bac3a0d 100644
--- a/docs/react/introduce.en-US.md
+++ b/docs/react/introduce.en-US.md
@@ -27,7 +27,7 @@ Following Ant Design specification, We develop a React UI library `antd` that co
 
 ## Features
 
-- An enterprise-class UI design language came from background applications.
+- An enterprise-class UI design language for web applications.
 - A set of high-quality React components out of the box.
 - Written in TypeScript with complete define types.
 - A npm + webpack + [dva](https://github.com/dvajs/dva) front-end development workflow.

From 2d2534321a0a787d46781707cc9c5f2e8b0ccc09 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 22 Jan 2017 11:15:14 +0800
Subject: [PATCH 10/51] Fix Table fixed header align issue, close #4637

---
 components/table/style/index.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/table/style/index.less b/components/table/style/index.less
index ae3c7dff2..2e2efc8c8 100644
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@@ -490,6 +490,7 @@
     padding-bottom: 20px;
     margin-bottom: -20px;
     margin-right: -18px;
+    padding-right: 18px;
   }
 
   /* fix firefox scrollbar bug */

From 774b7784745ef80c7f956df38d805de91168c812 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Sun, 22 Jan 2017 14:26:46 +0800
Subject: [PATCH 11/51] docs: Add note to Popconfirm, Popover and tooltip about
 child node.

Related issue: #4672
---
 components/popconfirm/index.en-US.md | 4 ++++
 components/popconfirm/index.zh-CN.md | 4 ++++
 components/popover/index.en-US.md    | 4 ++++
 components/popover/index.zh-CN.md    | 5 +++++
 components/tooltip/index.en-US.md    | 7 ++++++-
 components/tooltip/index.zh-CN.md    | 4 ++++
 6 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/components/popconfirm/index.en-US.md b/components/popconfirm/index.en-US.md
index c0253ac15..88229bedc 100644
--- a/components/popconfirm/index.en-US.md
+++ b/components/popconfirm/index.en-US.md
@@ -23,3 +23,7 @@ The difference with `confirm` is more lightweight than the static popped full-sc
 | cancelText| text of the cancel button                              | string        | Cancel   |
 
 Consult [Tooltip's documentation](https://ant.design/components/tooltip/#API) to find more APIs.
+
+## Note
+
+Please ensure that the child node of `Popconfirm` accepts `onClick`, `onFocus`, `onClick` event.
diff --git a/components/popconfirm/index.zh-CN.md b/components/popconfirm/index.zh-CN.md
index 0acde7e66..d41f49971 100644
--- a/components/popconfirm/index.zh-CN.md
+++ b/components/popconfirm/index.zh-CN.md
@@ -24,3 +24,7 @@ title: Popconfirm
 | cancelText| 取消按钮文字                              | string        | 取消   |
 
 更多属性请参考 [Tooltip](/components/tooltip-cn/#API)。
+
+## 注意
+
+请确保 `Popconfirm` 的子元素能接受 `onHover`、`onFocus`、`onClick` 事件。
diff --git a/components/popover/index.en-US.md b/components/popover/index.en-US.md
index 0c76190c7..24fd9bd36 100644
--- a/components/popover/index.en-US.md
+++ b/components/popover/index.en-US.md
@@ -20,3 +20,7 @@ Comparing with `Tooltip`, besides information `Popover` card can also provide ac
 | content   | content of the card                            | string\|ReactNode | none     |
 
 Consult [Tooltip's documentation](https://ant.design/components/tooltip/#API) to find more APIs.
+
+## Note
+
+Please ensure that the child node of `Popover` accepts `onClick`, `onFocus`, `onClick` event.
diff --git a/components/popover/index.zh-CN.md b/components/popover/index.zh-CN.md
index 2395e4be9..cf7ce436e 100644
--- a/components/popover/index.zh-CN.md
+++ b/components/popover/index.zh-CN.md
@@ -21,3 +21,8 @@ title: Popover
 | content   | 卡片内容                            | string\|ReactNode | 无     |
 
 更多属性请参考 [Tooltip](/components/tooltip-cn/#API)。
+
+
+## 注意
+
+请确保 `Popover` 的子元素能接受 `onHover`、`onFocus`、`onClick` 事件。
diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md
index eafe6fe59..035a06f08 100644
--- a/components/tooltip/index.en-US.md
+++ b/components/tooltip/index.en-US.md
@@ -8,7 +8,7 @@ A simple text popup tip.
 
 ## When To Use
 
-- The tip shows while mouse enter, and hides while mouse leave. The ToolTip doesn't support complex text and operation.
+- The tip shows while mouse enter, and hides while mouse leave. The Tooltip doesn't support complex text and operation.
 - It can provide an explanation of `button/text/operation` that can cover the usage of the default system `title`.
 
 ## API
@@ -31,3 +31,8 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 | trigger | triggering mode: can be hover, focus, or click. | string | hover |
 | overlayClassName | class name of the card                            | string | none     |
 | overlayStyle | style of the card                            | object | none    |
+
+
+## Note
+
+Please ensure that the child node of `Tooltip` accepts `onClick`, `onFocus`, `onClick` event.
diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md
index 834c83e3e..3abcdc728 100644
--- a/components/tooltip/index.zh-CN.md
+++ b/components/tooltip/index.zh-CN.md
@@ -33,3 +33,7 @@ title: Tooltip
 | trigger   | 触发行为，可选 `hover/focus/click`       | string        | hover  |
 | overlayClassName | 卡片类名                            | string | 无     |
 | overlayStyle | 卡片样式                            | object | 无     |
+
+## 注意
+
+请确保 `Tooltip` 的子元素能接受 `onHover`、`onFocus`、`onClick` 事件。

From f91ac37ad367c531bb9ac8b5305de048b1a3de7a Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Sun, 22 Jan 2017 15:05:32 +0800
Subject: [PATCH 12/51] docs: Oops, no onHover event.

---
 components/popconfirm/index.en-US.md | 2 +-
 components/popconfirm/index.zh-CN.md | 2 +-
 components/popover/index.en-US.md    | 2 +-
 components/popover/index.zh-CN.md    | 2 +-
 components/tooltip/index.en-US.md    | 2 +-
 components/tooltip/index.zh-CN.md    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/popconfirm/index.en-US.md b/components/popconfirm/index.en-US.md
index 88229bedc..f75570cd2 100644
--- a/components/popconfirm/index.en-US.md
+++ b/components/popconfirm/index.en-US.md
@@ -26,4 +26,4 @@ Consult [Tooltip's documentation](https://ant.design/components/tooltip/#API) to
 
 ## Note
 
-Please ensure that the child node of `Popconfirm` accepts `onClick`, `onFocus`, `onClick` event.
+Please ensure that the child node of `Popconfirm` accepts `onMouseEnter`, `onMouseLeave`, `onFocus`, `onClick` event.
diff --git a/components/popconfirm/index.zh-CN.md b/components/popconfirm/index.zh-CN.md
index d41f49971..93640ddc7 100644
--- a/components/popconfirm/index.zh-CN.md
+++ b/components/popconfirm/index.zh-CN.md
@@ -27,4 +27,4 @@ title: Popconfirm
 
 ## 注意
 
-请确保 `Popconfirm` 的子元素能接受 `onHover`、`onFocus`、`onClick` 事件。
+请确保 `Popconfirm` 的子元素能接受 `onMouseEnter`、`onMouseLeave`、`onFocus`、`onClick` 事件。
diff --git a/components/popover/index.en-US.md b/components/popover/index.en-US.md
index 24fd9bd36..f2ad368fc 100644
--- a/components/popover/index.en-US.md
+++ b/components/popover/index.en-US.md
@@ -23,4 +23,4 @@ Consult [Tooltip's documentation](https://ant.design/components/tooltip/#API) to
 
 ## Note
 
-Please ensure that the child node of `Popover` accepts `onClick`, `onFocus`, `onClick` event.
+Please ensure that the child node of `Popover` accepts `onMouseEnter`, `onMouseLeave`, `onFocus`, `onClick` event.
diff --git a/components/popover/index.zh-CN.md b/components/popover/index.zh-CN.md
index cf7ce436e..4fe5a7d13 100644
--- a/components/popover/index.zh-CN.md
+++ b/components/popover/index.zh-CN.md
@@ -25,4 +25,4 @@ title: Popover
 
 ## 注意
 
-请确保 `Popover` 的子元素能接受 `onHover`、`onFocus`、`onClick` 事件。
+请确保 `Popover` 的子元素能接受 `onMouseEnter`、`onMouseLeave`、`onFocus`、`onClick` 事件。
diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md
index 035a06f08..6d80607d1 100644
--- a/components/tooltip/index.en-US.md
+++ b/components/tooltip/index.en-US.md
@@ -35,4 +35,4 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 
 ## Note
 
-Please ensure that the child node of `Tooltip` accepts `onClick`, `onFocus`, `onClick` event.
+Please ensure that the child node of `Tooltip` accepts `onMouseEnter`, `onMouseLeave`, `onFocus`, `onClick` event.
diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md
index 3abcdc728..c7ff81409 100644
--- a/components/tooltip/index.zh-CN.md
+++ b/components/tooltip/index.zh-CN.md
@@ -36,4 +36,4 @@ title: Tooltip
 
 ## 注意
 
-请确保 `Tooltip` 的子元素能接受 `onHover`、`onFocus`、`onClick` 事件。
+请确保 `Tooltip` 的子元素能接受 `onMouseEnter`、`onMouseLeave`、`onFocus`、`onClick` 事件。

From b2ee5b2319923cd36d80826874ead61c0949c093 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 22 Jan 2017 16:07:35 +0800
Subject: [PATCH 13/51] Adjust Tag vertical-align and margin

---
 components/tag/demo/basic.md    | 3 +--
 components/tag/style/index.less | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/tag/demo/basic.md b/components/tag/demo/basic.md
index 86d8e606d..7e11b1754 100644
--- a/components/tag/demo/basic.md
+++ b/components/tag/demo/basic.md
@@ -28,9 +28,8 @@ function preventDefault(e) {
 ReactDOM.render(
   <div>
     <Tag>Tag 1</Tag>
+    <Tag><a href="https://github.com/ant-design/ant-design/issues/1862">Link</a></Tag>
     <Tag closable onClose={log}>Tag 2</Tag>
-    <Tag closable afterClose={log}>Tag 3</Tag>
-    <Tag closable><a href="https://github.com/ant-design/ant-design/issues/1862">Link</a></Tag>
     <Tag closable onClose={preventDefault}>Prevent Default</Tag>
   </div>,
   mountNode
diff --git a/components/tag/style/index.less b/components/tag/style/index.less
index 873e61de9..1be671c1f 100644
--- a/components/tag/style/index.less
+++ b/components/tag/style/index.less
@@ -13,11 +13,10 @@
   background: @background-color-base;
   font-size: @font-size-base;
   transition: all 0.3s @ease-in-out-circ;
-  vertical-align: middle;
   opacity: 1;
-  overflow: hidden;
-  margin: 4px 8px 4px 0;
+  margin-right: 8px;
   cursor: pointer;
+  white-space: nowrap;
 
   &:hover {
     opacity: 0.85;

From f343d6c6063b2f7ad5e6cc2f1cf1f42a48e0ef05 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 22 Jan 2017 16:20:20 +0800
Subject: [PATCH 14/51] fix tag snapshot test

---
 .../__tests__/__snapshots__/demo.test.js.snap | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/components/tag/__tests__/__snapshots__/demo.test.js.snap b/components/tag/__tests__/__snapshots__/demo.test.js.snap
index 289e3d368..26e6cc110 100644
--- a/components/tag/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tag/__tests__/__snapshots__/demo.test.js.snap
@@ -8,26 +8,6 @@ exports[`test renders ./components/tag/demo/basic.md correctly 1`] = `
       Tag 1
     </span>
   </div>
-  <div
-    class="ant-tag"
-    data-show="true">
-    <span
-      class="ant-tag-text">
-      Tag 2
-    </span>
-    <i
-      class="anticon anticon-cross" />
-  </div>
-  <div
-    class="ant-tag"
-    data-show="true">
-    <span
-      class="ant-tag-text">
-      Tag 3
-    </span>
-    <i
-      class="anticon anticon-cross" />
-  </div>
   <div
     class="ant-tag"
     data-show="true">
@@ -38,6 +18,14 @@ exports[`test renders ./components/tag/demo/basic.md correctly 1`] = `
         Link
       </a>
     </span>
+  </div>
+  <div
+    class="ant-tag"
+    data-show="true">
+    <span
+      class="ant-tag-text">
+      Tag 2
+    </span>
     <i
       class="anticon anticon-cross" />
   </div>

From 7518fde405845100d0744eb45e8826dbeec0ea2a Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 22 Jan 2017 18:48:57 +0800
Subject: [PATCH 15/51] Fix align issue inside InputGroup, close #4680

---
 components/input/style/mixin.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less
index e9d6ec3ec..d07025b27 100644
--- a/components/input/style/mixin.less
+++ b/components/input/style/mixin.less
@@ -243,6 +243,7 @@
     & > * {
       border-radius: 0;
       border-right-width: 0;
+      vertical-align: middle;
     }
 
     // Undo float for .ant-input-group .ant-input

From 04a94a691e4d369b11d7fa95ef12347487f0f7bb Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 22 Jan 2017 19:16:54 +0800
Subject: [PATCH 16/51] site: update sider menu order

---
 CHANGELOG.en-US.md                          |  2 +-
 CHANGELOG.zh-CN.md                          |  2 +-
 docs/react/i18n-solution.en-US.md           |  2 +-
 docs/react/i18n-solution.zh-CN.md           |  2 +-
 site/theme/static/common.less               | 16 ++++++++++++++++
 site/theme/template/Content/MainContent.jsx |  6 +++---
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 92d425ccc..4106fb131 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,5 @@
 ---
-order: 9
+order: 6
 title: Change Log
 toc: false
 timeline: true
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 01b536427..9bf971f24 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,5 @@
 ---
-order: 9
+order: 6
 title: 更新日志
 toc: false
 timeline: true
diff --git a/docs/react/i18n-solution.en-US.md b/docs/react/i18n-solution.en-US.md
index 41798c1eb..f61019c45 100644
--- a/docs/react/i18n-solution.en-US.md
+++ b/docs/react/i18n-solution.en-US.md
@@ -1,5 +1,5 @@
 ---
-order: 6
+order: 9
 title: i18n Solution
 link: //github.com/ant-design/intl-example
 ---
diff --git a/docs/react/i18n-solution.zh-CN.md b/docs/react/i18n-solution.zh-CN.md
index e5fe22c8f..d444d6182 100644
--- a/docs/react/i18n-solution.zh-CN.md
+++ b/docs/react/i18n-solution.zh-CN.md
@@ -1,5 +1,5 @@
 ---
-order: 6
+order: 9
 title: i18n 方案
 link: //github.com/ant-design/intl-example
 ---
diff --git a/site/theme/static/common.less b/site/theme/static/common.less
index b40827012..f2f3f91b7 100644
--- a/site/theme/static/common.less
+++ b/site/theme/static/common.less
@@ -57,6 +57,22 @@ div.main-container {
   a[disabled] {
     color: #ccc;
   }
+
+  .menu-item-link-outside {
+    position: relative;
+    .anticon {
+      font-size: 12px;
+      color: #999;
+      opacity: 0;
+      position: absolute;
+      right: -4px;
+      top: 16px;
+      transition: all .3s;
+    }
+    &:hover .anticon {
+      opacity: 1;
+    }
+  }
 }
 
 .aside-container .chinese {
diff --git a/site/theme/template/Content/MainContent.jsx b/site/theme/template/Content/MainContent.jsx
index e5ace5075..54adf0562 100644
--- a/site/theme/template/Content/MainContent.jsx
+++ b/site/theme/template/Content/MainContent.jsx
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { Link } from 'bisheng/router';
-import { Row, Col, Menu } from 'antd';
+import { Row, Col, Menu, Icon } from 'antd';
 import Article from './Article';
 import ComponentDoc from './ComponentDoc';
 import * as utils from '../utils';
@@ -110,8 +110,8 @@ export default class MainContent extends React.Component {
         {text}
       </Link>
     ) : (
-      <a href={item.link} target="_blank" rel="noopener noreferrer" disabled={disabled}>
-        {text}
+      <a href={item.link} target="_blank" rel="noopener noreferrer" disabled={disabled} className="menu-item-link-outside">
+        {text} <Icon type="export" />
       </a>
     );
 

From fa10c9dee05ae9e6711b9d18586bc1ebc240cafa Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 22 Jan 2017 19:31:25 +0800
Subject: [PATCH 17/51] adjust page margin in small device, ref #4682

---
 site/theme/static/responsive.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site/theme/static/responsive.less b/site/theme/static/responsive.less
index af7562dc9..53a26d786 100644
--- a/site/theme/static/responsive.less
+++ b/site/theme/static/responsive.less
@@ -177,6 +177,7 @@
   .main-wrapper {
     width: 100%;
     border-radius: 0;
+    margin: 0;
   }
 
   footer {

From cebf3a4c9eea91b49f25604e485e1cad3a206cfa Mon Sep 17 00:00:00 2001
From: caoyi <caoyi0905@mail.hfut.edu.cn>
Date: Sun, 22 Jan 2017 05:49:08 -0600
Subject: [PATCH 18/51] docs: fix Mention props API (#4683)

---
 components/mention/index.en-US.md | 2 +-
 components/mention/index.zh-CN.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/mention/index.en-US.md b/components/mention/index.en-US.md
index 017271a94..782c0f650 100644
--- a/components/mention/index.en-US.md
+++ b/components/mention/index.en-US.md
@@ -43,7 +43,7 @@ When need to mention someone or something.
 | prefix | character which will trigger Mention to show mention list | string | '@' |
 | defaultValue | default value | EditorState, you can use `Mention.toEditorState` to convert text to `EditorState` | null |
 | value | core state of mention | EditorState | null |
-| placeHolder | placeholder of input | string | null |
+| placeholder | placeholder of input | string | null |
 | getSuggestionContainer | rendered to the root of the menu. Default rendered to the body dom. If gets any problem of the menu while scrolling. Try to make the root the dom scrolled, and make it position relative.  | Function() | () => document.body |
 | onFocus | Callback function called when mention component get focus |  function() | null |
 | onBlur | Callback function called when mention component blur | function() | nul |
diff --git a/components/mention/index.zh-CN.md b/components/mention/index.zh-CN.md
index 77a83b74d..50dad7fcd 100644
--- a/components/mention/index.zh-CN.md
+++ b/components/mention/index.zh-CN.md
@@ -41,7 +41,7 @@ title: Mention
 | loading | 加载中 | boolean | false |
 | multiLines | 多行模式 | boolean | false |
 | prefix | 触发弹出下拉框的字符 | string | '@' |
-| placeHolder | 输入框默认文字 | string | null |
+| placeholder | 输入框默认文字 | string | null |
 | defaultValue | 默认值 | EditorState, 可以用 Mention.toEditorState(text) 把文字转换成 EditorState | null |
 | value | 值 | EditorState | null |
 | getSuggestionContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位| Function() | () => document.body |

From bde7d1c62468cf79cacc115d03fd21e62219fc81 Mon Sep 17 00:00:00 2001
From: Gray Choi <gray.choi.1988@gmail.com>
Date: Mon, 23 Jan 2017 12:08:46 +0900
Subject: [PATCH 19/51] Translate layout specification (#4542)

* create english index file

* tanslated the index

* tanslated aside.md

* adjust code format

* translated aside-collapse.md

* translated ceiling.md

* translated top.md

* translated top-aside.md
---
 docs/spec/layout/demo/aside-collapse.md       | 30 +++++----
 docs/spec/layout/demo/aside.md                | 52 +++++++++-------
 docs/spec/layout/demo/ceiling.md              | 15 ++++-
 docs/spec/layout/demo/top-aside.md            | 62 +++++++++++--------
 docs/spec/layout/demo/top.md                  | 33 ++++++----
 docs/spec/layout/index.en-US.md               | 50 +++++++++++++++
 docs/spec/layout/{index.md => index.zh-CN.md} |  8 +--
 7 files changed, 171 insertions(+), 79 deletions(-)
 create mode 100644 docs/spec/layout/index.en-US.md
 rename docs/spec/layout/{index.md => index.zh-CN.md} (94%)

diff --git a/docs/spec/layout/demo/aside-collapse.md b/docs/spec/layout/demo/aside-collapse.md
index e9236f47b..8e3f1fa54 100644
--- a/docs/spec/layout/demo/aside-collapse.md
+++ b/docs/spec/layout/demo/aside-collapse.md
@@ -1,10 +1,18 @@
 ---
 order: 4
-title: 可收起展开的侧边导航
+title:
+  zh-CN: 可收起展开的侧边导航
+  en-US: Collapsed aside
 ---
 
+## zh-CN
+
 页面横向空间有限时使用。侧边导航默认收起，点击底部按钮时展开。
 
+## en-US
+
+This pattern is used when the horizontal space is limited. Aside navigation is default to be collapsed, you can click the button at the bottom to expand it.
+
 ````__react
 import { Menu, Breadcrumb, Icon } from 'antd';
 import BrowserDemo from 'site/theme/template/BrowserDemo';
@@ -30,23 +38,23 @@ const AsideCollapse = React.createClass({
           <Menu mode="inline" theme="dark" defaultSelectedKeys={['user']}>
             <Menu.Item key="user">
               <Icon type="user" />
-              {!collapse && <span className="nav-text">导航一</span>}
+              {!collapse && <span className="nav-text">Navigation 1</span>}
             </Menu.Item>
             <Menu.Item key="setting">
               <Icon type="setting" />
-              {!collapse && <span className="nav-text">导航二</span>}
+              {!collapse && <span className="nav-text">Navigation 2</span>}
             </Menu.Item>
             <Menu.Item key="laptop">
               <Icon type="laptop" />
-              {!collapse && <span className="nav-text">导航三</span>}
+              {!collapse && <span className="nav-text">Navigation 3</span>}
             </Menu.Item>
             <Menu.Item key="notification">
               <Icon type="notification" />
-              {!collapse && <span className="nav-text">导航四</span>}
+              {!collapse && <span className="nav-text">Navigation 4</span>}
             </Menu.Item>
             <Menu.Item key="folder">
               <Icon type="folder" />
-              {!collapse && <span className="nav-text">导航五</span>}
+              {!collapse && <span className="nav-text">Navigation 5</span>}
             </Menu.Item>
           </Menu>
           <div className="aside-action" onClick={this.onCollapseChange}>
@@ -57,18 +65,18 @@ const AsideCollapse = React.createClass({
           <div className="layout-header"></div>
           <div className="layout-container">
             <Breadcrumb>
-              <Breadcrumb.Item>首页</Breadcrumb.Item>
-              <Breadcrumb.Item>应用列表</Breadcrumb.Item>
-              <Breadcrumb.Item>某应用</Breadcrumb.Item>
+              <Breadcrumb.Item>Home</Breadcrumb.Item>
+              <Breadcrumb.Item>App list</Breadcrumb.Item>
+              <Breadcrumb.Item>Any app</Breadcrumb.Item>
             </Breadcrumb>
             <div className="layout-content">
               <div style={{ height: 220 }}>
-                内容区域
+                Contents
               </div>
             </div>
           </div>
           <div className="layout-footer">
-          Ant Design 版权所有 © 2015 由蚂蚁金服体验技术部支持
+            Ant Design all rights reserved © 2015 Created by Ant UED
           </div>
         </div>
       </div>
diff --git a/docs/spec/layout/demo/aside.md b/docs/spec/layout/demo/aside.md
index bfecacf1c..52335aec5 100644
--- a/docs/spec/layout/demo/aside.md
+++ b/docs/spec/layout/demo/aside.md
@@ -1,12 +1,22 @@
 ---
 order: 2
-title: 侧边导航
+title: 
+  zh-CN: 侧边导航
+  en-US: Aside
 ---
 
+## zh-CN
+
 顶级导航在侧边栏。
 
 侧边导航在页面布局上采用的是左右的结构，一般主导航放置于页面的左侧固定位置，辅助菜单放置于工作区顶部。内容根据浏览器终端进行自适应，能提高横向空间的使用率，但是整个页面排版不稳定。侧边导航的模式层级扩展性强，一、二、三级导航项目可以更为顺畅且具关联性的被展示，同时侧边导航可以固定，使得用户在操作和浏览中可以快速的定位和切换当前位置，有很高的操作效率。但这类导航横向页面内容的空间会被牺牲一部份。
 
+## en-US
+
+Aside top level navigation
+
+A left-right structure of page layouts is used to Aside navigation, Generally, the mainnav is placed on the left side of the page, the secondary menu is placed on the top of the working area. Contens will adapts the layout to the viewing environment to imporve usage rates of horizaontal space, but the layout of the whole page is not stable. The level of the aisde navigation is scalable. The first, second, third level navigations could be present more fluently and relevantly, and aside navigation can be fixed to allows users quickly switch and  spot the current position when they are operating or viewing, there is a high operational efficency. But such navigation will occupie some space of the contents in the horizontal space. 
+
 ````__react
 import { Menu, Breadcrumb, Icon } from 'antd';
 import BrowserDemo from 'site/theme/template/BrowserDemo';
@@ -19,23 +29,23 @@ ReactDOM.render(
         <div className="layout-logo"></div>
         <Menu mode="inline" theme="dark"
           defaultSelectedKeys={['1']} defaultOpenKeys={['sub1']}>
-          <SubMenu key="sub1" title={<span><Icon type="user" />导航一</span>}>
-            <Menu.Item key="1">选项1</Menu.Item>
-            <Menu.Item key="2">选项2</Menu.Item>
-            <Menu.Item key="3">选项3</Menu.Item>
-            <Menu.Item key="4">选项4</Menu.Item>
+          <SubMenu key="sub1" title={<span><Icon type="user" />Navigation 1</span>}>
+            <Menu.Item key="1">item 1</Menu.Item>
+            <Menu.Item key="2">item 2</Menu.Item>
+            <Menu.Item key="3">item 3</Menu.Item>
+            <Menu.Item key="4">item 4</Menu.Item>
           </SubMenu>
-          <SubMenu key="sub2" title={<span><Icon type="laptop" />导航二</span>}>
-            <Menu.Item key="5">选项5</Menu.Item>
-            <Menu.Item key="6">选项6</Menu.Item>
-            <Menu.Item key="7">选项7</Menu.Item>
-            <Menu.Item key="8">选项8</Menu.Item>
+          <SubMenu key="sub2" title={<span><Icon type="laptop" />Navigation 2</span>}>
+            <Menu.Item key="5">item 5</Menu.Item>
+            <Menu.Item key="6">item 6</Menu.Item>
+            <Menu.Item key="7">item 7</Menu.Item>
+            <Menu.Item key="8">item 8</Menu.Item>
           </SubMenu>
-          <SubMenu key="sub3" title={<span><Icon type="notification" />导航三</span>}>
-            <Menu.Item key="9">选项9</Menu.Item>
-            <Menu.Item key="10">选项10</Menu.Item>
-            <Menu.Item key="11">选项11</Menu.Item>
-            <Menu.Item key="12">选项12</Menu.Item>
+          <SubMenu key="sub3" title={<span><Icon type="notification" />Navigation 3</span>}>
+            <Menu.Item key="9">item 9</Menu.Item>
+            <Menu.Item key="10">item 10</Menu.Item>
+            <Menu.Item key="11">item 11</Menu.Item>
+            <Menu.Item key="12">item 12</Menu.Item>
           </SubMenu>
         </Menu>
       </aside>
@@ -43,18 +53,18 @@ ReactDOM.render(
         <div className="layout-header"></div>
         <div className="layout-container">
           <Breadcrumb>
-            <Breadcrumb.Item>首页</Breadcrumb.Item>
-            <Breadcrumb.Item>应用列表</Breadcrumb.Item>
-            <Breadcrumb.Item>某应用</Breadcrumb.Item>
+            <Breadcrumb.Item>Home</Breadcrumb.Item>
+            <Breadcrumb.Item>App list</Breadcrumb.Item>
+            <Breadcrumb.Item>Any App</Breadcrumb.Item>
           </Breadcrumb>
           <div className="layout-content">
             <div style={{ height: 590 }}>
-              内容区域
+              Contents
             </div>
           </div>
         </div>
         <div className="layout-footer">
-        Ant Design 版权所有 © 2015 由蚂蚁金服体验技术部支持
+          Ant Design all rights reserved © 2015 Created by Ant UED
         </div>
       </div>
     </div>
diff --git a/docs/spec/layout/demo/ceiling.md b/docs/spec/layout/demo/ceiling.md
index dfb9d0001..c78ecf516 100644
--- a/docs/spec/layout/demo/ceiling.md
+++ b/docs/spec/layout/demo/ceiling.md
@@ -1,12 +1,21 @@
 ---
 order: 3
-title: 吊顶规范
+title:
+  zh-CN: 吊顶规范
+  en-US: Ceiling
 ---
+## zh-CN
 
 吊顶一般用于跨系统/应用场景，可以放置统一的登录/帮助信息。
 
 吊顶背景深色，高度 `30px`，和浅色调的主导航配合使用。
 
+## en-US
+
+Generally, ceiling is used for cross system/application, you can put uniform login/help information in it.
+
+Background color of a ceiling is a deep color, height is `30px`, generally to be used with a light color mainnav.
+
 ````__react
 import { Menu, Breadcrumb } from 'antd';
 import BrowserDemo from 'site/theme/template/BrowserDemo';
@@ -19,9 +28,9 @@ ReactDOM.render(
           <ul className="right">
             <li>xxx@example.com</li>
             <li>|</li>
-            <li>帮助中心</li>
+            <li>Help Center</li>
             <li>|</li>
-            <li>客服/投诉电话：400-826-7710</li>
+            <li>Custom Service/Complaint Center phone：400-826-7710</li>
           </ul>
         </div>
       </div>
diff --git a/docs/spec/layout/demo/top-aside.md b/docs/spec/layout/demo/top-aside.md
index ffb2a96c2..f3794a923 100644
--- a/docs/spec/layout/demo/top-aside.md
+++ b/docs/spec/layout/demo/top-aside.md
@@ -1,10 +1,18 @@
 ---
 order: 1
-title: 顶部导航 + 侧边栏
+title: 
+  zh-CN: 顶部导航 + 侧边栏
+  en-US: Top aside
 ---
 
+## zh-CN
+
 顶级导航在头部，次级导航在侧边栏。
 
+## en-US
+
+The top navigation is placed on the top, and the secondary navigation is placed on the aside.
+
 ````__react
 import { Menu, Breadcrumb, Icon } from 'antd';
 import BrowserDemo from 'site/theme/template/BrowserDemo';
@@ -18,9 +26,9 @@ ReactDOM.render(
           <div className="layout-logo"></div>
           <Menu theme="dark" mode="horizontal"
             defaultSelectedKeys={['2']} style={{lineHeight: '64px'}}>
-            <Menu.Item key="1">导航一</Menu.Item>
-            <Menu.Item key="2">导航二</Menu.Item>
-            <Menu.Item key="3">导航三</Menu.Item>
+            <Menu.Item key="1">Navigation 1</Menu.Item>
+            <Menu.Item key="2">Navigation 2</Menu.Item>
+            <Menu.Item key="3">Navigation 3</Menu.Item>
           </Menu>
         </div>
       </div>
@@ -28,49 +36,49 @@ ReactDOM.render(
         <div className="layout-wrapper">
           <Menu mode="horizontal"
             defaultSelectedKeys={['1']} style={{marginLeft: 124}}>
-            <Menu.Item key="1">二级导航</Menu.Item>
-            <Menu.Item key="2">二级导航</Menu.Item>
-            <Menu.Item key="3">二级导航</Menu.Item>
+            <Menu.Item key="1">The second level navigation</Menu.Item>
+            <Menu.Item key="2">The second level navigation</Menu.Item>
+            <Menu.Item key="3">The second level navigation</Menu.Item>
           </Menu>
         </div>
       </div>
       <div className="layout-wrapper">
         <Breadcrumb>
-          <Breadcrumb.Item>首页</Breadcrumb.Item>
-          <Breadcrumb.Item>应用列表</Breadcrumb.Item>
-          <Breadcrumb.Item>某应用</Breadcrumb.Item>
+          <Breadcrumb.Item>Home</Breadcrumb.Item>
+          <Breadcrumb.Item>App list</Breadcrumb.Item>
+          <Breadcrumb.Item>Any app</Breadcrumb.Item>
         </Breadcrumb>
         <div className="layout-container">
           <aside className="layout-sider">
             <Menu mode="inline" defaultSelectedKeys={['1']} defaultOpenKeys={['sub1']}>
-              <SubMenu key="sub1" title={<span><Icon type="user" />导航一</span>}>
-                <Menu.Item key="1">选项1</Menu.Item>
-                <Menu.Item key="2">选项2</Menu.Item>
-                <Menu.Item key="3">选项3</Menu.Item>
-                <Menu.Item key="4">选项4</Menu.Item>
+              <SubMenu key="sub1" title={<span><Icon type="user" />Navigation 1</span>}>
+                <Menu.Item key="1">item 1</Menu.Item>
+                <Menu.Item key="2">item 2</Menu.Item>
+                <Menu.Item key="3">item 3</Menu.Item>
+                <Menu.Item key="4">item 4</Menu.Item>
               </SubMenu>
-              <SubMenu key="sub2" title={<span><Icon type="laptop" />导航二</span>}>
-                <Menu.Item key="5">选项5</Menu.Item>
-                <Menu.Item key="6">选项6</Menu.Item>
-                <Menu.Item key="7">选项7</Menu.Item>
-                <Menu.Item key="8">选项8</Menu.Item>
+              <SubMenu key="sub2" title={<span><Icon type="laptop" />Navigation 2</span>}>
+                <Menu.Item key="5">item 5</Menu.Item>
+                <Menu.Item key="6">item 6</Menu.Item>
+                <Menu.Item key="7">item 7</Menu.Item>
+                <Menu.Item key="8">item 8</Menu.Item>
               </SubMenu>
-              <SubMenu key="sub3" title={<span><Icon type="notification" />导航三</span>}>
-                <Menu.Item key="9">选项9</Menu.Item>
-                <Menu.Item key="10">选项10</Menu.Item>
-                <Menu.Item key="11">选项11</Menu.Item>
-                <Menu.Item key="12">选项12</Menu.Item>
+              <SubMenu key="sub3" title={<span><Icon type="notification" />Navigation 3</span>}>
+                <Menu.Item key="9">item 9</Menu.Item>
+                <Menu.Item key="10">item 10</Menu.Item>
+                <Menu.Item key="11">item 11</Menu.Item>
+                <Menu.Item key="12">item 12</Menu.Item>
               </SubMenu>
             </Menu>
           </aside>
           <div className="layout-content">
             <div style={{ height: 240 }}>
-              <div style={{clear: 'both'}}>内容区域</div>
+              <div style={{clear: 'both'}}>Contents</div>
             </div>
           </div>
         </div>
         <div className="layout-footer">
-        Ant Design 版权所有 © 2015 由蚂蚁金服体验技术部支持
+          Ant Design all rights reserved © 2015 Created by Ant UED
         </div>
       </div>
     </div>
diff --git a/docs/spec/layout/demo/top.md b/docs/spec/layout/demo/top.md
index 5354bcaae..727c54761 100644
--- a/docs/spec/layout/demo/top.md
+++ b/docs/spec/layout/demo/top.md
@@ -1,7 +1,10 @@
 ---
 order: 0
-title: 顶部导航
+title: 
+  zh-CN: 顶部导航
+  en-US: Top
 ---
+## zh-CN
 
 一二级导航都在顶部。
 
@@ -9,6 +12,14 @@ title: 顶部导航
 
 > `<BrowserDemo />` 做演示用，无须复制。
 
+## en-US
+
+The first and second level nav are both at the top.
+
+A top-bottom structure of page layouts is used to top navigation. Generally, the mainnav is placed at the top of the page, and put log, the first level navigation, secondary menu(users, settings, notifications) from left to right in it. We always put contents in a fixed size navigation.( eg: `1200px`), the layout of the whole page is stable, it's not affected by viewing enviroment,; Top-bottom structure is conform to top-bottom viewing habit, it's a classical navigation pattern of websites. This pattern will bring demonstration efficiency up of the mian workarea, but it will also occupie some vertical spaces. And, because the horizontal space of the navigation is limited, this pattern is not suitable for the first level navigation which has too much information.
+
+> `<BrowserDemo />` This is for demo, don't need to copy.
+
 ````__react
 import { Menu, Breadcrumb } from 'antd';
 import BrowserDemo from 'site/theme/template/BrowserDemo';
@@ -21,9 +32,9 @@ ReactDOM.render(
           <div className="layout-logo"></div>
           <Menu theme="dark" mode="horizontal"
             defaultSelectedKeys={['2']} style={{lineHeight: '64px'}}>
-            <Menu.Item key="1">导航一</Menu.Item>
-            <Menu.Item key="2">导航二</Menu.Item>
-            <Menu.Item key="3">导航三</Menu.Item>
+            <Menu.Item key="1">Navigation 1</Menu.Item>
+            <Menu.Item key="2">Navigation 2</Menu.Item>
+            <Menu.Item key="3">Navigation 3</Menu.Item>
           </Menu>
         </div>
       </div>
@@ -31,24 +42,24 @@ ReactDOM.render(
         <div className="layout-wrapper">
           <Menu mode="horizontal"
             defaultSelectedKeys={['1']} style={{marginLeft: 124}}>
-            <Menu.Item key="1">二级导航</Menu.Item>
-            <Menu.Item key="2">二级导航</Menu.Item>
-            <Menu.Item key="3">二级导航</Menu.Item>
+            <Menu.Item key="1">The second level navigation</Menu.Item>
+            <Menu.Item key="2">The second level navigation</Menu.Item>
+            <Menu.Item key="3">The second level navigation</Menu.Item>
           </Menu>
         </div>
       </div>
       <div className="layout-wrapper">
         <Breadcrumb>
-          <Breadcrumb.Item>首页</Breadcrumb.Item>
-          <Breadcrumb.Item>应用列表</Breadcrumb.Item>
-          <Breadcrumb.Item>某应用</Breadcrumb.Item>
+          <Breadcrumb.Item>Home</Breadcrumb.Item>
+          <Breadcrumb.Item>App list</Breadcrumb.Item>
+          <Breadcrumb.Item>Any app</Breadcrumb.Item>
         </Breadcrumb>
         <div className="layout-container">
           <div style={{ height: 210 }}></div>
         </div>
       </div>
       <div className="layout-footer">
-      Ant Design 版权所有 © 2015 由蚂蚁金服体验技术部支持
+        Ant Design all rights reserved © 2015 Created by Ant UED
       </div>
     </div>
   </BrowserDemo>
diff --git a/docs/spec/layout/index.en-US.md b/docs/spec/layout/index.en-US.md
new file mode 100644
index 000000000..20952b312
--- /dev/null
+++ b/docs/spec/layout/index.en-US.md
@@ -0,0 +1,50 @@
+---
+template: component
+category: Design Fundamental
+order: 4
+cols: 1
+title: Layout
+---
+
+Layout and Navigation is the backbone of productions, it is one of the most important design pattern of a page,
+and it is also a base when you create a page, it will establish a interactive and visual style for a production.
+
+The Layout and Navigation design specification for Ant Design are as follows:
+
+### The specification of size
+
+The first level of the navigation is placed near by a logo inclined left, and the secondary menu is placed inclined right. 
+
+- Top Navigation (almost systems): the height of the first level navigation `64px`, the second level of navigation `48px`。
+- Top Navigation(contents page): the height of the first level navigation `80px`,the second level of navigation `56px`。
+- Calculation formula of a top navigation:`48+8n`.
+- Calculation formula a aside navigation:`200+8n`.
+
+### The principle of interaction
+
+- The first level navigation and the last level navigation should be distincted by visualization;
+- The current item should have the highest priority of visualization;
+- When the current navigation item is collapsed, the stlye of the current navigation item will be applied to the parent level of it;
+- The left side navigation bar support for both the according and the expanding style, you can choose the one of it case by case.
+
+### The principle of visualization
+
+ Style of a navigation should conform to the level of it.
+
+- **Emphasis by colorblock**
+
+  When background color is a deep color, you can use this pattern for the parent level navigation item of current page.
+
+- **The highlight match stick**
+
+  When background color is a light color, you can use this pattern for the current page navigation item, we recommed to use it for the last item of the navigation path.
+
+- **Hightlighted font**
+
+  From the visualization aspect, hightlighted font is stronger than colorblock, this pattern is often used for the parent level of the current item.
+
+- **Enlarge the size of the font**
+
+  `12px`、`14px` is a standard font size of navigations，14 is used for the first and the second level of the navigation. You can choose a approprigate font size in terms of the level of your navigation.
+
+In almost middle-back systems,  Ant Design uses two general layouts of top navigation and aside navition, we collect some basic layouts of middle-back systems are designed by Ant Design as follows:
\ No newline at end of file
diff --git a/docs/spec/layout/index.md b/docs/spec/layout/index.zh-CN.md
similarity index 94%
rename from docs/spec/layout/index.md
rename to docs/spec/layout/index.zh-CN.md
index dd88f055c..53afe269e 100644
--- a/docs/spec/layout/index.md
+++ b/docs/spec/layout/index.zh-CN.md
@@ -1,13 +1,9 @@
 ---
 template: component
-category:
-  zh-CN: 设计基础
-  en-US: Design Fundamental
+category: 设计基础
 order: 4
 cols: 1
-title:
-  zh-CN: 常用布局
-  en-US: Layout
+title: 常用布局
 ---
 
 布局和导航是产品的骨架，是页面的重要构成模式之一，是作为后续展开页面设计的基础，可以为产品奠定交互和视觉风格。

From 1ed890c095e393d4ed3cfdb5b364b8d201d3673c Mon Sep 17 00:00:00 2001
From: kacjay <45483388@qq.com>
Date: Mon, 23 Jan 2017 13:55:39 +0800
Subject: [PATCH 20/51] fix Menu selected change error (#4677)

protect none parameter[openKeys, defaultOpenKeys] Menu
---
 components/menu/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/menu/index.tsx b/components/menu/index.tsx
index 4c8eb3eda..276464270 100644
--- a/components/menu/index.tsx
+++ b/components/menu/index.tsx
@@ -79,7 +79,7 @@ export default class Menu extends React.Component<MenuProps, any> {
     }
 
     this.state = {
-      openKeys,
+      openKeys: openKeys || [],
     };
   }
   componentWillReceiveProps(nextProps) {

From 5b9d8f0e5a683ce3537827dbab65222722ae59ba Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 23 Jan 2017 14:09:37 +0800
Subject: [PATCH 21/51] Fix style of Tabs[tabPosition&type="card"], close #4669

---
 components/tabs/style/card-style.less | 134 ++++++++++++++++++++++++++
 components/tabs/style/index.less      |  84 +---------------
 2 files changed, 135 insertions(+), 83 deletions(-)
 create mode 100644 components/tabs/style/card-style.less

diff --git a/components/tabs/style/card-style.less b/components/tabs/style/card-style.less
new file mode 100644
index 000000000..89ed8ecad
--- /dev/null
+++ b/components/tabs/style/card-style.less
@@ -0,0 +1,134 @@
+@import "../../style/themes/default";
+@import "../../style/mixins/index";
+@tab-prefix-cls: ~"@{ant-prefix}-tabs";
+
+// card style
+.@{tab-prefix-cls} {
+  &&-card > &-bar &-nav-container {
+    height: 32px;
+  }
+  &&-card > &-bar &-ink-bar {
+    visibility: hidden;
+  }
+  &&-card > &-bar &-tab {
+    margin: 0;
+    border: 1px solid @border-color-base;
+    border-bottom: 0;
+    border-radius: 6px 6px 0 0;
+    transition: all 0.3s @ease-in-out;
+    background: #f9f9f9;
+    margin-right: 2px;
+  }
+  &&-card > &-bar &-tab {
+    padding: 5px 16px 4px;
+    transition: all 0.3s @ease-in-out;
+  }
+  &&-card > &-bar &-tab-active {
+    background: @component-background;
+    transform: translateZ(0);
+    border-color: @border-color-base;
+    color: @primary-color;
+  }
+  &&-card > &-bar &-tab-active {
+    padding-bottom: 5px;
+    transform: translateZ(0);
+  }
+  &&-card > &-bar &-nav-wrap {
+    margin-bottom: 0;
+  }
+  &&-card > &-bar &-tab .@{iconfont-css-prefix}-close {
+    margin-right: 0;
+    color: @text-color-secondary;
+    transition: all 0.3s @ease-in-out;
+    .iconfont-size-under-12px(9px);
+    transform-origin: 100% 50%;
+    width: 0;
+    text-align: right;
+    vertical-align: middle;
+    overflow: hidden;
+    &:hover {
+      color: #404040;
+      font-weight: bold;
+    }
+  }
+
+  &&-editable-card > &-bar &-tab:not(&-tab-active):hover {
+    padding-left: 8px;
+    padding-right: 8px;
+  }
+
+  &&-card > &-bar &-tab-active .@{iconfont-css-prefix}-close,
+  &&-card > &-bar &-tab:hover .@{iconfont-css-prefix}-close {
+    width: 16px;
+    transform: translateZ(0);
+  }
+
+  &-extra-content {
+    float: right;
+    line-height: 32px;
+
+    .@{tab-prefix-cls}-new-tab {
+      width: 20px;
+      height: 20px;
+      line-height: 20px;
+      text-align: center;
+      cursor: pointer;
+      border-radius: 3px;
+      border: 1px solid @border-color-base;
+      font-size: @font-size-base;
+      .iconfont-size-under-12px(10px);
+      color: @text-color-secondary;
+      transition: color 0.3s ease;
+      &:hover {
+        color: #404040;
+      }
+    }
+  }
+
+  // https://github.com/ant-design/ant-design/issues/4669
+  &-vertical&-card > .@{tab-prefix-cls}-bar {
+    .@{tab-prefix-cls}-nav-container {
+      height: auto;
+    }
+    .@{tab-prefix-cls}-tab {
+      border-bottom: 1px solid @border-color-base;
+      margin-bottom: 8px;
+      &-active {
+        padding-bottom: 4px;
+      }
+      &:last-child {
+        margin-bottom: 8px;
+      }
+    }
+  }
+
+  &-vertical&-card&-left > .@{tab-prefix-cls}-bar {
+    .@{tab-prefix-cls}-nav-wrap {
+      margin-right: 0;
+    }
+    .@{tab-prefix-cls}-tab {
+      border-right: 0;
+      border-radius: @border-radius-base 0 0 @border-radius-base;
+      margin-right: 1px;
+      &-active {
+        margin-right: -1px;
+        padding-right: 18px;
+      }
+    }
+  }
+
+  &-vertical&-card&-right > .@{tab-prefix-cls}-bar {
+    .@{tab-prefix-cls}-nav-wrap {
+      margin-left: 0;
+    }
+    .@{tab-prefix-cls}-tab {
+      border-left: 0;
+      border-radius: 0 @border-radius-base @border-radius-base 0;
+      margin-left: 1px;
+      &-active {
+        margin-left: -1px;
+        padding-left: 18px;
+      }
+    }
+  }
+}
diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less
index 6433fb10a..d7658d16c 100644
--- a/components/tabs/style/index.less
+++ b/components/tabs/style/index.less
@@ -1,7 +1,7 @@
 @import "../../style/themes/default";
 @import "../../style/mixins/index";
-
 @tab-prefix-cls: ~"@{ant-prefix}-tabs";
+@import "./card-style";
 
 .@{tab-prefix-cls} {
   box-sizing: border-box;
@@ -307,88 +307,6 @@
     margin-bottom: 0;
     margin-top: 16px;
   }
-
-  // card style
-  &&-card > &-bar &-nav-container {
-    height: 32px;
-  }
-  &&-card > &-bar &-ink-bar {
-    visibility: hidden;
-  }
-  &&-card > &-bar &-tab {
-    margin: 0;
-    border: 1px solid @border-color-base;
-    border-bottom: 0;
-    border-radius: 6px 6px 0 0;
-    transition: all 0.3s @ease-in-out;
-    background: #f9f9f9;
-    margin-right: 2px;
-  }
-  &&-card > &-bar &-tab {
-    padding: 5px 16px 4px;
-    transition: all 0.3s @ease-in-out;
-  }
-  &&-card > &-bar &-tab-active {
-    background: @component-background;
-    transform: translateZ(0);
-    border-color: @border-color-base;
-    color: @primary-color;
-  }
-  &&-card > &-bar &-tab-active {
-    padding-bottom: 5px;
-    transform: translateZ(0);
-  }
-  &&-card > &-bar &-nav-wrap {
-    margin-bottom: 0;
-  }
-  &&-card > &-bar &-tab .@{iconfont-css-prefix}-close {
-    margin-right: 0;
-    color: @text-color-secondary;
-    transition: all 0.3s @ease-in-out;
-    .iconfont-size-under-12px(9px);
-    transform-origin: 100% 50%;
-    width: 0;
-    text-align: right;
-    vertical-align: middle;
-    overflow: hidden;
-    &:hover {
-      color: #404040;
-      font-weight: bold;
-    }
-  }
-
-  &&-editable-card > &-bar &-tab:not(&-tab-active):hover {
-    padding-left: 8px;
-    padding-right: 8px;
-  }
-
-  &&-card > &-bar &-tab-active .@{iconfont-css-prefix}-close,
-  &&-card > &-bar &-tab:hover .@{iconfont-css-prefix}-close {
-    width: 16px;
-    transform: translateZ(0);
-  }
-
-  &-extra-content {
-    float: right;
-    line-height: 32px;
-
-    .@{tab-prefix-cls}-new-tab {
-      width: 20px;
-      height: 20px;
-      line-height: 20px;
-      text-align: center;
-      cursor: pointer;
-      border-radius: 3px;
-      border: 1px solid @border-color-base;
-      font-size: @font-size-base;
-      .iconfont-size-under-12px(10px);
-      color: @text-color-secondary;
-      transition: color 0.3s ease;
-      &:hover {
-        color: #404040;
-      }
-    }
-  }
 }
 
 .no-flex,

From bb54dce71278cc7a2f4cefd3a68a22f63a09bdca Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 23 Jan 2017 19:10:50 +0800
Subject: [PATCH 22/51] Add test case for Menu openKeys undefined bug

ref #4677 and #4692
---
 components/menu/__tests__/index.test.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/components/menu/__tests__/index.test.js b/components/menu/__tests__/index.test.js
index 1ec37a300..88c0c5287 100644
--- a/components/menu/__tests__/index.test.js
+++ b/components/menu/__tests__/index.test.js
@@ -82,4 +82,20 @@ describe('Menu', () => {
     );
     expect(wrapper.find('.ant-menu-sub').at(0).hasClass('ant-menu-hidden')).not.toBe(true);
   });
+
+  // https://github.com/ant-design/ant-design/pulls/4677
+  // https://github.com/ant-design/ant-design/issues/4692
+  // TypeError: Cannot read property 'indexOf' of undefined
+  it('pr #4677 and issue #4692', () => {
+    const wrapper = mount(
+      <Menu mode="horizontal">
+        <SubMenu title="submenu">
+          <Menu.Item key="1">menu1</Menu.Item>
+          <Menu.Item key="2">menu2</Menu.Item>
+        </SubMenu>
+      </Menu>
+    );
+    wrapper.update();
+    // just expect no error emit
+  });
 });

From 273c089aad4ae803797b1c395aac427cbab8bdec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= <afc163@gmail.com>
Date: Mon, 23 Jan 2017 21:08:16 +0800
Subject: [PATCH 23/51] Add test case for LocalProvider (#4693)

---
 .../locale-provider/__tests__/index.test.js   | 65 +++++++++++++++++++
 components/pagination/locale/en_US.tsx        |  2 -
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 components/locale-provider/__tests__/index.test.js
 delete mode 100644 components/pagination/locale/en_US.tsx

diff --git a/components/locale-provider/__tests__/index.test.js b/components/locale-provider/__tests__/index.test.js
new file mode 100644
index 000000000..8fc440716
--- /dev/null
+++ b/components/locale-provider/__tests__/index.test.js
@@ -0,0 +1,65 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import moment from 'moment';
+import { LocaleProvider, Pagination, DatePicker, TimePicker, Calendar,
+         Popconfirm, Table, Modal, Select, Transfer } from '../../';
+import enUS from '../en_US';
+import ptBR from '../pt_BR';
+import ruRU from '../ru_RU';
+import esES from '../es_ES';
+
+const Option = Select.Option;
+const RangePicker = DatePicker.RangePicker;
+
+const columns = [{
+  title: 'Name',
+  dataIndex: 'name',
+  filters: [{
+    text: 'filter1',
+    value: 'filter1',
+  }],
+}, {
+  title: 'Age',
+  dataIndex: 'age',
+}];
+
+const App = () => (
+  <div>
+    <Pagination defaultCurrent={1} total={50} showSizeChanger />
+    <Select showSearch style={{ width: 200 }}>
+      <Option value="jack">jack</Option>
+      <Option value="lucy">lucy</Option>
+    </Select>
+    <DatePicker />
+    <TimePicker />
+    <RangePicker style={{ width: 200 }} />
+    <Popconfirm title="Question?" visible>
+      <a>Click to confirm</a>
+    </Popconfirm>
+    <Transfer
+      dataSource={[]}
+      showSearch
+      targetKeys={[]}
+      render={item => item.title}
+    />
+    <Calendar fullscreen={false} value={moment()} />
+    <Table dataSource={[]} columns={columns} />
+    <Modal title="Locale Modal" visible>
+      <p>Locale Modal</p>
+    </Modal>
+  </div>
+);
+
+describe('Locale Provider', () => {
+  it('should display the text as locale changed', () => {
+    [enUS, ptBR, ruRU, esES].forEach((locale) => {
+      const wrapper = mount(
+        <LocaleProvider locale={locale}>
+          <App />
+        </LocaleProvider>
+      );
+      const DatePickerPlaceholder = wrapper.find('.ant-calendar-picker-input').at(0).node.getAttribute('placeholder');
+      expect(DatePickerPlaceholder).toBe(locale.DatePicker.lang.placeholder);
+    });
+  });
+});
diff --git a/components/pagination/locale/en_US.tsx b/components/pagination/locale/en_US.tsx
deleted file mode 100644
index 3a508c34d..000000000
--- a/components/pagination/locale/en_US.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import en_US from 'rc-pagination/lib/locale/en_US';
-export default en_US;

From 128d35b3910f0de7f74b5f69108d3468f65c3832 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 23 Jan 2017 21:12:19 +0800
Subject: [PATCH 24/51] update Changelog for semver

---
 CHANGELOG.en-US.md | 5 ++++-
 CHANGELOG.zh-CN.md | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 4106fb131..82f730dc3 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -5,7 +5,10 @@ toc: false
 timeline: true
 ---
 
-If you want to read change logs before `2.0.0`, please visit [GitHub](https://github.com/ant-design/ant-design/releases?after=2.0.0).
+
+`antd` strictly follows [Semantic Versioning 2.0.0](http://semver.org/).
+
+If you want to read change logs before `2.0.0`, please visit [GitHub](https://github.com/ant-design/ant-design/blob/1.x-stable/CHANGELOG.md).
 
 ---
 
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 9bf971f24..334f7921f 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -5,7 +5,9 @@ toc: false
 timeline: true
 ---
 
-如果需要查看 `2.0.0` 之前的更新日志，请移步 [GitHub](https://github.com/ant-design/ant-design/releases?after=2.0.0)。
+`antd` 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) 语义化版本规范。
+
+如果需要查看 `2.0.0` 之前的更新日志，请移步 [GitHub](https://github.com/ant-design/ant-design/blob/1.x-stable/CHANGELOG.md)。
 
 ---
 

From a81bf8f73e45f8c87a3b6e4712345416fffe0767 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 24 Jan 2017 14:59:39 +0800
Subject: [PATCH 25/51] use file.thumbUrl for <img /> in priority, close #4653

---
 .../upload/__tests__/uploadlist.test.js       | 34 +++++++++++++++++++
 components/upload/uploadList.tsx              |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 components/upload/__tests__/uploadlist.test.js

diff --git a/components/upload/__tests__/uploadlist.test.js b/components/upload/__tests__/uploadlist.test.js
new file mode 100644
index 000000000..ff712930c
--- /dev/null
+++ b/components/upload/__tests__/uploadlist.test.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import Upload from '..';
+
+const fileList = [{
+  uid: -1,
+  name: 'xxx.png',
+  status: 'done',
+  url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
+  thumbUrl: 'https://zos.alipayobjects.com/rmsportal/IQKRngzUuFzJzGzRJXUs.png',
+}, {
+  uid: -2,
+  name: 'yyy.png',
+  status: 'done',
+  url: 'https://zos.alipayobjects.com/rmsportal/IQKRngzUuFzJzGzRJXUs.png',
+  thumbUrl: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
+}];
+
+describe('Upload List', () => {
+  // https://github.com/ant-design/ant-design/issues/4653
+  it('should use file.thumbUrl for <img /> in priority', () => {
+    const wrapper = mount(
+      <Upload defaultFileList={fileList} listType="picture">
+        <button>upload</button>
+      </Upload>
+    );
+    fileList.forEach((file, i) => {
+      const linkNode = wrapper.find('.ant-upload-list-item-thumbnail').at(i);
+      const imgNode = wrapper.find('.ant-upload-list-item-thumbnail img').at(i);
+      expect(linkNode.prop('href')).toBe(file.url);
+      expect(imgNode.prop('src')).toBe(file.thumbUrl);
+    });
+  });
+});
diff --git a/components/upload/uploadList.tsx b/components/upload/uploadList.tsx
index 565c78a3f..fbb5810ce 100644
--- a/components/upload/uploadList.tsx
+++ b/components/upload/uploadList.tsx
@@ -84,7 +84,7 @@ export default class UploadList extends React.Component<UploadListProps, any> {
               target="_blank"
               rel="noopener noreferrer"
             >
-              <img src={file.url || file.thumbUrl} alt={file.name} />
+              <img src={file.thumbUrl || file.url} alt={file.name} />
             </a>
           );
         }

From f4021d525556f4cbcd3660baec96cccc10fcf1d0 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 24 Jan 2017 15:02:54 +0800
Subject: [PATCH 26/51] Fix default locale in Upload, close #4697

---
 components/upload/uploadList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/upload/uploadList.tsx b/components/upload/uploadList.tsx
index fbb5810ce..ad1f41abb 100644
--- a/components/upload/uploadList.tsx
+++ b/components/upload/uploadList.tsx
@@ -71,7 +71,7 @@ export default class UploadList extends React.Component<UploadListProps, any> {
       if (listType === 'picture' || listType === 'picture-card') {
         if (file.status === 'uploading' || (!file.thumbUrl && !file.url)) {
           if (listType === 'picture-card') {
-            icon = <div className={`${prefixCls}-list-item-uploading-text`}>文件上传中</div>;
+            icon = <div className={`${prefixCls}-list-item-uploading-text`}>Uploading...</div>;
           } else {
             icon = <Icon className={`${prefixCls}-list-item-thumbnail`} type="picture" />;
           }

From e5a735e888b8d46f0788415d67ebbd947d6242cf Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 24 Jan 2017 15:10:04 +0800
Subject: [PATCH 27/51] fix ts error, ref #4675

---
 components/table/filterDropdown.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/table/filterDropdown.tsx b/components/table/filterDropdown.tsx
index 5e4047732..4e5c556d7 100755
--- a/components/table/filterDropdown.tsx
+++ b/components/table/filterDropdown.tsx
@@ -42,10 +42,10 @@ export default class FilterMenu extends React.Component<FilterMenuProps, any> {
 
   componentWillReceiveProps(nextProps) {
     const { column } = nextProps;
-    let newState: {
-      selectedKeys?: string[];
-      visible?: boolean;
-    } = {};
+    const newState = {} as {
+      selectedKeys: string[];
+      visible: boolean;
+    };
     if ('selectedKeys' in nextProps) {
       newState.selectedKeys = nextProps.selectedKeys;
     }

From f3b2e155b50122b1e452e9b8c6b146b32cd69215 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 24 Jan 2017 15:20:06 +0800
Subject: [PATCH 28/51] style: Select height should flex with @input-height
 variable, close #4694

---
 components/select/style/index.less | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/select/style/index.less b/components/select/style/index.less
index fd53870fb..86dbd75b8 100644
--- a/components/select/style/index.less
+++ b/components/select/style/index.less
@@ -147,7 +147,7 @@
     margin-left: 8px;
     margin-right: 8px;
     position: relative;
-    line-height: 26px;
+    line-height: @input-height-base - 2px;
     // https://github.com/ant-design/ant-design/issues/3481#issuecomment-254721026
     &:after {
       content: '.';
@@ -163,14 +163,14 @@
       height: @input-height-lg;
     }
     .@{select-prefix-cls}-selection__rendered {
-      line-height: 30px;
+      line-height: @input-height-lg - 2px;
     }
     .@{select-prefix-cls}-selection--multiple {
       min-height: @input-height-lg;
       .@{select-prefix-cls}-selection__rendered {
         li {
-          height: 24px;
-          line-height: 24px;
+          height: @input-height-lg - 8px;
+          line-height: @input-height-lg - 8px;
         }
       }
     }
@@ -184,14 +184,14 @@
       height: @input-height-sm;
     }
     .@{select-prefix-cls}-selection__rendered {
-      line-height: 20px;
+      line-height: @input-height-sm - 2px;
     }
     .@{select-prefix-cls}-selection--multiple {
       min-height: @input-height-sm;
       .@{select-prefix-cls}-selection__rendered {
         li {
-          height: 14px;
-          line-height: 14px;
+          height: @input-height-sm - 8px;
+          line-height: @input-height-sm - 8px;
         }
       }
     }
@@ -290,8 +290,8 @@
     > ul > li,
     .@{select-prefix-cls}-selection__rendered > ul > li {  // for tree-select
       margin-top: 3px;
-      height: 20px;
-      line-height: 20px;
+      height: @input-height-base - 8px;
+      line-height: @input-height-base - 8px;
     }
 
     .@{select-prefix-cls}-selection__choice {

From edf9ebb0ef92b71c92a64c17080e1ea903c69fe8 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 24 Jan 2017 17:59:17 +0800
Subject: [PATCH 29/51] Fix Button font size inside Dropdown, close #4705

---
 components/dropdown/style/index.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less
index ea717c209..214c1c841 100644
--- a/components/dropdown/style/index.less
+++ b/components/dropdown/style/index.less
@@ -155,7 +155,6 @@
 
 .@{dropdown-prefix-cls}-trigger,
 .@{dropdown-prefix-cls}-link {
-  font-size: @font-size-base;
   .@{iconfont-css-prefix}-down {
     .iconfont-size-under-12px(10px);
   }

From 0dfdace9236a1be0e74a8a4b298147f21e5a426a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= <afc163@gmail.com>
Date: Tue, 24 Jan 2017 21:38:43 +0800
Subject: [PATCH 30/51] Keep bundle size warning out of server side

---
 components/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/index.tsx b/components/index.tsx
index 8de8930e3..2d726f2b1 100644
--- a/components/index.tsx
+++ b/components/index.tsx
@@ -1,7 +1,7 @@
 /* eslint no-console:0 */
 // this file is not used if use https://github.com/ant-design/babel-plugin-import
 if (process.env.NODE_ENV !== 'production') {
-  if (typeof console !== 'undefined' && console.warn) {
+  if (typeof console !== 'undefined' && console.warn && typeof window !== 'undefined') {
     console.warn(`You are using a whole package of antd,
 please use https://www.npmjs.com/package/babel-plugin-import to reduce app bundle size.`);
   }

From def370ee33028349866aa20e576e2361d6f4405a Mon Sep 17 00:00:00 2001
From: Marius Ileana <visvadw@gmail.com>
Date: Wed, 25 Jan 2017 05:12:04 +0200
Subject: [PATCH 31/51] Update aside-collapse.md (#4708)

Small corrections as part of my review.
---
 docs/spec/layout/demo/aside-collapse.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/spec/layout/demo/aside-collapse.md b/docs/spec/layout/demo/aside-collapse.md
index 8e3f1fa54..6fa9dd661 100644
--- a/docs/spec/layout/demo/aside-collapse.md
+++ b/docs/spec/layout/demo/aside-collapse.md
@@ -11,7 +11,7 @@ title:
 
 ## en-US
 
-This pattern is used when the horizontal space is limited. Aside navigation is default to be collapsed, you can click the button at the bottom to expand it.
+This pattern is used when the horizontal space is limited. By default, Aside navigation is collapsed. You can click the button at the bottom to expand it.
 
 ````__react
 import { Menu, Breadcrumb, Icon } from 'antd';

From a7517c7000fc54dd3909fe6c322bb6d01a216769 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 25 Jan 2017 12:00:38 +0800
Subject: [PATCH 32/51] docs: update react-fa link

---
 docs/react/recommendation.en-US.md | 2 +-
 docs/react/recommendation.zh-CN.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/react/recommendation.en-US.md b/docs/react/recommendation.en-US.md
index 40ed80ca0..9e9c64e5a 100644
--- a/docs/react/recommendation.en-US.md
+++ b/docs/react/recommendation.en-US.md
@@ -13,4 +13,4 @@ title: Third-Party Library
 * **Media Query: ** [react-responsive](https://github.com/contra/react-responsive), [react-media](https://github.com/ReactTraining/react-media)
 * **Copy to clipboard: ** [react-copy-to-clipboard](https://github.com/nkbt/react-copy-to-clipboard)
 * **Document head manager: ** [react-helmet](https://github.com/nfl/react-helmet)
-* **Font Awesome Icons**: https://github.com/andreypopp/react-fa
+* **Font Awesome Icons**: [react-fa](https://github.com/andreypopp/react-fa]
diff --git a/docs/react/recommendation.zh-CN.md b/docs/react/recommendation.zh-CN.md
index 9986241df..ee73e9782 100644
--- a/docs/react/recommendation.zh-CN.md
+++ b/docs/react/recommendation.zh-CN.md
@@ -13,4 +13,4 @@ title: 社区精选组件
 * **Media Query：** [react-responsive](https://github.com/contra/react-responsive)、[react-media](https://github.com/ReactTraining/react-media)
 * **复制到剪贴板：** [react-copy-to-clipboard](https://github.com/nkbt/react-copy-to-clipboard)
 * **管理 document head：** [react-helmet](https://github.com/nfl/react-helmet)
-* **Font Awesome 图标**: https://github.com/andreypopp/react-fa
+* **Font Awesome 图标**: [react-fa](https://github.com/andreypopp/react-fa]

From a963fd1c6024b9fbd69a876e8fb9c0bd4fe8450b Mon Sep 17 00:00:00 2001
From: Marius Ileana <visvadw@gmail.com>
Date: Wed, 25 Jan 2017 15:10:42 +0200
Subject: [PATCH 33/51] Review of docs/spec/layout/demo/top.md (#4710)

Small review corrections.
---
 docs/spec/layout/demo/top.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/spec/layout/demo/top.md b/docs/spec/layout/demo/top.md
index 727c54761..ed1466702 100644
--- a/docs/spec/layout/demo/top.md
+++ b/docs/spec/layout/demo/top.md
@@ -14,9 +14,12 @@ title:
 
 ## en-US
 
-The first and second level nav are both at the top.
+The first and second level nav are both on the top.
 
-A top-bottom structure of page layouts is used to top navigation. Generally, the mainnav is placed at the top of the page, and put log, the first level navigation, secondary menu(users, settings, notifications) from left to right in it. We always put contents in a fixed size navigation.( eg: `1200px`), the layout of the whole page is stable, it's not affected by viewing enviroment,; Top-bottom structure is conform to top-bottom viewing habit, it's a classical navigation pattern of websites. This pattern will bring demonstration efficiency up of the mian workarea, but it will also occupie some vertical spaces. And, because the horizontal space of the navigation is limited, this pattern is not suitable for the first level navigation which has too much information.
+A top-bottom structure of page layouts is used for top navigation. Generally, the mainnav is placed at the top of the page, and includes the logo, the first level navigation, and the secondary menu (users, settings, notifications) from left to right in it. 
+We always put contents in a fixed size navigation (eg: `1200px`), the layout of the whole page is stable, it's not affected by viewing area.
+
+Top-bottom structure is conform with the top-bottom viewing habit, it's a classical navigation pattern of websites. This pattern demonstrates efficiency in the main workarea, while using some vertical space. And because the horizontal space of the navigation is limited, this pattern is not suitable for cases when the first level navigation contains many elements or links.
 
 > `<BrowserDemo />` This is for demo, don't need to copy.
 

From d2e862d3af9cc29ab2333dc6e28985505a52f8c8 Mon Sep 17 00:00:00 2001
From: Marius Ileana <visvadw@gmail.com>
Date: Wed, 25 Jan 2017 15:10:51 +0200
Subject: [PATCH 34/51] Update aside.md (#4707)

Small review corrections.
---
 docs/spec/layout/demo/aside.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/spec/layout/demo/aside.md b/docs/spec/layout/demo/aside.md
index 52335aec5..e106be0fe 100644
--- a/docs/spec/layout/demo/aside.md
+++ b/docs/spec/layout/demo/aside.md
@@ -15,7 +15,9 @@ title:
 
 Aside top level navigation
 
-A left-right structure of page layouts is used to Aside navigation, Generally, the mainnav is placed on the left side of the page, the secondary menu is placed on the top of the working area. Contens will adapts the layout to the viewing environment to imporve usage rates of horizaontal space, but the layout of the whole page is not stable. The level of the aisde navigation is scalable. The first, second, third level navigations could be present more fluently and relevantly, and aside navigation can be fixed to allows users quickly switch and  spot the current position when they are operating or viewing, there is a high operational efficency. But such navigation will occupie some space of the contents in the horizontal space. 
+A left-right structure of page layouts is used to Aside navigation, Generally, the mainnav is placed on the left side of the page, and the secondary menu is placed on the top of the working area. Contents will adapt the layout to the viewing area to improve the horizontal space usage, while the layout of the whole page is not stable.
+
+The level of the aisde navigation is scalable. The first, second, and third level navigations could be present more fluently and relevantly, and aside navigation can be fixed, allowing the user to quickly switch and spot the current position, improving the user experience. However, this navigation occupies some horizontal space of the contents.
 
 ````__react
 import { Menu, Breadcrumb, Icon } from 'antd';

From 882ecc370aaf6b385e817a0482c7225376ead70e Mon Sep 17 00:00:00 2001
From: Marius Ileana <visvadw@gmail.com>
Date: Wed, 25 Jan 2017 15:11:02 +0200
Subject: [PATCH 35/51] Review of docs/spec/layout/demo/ceiling.md (#4709)

Small review corrections.
---
 docs/spec/layout/demo/ceiling.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/spec/layout/demo/ceiling.md b/docs/spec/layout/demo/ceiling.md
index c78ecf516..1f43b02fa 100644
--- a/docs/spec/layout/demo/ceiling.md
+++ b/docs/spec/layout/demo/ceiling.md
@@ -12,9 +12,9 @@ title:
 
 ## en-US
 
-Generally, ceiling is used for cross system/application, you can put uniform login/help information in it.
+Generally, ceiling is used for cross system/applications, where you can put uniform login/help information on top of the page.
 
-Background color of a ceiling is a deep color, height is `30px`, generally to be used with a light color mainnav.
+Background color of a ceiling is a dark color, height is `30px`, and a light color foreground for the mainnav should be used.
 
 ````__react
 import { Menu, Breadcrumb } from 'antd';

From 1ce6f7fc356b2badba39e9b301fb207a678b4897 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 25 Jan 2017 21:18:06 +0800
Subject: [PATCH 36/51] remove unused varable @layout-content-margin, close
 #4714

---
 components/style/themes/default.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index aca712acb..3b4b23218 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -148,7 +148,6 @@
 @layout-header-padding     : 0 50px;
 @layout-footer-padding     : 24px 50px;
 @layout-sider-background   : @heading-color;
-@layout-content-margin     : 24px;
 @layout-trigger-height     : 48px;
 
 // z-index list

From 5e3618c26dea38ca1435c51a069f43a2004bb615 Mon Sep 17 00:00:00 2001
From: Walter Barbagallo <turbometalskater@gmail.com>
Date: Wed, 25 Jan 2017 14:27:14 +0100
Subject: [PATCH 37/51] Fix Popover demo typo (#4703)

---
 components/popover/__tests__/__snapshots__/demo.test.js.snap | 2 +-
 components/popover/demo/control.md                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/popover/__tests__/__snapshots__/demo.test.js.snap b/components/popover/__tests__/__snapshots__/demo.test.js.snap
index 44f2dafe4..24cfb2a0a 100644
--- a/components/popover/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/popover/__tests__/__snapshots__/demo.test.js.snap
@@ -32,7 +32,7 @@ exports[`test renders ./components/popover/demo/control.md correctly 1`] = `
   class="ant-btn ant-btn-primary"
   type="button">
   <span>
-    Cilck me
+    Click me
   </span>
 </button>
 `;
diff --git a/components/popover/demo/control.md b/components/popover/demo/control.md
index 08dedd726..a0e00feac 100755
--- a/components/popover/demo/control.md
+++ b/components/popover/demo/control.md
@@ -39,7 +39,7 @@ const App = React.createClass({
         visible={this.state.visible}
         onVisibleChange={this.handleVisibleChange}
       >
-        <Button type="primary">Cilck me</Button>
+        <Button type="primary">Click me</Button>
       </Popover>
     );
   },

From 879bc9320cd73ad624ea378faf234f13547fd2b7 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Thu, 26 Jan 2017 10:56:24 +0800
Subject: [PATCH 38/51] docs: update docs for Tooltip, close: #4724

---
 components/tooltip/index.en-US.md | 2 ++
 components/tooltip/index.tsx      | 2 ++
 components/tooltip/index.zh-CN.md | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md
index 6d80607d1..2399c4637 100644
--- a/components/tooltip/index.en-US.md
+++ b/components/tooltip/index.en-US.md
@@ -28,6 +28,8 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 | arrowPointAtCenter | whether arrow pointed at the center of target, supported after `antd@1.11+` | boolean | `false` |
 | visible   | make the float card visible or not                     | boolean       | false  |
 | onVisibleChange | callback of the visible attribute changed            | (visible) => void | none     |
+| mouseEnterDelay | delay time to show when mouse enter.unit: s | number | 0 |
+| mouseLeaveDelay | delay time to hide when mouse leave.unit: s | number | 0.1 |
 | trigger | triggering mode: can be hover, focus, or click. | string | hover |
 | overlayClassName | class name of the card                            | string | none     |
 | overlayStyle | style of the card                            | object | none    |
diff --git a/components/tooltip/index.tsx b/components/tooltip/index.tsx
index e8ed1bd2a..6d29b17a1 100644
--- a/components/tooltip/index.tsx
+++ b/components/tooltip/index.tsx
@@ -18,6 +18,8 @@ export interface AbstractTooltipProps {
   builtinPlacements?: Object;
   visible?: boolean;
   onVisibleChange?: (visible: boolean) => void;
+  mouseEnterDelay?: number;
+  mouseLeaveDelay?: number;
   transitionName?: string;
   trigger?: 'hover' | 'focus' | 'click';
   openClassName?: string;
diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md
index c7ff81409..29a2f2f06 100644
--- a/components/tooltip/index.zh-CN.md
+++ b/components/tooltip/index.zh-CN.md
@@ -30,6 +30,8 @@ title: Tooltip
 | arrowPointAtCenter | 箭头是否指向目标元素中心，`antd@1.11+` 支持 | boolean | `false` |
 | visible   | 用于手动控制浮层显隐                     | boolean       | false  |
 | onVisibleChange | 显示隐藏的回调                      | (visible) => void | 无     |
+| mouseEnterDelay | 鼠标移入后延时多少才显示 Tooltip，单位：秒 | number | 0 |
+| mouseLeaveDelay | 鼠标移出后延时多少才隐藏 Tooltip，单位：秒 | number | 0.1 |
 | trigger   | 触发行为，可选 `hover/focus/click`       | string        | hover  |
 | overlayClassName | 卡片类名                            | string | 无     |
 | overlayStyle | 卡片样式                            | object | 无     |

From 5cd111d486e5b25a8e78bba31cc972f1d7988bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E7=A6=BB?= <surgesoft@gmail.com>
Date: Thu, 26 Jan 2017 11:23:54 +0800
Subject: [PATCH 39/51]  recalculate width while resize (#4676)

+ close #4645
 + throttleByAnimationFrameDecorator as a function decorator
---
 components/_util/getRequestAnimationFrame.tsx | 13 +++++-
 components/_util/throttleByAnimationFrame.tsx | 42 +++++++++++++++++++
 components/affix/index.tsx                    | 22 ++++++----
 tsconfig.json                                 |  1 +
 4 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 components/_util/throttleByAnimationFrame.tsx

diff --git a/components/_util/getRequestAnimationFrame.tsx b/components/_util/getRequestAnimationFrame.tsx
index f75c84e28..a92a5ab2e 100644
--- a/components/_util/getRequestAnimationFrame.tsx
+++ b/components/_util/getRequestAnimationFrame.tsx
@@ -1,3 +1,14 @@
+function requestAnimationFramePolyfill() {
+  let lastTime = 0;
+  return function(callback) {
+    const currTime = new Date().getTime();
+    const timeToCall = Math.max(0, 16 - (currTime - lastTime));
+    const id = window.setTimeout(function() { callback(currTime + timeToCall); }, timeToCall);
+    lastTime = currTime + timeToCall;
+    return id;
+  };
+}
+
 export default function getRequestAnimationFrame() {
   if (typeof window === 'undefined') {
     return () => {};
@@ -8,5 +19,5 @@ export default function getRequestAnimationFrame() {
   const prefix = ['moz', 'ms', 'webkit'].filter(key => `${key}RequestAnimationFrame` in window)[0];
   return prefix
     ? window[`${prefix}RequestAnimationFrame`]
-    : callback => setTimeout(callback, 1000 / 60);
+    : requestAnimationFramePolyfill();
 }
diff --git a/components/_util/throttleByAnimationFrame.tsx b/components/_util/throttleByAnimationFrame.tsx
new file mode 100644
index 000000000..f0afd147a
--- /dev/null
+++ b/components/_util/throttleByAnimationFrame.tsx
@@ -0,0 +1,42 @@
+import getRequestAnimationFrame from '../_util/getRequestAnimationFrame';
+
+const reqAnimFrame = getRequestAnimationFrame();
+
+export default function throttleByAnimationFrame(fn, threshhold = 250) {
+  let last;
+  return function() {
+    const self = this;
+    const args = arguments;
+    reqAnimFrame(timestamp => {
+      if (!last || timestamp - last > threshhold) {
+        last = timestamp;
+        fn.apply(self, args);
+      }
+    });
+  };
+}
+
+export function throttleByAnimationFrameDecorator(threshhold = 250) {
+  return function(target, key, descriptor) {
+    let fn = descriptor.value;
+    let definingProperty = false;
+    return {
+      configurable: true,
+      get() {
+        if (definingProperty || this === target.prototype || this.hasOwnProperty(key)) {
+          return fn;
+        }
+
+        let boundFn = throttleByAnimationFrame(fn.bind(this), threshhold);
+        definingProperty = true;
+        Object.defineProperty(this, key, {
+          value: boundFn,
+          configurable: true,
+          writable: true,
+        });
+        definingProperty = false;
+        return boundFn;
+      },
+    };
+  };
+}
diff --git a/components/affix/index.tsx b/components/affix/index.tsx
index 15a0e728b..14b122d1c 100644
--- a/components/affix/index.tsx
+++ b/components/affix/index.tsx
@@ -5,6 +5,7 @@ import classNames from 'classnames';
 import shallowequal from 'shallowequal';
 import omit from 'omit.js';
 import getScroll from '../_util/getScroll';
+import { throttleByAnimationFrameDecorator } from '../_util/throttleByAnimationFrame';
 
 function getTargetRect(target): ClientRect {
   return target !== window ?
@@ -96,18 +97,16 @@ export default class Affix extends React.Component<AffixProps, any> {
     });
   }
 
-  setPlaceholderStyle(e, placeholderStyle) {
+  setPlaceholderStyle(placeholderStyle) {
     const originalPlaceholderStyle = this.state.placeholderStyle;
-    if (e.type === 'resize') {
-      return;
-    }
     if (shallowequal(placeholderStyle, originalPlaceholderStyle)) {
       return;
     }
     this.setState({ placeholderStyle });
   }
 
-  updatePosition = (e) => {
+  @throttleByAnimationFrameDecorator(250)
+  updatePosition(e) {
     let { offsetTop, offsetBottom, offset, target = getDefaultTarget } = this.props;
     const targetNode = target();
 
@@ -145,7 +144,7 @@ export default class Affix extends React.Component<AffixProps, any> {
         left: targetRect.left + elemOffset.left,
         width: affixNode.offsetWidth,
       });
-      this.setPlaceholderStyle(e, {
+      this.setPlaceholderStyle({
         width: affixNode.offsetWidth,
         height: affixNode.offsetHeight,
       });
@@ -161,13 +160,18 @@ export default class Affix extends React.Component<AffixProps, any> {
         left: targetRect.left + elemOffset.left,
         width: affixNode.offsetWidth,
       });
-      this.setPlaceholderStyle(e, {
+      this.setPlaceholderStyle({
         width: affixNode.offsetWidth,
         height: affixNode.offsetHeight,
       });
     } else {
-      this.setAffixStyle(e, null);
-      this.setPlaceholderStyle(e, null);
+      const { affixStyle } = this.state;
+      if (e.type === 'resize' && affixStyle && affixStyle.position === 'fixed' && affixNode.offsetWidth) {
+        this.setAffixStyle(e, {...affixStyle, width: affixNode.offsetWidth });
+      } else {
+        this.setAffixStyle(e, null);
+      }
+      this.setPlaceholderStyle(null);
     }
   }
 
diff --git a/tsconfig.json b/tsconfig.json
index 4427691e6..eaed8b1c1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,6 +3,7 @@
     "strictNullChecks": true,
     "moduleResolution": "node",
     "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
     "jsx": "preserve",
     "target": "es6"
   },

From 340385d34dec68c08d841066598abc17a860d79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E7=A6=BB?= <surgesoft@gmail.com>
Date: Thu, 26 Jan 2017 12:08:40 +0800
Subject: [PATCH 40/51]  pass style props to `Affix` (#4715)

+ close #4701
---
 components/affix/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/affix/index.tsx b/components/affix/index.tsx
index 14b122d1c..2a26d5876 100644
--- a/components/affix/index.tsx
+++ b/components/affix/index.tsx
@@ -221,9 +221,9 @@ export default class Affix extends React.Component<AffixProps, any> {
     });
 
     const props = omit(this.props, ['prefixCls', 'offsetTop', 'offsetBottom', 'target']);
-
+    const placeholderStyle = { ...this.state.placeholderStyle, ...this.props.style };
     return (
-      <div {...props} style={this.state.placeholderStyle}>
+      <div {...props} style={placeholderStyle}>
         <div className={className} ref="fixedNode" style={this.state.affixStyle}>
           {this.props.children}
         </div>

From e270fa87af76cb062aae9ee8b75bb9b549a59a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E7=A6=BB?= <surgesoft@gmail.com>
Date: Thu, 26 Jan 2017 12:09:26 +0800
Subject: [PATCH 41/51]  Mention in controlled mode suggestions bug fix (#4718)

*  Mention in controlled mode suggestions bug fix

 + close #4716
---
 components/mention/index.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/components/mention/index.tsx b/components/mention/index.tsx
index 37b202492..6169ea211 100644
--- a/components/mention/index.tsx
+++ b/components/mention/index.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import RcMention, { Nav, toString, toEditorState, getMentions } from 'rc-editor-mention';
 import classNames from 'classnames';
+import shallowequal from 'shallowequal';
 import Icon from '../icon';
 
 export interface MentionProps {
@@ -47,10 +48,12 @@ export default class Mention extends React.Component<MentionProps, MentionState>
     };
   }
 
-  componentWillReceiveProps(nextProps) {
-    this.setState({
-      suggestions: nextProps.suggestions,
-    });
+  componentWillReceiveProps({ suggestions }) {
+    if (!shallowequal(suggestions, this.props.suggestions)) {
+      this.setState({
+        suggestions,
+      });
+    }
   }
 
   onSearchChange = (value) => {
@@ -75,6 +78,7 @@ export default class Mention extends React.Component<MentionProps, MentionState>
       suggestions: filteredSuggestions,
     });
   }
+
   onFocus = (ev) => {
     this.setState({
       focus: true,

From 6c0dba60e798fd54d64462fbe9288c189c162791 Mon Sep 17 00:00:00 2001
From: Valentin Vichnal <valentin@vichnal.com>
Date: Thu, 26 Jan 2017 05:30:37 +0100
Subject: [PATCH 42/51] Create reverseArrow prop for Sider (#4611)

Create reverseArrow prop for Sider
---
 components/layout/Sider.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/layout/Sider.tsx b/components/layout/Sider.tsx
index 16beda1ba..cc9e4e7e8 100644
--- a/components/layout/Sider.tsx
+++ b/components/layout/Sider.tsx
@@ -10,6 +10,7 @@ export interface SiderProps {
   collapsible?: boolean;
   collapsed?: boolean;
   defaultCollapsed?: boolean;
+  reverseArrow?: boolean;
   onCollapse?: (collapsed: boolean) => void;
   trigger?: React.ReactNode;
   width?: number | string;
@@ -22,6 +23,7 @@ export default class Sider extends React.Component<SiderProps, any> {
     prefixCls: 'ant-layout-sider',
     collapsible: false,
     defaultCollapsed: false,
+    reverseArrow: false,
     width: 200,
     collapsedWidth: 64,
     style: {},
@@ -68,7 +70,7 @@ export default class Sider extends React.Component<SiderProps, any> {
 
   render() {
     const {
-      prefixCls, className, collapsible, trigger, style, width, collapsedWidth,
+      prefixCls, className, collapsible, reverseArrow, trigger, style, width, collapsedWidth,
       ...others,
     } = this.props;
     const divProps = omit(others, ['collapsed', 'defaultCollapsed', 'onCollapse', 'name']);
@@ -81,8 +83,8 @@ export default class Sider extends React.Component<SiderProps, any> {
       flex: `0 0 ${this.state.collapsed ? collapsedWidth : width}px`,
     };
     const iconObj = {
-      'expanded': <Icon type="left" />,
-      'collapsed': <Icon type="right" />,
+      'expanded': reverseArrow ? <Icon type="right" /> : <Icon type="left" />,
+      'collapsed': reverseArrow ? <Icon type="left" /> : <Icon type="right" />,
     };
     const status = this.state.collapsed ? 'collapsed' : 'expanded';
     const defaultTrigger = iconObj[status];

From f0adb4dc5f656fc8af82e94c69fa221693d542c6 Mon Sep 17 00:00:00 2001
From: Bo Chen <bochen2014@yahoo.com>
Date: Thu, 26 Jan 2017 19:51:06 +1100
Subject: [PATCH 43/51] site: run ant-design on windows #4725
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 5hours's work

* 过年好!!

* lint issue
---
 package.json        | 11 +++++------
 site/theme/index.js |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index a07a5a61f..ac1ac3c26 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
     "bisheng-plugin-react": "^0.4.0",
     "bisheng-plugin-toc": "^0.4.0",
     "coveralls": "^2.11.15",
+    "cross-env": "^3.1.4",
     "dekko": "^0.2.0",
     "dora-plugin-upload": "^0.3.1",
     "enquire.js": "^2.1.1",
@@ -128,6 +129,7 @@
     "react-stateless-wrapper": "^1.0.2",
     "react-sublime-video": "^0.2.0",
     "reqwest": "^2.0.5",
+    "rimraf": "^2.5.4",
     "typescript-babel-jest": "^0.1.5",
     "values.js": "^1.0.3",
     "xhr2": "^0.1.3"
@@ -136,22 +138,19 @@
     "test": "jest",
     "test-all": "./scripts/test-all.sh",
     "lint": "npm run tslint && npm run eslint && npm run demolint && npm run lesshint",
-    "tslint": "antd-tools run ts-lint && npm run compile && rm -rf lib",
+    "tslint": "antd-tools run ts-lint && npm run compile && rimraf lib",
     "eslint": "eslint tests site scripts components ./.eslintrc.js ./webpack.config.js --ext '.js,.jsx'",
-    "demolint": "RUN_ENV=DEMO eslint components/*/demo/*.md --ext '.md'",
+    "demolint": "cross-env RUN_ENV=DEMO eslint components/*/demo/*.md --ext '.md'",
     "lesshint": "lesshint components -r scripts/lesshint-report.js",
     "eslint-fix": "eslint --fix tests site scripts components ./.eslintrc.js ./webpack.config.js --ext '.js,.jsx' && eslint-tinker ./components/*/demo/*.md",
-
     "clean": "antd-tools run clean",
     "dist": "antd-tools run dist",
     "compile": "antd-tools run compile",
-
     "start": "bisheng start -c ./site/bisheng.config.js --no-livereload",
     "babel-site": "babel ./site/theme/template --out-dir ./site/theme/template",
-    "clean-site": "rm site/theme/template/**/*.js site/theme/template/*.js",
+    "clean-site": "rimraf site/theme/template/**/*.js site/theme/template/*.js",
     "site": "npm run babel-site && bisheng build --ssr -c ./site/bisheng.config.js && npm run clean-site",
     "deploy": "npm run clean && npm run site && bisheng gh-pages --push-only",
-
     "pub": "antd-tools run pub",
     "prepublish": "antd-tools run guard",
     "pre-publish": "npm run test-all && node ./scripts/prepub",
diff --git a/site/theme/index.js b/site/theme/index.js
index 31d58e1ea..deeb8cd8f 100644
--- a/site/theme/index.js
+++ b/site/theme/index.js
@@ -27,7 +27,7 @@ module.exports = {
     components(markdownData) {
       const filename = markdownData.meta.filename;
       if (!/^components/.test(filename) ||
-          /\/demo$/.test(path.dirname(filename))) return;
+          /[/\\]demo$/.test(path.dirname(filename))) return;
 
       return {
         meta: markdownData.meta,

From f0bdbfdd97b5310e0ff688f35a1a9a23080cc957 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Thu, 26 Jan 2017 17:04:31 +0800
Subject: [PATCH 44/51] chore: improve readability for npm scripts

---
 package.json | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index ac1ac3c26..9d976b4b8 100644
--- a/package.json
+++ b/package.json
@@ -137,20 +137,19 @@
   "scripts": {
     "test": "jest",
     "test-all": "./scripts/test-all.sh",
-    "lint": "npm run tslint && npm run eslint && npm run demolint && npm run lesshint",
-    "tslint": "antd-tools run ts-lint && npm run compile && rimraf lib",
-    "eslint": "eslint tests site scripts components ./.eslintrc.js ./webpack.config.js --ext '.js,.jsx'",
-    "demolint": "cross-env RUN_ENV=DEMO eslint components/*/demo/*.md --ext '.md'",
+    "lint": "npm run lint:ts && npm run lint:es && npm run lint:demo && npm run lesshint",
+    "lint:ts": "antd-tools run ts-lint && npm run compile && rimraf lib",
+    "lint:es": "eslint tests site scripts components ./.eslintrc.js ./webpack.config.js --ext '.js,.jsx'",
+    "lint:demo": "cross-env RUN_ENV=DEMO eslint components/*/demo/*.md --ext '.md'",
     "lesshint": "lesshint components -r scripts/lesshint-report.js",
     "eslint-fix": "eslint --fix tests site scripts components ./.eslintrc.js ./webpack.config.js --ext '.js,.jsx' && eslint-tinker ./components/*/demo/*.md",
-    "clean": "antd-tools run clean",
     "dist": "antd-tools run dist",
     "compile": "antd-tools run compile",
     "start": "bisheng start -c ./site/bisheng.config.js --no-livereload",
-    "babel-site": "babel ./site/theme/template --out-dir ./site/theme/template",
-    "clean-site": "rimraf site/theme/template/**/*.js site/theme/template/*.js",
-    "site": "npm run babel-site && bisheng build --ssr -c ./site/bisheng.config.js && npm run clean-site",
-    "deploy": "npm run clean && npm run site && bisheng gh-pages --push-only",
+    "site": "npm run site:babel && bisheng build --ssr -c ./site/bisheng.config.js && npm run site:clean",
+    "site:babel": "babel ./site/theme/template --out-dir ./site/theme/template",
+    "site:clean": "rimraf site/theme/template/**/*.js site/theme/template/*.js",
+    "deploy": "antd-tools run clean && npm run site && bisheng gh-pages --push-only",
     "pub": "antd-tools run pub",
     "prepublish": "antd-tools run guard",
     "pre-publish": "npm run test-all && node ./scripts/prepub",

From a96dd7a9f3d45d1931b1d756b035a036a7aa5993 Mon Sep 17 00:00:00 2001
From: Andrey G <plandem@gmail.com>
Date: Thu, 26 Jan 2017 14:10:45 +0300
Subject: [PATCH 45/51] *up rc-menu (fixed bug with SubMenu) (#4727)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9d976b4b8..5c656c3eb 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "rc-editor-mention": "~0.3.0",
     "rc-form": "~1.1.0",
     "rc-input-number": "~2.8.3",
-    "rc-menu": "~5.0.1",
+    "rc-menu": "~5.0.9",
     "rc-notification": "~1.3.4",
     "rc-pagination": "~1.6.0",
     "rc-progress": "~2.0.1",

From 8a412ae260d336f542429935db4cf04fab69c85a Mon Sep 17 00:00:00 2001
From: Penghan Wang <WPH95@users.noreply.github.com>
Date: Fri, 27 Jan 2017 10:39:09 +0800
Subject: [PATCH 46/51] doc: improve document for Form validateFields (#4730)

---
 components/form/index.en-US.md | 2 +-
 components/form/index.zh-CN.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/form/index.en-US.md b/components/form/index.en-US.md
index ce5aab94d..d2a9a4a7e 100644
--- a/components/form/index.en-US.md
+++ b/components/form/index.en-US.md
@@ -67,7 +67,7 @@ If the form has been decorated by `Form.create` then it has `this.props.form` pr
 | 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. | Function([fieldNames: string[]], [options: object], callback: Function(errors, values)) |
+| 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` |
 | getFieldError | Get the error of a field. | Function(name) |
 | isFieldValidating | Check if the specified field is being validated. | Function(name) |
diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md
index b27f05416..99293144b 100644
--- a/components/form/index.zh-CN.md
+++ b/components/form/index.zh-CN.md
@@ -68,7 +68,7 @@ CustomizedForm = Form.create({})(CustomizedForm);
 | 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 | Function([fieldNames: string[]], [options: object], callback: Function(errors, values)) |
+| validateFields | 校验并获取一组输入域的值与 Error，若 fieldNames 参数为空，则校验全部组件 | Function([fieldNames: string[]], [options: object], callback: Function(errors, values)) |
 | validateFieldsAndScroll | 与 `validateFields` 相似，但校验完后，如果校验不通过的菜单域不在可见范围内，则自动滚动进可见范围 | 参考 `validateFields` |
 | getFieldError | 获取某个输入控件的 Error | Function(name) |
 | isFieldValidating | 判断一个输入控件是否在校验状态 | Function(name) |

From 0d2b8989bc79c4f508c197ce4ecd70ecff271550 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Fri, 27 Jan 2017 11:32:03 +0800
Subject: [PATCH 47/51] chore: update scripts

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5c656c3eb..a1fb7707f 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,9 @@
     "lint:es": "eslint tests site scripts components ./.eslintrc.js ./webpack.config.js --ext '.js,.jsx'",
     "lint:demo": "cross-env RUN_ENV=DEMO eslint components/*/demo/*.md --ext '.md'",
     "lesshint": "lesshint components -r scripts/lesshint-report.js",
-    "eslint-fix": "eslint --fix tests site scripts components ./.eslintrc.js ./webpack.config.js --ext '.js,.jsx' && eslint-tinker ./components/*/demo/*.md",
+    "eslint-fix": "npm run eslint-fix:code && npm run eslint-fix:demo",
+    "eslint-fix:code": "eslint --fix tests site scripts components ./.eslintrc.js ./webpack.config.js --ext '.js,.jsx'",
+    "eslint-fix:demo": "eslint-tinker ./components/*/demo/*.md",
     "dist": "antd-tools run dist",
     "compile": "antd-tools run compile",
     "start": "bisheng start -c ./site/bisheng.config.js --no-livereload",

From 29081542e6aedb53a5a4486a008fd30851f642e6 Mon Sep 17 00:00:00 2001
From: Penghan Wang <WPH95@users.noreply.github.com>
Date: Fri, 27 Jan 2017 13:54:15 +0800
Subject: [PATCH 48/51] doc: fix checkbox description error (#4731)

---
 components/checkbox/index.zh-CN.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/checkbox/index.zh-CN.md b/components/checkbox/index.zh-CN.md
index 6e03f9aea..5346c6925 100644
--- a/components/checkbox/index.zh-CN.md
+++ b/components/checkbox/index.zh-CN.md
@@ -27,7 +27,7 @@ title: Checkbox
 
 | 参数      | 说明             | 类型      | 默认值  |
 |----------|------------------|----------|--------|
-| defaultValue | 默认选中的选项 | string | [] |
-| value | 指定选中的选项| string | [] |
-| options  | 指定可选项 | string | [] |
+| defaultValue | 默认选中的选项 | string[] | [] |
+| value | 指定选中的选项| string[] | [] |
+| options  | 指定可选项 | string[] | [] |
 | onChange | 变化时回调函数 | Function(checkedValue) | - |

From 1a3ea43ebe2d3e262521a9f8febc61b42db86ea5 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 27 Jan 2017 14:27:18 +0800
Subject: [PATCH 49/51] Fix style prop of spin

---
 components/spin/__tests__/index.test.js | 15 +++++++++++++++
 components/spin/index.tsx               |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 components/spin/__tests__/index.test.js

diff --git a/components/spin/__tests__/index.test.js b/components/spin/__tests__/index.test.js
new file mode 100644
index 000000000..a1dd16757
--- /dev/null
+++ b/components/spin/__tests__/index.test.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import Spin from '..';
+
+describe('Spin', () => {
+  it('should only affect the spin element when set style to a nested <Spin>xx</Spin>', () => {
+    const wrapper = shallow(
+      <Spin style={{ background: 'red' }}>
+        <div>content</div>
+      </Spin>
+    );
+    expect(wrapper.find('.ant-spin-nested-loading').at(0).prop('style')).toBe(null);
+    expect(wrapper.find('.ant-spin').at(0).prop('style').background).toBe('red');
+  });
+});
diff --git a/components/spin/index.tsx b/components/spin/index.tsx
index 697bb854b..88e3e0e78 100644
--- a/components/spin/index.tsx
+++ b/components/spin/index.tsx
@@ -119,6 +119,7 @@ export default class Spin extends React.Component<SpinProps, any> {
           {...divProps}
           component="div"
           className={`${prefixCls}-nested-loading`}
+          style={null}
           transitionName="fade"
         >
           {spinning && <div key="loading">{spinElement}</div>}

From 85086f14b6616ba5afc069dc5720fabfdf9a0e66 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Fri, 27 Jan 2017 17:08:05 +0800
Subject: [PATCH 50/51] Using a special static property for type detecting
 (#4673)

Related issue: #4655
---
 .eslintrc.js                                  |  2 +-
 components/breadcrumb/Breadcrumb.tsx          |  4 ++--
 components/breadcrumb/BreadcrumbItem.tsx      |  2 ++
 .../breadcrumb/__tests__/Breadcrumb.test.js   | 19 +++++++++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 components/breadcrumb/__tests__/Breadcrumb.test.js

diff --git a/.eslintrc.js b/.eslintrc.js
index ae73dba07..5a7680725 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,7 +3,7 @@ const eslintrc = {
   env: {
     browser: true,
     node: true,
-    mocha: true,
+    jasmine: true,
     jest: true,
     es6: true,
   },
diff --git a/components/breadcrumb/Breadcrumb.tsx b/components/breadcrumb/Breadcrumb.tsx
index ef1e5a64d..e19e72fec 100755
--- a/components/breadcrumb/Breadcrumb.tsx
+++ b/components/breadcrumb/Breadcrumb.tsx
@@ -89,8 +89,8 @@ export default class Breadcrumb extends React.Component<BreadcrumbProps, any> {
     } else if (children) {
       crumbs = React.Children.map(children, (element: any, index) => {
         warning(
-          element.type === BreadcrumbItem,
-          ' `BreadcrumbItem` is required as the wrapper of children element. '
+          element && element.type.__ANT_BREADCRUMB_ITEM,
+          'Breadcrumb only accetps Breadcrumb.Item as it\'s children'
         );
         return cloneElement(element, {
           separator,
diff --git a/components/breadcrumb/BreadcrumbItem.tsx b/components/breadcrumb/BreadcrumbItem.tsx
index 02b4c4f0d..b1ec47ebd 100644
--- a/components/breadcrumb/BreadcrumbItem.tsx
+++ b/components/breadcrumb/BreadcrumbItem.tsx
@@ -8,6 +8,8 @@ export interface BreadcrumbItemProps {
 }
 
 export default class BreadcrumbItem extends React.Component<BreadcrumbItemProps, any> {
+  static __ANT_BREADCRUMB_ITEM = true;
+
   static defaultProps = {
     prefixCls: 'ant-breadcrumb',
     separator: '/',
diff --git a/components/breadcrumb/__tests__/Breadcrumb.test.js b/components/breadcrumb/__tests__/Breadcrumb.test.js
new file mode 100644
index 000000000..a1e48d54c
--- /dev/null
+++ b/components/breadcrumb/__tests__/Breadcrumb.test.js
@@ -0,0 +1,19 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import Breadcrumb from '../Breadcrumb';
+
+describe('Breadcrumb', () => {
+  it('warns on non-Breadcrumb.Item children', () => {
+    const MyCom = () => <div>foo</div>;
+    spyOn(console, 'error');
+    mount(
+      <Breadcrumb>
+        <MyCom />
+      </Breadcrumb>
+    );
+    expect(console.error.calls.count()).toBe(1);
+    expect(console.error.calls.argsFor(0)[0]).toContain(
+      'Breadcrumb only accetps Breadcrumb.Item as it\'s children'
+    );
+  });
+});

From f2e19c16bec844f8a09b1302f11ac747289e077f Mon Sep 17 00:00:00 2001
From: paranoidjk <hust2012jiangkai@gmail.com>
Date: Fri, 27 Jan 2017 17:08:12 +0800
Subject: [PATCH 51/51] fix(transfer): checkall should response to filter
 result; fix #4654 (#4665)

---
 components/transfer/__tests__/index.test.js | 110 ++++++++++++++++++++
 components/transfer/item.tsx                |  28 +----
 components/transfer/list.tsx                |  44 ++++++--
 3 files changed, 149 insertions(+), 33 deletions(-)

diff --git a/components/transfer/__tests__/index.test.js b/components/transfer/__tests__/index.test.js
index e4a4a72e2..a4963f2ab 100644
--- a/components/transfer/__tests__/index.test.js
+++ b/components/transfer/__tests__/index.test.js
@@ -1,3 +1,4 @@
+/* eslint no-use-before-define: "off" */
 import React from 'react';
 import { render, mount } from 'enzyme';
 import { renderToJson } from 'enzyme-to-json';
@@ -26,6 +27,50 @@ const listCommonProps = {
   lazy: false,
 };
 
+const searchTransferProps = {
+  dataSource: [
+    {
+      key: '0',
+      title: 'content1',
+      description: 'description of content1',
+      chosen: false,
+    },
+    {
+      key: '1',
+      title: 'content2',
+      description: 'description of content2',
+      chosen: false,
+    },
+    {
+      key: '2',
+      title: 'content3',
+      description: 'description of content3',
+      chosen: false,
+    },
+    {
+      key: '3',
+      title: 'content4',
+      description: 'description of content4',
+      chosen: false,
+    },
+    {
+      key: '4',
+      title: 'content5',
+      description: 'description of content5',
+      chosen: false,
+    },
+    {
+      key: '5',
+      title: 'content6',
+      description: 'description of content6',
+      chosen: false,
+    },
+  ],
+  selectedKeys: [],
+  targetKeys: ['3', '4'],
+  lazy: false,
+};
+
 describe('Transfer', () => {
   it('should render correctly', () => {
     const wrapper = render(<Transfer {...listCommonProps} />);
@@ -82,4 +127,69 @@ describe('Transfer', () => {
     wrapper.find(TransferSearch).at(0).find('input').simulate('change', { target: { value: 'a' } });
     expect(wrapper.find(TransferList).at(0).find(TransferItem).find(Checkbox)).toHaveLength(1);
   });
+
+  it('should display the correct count of items when filter by input', () => {
+    const filterOption = (inputValue, option) => option.description.indexOf(inputValue) > -1;
+    const renderFunc = item => item.title;
+    const wrapper = mount(
+      <Transfer
+        {...searchTransferProps}
+        showSearch
+        filterOption={filterOption}
+        render={renderFunc}
+      />
+    );
+    wrapper.find(TransferSearch).at(0).find('input').simulate('change', { target: { value: 'content2' } });
+    expect(wrapper.find(TransferList).at(0).find('.ant-transfer-list-header-selected > span').at(0)
+      .first()
+      .text()
+      .trim()).toEqual('1');
+  });
+
+  it('should just check the filtered item when click on check all after search by input', () => {
+    const filterOption = (inputValue, option) => option.description.indexOf(inputValue) > -1;
+    const renderFunc = item => item.title;
+    const handleSelectChange = jest.fn();
+    const wrapper = mount(
+      <Transfer
+        {...searchTransferProps}
+        showSearch
+        filterOption={filterOption}
+        render={renderFunc}
+        onSelectChange={handleSelectChange}
+      />
+    );
+    wrapper.find(TransferSearch).at(0).find('input')
+      .simulate('change', { target: { value: 'content2' } });
+    wrapper.find(TransferList).at(0).find('.ant-transfer-list-header input[type="checkbox"]').filterWhere(n => !n.prop('checked'))
+      .simulate('change');
+    expect(handleSelectChange).toHaveBeenCalledWith(['1'], []);
+  });
+
+  it('should transfer just the filtered item after search by input', () => {
+    const filterOption = (inputValue, option) => option.description.indexOf(inputValue) > -1;
+    const renderFunc = item => item.title;
+    const handleChange = jest.fn();
+    const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
+      wrapper.setProps({
+        selectedKeys: [...sourceSelectedKeys, ...targetSelectedKeys],
+      });
+    };
+    const wrapper = mount(
+      <Transfer
+        {...searchTransferProps}
+        showSearch
+        filterOption={filterOption}
+        render={renderFunc}
+        onSelectChange={handleSelectChange}
+        onChange={handleChange}
+      />
+    );
+    wrapper.find(TransferSearch).at(0).find('input')
+      .simulate('change', { target: { value: 'content2' } });
+    wrapper.find(TransferList).at(0).find('.ant-transfer-list-header input[type="checkbox"]').filterWhere(n => !n.prop('checked'))
+      .simulate('change');
+    wrapper.find(TransferOperation).find(Button).at(1).simulate('click');
+    expect(handleChange).toHaveBeenCalledWith(['1', '3', '4'], 'right', ['1']);
+  });
 });
diff --git a/components/transfer/item.tsx b/components/transfer/item.tsx
index 4798e94f7..b5eb7040a 100644
--- a/components/transfer/item.tsx
+++ b/components/transfer/item.tsx
@@ -5,38 +5,12 @@ import assign from 'object-assign';
 import Lazyload from 'react-lazy-load';
 import Checkbox from '../checkbox';
 
-function isRenderResultPlainObject(result) {
-  return result && !React.isValidElement(result) &&
-    Object.prototype.toString.call(result) === '[object Object]';
-}
-
 export default class Item extends React.Component<any, any> {
   shouldComponentUpdate(...args) {
     return PureRenderMixin.shouldComponentUpdate.apply(this, args);
   }
-  matchFilter = (text) => {
-    const { filter, filterOption, item } = this.props;
-    if (filterOption) {
-      return filterOption(filter, item);
-    }
-    return text.indexOf(filter) >= 0;
-  }
   render() {
-    const { render, filter, item, lazy, checked, prefixCls, onClick } = this.props;
-    const renderResult = render(item);
-    let renderedText;
-    let renderedEl;
-    if (isRenderResultPlainObject(renderResult)) {
-      renderedText = renderResult.value;
-      renderedEl = renderResult.label;
-    } else {
-      renderedText = renderResult;
-      renderedEl = renderResult;
-    }
-
-    if (filter && filter.trim() && !this.matchFilter(renderedText)) {
-      return null;
-    }
+    const { renderedText, renderedEl, item, lazy, checked, prefixCls, onClick } = this.props;
 
     const className = classNames({
       [`${prefixCls}-content-item`]: true,
diff --git a/components/transfer/list.tsx b/components/transfer/list.tsx
index fff525c37..ee32d6573 100644
--- a/components/transfer/list.tsx
+++ b/components/transfer/list.tsx
@@ -11,6 +11,11 @@ import Checkbox from '../checkbox';
 function noop() {
 }
 
+function isRenderResultPlainObject(result) {
+  return result && !React.isValidElement(result) &&
+    Object.prototype.toString.call(result) === '[object Object]';
+}
+
 export interface TransferListProps {
   prefixCls: string;
   dataSource: TransferItem[];
@@ -103,9 +108,27 @@ export default class TransferList extends React.Component<TransferListProps, any
     this.props.handleClear();
   }
 
+  matchFilter = (text, item) => {
+    const { filter, filterOption } = this.props;
+    if (filterOption) {
+      return filterOption(filter, item);
+    }
+    return text.indexOf(filter) >= 0;
+  }
+
+  renderItem = (item) => {
+    const { render = noop } = this.props;
+    const renderResult = render(item);
+    const isRenderResultPlain = isRenderResultPlainObject(renderResult);
+    return {
+      renderedText: isRenderResultPlain ? renderResult.value : renderResult,
+      renderedEl: isRenderResultPlain ? renderResult.label : renderResult,
+    };
+  }
+
   render() {
-    const { prefixCls, dataSource, titleText, filter, checkedKeys, lazy, filterOption,
-            body = noop, footer = noop, showSearch, render = noop, style } = this.props;
+    const { prefixCls, dataSource, titleText, checkedKeys, lazy,
+            body = noop, footer = noop, showSearch, style, filter } = this.props;
 
     let { searchPlaceholder, notFoundContent } = this.props;
 
@@ -118,20 +141,29 @@ export default class TransferList extends React.Component<TransferListProps, any
     });
 
     const filteredDataSource: TransferItem[] = [];
+    const totalDataSource: TransferItem[] = [];
 
     const showItems = dataSource.map((item) => {
+      const { renderedText, renderedEl } = this.renderItem(item);
+      if (filter && filter.trim() && !this.matchFilter(renderedText, item)) {
+        return null;
+      }
+
+      // all show items
+      totalDataSource.push(item);
       if (!item.disabled) {
+         // response to checkAll items
         filteredDataSource.push(item);
       }
+
       const checked = checkedKeys.indexOf(item.key) >= 0;
       return (
         <Item
           key={item.key}
           item={item}
           lazy={lazy}
-          render={render}
-          filter={filter}
-          filterOption={filterOption}
+          renderedText={renderedText}
+          renderedEl={renderedEl}
           checked={checked}
           prefixCls={prefixCls}
           onClick={this.handleSelect}
@@ -200,7 +232,7 @@ export default class TransferList extends React.Component<TransferListProps, any
           {checkAllCheckbox}
           <span className={`${prefixCls}-header-selected`}>
             <span>
-              {(checkedKeys.length > 0 ? `${checkedKeys.length}/` : '') + dataSource.length} {unit}
+              {(checkedKeys.length > 0 ? `${checkedKeys.length}/` : '') + totalDataSource.length} {unit}
             </span>
             <span className={`${prefixCls}-header-title`}>
               {titleText}