CHANGELOG - v2.6

add attribute compact for InputGroup (#4309 )
* add attribute `compact` for InputGroup * improve
2026-02-09 10:59:19 +08:00 · 2017-01-02 02:14:40 +08:00 · 2017-01-02 00:12:41 +08:00 · 2017-01-01 22:20:06 +08:00 · 2017-01-01 17:39:27 +08:00 · 2017-01-01 17:20:08 +08:00
643 changed files with 44713 additions and 6650 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,6 @@
 {
-  "presets": ["es2015", "react", "stage-0"]
+  "presets": ["es2015", "react", "stage-0"],
+  "plugins": [
+    "add-module-exports"
+  ]
 }
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -27,6 +27,7 @@ const eslintrc = {
    'react/prop-types': 0,
    'react/jsx-first-prop-new-line': 0,
    'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx', '.md'] }],
+    'import/extensions': 0,
    'import/no-unresolved': 0,
    'import/no-extraneous-dependencies': 0,
    'no-param-reassign': 0,
@@ -39,6 +40,7 @@ const eslintrc = {
    'jsx-a11y/no-static-element-interactions': 0,
    'jsx-a11y/anchor-has-content': 0,
    'react/no-danger': 0,
+    'comma-dangle': ['error', 'always-multiline'],
  },
 };

--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -19,7 +19,7 @@ Tips: choose the corresponding documentation with versions selector which in the

 ### 2. Make sure that your question is about Ant Design, not React

-Someone may think all of the questions that he/she meets in developing are about Ant Design, but it's not true. So, please read [React's documentaion](http://facebook.github.io/react/docs/getting-started.html) or just Google(not Baidu, seriously) your questions with keywork *React* first. If you are sure that your question is about Ant Design, go ahead.
+Someone may think all of the questions that he/she meets in developing are about Ant Design, but it's not true. So, please read [React's documentation](http://facebook.github.io/react/docs/getting-started.html) or just Google (not Baidu, seriously) your questions with keyword *React* first. If you are sure that your question is about Ant Design, go ahead.

 ### 3. Read the FAQ and search the issues list of Ant Design

@@ -48,9 +48,11 @@ If you believe that Ant Design should provide some features, but it does not. Yo

 ## Tips about Pull Request

+**Working on your first Pull Request?** You can learn how from this *free* series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)
+
 It's welcomed to pull request. And there are some tips about that:

-1. It is a good habit to create a feature request issue to disscuss whether the feature is necessary before you implement it. However, it's unnecessary to create an issue to claim that you found a typo or improved the readability of documentaion, just create a pull request.
+1. It is a good habit to create a feature request issue to discuss whether the feature is necessary before you implement it. However, it's unnecessary to create an issue to claim that you found a typo or improved the readability of documentation, just create a pull request.
 1. Run `npm run lint` and fix those errors before committing in order to keep consistent code style.
 1. Rebase before creating a PR to keep commit history clear.
 1. Add some descriptions and refer relative issues for you PR.
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ config/base.yaml
 components/**/*.js
 components/**/*.jsx
 /.vscode/
+/coverage
+!components/**/__tests__/*
+yarn.lock
--- a/.jest.node.json
+++ b/.jest.node.json
@@ -0,0 +1,18 @@
+{
+  "setupFiles": [
+    "tests/setup.js"
+  ],
+  "moduleFileExtensions": [
+    "ts",
+    "tsx",
+    "js",
+    "md"
+  ],
+  "transform": {
+    "\\.tsx?$": "node_modules/typescript-babel-jest",
+    "\\.js$": "node_modules/babel-jest",
+    "\\.md$": "node_modules/antd-demo-jest"
+  },
+  "testRegex": "demo\\.test\\.js$",
+  "testEnvironment": "node"
+}
--- a/.lesshintrc
+++ b/.lesshintrc
@@ -12,10 +12,11 @@
  "newlineAfterBlock": false,
  "maxCharPerLine": false,
  "excludedFiles": [
-    "components/layout/style/mixin.less",
+    "components/grid/style/mixin.less",
    "components/style/core/base.less",
    "components/style/core/iconfont.less",
    "components/style/core/normalize.less",
-    "components/style/mixins/compatibility.less"
+    "components/style/mixins/compatibility.less",
+    "components/style/color/*"
  ]
 }
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,6 @@ language: node_js

 node_js:
  - "6"
+
+after_script:
+  - cat ./coverage/lcov.info | node_modules/coveralls/bin/coveralls.js
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,11 +1,17 @@
+Albert Zheng <lisong.zheng@gmail.com>
 Andrew Murray <radarhere@gmail.com>
+Andrey G <plandem@gmail.com>
 Benjy Cui <benjytrys@gmail.com>
 Bernie <bernie.wangbj@gmail.com>
 Bozhao <yubz86@gmail.com>
 Bruce Mitchener <bruce.mitchener@gmail.com>
 Bruno Maia <bruno.mm.maia@gmail.com>
+C <4019980@qq.com>
 Cam Song <neosoyn@gmail.com>
+Catalin Miron <mironcatalin@gmail.com>
 Cee Cirno <i@cee.moe>
+Cody Chan <int64ago@gmail.com>
+Danny Hoower Antonio Viasus Avila <danjavia@gmail.com>
 Daqi Song <dqaria@gmail.com>
 DengYun <tdzl2003@gmail.com>
 Eddie Xie <oeddyo@gmail.com>
@@ -16,19 +22,25 @@ Gray Choi <gray.choi.1988@gmail.com>
 Guan Hao <raptium@gmail.com>
 Haibin Yu <haibin.yu@oceanwing.com>
 Hanai <ihanai1991@gmail.com>
+ImJoeHs <865439601@qq.com>
 Infinity <305870677@qq.com>
 James <james@schoolshape.com>
 Jerry Bendy <jerry@icewingcc.com>
+Junyu Zhan <irrigator@yeah.net>
 KgTong <kgtong1992@gmail.com>
 Leon Shi <superRaytin@163.com>
 Leon Shi <superRaytin@gmail.com>
 Liu Yang <zation1@gmail.com>
+LongYinan <lynweklm@gmail.com>
 MG12 <wuzhao.mail@gmail.com>
 Ma Tianxiao <matx2215@outlook.com>
 Marius Ileana <visvadw@gmail.com>
 Marshall Chen <Juniors.fei@gmail.com>
+Meck <yesmeck@gmail.com>
 Mr.Tone <vector@malubei.com>
+Nathan Wells <nwwells@gmail.com>
 Neverland <chenjiahan@buaa.edu.cn>
+Nimo <nimo.jser@gmail.com>
 Pyiner <lijiuyang1992@gmail.com>
 Qiaosen Huang <joesonw@gmail.com>
 RaoHai <surgesoft@gmail.com>
@@ -49,10 +61,12 @@ bang <sqibang@gmail.com>
 bang88 <sqibang@gmail.com>
 chencheng (云谦) <sorrycc@gmail.com>
 ddcat1115 <ddcat1115@gmail.com>
+denzw <denzw@21cn.com>
 detailyang <detailyang@gmail.com>
 devqin <devqin@gmail.com>
 djorkaeff <djorkae55@gmail.com>
 ecofe <150641329@qq.com>
+edgji <j.edgji@gmail.com>
 elrrrrrrr <elrrrrrrr@gmail.com>
 ezpub <ez.foro@gmail.com>
 feng zhi hao <fzhihao@outlook.com>
@@ -63,15 +77,18 @@ hi-caicai <hi@cai-cai.me>
 ioldfish <fish.wangl@gmail.com>
 jasonslyvia <jasonslyvia@gmail.com>
 jiang <155259966@qq.com>
+jinouwuque <ee2win@gmail.com>
 kagawagao <kingsongao1221@gmail.com>
 kaifei <150641329@qq.com>
 kasinooya <kasinooya@gmail.com>
+kayw <kayw@outlook.com>
 leon.shi <superRaytin@163.com>
 lgmcolin <gengmin.lgm@gmail.com>
 lgmcolin <lgmcolin@gmail.com>
 lixiaochou077 <qi.liqi07@gmail.com>
 lizhaocai <lzc09008@gmail.com>
 muzuiget <muzuiget@gmail.com>
+parlop <parlop@gmail.com>
 pizn <pizner@gmail.com>
 plandem <plandem@gmail.com>
 popomore <sakura9515@gmail.com>
@@ -88,6 +105,7 @@ tom <caolvchong@gmail.com>
 ustccjw <317713370@qq.com>
 warmhug <hualei5280@gmail.com>
 wizawu <wizawu@gmail.com>
+xiaofan2406 <xiaofan2406@gmail.com>
 yeliex <yeliex@yeliex.com>
 yiminghe <yiminghe@gmail.com>
 yubozhao <yubz86@gmail.com>
@@ -99,9 +117,15 @@ zhaocai <lzc09008@gmail.com>
 zhujun24 <zhujun87654321@gmail.com>
 zilong <jzlxiaohei@163.com>
 zinkey <yaya@uloveit.com.cn>
+zuiidea <zuiiidea@gmail.com>
 偏右 <afc163@gmail.com>
 逸达 <dqaria@gmail.com>
+蔡伦 <sliuqin@gmail.com>
 陆离 <surgesoft@gmail.com>
 低位 <zhujun87654321@gmail.com>
+广彬-梁 <326741518@qq.com>
 闲耘™ <hotoo.cn@gmail.com>
+吕立青 <jimmy.jinglv@gmail.com>
+马斯特 <sd4399340@126.com>
+马金花儿 <o.o@mug.dog>
 白羊座小葛 <abeyuhang@gmail.com>
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,5 @@
 ---
-order: 3
+order: 6
 title: Change Log
 toc: false
 timeline: true
@@ -9,6 +9,220 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi

 ---

+## 2.6.0
+
+`2017-1-2`
+
+- Brand new color system. [pull/4426](https://github.com/ant-design/ant-design/pull/4426)
+  - Brand new color palattes.
+  - Brand new color algorithm replacing the tint/shade system.
+  - Change default font color.
+- Add Grid playground demo. [commit/ee17ab](https://github.com/ant-design/ant-design/commit/ee17abfa9d0362c6f9baab4a9a09e57574583246)
+- Add Layout component. [#3534](https://github.com/ant-design/ant-design/issues/3534)
+- Input
+  - Support prefix and suffix. [#4226](https://github.com/ant-design/ant-design/issues/4226) [@ystarlongzi](https://github.com/ystarlongzi)
+  - InputGroup support compact display mode. [pull/4309](https://github.com/ant-design/ant-design/pull/4309)
+- Spin support delayed display. [#4306](https://github.com/ant-design/ant-design/issues/4306)
+- Fix the dislocation problem of Pagination in low resolution. [#4349](https://github.com/ant-design/ant-design/issues/4349)
+- Fix wrapping display of Dropdown.Button. [pull/4355](https://github.com/ant-design/ant-design/pull/4355) [@Morhaus](https://github.com/Morhaus)
+- Fix wrong background color of Cascader in disabled status. [#4434](https://github.com/ant-design/ant-design/issues/4434)
+- Fix MonthPicker[monthCellContentRender] doesn't work, and some documentation errors. [#4394](https://github.com/ant-design/ant-design/issues/4394)
+- Fix the extra border of ButtonGroup. [#4382](https://github.com/ant-design/ant-design/pull/4382) [@ystarlongzi](https://github.com/ystarlongzi)
+- Fix wrong background color of the Submenu(horizontal mode). [#4414](https://github.com/ant-design/ant-design/issues/4414)
+- Fix overlapping graphics with Select/Cascader in Form.Item with hasFeedback. [#4431](https://github.com/ant-design/ant-design/issues/4431) [@JesperWe](https://github.com/JesperWe)
+- Reset border-radius of the first row in Table without header. [#4373](https://github.com/ant-design/ant-design/issues/4373)
+- Improve the drag performance of Tree. [#4371](https://github.com/ant-design/ant-design/issues/4371)
+- Improve official website and documentation, fix some bugs.
+- Update rc-form to support nested style of getFieldDecorator[id].
+
+## 2.5.3
+
+`2016-12-24` 🎄🎄🎄
+
+* Supports TypeScript@2.1. [#4208](https://github.com/ant-design/ant-design/issues/4208)
+* Fix style issue resulting in nested Tabs. [#4317](https://github.com/ant-design/ant-design/issues/4317)
+* Fix `onChange` callback issue resulting in Radio. [#4242](https://github.com/ant-design/ant-design/issues/4242) [@ystarlongzi](https://github.com/ystarlongzi)
+* Fix a FormItem mis-aligin bug。 [#4271](https://github.com/ant-design/ant-design/issues/4271)
+* Fix background issue resulting in selected element of veritcal Menu.[#4253](https://github.com/ant-design/ant-design/issues/4253)
+* Improve arguments type of `onVisibleChange` callback of  Dropdown.[#4236](https://github.com/ant-design/ant-design/issues/4236) [@bang88](https://github.com/bang88)
+* Improve first argument type of `onChange` callback of Cascader.[#4231](https://github.com/ant-design/ant-design/issues/4231) [@bang88](https://github.com/bang88)
+* Improve default width of Datepicker[showTime]. [b912f1c](https://github.com/ant-design/ant-design/commit/b912f1cea6f470c16b8dd90554883460161cef47)
+
+## 2.5.2
+
+`2016-12-10`
+
+* Improve selected item style of Menu.
+* Fix issue resulting in Mention not responses `onFocus` and `onBlur`. [#4163](https://github.com/ant-design/ant-design/issues/4163)
+* Fix issue resulting in there is a redundant shadow between `disabled` and `checked` Radio. [#4114](https://github.com/ant-design/ant-design/pull/4114) @jdz321
+* Fix error when setting Momment `defaultValue` or `value` on RangePicker, TimePicker, Calendar. [#4147](https://github.com/ant-design/ant-design/issues/4147)
+* Fix issue resulting in Affix disappears when it's uesed in animated Tabs. [#3943](https://github.com/ant-design/ant-design/issues/3943)
+* Fix issue resulting in Cascader passes different `selectedOptions` to `onChange` when manually selecting and selecting by search. [#4096](https://github.com/ant-design/ant-design/issues/4096)
+* Fix issue resulting in Tabs get offset, when too many tabs are opening. [#3637](https://github.com/ant-design/ant-design/issues/3637)
+* Table
+  * Align text of grouped parent header to center.
+  * Fix issue resulting in `filterDropdownVisible` can't be set correctly. [#4162](https://github.com/ant-design/ant-design/issues/4162)
+
+## 2.5.1
+
+`2016-12-03`
+
+* Improve website experience on mobile devices.
+* Add some migrate warnings for `1.x` to `2.x`.
+* ToolTip, Popover, Popconfirm support to wrap text node and multiple node directly now. [#3924](https://github.com/ant-design/ant-design/issues/3924)
+* Anchor
+  * Fix current position bug when scroll fastly. [#4053](https://github.com/ant-design/ant-design/issues/4053)
+  * Fix a bug of parent component ref node is undefined. [#4037](https://github.com/ant-design/ant-design/issues/4037)
+* Table
+  * Fix a selection problem when setting defaultChecked in rowSelection. [#4020](https://github.com/ant-design/ant-design/issues/4020)
+  * Fix grouping column title cannot work with filters. [#4099](https://github.com/ant-design/ant-design/issues/4099)
+* Fix a misplace bug when using Popover over `Input[type="textarea"]`. [#4092](https://github.com/ant-design/ant-design/issues/4092)
+* Fix Popconfirm `visible` is not-working problem. [#4068](https://github.com/ant-design/ant-design/issues/4068)
+* Fix TimePicker can not override width by `style.width`.
+* Unify Steps icon size. [#3817](https://github.com/ant-design/ant-design/issues/3817)
+* Fix style details of Form, Button, Slider, Table.
+
+## 2.5.0
+
+`2016-11-25`
+
+* Change the default theme to Alipay style and improve lots of style details.
+* Supports server-side rendering. (`Mention` will throw warning for [draft-js](https://github.com/facebook/draft-js/issues/385)' issue)
+* Introduce [Jest Snapshot](https://facebook.github.io/jest/docs/tutorial-react.html#snapshot-testing) to test the structure of components and SSR issues.
+* Improve official website and documentation.
+* Add [document](https://ant.design/docs/react/customize-theme) for customizing theme.
+* Add [Sketch template files](https://ant.design/docs/resource/download).
+* `LocaleProvider` supports Brazilian. [#4004](https://github.com/ant-design/ant-design/pull/4004) [@nathantn](https://github.com/nathantn)
+* DatePicker
+  * DatePicker can determine whether to show "Today" button. [commit](https://github.com/ant-design/ant-design/commit/bbef274aae169d142e3e7e3ea0af922d48e6dd64)
+  * RangePicker can set presetted ranges. [demo](https://ant.design/components/date-picker/#components-date-picker-demo-presetted-ranges)
+  * Fix "Now" button doesn't work while `DatePicker[showTime]` is set. [#3748](https://github.com/ant-design/ant-design/issues/3748)
+  * Fix `RangePicker[format]` should work. [#3808](https://github.com/ant-design/ant-design/issues/3808)
+* Add and update some icons. [#3977](https://github.com/ant-design/ant-design/pull/3977)
+* New component `Input.Search`. [demo](https://ant.design/components/input/#components-input-demo-search-input)
+* Mention onSelect event will get complete record. [#3867](https://github.com/ant-design/ant-design/issues/3867)
+* Pagination can get current range. [demo](https://ant.design/components/pagination/#components-pagination-demo-total)
+* Table
+  * We can control the visible of customized `filterDropdown`. [demo](https://ant.design/components/table/#components-table-demo-custom-filter-panel)
+  * Supports JSX-style columns. [demo](https://ant.design/components/table/#components-table-demo-jsx)
+  * Can listen the click event of table cell. [#3774](https://github.com/ant-design/ant-design/issues/3774)
+  * Fix border radius of head of border-less table.
+  * Fix that height of title and footer don't follow `Table[size]`. [commit](https://github.com/ant-design/ant-design/commit/9e6439b06cd099ab384a4a2f026f0def6e12bf23)
+  * Fix issue with selected status. [#3900](https://github.com/ant-design/ant-design/issues/3900)
+* Upload
+  * Fix that children could not be `null`.
+  * Fix logic of preview. [commit](https://github.com/ant-design/ant-design/commit/e552880c32aaa3f5b0fb09a5e1fb7454c24d5378)
+* Fix `z-index` of Badge. [#3898](https://github.com/ant-design/ant-design/issues/3898)
+* Fix alignment of multi-line Checkbox. [#3971](https://github.com/ant-design/ant-design/issues/3971) [@flashback313](https://github.com/flashback313)
+* Fix alignment of InputNumber while using with other form controls. [#3866(comment)](https://github.com/ant-design/ant-design/issues/3866#issuecomment-261148256)
+* Fix style of `Menu.Divider`. [#3813](https://github.com/ant-design/ant-design/issues/3813)
+* Fix that Popover should support Checkbox and Radio as children. [#3455](https://github.com/ant-design/ant-design/issues/3455)
+* Fix height of `Select[combobox]`. [#3855](https://github.com/ant-design/ant-design/issues/3855)
+* Fix style of actived Switch. [#3838](https://github.com/ant-design/ant-design/issues/3838)
+* Fix that Transfer doesn't show "Not Found" while there is no search result. [#3996](https://github.com/ant-design/ant-design/issues/3996)
+* Fix style of placeholder of TreeSelect. [#3841](https://github.com/ant-design/ant-design/issues/3841)
+* Fix compile errors in TypeScript. [#3969](https://github.com/ant-design/ant-design/pull/3969) [@AlbertZheng](https://github.com/AlbertZheng)
+* Fix that feedback icon should not affect users' operation. [#3891](https://github.com/ant-design/ant-design/issues/3891)
+
+## 2.4.3
+
+`2016-11-17`
+
+* Fix errors in `Anchor` about querySelector, and make some experience Optimization .[#3832](https://github.com/ant-design/ant-design/issues/3832) [#3844](https://github.com/ant-design/ant-design/issues/3844)
+
+## 2.4.2
+
+`2016-11-13`
+
+* Fix `Dropdown.Button` cannot popup menu.[#3815](https://github.com/ant-design/ant-design/issues/3815)
+
+## 2.4.1
+
+`2016-11-11`
+
+* Fix `2.4.0` missing index files.
+
+## 2.4.0
+
+`2016-11-11`
+
+* Adjust components structure.
+* New [Anchor](https://ant.design/components/anchor) Component.
+* Fix less variables `@font-size-base` and `@text-color`, add `@font-size-lg` `@text-color-secondary`.
+* Add new props `selectedKeys` for `Transfer` component [#3729]. (https://github.com/ant-design/ant-design/issues/3729)
+* Add `Tag` selected status.
+* Fix `Dropdown.Button` not support `visible` and `onVisibleChange`. [#3779](https://github.com/ant-design/ant-design/issues/3779)
+* Fix `Now` button of `DatePicker[showTime]`. [#3748](https://github.com/ant-design/ant-design/issues/3748)
+* Fix style of `Steps` in vertical mode. [#3760](https://github.com/ant-design/ant-design/issues/3760)
+* Fix style compatibility of `Spin` in IE10+.[#3755](https://github.com/ant-design/ant-design/issues/3755)
+* Fix default style of `Carousel` component.
+* Fix focus logic of `Mention` component. [#3801](https://github.com/ant-design/ant-design/issues/3801)
+* Fix animate bug of `Progress` component. [#3784](https://github.com/ant-design/ant-design/issues/3784)
+* Fix focus bug of `Select` component. [#3778](https://github.com/ant-design/ant-design/issues/3778)
+* Fix `TimePicker` not support `format="HH"` bug. [#3793](https://github.com/ant-design/ant-design/issues/3793)
+* Fix `Input` `suffix` mouse event responsive area. [#3714](https://github.com/ant-design/ant-design/issues/3714)
+* Improve performance of `Table` selection. [#3757](https://github.com/ant-design/ant-design/pull/3757)
+* Improve Carousel default UI style.
+* Improve style of `Checkbox` and `Radio`. [#3590](https://github.com/ant-design/ant-design/issues/3590)
+* Fix style of DatePickek, Form, Table.
+
+## 2.3.2
+
+`2016-11-09`
+
+* Fix dead loop while using `getFieldProps`.
+
+## 2.3.1
+
+`2016-11-07`
+
+* Add missing `dist/antd.css` back.
+
+## 2.3.0
+
+`2016-11-04`
+
+* Upgrade normalize.css to 5.0.
+* Point main file to `lib/index.js` in package.json. [#3397](https://github.com/ant-design/ant-design/pull/3397)
+* A brand new `Spin` design.
+* Add `addon` for `TimePicker` to allow render some addon to its bottom.
+* Add `onDragEnd` for `Tree`.
+* Add `bordered` for `Collapse`.
+* Improve `Tabs` switch animation.
+* Improve `Radio` and `Checkbox` style when it's disabled and mouse hovered. [#3590](https://github.com/ant-design/ant-design/issues/3590)
+* Optimize `Transfer` performance.[#2860](https://github.com/ant-design/ant-design/issues/2860)
+* Fix nested `Popover` style issue. [#3448](https://github.com/ant-design/ant-design/issues/3448)
+* Fix issue resulting in server side render `Transfer` failed. [#3686](https://github.com/ant-design/ant-design/issues/3686)
+* Fix issue resulting in preview image not display when `Upload` in `picture-card` mode. [#3706](https://github.com/ant-design/ant-design/pull/3706) [@denzw](https://github.com/denzw)
+* DatePicker
+  * `onChange` will be triggered when `DatePicker` in `showTime` mode on blur now.
+  * Add `monthCellContentRender` for `MonthPicker`.
+  * `Rangepicker` can input time manually now.[#3718](https://github.com/ant-design/ant-design/issues/3718)
+  * Add czech locale/translations.
+* Badge
+  * Improve number over 99 displaying when mouse hovering. [#3645](https://github.com/ant-design/ant-design/issues/3645)
+  * Fix moving animation when using `Badge` alone. [#3709](https://github.com/ant-design/ant-design/issues/3709)
+* Mention
+  * Fix issue resulting in `Mention` will be covered by `Table`. [#3588](https://github.com/ant-design/ant-design/issues/3588)
+  * Add `getSuggestionContainer` to allow specify container. [#3658](https://github.com/ant-design/ant-design/pull/3658)
+* Tag
+  * Deprecate `color`. [#3560](https://github.com/ant-design/ant-design/issues/3560)
+  * Add `type`. [#3560](https://github.com/ant-design/ant-design/issues/3560)
+  * Add `checkable`. [#3560](https://github.com/ant-design/ant-design/issues/3560)
+* Radio.Group
+  * Add `className`。
+  * `null` or `undefined` `children` will be ignored.
+* Select
+  * Add `tokenSeparators` to support automatic tokenization。[#2071](https://github.com/ant-design/ant-design/issues/2071)
+  * Add `onFocus` callback. [#3587](https://github.com/ant-design/ant-design/issues/3587)
+  * Fix issue resulting in Select can't display correct selected item text in `combobox` mode. [#3401](https://github.com/ant-design/ant-design/issues/3401)
+
+## 2.2.1
+
+`2016-11-02`
+
+* Fix controlled DatePicker[showTime] not working bug. [#3665](https://github.com/ant-design/ant-design/issues/3665)
+
 ## 2.2.0

 `2016-10-28`
@@ -27,7 +241,6 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
  * New icons `bulb` `select` `like-o` `dislike-o`.
  * Adjust existing icons `loading` `like` `dislike`.
 * Improve the TypeScript definition of Card & DatePicker & Icon & Table. [@infeng](https://github.com/infeng) [3468](https://github.com/ant-design/ant-design/pull/3468) [#3603](https://github.com/ant-design/ant-design/pull/3603) [#3531](https://github.com/ant-design/ant-design/pull/3531)
-
 * Fix Cascader `defaultValue` should work. [#3470](https://github.com/ant-design/ant-design/issues/3470)
 * Fix the alignment of Button & Input & DatePicker & Select. [#3481](https://github.com/ant-design/ant-design/issues/3481)
 * DatePicker
@@ -97,7 +310,7 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
 - Fix developers cannot call methods of react-slick. [#3164](https://github.com/ant-design/ant-design/issues/3164)
 - Fix Steps.Step[icon] should support React.ReactNode. [#3159](https://github.com/ant-design/ant-design/issues/3159)
 - Fix server-side render for Affix. [#3216](https://github.com/ant-design/ant-design/issues/3216)
- Fix Mention should supoort `onSelect` `placeholder`. [#3236](https://github.com/ant-design/ant-design/issues/3236) [#3226](https://github.com/ant-design/ant-design/issues/3226)
+- Fix Mention should support `onSelect` `placeholder`. [#3236](https://github.com/ant-design/ant-design/issues/3236) [#3226](https://github.com/ant-design/ant-design/issues/3226)
 - Fix Transfer cannot work with `getFieldDecorator`.
 - Fix LocaleProvider doesn't work for time-related components.
 - Fix Cascader doesn't show search text in search mode.
@@ -126,6 +339,8 @@ If you meet any problem while you try to upgrade from `antd@1.0.0`, feel free to

 ### 2.x Breaking changes

+> We suggest you upgrade to lastest version of `2.x`.
+
 There are some breaking changes in `antd@2.0.0`, and you need to modify your code to work with it.

 * `value` and `defaultValue` of all the time-related components will not support type `String/Date`, please use [moment](http://momentjs.com/):
@@ -139,7 +354,7 @@ There are some breaking changes in `antd@2.0.0`, and you need to modify your cod
  - <Calendar defaultValue={new Date('2010-10-10')} />
  + <Calendar defaultValue={moment('2010-10-10', 'YYYY-MM-DD')} />
  ```
-* Parameters of type `Date/GregorianCalendar` of functions such as `onChange` and `onPanelChange`, plus other callback functions had been changed to type moment. Please consult [APIs of gregorian-calendar](https://github.com/yiminghe/gregorian-calendar) and [APIs of moment](http://momentjs.com/docs/), and update your code accordingly. And you can consult this [commit](https://github.com/ant-design/ant-design/commit/5a4ebe535f0353089b30ac331bc4fb7877963371) to see how to upate.
+* Parameters of type `Date/GregorianCalendar` of functions such as `onChange` and `onPanelChange`, plus other callback functions had been changed to type moment. Please consult [APIs of gregorian-calendar](https://github.com/yiminghe/gregorian-calendar) and [APIs of moment](http://momentjs.com/docs/), and update your code accordingly. And you can consult this [commit](https://github.com/ant-design/ant-design/commit/4026221d451b246956983bb42140142d4a48b7d7) to see how to update.

  Because the return value of `JSON.stringy(date: moment)` will lost time zone, we should use `.format` to convert date to string first, see related issue [#3082](https://github.com/ant-design/ant-design/issues/3082) for details:
  ```js
@@ -237,6 +452,6 @@ The following change will throw some warnings in the console and it will still w
 * [dva@1.0.0](https://github.com/dvajs/dva) is published and it is officially recommended framework [in real world](http://ant.design/docs/react/practical-projects).
 * The officially recommended scaffold is [dva-cli](https://github.com/dvajs/dva-cli) now, the old `antd-init` is just for studying and demo.

-## 1.0.0
+## 1.11.4

-Visit [GitHub](https://github.com/ant-design/ant-design/releases?after=2.0.0) to read change logs from `0.x` to `1.x`。
+Visit [GitHub](https://github.com/ant-design/ant-design/blob/1.x-stable/CHANGELOG.md) to read change logs from `0.x` to `1.x`。
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,14 +1,227 @@
 ---
-order: 3
+order: 6
 title: 更新日志
 toc: false
 timeline: true
 ---

-如果需要查看 `0.12.x` 及之前的更新日志，请移步 [GitHub](https://github.com/ant-design/ant-design/releases?after=1.0.0)。
+如果需要查看 `2.0.0` 之前的更新日志，请移步 [GitHub](https://github.com/ant-design/ant-design/releases?after=2.0.0)。

 ---

+## 2.6.0
+
+`2017-1-2`
+
+- 采用全新的色彩系统。[pull/4426](https://github.com/ant-design/ant-design/pull/4426)
+  - 全新的调色板系统
+  - 使用新的算法函数代替 shade，tint
+  - 调整默认文字颜色
+- 增加 Grid 栅格配置器示例。[commit/ee17ab](https://github.com/ant-design/ant-design/commit/ee17abfa9d0362c6f9baab4a9a09e57574583246)
+- 增加 Layout 布局组件。[#3534](https://github.com/ant-design/ant-design/issues/3534)
+- Input
+  - 增加 prefix 和 suffix 属性，支持前后缀配置。[#4226](https://github.com/ant-design/ant-design/issues/4226) [@ystarlongzi](https://github.com/ystarlongzi)
+  - InputGroup 增加 compact 属性，支持紧凑型展示。[pull/4309](https://github.com/ant-design/ant-design/pull/4309)
+- Spin 增加延迟显示属性 delay。[#4306](https://github.com/ant-design/ant-design/issues/4306)
+- 修复 Pagination 在低分辨率下的错位问题。[#4349](https://github.com/ant-design/ant-design/issues/4349)
+- 修复 Dropdown.Button 换行的问题。[pull/4355](https://github.com/ant-design/ant-design/pull/4355) [@Morhaus](https://github.com/Morhaus)
+- 修复 Cascader disabled 状态底色的问题。[#4434](https://github.com/ant-design/ant-design/issues/4434)
+- 修复 MonthPicker monthCellContentRender 属性无效的问题，并修正了错误的文档。[#4394](https://github.com/ant-design/ant-design/issues/4394)
+- 修复 ButtonGroup 存在多余蓝色边框的问题。[#4382](https://github.com/ant-design/ant-design/pull/4382) [@ystarlongzi](https://github.com/ystarlongzi)
+- 修复 Menu horizontal 模式子菜单选择项背景色错误的问题。[#4414](https://github.com/ant-design/ant-design/issues/4414)
+- 修复配置了 hasFeedback 的 Select/Cascader 下拉箭头被遮盖的问题。[#4431](https://github.com/ant-design/ant-design/issues/4431) [@JesperWe](https://github.com/JesperWe)
+- Table 没有 header 时，第一行改为非圆角。[#4373](https://github.com/ant-design/ant-design/issues/4373)
+- 优化 Tree 的拖拽效果。[#4371](https://github.com/ant-design/ant-design/issues/4371)
+- 进行了一些文档或示例优化、文档错误修正以及网站样式问题修复。
+- 升级 rc-form 底层依赖，getFieldDecorator 的 id 支持嵌套式写法。
+
+## 2.5.3
+
+`2016-12-24` 🎄🎄🎄
+
+* 支持 TypeScript@2.1。[#4208](https://github.com/ant-design/ant-design/issues/4208)
+* 修正了 Tabs 嵌套时的样式问题。 [#4317](https://github.com/ant-design/ant-design/issues/4317)
+* 修正了 Radio 在当前项选中时，再次点击仍会触发 onChange 的问题。 [#4242](https://github.com/ant-design/ant-design/issues/4242) [@ystarlongzi](https://github.com/ystarlongzi)
+* 修正了 Form 多列栅格式的表单排列方式布局异常。 [#4271](https://github.com/ant-design/ant-design/issues/4271)
+* 修正了 Menu 竖直方向的当前选择项的背景问题。[#4253](https://github.com/ant-design/ant-design/issues/4253)
+* 优化了 Dropdown 的 `onVisibleChange` 回调参数 Type 类型。[#4236](https://github.com/ant-design/ant-design/issues/4236)
+* 优化了 Cascader 的 `onChange` 回调参数的 Type 类型。[#4231](https://github.com/ant-design/ant-design/issues/4231)
+* 优化了 Datepicker[showTime] 的默认宽度 [b912f1c](https://github.com/ant-design/ant-design/commit/b912f1cea6f470c16b8dd90554883460161cef47)
+
+## 2.5.2
+
+`2016-12-10`
+
+* 优化 Menu 已选择项的样式。
+* 修复 Mention 不能响应 `onFocus` 和 `onBlur` 的问题。[#4163](https://github.com/ant-design/ant-design/issues/4163)
+* 修复 `disabled` 和 `checked` 的 Radio 之间会多一条阴影的问题。[#4114](https://github.com/ant-design/ant-design/pull/4114) @jdz321
+* 修复 RangePicker、TimePicker、Calendar 设置 Moment 的 `defaultValue` 和 `value` 时也会报错的问题。[#4147](https://github.com/ant-design/ant-design/issues/4147)
+* 修复 Affix 在开启动画的 Tabs 里使用时会消失的问题。[#3943](https://github.com/ant-design/ant-design/issues/3943)
+* 修复 Cascader 手动选择和搜索选择时 `onChange` 接收到的 `selectedOptions` 不同的问题。[#4096](https://github.com/ant-design/ant-design/issues/4096)
+* 修复 Tabs 页增加到一定数量时会产生偏移的问题。[#3637](https://github.com/ant-design/ant-design/issues/3637)
+* Table
+  * 居中对齐表头分组的父表头。
+  * 修正设置 filterDropdownVisible 时不生效的问题。[#4162](https://github.com/ant-design/ant-design/issues/4162)
+
+## 2.5.1
+
+`2016-12-03`
+
+* 提升网站首页在移动端访问的体验。
+* 补充从 `1.x` 升级到 `2.x` 时的组件改动警告提示。[#4028](https://github.com/ant-design/ant-design/pull/4028)
+* 现在 ToolTip、Popover、Popconfirm 支持直接包裹文本节点和多个节点。[#3924](https://github.com/ant-design/ant-design/issues/3924)
+* Anchor
+  * 修复快速滚动时的定位问题。[#4053](https://github.com/ant-design/ant-design/issues/4053)
+  * 修复 target 指定父元素 ref 时无效的问题。[#4037](https://github.com/ant-design/ant-design/issues/4037)
+* Table
+  * 修复设置 defaultChecked 时的一个选中问题。[#4020](https://github.com/ant-design/ant-design/issues/4020)
+  * 修复分组表头中筛选功能无法使用的问题。[#4099](https://github.com/ant-design/ant-design/issues/4099)
+* 修复在 `Input[type="textarea"]` 上使用 Popover 定位错误问题。[#4092](https://github.com/ant-design/ant-design/issues/4092)
+* 修复 Popconfirm 的 `visible` 属性失效的问题。[#4068](https://github.com/ant-design/ant-design/issues/4068)
+* 修复 TimePicker 无法设置 `style.width` 的问题。
+* 修复 Steps 自定义图标和默认图标大小不一致的问题。[#3817](https://github.com/ant-design/ant-design/issues/3817)
+* 修复 Form、Button、Slider、Table 等组件的一些样式细节。
+
+## 2.5.0
+
+`2016-11-25`
+
+* 默认主题风格修改为支付宝钱包风格，及大量样式优化。
+* 支持服务端渲染。（Mention 会因为 [draft-js](https://github.com/facebook/draft-js/issues/385) 的问题有 warning）
+* 引入 [Jest Snapshot](https://facebook.github.io/jest/docs/tutorial-react.html#snapshot-testing) 测试组件结构及服务端渲染问题。
+* 官网及文档优化。
+* 新增自定义主题的 [文档](https://ant.design/docs/react/customize-theme)。
+* 新增 [Sketch 资源文件](https://ant.design/docs/resource/download)。
+* LocaleProvider 新增巴西语支持。[#4004](https://github.com/ant-design/ant-design/pull/4004) [@nathantn](https://github.com/nathantn)
+* DatePicker
+  * DatePicker 现在可以决定是否展示 “今天” 按钮。[commit](https://github.com/ant-design/ant-design/commit/bbef274aae169d142e3e7e3ea0af922d48e6dd64)
+  * RangePicker 现在可以自定义快捷选择。[demo](https://ant.design/components/date-picker/#components-date-picker-demo-presetted-ranges)
+  * 修复 DatePicker 设置 `showTime` 后 “此刻” 按钮失效的问题。[#3748](https://github.com/ant-design/ant-design/issues/3748)
+  * 修复 `RangePicker[format]` 失效的问题。[#3808](https://github.com/ant-design/ant-design/issues/3808)
+* 新增并优化部分 Icon。[#3977](https://github.com/ant-design/ant-design/pull/3977)
+* 新增 Input.Search 控件。[demo](https://ant.design/components/input/#components-input-demo-search-input)
+* Mention onSelect 事件现在可以获取完整的数据。[#3867](https://github.com/ant-design/ant-design/issues/3867)
+* Pagination 现在支持展示当前页的索引范围。[demo](https://ant.design/components/pagination/#components-pagination-demo-total)
+* Table
+  * 自定义筛选的显示隐藏现在可以通过代码控制。[demo](https://ant.design/components/table/#components-table-demo-custom-filter-panel)
+  * 支持 JSX 风格的方式设置 columns。[demo](https://ant.design/components/table/#components-table-demo-jsx)
+  * 现在可以监听单元格的点击事件。[#3774](https://github.com/ant-design/ant-design/issues/3774)
+  * 修复无边框 Table 头部的圆角样式问题。
+  * 修复 title 和 footer 高度不随 `Table[size]` 变化的问题。[commit](https://github.com/ant-design/ant-design/commit/9e6439b06cd099ab384a4a2f026f0def6e12bf23)
+  * 修复选中状态出错的问题。[#3900](https://github.com/ant-design/ant-design/issues/3900)
+* Upload
+  * 修复 children 不能为 `null` 的问题。
+  * 修复预览逻辑的问题。[commit](https://github.com/ant-design/ant-design/commit/e552880c32aaa3f5b0fb09a5e1fb7454c24d5378)
+* 修复 Badge 会覆盖其他组件的问题。[#3898](https://github.com/ant-design/ant-design/issues/3898)
+* 修复多行 Checkbox 样式不对齐的问题。[#3971](https://github.com/ant-design/ant-design/issues/3971) [@flashback313](https://github.com/flashback313)
+* 修复 InputNumber 与其它表单控件不对齐的问题。[#3866(comment)](https://github.com/ant-design/ant-design/issues/3866#issuecomment-261148256)
+* 修复 `Menu.Divider` 样式问题。[#3813](https://github.com/ant-design/ant-design/issues/3813)
+* 修复 Popover 直接内嵌 Checkbox 和 Radio 无效的问题。[#3455](https://github.com/ant-design/ant-design/issues/3455)
+* 修复 Select combobox 高度异常问题。[#3855](https://github.com/ant-design/ant-design/issues/3855)
+* 修复 Switch actived 后的样式问题。[#3838](https://github.com/ant-design/ant-design/issues/3838)
+* 修复 Transfer 搜索无结果时不展示 “Not Found” 提示的问题。[#3996](https://github.com/ant-design/ant-design/issues/3996)
+* 修复 TreeSelect 占位符的样式问题。[#3841](https://github.com/ant-design/ant-design/issues/3841)
+* 修复 TypeScript 编译报错的问题。[#3969](https://github.com/ant-design/ant-design/pull/3969) [@AlbertZheng](https://github.com/AlbertZheng)
+* 修复表单反馈图标影响用户操作的问题。[#3891](https://github.com/ant-design/ant-design/issues/3891)
+
+## 2.4.3
+
+`2016-11-17`
+
+* 修复 `Anchor` 内部 querySelector 报错，并做了一些体验优化 。[#3832](https://github.com/ant-design/ant-design/issues/3832) [#3844](https://github.com/ant-design/ant-design/issues/3844)
+
+## 2.4.2
+
+`2016-11-13`
+
+* 修复 `Dropdown.Button` 不弹出的问题。[#3815](https://github.com/ant-design/ant-design/issues/3815)
+
+## 2.4.1
+
+`2016-11-11`
+
+* 修复 `2.4.0` 组件 index 文件丢失的问题。
+
+## 2.4.0
+
+`2016-11-11`
+
+* 调整了组件的导航结构。
+* 新增 [Anchor](https://ant.design/components/anchor) 锚点组件。
+* 整理了样式变量，修复 `@font-size-base` 和 `@text-color` 在部分组件无效的问题，新增 `@font-size-lg` `@text-color-secondary`，并移除了部分无用的变量。
+* `Transfer` 组件新增了受控属性 `selectedKeys`。[#3729](https://github.com/ant-design/ant-design/issues/3729)
+* `Tag` 新增选中状态。
+* 修复 `Dropdown.Button` 不支持 `visible` 和 `onVisibleChange` 的问题。[#3779](https://github.com/ant-design/ant-design/issues/3779)
+* 修复 `DatePicker[showTime]`` 的 `此刻` 按钮。[#3748](https://github.com/ant-design/ant-design/issues/3748)
+* 修复 `Steps` 竖直方向的样式。[#3760](https://github.com/ant-design/ant-design/issues/3760)
+* 修复 `Spin` 组件在 IE10+ 的样式问题。[#3755](https://github.com/ant-design/ant-design/issues/3755)
+* 修复 `Mention` 组件的 focus 逻辑. [#3801](https://github.com/ant-design/ant-design/issues/3801)
+* 修复 `Progress` 组件的动画问题。[#3784](https://github.com/ant-design/ant-design/issues/3784)
+* 修复 `Select` 搜索时的丢失焦点问题。[#3778](https://github.com/ant-design/ant-design/issues/3778)
+* 修复 `TimePicker` 不支持 `format="HH"` 等格式的问题。[#3793](https://github.com/ant-design/ant-design/issues/3793)
+* 修复 `Input` 的 `suffix` 部分区域中鼠标事件无法响应的问题。[#3714](https://github.com/ant-design/ant-design/issues/3714)
+* 优化了 `Table` 选择的性能。[#3757](https://github.com/ant-design/ant-design/pull/3757)
+* 优化 `Carousel` 的默认样式。
+* 优化 `Checkbox` 和 `Radio` 的样式。[#3590](https://github.com/ant-design/ant-design/issues/3590)
+* 修复 `DatePicker`、`Form`、`Table` 等组件的样式细节。
+
+## 2.3.2
+
+`2016-11-09`
+
+* 修复使用 `getFieldProps` 会导致死循环的问题。
+
+## 2.3.1
+
+`2016-11-07`
+
+* 修正上个版本缺少 `dist/antd.css` 的问题。
+
+## 2.3.0
+
+`2016-11-04`
+
+* 升级 normalize.css 到 5.0。
+* package.json 的 main 换成了 `lib/index.js`。[#3397](https://github.com/ant-design/ant-design/pull/3397)
+* 全新的 `Spin` 设计。
+* `TimePicker` 新增了 `addon` 以支持自定义的附加内容。
+* `Tree` 新增了 `onDragEnd`。
+* `Collapse` 新增了 `bordered`。
+* 优化 `Tabs` 切换时的动画效果。
+* 优化 `Radio` 和 `Checkbox` 在禁用和鼠标停留时的样式。[#3590](https://github.com/ant-design/ant-design/issues/3590)
+* 优化 `Transfer` 的性能。[#2860](https://github.com/ant-design/ant-design/issues/2860)
+* 修复 `Popover` 嵌套时的样式问题。[#3448](https://github.com/ant-design/ant-design/issues/3448)
+* 修复 `Transfer` 服务端渲染报错的问题。[#3686](https://github.com/ant-design/ant-design/issues/3686)
+* 修复 `Upload` `picture-card` 模式下新上传的图片不显示预览的问题。[#3706](https://github.com/ant-design/ant-design/pull/3706) [@denzw](https://github.com/denzw)
+* DatePicker
+  * 在 `showTime` 模式下现在失去焦点也会触发 `onChange`。
+  * `MonthPicker` 增加了 `monthCellContentRender`。
+  * `RangePicker` 现在可以手动输入时间了。[#3718](https://github.com/ant-design/ant-design/issues/3718)
+  * 新增了捷克语的翻译。
+* Badge
+  * 优化鼠标停留时超过 99 的数字显示。[#3645](https://github.com/ant-design/ant-design/issues/3645)
+  * 修复单独使用时会有移动动画的问题。[#3709](https://github.com/ant-design/ant-design/issues/3709)
+* Mention
+  * 修复会被 `Table` 遮住的问题。[#3588](https://github.com/ant-design/ant-design/issues/3588)
+  * 新增 `getSuggestionContainer` 来指定容器。[#3658](https://github.com/ant-design/ant-design/pull/3658)
+* Tag
+  * 废弃 `color` 属性。[#3560](https://github.com/ant-design/ant-design/issues/3560)
+  * 新增 `type`。[#3560](https://github.com/ant-design/ant-design/issues/3560)
+  * 新增 `checkable`。[#3560](https://github.com/ant-design/ant-design/issues/3560)
+* Radio.Group
+  * 新增 `className`。
+  * `children` 为 `null` 或 `undefined` 时现在会被忽略。
+* Select
+  * 新增 `tokenSeparators` 支持粘贴时自动分词。[#2071](https://github.com/ant-design/ant-design/issues/2071)
+  * 新增 `onFocus` 回调。[#3587](https://github.com/ant-design/ant-design/issues/3587)
+  * 修复 `combobox` 模式下选中项不能正确显示的问题。[#3401](https://github.com/ant-design/ant-design/issues/3401)
+
+## 2.2.1
+
+`2016-11-02`
+
+* 修复 Form 中 DatePicker[showTime]（受控）无法使用的问题。[#3665](https://github.com/ant-design/ant-design/issues/3665)
+
 ## 2.2.0

 `2016-10-28`
@@ -27,7 +240,6 @@ timeline: true
  * 新增 `bulb` `select` `like-o` `dislike-o`。
  * 调整 `loading` `like` `dislike`。
 * 优化 Card DatePicker Icon Table 的 TypeScript 定义。[@infeng](https://github.com/infeng) [3468](https://github.com/ant-design/ant-design/pull/3468) [#3603](https://github.com/ant-design/ant-design/pull/3603) [#3531](https://github.com/ant-design/ant-design/pull/3531)
-
 * 修复 Cascader `defaultValue` 失效的问题。[#3470](https://github.com/ant-design/ant-design/issues/3470)
 * 修复在一行内同时使用 Button Input DatePicker Select 时对齐的问题。[#3481](https://github.com/ant-design/ant-design/issues/3481)
 * DatePicker
@@ -124,6 +336,8 @@ timeline: true

 ### 2.x 不兼容改动

+> 建议从 `1.x` 升级时，直接升级到 `2.x` 的最新版本。
+
 此版本有部分不兼容的改动，升级时确保修改相应的使用代码。

 * 时间类组件的 `value` 和 `defaultValue` 不再支持 `String/Date` 类型，请使用 [moment](http://momentjs.com/)。
@@ -137,9 +351,9 @@ timeline: true
  - <Calendar defaultValue={new Date('2010-10-10')} />
  + <Calendar defaultValue={moment('2010-10-10', 'YYYY-MM-DD')} />
  ```
-* 时间类组件的 `onChange` 和 `onPanelChange` 及其他回调函数中为 `Date/GregorianCalendar` 类型的参数，均修改为 moment 类型，两者 API 有所不同，但功能基本一致，请对照 [moment 的 API 文档](http://momentjs.com/docs/) 和 [gregorian-calendar 的文档](https://github.com/yiminghe/gregorian-calendar) 进行修改。你也可以参考这个 [commit](https://github.com/ant-design/ant-design/commit/5a4ebe535f0353089b30ac331bc4fb7877963371) 来进行修改。
+* 时间类组件的 `onChange` 和 `onPanelChange` 及其他回调函数中为 `Date/GregorianCalendar` 类型的参数，均修改为 moment 类型，两者 API 有所不同，但功能基本一致，请对照 [moment 的 API 文档](http://momentjs.com/docs/) 和 [gregorian-calendar 的文档](https://github.com/yiminghe/gregorian-calendar) 进行修改。你也可以参考这个 [commit](https://github.com/ant-design/ant-design/commit/4026221d451b246956983bb42140142d4a48b7d7) 来进行修改。

-  由于 `JSON.stringy(date: moment)` 返回的值会丢失时区设置，所以要先使用 `.format` 把日期转成字符串，相关 issue 见 [#3082](https://github.com/ant-design/ant-design/issues/3082)：
+  由于 `JSON.stringify(date: moment)` 返回的值会丢失时区设置，所以要先使用 `.format` 把日期转成字符串，相关 issue 见 [#3082](https://github.com/ant-design/ant-design/issues/3082)：
  ```js
  handleSubmit() {
    const values = this.props.form.getFieldsValue();
@@ -236,446 +450,6 @@ timeline: true
 * [dva@1.0.0](https://github.com/dvajs/dva) 也已经发布，并推荐 [在实战项目中使用](http://ant.design/docs/react/practical-projects)。
 * 脚手架工具推荐使用 [dva-cli](https://github.com/dvajs/dva-cli)，原来的 `antd-init` 以后仅会用于学习以及 demo。

-## 1.11.2
+## 1.11.4

-`2016-09-26`
-
- 修复 Popover 内嵌 Badge 后失效的问题。[#3109](https://github.com/ant-design/ant-design/issues/3109)
- 修复 Modal 内嵌的 Button 在某些情况下与 Modal 的滚动不同步的问题。[#3031](https://github.com/ant-design/ant-design/issues/3031)
-
-## 1.11.1
-
-`2016-09-14`
-
- 修复 Menu 设置成 `theme=dark` 后，链接点击无效的问题。[#2929](https://github.com/ant-design/ant-design/issues/2929)
- 修复迷你型 Table 表头与内容不对齐的问题。[#2933](https://github.com/ant-design/ant-design/issues/2933)
- 修复 Cascader hover 样式。[#3015](https://github.com/ant-design/ant-design/issues/3015)
- 修复 Upload 上传多个文件时，`onChange` 调用不正确的问题。[#3001](https://github.com/ant-design/ant-design/issues/3001)
- 修复 TimePicker 报错样式的问题。[#2973](https://github.com/ant-design/ant-design/issues/2973)
- 修复 Calendar 控件的年度选择下拉内容截断的问题。[#2927](https://github.com/ant-design/ant-design/issues/2927)
-
-## 1.11.0
-
-`2016-09-01`
-
- `Tooltip` `Popover` `Popconfirm` 修正默认对齐方式为边缘对齐，增加 arrowPointAtCenter 属性用于箭头指向中心的行为。[commit 977e2e3](https://github.com/ant-design/ant-design/commit/977e2e32fc40968846c8201ed72bdc3818375d2f)
- `Table`
-  - 移除数据中添加的 `indexForSort`。[#2501](https://github.com/ant-design/ant-design/issues/2501)
-  - 修复 `pagination` 属性中 `defaultPageSize` 不生效的问题。[#2874](https://github.com/ant-design/ant-design/issues/2874)
-  - 修复数据为空时固定列出现重复提示的问题。[#2812](https://github.com/ant-design/ant-design/issues/2812)
-  - 给树形子数据增加排序功能。[#2839](https://github.com/ant-design/ant-design/issues/2839)
- `InputNumber` 样式问题修复。[#2876](https://github.com/ant-design/ant-design/issues/2876)
- 修复手动导入 less 文件时 input error 样式被 focus 样式覆盖的问题。[#2916](https://github.com/ant-design/ant-design/issues/2916)
- index.d.ts 中补充了一些缺失的声明，修复 `Form` 中 typescript 语法检查报错的问题。[#2885](https://github.com/ant-design/ant-design/issues/2885)
- 升级 react-slick 依赖到 `0.13`。
-
-## 1.10.0
-
-`2016-08-20`
-
- Affix 和 BackTop 新增 `target` 属性，支持指定滚动容器。[#2718](https://github.com/ant-design/ant-design/issues/2718)
- 文档页面加上编辑按钮，方便社区贡献。[#2325](https://github.com/ant-design/ant-design/issues/2325)
- 升级 rc-cascader 依赖，修复一个 `loadData` 属性和表单结合使用的问题。[#2767](https://github.com/ant-design/ant-design/issues/2767)
- 修复 `editable-card` 类型的 Tabs 没有关闭图标的问题。[#2747](https://github.com/ant-design/ant-design/issues/2747)
- Menu 修正默认 `z-index`。[#2762](https://github.com/ant-design/ant-design/issues/2762)
- 修正 Select 组件在 IE 下的一些样式问题。[#2741](https://github.com/ant-design/ant-design/issues/2741)
-
-## 1.9.1
-
-`2016-08-16`
-
- 修复 `editable-card` 类型的 Tabs 设置 `activeKey` 无效的问题。[#2725](https://github.com/ant-design/ant-design/issues/2725)
- 修复一个 Table 的样式兼容性问题。[#2723](https://github.com/ant-design/ant-design/issues/2723)
- 更新 axure 部件库。[#2714](https://github.com/ant-design/ant-design/issues/2714)
-
-## 1.9.0
-
-`2016-08-15`
-
- Transfer 修复在火狐下 item 文案过长时只显示省略号的问题。[#2674](https://github.com/ant-design/ant-design/issues/2674)
- Input 修复 `autosize` 模式下特定场景中不能输入中文及光标定位不准的问题。[#2666](https://github.com/ant-design/ant-design/issues/2666) [#2239](https://github.com/ant-design/ant-design/issues/2239)
- Tabs 修复 `type="editable-card"` 模式下的 `children` 解析问题。[#2658](https://github.com/ant-design/ant-design/issues/2658)
- Radio 修复若干 less 硬编码问题。[#2424](https://github.com/ant-design/ant-design/issues/2424)
- Upload 的 rc-upload 依赖升级至 2.x，引入的变化有：
-  - 增加 `disabled` 属性。[#2645](https://github.com/ant-design/ant-design/issues/2645)
-  - 取消上传时会自动 abort 上传请求。[#2571](https://github.com/ant-design/ant-design/issues/2571) [#2518](https://github.com/ant-design/ant-design/issues/2518)
- Table
-  - 修复 spin 在可滚动区域的定位问题。[#2652](https://github.com/ant-design/ant-design/issues/2652)
-  - 修复无数据时 提示样式错位的问题。[#2663](https://github.com/ant-design/ant-design/issues/2663)
- Popover 修复设定 `getTooltipContainer` 后会导致内嵌 DatePicker 样式失效的问题。[#2675](https://github.com/ant-design/ant-design/issues/2675)
- Modal 修复重复卸载组件导致的报错。[#2688](https://github.com/ant-design/ant-design/issues/2688)
-  升级 rc-slider 组件依赖。
-
-## 1.8.0
-
-`2016-08-08`
-
- 修复可关闭 Tabs 组件只有一个 Tab 的时候报错的问题。[#2559](https://github.com/ant-design/ant-design/issues/2559)
- 修复 Datepicker 在 IE8 下关闭图标。[#2584](https://github.com/ant-design/ant-design/issues/2584)
- Tags 支持自定义标签颜色。[#2585](https://github.com/ant-design/ant-design/issues/2585)
- TreeSelect 修复未找到内容时的样式。[9cee9f](https://github.com/ant-design/ant-design/commit/9cee9f103a4729572358206c81cba84e2fdc20f5)
- Modal 适配小屏幕。[#2597](https://github.com/ant-design/ant-design/issues/2597)
- 修复了 Row 组件在同一行闭合会报错的问题。[#2603](https://github.com/ant-design/ant-design/issues/2603)
- Table 的 `rowSelection.onChange` 的参数 `selectedRows` 现在和 `selectedRowKeys` 保持一致。[#2566](https://github.com/ant-design/ant-design/issues/2603)
- Checkbox 和 Radio 现在支持 `onClick` 属性。
-
-## 1.7.0
-
-`2016-07-30`
-
-友情提示 [Ant Design Mobile](http://mobile.ant.design) 已经发布。
-
- Table
-  - 现可以定义页头。[demo](http://ant.design/components/table#components-table-demo-bordered)
-  - 修复当 `rowKey` 为 `String` 时的报错问题。[#2500](https://github.com/ant-design/ant-design/issues/2500)
-  - 修复 `Table` 会修改 `dataSource` 里面的值的问题。[#2501](https://github.com/ant-design/ant-design/issues/2501)
- Form 现在不再需要显式传递 `form={this.props.form}`。
- 优化 Breadcrumb.Item 的 hover 效果。
- 优化 Progress 的动画效果。
- DatePicker
-  - 优化清除按钮样式。
-  - 修复点击 `此刻` 时不触发 `onChange` 的问题。[#1902](https://github.com/ant-design/ant-design/issues/1902)
- Menu
-  - 修复子菜单中的 Item 被选中后，父级元素无样式变化的问题。[#2414](https://github.com/ant-design/ant-design/issues/2414)
-  - 修复 Menu.Item disabled 后的样式问题。
- TreeSelect
-  - treeNodes 可以设置是否可选。[#2401](https://github.com/ant-design/ant-design/issues/2401)
-  - 修复多选模式下进行搜索会把已选项清掉的问题。[#2393](https://github.com/ant-design/ant-design/issues/2393)
-  - 修复 TreeSelect 会修改原数据的问题。[#2459](https://github.com/ant-design/ant-design/issues/2459)
- 修复了 Select 组件 placeholder 溢出的问题。[#2480](https://github.com/ant-design/ant-design/pull/2480)
- 修复 Timeline.Item 无法自定义边框颜色的问题。[#2479](https://github.com/ant-design/ant-design/issues/2479)
- 修复 Spin 显示突兀的问题。[#2398](https://github.com/ant-design/ant-design/issues/2398)
- 修复 Cascader 选项文字过长导致的样式问题。[#2515](https://github.com/ant-design/ant-design/issues/2515)
-
-## 1.6.5
-
-`2016-07-16`
-
- 修复 Input 的 `value prop on input should not be null` 警告并且导致在表单中无法重置的问题。[#2335](https://github.com/ant-design/ant-design/issues/2335)
- 优化 FormItem 的布局实现，修复表单布局不支持响应式布局的问题。[#2305](https://github.com/ant-design/ant-design/issues/2305)
- 修复带时间的 DatePicker 的 onChange 触发逻辑。[#2399](https://github.com/ant-design/ant-design/issues/2399#issuecomment-232893146)
- 修复 Transfer 搜索后全选的问题。[#2396](https://github.com/ant-design/ant-design/issues/2396)
- 修复 Cascader 样式会被 ant-input 样式覆盖的问题。[#2400](https://github.com/ant-design/ant-design/issues/2400)
- 修复 Table 删除数据时导致当前页数溢出的问题。[#2301](https://github.com/ant-design/ant-design/pull/2301)
- 修复 resize 浏览器时 Affix 元素没有和原来的位置同步的问题。[#1987](https://github.com/ant-design/ant-design/issues/1987)
- 给 Affix 元素添加占位，修复固定时页面跳动的问题。
- 修复 Select combobox 模式会导致页面出现横向滚动条的问题。[#2353](https://github.com/ant-design/ant-design/issues/2353)
- 修复 Upload 组件已上传文件链接点击无效的问题。[#2331](https://github.com/ant-design/ant-design/issues/2331)
- 修复 Upload 上传过程中删除图片后的报错问题。[#2342](https://github.com/ant-design/ant-design/issues/2342)
-
-## 1.6.4
-
-`2016-07-08`
-
- 修复组件在 react@15.2.0 下报 Unknown props 警告的问题。[#2258](https://github.com/ant-design/ant-design/issues/2258)
- `Table`
-     - 修复 filterDropDown 中内容未改变也会调用 onChange 的问题。[#2228](https://github.com/ant-design/ant-design/issues/2228)
-     - 修复设置 scroll.y 高度后导致内容无法对齐的问题。[#2227](https://github.com/ant-design/ant-design/issues/2227)
- `Form`
-     - 修复 `FormItem` 中带空格后缀的冒号替换问题，关联issue：[#1877](https://github.com/ant-design/ant-design/issues/1877)
-     -  demo 优化。
- `Transfer`
-     - 修复重复 render 的问题，性能优化。[#2112](https://github.com/ant-design/ant-design/issues/2112)
-     - 优化搜索逻辑，修复搜索时未对特殊字符进行处理的问题。[#2260](https://github.com/ant-design/ant-design/issues/2260)
-     - 清除按钮样式优化。
- 修复 `Steps` 最后一步多余横线隐藏的问题。
- 修复 `Cascader` small size 样式下沉 1px，以及 hover/click 样式残缺的问题。[#2234](https://github.com/ant-design/ant-design/issues/2234)
- 修复 `RangePicker` 无清除按钮的问题。[#2252](https://github.com/ant-design/ant-design/issues/2252)
-
-## 1.6.3
-
-`2016-07-04`
-
- 修复 Transfer 的一个 unmount 的错误。[#2206](https://github.com/ant-design/ant-design/pull/2206)
- 修复了 Badge、Alert、Menu、Tag、Checkbox、Radio 组件的一些样式细节问题。
-
-## 1.6.2
-
-`2016-06-27`
-
- 修复 Table、Transfer 的样式错位问题。
- 修复 DatePicker 的一个样式问题。[#2182](https://github.com/ant-design/ant-design/issues/2182)
- 优化 Menu 的 hover 样式响应性能。
-
-## 1.6.1
-
-`2016-06-24`
-
- 回滚一个未完成的 DatePicker 时间选项改造效果。
-
-## 1.6.0
-
-`2016-06-24`
-
- 新增置顶组件 [BackTop](/components/back-top)。
- 全新的 [Spin](/components/spin) 样式。
- 给 `Modal.xxx` 系列方法添加了 `{ destory }` 的访问值，方便事后销毁。[#2110](https://github.com/ant-design/ant-design/issues/2110)
- Table 的 `rowKey` 属性支持直接使用字符串。[#2058](https://github.com/ant-design/ant-design/issues/2058)
- Table 增加 `column.filterDropdown` 属性用于自定义渲染筛选菜单的浮层。[#1736](https://github.com/ant-design/ant-design/issues/1736)
- 修复 Tooltip、Popover、Popconfirm 设置 `onVisibleChange` 后失效的问题。[#2134](https://github.com/ant-design/ant-design/issues/2134)
- 修复在 IE8 下 Checkbox 的勾样式变形的问题。[#2148](https://github.com/ant-design/ant-design/issues/2148)
- 优化 Checkbox、Radio 失效状态的文字颜色。[#2114](https://github.com/ant-design/ant-design/issues/2114)
- 优化 Checkbox、Radio 的默认边距过于拥挤的问题。[#2137](https://github.com/ant-design/ant-design/issues/2137)
- 优化 Pagination 在暗色背景下的样式。[#2126](https://github.com/ant-design/ant-design/issues/2126)
- 修复 Table 固定列时内容无法换行和高度对齐的问题，同时修复了一个 Chrome 下的表格内容错位问题。[#2130](https://github.com/ant-design/ant-design/issues/2130)
- 修复一个 Table 的 `rowSelection` 设为 null 时可能导致报错的问题。[#2127](https://github.com/ant-design/ant-design/issues/2127)
- 修复在 IE8 下点击 Table 选择框报错的问题。[#2154](https://github.com/ant-design/ant-design/issues/2154)
- 小幅优化了 Transfer 的渲染性能。[#2112](https://github.com/ant-design/ant-design/issues/2112)
- 将 DatePicker 的清除按钮从面板上移到外部输入框，解决用户容易误解为关闭的问题。[#1708](https://github.com/ant-design/ant-design/issues/1708)
- Upload 的 `onPreview` 现在没有 `file.url` 时也能生效。[#2163](https://github.com/ant-design/ant-design/issues/2163)
-
-## 1.5.1
-
-`2016-06-21`
-
- 修复一个 TypeScript 定义文件的语法错误。
- 修复 Table 固定表头高度和滚动条样式问题。
-
-## 1.5.0
-
-`2016-06-17`
-
- 升级 `rc-form` 到 0.17，支持 `getFieldProps('xx.yy')` 的写法，并支持单多选控件进行关联。[#](https://github.com/react-component/form/pull/21)
- Input 的 `addonBefore` 和 `addonAfter` 支持内嵌选择框。[#1927](https://github.com/ant-design/ant-design/issues/1927)
- 优化了两个 DatePicker 组成的时间范围选择演示的体验。
- 优化一个多个对话框的遮罩层高度的问题。[#2009](https://github.com/ant-design/ant-design/issues/2009)
- 优化 Table 的 `getCheckboxProps` 的调用次数。[#2086](https://github.com/ant-design/ant-design/issues/2086)
- 修复 Table 固定列时，表头无法左右滚动的问题。[#2068](https://github.com/ant-design/ant-design/issues/2068)
- 修复小型表格固定表头的样式。[#2023](https://github.com/ant-design/ant-design/issues/2023)
- 修复 Tabs 的 `tabPosition` 为左右时样式错位的问题。[#2046](https://github.com/ant-design/ant-design/issues/2046)
- 修复 RangePicker 的日期范围背景丢失的问题。
- 修复 Switch 失效状态下文字颜色太浅的问题。[#2051](https://github.com/ant-design/ant-design/issues/2051)
- 修复一个 Select 的 `disabled` 选项依然可以被移除的问题。[#2034](https://github.com/ant-design/ant-design/issues/2034)
- 修复官方站点在 IE 下的报错问题。
-
-## 1.4.1
-
-`2016-06-12`
-
- 修复一个展开 Tabs 会导致表格宽度溢出的问题。[#2013](https://github.com/ant-design/ant-design/issues/2013)
- 修复一个某些情况下表格布局被破坏的问题。
-
-## 1.4.0
-
-`2016-06-12`
-
-此版本之后你可能会遇到 [#2030](https://github.com/ant-design/ant-design/issues/2030)，请使用 `react@15+` 或 `npm@3+`。
-
- `Input[type="textarea"]` 支持自动调整高度。 [#](http://ant.design/components/input#components-input-demo-autosize-textarea)
- `Breadcrumb`
-  - `nameRender` 新增 `route` 和 `params` 参数。 [#1999](https://github.com/ant-design/ant-design/issues/1999)
-  - `linkRender` 新增 `paths` 参数。
- 再次修复 `Table` 组件 `rowSelection.onChange` 与 `onRowClick` 冲突问题。 [#1470](https://github.com/ant-design/ant-design/issues/1470)
- 修复 `Form.Item` 中 `Input` 高度抖动问题。 [#1955](https://github.com/ant-design/ant-design/issues/1955)
- 修复高级搜索的 `ant-advanced-search-form` 样式丢失的问题。
-
-## 1.3.2
-
-`2016-06-06`
-
- 修复全局模式下引用 antd，IE8 环境报错的问题。 [#1970](https://github.com/ant-design/ant-design/issues/1970)
-
-## 1.3.1
-
-`2016-06-06`
-
- 修复 `Message` `Notification` 找不到的问题。 [#1968](https://github.com/ant-design/ant-design/issues/1968)
-
-## 1.3.0
-
-`2016-06-02`
-
- Transfer 组件增加 `rowKey` 属性，可自定义数据源主键。 [#1900](https://github.com/ant-design/ant-design/issues/1900)
- Tag 组件 `default` 类型的样式增加边框，防止淹没在背景中。 [#1910](https://github.com/ant-design/ant-design/issues/1910)
- Table
-  - 修复筛选为单选时仍旧展示多选框的问题。 [#1880](https://github.com/ant-design/ant-design/issues/1880)
-  - 修复 fixed left 的固定列会覆盖 rowSelection 的 Checkbox 的问题。 [#1829](https://github.com/ant-design/ant-design/issues/1829)
-  - 升级 rc-table 依赖
-    - 修复了 fixed 列中数据重复展示以及一些错位问题。 [#1898](https://github.com/ant-design/ant-design/issues/1898)
-    - `dataIndex` 支持内嵌属性的写法。 [react-component/table#46](https://github.com/react-component/table/issues/46)
- 修复了 v1.2.0 新增加的组件属性的 TypeScript 定义。 [#1933](https://github.com/ant-design/ant-design/issues/1933)
- Form 修复 label中冒号的国际化问题，采用样式实现冒号，不再需要手动输入冒号。 [#1877](https://github.com/ant-design/ant-design/issues/1877)
- 修复 DatePicker 组件点击『此刻』失效的问题，并进行了一些代码优化。 [#1902](https://github.com/ant-design/ant-design/issues/1902)
- 升级 rc-upload 依赖，修复了 IE10 中第二次上传同一文件不触发 `onChange` 的问题。 [058af3c](https://github.com/ant-design/ant-design/commit/b15a4e3165be5e4db995d3fe75d4d557c7f21c61)
- 文档使用 [bisheng](https://github.com/benjycui/bisheng) 重构。
-
-## 1.2.1
-
-`2016-05-27`
-
- 修复一个 Select 组件的文字重复问题。
-
-## 1.2.0
-
-`2016-05-26`
-
- Input 组件的文档现在和 Form 分离。 [3c98d3](https://github.com/ant-design/ant-design/commit/3c98d3f80f4ec80066756adc3b4108141d4383ca)
- Affix
-  - 新增了 `onChange` 属性。当固定状态改变时回调 [#1777](https://github.com/ant-design/ant-design/issues/1777)
-  - 找回了从 affixStyle 中走失的 `width` 属性，修复固定后错位的问题。[#1820](https://github.com/ant-design/ant-design/issues/1820)
- Table
-  - 修复了 Table 组件的分页相关的一系列问题 [#1669](https://github.com/ant-design/ant-design/issues/1669) [#1842](https://github.com/ant-design/ant-design/issues/1842)
-  - 修复了当有列固定在左边时，选择框不显示的问题 [#1829](https://github.com/ant-design/ant-design/issues/1829)
- 修复了当 Checkbox 的 label 为数字 0 时， label 不显示的问题 [#1811](https://github.com/ant-design/ant-design/issues/1811)
- 修复 Select combobox 模式下无法重置 `optionLabelProp` 的问题。[#1773](https://github.com/ant-design/ant-design/issues/1773)
- 修复了 Tag 组件为 closeable 时，内部链接无法点击的问题 [#1862](https://github.com/ant-design/ant-design/issues/1862)
- Tab 组件新增 `hideAdd` 属性，用于关闭右边的添加按钮 [#1750](https://github.com/ant-design/ant-design/issues/1750)
- 修复了一个在某些情况下找不到 `normalize.css/normalize.css` 文件的问题。[ant-design/antd-init#52](https://github.com/ant-design/antd-init/issues/52)
- 修复构建文件在 IE8 下报错的问题。[#1804](https://github.com/ant-design/ant-design/issues/1804)
- 更新了第三方依赖。
-
-## 1.1.0
-
-`2016-05-18`
-
- Cascader 的选择框支持自定义渲染节点，并给 `displayRender` 方法增加了 `selectedOptions` 参数。[#1726](https://github.com/ant-design/ant-design/issues/1726)
- Input.Group 新增 `size` 属性，可设置控件尺寸。[#1732](https://github.com/ant-design/ant-design/issues/1732)
- Layout 新增常用布局：侧边导航展开收起模式。[#1643](https://github.com/ant-design/ant-design/issues/1643)
- Transfer 支持自定义渲染行数据。[#1664](https://github.com/ant-design/ant-design/issues/1664)
- Upload 的 children 为空时，不再显示上传按钮。[#1610](https://github.com/ant-design/ant-design/issues/1610)
- Table
-  - 修复 `filter` 过滤数据后显示错误分页的问题。[#1669](https://github.com/ant-design/ant-design/issues/1669)
-  - 修复 `pagination` 不指定时显示错误分页的问题。[#1683](https://github.com/ant-design/ant-design/issues/1683)
- Modal
-  - 修复弹出时背景依然跟随滚动的问题。[#1751](https://github.com/ant-design/ant-design/issues/1751)
-  - 修复关闭按钮获得焦点时的样式问题。[#1668](https://github.com/ant-design/ant-design/issues/1668)
- 将搜索输入框相关样式移到 Input 组件下。[7b7f846](https://github.com/ant-design/ant-design/commit/7b7f8461611e53f4f96ae8d64d37fe28ee8d2553)
- 修复 Select 获得焦点时的样式问题。[#1684](https://github.com/ant-design/ant-design/issues/1684)
- 修复 TreeSelect 占位符样式问题。[#1657](https://github.com/ant-design/ant-design/issues/1657)
- 修复了类型定义以更好地支持 `TypeScript`。[#1696](https://github.com/ant-design/ant-design/pull/1696) [@xujihui1985](https://github.com/xujihui1985)
- 优化了 LocaleProvider。[a3850a4](https://github.com/ant-design/ant-design/commit/a3850a4df84d7055a1a40600919f2f9ba1bbf2b2)
- 其他组件的样式优化。
-
-## 1.0.1
-
-`2016-05-11`
-
- 修复当 Table 的 `rowSelection.type` 为 'radio' 时的报错。[#1627](https://github.com/ant-design/ant-design/issues/1627)
- 修复 CheckboxGroup 与 `getFieldProps`共用时的问题。[#1631](https://github.com/ant-design/ant-design/issues/1631)
- 修复 RangePicker 中 TimePicker 不会受 locale 控制的问题。[#1635](https://github.com/ant-design/ant-design/issues/1635)
- 修复 Tag 组件缺失的问题。
- 修复 Table 的 className 不在最外层容器上的问题。
- 修复一个样式文件重复打包的问题。
-
-## 1.0.0
-
-`2016-05-09`
-
-很高兴的通知各位，经过四个月时间的紧密开发，`antd@1.0.0` 终于发布了。从去年 5 月 7 日提交第一行代码以来，经过整整一年的开发迭代，antd 受到社区的大量关注，使用的公司和产品持续增加，已经日趋成熟。这个版本我们重构了底层代码和站点，持续完善现有组件功能和优化细节，其中很多都来自社区的贡献，无法一一感谢，欢迎各位持续关注和鞭策。在升级过程中遇到任何问题，请及时反馈给我们。
-
-### 主要变化
-
- **兼容 React@15.x**。
- **全新单页站点**，使用 React 和 antd 进行了彻底重构，加载更快，访问更流畅。
- **样式支持按需加载**。可参考 [antd-init](https://github.com/ant-design/antd-init) 的模版代码, 需要配合 [babel-plugin-antd](https://github.com/ant-design/babel-plugin-antd#usage) 插件和 `style` 配置进行使用。[#900](https://github.com/ant-design/ant-design/issues/900)
- **提供独立的构建文件**。[文档](/docs/react/install#浏览器引入)
- 新增卡片组件 [Card](/components/card)。
- 新增评分组件 [Rate](/components/rate)。
- 新增 [LocaleProvider](/components/locale-provider) 组件，提供组件文案的国际化支持，并新增了英语和俄语的语言配置。[#1411](https://github.com/ant-design/ant-design/issues/1411)
- 更好的服务端渲染支持，修复了 Badge、Spin、Calendar、Upload 等组件服务端渲染的问题。
- 新增 antd.d.ts 以更好的支持 TypeScript。[@bang88](https://github.com/bang88)
- 布局组件支持响应式布局和栅格间隔设置。[#1082](https://github.com/ant-design/ant-design/issues/1082)
- Table 支持固定列和横向滚动。[#1265](https://github.com/ant-design/ant-design/issues/1265)
-
-### 不兼容改动
-
-此版本有部分不兼容的改动，升级时确保修改相应的使用代码。
-
- 推荐使用样式按需加载。如果依然需要整体载入样式，**样式入口文件已变为** `antd/dist/antd.css` 和 `antd/dist/antd.less`。如果你在项目中覆盖了 less 变量，less 文件的引用方式也有 [相应变更](https://github.com/ant-design/ant-design/issues/1558#issuecomment-218120000)。
-
-   ```diff
-   - import 'antd/lib/index.css';  // import 'antd/style/index.less';
-   + import 'antd/dist/antd.css';  // import 'antd/dist/antd.less';
-   ```
-
- 完全移除了 `0.12` 中废弃的 Validation 组件，可以直接 import [rc-form-validation](https://github.com/react-component/form-validation) 用以代替。[#1096](https://github.com/ant-design/ant-design/issues/1096)
- Breadcrumb.Item 的 `href` 属性被移除，请直接用 `a` 标签包裹可点击的内容。
- Modal 移除了 `align` 属性，现在可以使用 `style` 属性调整位置。
- `Modal.confirm` 等方法的配置项 `iconClassName` 重命名为 `iconType`。
- Select 移除了 `onChange` 中的 `label` 参数，新增了 `labelInValue` 属性。[#1695](https://github.com/ant-design/ant-design/issues/1695)
- 移除了 `import { Form } from 'antd/lib/form';` 的用法，应统一为 `import { Form } from 'antd';` 或 `import Form from 'antd/lib/form';`。
-
-#### 有兼容提示的改动
-
-这里的改动在升级后控制台会出现警告提示，请按提示进行修改。
-
- 废弃 QueueAnim，可以直接 import [rc-queue-anim](https://github.com/react-component/queue-anim) 用以代替。Ant Design 的动效方案已移至 [Ant Motion](http://motion.ant.design/components/queue-anim)，欢迎前往探索。
- Affix 的 `offset` 属性重命名为 `offsetTop`。
- Popover 的 `overlay` 属性重命名为 `content`。
- Progress.Line 使用方式改为 `<Progress />` 或 `<Progress type="line" />`。
- Progress.Circle 使用方式改为 `<Progress type="circle" />`。
- Spin 的 `spining` 属性更正为 `spinning`。
- Alert 的 type `warn` 重命名为 `warning`。[#1225](https://github.com/ant-design/ant-design/issues/1225)
- Tree 的 `onExpand` 参数从 `function(node, expanded, expandedKeys)` 调整为 `function(expandedKeys, {expanded, node})`。
-
-### Bug 修复
-
- 修复 Table 的 `size` 为 `middle` 时，分页器大小无法控制的问题。[#1396](https://github.com/ant-design/ant-design/issues/1396)
- 修复 Table 的 `pagination.defaultCurrent` 失效的问题。
- 修复 Cascader 的 `defaultValue` 没有被 `value` 覆盖的问题。
- 修复 Select 同时设置 `allowClear` `disabled` 时还是会出现清除按钮的问题。[#1480](https://github.com/ant-design/ant-design/issues/1480)
- 修复 Transfer 的 `DataSource` 变化时已选中项没有同步的问题。[#1587](https://github.com/ant-design/ant-design/issues/1587)
- 修复 DatePicker 日期格式与国际化配置不同步的问题。[#1509](https://github.com/ant-design/ant-design/issues/1509)
- 修复 Button 禁用时事件仍然会冒泡的问题。[#1541](https://github.com/ant-design/ant-design/issues/1541)
- 修复 Carousel 自动播放时的卡顿和报错问题。[#1397](https://github.com/ant-design/ant-design/issues/1397)
- 修复 Tabs 的 card 类型内嵌标准 Tabs 时的样式问题。[#1617](https://github.com/ant-design/ant-design/issues/1617)
- 修复 Menu `horizontal` 和 `vertical` 模式不支持受控 `openKeys` 的问题。
-
-### 其他改进
-
- 样式变量梳理，去除了部分无用的变量，另外还有大量样式细节问题修复。
- 依赖的 normalize.css 升级到 [4.x](https://github.com/necolas/normalize.css/blob/4.1.1/CHANGELOG.md)。
- 使用 ES2016 classes 重构了代码。[@waywardmonkeys](https://github.com/waywardmonkeys)
- Popover、Popconfirm 和 Tooltip 组件根据不同的弹出位置有了更精准方向的弹出动画。
- 补充 Select TreeSelect Switch Radio Checkbox 等组件的 `focus` 表现，增强表单组件的可用性。[#1358](https://github.com/ant-design/ant-design/issues/1358)
- message 和 notification 现在可以全局配置 `duration`。[#1143](https://github.com/ant-design/ant-design/issues/1143)
- DatePicker 和 TimePicker 的 `onChange(date, dateString)` 方法增加第二个参数用于获得格式化后的日期字符串。[#1104](https://github.com/ant-design/ant-design/issues/1104)
- DatePicker 和 DatePicker.RangePicker 现在可以设置内部 TimePikcer 的属性。[#1415](https://github.com/ant-design/ant-design/issues/1415)
- Checkbox
-  - 支持类似 Radio 的使用方式 `<Checkbox>option</Checkbox>`。[#1029](https://github.com/ant-design/ant-design/issues/1029)
-  - Checkbox.Group 现在允许 `label` 和 `value` 不同。[#1025](https://github.com/ant-design/ant-design/issues/1025)
-  - Checkbox.Group 允许单独设置某个 Checkbox 为 `disabled`。[#1218](https://github.com/ant-design/ant-design/issues/1218)
- Breadcrumb
-  - 支持路由模式下自定义链接 `linkRender`。[#1026](https://github.com/ant-design/ant-design/issues/1026)
-  - 支持路由模式下自定义最后一项内容 `nameRender`。[#1304](https://github.com/ant-design/ant-design/issues/1304)
- Modal
-  - 新增 `Modal.warning` 方法。
-  - 弹出时背景不再跟随滚动。[#1195](https://github.com/ant-design/ant-design/issues/1195)
- Select
-  - 搜索框和单选选择框合并，以优化视觉和交互效果。
-  - 优化多选框的选中效果。
- Spin
-  - 增加延时展示以优化体验。[#1273](https://github.com/ant-design/ant-design/issues/1273)
-  - 增加 `tip` 属性用于定义加载文案。[#1046](https://github.com/ant-design/ant-design/issues/1046)
- Steps
-  - 重构布局方式，以支持更灵活的自适应布局和优化了性能，并移除了 `maxDescriptionWidth` 属性。[#1099](https://github.com/ant-design/ant-design/issues/1099)
-  - 新增 `status` 属性以指定当前步骤状态，同时支持错误步骤的展示。[#1098](https://github.com/ant-design/ant-design/issues/1098)
- Timeline
-  - 新增 `dot` 属性，可自定义时间轴点。
-  - 现在可以设置 `className` 和 `style` 的问题。
-  - `color` 属性现在支持自定义色值。
- Tree
-  - 当子节点被选中时，自动展开父节点。
-  - 新增 `checkStrictly` 属性，支持父子节点选中关系脱离。
- Upload
-  - 在上传文件列表中的文件被删除时，将触发 `onRemove` 事件。[#1240](https://github.com/ant-design/ant-design/issues/1240)
-  - 增加 `onPreview` 支持文件的自定义预览方式。[#1240](https://github.com/ant-design/ant-design/issues/1240)
-  - `data` 属性支持设为一个函数，用于动态修改上传参数。[react-component/upload#32](https://github.com/react-component/upload/pull/32)
- Slider `marks` 现在支持 JSX 并可以单独设置某个标记的样式。
- Tag 的 `onClose` 可以使用 `e.preventDefault()` 阻止默认事件。[#1267](https://github.com/ant-design/ant-design/issues/1267)
- Form.Item 在有多个 child 时也可以自动生成错误信息与校验状态，但一个 Form.Item 内仍然只能有一个表单控件。[#1287](https://github.com/ant-design/ant-design/issues/1287)
- Input 新增 `onPressEnter` 属性监听回车事件。
- Table 现在可以通过 `filteredValue` `sortOrder` 控制筛选和排序的状态。[#971](https://github.com/ant-design/ant-design/issues/971)
- Button 增加了 `icon` 属性。[#1199](https://github.com/ant-design/ant-design/issues/1199)
- SubMenu 增加 `onTitleClick` 属性。
- Affix 增加 `offsetBottm` 属性，支持固定在底部。[#1000](https://github.com/ant-design/ant-design/issues/1000)
-
-### 相关工具发布
-
- [antd-init](http://github.com/ant-design/antd-init) 同步发布 `1.0.0` 版本，享受最新 [ant-tool](https://github.com/ant-tool/) 工具带来的流畅开发体验。
- [Ant Motion](http://motion.ant.design) 全新的动效设计解决方案。
- [Ant UX](http://ux.ant.design/) 发布 1.0 版本，提供多种平台的流程素材支持。
-
-## 0.12.17
-
-去 [GitHub](https://github.com/ant-design/ant-design/releases?after=1.0.0) 查看 `0.12.x` 及之前的更新日志。
+去 [GitHub](https://github.com/ant-design/ant-design/blob/1.x-stable/CHANGELOG.md) 查看 `0.x` 到 `1.x` 的 Change Log。
--- a/README-zh_CN.md
+++ b/README-zh_CN.md
@@ -5,15 +5,20 @@
 </p>

 # Ant Design
+
 [![](https://img.shields.io/travis/ant-design/ant-design.svg?style=flat-square)](https://travis-ci.org/ant-design/ant-design)
+[![Coveralls](https://img.shields.io/coveralls/ant-design/ant-design.svg?style=flat-square)](https://coveralls.io/github/ant-design/ant-design)
+[![Dependency Status](https://img.shields.io/david/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design)
+
 [![npm package](https://img.shields.io/npm/v/antd.svg?style=flat-square)](https://www.npmjs.org/package/antd)
 [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](https://npmjs.org/package/antd)
-[![CDNJS](https://img.shields.io/cdnjs/v/antd.svg?style=flat-square)](https://cdnjs.com/libraries/antd)
-[![Dependency Status](https://david-dm.org/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design)
-[![Join the chat at https://gitter.im/ant-design/ant-design](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/ant-design/ant-design.svg)](http://isitmaintained.com/project/ant-design/ant-design "Average time to resolve an issue")
+[![Join the chat at https://gitter.im/ant-design/ant-design](https://img.shields.io/gitter/room/ant-design/ant-design.svg?style=flat-square)](https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

 一套企业级的 UI 设计语言和 React 实现。

+[README in English](README.md)
+
 ## 特性

 - 提炼和服务企业级中后台产品的交互语言和视觉风格。
@@ -53,7 +58,7 @@ import 'antd/dist/antd.css';  // or 'antd/dist/antd.less'

 tsconfig.json

-```
+```js
 {
  "compilerOptions": {
    "moduleResolution": "node",
@@ -63,24 +68,35 @@ tsconfig.json
 }
 ```

+> 注意：设置 `allowSyntheticDefaultImports` 避免 `error TS1192: Module 'react' has no default export` 的错误。
+
+
 ## 链接

 - [首页](http://ant.design/)
- [React 实现](http://ant.design/docs/react/introduce)
- [修改记录](CHANGELOG.zh-CN.md)
- [开发脚手架](https://github.com/ant-design/antd-init/)
+- [组件文档](http://ant.design/docs/react/introduce)
+- [更新日志](CHANGELOG.en-US.md)
+- [开发脚手架](https://github.com/dvajs/dva-cli)
 - [开发工具文档](http://ant-tool.github.io/)
 - [React 基础组件](http://react-component.github.io/)
 - [移动端组件](http://mobile.ant.design)
- [React 代码规范](https://github.com/react-component/react-component.github.io/blob/master/docs/zh-cn/component-code-style.md)
- [组件设计原则](https://github.com/react-component/react-component.github.io/blob/master/docs/zh-cn/component-design.md)
- [网站和组件开发说明](https://github.com/ant-design/ant-design/wiki/%E7%BD%91%E7%AB%99%E5%92%8C%E7%BB%84%E4%BB%B6%E5%BC%80%E5%8F%91%E8%AF%B4%E6%98%8E)
- [版本发布手册](https://github.com/ant-design/ant-design/wiki/%E8%BD%AE%E5%80%BC%E8%A7%84%E5%88%99%E5%92%8C%E7%89%88%E6%9C%AC%E5%8F%91%E5%B8%83%E6%B5%81%E7%A8%8B)
+- [动效](https://motion.ant.design)
+- [设计规范速查手册](https://os.alipayobjects.com/rmsportal/HTXUgPGkyyxEivE.png)
+- [开发者说明](https://github.com/ant-design/ant-design/wiki/Development)
+- [版本发布规则](https://github.com/ant-design/ant-design/wiki/%E8%BD%AE%E5%80%BC%E8%A7%84%E5%88%99%E5%92%8C%E7%89%88%E6%9C%AC%E5%8F%91%E5%B8%83%E6%B5%81%E7%A8%8B)
 - [社区贡献脚手架和范例](https://github.com/ant-design/ant-design/issues/129)
 - [常见问题](https://github.com/ant-design/ant-design/wiki/FAQ)
- [CodePen 模板](http://codepen.io/benjycui/pen/KgPZrE?editors=001)
+- [CodePen 模板](http://codepen.io/benjycui/pen/KgPZrE?editors=001) for bug reports
 - [Awesome Ant Design](https://github.com/websemantics/awesome-ant-design)
+- [定制主题](http://ant.design/docs/react/customize-theme)

 ## 如何贡献

 我们欢迎任何形式的贡献，有任何建议或意见您可以进行 [Pull Request](https://github.com/ant-design/ant-design/pulls)，或者给我们 [提问](https://github.com/ant-design/ant-design/issues)。
+
+## 发布周期
+
+* 每周末会发布一个完全兼容的 patch 版本。
+* 每月发布一个带有新特性的 minor 版本。
+* 任何时候都可以发布紧急补丁。
+* 大版本号不在此发布周期内。
--- a/README.md
+++ b/README.md
@@ -5,22 +5,31 @@
 </p>

 # Ant Design
+
 [![](https://img.shields.io/travis/ant-design/ant-design.svg?style=flat-square)](https://travis-ci.org/ant-design/ant-design)
+[![Coveralls](https://img.shields.io/coveralls/ant-design/ant-design.svg?style=flat-square)](https://coveralls.io/github/ant-design/ant-design)
+[![Dependency Status](https://img.shields.io/david/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design)
+
 [![npm package](https://img.shields.io/npm/v/antd.svg?style=flat-square)](https://www.npmjs.org/package/antd)
 [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](https://npmjs.org/package/antd)
-[![CDNJS](https://img.shields.io/cdnjs/v/antd.svg?style=flat-square)](https://cdnjs.com/libraries/antd)
-[![Dependency Status](https://david-dm.org/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design)
-[![Join the chat at https://gitter.im/ant-design/ant-design](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/ant-design/ant-design.svg)](http://isitmaintained.com/project/ant-design/ant-design "Average time to resolve an issue")
+[![Join the chat at https://gitter.im/ant-design/ant-design](https://img.shields.io/gitter/room/ant-design/ant-design.svg?style=flat-square)](https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

 An enterprise-class UI design language and React-based implementation.

+[中文 README](README-zh_CN.md)
+
 ## Features

 - An enterprise-class design language and high quality UI.
- Graceful UI components out of the box, base on [React Component](http://react-component.github.io/badgeboard/).
- Writen in TypeScript with complete define types.
+- Graceful UI components out of the box, based on [React Component](http://react-component.github.io/badgeboard/).
+- Written in TypeScript with complete define types.
 - A npm + webpack + babel + [dora](https://github.com/dora-js/dora) + [dva](https://github.com/dvajs/dva) development framework.

+## Let's build a better antd together [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
+
+`antd` is an open source project, any reasonable improvement is welcomed. If you are interested in contributing to `antd`, you can watch this repository and join in [discussion](https://github.com/ant-design/ant-design/issues?q=is%3Aopen+is%3Aissue+label%3ADiscussion), or try to implement some [features which had been accepted](https://github.com/ant-design/ant-design/issues?q=is%3Aopen+is%3Aissue+label%3A%22PR+welcome%22).
+
 ## Install

 ```bash
@@ -67,18 +76,18 @@ import 'antd/dist/antd.css';  // or 'antd/dist/antd.less'
   import 'antd/lib/date-picker/style/css';  // with style
   ```

+## Environment Support

-## Browser Support
-
-Normal browsers and Internet Explorer 9+.
-
+* Browser: Modern browsers and Internet Explorer 9+.
 > [IE8 issues](https://github.com/xcatliu/react-ie8)
+* Server-side Rendering
+* [Electron](http://electron.atom.io/)

 ## TypeScript

 tsconfig.json

-```
+```js
 {
  "compilerOptions": {
    "moduleResolution": "node",
@@ -88,24 +97,33 @@ tsconfig.json
 }
 ```

+> Note: set `allowSyntheticDefaultImports` to prevent `error TS1192: Module 'react' has no default export`.
+
 ## Links

 - [Home page](http://ant.design/)
 - [UI library](http://ant.design/docs/react/introduce)
- [ChangeLog](CHANGELOG.en-US.md)
- [Scaffold tool](https://github.com/ant-design/antd-init/)
+- [Change Log](CHANGELOG.en-US.md)
+- [Scaffold tool](https://github.com/dvajs/dva-cli/)
 - [Development tool](http://ant-tool.github.io/)
 - [React components](http://react-component.github.io/)
 - [Mobile UI](http://mobile.ant.design)
- [React style guide](https://github.com/react-component/react-component.github.io/blob/master/docs/zh-cn/component-code-style.md)
- [React component design guide](https://github.com/react-component/react-component.github.io/blob/master/docs/zh-cn/component-design.md)
+- [Motion](https://motion.ant.design)
 - [Developer Instruction](https://github.com/ant-design/ant-design/wiki/Development)
 - [Versioning Release Note](https://github.com/ant-design/ant-design/wiki/%E8%BD%AE%E5%80%BC%E8%A7%84%E5%88%99%E5%92%8C%E7%89%88%E6%9C%AC%E5%8F%91%E5%B8%83%E6%B5%81%E7%A8%8B)
 - [Boilerplates](https://github.com/ant-design/ant-design/issues/129)
 - [FAQ](https://github.com/ant-design/ant-design/wiki/FAQ)
 - [CodePen boilerplate](http://codepen.io/benjycui/pen/KgPZrE?editors=001) for bug reports
 - [Awesome Ant Design](https://github.com/websemantics/awesome-ant-design)
+- [Customize Theme](http://ant.design/docs/react/customize-theme)

 ## Contributing

 We welcome all contributions, please read our [CONTRIBUTING.md](https://github.com/ant-design/ant-design/blob/master/.github/CONTRIBUTING.md) first. You can submit any ideas as [pull requests](https://github.com/ant-design/ant-design/pulls) or as a [GitHub issue](https://github.com/ant-design/ant-design/issues). If you'd like to improve code, check out the [Development Instruction](https://github.com/ant-design/ant-design/wiki/Development) and have a good time! :)
+
+## Release Schedule
+
+* Weekly release: patch version at the end of every week.
+* Monthly release: minor version at the end of every month.
+* Emergence release: emergence patch anytime if necessary.
+* Major version release is not included in this schedule.
--- a/components/_util/splitObject.tsx
+++ b/components/_util/splitObject.tsx
@@ -1,12 +0,0 @@
-export default function splitObject(obj, parts): Array<any> {
-  const left = {};
-  const right = {};
-  Object.keys(obj).forEach((k) => {
-    if (parts.indexOf(k) !== -1) {
-      left[k] = obj[k];
-    } else {
-      right[k] = obj[k];
-    }
-  });
-  return [left, right];
-}
--- a/components/_util/warning.tsx
+++ b/components/_util/warning.tsx
@@ -0,0 +1,9 @@
+import warning from 'warning';
+
+const warned: { [msg: string]: boolean} = {};
+export default (valid: boolean, message: string): void => {
+  if (!valid && !warned[message]) {
+    warning(false, message);
+    warned[message] = true;
+  }
+};
--- a/components/affix/tests/snapshots/demo.test.js.snap
+++ b/components/affix/tests/snapshots/demo.test.js.snap
@@ -0,0 +1,65 @@
+exports[`test renders ./components/affix/demo/basic.md correctly 1`] = `
+<div>
+  <div>
+    <div
+      class="">
+      <button
+        class="ant-btn ant-btn-primary"
+        type="button">
+        <span>
+          Affix top
+        </span>
+      </button>
+    </div>
+  </div>
+  <br />
+  <div>
+    <div
+      class="">
+      <button
+        class="ant-btn ant-btn-primary"
+        type="button">
+        <span>
+          Affix bottom
+        </span>
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/affix/demo/on-change.md correctly 1`] = `
+<div>
+  <div
+    class="">
+    <button
+      class="ant-btn"
+      type="button">
+      <span>
+        120px to affix top
+      </span>
+    </button>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/affix/demo/target.md correctly 1`] = `
+<div
+  class="scrollable-container">
+  <div
+    class="background">
+    <div>
+      <div
+        class="">
+        <button
+          class="ant-btn ant-btn-primary"
+          type="button">
+          <span>
+            Fixed at the top of container
+          </span>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+`;
--- a/components/affix/tests/demo.test.js
+++ b/components/affix/tests/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest';
+
+demoTest('affix');
--- a/components/affix/demo/basic.md
+++ b/components/affix/demo/basic.md
@@ -17,8 +17,15 @@ The simplest usage.
 import { Affix, Button } from 'antd';

 ReactDOM.render(
-  <Affix>
-    <Button type="primary">Affix top</Button>
-  </Affix>
-, mountNode);
+  <div>
+    <Affix>
+      <Button type="primary">Affix top</Button>
+    </Affix>
+    <br />
+    <Affix offsetBottom={0}>
+      <Button type="primary">Affix bottom</Button>
+    </Affix>
+  </div>,
+  mountNode
+);
 ````
--- a/components/affix/demo/bottom.md
+++ b/components/affix/demo/bottom.md
@@ -1,24 +0,0 @@
---
-order: 2
-title:
-  zh-CN: 下方固定
-  en-US: Bottom
---
-
-## zh-CN
-
-固定在屏幕下方。
-
-## en-US
-
-Affix to bottom.
-
-````jsx
-import { Affix, Button } from 'antd';
-
-ReactDOM.render(
-  <Affix offsetBottom={20}>
-    <Button type="primary">20px to affix bottom</Button>
-  </Affix>
-, mountNode);
-````
--- a/components/affix/demo/offset.md
+++ b/components/affix/demo/offset.md
@@ -1,24 +0,0 @@
---
-order: 1
-title:
-  zh-CN: 偏移
-  en-US: Offset
---
-
-## zh-CN
-
-达到一定的偏移量才触发。
-
-## en-US
-
-Affix element according to offset value.
-
-````jsx
-import { Affix, Button } from 'antd';
-
-ReactDOM.render(
-  <Affix offsetTop={75}>
-    <Button type="primary">75px to affix top</Button>
-  </Affix>
-, mountNode);
-````
--- a/components/affix/demo/on-change.md
+++ b/components/affix/demo/on-change.md
@@ -1,5 +1,5 @@
 ---
-order: 3
+order: 1
 title:
  zh-CN: 固定状态改变的回调
  en-US: Callback
@@ -19,6 +19,7 @@ import { Affix, Button } from 'antd';
 ReactDOM.render(
  <Affix offsetTop={120} onChange={affixed => console.log(affixed)}>
    <Button>120px to affix top</Button>
-  </Affix>
-, mountNode);
+  </Affix>,
+  mountNode
+);
 ````
--- a/components/affix/demo/target.md
+++ b/components/affix/demo/target.md
@@ -1,5 +1,5 @@
 ---
-order: 4
+order: 2
 title:
  zh-CN: 滚动容器
  en-US: Container to scroll.
@@ -11,27 +11,38 @@ title:

 ## en-US

-Set a `target` for 'Affix', which is listen to scroll event of target element (default is `window`). 
+Set a `target` for 'Affix', which is listen to scroll event of target element (default is `window`).

 ````jsx
 import { Affix, Button } from 'antd';

-const Demo = () => {
-  return (
-    <div style={{ height: 100, overflow: 'hidden' }}>
-      <div style={{ height: '100%', overflowY: 'scroll' }} id="affix-target">
-        <div style={{ height: 300, backgroundImage: 'url(https://zos.alipayobjects.com/rmsportal/RmjwQiJorKyobvI.jpg)' }}>
-          <br />
-          <br />
-          <br />
-          <Affix target={() => document.getElementById('affix-target')} offsetTop={20}>
-            <Button type="primary">Fixed at the top of container</Button>
+class Demo extends React.Component {
+  render() {
+    return (
+      <div className="scrollable-container" ref={(node) => { this.container = node; }}>
+        <div className="background">
+          <Affix target={() => this.container}>
+            <Button type="primary">
+              Fixed at the top of container
+            </Button>
          </Affix>
        </div>
      </div>
-    </div>
-  );
-};
+    );
+  }
+}

 ReactDOM.render(<Demo />, mountNode);
 ````
+
+<style>
+#components-affix-demo-target .scrollable-container {
+  height: 100px;
+  overflow-y: scroll;
+}
+#components-affix-demo-target .background {
+  padding-top: 60px;
+  height: 300px;
+  background-image: url('https://zos.alipayobjects.com/rmsportal/RmjwQiJorKyobvI.jpg');
+}
+</style>
--- a/components/affix/index.en-US.md
+++ b/components/affix/index.en-US.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Other
+type: Navigation
 title: Affix
 ---

@@ -8,9 +8,9 @@ Make an element sticky to viewport.

 ## When To Use

-When user browses a long web page, some content need to sticky to viewport. It is common for menus and actions.
+When user browses a long web page, some content need to stick to the viewport. This is common for menus and actions.

-Please note that Affix should not cover other content in page, especially when the size of viewport is small.
+Please note that Affix should not cover other content on the page, especially when the size of the viewport is small.

 ## API

--- a/components/affix/index.tsx
+++ b/components/affix/index.tsx
@@ -64,6 +64,7 @@ export default class Affix extends React.Component<AffixProps, any> {

  scrollEvent: any;
  resizeEvent: any;
+  timeout: any;
  refs: {
    fixedNode: HTMLElement;
  };
@@ -172,7 +173,10 @@ export default class Affix extends React.Component<AffixProps, any> {

  componentDidMount() {
    const target = this.props.target || getDefaultTarget;
-    this.setTargetEventListeners(target);
+    // Wait for parent component ref has its value
+    this.timeout = setTimeout(() => {
+      this.setTargetEventListeners(target);
+    });
  }

  componentWillReceiveProps(nextProps) {
@@ -187,10 +191,14 @@ export default class Affix extends React.Component<AffixProps, any> {

  componentWillUnmount() {
    this.clearScrollEventListeners();
+    clearTimeout(this.timeout);
  }

  setTargetEventListeners(getTarget) {
    const target = getTarget();
+    if (!target) {
+      return;
+    }
    this.scrollEvent = addEventListener(target, 'scroll', this.updatePosition);
    this.resizeEvent = addEventListener(target, 'resize', this.updatePosition);
  }
--- a/components/affix/index.zh-CN.md
+++ b/components/affix/index.zh-CN.md
@@ -1,7 +1,7 @@
 ---
 category: Components
 subtitle: 固钉
-type: Other
+type: Navigation
 title: Affix
 ---

--- a/components/alert/tests/snapshots/demo.test.js.snap
+++ b/components/alert/tests/snapshots/demo.test.js.snap
@@ -0,0 +1,308 @@
+exports[`test renders ./components/alert/demo/banner.md correctly 1`] = `
+<div>
+  <div
+    class="ant-alert ant-alert-warning ant-alert-banner"
+    data-show="true">
+    <i
+      class="anticon anticon-exclamation-circle ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Warning text
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <br />
+  <div
+    class="ant-alert ant-alert-warning ant-alert-banner"
+    data-show="true">
+    <i
+      class="anticon anticon-exclamation-circle ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Very long warning text warning text text text text text text text
+    </span>
+    <span
+      class="ant-alert-description" />
+    <a
+      class="ant-alert-close-icon">
+      <i
+        class="anticon anticon-cross" />
+    </a>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/alert/demo/basic.md correctly 1`] = `
+<div
+  class="ant-alert ant-alert-success ant-alert-no-icon"
+  data-show="true">
+  <span
+    class="ant-alert-message">
+    Success Text
+  </span>
+  <span
+    class="ant-alert-description" />
+</div>
+`;
+
+exports[`test renders ./components/alert/demo/closable.md correctly 1`] = `
+<div>
+  <div
+    class="ant-alert ant-alert-warning ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text
+    </span>
+    <span
+      class="ant-alert-description" />
+    <a
+      class="ant-alert-close-icon">
+      <i
+        class="anticon anticon-cross" />
+    </a>
+  </div>
+  <div
+    class="ant-alert ant-alert-error ant-alert-with-description ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Error Text
+    </span>
+    <span
+      class="ant-alert-description">
+      Error Description Error Description Error Description Error Description Error Description Error Description
+    </span>
+    <a
+      class="ant-alert-close-icon">
+      <i
+        class="anticon anticon-cross" />
+    </a>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/alert/demo/close-text.md correctly 1`] = `
+<div
+  class="ant-alert ant-alert-info ant-alert-no-icon"
+  data-show="true">
+  <span
+    class="ant-alert-message">
+    Info Text
+  </span>
+  <span
+    class="ant-alert-description" />
+  <a
+    class="ant-alert-close-icon">
+    Close Now
+  </a>
+</div>
+`;
+
+exports[`test renders ./components/alert/demo/description.md correctly 1`] = `
+<div>
+  <div
+    class="ant-alert ant-alert-success ant-alert-with-description ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Success Text
+    </span>
+    <span
+      class="ant-alert-description">
+      Success Description Success Description Success Description
+    </span>
+  </div>
+  <div
+    class="ant-alert ant-alert-info ant-alert-with-description ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Info Text
+    </span>
+    <span
+      class="ant-alert-description">
+      Info Description Info Description Info Description Info Description
+    </span>
+  </div>
+  <div
+    class="ant-alert ant-alert-warning ant-alert-with-description ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Warning Text
+    </span>
+    <span
+      class="ant-alert-description">
+      Warning Description Warning Description Warning Description Warning Description
+    </span>
+  </div>
+  <div
+    class="ant-alert ant-alert-error ant-alert-with-description ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Error Text
+    </span>
+    <span
+      class="ant-alert-description">
+      Error Description Error Description Error Description Error Description
+    </span>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/alert/demo/icon.md correctly 1`] = `
+<div>
+  <div
+    class="ant-alert ant-alert-success"
+    data-show="true">
+    <i
+      class="anticon anticon-check-circle ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Success Tips
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <div
+    class="ant-alert ant-alert-info"
+    data-show="true">
+    <i
+      class="anticon anticon-info-circle ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Informational Notes
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <div
+    class="ant-alert ant-alert-warning"
+    data-show="true">
+    <i
+      class="anticon anticon-exclamation-circle ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Warning
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <div
+    class="ant-alert ant-alert-error"
+    data-show="true">
+    <i
+      class="anticon anticon-cross-circle ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Error
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <div
+    class="ant-alert ant-alert-success ant-alert-with-description"
+    data-show="true">
+    <i
+      class="anticon anticon-check-circle-o ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      success tips
+    </span>
+    <span
+      class="ant-alert-description">
+      Detailed description and advices about successful copywriting.
+    </span>
+  </div>
+  <div
+    class="ant-alert ant-alert-info ant-alert-with-description"
+    data-show="true">
+    <i
+      class="anticon anticon-info-circle-o ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Informational Notes
+    </span>
+    <span
+      class="ant-alert-description">
+      Additional description and informations about copywriting.
+    </span>
+  </div>
+  <div
+    class="ant-alert ant-alert-warning ant-alert-with-description"
+    data-show="true">
+    <i
+      class="anticon anticon-exclamation-circle-o ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Warning
+    </span>
+    <span
+      class="ant-alert-description">
+      This is a warning notice about copywriting.
+    </span>
+  </div>
+  <div
+    class="ant-alert ant-alert-error ant-alert-with-description"
+    data-show="true">
+    <i
+      class="anticon anticon-cross-circle-o ant-alert-icon" />
+    <span
+      class="ant-alert-message">
+      Error
+    </span>
+    <span
+      class="ant-alert-description">
+      This is an error message about copywriting.
+    </span>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/alert/demo/style.md correctly 1`] = `
+<div>
+  <div
+    class="ant-alert ant-alert-success ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Success Text
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <div
+    class="ant-alert ant-alert-info ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Info Text
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <div
+    class="ant-alert ant-alert-warning ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Warning Text
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <div
+    class="ant-alert ant-alert-error ant-alert-no-icon"
+    data-show="true">
+    <span
+      class="ant-alert-message">
+      Error Text
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+</div>
+`;
--- a/components/alert/tests/demo.test.js
+++ b/components/alert/tests/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest';
+
+demoTest('alert');
--- a/components/alert/index.en-US.md
+++ b/components/alert/index.en-US.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Views
+type: Feedback
 title: Alert
 ---

@@ -9,7 +9,7 @@ Alert component for feedback.
 ## When To Use

 - When you need to show alert messages for users.
- When you need a persist static container, and closable by user actions.
+- When you need a persistent static container which is closable by user actions.

 ## API

--- a/components/alert/index.tsx
+++ b/components/alert/index.tsx
@@ -93,21 +93,25 @@ export default class Alert extends React.Component<AlertProps, any> {
      iconType += '-o';
    }

-    let alertCls = classNames({
-      [prefixCls]: true,
+    let alertCls = classNames(prefixCls, {
      [`${prefixCls}-${type}`]: true,
      [`${prefixCls}-close`]: !this.state.closing,
      [`${prefixCls}-with-description`]: !!description,
      [`${prefixCls}-no-icon`]: !showIcon,
      [`${prefixCls}-banner`]: !!banner,
-      [className]: !!className,
-    });
+    }, className);

    // closeable when closeText is assigned
    if (closeText) {
      closable = true;
    }

+    const closeIcon = closable ? (
+      <a onClick={this.handleClose} className={`${prefixCls}-close-icon`}>
+        {closeText || <Icon type="cross" />}
+      </a>
+    ) : null;
+
    return this.state.closed ? null : (
      <Animate
        component=""
@@ -119,9 +123,7 @@ export default class Alert extends React.Component<AlertProps, any> {
          {showIcon ? <Icon className={`${prefixCls}-icon`} type={iconType} /> : null}
          <span className={`${prefixCls}-message`}>{message}</span>
          <span className={`${prefixCls}-description`}>{description}</span>
-          {closable ? <a onClick={this.handleClose} className={`${prefixCls}-close-icon`}>
-            {closeText || <Icon type="cross" />}
-          </a> : null}
+          {closeIcon}
        </div>
      </Animate>
    );
--- a/components/alert/index.zh-CN.md
+++ b/components/alert/index.zh-CN.md
@@ -1,7 +1,7 @@
 ---
 category: Components
 subtitle: 警告提示
-type: Views
+type: Feedback
 title: Alert
 ---

--- a/components/alert/style/index.less
+++ b/components/alert/style/index.less
@@ -16,8 +16,8 @@
  }

  &-icon {
-    font-size: 14px;
-    top: 9px;
+    font-size: @font-size-lg;
+    top: 9.5px;
    left: 16px;
    position: absolute;
  }
@@ -29,32 +29,32 @@
  }

  &-success {
-    border: 1px solid tint(@success-color, 80%);
-    background-color: tint(@success-color, 90%);
+    border: 1px solid @green-2;
+    background-color: @green-1;
    .@{alert-prefix-cls}-icon {
      color: @success-color;
    }
  }

  &-info {
-    border: 1px solid tint(@primary-color, 80%);
-    background-color: tint(@primary-color, 90%);
+    border: 1px solid @primary-2;
+    background-color: @primary-1;
    .@{alert-prefix-cls}-icon {
      color: @primary-color;
    }
  }

  &-warning {
-    border: 1px solid tint(@warning-color, 80%);
-    background-color: tint(@warning-color, 90%);
+    border: 1px solid @yellow-2;
+    background-color: @yellow-1;
    .@{alert-prefix-cls}-icon {
      color: @warning-color;
    }
  }

  &-error {
-    border: 1px solid tint(@error-color, 80%);
-    background-color: tint(@error-color, 90%);
+    border: 1px solid @red-2;
+    background-color: @red-1;
    .@{alert-prefix-cls}-icon {
      color: @error-color;
    }
@@ -71,7 +71,7 @@
    cursor: pointer;

    .@{iconfont-css-prefix}-cross {
-      color: @legend-color;
+      color: @text-color-secondary;
      transition: color .3s ease;
      &:hover {
        color: #404040;
@@ -113,7 +113,7 @@
  }

  &-with-description &-message {
-    font-size: 14px;
+    font-size: @font-size-lg;
    color: @heading-color;
    display: block;
    margin-bottom: 4px;
--- a/components/anchor/AnchorLink.tsx
+++ b/components/anchor/AnchorLink.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import classNames from 'classnames';
+import AnchorHelper, { scrollTo } from './anchorHelper';
+
+export interface AnchorLinkProps {
+  href: string;
+  onClick: (href: string, component: Element) => void;
+  active?: boolean;
+  prefixCls?: string;
+  children?: any;
+  title?: Element;
+  bounds: number;
+  target?: () => HTMLElement | Window;
+  affix?: boolean;
+}
+
+export default class AnchorLink extends React.Component<AnchorLinkProps, any> {
+  static contextTypes = {
+    anchorHelper: React.PropTypes.any,
+  };
+
+  static defaultProps = {
+    href: '#',
+    prefixCls: 'ant-anchor',
+  };
+
+  context: {
+    anchorHelper: AnchorHelper;
+  };
+
+  private _component: Element;
+
+  setActiveAnchor() {
+    const { bounds, href, affix } = this.props;
+    const { anchorHelper } = this.context;
+    const active = affix && anchorHelper && anchorHelper.getCurrentAnchor(bounds) === href;
+    if (active && anchorHelper) {
+      anchorHelper.setActiveAnchor(this._component);
+    }
+  }
+
+  componentDidMount() {
+    this.setActiveAnchor();
+  }
+
+  componentDidUpdate() {
+    this.setActiveAnchor();
+  }
+
+  renderAnchorLink = (child) => {
+    const { href } = child.props;
+    if (href) {
+      this.context.anchorHelper.addLink(href);
+      return React.cloneElement(child, {
+        onClick: this.props.onClick,
+        prefixCls: this.props.prefixCls,
+        affix: this.props.affix,
+      });
+    }
+    return child;
+  }
+
+  refsTo = (component) => {
+    this._component = component;
+  }
+
+  scrollTo = (e) => {
+    e.preventDefault();
+    const { onClick, href } = this.props;
+    const { anchorHelper } = this.context;
+    if (onClick) {
+      onClick(href, this._component);
+    } else {
+      e.stopPreventDefault();
+      const scrollToFn = anchorHelper ? anchorHelper.scrollTo : scrollTo;
+      scrollToFn(href);
+    }
+  }
+
+  render() {
+    const { prefixCls, href, children, title, bounds, affix } = this.props;
+    const { anchorHelper } = this.context;
+    const active = affix && anchorHelper && anchorHelper.getCurrentAnchor(bounds) === href;
+    const cls = classNames({
+      [`${prefixCls}-link`]: true,
+      [`${prefixCls}-link-active`]: active,
+    });
+    return (
+      <div className={cls}>
+        <a
+          ref={this.refsTo}
+          className={`${prefixCls}-link-title`}
+          onClick={this.scrollTo}
+          href={href}
+          title={typeof title === 'string' ? title : ''}
+        >
+          {title}
+        </a>
+        {React.Children.map(children, this.renderAnchorLink)}
+      </div>
+    );
+  }
+}
--- a/components/anchor/tests/Anchor.test.js
+++ b/components/anchor/tests/Anchor.test.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import Anchor from '..';
+
+const { Link } = Anchor;
+
+describe('Anchor Render', () => {
+  it('Anchor render perfectly', () => {
+    const wrapper = mount(
+      <Anchor>
+        <Link href="#API" title="API" />
+      </Anchor>
+    );
+
+    wrapper.find('a[href="#API"]').simulate('click');
+
+    wrapper.node.handleScroll();
+    expect(wrapper.node.state).not.toBe(null);
+  });
+});
--- a/components/anchor/tests/snapshots/demo.test.js.snap
+++ b/components/anchor/tests/snapshots/demo.test.js.snap
@@ -0,0 +1,122 @@
+exports[`test renders ./components/anchor/demo/basic.md correctly 1`] = `
+<div>
+  <div
+    class="">
+    <div
+      class="ant-anchor-wrapper">
+      <div
+        class="ant-anchor">
+        <div
+          class="ant-anchor-ink">
+          <span
+            class="ant-anchor-ink-ball animated" />
+        </div>
+        <div
+          class="ant-anchor-link">
+          <a
+            class="ant-anchor-link-title"
+            href="#components-anchor-demo-basic"
+            title="Basic demo">
+            Basic demo
+          </a>
+        </div>
+        <div
+          class="ant-anchor-link">
+          <a
+            class="ant-anchor-link-title"
+            href="#components-anchor-demo-fixed"
+            title="Fixed demo">
+            Fixed demo
+          </a>
+        </div>
+        <div
+          class="ant-anchor-link">
+          <a
+            class="ant-anchor-link-title"
+            href="#API"
+            title="API">
+            API
+          </a>
+          <div
+            class="ant-anchor-link">
+            <a
+              class="ant-anchor-link-title"
+              href="#Anchor-Props"
+              title="Anchor Props">
+              Anchor Props
+            </a>
+          </div>
+          <div
+            class="ant-anchor-link">
+            <a
+              class="ant-anchor-link-title"
+              href="#Link-Props"
+              title="Link Props">
+              Link Props
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/anchor/demo/fixed.md correctly 1`] = `
+<div
+  class="ant-anchor-wrapper">
+  <div
+    class="ant-anchor fixed">
+    <div
+      class="ant-anchor-ink">
+      <span
+        class="ant-anchor-ink-ball animated" />
+    </div>
+    <div
+      class="ant-anchor-link">
+      <a
+        class="ant-anchor-link-title"
+        href="#components-anchor-demo-basic"
+        title="Basic demo">
+        Basic demo
+      </a>
+    </div>
+    <div
+      class="ant-anchor-link">
+      <a
+        class="ant-anchor-link-title"
+        href="#components-anchor-demo-fixed"
+        title="Fixed demo">
+        Fixed demo
+      </a>
+    </div>
+    <div
+      class="ant-anchor-link">
+      <a
+        class="ant-anchor-link-title"
+        href="#API"
+        title="API">
+        API
+      </a>
+      <div
+        class="ant-anchor-link">
+        <a
+          class="ant-anchor-link-title"
+          href="#Anchor-Props"
+          title="Anchor Props">
+          Anchor Props
+        </a>
+      </div>
+      <div
+        class="ant-anchor-link">
+        <a
+          class="ant-anchor-link-title"
+          href="#Link-Props"
+          title="Link Props">
+          Link Props
+        </a>
+      </div>
+    </div>
+  </div>
+</div>
+`;
--- a/components/anchor/tests/demo.test.js
+++ b/components/anchor/tests/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest';
+
+demoTest('anchor');
--- a/components/anchor/anchorHelper.tsx
+++ b/components/anchor/anchorHelper.tsx
@@ -0,0 +1,129 @@
+import getScroll from '../_util/getScroll';
+import getRequestAnimationFrame from '../_util/getRequestAnimationFrame';
+
+export const reqAnimFrame = getRequestAnimationFrame();
+
+export const easeInOutCubic = (t, b, c, d) => {
+  const cc = c - b;
+  t /= d / 2;
+  if (t < 1) {
+    return cc / 2 * t * t * t + b;
+  }
+  return cc / 2 * ((t -= 2) * t * t + 2) + b;
+};
+
+export function getDefaultTarget() {
+  return typeof window !== 'undefined' ?
+    window : null;
+}
+
+export function getOffsetTop(element): number {
+  if (!element) {
+    return 0;
+  }
+
+  if (!element.getClientRects().length) {
+    return 0;
+  }
+
+  const rect = element.getBoundingClientRect();
+
+  if ( rect.width || rect.height ) {
+    const doc = element.ownerDocument;
+    const docElem = doc.documentElement;
+    return  rect.top - docElem.clientTop;
+  }
+
+  return rect.top;
+}
+
+export type Section = {
+  top: number;
+  bottom: number;
+  section: any;
+};
+
+export function scrollTo(href, target = getDefaultTarget, callback = () => {}) {
+  const scrollTop = getScroll(target(), true);
+  const targetElement = document.getElementById(href.substring(1));
+  if (!targetElement) {
+    return;
+  }
+  const offsetTop = getOffsetTop(targetElement);
+  const targetScrollTop = scrollTop + offsetTop;
+  const startTime = Date.now();
+  const frameFunc = () => {
+    const timestamp = Date.now();
+    const time = timestamp - startTime;
+    window.scrollTo(window.pageXOffset, easeInOutCubic(time, scrollTop, targetScrollTop, 450));
+    if (time < 450) {
+      reqAnimFrame(frameFunc);
+    } else {
+      callback();
+    }
+  };
+  reqAnimFrame(frameFunc);
+  history.pushState(null, '', href);
+}
+
+class AnchorHelper {
+  private links: Array<string>;
+  private currentAnchor: HTMLElement | null;
+  private _activeAnchor: string;
+
+  constructor() {
+    this.links = [];
+    this.currentAnchor = null;
+    this._activeAnchor = '';
+  }
+
+  addLink(link) {
+    if (this.links.indexOf(link) === -1) {
+      this.links.push(link);
+    }
+  }
+
+  getCurrentActiveAnchor(): HTMLElement | null {
+    return this.currentAnchor;
+  }
+
+  setActiveAnchor(component) {
+    this.currentAnchor = component;
+  }
+
+  getCurrentAnchor(bounds = 5) {
+    let activeAnchor = '';
+    if (typeof document === 'undefined') {
+      return activeAnchor;
+    }
+
+    const linksPositions = (this.links
+    .map(section => {
+      const target = document.getElementById(section.substring(1));
+      if (target && getOffsetTop(target) < bounds) {
+        const top = getOffsetTop(target);
+        if (top <= bounds) {
+          return {
+            section,
+            top,
+            bottom: top + target.clientHeight,
+          };
+        }
+      }
+      return null;
+    })
+    .filter(section => section !== null) as Array<Section>);
+
+    if (linksPositions.length) {
+      const maxSection = linksPositions.reduce((prev, curr) => curr.top > prev.top ? curr : prev);
+      return maxSection.section;
+    }
+    return '';
+  }
+
+  scrollTo(href, target = getDefaultTarget, callback = () => {}) {
+    scrollTo(href, target, callback);
+  }
+}
+
+export default AnchorHelper;
--- a/components/anchor/demo/basic.md
+++ b/components/anchor/demo/basic.md
@@ -0,0 +1,36 @@
+---
+order: 0
+title:
+  zh-CN: 基本
+  en-US: Basic
+---
+
+## zh-CN
+
+最简单的用法。
+
+## en-US
+
+The simplest usage.
+
+```jsx
+import { Anchor } from 'antd';
+const { Link } = Anchor;
+
+ReactDOM.render(
+  <Anchor>
+    <Link href="#components-anchor-demo-basic" title="Basic demo" />
+    <Link href="#components-anchor-demo-fixed" title="Fixed demo" />
+    <Link href="#API" title="API">
+      <Link href="#Anchor-Props" title="Anchor Props" />
+      <Link href="#Link-Props" title="Link Props" />
+    </Link>
+  </Anchor>
+, mountNode);
+```
+
+<style>
+.code-box-demo .ant-affix {
+  z-index: 11;
+}
+</style>
--- a/components/anchor/demo/fixed.md
+++ b/components/anchor/demo/fixed.md
@@ -0,0 +1,30 @@
+---
+order: 2
+title:
+  zh-CN: 固定
+  en-US: Fixed Anchor
+---
+
+## zh-CN
+
+不浮动，状态不随页面滚动变化。
+
+## en-US
+
+Do not change state when page is scrolling.
+
+```jsx
+import { Anchor } from 'antd';
+const { Link } = Anchor;
+
+ReactDOM.render(
+  <Anchor affix={false}>
+    <Link href="#components-anchor-demo-basic" title="Basic demo" />
+    <Link href="#components-anchor-demo-fixed" title="Fixed demo" />
+    <Link href="#API" title="API">
+      <Link href="#Anchor-Props" title="Anchor Props" />
+      <Link href="#Link-Props" title="Link Props" />
+    </Link>
+  </Anchor>
+, mountNode);
+```
--- a/components/anchor/index.en-US.md
+++ b/components/anchor/index.en-US.md
@@ -0,0 +1,29 @@
+---
+category: Components
+type: Other
+cols: 2
+title: Anchor
+---
+
+Hyperlinks to scroll on one page.
+
+## When To Use
+
+For displaying anchor hyperlinks on page and jumping between them.
+
+## API
+
+### Anchor Props
+
+| Property     | Description           | Type     | Default      |
+|--------------|-----------------------|----------|--------------|
+| offsetTop    | Pixels to offset from top when calculating position of scroll | Number | 0 |
+| offsetBottom | Pixels to offset from bottom when calculating position of scroll | Number | - |
+| bounds     | Bounding distance of anchor area | Number | 5(px) |
+
+### Link Props
+
+| Property        | Description           | Type               | Default       |
+|-------------|----------------|--------------------|--------------|
+| href    | target of hyperlink  | String |         |
+| title | content of  hyperlink | React.Node |         |
--- a/components/anchor/index.tsx
+++ b/components/anchor/index.tsx
@@ -0,0 +1,141 @@
+import React from 'react';
+import classNames from 'classnames';
+import addEventListener from 'rc-util/lib/Dom/addEventListener';
+import AnchorLink from './AnchorLink';
+import Affix from '../affix';
+import AnchorHelper, { getDefaultTarget } from './anchorHelper';
+
+export interface AnchorProps {
+  target: () => HTMLElement | Window;
+  children: React.ReactNode;
+  prefixCls?: string;
+  offsetTop?: number;
+  bounds?: number;
+  className?: string;
+  style?: React.CSSProperties;
+  affix?: boolean;
+}
+
+export default class Anchor extends React.Component<AnchorProps, any> {
+  static Link = AnchorLink;
+
+  static defaultProps = {
+    prefixCls: 'ant-anchor',
+    affix: true,
+  };
+
+  static childContextTypes = {
+    anchorHelper: React.PropTypes.any,
+  };
+
+  refs: {
+    ink?: any;
+  };
+
+  private scrollEvent: any;
+  private anchorHelper: AnchorHelper;
+  private _avoidInk: boolean;
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      activeAnchor: null,
+      animated: true,
+    };
+    this.anchorHelper = new AnchorHelper();
+  }
+
+  handleScroll = () => {
+    this.setState({
+      activeAnchor: this.anchorHelper.getCurrentAnchor(this.props.bounds),
+    });
+  }
+
+  getChildContext() {
+    return {
+      anchorHelper: this.anchorHelper,
+    };
+  }
+
+  componentDidMount() {
+    this.handleScroll();
+    this.updateInk();
+    this.scrollEvent = addEventListener((this.props.target || getDefaultTarget)(), 'scroll', this.handleScroll);
+  }
+
+  componentWillUnmount() {
+    if (this.scrollEvent) {
+      this.scrollEvent.remove();
+    }
+  }
+
+  componentDidUpdate() {
+    if (!this._avoidInk) {
+      this.updateInk();
+    }
+  }
+
+  updateInk = () => {
+    const activeAnchor = this.anchorHelper.getCurrentActiveAnchor();
+    if (activeAnchor) {
+      this.refs.ink.style.top = `${activeAnchor.offsetTop + activeAnchor.clientHeight / 2 - 4.5}px`;
+    }
+  }
+
+  clickAnchorLink = (href, component) => {
+    this._avoidInk = true;
+    this.refs.ink.style.top = `${component.offsetTop + component.clientHeight / 2 - 4.5}px`;
+    this.anchorHelper.scrollTo(href, getDefaultTarget, () => {
+      this._avoidInk = false;
+    });
+  }
+
+  renderAnchorLink = (child) => {
+    const { href } = child.props;
+    if (href) {
+      this.anchorHelper.addLink(href);
+      return React.cloneElement(child, {
+        onClick: this.clickAnchorLink,
+        prefixCls: this.props.prefixCls,
+        bounds: this.props.bounds,
+        affix: this.props.affix,
+      });
+    }
+    return child;
+  }
+
+  render() {
+    const { prefixCls, offsetTop, style, className = '', affix } = this.props;
+    const { activeAnchor, animated } = this.state;
+    const inkClass = classNames({
+      [`${prefixCls}-ink-ball`]: true,
+      animated,
+      visible: !!activeAnchor,
+    });
+
+    const wrapperClass = classNames({
+      [`${prefixCls}-wrapper`]: true,
+    }, className);
+
+    const anchorClass = classNames(prefixCls, {
+      'fixed': !affix,
+    });
+
+    const anchorContent = (
+      <div className={wrapperClass} style={style}>
+        <div className={anchorClass}>
+          <div className={`${prefixCls}-ink`} >
+            <span className={inkClass} ref="ink" />
+          </div>
+          {React.Children.map(this.props.children, this.renderAnchorLink)}
+        </div>
+      </div>
+    );
+
+    return !affix ? anchorContent : (
+      <Affix offsetTop={offsetTop}>
+        {anchorContent}
+      </Affix>
+    );
+  }
+}
--- a/components/anchor/index.zh-CN.md
+++ b/components/anchor/index.zh-CN.md
@@ -0,0 +1,30 @@
+---
+category: Components
+subtitle: 锚点
+cols: 2
+type: Other
+title: Anchor
+---
+
+用于跳转到页面指定位置。
+
+## 何时使用
+
+需要展现当前页面上可供跳转的锚点链接，以及快速在锚点之间跳转。
+
+## API
+
+### Anchor Props
+
+| 成员        | 说明           | 类型               | 默认值       |
+|-------------|----------------|--------------------|--------------|
+| offsetTop    | 距离窗口顶部达到指定偏移量后触发   | Number |         |
+| offsetBottom | 距离窗口底部达到指定偏移量后触发   | Number |         |
+| bounds | 锚点区域边界 | Number | 5(px) |
+
+### Link Props
+
+| 成员        | 说明           | 类型               | 默认值       |
+|-------------|----------------|--------------------|--------------|
+| href    | 锚点链接   | String |         |
+| title | 文字内容   | React.Node |         |
--- a/components/anchor/style/index.less
+++ b/components/anchor/style/index.less
@@ -0,0 +1,78 @@
+@import "../../style/themes/default";
+
+.@{ant-prefix} {
+  &-anchor {
+    position: relative;
+    &-wrapper {
+      background-color: @component-background;
+    }
+
+    &-ink {
+      position: absolute;
+      height: 100%;
+      left: 0;
+      top: 0;
+      &:before {
+        content: ' ';
+        position: relative;
+        width: 2px;
+        height: 100%;
+        display: block;
+        background-color: @border-color-split;
+        margin: 0 auto;
+      }
+      &-ball {
+        display: none;
+        position: absolute;
+        width: 9px;
+        height: 9px;
+        border-radius: 9px;
+        border: 3px solid @primary-color;
+        background-color: @component-background;
+        left: 50%;
+        transition: top .3s ease-in-out;
+        transform: translateX(-50%);
+        &.visible {
+          display: inline-block;
+        }
+      }
+    }
+
+    &.fixed &-ink &-ink-ball {
+      display: none;
+    }
+  }
+
+  &-anchor-link {
+    padding: 8px 0 8px 18px;
+    line-height: 1;
+
+    & & {
+      padding-top: 6px;
+      padding-bottom: 6px;
+    }
+
+    &-title {
+      display: block;
+      position: relative;
+      transition: all .3s;
+      color: @text-color;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin-bottom: 8px;
+    }
+
+    &-title:only-child {
+      margin-bottom: 0;
+    }
+
+    &-active > &-title {
+      color: @primary-color;
+    }
+
+    & > & {
+      font-size: @font-size-base;
+    }
+  }
+}
--- a/components/anchor/style/index.tsx
+++ b/components/anchor/style/index.tsx
@@ -0,0 +1,2 @@
+import '../../style/index.less';
+import './index.less';
--- a/components/auto-complete/tests/snapshots/demo.test.js.snap
+++ b/components/auto-complete/tests/snapshots/demo.test.js.snap
@@ -0,0 +1,85 @@
+exports[`test renders ./components/auto-complete/demo/basic.md correctly 1`] = `
+<div
+  class="ant-select-show-search ant-select ant-select-combobox ant-select-enabled"
+  style="width:200px;">
+  <div
+    aria-autocomplete="list"
+    aria-expanded="false"
+    aria-haspopup="true"
+    class="ant-select-selection
+              ant-select-selection--single"
+    role="combobox">
+    <div
+      class="ant-select-selection__rendered">
+      <div
+        class="ant-select-selection__placeholder"
+        style="display:block;user-select:none;-webkit-user-select:none;"
+        unselectable="unselectable">
+        input here
+      </div>
+      <ul>
+        <li
+          class="ant-select-search ant-select-search--inline">
+          <div
+            class="ant-select-search__field__wrap">
+            <input
+              class="ant-select-search__field"
+              value="" />
+            <span
+              class="ant-select-search__field__mirror" />
+          </div>
+        </li>
+      </ul>
+    </div>
+    <span
+      class="ant-select-arrow"
+      style="user-select:none;-webkit-user-select:none;"
+      unselectable="unselectable">
+      <b />
+    </span>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/auto-complete/demo/options.md correctly 1`] = `
+<div
+  class="ant-select-show-search ant-select ant-select-combobox ant-select-enabled"
+  style="width:200px;">
+  <div
+    aria-autocomplete="list"
+    aria-expanded="false"
+    aria-haspopup="true"
+    class="ant-select-selection
+              ant-select-selection--single"
+    role="combobox">
+    <div
+      class="ant-select-selection__rendered">
+      <div
+        class="ant-select-selection__placeholder"
+        style="display:block;user-select:none;-webkit-user-select:none;"
+        unselectable="unselectable">
+        input here
+      </div>
+      <ul>
+        <li
+          class="ant-select-search ant-select-search--inline">
+          <div
+            class="ant-select-search__field__wrap">
+            <input
+              class="ant-select-search__field"
+              value="" />
+            <span
+              class="ant-select-search__field__mirror" />
+          </div>
+        </li>
+      </ul>
+    </div>
+    <span
+      class="ant-select-arrow"
+      style="user-select:none;-webkit-user-select:none;"
+      unselectable="unselectable">
+      <b />
+    </span>
+  </div>
+</div>
+`;
--- a/components/auto-complete/tests/demo.test.js
+++ b/components/auto-complete/tests/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest';
+
+demoTest('auto-complete');
--- a/components/auto-complete/demo/basic.md
+++ b/components/auto-complete/demo/basic.md
@@ -43,6 +43,7 @@ const Complete = React.createClass({
        style={{ width: 200 }}
        onSelect={onSelect}
        onChange={this.handleChange}
+        placeholder="input here"
      />
    );
  },
--- a/components/auto-complete/demo/options.md
+++ b/components/auto-complete/demo/options.md
@@ -42,6 +42,7 @@ const Complete = React.createClass({
      <AutoComplete
        style={{ width: 200 }}
        onChange={this.handleChange}
+        placeholder="input here"
      >
        {children}
      </AutoComplete>
--- a/components/auto-complete/index.en-US.md
+++ b/components/auto-complete/index.en-US.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Form Controls
+type: Data Entry
 cols: 1
 title: AutoComplete
 ---
@@ -9,7 +9,7 @@ Autocomplete function of input field.

 ## When To Use

-When need to use autocomplete function.
+When there is a need for autocomplete functionality.

 ## API

@@ -17,7 +17,7 @@ When need to use autocomplete function.
 const dataSource = ['12345', '23456', '34567'];
 <AutoComplete dataSource={dataSource} />
 ```
-
+Since `AutoComplete` is based on `Select`, so besides the following API, `AutoComplete` has the same API as `Select`.

 | Property           | Description                             |  Type | Default |
 |----------------|----------------------------------|------------|--------|
@@ -28,3 +28,4 @@ const dataSource = ['12345', '23456', '34567'];
 | 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) | -   |
 | disabled | Whether disabled select | boolean | false |
+| placeholder | placeholder of input | string | - |
--- a/components/auto-complete/index.tsx
+++ b/components/auto-complete/index.tsx
@@ -72,11 +72,13 @@ export default class AutoComplete extends React.Component<AutoCompleteProps, any
    }) : []);

    return (
-      <Select {...this.props}
+      <Select
+        {...this.props}
        className={cls}
        optionLabelProp={optionLabelProp}
        combobox
-        notFoundContent={notFoundContent} >
+        notFoundContent={notFoundContent}
+      >
        {options}
      </Select>
    );
--- a/components/auto-complete/index.zh-CN.md
+++ b/components/auto-complete/index.zh-CN.md
@@ -1,7 +1,7 @@
 ---
 category: Components
 subtitle: 自动完成
-type: Form Controls
+type: Data Entry
 cols: 1
 title: AutoComplete
 ---
@@ -18,7 +18,7 @@ title: AutoComplete
 const dataSource = ['12345', '23456', '34567'];
 <AutoComplete dataSource={dataSource} />
 ```
-
+因为 `AutoComplete` 是基于 `Select` 封装的，所以除了以下 API 外，`AutoComplete` 跟 `Select` 拥有一样的 API。

 | 参数           | 说明                             | 类型        | 默认值 |
 |----------------|----------------------------------|------------|---------|
@@ -29,3 +29,4 @@ const dataSource = ['12345', '23456', '34567'];
 | onChange | 选中 option，或 input 的 value 变化时，调用此函数 | function(value) | 无 |
 | onSelect | 被选中时调用，参数为选中项的 value 值	| function(value, option)	| 无 |
 | disabled | 是否禁用 | boolean | false |
+| placeholder | 输入框提示 | string | - |
--- a/components/back-top/tests/snapshots/demo.test.js.snap
+++ b/components/back-top/tests/snapshots/demo.test.js.snap
@@ -0,0 +1,21 @@
+exports[`test renders ./components/back-top/demo/basic.md correctly 1`] = `
+<div>
+  Scroll down to see the bottom-right
+  <strong
+    style="color:rgba(64, 64, 64, 0.6);">
+     gray 
+  </strong>
+  button.
+</div>
+`;
+
+exports[`test renders ./components/back-top/demo/custom.md correctly 1`] = `
+<div>
+  Scroll down to see the bottom-right
+  <strong
+    style="color:#57c5f7;">
+     blue 
+  </strong>
+  button.
+</div>
+`;
--- a/components/back-top/tests/demo.test.js
+++ b/components/back-top/tests/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest';
+
+demoTest('back-top');
--- a/components/back-top/demo/basic.md
+++ b/components/back-top/demo/basic.md
@@ -19,7 +19,10 @@ import { BackTop } from 'antd';
 ReactDOM.render(
  <div>
    <BackTop />
-    Scroll down to see the bottom right gray button.
-  </div>
-, mountNode);
+    Scroll down to see the bottom-right
+    <strong style={{ color: 'rgba(64, 64, 64, 0.6)' }}> gray </strong>
+    button.
+  </div>,
+  mountNode
+);
 ````
--- a/components/back-top/demo/custom.md
+++ b/components/back-top/demo/custom.md
@@ -17,23 +17,31 @@ You can customize the style of the button, just note the size limit: no more tha
 ````jsx
 import { BackTop } from 'antd';

-const style = {
-  height: 40,
-  width: 40,
-  lineHeight: '40px',
-  borderRadius: 4,
-  backgroundColor: '#57c5f7',
-  color: '#fff',
-  textAlign: 'center',
-  fontSize: 20,
-};
-
 ReactDOM.render(
  <div>
-    <BackTop style={{ bottom: 100 }}>
-      <div style={style}>UP</div>
+    <BackTop>
+      <div className="ant-back-top-inner">UP</div>
    </BackTop>
-    Scroll down to see the bottom right blue button.
-  </div>
-, mountNode);
+    Scroll down to see the bottom-right
+    <strong style={{ color: '#57c5f7' }}> blue </strong>
+    button.
+  </div>,
+  mountNode
+);
+````
+
+````css
+#components-back-top-demo-custom .ant-back-top {
+  bottom: 100px;
+}
+#components-back-top-demo-custom .ant-back-top-inner {
+  height: 40px;
+  width: 40px;
+  line-height: 40px;
+  border-radius: 4px;
+  background-color: #57c5f7;
+  color: #fff;
+  text-align: center;
+  font-size: 20px;
+}
 ````
--- a/components/back-top/index.en-US.md
+++ b/components/back-top/index.en-US.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Other
+type: Navigation
 title: BackTop
 ---

--- a/components/back-top/index.tsx
+++ b/components/back-top/index.tsx
@@ -99,10 +99,7 @@ export default class BackTop extends React.Component<BackTopProps, any> {

  render() {
    const { prefixCls = 'ant-back-top', className = '', children } = this.props;
-    const classString = classNames({
-      [prefixCls]: true,
-      [className]: !!className,
-    });
+    const classString = classNames(prefixCls, className);

    const defaultElement = (
      <div className={`${prefixCls}-content`}>
@@ -118,15 +115,15 @@ export default class BackTop extends React.Component<BackTopProps, any> {
      'visibilityHeight',
    ]);

+    const backTopBtn = this.state.visible ? (
+      <div {...divProps} className={classString} onClick={this.scrollToTop}>
+        {children || defaultElement}
+      </div>
+    ) : null;
+
    return (
      <Animate component="" transitionName="fade">
-        {
-          this.state.visible ?
-            <div {...divProps} className={classString} onClick={this.scrollToTop}>
-              {children || defaultElement}
-            </div>
-          : null
-        }
+        {backTopBtn}
      </Animate>
    );
  }
--- a/components/back-top/index.zh-CN.md
+++ b/components/back-top/index.zh-CN.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Other
+type: Navigation
 subtitle: 回到顶部
 title: BackTop
 ---
--- a/components/badge/ScrollNumber.tsx
+++ b/components/badge/ScrollNumber.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { createElement, Component } from 'react';
-import {findDOMNode} from 'react-dom';
+import { findDOMNode } from 'react-dom';
 import isCssAnimationSupported from '../_util/isCssAnimationSupported';
 import assign from 'object-assign';
 import omit from 'omit.js';
@@ -20,7 +20,7 @@ export interface ScrollNumberProps {
  component?: string;
  onAnimated?: Function;
  height?: number;
-  style: React.CSSProperties;
+  style?: React.CSSProperties;
 }

 export default class ScrollNumber extends Component<ScrollNumberProps, any> {
--- a/components/badge/tests/snapshots/demo.test.js.snap
+++ b/components/badge/tests/snapshots/demo.test.js.snap
--- a/components/badge/tests/demo.test.js
+++ b/components/badge/tests/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest';
+
+demoTest('badge');
--- a/components/badge/demo/99plus.md
+++ b/components/badge/demo/99plus.md
@@ -1,27 +0,0 @@
---
-order: 1
-title:
-  zh-CN: 大数字
-  en-US: Overflowed count
---
-
-## zh-CN
-
-超过 99 的会显示为 `99+`。
-
-## en-US
-
-`99+` is displayed when count is larger than `99`.
-
-````jsx
-import { Badge } from 'antd';
-
-ReactDOM.render(<div>
-  <Badge count={99}>
-    <a href="#" className="head-example" />
-  </Badge>
-  <Badge count={200}>
-    <a href="#" className="head-example" />
-  </Badge>
-</div>, mountNode);
-````
--- a/components/badge/demo/basic.md
+++ b/components/badge/demo/basic.md
@@ -23,7 +23,7 @@ ReactDOM.render(
 , mountNode);
 ````

-````css
+<style>
 .ant-badge:not(.ant-badge-status) {
  margin-right: 16px;
 }
@@ -34,4 +34,4 @@ ReactDOM.render(
  background: #eee;
  display: inline-block;
 }
-````
+</style>
--- a/components/badge/demo/change.md
+++ b/components/badge/demo/change.md
@@ -14,7 +14,7 @@ title:
 The count will be animated as it changes.

 ````jsx
-import { Badge, Button, Icon } from 'antd';
+import { Badge, Button, Icon, Switch } from 'antd';
 const ButtonGroup = Button.Group;

 const Test = React.createClass({
@@ -35,21 +35,16 @@ const Test = React.createClass({
    }
    this.setState({ count });
  },
-  onClick() {
-    this.setState({
-      show: !this.state.show,
-    });
+  onChange(show) {
+    this.setState({ show });
  },
  render() {
    return (
      <div>
-        <Badge count={this.state.count}>
-          <a href="#" className="head-example" />
-        </Badge>
-        <Badge dot={this.state.show}>
-          <a href="#" className="head-example" />
-        </Badge>
-        <div style={{ marginTop: 10 }}>
+        <div>
+          <Badge count={this.state.count}>
+            <a href="#" className="head-example" />
+          </Badge>
          <ButtonGroup>
            <Button type="ghost" onClick={this.decline}>
              <Icon type="minus" />
@@ -58,16 +53,17 @@ const Test = React.createClass({
              <Icon type="plus" />
            </Button>
          </ButtonGroup>
-          <Button type="ghost" onClick={this.onClick} style={{ marginLeft: 8 }}>
-            Switch state
-          </Button>
+        </div>
+        <div style={{ marginTop: 10 }}>
+          <Badge dot={this.state.show}>
+            <a href="#" className="head-example" />
+          </Badge>
+          <Switch onChange={this.onChange} />
        </div>
      </div>
    );
  },
 });

-ReactDOM.render(
-  <Test />
-, mountNode);
+ReactDOM.render(<Test />, mountNode);
 ````
--- a/components/badge/demo/link.md
+++ b/components/badge/demo/link.md
@@ -1,5 +1,5 @@
 ---
-order: 2
+order: 3
 title:
  zh-CN: 可点击
  en-US: Clickable
--- a/components/badge/demo/no-wrapper.md
+++ b/components/badge/demo/no-wrapper.md
@@ -1,5 +1,5 @@
 ---
-order: 0
+order: 1
 title:
  zh-CN: 独立使用
  en-US: Standalone
--- a/components/badge/demo/overflow.md
+++ b/components/badge/demo/overflow.md
@@ -1,22 +1,28 @@
 ---
-order: 6
+order: 2
 title:
  zh-CN: 封顶数字
-  en-US: Customized overflow count
+  en-US: Overflow Count
 ---

 ## zh-CN

-超过 `overflowCount` 的会显示为 `${overflowCount}+`。
+超过 `overflowCount` 的会显示为 `${overflowCount}+`，默认的 `overflowCount` 为 `99`。

 ## en-US

-`${overflowCount}+` is displayed when count is larger than `overflowCount`.
+`${overflowCount}+` is displayed when count is larger than `overflowCount`. The default value of `overflowCount` is `99`.

 ````jsx
 import { Badge } from 'antd';

 ReactDOM.render(<div>
+  <Badge count={99}>
+    <a href="#" className="head-example" />
+  </Badge>
+  <Badge count={100}>
+    <a href="#" className="head-example" />
+  </Badge>
  <Badge count={99} overflowCount={10}>
    <a href="#" className="head-example" />
  </Badge>
--- a/components/badge/demo/status.md
+++ b/components/badge/demo/status.md
@@ -1,5 +1,5 @@
 ---
-order: 7
+order: 6
 title:
  zh-CN: 状态点
  en-US: Status
--- a/components/badge/index.en-US.md
+++ b/components/badge/index.en-US.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Views
+type: Data Display
 title: Badge
 ---

@@ -27,6 +27,6 @@ Badge normally appears in proximity to notification or head picture with eye-cat
 |----------------|-------------------------|------------|---------|
 | count          | Number to show in badge | Number     |         |
 | overflowCount  | Max count to show       | Number     | 99      |
-| dot            | whether to show red dot without number | Boolean | false  |
+| 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 | '' |
--- a/components/badge/index.tsx
+++ b/components/badge/index.tsx
@@ -2,8 +2,7 @@ import React from 'react';
 import Animate from 'rc-animate';
 import ScrollNumber from './ScrollNumber';
 import classNames from 'classnames';
-import warning from 'warning';
-import splitObject from '../_util/splitObject';
+import warning from '../_util/warning';

 export interface BadgeProps {
  /** Number to show in badge */
@@ -37,30 +36,21 @@ export default class Badge extends React.Component<BadgeProps, any> {
  };

  render() {
-    let [{
-      count, prefixCls, overflowCount, className, style, children, dot, status, text,
-    }, restProps] = splitObject(
-      this.props,
-      ['count', 'prefixCls', 'overflowCount', 'className', 'style', 'children', 'dot', 'status', 'text']
-    );
+    const { count, prefixCls, overflowCount, className, style, children, dot, status, text, ...restProps } = this.props;
    const isDot = dot || status;
-
-    count = count > overflowCount ? `${overflowCount}+` : count;
-
+    let displayCount = count > overflowCount ? `${overflowCount}+` : count;
    // dot mode don't need count
    if (isDot) {
-      count = '';
+      displayCount = '';
    }

    // null undefined "" "0" 0
-    const hidden = (!count || count === '0') && !isDot;
+    const hidden = (!displayCount || displayCount === '0') && !isDot;
    const scrollNumberCls = classNames({
      [`${prefixCls}-dot`]: isDot,
      [`${prefixCls}-count`]: !isDot,
    });
-    const badgeCls = classNames({
-      [className]: !!className,
-      [prefixCls]: true,
+    const badgeCls = classNames(className, prefixCls, {
      [`${prefixCls}-status`]: !!status,
      [`${prefixCls}-not-a-wrapper`]: !children,
    });
@@ -83,29 +73,31 @@ export default class Badge extends React.Component<BadgeProps, any> {
      );
    }

+    const scrollNumber = hidden ? null : (
+      <ScrollNumber
+        data-show={!hidden}
+        className={scrollNumberCls}
+        count={displayCount}
+        style={style}
+      />
+    );
+
+    const statusText = (hidden || !text) ? null : (
+      <span className={`${prefixCls}-status-text`}>{text}</span>
+    );
+
    return (
-      <span {...restProps} className={badgeCls} title={count}>
+      <span {...restProps} className={badgeCls} title={count as string}>
        {children}
        <Animate
          component=""
          showProp="data-show"
-          transitionName={`${prefixCls}-zoom`}
+          transitionName={children ? `${prefixCls}-zoom` : ''}
          transitionAppear
        >
-          {
-            hidden ? null :
-              <ScrollNumber
-                data-show={!hidden}
-                className={scrollNumberCls}
-                count={count}
-                style={style}
-              />
-          }
+          {scrollNumber}
        </Animate>
-        {
-          hidden || !text ? null :
-            <span className={`${prefixCls}-status-text`}>{text}</span>
-        }
+        {statusText}
      </span>
    );
  }
--- a/components/badge/index.zh-CN.md
+++ b/components/badge/index.zh-CN.md
@@ -1,7 +1,7 @@
 ---
 category: Components
 subtitle: 徽标数
-type: Views
+type: Data Display
 title: Badge
 ---

--- a/components/badge/style/index.less
+++ b/components/badge/style/index.less
@@ -16,16 +16,15 @@
    height: 20px;
    border-radius: 10px;
    min-width: 20px;
-    background: @error-color;
+    background: @highlight-color;
    border: 1px solid transparent;
    color: #fff;
    line-height: 18px;
    text-align: center;
    padding: 0 6px;
-    font-size: 12px;
+    font-size: @font-size-base;
    white-space: nowrap;
    transform-origin: -10% center;
-    z-index: 10;
    font-family: tahoma;
    box-shadow: 0 0 0 1px #fff;
    a,
@@ -42,7 +41,7 @@
    height: 8px;
    width: 8px;
    border-radius: 100%;
-    background: @error-color;
+    background: @highlight-color;
    z-index: 10;
    box-shadow: 0 0 0 1px #fff;
  }
@@ -109,15 +108,6 @@
  }
 }

-a & {
-  &-count:hover {
-    background: tint(@error-color, 20%);
-  }
-  &-count:active {
-    background: shade(@error-color, 5%);
-  }
-}
-
 .@{number-prefix-cls} {
  overflow: hidden;
  &-only {
--- a/components/breadcrumb/Breadcrumb.tsx
+++ b/components/breadcrumb/Breadcrumb.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { cloneElement } from 'react';
-import warning from 'warning';
+import warning from '../_util/warning';
 import BreadcrumbItem from './BreadcrumbItem';
+import classNames from 'classnames';

 export interface BreadcrumbProps {
  prefixCls?: string;
@@ -10,6 +11,7 @@ export interface BreadcrumbProps {
  separator?: string | React.ReactNode;
  itemRender?: (route: any, params: any, routes: Array<any>, paths: Array<string>) => React.ReactNode;
  style?: React.CSSProperties;
+  className?: string;
 };

 function getBreadcrumbName(route, params) {
@@ -52,18 +54,21 @@ export default class Breadcrumb extends React.Component<BreadcrumbProps, any> {
    nameRender: React.PropTypes.func,
  };

-  constructor(props) {
-    super();
-
+  componentDidMount() {
+    const props = this.props;
    warning(
      !('linkRender' in props || 'nameRender' in props),
-      '`linkRender` and `nameRender` are removed, please use `itemRender` instead.'
+      '`linkRender` and `nameRender` are removed, please use `itemRender` instead, ' +
+      'see: http://u.ant.design/item-render.'
    );
  }

  render() {
    let crumbs;
-    const { separator, prefixCls, routes, params = {}, children, itemRender = defaultItemRender } = this.props;
+    const {
+      separator, prefixCls, style, className, routes, params = {},
+      children, itemRender = defaultItemRender,
+    } = this.props;
    if (routes && routes.length > 0) {
      const paths: string[] = [];
      crumbs = routes.map((route) => {
@@ -93,7 +98,7 @@ export default class Breadcrumb extends React.Component<BreadcrumbProps, any> {
      });
    }
    return (
-      <div className={prefixCls}>
+      <div className={classNames(className, prefixCls)} style={style}>
        {crumbs}
      </div>
    );
--- a/components/breadcrumb/BreadcrumbItem.tsx
+++ b/components/breadcrumb/BreadcrumbItem.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
-import splitObject from '../_util/splitObject';
+import { PropTypes } from 'react';

 export interface BreadcrumbItemProps {
+  prefixCls?: string;
  separator?: React.ReactNode;
  href?: string;
 }
@@ -13,18 +14,16 @@ export default class BreadcrumbItem extends React.Component<BreadcrumbItemProps,
  };

  static propTypes = {
-    prefixCls: React.PropTypes.string,
-    separator: React.PropTypes.oneOfType([
-      React.PropTypes.string,
-      React.PropTypes.element,
+    prefixCls: PropTypes.string,
+    separator: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.element,
    ]),
-    href: React.PropTypes.string,
+    href: PropTypes.string,
  };

  render() {
-    const [{ prefixCls, separator, children }, restProps] = splitObject(
-      this.props, ['prefixCls', 'separator', 'children']
-    );
+    const { prefixCls, separator, children, ...restProps } = this.props;
    let link;
    if ('href' in this.props) {
      link = <a className={`${prefixCls}-link`} {...restProps}>{children}</a>;
--- a/components/breadcrumb/tests/snapshots/demo.test.js.snap
+++ b/components/breadcrumb/tests/snapshots/demo.test.js.snap
@@ -0,0 +1,185 @@
+exports[`test renders ./components/breadcrumb/demo/basic.md correctly 1`] = `
+<div
+  class="ant-breadcrumb">
+  <span>
+    <span
+      class="ant-breadcrumb-link">
+      Home
+    </span>
+    <span
+      class="ant-breadcrumb-separator">
+      /
+    </span>
+  </span>
+  <span>
+    <span
+      class="ant-breadcrumb-link">
+      <a
+        href="">
+        Application Center
+      </a>
+    </span>
+    <span
+      class="ant-breadcrumb-separator">
+      /
+    </span>
+  </span>
+  <span>
+    <span
+      class="ant-breadcrumb-link">
+      <a
+        href="">
+        Application List
+      </a>
+    </span>
+    <span
+      class="ant-breadcrumb-separator">
+      /
+    </span>
+  </span>
+  <span>
+    <span
+      class="ant-breadcrumb-link">
+      An Application
+    </span>
+    <span
+      class="ant-breadcrumb-separator">
+      /
+    </span>
+  </span>
+</div>
+`;
+
+exports[`test renders ./components/breadcrumb/demo/router.md correctly 1`] = `
+<div>
+  <div
+    class="demo-nav">
+    <a
+      href="#/">
+      Home
+    </a>
+    <a
+      href="#/apps">
+      Application List
+    </a>
+  </div>
+  Home Page
+  <div
+    class="ant-alert ant-alert-info ant-alert-no-icon"
+    data-show="true"
+    style="margin:16px 0;">
+    <span
+      class="ant-alert-message">
+      Click the navigation above to switch:
+    </span>
+    <span
+      class="ant-alert-description" />
+  </div>
+  <div
+    class="ant-breadcrumb">
+    <span>
+      <span
+        class="ant-breadcrumb-link">
+        <span>
+          Home
+        </span>
+      </span>
+      <span
+        class="ant-breadcrumb-separator">
+        /
+      </span>
+    </span>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/breadcrumb/demo/separator.md correctly 1`] = `
+<div
+  class="ant-breadcrumb">
+  <span>
+    <span
+      class="ant-breadcrumb-link">
+      Home
+    </span>
+    <span
+      class="ant-breadcrumb-separator">
+      >
+    </span>
+  </span>
+  <span>
+    <a
+      class="ant-breadcrumb-link"
+      href="">
+      Application Center
+    </a>
+    <span
+      class="ant-breadcrumb-separator">
+      >
+    </span>
+  </span>
+  <span>
+    <a
+      class="ant-breadcrumb-link"
+      href="">
+      Application List
+    </a>
+    <span
+      class="ant-breadcrumb-separator">
+      >
+    </span>
+  </span>
+  <span>
+    <span
+      class="ant-breadcrumb-link">
+      An Application
+    </span>
+    <span
+      class="ant-breadcrumb-separator">
+      >
+    </span>
+  </span>
+</div>
+`;
+
+exports[`test renders ./components/breadcrumb/demo/withIcon.md correctly 1`] = `
+<div
+  class="ant-breadcrumb">
+  <span>
+    <a
+      class="ant-breadcrumb-link"
+      href="">
+      <i
+        class="anticon anticon-home" />
+    </a>
+    <span
+      class="ant-breadcrumb-separator">
+      /
+    </span>
+  </span>
+  <span>
+    <a
+      class="ant-breadcrumb-link"
+      href="">
+      <i
+        class="anticon anticon-user" />
+      <span>
+        Application List
+      </span>
+    </a>
+    <span
+      class="ant-breadcrumb-separator">
+      /
+    </span>
+  </span>
+  <span>
+    <span
+      class="ant-breadcrumb-link">
+      Application
+    </span>
+    <span
+      class="ant-breadcrumb-separator">
+      /
+    </span>
+  </span>
+</div>
+`;
--- a/components/breadcrumb/tests/demo.test.js
+++ b/components/breadcrumb/tests/demo.test.js
@@ -0,0 +1,12 @@
+import { render } from 'enzyme';
+import { renderToJson } from 'enzyme-to-json';
+import demoTest from '../../../tests/shared/demoTest';
+import routerDemo from '../demo/router.md';
+
+demoTest('breadcrumb', { skip: ['router.md'] });
+
+const testMethod = typeof window !== 'undefined' ? test : test.skip;
+testMethod('renders ./components/breadcrumb/demo/router.md correctly', () => {
+  const wrapper = render(routerDemo);
+  expect(renderToJson(wrapper)).toMatchSnapshot();
+});
--- a/components/breadcrumb/demo/router.md
+++ b/components/breadcrumb/demo/router.md
@@ -8,15 +8,15 @@ title:

 ## zh-CN

-和 `react-router@2.x` 进行结合使用。
+和 `react-router@2+` 进行结合使用。

 ## en-US

-Used together with `react-router@2.x`.
+Used together with `react-router@2+`.

 ````jsx
 import { Router, Route, Link, hashHistory } from 'react-router';
-import { Breadcrumb } from 'antd';
+import { Breadcrumb, Alert } from 'antd';

 const Apps = () => (
  <ul className="app-list">
@@ -29,24 +29,15 @@ const Apps = () => (
  </ul>
 );

-const Home = props => (
+const Home = ({ routes, params, children }) => (
  <div>
    <div className="demo-nav">
      <Link to="/">Home</Link>
      <Link to="/apps">Application List</Link>
    </div>
-    {props.children || 'Home'}
-    <div
-      style={{
-        marginBottom: 15,
-        marginTop: 15,
-        paddingBottom: 15,
-        borderBottom: '1px dashed #ccc',
-      }}
-    >
-      Click the navigation above to switch:
-    </div>
-    <Breadcrumb {...props} />
+    {children || 'Home Page'}
+    <Alert style={{ margin: '16px 0' }} message="Click the navigation above to switch:" />
+    <Breadcrumb routes={routes} params={params} />
  </div>
 );

--- a/components/breadcrumb/index.en-US.md
+++ b/components/breadcrumb/index.en-US.md
@@ -4,25 +4,17 @@ type: Navigation
 title: Breadcrumb
 ---

-A breadcrumb displays the current location within a hierarchy. It allows going back to states higher up within the hierarchy.
+A breadcrumb displays the current location within a hierarchy. It allows going back to states higher up in the hierarchy.

 ## When To Use

 - When the system has more than two layers in a hierarchy.
 - When you need to inform the user of where they are.
- When the user may need to navigate back to a higher level When the application has multi-layer architecture.
+- When the user may need to navigate back to a higher level.
+- When the application has multi-layer architecture.

 ## API

-```html
-<Breadcrumb>
-  <Breadcrumb.Item>Home</Breadcrumb.Item>
-  <Breadcrumb.Item>Application Center</Breadcrumb.Item>
-  <Breadcrumb.Item>Application List</Breadcrumb.Item>
-  <Breadcrumb.Item>An Application</Breadcrumb.Item>
-</Breadcrumb>
-```
-
 | Property      | Description                              | Type              |  Optional | Default |
 |-----------|-----------------------------------|-----------------|---------|--------|
 | routes    | The routing stack information of router | Array             |         | -      |
@@ -31,3 +23,18 @@ A breadcrumb displays the current location within a hierarchy. It allows going b
 | itemRender | Custom item renderer | (route, params, routes, paths) => React.ReactNode | | - |

 > `linkRender` and `nameRender` were removed after `antd@2.0`, please use `itemRender` instead.
+
+### Use with browserHistory
+
+The link of Breadcrumb item contain `#` defaultly, you can use `itemRender` to make `browserHistory` Link.
+
+```jsx
+import { Link } from 'react-router';
+
+function itemRender(route, params, routes, paths) {
+  const last = routes.indexOf(route) === routes.length - 1;
+  return last ? <span>{route.breadcrumbName}</span> : <Link to={paths.join('/')}>{route.breadcrumbName}</Link>;
+}
+
+return <Breadcrumb itemRender={itemRender} />;
+```
--- a/components/breadcrumb/index.zh-CN.md
+++ b/components/breadcrumb/index.zh-CN.md
@@ -15,15 +15,6 @@ title: Breadcrumb

 ## API

-```html
-<Breadcrumb>
-  <Breadcrumb.Item>首页</Breadcrumb.Item>
-  <Breadcrumb.Item>应用中心</Breadcrumb.Item>
-  <Breadcrumb.Item>应用列表</Breadcrumb.Item>
-  <Breadcrumb.Item>某应用</Breadcrumb.Item>
-</Breadcrumb>
-```
-
 | 参数      | 说明                              | 类型              |  可选值 | 默认值 |
 |-----------|-----------------------------------|-----------------|---------|--------|
 | routes    | router 的路由栈信息               | Array             |         | -      |
@@ -32,3 +23,18 @@ title: Breadcrumb
 | itemRender | 自定义链接函数，和 react-router 配置使用 | (route, params, routes, paths) => React.ReactNode | | - |

 > 2.0 之后，`linkRender` 和 `nameRender` 被移除，请使用 `itemRender` 来代替。
+
+### 和 browserHistory 配合
+
+和 react-router 一起使用时，默认生成的 url 路径是带有 `#` 的，如果和 browserHistory 一起使用的话，你可以使用 `itemRender` 属性定义面包屑链接。
+
+```jsx
+import { Link } from 'react-router';
+
+function itemRender(route, params, routes, paths) {
+  const last = routes.indexOf(route) === routes.length - 1;
+  return last ? <span>{route.breadcrumbName}</span> : <Link to={paths.join('/')}>{route.breadcrumbName}</Link>;
+}
+
+return <Breadcrumb itemRender={itemRender} />;
+```
--- a/components/breadcrumb/style/index.less
+++ b/components/breadcrumb/style/index.less
@@ -3,14 +3,14 @@
@breadcrumb-prefix-cls: ~"@{ant-prefix}-breadcrumb";

 .@{breadcrumb-prefix-cls} {
-  color: #999;
+  color: @text-color-secondary;
  font-size: @font-size-base;

  a {
    color: @text-color;
    transition: color .3s;
    &:hover {
-      color: tint(@primary-color, 20%);
+      color: @primary-5;
    }
  }

--- a/components/button/tests/snapshots/demo.test.js.snap
+++ b/components/button/tests/snapshots/demo.test.js.snap
@@ -0,0 +1,453 @@
+exports[`test renders ./components/button/demo/basic.md correctly 1`] = `
+<div>
+  <button
+    class="ant-btn ant-btn-primary"
+    type="button">
+    <span>
+      Primary
+    </span>
+  </button>
+  <button
+    class="ant-btn"
+    type="button">
+    <span>
+      Default
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-ghost"
+    type="button">
+    <span>
+      Ghost
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-dashed"
+    type="button">
+    <span>
+      Dashed
+    </span>
+  </button>
+</div>
+`;
+
+exports[`test renders ./components/button/demo/button-group.md correctly 1`] = `
+<div>
+  <h4>
+    Basic
+  </h4>
+  <div
+    class="ant-btn-group">
+    <button
+      class="ant-btn"
+      type="button">
+      <span>
+        Cancel
+      </span>
+    </button>
+    <button
+      class="ant-btn ant-btn-primary"
+      type="button">
+      <span>
+        OK
+      </span>
+    </button>
+  </div>
+  <div
+    class="ant-btn-group">
+    <button
+      class="ant-btn"
+      disabled=""
+      type="button">
+      <span>
+        L
+      </span>
+    </button>
+    <button
+      class="ant-btn"
+      disabled=""
+      type="button">
+      <span>
+        M
+      </span>
+    </button>
+    <button
+      class="ant-btn"
+      disabled=""
+      type="button">
+      <span>
+        R
+      </span>
+    </button>
+  </div>
+  <div
+    class="ant-btn-group">
+    <button
+      class="ant-btn ant-btn-primary"
+      type="button">
+      <span>
+        L
+      </span>
+    </button>
+    <button
+      class="ant-btn"
+      type="button">
+      <span>
+        M
+      </span>
+    </button>
+    <button
+      class="ant-btn ant-btn-ghost"
+      type="button">
+      <span>
+        M
+      </span>
+    </button>
+    <button
+      class="ant-btn ant-btn-dashed"
+      type="button">
+      <span>
+        R
+      </span>
+    </button>
+  </div>
+  <h4>
+    With Icon
+  </h4>
+  <div
+    class="ant-btn-group">
+    <button
+      class="ant-btn ant-btn-primary"
+      type="button">
+      <i
+        class="anticon anticon-left" />
+      <span>
+        Go back
+      </span>
+    </button>
+    <button
+      class="ant-btn ant-btn-primary"
+      type="button">
+      <span>
+        Go forward
+      </span>
+      <i
+        class="anticon anticon-right" />
+    </button>
+  </div>
+  <div
+    class="ant-btn-group">
+    <button
+      class="ant-btn ant-btn-primary ant-btn-icon-only"
+      type="button">
+      <i
+        class="anticon anticon-cloud" />
+    </button>
+    <button
+      class="ant-btn ant-btn-primary ant-btn-icon-only"
+      type="button">
+      <i
+        class="anticon anticon-cloud-download" />
+    </button>
+  </div>
+</div>
+`;
+
+exports[`test renders ./components/button/demo/disabled.md correctly 1`] = `
+<div>
+  <button
+    class="ant-btn ant-btn-primary"
+    type="button">
+    <span>
+      Primary
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-primary"
+    disabled=""
+    type="button">
+    <span>
+      Primary(disabled)
+    </span>
+  </button>
+  <br />
+  <button
+    class="ant-btn"
+    type="button">
+    <span>
+      Default
+    </span>
+  </button>
+  <button
+    class="ant-btn"
+    disabled=""
+    type="button">
+    <span>
+      Default(disabled)
+    </span>
+  </button>
+  <br />
+  <button
+    class="ant-btn ant-btn-ghost"
+    type="button">
+    <span>
+      Ghost
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-ghost"
+    disabled=""
+    type="button">
+    <span>
+      Ghost(disabled)
+    </span>
+  </button>
+  <br />
+  <button
+    class="ant-btn ant-btn-dashed"
+    type="button">
+    <span>
+      Dashed
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-dashed"
+    disabled=""
+    type="button">
+    <span>
+      Dashed(disabled)
+    </span>
+  </button>
+</div>
+`;
+
+exports[`test renders ./components/button/demo/icon.md correctly 1`] = `
+<div>
+  <button
+    class="ant-btn ant-btn-primary ant-btn-circle ant-btn-icon-only"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+  </button>
+  <button
+    class="ant-btn ant-btn-primary"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+    <span>
+      Search
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-circle ant-btn-icon-only"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+  </button>
+  <button
+    class="ant-btn"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+    <span>
+      Search
+    </span>
+  </button>
+  <br />
+  <button
+    class="ant-btn ant-btn-ghost ant-btn-circle ant-btn-icon-only"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+  </button>
+  <button
+    class="ant-btn ant-btn-ghost"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+    <span>
+      Search
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-dashed ant-btn-circle ant-btn-icon-only"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+  </button>
+  <button
+    class="ant-btn ant-btn-dashed"
+    type="button">
+    <i
+      class="anticon anticon-search" />
+    <span>
+      Search
+    </span>
+  </button>
+</div>
+`;
+
+exports[`test renders ./components/button/demo/loading.md correctly 1`] = `
+<div>
+  <button
+    class="ant-btn ant-btn-primary ant-btn-loading"
+    type="button">
+    <i
+      class="anticon anticon-spin anticon-loading" />
+    <span>
+      Loading
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-primary ant-btn-sm ant-btn-loading"
+    type="button">
+    <i
+      class="anticon anticon-spin anticon-loading" />
+    <span>
+      Loading
+    </span>
+  </button>
+  <br />
+  <button
+    class="ant-btn ant-btn-primary"
+    type="button">
+    <span>
+      Click me!
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-primary"
+    type="button">
+    <i
+      class="anticon anticon-poweroff" />
+    <span>
+      Click me!
+    </span>
+  </button>
+</div>
+`;
+
+exports[`test renders ./components/button/demo/multiple.md correctly 1`] = `
+<div>
+  <button
+    class="ant-btn ant-btn-primary"
+    type="button">
+    <span>
+      primary
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-ghost"
+    type="button">
+    <span>
+      secondary
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-ghost ant-dropdown-trigger"
+    type="button">
+    <span>
+      more 
+    </span>
+    <i
+      class="anticon anticon-down" />
+  </button>
+</div>
+`;
+
+exports[`test renders ./components/button/demo/size.md correctly 1`] = `
+<div>
+  <div
+    class="ant-radio-group">
+    <label
+      class="ant-radio-button-wrapper">
+      <span
+        class="ant-radio-button">
+        <span
+          class="ant-radio-button-inner" />
+        <input
+          class="ant-radio-button-input"
+          type="radio" />
+      </span>
+      <span>
+        Large
+      </span>
+    </label>
+    <label
+      class="ant-radio-button-wrapper ant-radio-button-wrapper-checked">
+      <span
+        class="ant-radio-button ant-radio-button-checked ant-radio-button ant-radio-button-checked ant-radio-button-checked-1">
+        <span
+          class="ant-radio-button-inner" />
+        <input
+          checked=""
+          class="ant-radio-button-input"
+          type="radio" />
+      </span>
+      <span>
+        Default
+      </span>
+    </label>
+    <label
+      class="ant-radio-button-wrapper">
+      <span
+        class="ant-radio-button">
+        <span
+          class="ant-radio-button-inner" />
+        <input
+          class="ant-radio-button-input"
+          type="radio" />
+      </span>
+      <span>
+        Small
+      </span>
+    </label>
+  </div>
+  <br />
+  <br />
+  <button
+    class="ant-btn ant-btn-primary ant-btn-circle ant-btn-icon-only"
+    type="button">
+    <i
+      class="anticon anticon-download" />
+  </button>
+  <button
+    class="ant-btn ant-btn-primary"
+    type="button">
+    <i
+      class="anticon anticon-download" />
+    <span>
+      Download
+    </span>
+  </button>
+  <button
+    class="ant-btn ant-btn-primary"
+    type="button">
+    <span>
+      Normal
+    </span>
+  </button>
+  <br />
+  <div
+    class="ant-btn-group">
+    <button
+      class="ant-btn ant-btn-primary"
+      type="button">
+      <i
+        class="anticon anticon-left" />
+      <span>
+        Backward
+      </span>
+    </button>
+    <button
+      class="ant-btn ant-btn-primary"
+      type="button">
+      <span>
+        Forward
+      </span>
+      <i
+        class="anticon anticon-right" />
+    </button>
+  </div>
+</div>
+`;
--- a/components/button/tests/snapshots/index.test.js.snap
+++ b/components/button/tests/snapshots/index.test.js.snap
@@ -0,0 +1,19 @@
+exports[`Button renders Chinese characters correctly 1`] = `
+<button
+  class="ant-btn"
+  type="button">
+  <span>
+    按 钮
+  </span>
+</button>
+`;
+
+exports[`Button renders correctly 1`] = `
+<button
+  class="ant-btn"
+  type="button">
+  <span>
+    Follow
+  </span>
+</button>
+`;
--- a/components/button/tests/demo.test.js
+++ b/components/button/tests/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest';
+
+demoTest('button');
--- a/components/button/tests/index.test.js
+++ b/components/button/tests/index.test.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import { render } from 'enzyme';
+import { renderToJson } from 'enzyme-to-json';
+import Button from '..';
+
+describe('Button', () => {
+  it('renders correctly', () => {
+    const wrapper = render(
+      <Button>Follow</Button>
+    );
+    expect(renderToJson(wrapper)).toMatchSnapshot();
+  });
+
+  it('renders Chinese characters correctly', () => {
+    const wrapper = render(
+      <Button>按钮</Button>
+    );
+    expect(renderToJson(wrapper)).toMatchSnapshot();
+  });
+});
--- a/components/button/button-group.tsx
+++ b/components/button/button-group.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import classNames from 'classnames';
-import splitObject from '../_util/splitObject';

 export type ButtonSize = 'small' | 'large'

@@ -12,8 +11,7 @@ export interface ButtonGroupProps {
 }

 export default function ButtonGroup(props: ButtonGroupProps) {
-  const [{ prefixCls = 'ant-btn-group', size, className }, others] =
-    splitObject(props, ['prefixCls', 'size', 'className']);
+  const { prefixCls = 'ant-btn-group', size = '', className, ...others } = props;

  // large => lg
  // small => sm
@@ -22,11 +20,9 @@ export default function ButtonGroup(props: ButtonGroupProps) {
    small: 'sm',
  })[size] || '';

-  const classes = classNames({
-    [prefixCls]: true,
+  const classes = classNames(prefixCls, {
    [`${prefixCls}-${sizeCls}`]: sizeCls,
-    [className]: className,
-  });
+  }, className);

  return <div {...others} className={classes} />;
 }
--- a/components/button/button.tsx
+++ b/components/button/button.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { findDOMNode } from 'react-dom';
 import Icon from '../icon';
-import splitObject from '../_util/splitObject';
+
 const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/;
 const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar);
 function isString(str) {
@@ -101,9 +101,7 @@ export default class Button extends React.Component<ButtonProps, any> {
  }

  render() {
-    const props = this.props;
-    const [{ type, shape, size, className, htmlType, children, icon, loading, prefixCls }, others] = splitObject(props,
-      ['type', 'shape', 'size', 'className', 'htmlType', 'children', 'icon', 'loading', 'prefixCls']);
+    const { type, shape, size = '', className, htmlType, children, icon, loading, prefixCls, ...others } = this.props;

    // large => lg
    // small => sm
@@ -112,28 +110,27 @@ export default class Button extends React.Component<ButtonProps, any> {
      small: 'sm',
    })[size] || '';

-    const classes = classNames({
-      [prefixCls]: true,
+    const classes = classNames(prefixCls, {
      [`${prefixCls}-${type}`]: type,
      [`${prefixCls}-${shape}`]: shape,
      [`${prefixCls}-${sizeCls}`]: sizeCls,
      [`${prefixCls}-icon-only`]: !children && icon,
      [`${prefixCls}-loading`]: loading,
-      [className]: className,
-    });
+    }, className);

    const iconType = loading ? 'loading' : icon;
-
+    const iconNode = iconType ? <Icon type={iconType} /> : null;
    const kids = React.Children.map(children, insertSpace);

    return (
-      <button {...others}
+      <button
+        {...others}
        type={htmlType || 'button'}
        className={classes}
        onMouseUp={this.handleMouseUp}
        onClick={this.handleClick}
      >
-        {iconType ? <Icon type={iconType} /> : null}{kids}
+        {iconNode}{kids}
      </button>
    );
  }
--- a/components/button/demo/basic.md
+++ b/components/button/demo/basic.md
@@ -30,7 +30,6 @@ ReactDOM.render(
    <Button>Default</Button>
    <Button type="ghost">Ghost</Button>
    <Button type="dashed">Dashed</Button>
-  </div>,
-  mountNode
-);
+  </div>
+, mountNode);
 ````
--- a/components/button/demo/button-group.md
+++ b/components/button/demo/button-group.md
@@ -53,20 +53,6 @@ ReactDOM.render(
      <Button type="primary" icon="cloud" />
      <Button type="primary" icon="cloud-download" />
    </ButtonGroup>
-
-    <h4>Size</h4>
-    <ButtonGroup size="large">
-      <Button type="ghost">Large</Button>
-      <Button type="ghost">Large</Button>
-    </ButtonGroup>
-    <ButtonGroup>
-      <Button type="ghost">Default</Button>
-      <Button type="ghost">Default</Button>
-    </ButtonGroup>
-    <ButtonGroup size="small">
-      <Button type="ghost">Small</Button>
-      <Button type="ghost">Small</Button>
-    </ButtonGroup>
  </div>,
  mountNode
 );
@@ -85,8 +71,4 @@ ReactDOM.render(
 #components-button-demo-button-group .ant-btn-group {
  margin-right: 8px;
 }
-#components-button-demo-button-group .ant-btn {
-  margin-bottom: 12px;
-  margin-right: 0;
-}
 </style>
--- a/components/button/demo/icon.md
+++ b/components/button/demo/icon.md
@@ -24,9 +24,13 @@ ReactDOM.render(
  <div>
    <Button type="primary" shape="circle" icon="search" />
    <Button type="primary" icon="search">Search</Button>
+    <Button shape="circle" icon="search" />
+    <Button icon="search">Search</Button>
    <br />
-    <Button type="ghost" shape="circle-outline" icon="search" />
+    <Button type="ghost" shape="circle" icon="search" />
    <Button type="ghost" icon="search">Search</Button>
+    <Button type="dashed" shape="circle" icon="search" />
+    <Button type="dashed" icon="search">Search</Button>
  </div>,
  mountNode
 );
--- a/components/button/demo/multiple.md
+++ b/components/button/demo/multiple.md
@@ -0,0 +1,44 @@
+---
+order: 6
+title:
+  zh-CN: 多个按钮组合
+  en-US: Multiple Buttons
+---
+
+## zh-CN
+
+按钮组合使用时，推荐使用1个主操作 + n 个次操作，3个以上操作时把更多操作放到 `Dropdown.Button` 中组合使用。
+
+## en-US
+
+If you need several buttons, we recommend that you use 1 primary button + n secondary buttons, and if there are more than three operations, you can group some of them into `Dropdown.Button`.
+
+
+````jsx
+import { Button, Menu, Dropdown, Icon } from 'antd';
+
+function handleMenuClick(e) {
+  console.log('click', e);
+}
+
+const menu = (
+  <Menu onClick={handleMenuClick}>
+    <Menu.Item key="1">1st item</Menu.Item>
+    <Menu.Item key="2">2nd item</Menu.Item>
+    <Menu.Item key="3">3rd item</Menu.Item>
+  </Menu>
+);
+
+ReactDOM.render(
+  <div>
+    <Button type="primary">primary</Button>
+    <Button type="ghost">secondary</Button>
+    <Dropdown overlay={menu}>
+      <Button type="ghost">
+        more <Icon type="down" />
+      </Button>
+    </Dropdown>
+  </div>,
+  mountNode
+);
+````
--- a/components/button/demo/size.md
+++ b/components/button/demo/size.md
@@ -18,11 +18,43 @@ Ant Design supports a default button size as well as a large and small size.
 If a large or small button is desired, set the `size` property to either `large` or `small` respectively. Omit the `size` property for a button with the default size.

 ````jsx
-import { Button } from 'antd';
+import { Button, Radio, Icon } from 'antd';

-ReactDOM.render(<div>
-  <Button type="primary" size="large">Large</Button>
-  <Button type="primary">Default</Button>
-  <Button type="primary" size="small">Small</Button>
-</div>, mountNode);
+class ButtonSize extends React.Component {
+  state = {
+    size: 'default',
+  };
+
+  handleSizeChange = (e) => {
+    this.setState({ size: e.target.value });
+  }
+
+  render() {
+    const size = this.state.size;
+    return (
+      <div>
+        <Radio.Group value={size} onChange={this.handleSizeChange}>
+          <Radio.Button value="large">Large</Radio.Button>
+          <Radio.Button value="default">Default</Radio.Button>
+          <Radio.Button value="small">Small</Radio.Button>
+        </Radio.Group>
+        <br /><br />
+        <Button type="primary" shape="circle" icon="download" size={size} />
+        <Button type="primary" icon="download" size={size}>Download</Button>
+        <Button type="primary" size={size}>Normal</Button>
+        <br />
+        <Button.Group size={size}>
+          <Button type="primary">
+            <Icon type="left" />Backward
+          </Button>
+          <Button type="primary">
+            Forward<Icon type="right" />
+          </Button>
+        </Button.Group>
+      </div>
+    );
+  }
+}
+
+ReactDOM.render(<ButtonSize />, mountNode);
 ````
--- a/components/button/index.en-US.md
+++ b/components/button/index.en-US.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Basic
+type: General
 title: Button
 ---

@@ -8,7 +8,7 @@ To trigger an operation.

 ## When To Use

-A button means an operation(or a series of operations). Click a button will trigger corresponding business logic.
+A button means an operation (or a series of operations). Clicking a button will trigger corresponding business logic.

 ## API

@@ -16,10 +16,10 @@ To get a customized button, just set `type`/`shape`/`size`/`loading`/`disabled`.

 Property | Description | Type | Default
 -----|-----|-----|------
-type | can be set to `primary` `ghost` or omitted | string | -
+type | can be set to `primary` `ghost` `dashed` or omitted | string | -
 htmlType | to set the original `type` of `button`, see: [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button`
 icon | set the icon of button, see: Icon component | string | -
-shape | can be set to `circle` `circle-outline` or omitted | 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
 onClick | set the handler to handle `click` event | function | -
@@ -27,8 +27,11 @@ 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.

 <style>
-[id^="components-button-demo-"] .ant-btn {
+[id^=components-button-demo-] .ant-btn {
  margin-right: 8px;
  margin-bottom: 12px;
 }
+[id^=components-button-demo-] .ant-btn-group > .ant-btn {
+  margin-right: 0;
+}
 </style>
--- a/components/button/index.zh-CN.md
+++ b/components/button/index.zh-CN.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Basic
+type: General
 title: Button
 subtitle: 按钮
 ---
@@ -19,10 +19,10 @@ subtitle: 按钮

 属性 | 说明 | 类型 | 默认值
 -----|-----|-----|------
-type | 设置按钮类型，可选值为 `primary` `ghost` 或者不设 | string | -
+type | 设置按钮类型，可选值为 `primary` `ghost` `dashed` 或者不设 | string | -
 htmlType | 设置 `button` 原生的 `type` 值，可选值请参考 [HTML 标准](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button`
 icon | 设置按钮的图标类型 | string | -
-shape | 设置按钮形状，可选值为 `circle` `circle-outline` 或者不设 | string | -
+shape | 设置按钮形状，可选值为 `circle` 或者不设 | string | -
 size | 设置按钮大小，可选值为 `small` `large` 或者不设 | string | `default`
 loading | 设置按钮载入状态 | boolean | false
 onClick | `click` 事件的 handler | function | -
@@ -34,4 +34,7 @@ onClick | `click` 事件的 handler | function | -
  margin-right: 8px;
  margin-bottom: 12px;
 }
+[id^="components-button-demo-"] .ant-btn-group > .ant-btn {
+  margin-right: 0;
+}
 </style>
--- a/components/button/style/index.less
+++ b/components/button/style/index.less
@@ -16,6 +16,10 @@
    .@{btn-prefix-cls}-group &:not(:first-child):not(:last-child) {
      border-right-color: @btn-group-border;
      border-left-color: @btn-group-border;
+
+      &:disabled {
+        border-color: @btn-default-border;
+      }
    }

    .@{btn-prefix-cls}-group &:first-child {
@@ -28,7 +32,7 @@
    }

    .@{btn-prefix-cls}-group &:last-child:not(:first-child),
-    .@{btn-prefix-cls}-group & + .@{btn-prefix-cls} {
+    .@{btn-prefix-cls}-group & + & {
      border-left-color: @btn-group-border;
      &[disabled] {
        border-left-color: @btn-default-border;
@@ -101,27 +105,27 @@
  }

  &-clicked:after {
-  	content: '';
-  	position: absolute;
-  	top: -1px;
-  	left: -1px;
-  	bottom: -1px;
-  	right: -1px;
-  	border-radius: inherit;
+    content: '';
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    bottom: -1px;
+    right: -1px;
+    border-radius: inherit;
    border: 0 solid @primary-color;
-  	opacity: 0.4;
+    opacity: 0.4;
    animation: buttonEffect 0.36s ease-out forwards;
    display: block;
  }
 }

@keyframes buttonEffect {
-	to {
-		opacity: 0;
+  to {
+    opacity: 0;
    top: -6px;
-  	left: -6px;
-  	bottom: -6px;
-  	right: -6px;
+    left: -6px;
+    bottom: -6px;
+    right: -6px;
    border-width: 6px;
-	}
+  }
 }
--- a/components/button/style/mixin.less
+++ b/components/button/style/mixin.less
@@ -21,15 +21,14 @@

 .button-variant-primary(@color; @background) {
  .button-color(@color; @background; @background);
-
  &:hover,
  &:focus {
-    .button-color(@color; tint(@background, 20%); tint(@background, 20%));
+    .button-color(@color; ~`colorPalette("@{background}", 5)`; ~`colorPalette("@{background}", 5)`);
  }

  &:active,
  &.active {
-    .button-color(@color; shade(@background, 5%); shade(@background, 5%));
+    .button-color(@color; ~`colorPalette("@{background}", 7)`; ~`colorPalette("@{background}", 7)`);
  }

  .button-disabled();
@@ -40,12 +39,12 @@

  &:hover,
  &:focus {
-    .button-color(tint(@primary-color, 20%); @background; tint(@primary-color, 20%));
+    .button-color(@primary-5; @background; @primary-5);
  }

  &:active,
  &.active {
-    .button-color(shade(@primary-color, 5%); @background; shade(@primary-color, 5%));
+    .button-color(@primary-7; @background; @primary-7);
  }

  .button-disabled();
@@ -74,15 +73,20 @@
 .button-group-base(@btnClassName) {
  position: relative;
  display: inline-block;
-  vertical-align: middle;
  > .@{btnClassName} {
    position: relative;
+    z-index: 1;
+
    &:hover,
    &:focus,
    &:active,
    &.active {
      z-index: 2;
    }
+
+    &:disabled {
+      z-index: 0;
+    }
  }

  // size
@@ -137,7 +141,7 @@

  &.disabled,
  &[disabled] {
-    cursor: @cursor-disabled;
+    cursor: not-allowed;
    > * {
      pointer-events: none;
    }
--- a/components/calendar/tests/snapshots/demo.test.js.snap
+++ b/components/calendar/tests/snapshots/demo.test.js.snap
--- a/components/calendar/tests/demo.test.js
+++ b/components/calendar/tests/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest';
+
+demoTest('calendar');
--- a/components/calendar/demo/notice-calendar.md
+++ b/components/calendar/demo/notice-calendar.md
@@ -108,7 +108,7 @@ ReactDOM.render(
 }

 .event-normal {
-  color: #2db7f5;
+  color: #108ee9;
 }

 .event-error {
--- a/components/calendar/index.en-US.md
+++ b/components/calendar/index.en-US.md
@@ -1,11 +1,11 @@
 ---
 category: Components
-type: Views
+type: Data Display
 cols: 1
 title: Calendar
 ---

-When To Use container for displaying data in calendar form.
+Container for displaying data in calendar form.

 ## When To Use

@@ -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   | [defualt](https://github.com/ant-design/ant-design/issues/424)  |
+| 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) | - |
--- a/components/calendar/index.tsx
+++ b/components/calendar/index.tsx
@@ -64,8 +64,15 @@ export default class Calendar extends React.Component<CalendarProps, any> {

  constructor(props) {
    super(props);
+    const value = props.value || props.defaultValue || moment();
+    if (!moment.isMoment(value)) {
+      throw new Error(
+        'The value/defaultValue of Calendar must be a moment object after `antd@2.0`, ' +
+        'see: http://u.ant.design/calendar-value'
+      );
+    }
    this.state = {
-      value: props.value || props.defaultValue || moment(),
+      value,
      mode: props.mode,
    };
  }
--- a/components/calendar/index.zh-CN.md
+++ b/components/calendar/index.zh-CN.md
@@ -1,6 +1,6 @@
 ---
 category: Components
-type: Views
+type: Data Display
 subtitle: 日历
 cols: 1
 title: Calendar
@@ -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/issues/424)  |
+| locale       | 国际化配置     | Object   | [默认配置](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json)  |
 | onPanelChange| 日期面板变化回调 | function(date: moment, mode: string) | 无 |
--- a/components/calendar/locale/pt_BR.tsx
+++ b/components/calendar/locale/pt_BR.tsx
@@ -0,0 +1,2 @@
+import pt_BR from '../../date-picker/locale/pt_BR';
+export default pt_BR;
--- a/Show More
+++ b/Show More