release 3.5.2

site: better responsive
Allow to use any CSS units for layout width (#10479 )
2026-02-09 10:59:19 +08:00 · 2018-05-13 22:51:50 +08:00 · 2018-05-12 14:02:34 +08:00 · 2018-05-12 02:30:33 +08:00 · 2018-05-11 16:02:36 +08:00 · 2018-05-10 23:56:22 +08:00
244 changed files with 10480 additions and 2775 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -61,6 +61,7 @@ if (process.env.RUN_ENV === 'DEMO') {
    'no-console': 0,
    'no-plusplus': 0,
    'eol-last': 0,
+    'no-script-url': 0,
    'prefer-rest-params': 0,
    'react/no-multi-comp': 0,
    'react/prefer-stateless-function': 0,
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,3 @@
-<!--
-两会期间，如果遇到官网无法访问，请使用代理或者访问国内镜像 http://ant-design.gitee.io
-->
-
 <!--
 IMPORTANT: Please use the following link to create a new issue:

--- a/.github/lock.yml
+++ b/.github/lock.yml
@@ -0,0 +1,14 @@
+# Configuration for lock-threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 365
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked because it has not had recent
+  activity. Please open a new issue for related bugs and link to relevant
+  comments in this thread.
+# Issues or pull requests with these labels will not be locked
+# exemptLabels:
+#   - no-locking
+# Limit to only `issues` or `pulls`
+only: issues
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ matrix:
      - env: REACT=15 TEST_TYPE=test:es
      - env: REACT=15 TEST_TYPE=test:dom
      - env: REACT=15 TEST_TYPE=test:node
-      - env: REACT=16 TEST_TYPE=bisheng:build

 before_script:
  - scripts/install-react.sh
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,18 +1,26 @@
+778758944 <778758944@qq.com>
 Aaron Planell López <aaronplanell@gmail.com>
 Adrian Dimitrov <dimitrov.adrian@gmail.com>
 Albert Zheng <lisong.zheng@gmail.com>
 Albert 理斯特 <shuaizhexu@gmail.com>
+Aleck Landgraf <aleck.landgraf@gmail.com>
 Alexander <labriko@yandex.ru>
+Alexander Suevalov <suevalov.work@gmail.com>
 Alexandre Kirszenberg <a.kirszenberg@gmail.com>
+Amorites <751809522@qq.com>
 Anas Tawfeek <anas.tawfeek@outlook.com>
 Andrew Murray <radarhere@gmail.com>
 Andrey G <plandem@gmail.com>
+Arnab Sen <arnabsen@gmail.com>
 Arthur Denner Oliveira Santos <arthurdenner7@gmail.com>
+Arvin Xu <arvinx@foxmail.com>
 BK Heleth <bon.hoo@hotmail.com>
 Babajide Fowotade <jide.b.tade@gmail.com>
+Bartek <bartek.kozera@gmail.com>
 Benjamin Kniffler <bkniffler@me.com>
 Benjy Cui <benjytrys@gmail.com>
 Bernie <bernie.wangbj@gmail.com>
+Bilal Sirazitdinov <bilalsir@yandex.ru>
 Bill Sheikh <bilawals22@gmail.com>
 Bo Chen <bochen2014@yahoo.com>
 Bozhao <yubz86@gmail.com>
@@ -20,113 +28,187 @@ Brett Lamy <bel423@me.com>
 Brook Shi <iwxiaot@gmail.com>
 Bruce Mitchener <bruce.mitchener@gmail.com>
 Bruno Maia <bruno.mm.maia@gmail.com>
+Bryan Berger <bb@ga.co>
 C <4019980@qq.com>
 Cam Song <neosoyn@gmail.com>
+Camol <kwwnjujlc@sina.com>
+Canwen Xu <canwenxu@126.com>
 Catalin Miron <mironcatalin@gmail.com>
 Cee Cirno <i@cee.moe>
+Chang Wang <cheapsteak@gmail.com>
 Chikara Chan <chenhongtu@51xianqu.net>
 Chris Kelly <cjke.7777@gmail.com>
 ChrisFan <chris.fan.dev@gmail.com>
+Christopher Deutsch <cd@cdeutsch.com>
+Chuang Yu <cyu9960@gmail.com>
+Claudio Restifo <claudio.restifo@gmail.com>
 Cody Chan <int64ago@gmail.com>
 Colton Pierson <colton@coltonpierson.com>
+Confiks <confiks@scriptbase.org>
 Conway Anderson <hello@conwayanderson.com>
 Cordaro <elvis07@163.com>
 D & R <jdz321@qq.com>
 Damian Green <damian.green@microlease.com>
+Dan Minshew <ofenixculpa@gmail.com>
+Dane David <dndavid102@gmail.com>
 Danny Hoower Antonio Viasus Avila <danjavia@gmail.com>
 Daqi Song <dqaria@gmail.com>
 Darren Poon <dyhpoon@gmail.com>
+David Schneider <davschne@gmail.com>
 DengYun <tdzl2003@gmail.com>
+Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
+Dmitry Bolotin <bolotin.dmitriy@gmail.com>
 Dorian <dorian@doma.io>
+DosLin <doslino@gmail.com>
+EcmaProSrc.P/ka <asoiso@foxmail.com>
 Edd Hannay <accounts@edd.fm>
 Eddie Xie <oeddyo@gmail.com>
+Eden Wang <Eden.Wang@Akmii.com>
 Eden Wang <yociduo@vip.qq.com>
 Egor Yurtaev <yurtaev.egor@gmail.com>
+Eli White <github@eli-white.com>
 Emma <sima.zhang1990@gmail.com>
 Eric <84263800@qq.com>
 Erwann Mest <m+github@kud.io>
 Evgeny Kuznetsov <jackk@ya.ru>
 Eward Song <eward.song@gmail.com>
+Flynn <li.fulin@foxmail.com>
+For177 <mengqiang.q@gmail.com>
+Geoff Holden <geoff@brightloudnoise.com>
+George Gray <george@ummodesign.com>
 Graeme Yeates <gyeates@clearpath.ai>
 Graeme Yeates <yeatesgraeme@gmail.com>
 Gray Choi <gray.choi.1988@gmail.com>
 Guan Hao <raptium@gmail.com>
+Guan Yu Pan (Jacky) <jackypan1989@gmail.com>
 HJin.me <hjin.me@gmail.com>
 Hai Phan Nguyen <pnghai@gmail.com>
 Haibin Yu <haibin.yu@oceanwing.com>
 Hanai <ihanai1991@gmail.com>
 Haroen Viaene <fingebimus@me.com>
 Harshit Mehrotra <harshitmehrotra@hotmail.com>
+Henri Normak <henri.normak@gmail.com>
 Hubert Argasinski <argasinski.hubert@gmail.com>
+Hughen <446370503@163.com>
 Hugo LEHMANN <shogi31@gmail.com>
 Igor G <i.gaidai4uk@gmail.com>
 ImJoeHs <865439601@qq.com>
 Inclined.Z <zjq0717@163.com>
 Infinity <305870677@qq.com>
+Ivan Kravets <me@ikravets.com>
 Ivo Stratev <ivo.stratev.tues@gmail.com>
+JaePil Jung <jjp5023@gmail.com>
 James <james@schoolshape.com>
+Jeffrey Carl Faden <jeffreyatw@gmail.com>
 Jerry Bendy <jerry@icewingcc.com>
 Jesper We <jesper@journeyman.se>
+Jiabin Peng <png.inside@gmail.com>
 Jialei <jialeicui@126.com>
 Jieraaa <842533841@qq.com>
+Jing Ma <mjingm87@qq.com>
 Joe <qiaolibo@126.com>
 Joe Hsu <jhsu.x1@gmail.com>
+John Johnson III <john@johnjohnson.cc>
+John Nguyen <jtnguyen236@gmail.com>
 Jonatas Walker <jonataswalker@gmail.com>
+Jonny Buchanan <jonathan.buchanan@gmail.com>
 Jordan Hornblow <jordan@jch254.com>
+Josué <ujosuegt@outlook.com>
+Juan Rodrigo Venegas Boesch <jrvboesch@gmail.com>
 Junyu Zhan <irrigator@yeah.net>
+Kaien Liao <liaokaien@gmail.com>
 Kenaniah Cerny <kenaniah@gmail.com>
 Kenneth Truong <kenneth.e.truong@gmail.com>
 Kevin Ivan <info@kevinivan.com>
 KgTong <kgtong1992@gmail.com>
+Khalifa Lame <khalibloo@gmail.com>
+Kiho · Cham <monkindey@163.com>
 Kimmo Saari <kimmo.saari@revolt.fi>
+Kirill Stiopin <kirill.stiopin@hotmail.com>
 Knacktus <knacktus@gmail.com>
+Kyle Kelley <rgbkrk@gmail.com>
 Kyle Rosenberg <kyle.rosenberg@gmail.com>
 Larry Laski <larry.laski@gmail.com>
 LeeHarlan <709886167@qq.com>
+LeezQ <lizhenq2009@gmail.com>
 Leo <clinyong@gmail.com>
 Leon Shi <superRaytin@163.com>
 Leon Shi <superRaytin@gmail.com>
 Liu Yang <zation1@gmail.com>
 LongYinan <lynweklm@gmail.com>
+Lyndon001 <lld207@126.com>
 MG12 <wuzhao.mail@gmail.com>
 Ma Tianxiao <matx2215@outlook.com>
 Madis Väin <madisvain@gmail.com>
 Manjit Kumar <manjit1727@gmail.com>
+Manweill <mic.liangwenwei@foxmail.com>
+Marco Afonso <mafonso333@gmail.com>
+Marcus Bransbury <marcus.bransbury@gmail.com>
 Marius Ileana <visvadw@gmail.com>
+Mars Wong <marswong618@gmail.com>
 Marshall Chen <Juniors.fei@gmail.com>
 Martin Litvaj <kamahl19@gmail.com>
 Martin Novák <martinnovak@outlook.com>
+Mathew <khayaanimations@gmail.com>
+Maximilian Meyer <Maximilian.Meyer@br.de>
 Meck <yesmeck@gmail.com>
 MeiLin <postget.me@gmail.com>
+Meow-z <372086270@qq.com>
+Miaow <i@zfeng.net>
+Michalis Macheras <diodosier@gmail.com>
 Min <dicklwm@163.com>
+MinJeong Kim <min7859@gmail.com>
 Minqi Pan <pmq2001@gmail.com>
 Minsung Ryu <ryums0227@gmail.com>
 Mitchell Demler <mitchell.demler@harcourts.net>
+Mohamed Seada <mohamed.seada.1994@gmail.com>
 Mr.Tone <vector@malubei.com>
+MuYu <mr.muzea@gmail.com>
+Mário Gonçalves <mario.mc.goncalves@gmail.com>
+Nathan Griffin <nathan@gatherhere.com>
 Nathan Tavares Nascimento <nathan.tnascimento@gmail.com>
 Nathan Wells <nwwells@gmail.com>
+Neekey <ni184775761@gmail.com>
+Nekron <nekron.hyt@gmail.com>
 Neverland <chenjiahan@buaa.edu.cn>
 Nico <nicolas@freddelacompta.com>
+Nidhi Agarwal <nidhi.agarwal@zomato.com>
 Nimo <nimo.jser@gmail.com>
 Nishant Arora <na.nishantarora@gmail.com>
+Nokecy <Nokecy@163.com>
 OAwan <georgio.wan@gmail.com>
+Oleksandr Kovalchuk <me.olexandr.kovalchuk@gmail.com>
+OuYancey <ou.yancey@gmail.com>
 Panjie Setiawan Wicaksono <panjie@panjiesw.com>
 Patrick Gidich <patrick.gidich@simnova.com>
 Patryk <longer44@gmail.com>
+Peter <usstpeter@gmail.com>
 Peter Berg <atticusberg@gmail.com>
 Pierre <pierre@bazoge.com>
+Pierre Neter <pierreneter@gmail.com>
 Piper Chester <piperchester@gmail.com>
 Pixy Yuan <pixy.bupt@gmail.com>
 Pyiner <lijiuyang1992@gmail.com>
+Pyroboomka <qwaarty@mail.ru>
 Qiaosen Huang <joesonw@gmail.com>
 Qingrong Ke <keqingrong1992@gmail.com>
 Rafael Cosman <rafaelcosman@alumni.stanford.edu>
+Ramsés Moreno <ramses@cuatromedios.com>
+Randy <randypriv@gmail.com>
 RaoHai <surgesoft@gmail.com>
+Reed Sun <superreedsun@gmail.com>
 Rex <zhangzilong.zzl@163.com>
+Ricardo Raphael Joson <rrjoson08@gmail.com>
 Richard D. Worth <rdworth@gmail.com>
 Robert Wilkinson <wilkinson.robert.a@gmail.com>
+Rohan Malhotra <rohan.root@gmail.com>
 Rrrandom <emanonhere@gmail.com>
+SHEN Lin <shenlin192@gmail.com>
 Sakol Assawasagool <koobitor@gmail.com>
+Sam Chen <chenxsan@gmail.com>
+Sam Maxwell <sam@paybase.io>
+Sangle <whb97@163.com>
+Sanjay Kumar <kris.gooner@gmail.com>
 Sanjay Kumar <sk@tectusdreamlab.com>
 Sean Lin <sean@ejoy.com>
 Sean Sun <pinggodstudio@gmail.com>
@@ -134,39 +216,74 @@ Sebastian Blade <blade254353074@hotmail.com>
 Sergio Crisostomo <sergiosbox@gmail.com>
 Shawn Sit <xueqingxiao@gmail.com>
 ShiTengFei <shitengfei@goyoo.com>
+Shubham Kanodia <shubhamsizzles@gmail.com>
 SimaQ <sima.zhang1990@gmail.com>
+Spencer <spjy@hawaii.edu>
+Stephen Esser <Stephen.Esser@gmail.com>
+Tao <magicdawn@qq.com>
 Tao Zhang <windse7en@gmail.com>
+Taylor Sabell <taylorsabell@gmail.com>
+Tengjiao Cai <caitengjiao1987@gmail.com>
+Terence <trence320@163.com>
 The Rock <zhoguoxin@126.com>
 Tino D <ginodeis@gmail.com>
+Tom Gao <tom@zoomsoft.cc>
+Trotyl Yu <trotyl@qq.com>
+Troy Thompson <troynt@gmail.com>
 Tyler <chaotyler@gmail.com>
+Ubaldo Quintana <blkdr@hotmail.com>
 Vadim Macagon <vadim.macagon@gmail.com>
 Valentin Vichnal <valentin@vichnal.com>
-Vemund Santi <veund@santi.no>
+Vemund Santi <vemund@santi.no>
+Vic <709147950@qq.com>
 Vincent Zhang <vxzhong@qq.com>
+ViviaRui <zr1450995198@163.com>
 Walter Barbagallo <turbometalskater@gmail.com>
+Wang Jun <amos.callmexyz@gmail.com>
 Warren Seymour <warren@fountainhead.tech>
 Wei Zhu <yesmeck@gmail.com>
+Wenchao Hu <zjuhwc@gmail.com>
 Will Chen <willchen90@gmail.com>
+WingGao <wing.gao@live.com>
+Wu Haotian <whtsky@gmail.com>
+XBTop1! <xbtop1@gmail.com>
 Xie Guanglei <xieguanglei@hotmail.com>
+XuMM_12 <owiatsq@sina.cn>
+Yang Bin <yangkghjh@gmail.com>
+Yasin Uslu <nepjua@gmail.com>
 Yiming <ymjrcc@qq.com>
 Yogesh <yogeshkumar180592@gmail.com>
+YuChao Liang <l.yuch@foxmail.com>
+Yunus EŞ <yunus@yunuses.com>
+Yury Kozyrev <urakozz@me.com>
 Yusuke Ito <novi.mad@gmail.com>
 Yuwei Ba <i@xiaoba.me>
 YuyingWu <wuyuying1128@gmail.com>
 Zack Craig <zack@zack6849.com>
 Zap <a124116186@qq.com>
+Zhang Zhi <fytriht@gmail.com>
+Zheeeng <hi@zheeeng.me>
+Ziluo <gyfzzu@gmail.com>
 afc163 <afc163@gmail.com>
+ahalimkara <ahalimkara@gmail.com>
+ascoders <576625322@qq.com>
 ashishg-qburst <ashishg@qburst.com>
 bang <sqibang@gmail.com>
 bang88 <sqibang@gmail.com>
 blankzust <450811238@qq.com>
+byuanama <byuan@ama.com.au>
+bzone <yarnbcoder@gmail.com>
 caoyi <caoyi0905@mail.hfut.edu.cn>
 cathayandy <wzm_andy@126.com>
+chaofeis <408067385@qq.com>
 chchen <cc272309126@gmail.com>
 chencheng (云谦) <sorrycc@gmail.com>
+chencheng <sorrycc@gmail.com>
+cjahv <cjahv@qq.com>
 clinyong <clinyong@gmail.com>
 corneyl <cornieljoosse@gmail.com>
 ddcat1115 <ddcat1115@gmail.com>
+delesseps <andrewlessels@gmail.com>
 denzw <denzw@21cn.com>
 detailyang <detailyang@gmail.com>
 devqin <devqin@gmail.com>
@@ -181,40 +298,67 @@ feng zhi hao <fzhihao@outlook.com>
 fengmk2 <m@fengmk2.com>
 flashback313 <windmark2012@gmail.com>
 genie <genie88@163.com>
+gregahren <grega.hren@gmail.com>
 handycode <lihandi@gmail.com>
 hansnow <hansnow2012@gmail.com>
 haoxin <coderhaoxin@outlook.com>
 hardfist <yangjianzju@gmail.com>
+hauwa123 <hauwa.aminu@outlook.com>
+henryv0 <henryvo94@gmail.com>
 hi-caicai <hi@cai-cai.me>
+huzzbuzz <huzzbuzz@outlook.com>
 iamcastelli <sowed@cyberdude.com>
+imosapatryk <imosa.patryk@gmail.com>
+infeng <fzhihao@outlook.com>
+int2d <int2d@qq.com>
 ioldfish <fish.wangl@gmail.com>
 jasonslyvia <jasonslyvia@gmail.com>
+jasonxia23 <xia.jason23@gmail.com>
 jiang <155259966@qq.com>
+jim <wasd2144@hotmail.com>
 jinouwuque <ee2win@gmail.com>
+junjing.zhang <zhangjunjing@gmail.com>
 kacjay <45483388@qq.com>
 kagawagao <kingsongao1221@gmail.com>
 kaifei <150641329@qq.com>
 kasinooya <kasinooya@gmail.com>
 kayw <kayw@outlook.com>
 kdenz <ksnz93@gmail.com>
+kdepp <kdepp.cd@gmail.com>
 keng <keng@renderinghouse.com>
+keqingrong <keqingrong1992@gmail.com>
 ko <git@yaksok.net>
+konakona <lovekonakona@gmail.com>
 kossel <lis.yichao@gmail.com>
+kuang <p2227@hotmail.com>
 kun sam <kunsam624@icloud.com>
 leadream <857098475@qq.com>
 lehug <zcszuo5811@126.com>
 leon.shi <superRaytin@163.com>
 lgmcolin <gengmin.lgm@gmail.com>
 lgmcolin <lgmcolin@gmail.com>
+liangfei <njliangfei@gmail.com>
 liekkas <zjq0717@163.com>
+lihqi <455711093@qq.com>
 lixiaochou077 <qi.liqi07@gmail.com>
 lixiaoyang <lixiaoyang2345@gmail.com>
+lixiaoyang1992 <lixiaoyang2345@gmail.com>
 lizhaocai <lzc09008@gmail.com>
+lizhen <lizhen@youzan.com>
 loganpowell <loganp@tepper.cmu.edu>
+luyiming <luyimingchn@gmail.com>
+lvren <luren6049@qq.com>
 mArker <252133226@qq.com>
+memoryza <jincai.wang@foxmail.com>
+mgrdevport <mgrdevport@gmail.com>
 mitchell.demler <mitchell.demler@harcourts.net>
+mkermani144 <mkermani144@gmail.com>
+monkindey <monkindey@163.com>
 muzuiget <muzuiget@gmail.com>
 natergj <nater_nater@me.com>
+neekey <ni184775761@gmail.com>
+niko <644506165@qq.com>
+nikogu <644506165@qq.com>
 paranoidjk <hust2012jiangkai@gmail.com>
 parlop <parlop@gmail.com>
 pd4d10 <pd4d10@gmail.com>
@@ -224,8 +368,11 @@ pizn <pizner@gmail.com>
 plandem <plandem@gmail.com>
 popomore <sakura9515@gmail.com>
 qubaoming <qubaoming@didichuxing.com>
+ravirambles <ravirambles@gmail.com>
 ryangun <ryangun@foxmail.com>
+ryanhoho <hswacoal@gmail.com>
 sadmark <zhoubin@laidian360.com>
+sallen450 <jqh101@sina.com>
 shelwin <wxfans@gmail.com>
 shenlin192@gmail.com <shenlin192@gmail.com>
 shlice <licesh@gmail.com>
@@ -236,17 +383,26 @@ snadn <snadn@snadn.cn>
 sojournerc <cmeyer@zvelo.com>
 sorrycc <sorrycc@gmail.com>
 swindme <swindme@163.com>
+syssam <s.y.s.sam.sys@gmail.com>
+thegatheringstorm <tgs@tgs.blue>
 tianli.zhao <275287902@qq.com>
 tom <caolvchong@gmail.com>
+twobin <twobin@live.com>
+u3u <qwq@qwq.cat>
 ustccjw <317713370@qq.com>
+valleykid <valleykiddy@gmail.com>
+vgeyi <vgeyiz@126.com>
 wangtao0101 <yuecjn@gmail.com>
+wangxiaolei <fatelei@gmail.com>
 warmhug <hualei5280@gmail.com>
 whtang906 <whtang906@gmail.com>
 wizawu <wizawu@gmail.com>
 wonyun <wy393767068@163.com>
 xiaofan2406 <xiaofan2406@gmail.com>
+yangwukang <yangwukang@boco.com.cn>
 yeliex <yeliex@yeliex.com>
 yiminghe <yiminghe@gmail.com>
+yociduo <yociduo@vip.qq.com>
 yubozhao <yubz86@gmail.com>
 yuche <i@yuche.me>
 z <haig8@msn.com>
@@ -255,26 +411,46 @@ zerob4wl <zerob4wl@gmail.com>
 zhangpc <zhangpc@tenxcloud.com>
 zhaocai <lzc09008@gmail.com>
 zhujun24 <zhujun87654321@gmail.com>
+zhuyue <fuping.dfp@antfin.com>
 zilong <jzlxiaohei@163.com>
 zinkey <yaya@uloveit.com.cn>
 zollero <corona7@163.com>
+zombiej <smith3816@gmail.com>
 zuiidea <zuiiidea@gmail.com>
-一喵呜 <hyb628@gmail.com>
-乔奕轩 <qiao_yixuan@163.com>
-低位 <zhujun87654321@gmail.com>
-偏右 <afc163@gmail.com>
-可乐 <zaxlct@foxmail.com>
-吕立青 <jimmy.jinglv@gmail.com>
-广彬-梁 <326741518@qq.com>
-柚子男 <yozman@sina.com>
-白羊座小葛 <abeyuhang@gmail.com>
-英布 <chaoren1641@gmail.com>
-蔡伦 <sliuqin@gmail.com>
-逸达 <dqaria@gmail.com>
 邦 <sqibang@gmail.com>
-闲耘™ <hotoo.cn@gmail.com>
+爱but的苍蝇 <354788473@qq.com>
+拷钉 <41830859@qq.com>
+竹尔 <Juelchiang@gmail.com>
+偏右 <afc163@gmail.com>
+英布 <chaoren1641@gmail.com>
+朮厃 <cn.ah.liu@gmail.com>
+诸岳 <dengfuping_develop@163.com>
+逸达 <dqaria@gmail.com>
+蔡伦 <sliuqin@gmail.com>
 陆离 <surgesoft@gmail.com>
+愚道 <tingzhao.ytz@antfin.com>
 陈帅 <wasd2144@hotmail.com>
-马斯特 <sd4399340@126.com>
-马金花儿 <o.o@mug.dog>
+松子 <window.pibarr@gmail.com>
+可乐 <zaxlct@foxmail.com>
+山客 <zeakhold@gmail.com>
+曾凯 <zengkai2009@foxmail.com>
+低位 <zhujun87654321@gmail.com>
+广彬-梁 <326741518@qq.com>
+徐坤龙 <272992168@qq.com>
 黄子毅 <576625322@qq.com>
+翁润雨 <593110501@qq.com>
+崔宏森 <948346354@qq.com>
+闲耘™ <hotoo.cn@gmail.com>
+一喵呜 <hyb628@gmail.com>
+吕立青 <jimmy.jinglv@gmail.com>
+隋鑫磊 <joshuasui@gmail.com>
+乔奕轩 <qiao_yixuan@163.com>
+马斯特 <sd4399340@126.com>
+王集鹄 <wjhu111@21cn.com>
+柚子男 <yozman@sina.com>
+愚指导 <yutingzhao1991@sina.com>
+愚指导-TZ <yutingzhao1991@sina.com>
+超能刚哥 <margox@foxmail.com>
+马金花儿 <o.o@mug.dog>
+रोहन मल्होत्रा <rohan.malhotra@adwyze.com>
+白羊座小葛 <abeyuhang@gmail.com>
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -14,13 +14,157 @@ timeline: true
 * Major version release is not included in this schedule for breaking change and new features.

 ---
+
+## 3.5.2
+
+`2018-05-13`
+
+- 🐞 Fixed `Cascader` displayRender z-index issue. [#10433](https://github.com/ant-design/ant-design/issues/10433)
+- 🐞 Fixed `Button` Types of property 'ref' are incompatible. [#10405](https://github.com/ant-design/ant-design/issues/10405)
+- 🐞 Fixed `Table` filter doesn't work on checkbox click. [#10452](https://github.com/ant-design/ant-design/issues/10452)
+- 🐞 Fixed the height of `Form` item when checks position is dithered. [#10445](https://github.com/ant-design/ant-design/issues/10445)
+- 🌟 Allow to use any CSS units for `Layout` width. [#10479](https://github.com/ant-design/ant-design/pull/10479)
+
+## 3.5.1
+
+`2018-05-09`
+
+- 🐞 Fixed broken style of Input.Group under Form. [#10371](https://github.com/ant-design/ant-design/issues/10371)
+- 🐞 Fixed overlay style of Select. [#10383](https://github.com/ant-design/ant-design/issues/10383)
+- 🐞 Remove focused style of Collapse.
+- 🐞 Remove unnecessary `z-index` of Input.Group and Checkbox. [#9840](https://github.com/ant-design/ant-design/issues/9840) [#10385](https://github.com/ant-design/ant-design/issues/10385)
+- 🐞 Fixed that monospaced font family can't be bold.
+- Table
+  - 💄 Rewrited the editable table demo. [#10119](https://github.com/ant-design/ant-design/pull/10119)
+  - 🐞 Fixed that table column overlay each other. [#9822](https://github.com/ant-design/ant-design/issues/9822)
+- TypeScript
+  - 🐞 Fixed Breadcrumb.Item type. [#10372](https://github.com/ant-design/ant-design/pull/10372) [@karol-majewski](https://github.com/karol-majewski)
+  - 🐞 Fixed Table `rowSelection` type。[#10374](https://github.com/ant-design/ant-design/issues/10374)
+
+## 3.5.0
+
+`2018-05-04`
+
+- 🌟 Add `title` prop to `Badge` that shows when hovering it. [74d81c2](https://github.com/ant-design/ant-design/commit/74d81c2d078a3c84b3e44cbfbdd99b8f479ea71d) [@ludwigbacklund](https://github.com/ludwigbacklund)
+- 🌟 Add `successPercent` as `Progress[format]` argument. [#10096](https://github.com/ant-design/ant-design/issues/10096)
+- 🌟 Update `rc-notification` to 3.1.0 so that `Notification` support set `maxCount`. [#10161](https://github.com/ant-design/ant-design/pull/10161) [@jzhangs](https://github.com/jzhangs)
+- 🌟 Update `rc-cascader` to 1.13.0 so that `Cascader` support set `filedNames`. [react-component/cascader#23](https://github.com/react-component/cascader/pull/23) [@405go](https://github.com/405go)
+- 🌟 Add ability to update `Notification` props by key. [react-component/notification#40](https://github.com/react-component/notification/pull/40) [@yevhen-hryhorevskyi](https://github.com/yevhen-hryhorevskyi)
+- 🌟 `List` support pagination by default. [#10135](https://github.com/ant-design/ant-design/pull/10135)
+- Table
+  - 🌟 Column `sorter` function is passed `sortOrder` as param. [#10306](https://github.com/ant-design/ant-design/pull/10306) [@kumarashwin](https://github.com/kumarashwin)
+  - 🐞 Fix merged header cell border. [#10359](https://github.com/ant-design/ant-design/issues/10359)
+  - 🐞 Fix lost of user selection on data updates. [#10332](https://github.com/ant-design/ant-design/pull/10332) [@chrvadala](https://github.com/chrvadala)
+- `Menu` upgrade `rc-menu` to `7.x` [#10305](https://github.com/ant-design/ant-design/pull/10305)
+  - 🌟 Better aria-* attributes support. [react-component/menu#137](https://github.com/react-component/menu/pull/137)
+  - 🌟 Improve Menu performance by avoiding unnecessary updates. [react-component/menu#133](https://github.com/react-component/menu/pull/133)
+  - 🌟 Support passing props through to MenuItem list item. [react-component/menu#135](https://github.com/react-component/menu/pull/135)
+  - 🐞 Minor key shortcut bug fixes. [react-component/menu#132](https://github.com/react-component/menu/pull/132)
+- Collapse
+  - 🌟 Support custom `Collapse` styles with less. [#9943](https://github.com/ant-design/ant-design/pull/9943) [@davidhatten](https://github.com/davidhatten)
+  - 🌟 Update `rc-collapse` to 1.9.0 to add `Collapse` keyboard support. [react-component/collapse#84](https://github.com/react-component/collapse/pull/84/)  [@kossel](https://github.com/kossel)
+- Select
+  - 🐞 Fix type for `placeholder`. [#10282](https://github.com/ant-design/ant-design/pull/10282) [@thomasthiebaud](https://github.com/thomasthiebaud)
+  - 🐞 Fix extra space taken up when arrow disabled. [#10296](https://github.com/ant-design/ant-design/pull/10296)
+  - 🐞 Fix property `value` typescript type. [#10336](https://github.com/ant-design/ant-design/pull/10336) [@paranoidjk](https://github.com/paranoidjk)
+- Input
+  - 🐞 Fix `Input.Search` not disable enter button when disabled prop is true. [#10040](https://github.com/ant-design/ant-design/issues/10040)
+  - 🐞 Fix `Input.Group` align issue in Form. [#10281](https://github.com/ant-design/ant-design/issues/10281)
+- Form
+  - 🐞 Fix typing for `Form.onValuesChange`. [#10231](https://github.com/ant-design/ant-design/pull/10231) [@whtsky](https://github.com/whtsky)
+  - 🐞 Fix typescript interface `ComponentDecorator`. [#10324](https://github.com/ant-design/ant-design/pull/10324) [@paranoidjk](https://github.com/paranoidjk)
+- 🐞 Fix dashed `Divider`. [#10216](https://github.com/ant-design/ant-design/issues/10216)
+- 🐞 Fix `Spin` container interaction. [#10227](https://github.com/ant-design/ant-design/issues/10227)
+- 🐞 Fix `Notification` icon hover color. [#10272](https://github.com/ant-design/ant-design/issues/10272)
+- 🐞 Fix `Upload` property `lastModifiedDate` name. [#10315](https://github.com/ant-design/ant-design/pull/10315) [@danielg2002](https://github.com/danielg2002)
+- 🐞 Fix `Button` props type, use `React.HTMLProps`. [#10229](https://github.com/ant-design/ant-design/pull/10229) [@whtsky](https://github.com/whtsky)
+- 🐞 Fix less var naming convention. [#10275](https://github.com/ant-design/ant-design/issues/10275)
+
+## 3.4.5
+
+`2018-05-03`
+
+- 🐞 Fix file object is empty and file name not showing in Upload. [#10319](https://github.com/ant-design/ant-design/issues/10319)
+
+## 3.4.4
+
+`2018-04-28`
+
+- 🐞 Fix that Upload file in`onChange({ file })` is not a File instance introduced in `3.4.2`. [#10293](https://github.com/ant-design/ant-design/issues/10293)
+- 🐞 Fix style lose bug when use tree shaking in webpack@4. [#10217](https://github.com/ant-design/ant-design/pull/10217) [@whtsky](https://github.com/whtsky)
+
+## 3.4.3
+
+`2018-04-23`
+
+- 🐞 Fix style lose bug when use tree shaking in webpack@4. [#10197](https://github.com/ant-design/ant-design/pull/10197) [@Aladdin-ADD](https://github.com/Aladdin-ADD)
+- 🐞 Fix `Menu` item's clickable region in dark theme. [#10187](https://github.com/ant-design/ant-design/pull/10187) [@dgeibi ](https://github.com/dgeibi )
+
+## 3.4.2
+
+`2018-04-22`
+
+- 💄 Deployed site by [netlify](http://netlify.com/) to avoid blocking by GFW.
+- 🐞 Fix TypeScript definitions of Menu, Tooltip, Card, Anchor, Avatar, Form, Tabs, Transfer, Tree, AutoComplete and etc.
+- 💄 Added `sideEffects` to `package.json` for better Tree-Shaking. [#10043](https://github.com/ant-design/ant-design/pull/10043) [@Aladdin-ADD](https://github.com/Aladdin-ADD)
+- List
+  - 🐞 Fix extra border. [#10028](https://github.com/ant-design/ant-design/issues/10028)
+  - 🐞 Fix extra prop warning of `locale`. [#10128](https://github.com/ant-design/ant-design/pull/10128) [@slonoed](https://github.com/slonoed)
+- 🐞 Fix wrong preview image of Upload list when file.url contains url params. [#10102](https://github.com/ant-design/ant-design/issues/10102)
+- 🐞 Fix Progress when percent is out of range. [0eb8357](https://github.com/ant-design/ant-design/commit/0eb835772dbaa7ed14babe03fc177821c5bd5ca5)
+- Menu
+  - 🐞 Fix arrow style of disabled SubMenu. [#10113](https://github.com/ant-design/ant-design/issues/10113)
+  - 🐞 Fix that menu width is wrong when `collapsedWidth` is assigned as px string like `40px`. [#10140](https://github.com/ant-design/ant-design/issues/10140)
+- 🐞 Fix that sometimes controlled input in Form cannot be edited. [#9790](https://github.com/ant-design/ant-design/issues/9790)
+- 🐞 Fix padding jumping issue of loading Card. [#10052](https://github.com/ant-design/ant-design/pull/10052) [@zheeeng](https://github.com/zheeeng)
+- 🐞 Fix that Avatar's fallback text don't scale as the text avatar does. [#10184](https://github.com/ant-design/ant-design/pull/10184)
+- 🐞 Fix Table `getCheckboxProps` cannot be updated as expected. [#10133](https://github.com/ant-design/ant-design/issues/10133)
+- 🐞 Fix CheckboxGroup `prefixCls` prop not passed to Checkbox. [#9950](https://github.com/ant-design/ant-design/issues/9950)
+
+## 3.4.1
+
+`2018-04-08`
+
+- 🐞 Fix TypeScript type error caused by code error of Badge. [#9931](https://github.com/ant-design/ant-design/issues/9931)
+- 💄 Improve clicking region of Card `actions`. [#9882](https://github.com/ant-design/ant-design/issues/9882)
+- 🐞 Fix Divider style issue when used with float elements. [#9956](https://github.com/ant-design/ant-design/issues/9956)
+- 🐞 Fix style issue of Form in advanced-search mode. [#9907](https://github.com/ant-design/ant-design/issues/9907)
+- 🐞 Add `onHeaderRow` TypeScript type definitions for Table. [#9902](https://github.com/ant-design/ant-design/pull/9902) [@Nokecy](https://github.com/Nokecy)
+- 💄 Improve the customized-icon demo of Tree. [#9893](https://github.com/ant-design/ant-design/pull/9893)
+- 🐞 Fix image url display with non-image extention in Upload. [#9936](https://github.com/ant-design/ant-design/pull/9936)
+
+## 3.4.0
+
+`2018-04-01`
+
+- Tree
+  - 🛠 In this version, we refactored the underlying code of Tree to resolve some long living issues.
+  - 🌟 Added `defaultExpandParent` for expanding parent at first render.
+  - 🌟 Added `disabled` for disabling the whole tree.
+  - 🌟 Added `TreeNode[icon]` to allow setting custom node icon.
+  - 🌟 Improved the check logic for disabled TreeNode.
+- 🌟 Anchor added `getContainer` for setting the container of scroll content.
+- 🌟 Table added a new less variable `@table-expanded-row-bg`. [#9789](https://github.com/ant-design/ant-design/pull/9789)
+- 🐞 Fixed a less syntax error. [#9832](https://github.com/ant-design/ant-design/pull/9832) [@jojoLockLock](https://github.com/jojoLockLock)
+- 🐞 Fixed `moment.locale` invoking error in LocaleProvider. [#9853](https://github.com/ant-design/ant-design/pull/9853)
+- 🐞 Fixed issue resulting in `style` of WeekPicker not works. [#9848](https://github.com/ant-design/ant-design/issues/9848)
+- 🐞 Fixed type definition of Layout.Sider. [#9885](https://github.com/ant-design/ant-design/pull/9885) [@zachguo](https://github.com/zachguo)
+- 💄 Improved style of Modal for long contents. [#9592](https://github.com/ant-design/ant-design/pull/9592)
+- 🌟 Added new locale Slovenian.
+
+## 3.3.3
+
+`2018-03-25`
+
+- Revert Upload `file` type change in previous version  which causes breaking change.
+
 ## 3.3.2

 `2018-03-24`

 - 🐞 `Carousel`: Upgrade `react-slick` version to fix width calculation. [#3659](https://github.com/ant-design/ant-design/issues/3659)
 - 💄 `Rate`: Adjust `disabled` style. [#9747](https://github.com/ant-design/ant-design/issues/9747)
- 💄 `Modal`: Adjust `confirm-modal` style to fix multiple line display issue. [#9374](https://github.com/ant-design/ant-design/issues/9374)
+- 💄 `Modal`: Adjust `confirm-modal` style to fix display issue when content use grid layout. [#9374](https://github.com/ant-design/ant-design/issues/9374)
 - 💄 `Menu`: Adjust style to fix mouse trigger event region. [#9666](https://github.com/ant-design/ant-design/pull/9666) [@dgeibi](https://github.com/dgeibi)
 - 🐞 `Upload`: Fix type of `file` on `beforeUpload` function. [#9775](https://github.com/ant-design/ant-design/issues/9775)
 - 🐞 `Button`: Fix `two-chinese-words` space not re-calculate when text changed. [4502ad8](https://github.com/ant-design/ant-design/commit/4502ad8376e536c450fa4f27d2a5855be5a153e7)
@@ -127,7 +271,7 @@ timeline: true
  - 🐞 Fix issue resulting date panel being closed without animation when click on the preset range. [#6364](https://github.com/ant-design/ant-design/issues/6364)
  - 🐞 Fix issue resulting `onOk` is not being trigged, when click on the preset range. [#7747](https://github.com/ant-design/ant-design/issues/7747)
 - Select
-  - 🌟 Improve `onChange`、`onDeselect`, they will receive selected `Option` as second paramteter.
+  - 🌟 Improve `onChange`, `onDeselect`, they will receive selected `Option` as second paramteter.
  - 🐞 Fix issue resulting in `onSelect` is not trigged when using automatic tokenization. [#9094](https://github.com/ant-design/ant-design/issues/9094)
  - 🐞 Fix the missing scrollbar in Chrome.
 - 🌟 Improve Table's `rowSelection[getCheckboxProps]` prop, now the all the properties returned by `getCheckboxProps` will be passed to checkbox. [#9054](https://github.com/ant-design/ant-design/pull/9054) [@mgrdevport](https://github.com/ant-design/ant-design/pull/9054)
@@ -392,7 +536,7 @@ We provide a [migration tool](https://github.com/ant-design/antd-migration-helpe
  - 🌟 `status` can use whith `children` now. [#8164](https://github.com/ant-design/ant-design/issues/8164)
 - Card
  - 🌟 Added new `inner` type. [Demo](https://ant.design/components/card/#components-card-demo-inner)。
-  - 🌟 Added `cover`、`actions` and a new `Meta` component. [Demo](https://ant.design/components/card/#components-card-demo-meta)。
+  - 🌟 Added `cover`, `actions` and a new `Meta` component. [Demo](https://ant.design/components/card/#components-card-demo-meta)。
 - DatePicker
  - 🌟 Added `mode` and `onPanelChange`，to allow controlling the panel mode. [Demo](https://ant.design/components/date-picker/#components-date-picker-demo-mode)。
  - 🌟 Added `WeekPicker` component. [Demo](https://ant.design/components/date-picker/#components-date-picker-demo-basic)
@@ -428,7 +572,7 @@ We provide a [migration tool](https://github.com/ant-design/antd-migration-helpe
  - 🌟 Added `column[defaultSortOrder]` to allow setting default sort order. [#8111](https://github.com/ant-design/ant-design/pull/8111) [@megawac](https://github.com/megawac)
  - 🌟 Added `rowSelection[fixed]` to allow fixing the selection column.。
  - 🙅 Deprecated `getBodyWrapper`, please use `components` instead.
-  - 🙅 Deprecated `onRowClick`，`onRowDoubleClick`、`onRowContextMenu`、`onRowMouseEnter`、`onRowMouseLeave`, please use `onRow` instead.
+  - 🙅 Deprecated `onRowClick`，`onRowDoubleClick`, `onRowContextMenu`, `onRowMouseEnter`, `onRowMouseLeave`, please use `onRow` instead.
    ```javascript
    <Table onRow={(record) => ({
      onClick: () => {},
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -14,13 +14,157 @@ timeline: true
 * 主版本号：含有破坏性更新和新特性，不在发布周期内。

 ---
+
+## 3.5.2
+
+`2018-05-13`
+
+- 🐞 修复 `Cascader` 的 displayRender 问题。[#10433](https://github.com/ant-design/ant-design/issues/10433)
+- 🐞 修复 `Button` ref 不兼容问题。[#10405](https://github.com/ant-design/ant-design/issues/10405)
+- 🐞 修复 `Table` 过滤器在复选框上不起作用。[#10452](https://github.com/ant-design/ant-design/issues/10452)
+- 🐞 修复 `Form` 表单项校验位置高度时出现抖动问题。[#10445](https://github.com/ant-design/ant-design/issues/10445)
+- 🌟 设置 `Layout` 宽度时，允许使用任何的 CSS 单位。 [#10479](https://github.com/ant-design/ant-design/pull/10479)
+
+## 3.5.1
+
+`2018-05-09`
+
+- 🐞 修复 Input.Group 在 Form 下样式错位的问题。[#10371](https://github.com/ant-design/ant-design/issues/10371)
+- 🐞 修复 Select 箭头和内容重叠的问题。[#10383](https://github.com/ant-design/ant-design/issues/10383)
+- 🐞 移除 Collapse 点击时的 focus 样式。
+- 🐞 移除 Input.Group 和 Checkbox 不必要的 `z-index`。[#9840](https://github.com/ant-design/ant-design/issues/9840) [#10385](https://github.com/ant-design/ant-design/issues/10385)
+- 🐞 修复一个数字等宽字体没有加粗的问题。
+- Table
+  - 💄 重写了可编辑表格的演示。[#10119](https://github.com/ant-design/ant-design/pull/10119)
+  - 🐞 修复一个表格列内容互相重叠的问题。[#9822](https://github.com/ant-design/ant-design/issues/9822)
+- TypeScript
+  - 🐞 调整 Breadcrumb.Item 的类型。[#10372](https://github.com/ant-design/ant-design/pull/10372) [@karol-majewski](https://github.com/karol-majewski)
+  - 🐞 修复 Table 的 `rowSelection` 的类型。[#10374](https://github.com/ant-design/ant-design/issues/10374)
+
+## 3.5.0
+
+`2018-05-04`
+
+- 🌟 组件 `Badge` 新增 `title` 属性支持鼠标 hover 的时候显示。[74d81c2](https://github.com/ant-design/ant-design/commit/74d81c2d078a3c84b3e44cbfbdd99b8f479ea71d) [@ludwigbacklund](https://github.com/ludwigbacklund)
+- 🌟 添加 `successPercent` 为 `Progress[format]` 的参数。[#10096](https://github.com/ant-design/ant-design/issues/10096)
+- 🌟 更新 `rc-notification` 到 3.1.0 来支持组件 `Notification` 的 `maxCount` 属性。[#10161](https://github.com/ant-design/ant-design/pull/10161) [@jzhangs](https://github.com/jzhangs)
+- 🌟 更新 `rc-cascader` 到 1.13.0 来支持组件 `Cascader` 的 `filedNames` 属性。[react-component/cascader#23](https://github.com/react-component/cascader/pull/23) [@405go](https://github.com/405go)
+- 🌟 组件 `Notification` 支持通过 key 更新通知属性。 [react-component/notification#40](https://github.com/react-component/notification/pull/40) [@yevhen-hryhorevskyi](https://github.com/yevhen-hryhorevskyi)
+- 🌟 组件 `List` 支持内置的翻页功能。[#10135](https://github.com/ant-design/ant-design/pull/10135)
+- Table
+  - 🌟 新增 `sortOrder` 参数传递给列配置中的 `sorter` 方法。[#10306](https://github.com/ant-design/ant-design/pull/10306) [@kumarashwin](https://github.com/kumarashwin)
+  - 🐞 修复头部单元格的边框样式问题。[#10359](https://github.com/ant-design/ant-design/issues/10359)
+  - 🐞 修复当数据变化时用户选择项丢失的问题。[#10332](https://github.com/ant-design/ant-design/pull/10332) [@chrvadala](https://github.com/chrvadala)
+- `Menu` 升级 `rc-menu` 到 `7.x` [#10305](https://github.com/ant-design/ant-design/pull/10305)
+  - 🌟 更好的 aria-* 属性支持。[react-component/menu#137](https://github.com/react-component/menu/pull/137)
+  - 🌟 一些内部优化提升组件性能。[react-component/menu#133](https://github.com/react-component/menu/pull/133)
+  - 🌟 支持将属性传递到菜单项中。[react-component/menu#135](https://github.com/react-component/menu/pull/135)
+  - 🐞 修复一些快捷键的问题。[react-component/menu#132](https://github.com/react-component/menu/pull/132)
+- Collapse
+  - 🌟 更新 `rc-collapse` 到 1.9.0 优化键盘支持。[react-component/collapse#84](https://github.com/react-component/collapse/pull/84/)  [@kossel](https://github.com/kossel)
+  - 🌟 支持通过 less 定义组件 `Collapse` 的样式。[#9943](https://github.com/ant-design/ant-design/pull/9943) [@davidhatten](https://github.com/davidhatten)
+- Select
+  - 🐞 修复 `placeholder` 的 ts 类型问题。[#10282](https://github.com/ant-design/ant-design/pull/10282) [@thomasthiebaud](https://github.com/thomasthiebaud)
+  - 🐞 修复不显示箭头时多余的空白。[#10296](https://github.com/ant-design/ant-design/pull/10296)
+  - 🐞 修复属性 `value` 的 typescript 类型错误。[#10336](https://github.com/ant-design/ant-design/pull/10336) [@paranoidjk](https://github.com/paranoidjk)
+- Input
+  - 🐞 修复 `Input.Search` 当 disabled 为 true 时按钮没有被禁用的问题。[#10040](https://github.com/ant-design/ant-design/issues/10040)
+  - 🐞 修复 `Input.Group` 在表单中对齐的问题。[#10281](https://github.com/ant-design/ant-design/issues/10281)
+- Form
+  - 🐞 修复 `Form.onValuesChange` 的 ts 类型错误。[#10231](https://github.com/ant-design/ant-design/pull/10231) [@whtsky](https://github.com/whtsky)
+  - 🐞 修复 `ComponentDecorator` typescript 定义的错误。[#10324](https://github.com/ant-design/ant-design/pull/10324) [@paranoidjk](https://github.com/paranoidjk)
+- 🐞 修复 `Divider` 为 dashed 时的样式问题。[#10216](https://github.com/ant-design/ant-design/issues/10216)
+- 🐞 修复 `Spin` 覆盖层的展示问题。[#10227](https://github.com/ant-design/ant-design/issues/10227)
+- 🐞 修复 `Notification` 鼠标 hover 是图标的颜色问题。[#10272](https://github.com/ant-design/ant-design/issues/10272)
+- 🐞 修复 `Upload` 组件属性 `lastModifiedDate` 的拼写错误。[#10315](https://github.com/ant-design/ant-design/pull/10315) [@danielg2002](https://github.com/danielg2002)
+- 🐞 修复 `Button` 的属性类型，使用 `React.HTMLProps`。[#10229](https://github.com/ant-design/ant-design/pull/10229) [@whtsky](https://github.com/whtsky)
+- 🐞 修复 less 命名约定不一致的问题。 [#10275](https://github.com/ant-design/ant-design/issues/10275)
+
+## 3.4.5
+
+`2018-05-03`
+
+- 🐞 修复 Upload 上传文件名不展示（file 对象属性为空）的问题。[#10319](https://github.com/ant-design/ant-design/issues/10319)
+
+## 3.4.4
+
+`2018-04-28`
+
+- 🐞 修复 3.4.2 中引入的 Upload 中 onChange 参数 `{ file }` file 不是 File 实例的问题。[#10293](https://github.com/ant-design/ant-design/issues/10293)
+- 🐞 修复 webpack@4 下使用 Tree Shaking 样式丢失的问题。[#10217](https://github.com/ant-design/ant-design/pull/10217) [@whtsky](https://github.com/whtsky)
+
+## 3.4.3
+
+`2018-04-23`
+
+- 🐞 修复了 webpack@4 下使用 Tree Shaking 样式丢失的问题。[#10197](https://github.com/ant-design/ant-design/pull/10197) [@Aladdin-ADD](https://github.com/Aladdin-ADD)
+- 🐞 修复 `Menu` 组件在 `dark` 主题下点击区域的问题。[#10187](https://github.com/ant-design/ant-design/pull/10187) [@dgeibi](https://github.com/dgeibi)
+
+## 3.4.2
+
+`2018-04-22`
+
+- 💄 部署网站到 [netlify](http://netlify.com/)，解决网站被墙的问题。
+- 🐞 修复和调整 Menu、Tooltip、Card、Anchor、Avatar、Form、Tabs、Transfer、Tree、AutoComplete 等组件的 TypeScript 定义。
+- 💄 增加 `sideEffects` 配置以优化 Tree Shaking 效果。[#10043](https://github.com/ant-design/ant-design/pull/10043) [@Aladdin-ADD](https://github.com/Aladdin-ADD)
+- List
+  - 🐞 修复多余边框问题。[#10028](https://github.com/ant-design/ant-design/issues/10028)
+  - 🐞 修复 `locale` 属性被传递给 div 的警告。[#10128](https://github.com/ant-design/ant-design/pull/10128) [@slonoed](https://github.com/slonoed)
+- 🐞 修复 Upload 的文件 url 带有参数时，图片预览效果失效的问题。[#10102](https://github.com/ant-design/ant-design/issues/10102)
+- 🐞 修复 Progress 的百分比越界时的展现。[0eb8357](https://github.com/ant-design/ant-design/commit/0eb835772dbaa7ed14babe03fc177821c5bd5ca5)
+- Menu
+  - 🐞 修复 SubMenu 的失效箭头样式。[#10113](https://github.com/ant-design/ant-design/issues/10113)
+  - 🐞 修复 `collapsedWidth` 为像素字符串 `40px` 菜单宽度失效的问题。[#10140](https://github.com/ant-design/ant-design/issues/10140)
+- 🐞 修复一个某些情况下 Form 内使用受控组件时无法编辑的问题。[#9790](https://github.com/ant-design/ant-design/issues/9790)
+- 🐞 修复 Card 切换 loading 状态时的内边距跳动问题。[#10052](https://github.com/ant-design/ant-design/pull/10052) [@zheeeng](https://github.com/zheeeng)
+- 🐞 修复 Avatar 图片加载失败时的文字没有正确缩放的问题。[#10184](https://github.com/ant-design/ant-design/pull/10184)
+- 🐞 修复 Table 的 `getCheckboxProps` 无法动态更新的问题。[#10133](https://github.com/ant-design/ant-design/issues/10133)
+- 🐞 修复 CheckGroup 指定 `prefixCls` 没有传递给 Checkbox 的问题。[#9950](https://github.com/ant-design/ant-design/issues/9950)
+
+## 3.4.1
+
+`2018-04-08`
+
+- 🐞 修复了 Badge 代码错误引起的 TypeScript 类型报错。[#9931](https://github.com/ant-design/ant-design/issues/9931)
+- 💄 优化了 Card `actions` 点击区域的范围。[#9882](https://github.com/ant-design/ant-design/issues/9882)
+- 🐞 修复了 Divider 与浮动元素一起使用时的样式问题。[#9956](https://github.com/ant-design/ant-design/issues/9956)
+- 🐞 修复了 Form 高级搜索模式下的样式问题。[#9907](https://github.com/ant-design/ant-design/issues/9907)
+- 🐞 补充了 Table 缺失的 `onHeaderRow` TypeScript 定义。[#9902](https://github.com/ant-design/ant-design/pull/9902) [@Nokecy](https://github.com/Nokecy)
+- 💄 优化了 Tree 自定义图标示例。[#9893](https://github.com/ant-design/ant-design/pull/9893)
+- 🐞 修复了 Upload 对无扩展名图片地址的预览展示问题。[#9936](https://github.com/ant-design/ant-design/pull/9936)
+
+## 3.4.0
+
+`2018-04-01`
+
+- Tree
+  - 🛠 在这个版本里，我们重构了 Tree 底层的代码，以解决一些存在了很久的问题。
+  - 🌟 新增 `defaultExpandParent` 用于在第一次渲染时自动展开父节点。
+  - 🌟 新增 `disabled` 用于禁用整棵树。
+  - 🌟 TreeNode 新增 `icon` 用于设置自定义图标。
+  - 🌟 优化了 TreeNode 设置 `disabled` 时的勾选逻辑。
+- 🌟 Anchor 新增 `getContainer` 用于指定内容滚动的容器。
+- 🌟 Table 新增 less 变量 `@table-expanded-row-bg`。[#9789](https://github.com/ant-design/ant-design/pull/9789)
+- 🐞 修复一处 less 语法错误。[#9832](https://github.com/ant-design/ant-design/pull/9832) [@jojoLockLock](https://github.com/jojoLockLock)
+- 🐞 修复 LocaleProvider 中 moment.locale 调用报错的问题。 [#9853](https://github.com/ant-design/ant-design/pull/9853)
+- 🐞 修复 WeekPicker 的 style 属性不生效的问题。[#9848](https://github.com/ant-design/ant-design/issues/9848)
+- 🐞 修复 Layout.Sider 的 TypeScript 定义。[#9885](https://github.com/ant-design/ant-design/pull/9885) [@zachguo](https://github.com/zachguo)
+- 💄 优化了 Modal 中超长内容的显示。[#9592](https://github.com/ant-design/ant-design/pull/9592)
+- 🌟 新增斯洛维尼亚语。
+
+## 3.3.3
+
+`2018-03-25`
+
+- 回退上个版本 Upload 中 `file` 类型的修改。
+
 ## 3.3.2

 `2018-03-24`

 - 🐞 `Carousel`: 升级 `react-slick` 版本以修复宽度计算错误。 [#3659](https://github.com/ant-design/ant-design/issues/3659)
 - 💄 `Rate`: 调整 `disabled` 样式。 [#9747](https://github.com/ant-design/ant-design/issues/9747)
- 💄 `Modal`: 调整 `confirm-modal` 样式以修复标题多行展示问题。 [#9374](https://github.com/ant-design/ant-design/issues/9374)
+- 💄 `Modal`: 调整 `confirm-modal` 样式以修复 content 内使用栅格会错位的问题。 [#9374](https://github.com/ant-design/ant-design/issues/9374)
 - 💄 `Menu`: 调整样式以修复鼠标事件范围。[#9666](https://github.com/ant-design/ant-design/pull/9666) [@dgeibi](https://github.com/dgeibi)
 - 🐞 `Upload`: 修复 `beforeUpload` 的 `file` 类型错误。 [#9775](https://github.com/ant-design/ant-design/issues/9775)
 - 🐞 `Button`: 修复文本改变时，空格插入没有重新计算 [4502ad8](https://github.com/ant-design/ant-design/commit/4502ad8376e536c450fa4f27d2a5855be5a153e7)
--- a/README-zh_CN.md
+++ b/README-zh_CN.md
@@ -88,6 +88,7 @@ import 'antd/dist/antd.css';  // or 'antd/dist/antd.less'

 ```bash
 $ git clone git@github.com:ant-design/ant-design.git
+$ cd ant-design
 $ npm install
 $ npm start
 ```
--- a/components/tests/index.test.js
+++ b/components/tests/index.test.js
@@ -1,7 +1,15 @@
-import * as antd from '..';
+const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+const antd = require('..');

 describe('antd', () => {
  it('exports modules correctly', () => {
    expect(Object.keys(antd)).toMatchSnapshot();
  });
+
+  it('should hint when import all components', () => {
+    expect(warnSpy).toBeCalledWith(
+      'You are using a whole package of antd, please use https://www.npmjs.com/package/babel-plugin-import to reduce app bundle size.'
+    );
+    warnSpy.mockRestore();
+  });
 });
--- a/components/_util/type.ts
+++ b/components/_util/type.ts
@@ -0,0 +1,3 @@
+export type Diff<T extends string, U extends string> = ({ [P in T]: P } &
+  { [P in U]: never } & { [x: string]: never })[T];
+export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
--- a/components/alert/demo/smooth-closed.md
+++ b/components/alert/demo/smooth-closed.md
@@ -18,16 +18,16 @@ import { Alert } from 'antd';

 class App extends React.Component {
  state = {
-    visiable: true,
+    visible: true,
  }
  handleClose = () => {
-    this.setState({ visiable: false });
+    this.setState({ visible: false });
  }
  render() {
    return (
      <div>
        {
-          this.state.visiable ? (
+          this.state.visible ? (
            <Alert
              message="Alert Message Text"
              type="success"
--- a/components/anchor/Anchor.tsx
+++ b/components/anchor/Anchor.tsx
@@ -8,11 +8,11 @@ import AnchorLink from './AnchorLink';
 import getScroll from '../_util/getScroll';
 import getRequestAnimationFrame from '../_util/getRequestAnimationFrame';

-function getDefaultTarget() {
+function getDefaultContainer() {
  return window;
 }

-function getOffsetTop(element: HTMLElement): number {
+function getOffsetTop(element: HTMLElement, container: AnchorContainer): number {
  if (!element) {
    return 0;
  }
@@ -24,9 +24,11 @@ function getOffsetTop(element: HTMLElement): number {
  const rect = element.getBoundingClientRect();

  if (rect.width || rect.height) {
-    const doc = element.ownerDocument;
-    const docElem = doc.documentElement;
-    return rect.top - docElem.clientTop;
+    if (container === window) {
+      container = element.ownerDocument.documentElement;
+      return rect.top - container.clientTop;
+    }
+    return rect.top - (container as HTMLElement).getBoundingClientRect().top;
  }

  return rect.top;
@@ -43,21 +45,27 @@ function easeInOutCubic(t: number, b: number, c: number, d: number) {

 const reqAnimFrame = getRequestAnimationFrame();
 const sharpMatcherRegx = /#([^#]+)$/;
-function scrollTo(href: string, offsetTop = 0, target: () => Window | HTMLElement, callback = () => { }) {
-  const scrollTop = getScroll(target(), true);
+function scrollTo(href: string, offsetTop = 0, getContainer: () => AnchorContainer, callback = () => { }) {
+  const container = getContainer();
+  const scrollTop = getScroll(container, true);
  const sharpLinkMatch = sharpMatcherRegx.exec(href);
  if (!sharpLinkMatch) { return; }
  const targetElement = document.getElementById(sharpLinkMatch[1]);
  if (!targetElement) {
    return;
  }
-  const eleOffsetTop = getOffsetTop(targetElement);
+  const eleOffsetTop = getOffsetTop(targetElement, container);
  const targetScrollTop = scrollTop + eleOffsetTop - offsetTop;
  const startTime = Date.now();
  const frameFunc = () => {
    const timestamp = Date.now();
    const time = timestamp - startTime;
-    window.scrollTo(window.pageXOffset, easeInOutCubic(time, scrollTop, targetScrollTop, 450));
+    const nextScrollTop = easeInOutCubic(time, scrollTop, targetScrollTop, 450);
+    if (container === window) {
+      window.scrollTo(window.pageXOffset, nextScrollTop);
+    } else {
+      (container as HTMLElement).scrollTop = nextScrollTop;
+    }
    if (time < 450) {
      reqAnimFrame(frameFunc);
    } else {
@@ -73,6 +81,8 @@ type Section = {
  top: number;
 };

+export type AnchorContainer =  HTMLElement | Window;
+
 export interface AnchorProps {
  prefixCls?: string;
  className?: string;
@@ -82,7 +92,14 @@ export interface AnchorProps {
  bounds?: number;
  affix?: boolean;
  showInkInFixed?: boolean;
-  target?: () => HTMLElement | Window;
+  getContainer?: () => AnchorContainer;
+}
+
+export interface AnchorDefaultProps extends AnchorProps {
+  prefixCls: string;
+  affix: boolean;
+  showInkInFixed: boolean;
+  getContainer: () => AnchorContainer;
 }

 export default class Anchor extends React.Component<AnchorProps, any> {
@@ -92,6 +109,7 @@ export default class Anchor extends React.Component<AnchorProps, any> {
    prefixCls: 'ant-anchor',
    affix: true,
    showInkInFixed: false,
+    getContainer: getDefaultContainer,
  };

  static childContextTypes = {
@@ -133,8 +151,8 @@ export default class Anchor extends React.Component<AnchorProps, any> {
  }

  componentDidMount() {
-    const getTarget = this.props.target || getDefaultTarget;
-    this.scrollEvent = addEventListener(getTarget(), 'scroll', this.handleScroll);
+    const { getContainer } = this.props as AnchorDefaultProps;
+    this.scrollEvent = addEventListener(getContainer(), 'scroll', this.handleScroll);
    this.handleScroll();
  }

@@ -159,10 +177,10 @@ export default class Anchor extends React.Component<AnchorProps, any> {
  }

  handleScrollTo = (link: string) => {
-    const { offsetTop, target = getDefaultTarget } = this.props;
+    const { offsetTop, getContainer } = this.props as AnchorDefaultProps;
    this.animating = true;
    this.setState({ activeLink: link });
-    scrollTo(link, offsetTop, target, () => {
+    scrollTo(link, offsetTop, getContainer, () => {
      this.animating = false;
    });
  }
@@ -174,16 +192,20 @@ export default class Anchor extends React.Component<AnchorProps, any> {
    }

    const linkSections: Array<Section> = [];
+    const { getContainer } = this.props as AnchorDefaultProps;
+    const container = getContainer();
    this.links.forEach(link => {
      const sharpLinkMatch = sharpMatcherRegx.exec(link.toString());
      if (!sharpLinkMatch) { return; }
      const target = document.getElementById(sharpLinkMatch[1]);
-      if (target && getOffsetTop(target) < offsetTop + bounds) {
-        const top = getOffsetTop(target);
-        linkSections.push({
-          link,
-          top,
-        });
+      if (target) {
+        const top = getOffsetTop(target, container);
+        if (top < offsetTop + bounds) {
+          linkSections.push({
+            link,
+            top,
+          });
+        }
      }
    });

@@ -199,7 +221,8 @@ export default class Anchor extends React.Component<AnchorProps, any> {
      return;
    }
    const { prefixCls } = this.props;
-    const linkNode = ReactDOM.findDOMNode(this as any).getElementsByClassName(`${prefixCls}-link-title-active`)[0];
+    const anchorNode = ReactDOM.findDOMNode(this) as Element;
+    const linkNode = anchorNode.getElementsByClassName(`${prefixCls}-link-title-active`)[0];
    if (linkNode) {
      this.inkNode.style.top = `${(linkNode as any).offsetTop + linkNode.clientHeight / 2 - 4.5}px`;
    }
--- a/components/anchor/index.en-US.md
+++ b/components/anchor/index.en-US.md
@@ -19,6 +19,7 @@ For displaying anchor hyperlinks on page and jumping between them.
 | -------- | ----------- | ---- | ------- |
 | affix | Fixed mode of Anchor | boolean | true |
 | bounds | Bounding distance of anchor area | number | 5(px) |
+| getContainer | Scrolling container | () => HTMLElement | () => window  |
 | offsetBottom | Pixels to offset from bottom when calculating position of scroll | number | - |
 | offsetTop | Pixels to offset from top when calculating position of scroll | number | 0 |
 | showInkInFixed | Whether show ink-balls in Fixed mode | boolean | false |
--- a/components/anchor/index.zh-CN.md
+++ b/components/anchor/index.zh-CN.md
@@ -20,6 +20,7 @@ title: Anchor
 | --- | --- | --- | --- |
 | affix | 固定模式 | boolean | true |
 | bounds | 锚点区域边界 | number | 5(px) |
+| getContainer | 指定滚动的容器 | () => HTMLElement | () => window |
 | offsetBottom | 距离窗口底部达到指定偏移量后触发 | number |  |
 | offsetTop | 距离窗口顶部达到指定偏移量后触发 | number |  |
 | showInkInFixed | 固定模式是否显示小圆点 | boolean | false |
--- a/components/auto-complete/tests/snapshots/demo.test.js.snap
+++ b/components/auto-complete/tests/snapshots/demo.test.js.snap
@@ -19,7 +19,7 @@ exports[`renders ./components/auto-complete/demo/basic.md correctly 1`] = `
      <div
        class="ant-select-selection__placeholder"
        style="display:block;user-select:none;-webkit-user-select:none"
-        unselectable="unselectable"
+        unselectable="on"
      >
        input here
      </div>
@@ -47,7 +47,7 @@ exports[`renders ./components/auto-complete/demo/basic.md correctly 1`] = `
    <span
      class="ant-select-arrow"
      style="user-select:none;-webkit-user-select:none"
-      unselectable="unselectable"
+      unselectable="on"
    >
      <b />
    </span>
@@ -78,7 +78,7 @@ exports[`renders ./components/auto-complete/demo/certain-category.md correctly 1
        <div
          class="ant-select-selection__placeholder"
          style="display:block;user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          input here
        </div>
@@ -117,7 +117,7 @@ exports[`renders ./components/auto-complete/demo/certain-category.md correctly 1
      <span
        class="ant-select-arrow"
        style="user-select:none;-webkit-user-select:none"
-        unselectable="unselectable"
+        unselectable="on"
      >
        <b />
      </span>
@@ -166,7 +166,7 @@ exports[`renders ./components/auto-complete/demo/custom.md correctly 1`] = `
    <span
      class="ant-select-arrow"
      style="user-select:none;-webkit-user-select:none"
-      unselectable="unselectable"
+      unselectable="on"
    >
      <b />
    </span>
@@ -193,7 +193,7 @@ exports[`renders ./components/auto-complete/demo/non-case-sensitive.md correctly
      <div
        class="ant-select-selection__placeholder"
        style="display:block;user-select:none;-webkit-user-select:none"
-        unselectable="unselectable"
+        unselectable="on"
      >
        try to type \`b\`
      </div>
@@ -221,7 +221,7 @@ exports[`renders ./components/auto-complete/demo/non-case-sensitive.md correctly
    <span
      class="ant-select-arrow"
      style="user-select:none;-webkit-user-select:none"
-      unselectable="unselectable"
+      unselectable="on"
    >
      <b />
    </span>
@@ -248,7 +248,7 @@ exports[`renders ./components/auto-complete/demo/options.md correctly 1`] = `
      <div
        class="ant-select-selection__placeholder"
        style="display:block;user-select:none;-webkit-user-select:none"
-        unselectable="unselectable"
+        unselectable="on"
      >
        input here
      </div>
@@ -276,7 +276,7 @@ exports[`renders ./components/auto-complete/demo/options.md correctly 1`] = `
    <span
      class="ant-select-arrow"
      style="user-select:none;-webkit-user-select:none"
-      unselectable="unselectable"
+      unselectable="on"
    >
      <b />
    </span>
@@ -307,7 +307,7 @@ exports[`renders ./components/auto-complete/demo/uncertain-category.md correctly
        <div
          class="ant-select-selection__placeholder"
          style="display:block;user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          input here
        </div>
@@ -351,7 +351,7 @@ exports[`renders ./components/auto-complete/demo/uncertain-category.md correctly
      <span
        class="ant-select-arrow"
        style="user-select:none;-webkit-user-select:none"
-        unselectable="unselectable"
+        unselectable="on"
      >
        <b />
      </span>
--- a/components/auto-complete/index.tsx
+++ b/components/auto-complete/index.tsx
@@ -21,7 +21,7 @@ export type ValidInputElement =
 export interface AutoCompleteProps extends AbstractSelectProps {
  value?: SelectValue;
  defaultValue?: SelectValue;
-  dataSource: DataSourceItemType[];
+  dataSource?: DataSourceItemType[];
  optionLabelProp?: string;
  onChange?: (value: SelectValue) => void;
  onSelect?: (value: SelectValue, option: Object) => any;
--- a/components/avatar/tests/Avatar.test.js
+++ b/components/avatar/tests/Avatar.test.js
@@ -8,4 +8,22 @@ describe('Avatar Render', () => {
    const children = wrapper.find('.ant-avatar-string');
    expect(children.length).toBe(1);
  });
+
+  it('should render fallback string correctly', () => {
+    const div = global.document.createElement('div');
+    global.document.body.appendChild(div);
+
+    const wrapper = mount(<Avatar src="http://error.url">Fallback</Avatar>, { attachTo: div });
+    wrapper.instance().setScale = jest.fn(() => wrapper.instance().setState({ scale: 0.5 }));
+    wrapper.setState({ isImgExist: false });
+
+    const children = wrapper.find('.ant-avatar-string');
+    expect(children.length).toBe(1);
+    expect(children.text()).toBe('Fallback');
+    expect(wrapper.instance().setScale).toBeCalled();
+    expect(div.querySelector('.ant-avatar-string').style.transform).toBe('scale(0.5)');
+
+    wrapper.detach();
+    global.document.body.removeChild(div);
+  });
 });
--- a/components/avatar/index.tsx
+++ b/components/avatar/index.tsx
@@ -46,7 +46,8 @@ export default class Avatar extends React.Component<AvatarProps, AvatarState> {

  componentDidUpdate(prevProps: AvatarProps, prevState: AvatarState) {
    if (prevProps.children !== this.props.children
-        || (prevState.scale !== this.state.scale && this.state.scale === 1)) {
+        || (prevState.scale !== this.state.scale && this.state.scale === 1)
+        || (prevState.isImgExist !== this.state.isImgExist)) {
      this.setScale();
    }
  }
@@ -55,7 +56,8 @@ export default class Avatar extends React.Component<AvatarProps, AvatarState> {
    const childrenNode = this.avatarChildren;
    if (childrenNode) {
      const childrenWidth = childrenNode.offsetWidth;
-      const avatarWidth = ReactDOM.findDOMNode(this).getBoundingClientRect().width;
+      const avatarNode = ReactDOM.findDOMNode(this) as Element;
+      const avatarWidth = avatarNode.getBoundingClientRect().width;
      // add 4px gap for each side to get better performance
      if (avatarWidth - 8 < childrenWidth) {
        this.setState({
--- a/components/badge/ScrollNumber.tsx
+++ b/components/badge/ScrollNumber.tsx
@@ -106,7 +106,7 @@ export default class ScrollNumber extends Component<ScrollNumberProps, ScrollNum
    return createElement('span', {
      className: `${this.props.prefixCls}-only`,
      style: {
-        transition: removeTransition && 'none',
+        transition: removeTransition ? 'none' : undefined,
        msTransform: `translateY(${-position * 100}%)`,
        WebkitTransform: `translateY(${-position * 100}%)`,
        transform: `translateY(${-position * 100}%)`,
--- a/components/badge/tests/snapshots/demo.test.js.snap
+++ b/components/badge/tests/snapshots/demo.test.js.snap
@@ -1617,3 +1617,177 @@ exports[`renders ./components/badge/demo/status.md correctly 1`] = `
  </span>
 </div>
 `;
+
+exports[`renders ./components/badge/demo/title.md correctly 1`] = `
+<div>
+  <span
+    class="ant-badge"
+  >
+    <a
+      class="head-example"
+      href="#"
+    />
+    <sup
+      class="ant-scroll-number ant-badge-count"
+      data-show="true"
+      title="Custom hover text"
+    >
+      <span
+        class="ant-scroll-number-only"
+        style="transition:none;-ms-transform:translateY(-1500%);-webkit-transform:translateY(-1500%);transform:translateY(-1500%)"
+      >
+        <p
+          class=""
+        >
+          0
+        </p>
+        <p
+          class=""
+        >
+          1
+        </p>
+        <p
+          class=""
+        >
+          2
+        </p>
+        <p
+          class=""
+        >
+          3
+        </p>
+        <p
+          class=""
+        >
+          4
+        </p>
+        <p
+          class=""
+        >
+          5
+        </p>
+        <p
+          class=""
+        >
+          6
+        </p>
+        <p
+          class=""
+        >
+          7
+        </p>
+        <p
+          class=""
+        >
+          8
+        </p>
+        <p
+          class=""
+        >
+          9
+        </p>
+        <p
+          class=""
+        >
+          0
+        </p>
+        <p
+          class=""
+        >
+          1
+        </p>
+        <p
+          class=""
+        >
+          2
+        </p>
+        <p
+          class=""
+        >
+          3
+        </p>
+        <p
+          class=""
+        >
+          4
+        </p>
+        <p
+          class="current"
+        >
+          5
+        </p>
+        <p
+          class=""
+        >
+          6
+        </p>
+        <p
+          class=""
+        >
+          7
+        </p>
+        <p
+          class=""
+        >
+          8
+        </p>
+        <p
+          class=""
+        >
+          9
+        </p>
+        <p
+          class=""
+        >
+          0
+        </p>
+        <p
+          class=""
+        >
+          1
+        </p>
+        <p
+          class=""
+        >
+          2
+        </p>
+        <p
+          class=""
+        >
+          3
+        </p>
+        <p
+          class=""
+        >
+          4
+        </p>
+        <p
+          class=""
+        >
+          5
+        </p>
+        <p
+          class=""
+        >
+          6
+        </p>
+        <p
+          class=""
+        >
+          7
+        </p>
+        <p
+          class=""
+        >
+          8
+        </p>
+        <p
+          class=""
+        >
+          9
+        </p>
+      </span>
+    </sup>
+  </span>
+</div>
+`;
--- a/components/badge/tests/index.test.js
+++ b/components/badge/tests/index.test.js
@@ -7,8 +7,14 @@ describe('Badge', () => {
    const badge = mount(<Badge count={10} dot />);
    expect(badge.find('.ant-card-multiple-words').length).toBe(0);
  });
+
  test('badge dot not showing count == 0', () => {
    const badge = mount(<Badge count={0} dot />);
    expect(badge.find('.ant-badge-dot').length).toBe(0);
  });
+
+  it('should have an overriden title attribute', () => {
+    const badge = mount(<Badge count={10} title="Custom title" />);
+    expect(badge.find('.ant-scroll-number').getDOMNode().attributes.getNamedItem('title').value).toEqual('Custom title');
+  });
 });
--- a/components/badge/demo/title.md
+++ b/components/badge/demo/title.md
@@ -0,0 +1,39 @@
+---
+order: 7
+title:
+  zh-CN: 自定义标题
+  en-US: Title
+---
+
+## zh-CN
+
+设置鼠标放在状态点上时显示的文字
+
+## en-US
+
+The badge will display `title` when hovered over, instead of `count`.
+
+````jsx
+import { Badge } from 'antd';
+
+ReactDOM.render(
+  <div>
+    <Badge count={5} title="Custom hover text">
+      <a href="#" className="head-example" />
+    </Badge>
+  </div>
+, mountNode);
+````
+
+<style>
+.ant-badge:not(.ant-badge-status) {
+  margin-right: 20px;
+}
+.head-example {
+  width: 42px;
+  height: 42px;
+  border-radius: 4px;
+  background: #eee;
+  display: inline-block;
+}
+</style>
--- a/components/badge/index.en-US.md
+++ b/components/badge/index.en-US.md
@@ -31,3 +31,4 @@ Badge normally appears in proximity to notifications or user avatars with eye-ca
 | showZero | Whether to show badge when `count` is zero | boolean | `false` |
 | status | Set Badge as a status dot | `success` \| `processing` \| `default` \| `error` \| `warning` | `''` |
 | text | If `status` is set, `text` sets the display text of the status `dot` | string | `''` |
+| title | Text to show when hovering over the badge | string | `count` |
--- a/components/badge/index.tsx
+++ b/components/badge/index.tsx
@@ -21,6 +21,7 @@ export interface BadgeProps {
  status?: 'success' | 'processing' | 'default' | 'error' | 'warning';
  text?: string;
  offset?: [number | string, number | string];
+  title?: string;
 }

 export default class Badge extends React.Component<BadgeProps, any> {
@@ -57,6 +58,7 @@ export default class Badge extends React.Component<BadgeProps, any> {
      status,
      text,
      offset,
+      title,
      ...restProps,
    } = this.props;
    let displayCount = (count as number) > (overflowCount as number) ? `${overflowCount}+` : count;
@@ -103,7 +105,7 @@ export default class Badge extends React.Component<BadgeProps, any> {
        data-show={!hidden}
        className={scrollNumberCls}
        count={displayCount}
-        title={count}
+        title={title || count}
        style={styleWithOffset}
      />
    );
--- a/components/badge/index.zh-CN.md
+++ b/components/badge/index.zh-CN.md
@@ -32,3 +32,4 @@ title: Badge
 | showZero | 当数值为 0 时，是否展示 Badge | boolean | false |
 | status | 设置 Badge 为状态点 | Enum{ 'success', 'processing, 'default', 'error', 'warning' } | '' |
 | text | 在设置了 `status` 的前提下有效，设置状态点的文本 | string | '' |
+| title | 设置鼠标放在状态点上时显示的文字 | string | `count` |
--- a/components/breadcrumb/Breadcrumb.tsx
+++ b/components/breadcrumb/Breadcrumb.tsx
@@ -41,7 +41,7 @@ function defaultItemRender(route: Route, params: any, routes: Route[], paths: st
 }

 export default class Breadcrumb extends React.Component<BreadcrumbProps, any> {
-  static Item: any;
+  static Item: typeof BreadcrumbItem;

  static defaultProps = {
    prefixCls: 'ant-breadcrumb',
--- a/components/button/tests/snapshots/demo.test.js.snap
+++ b/components/button/tests/snapshots/demo.test.js.snap
@@ -212,7 +212,7 @@ exports[`renders ./components/button/demo/disabled.md correctly 1`] = `
  </button>
  <br />
  <button
-    class="ant-btn"
+    class="ant-btn ant-btn-background-ghost"
    type="button"
  >
    <span>
@@ -220,7 +220,7 @@ exports[`renders ./components/button/demo/disabled.md correctly 1`] = `
    </span>
  </button>
  <button
-    class="ant-btn"
+    class="ant-btn ant-btn-background-ghost"
    disabled=""
    type="button"
  >
--- a/components/button/tests/snapshots/index.test.js.snap
+++ b/components/button/tests/snapshots/index.test.js.snap
@@ -66,6 +66,48 @@ exports[`Button renders Chinese characters correctly 3`] = `
 </button>
 `;

+exports[`Button renders Chinese characters correctly 4`] = `
+<button
+  class="ant-btn"
+  type="button"
+>
+  <i
+    class="anticon anticon-search"
+  />
+  <span>
+    按钮
+  </span>
+</button>
+`;
+
+exports[`Button renders Chinese characters correctly 5`] = `
+<button
+  class="ant-btn ant-btn-loading"
+  type="button"
+>
+  <i
+    class="anticon anticon-spin anticon-loading"
+  />
+  <span>
+    按钮
+  </span>
+</button>
+`;
+
+exports[`Button renders Chinese characters correctly 6`] = `
+<button
+  class="ant-btn ant-btn-loading"
+  type="button"
+>
+  <i
+    class="anticon anticon-spin anticon-loading"
+  />
+  <span>
+    按 钮
+  </span>
+</button>
+`;
+
 exports[`Button renders correctly 1`] = `
 <button
  class="ant-btn"
--- a/components/button/tests/index.test.js
+++ b/components/button/tests/index.test.js
@@ -26,6 +26,21 @@ describe('Button', () => {
      <Button><Icon type="search" />按钮</Button>
    );
    expect(wrapper2).toMatchSnapshot();
+    // should not insert space when there is icon
+    const wrapper3 = render(
+      <Button icon="search">按钮</Button>
+    );
+    expect(wrapper3).toMatchSnapshot();
+    // should not insert space when there is icon while loading
+    const wrapper4 = render(
+      <Button icon="search" loading>按钮</Button>
+    );
+    expect(wrapper4).toMatchSnapshot();
+    // should insert space while loading
+    const wrapper5 = render(
+      <Button loading>按钮</Button>
+    );
+    expect(wrapper5).toMatchSnapshot();
  });

  it('renders Chinese characters correctly in HOC', () => {
--- a/components/button/button.tsx
+++ b/components/button/button.tsx
@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import omit from 'omit.js';
 import Icon from '../icon';
+import { Omit } from '../_util/type';
 import Group from './button-group';

 const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/;
@@ -34,33 +35,30 @@ function insertSpace(child: React.ReactChild, needInserted: boolean) {
  return child;
 }

-export type ButtonType = 'primary' | 'ghost' | 'dashed' | 'danger';
+export type ButtonType = 'default' | 'primary' | 'ghost' | 'dashed' | 'danger';
 export type ButtonShape = 'circle' | 'circle-outline';
 export type ButtonSize = 'small' | 'default' | 'large';

-export interface ButtonProps {
+export interface BaseButtonProps<T> extends Omit<React.HTMLProps<T>, 'ref' | 'size'> {
  type?: ButtonType;
  htmlType?: string;
  icon?: string;
  shape?: ButtonShape;
  size?: ButtonSize;
-  onClick?: React.FormEventHandler<any>;
-  onMouseUp?: React.FormEventHandler<any>;
-  onMouseDown?: React.FormEventHandler<any>;
-  onKeyPress?: React.KeyboardEventHandler<any>;
-  onKeyDown?: React.KeyboardEventHandler<any>;
-  tabIndex?: number;
  loading?: boolean | { delay?: number };
-  disabled?: boolean;
-  style?: React.CSSProperties;
  prefixCls?: string;
  className?: string;
  ghost?: boolean;
-  target?: string;
-  href?: string;
-  download?: string;
 }

+export interface AnchorButtonProps extends BaseButtonProps<HTMLAnchorElement> {
+  href: string;
+}
+
+export interface NativeButtonProps extends BaseButtonProps<HTMLButtonElement> {}
+
+export type ButtonProps = AnchorButtonProps | NativeButtonProps;
+
 export default class Button extends React.Component<ButtonProps, any> {
  static Group: typeof Group;
  static __ANT_BUTTON = true;
@@ -143,7 +141,7 @@ export default class Button extends React.Component<ButtonProps, any> {
    }
  }

-  handleClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+  handleClick = (e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => {
    // Add click effect
    this.setState({ clicked: true });
    clearTimeout(this.timeout);
@@ -151,14 +149,13 @@ export default class Button extends React.Component<ButtonProps, any> {

    const onClick = this.props.onClick;
    if (onClick) {
-      onClick(e);
+      (onClick as (e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => void)(e);
    }
  }

  isNeedInserted() {
-    const { loading, icon, children } = this.props;
-    const iconType = loading ? 'loading' : icon;
-    return React.Children.count(children) === 1 && (!iconType || iconType === 'loading');
+    const { icon, children } = this.props;
+    return React.Children.count(children) === 1 && !icon;
  }

  render() {
@@ -181,7 +178,7 @@ export default class Button extends React.Component<ButtonProps, any> {
        break;
    }

-    const ComponentProp = others.href ? 'a' : 'button';
+    const ComponentProp = (others as AnchorButtonProps).href ? 'a' : 'button';

    const classes = classNames(prefixCls, className, {
      [`${prefixCls}-${type}`]: type,
@@ -202,7 +199,7 @@ export default class Button extends React.Component<ButtonProps, any> {
    return (
      <ComponentProp
        {...omit(others, ['loading'])}
-        type={others.href ? undefined : (htmlType || 'button')}
+        type={(others as AnchorButtonProps).href ? undefined : (htmlType || 'button')}
        className={classes}
        onClick={this.handleClick}
      >
--- a/components/button/demo/disabled.md
+++ b/components/button/demo/disabled.md
@@ -24,8 +24,8 @@ ReactDOM.render(
    <Button>Default</Button>
    <Button disabled>Default(disabled)</Button>
    <br />
-    <Button>Ghost</Button>
-    <Button disabled>Ghost(disabled)</Button>
+    <Button ghost>Ghost</Button>
+    <Button ghost disabled>Ghost(disabled)</Button>
    <br />
    <Button type="dashed">Dashed</Button>
    <Button type="dashed" disabled>Dashed(disabled)</Button>
--- a/components/button/index.en-US.md
+++ b/components/button/index.en-US.md
@@ -21,6 +21,7 @@ To get a customized button, just set `type`/`shape`/`size`/`loading`/`disabled`.
 | htmlType | set the original html `type` of `button`, see: [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button` |
 | icon | set the icon of button, see: Icon component | string | - |
 | loading | set the loading status of button | boolean \| { delay: number } | false |
+| disabled | disabled state of button | boolean | `false` |
 | shape | can be set to `circle` or omitted | string | - |
 | size | can be set to `small` `large` or omitted | string | `default` |
 | target | same as target attribute of a, works when href is specified | string | - |
--- a/components/button/index.zh-CN.md
+++ b/components/button/index.zh-CN.md
@@ -24,6 +24,7 @@ subtitle: 按钮
 | htmlType | 设置 `button` 原生的 `type` 值，可选值请参考 [HTML 标准](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) | string | `button` |
 | icon | 设置按钮的图标类型 | string | - |
 | loading | 设置按钮载入状态 | boolean \| { delay: number } | `false` |
+| disabled | 按钮失效状态 | boolean | `false` |
 | shape | 设置按钮形状，可选值为 `circle` 或者不设 | string | - |
 | size | 设置按钮大小，可选值为 `small` `large` 或者不设 | string | `default` |
 | target | 相当于 a 链接的 target 属性，href 存在时生效 | string | - |
--- a/components/calendar/tests/snapshots/demo.test.js.snap
+++ b/components/calendar/tests/snapshots/demo.test.js.snap
@@ -33,7 +33,7 @@ exports[`renders ./components/calendar/demo/basic.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -65,7 +65,7 @@ exports[`renders ./components/calendar/demo/basic.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -1042,7 +1042,7 @@ exports[`renders ./components/calendar/demo/card.md correctly 1`] = `
          <span
            class="ant-select-arrow"
            style="user-select:none;-webkit-user-select:none"
-            unselectable="unselectable"
+            unselectable="on"
          >
            <b />
          </span>
@@ -1074,7 +1074,7 @@ exports[`renders ./components/calendar/demo/card.md correctly 1`] = `
          <span
            class="ant-select-arrow"
            style="user-select:none;-webkit-user-select:none"
-            unselectable="unselectable"
+            unselectable="on"
          >
            <b />
          </span>
@@ -2049,7 +2049,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -2081,7 +2081,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -3466,7 +3466,7 @@ exports[`renders ./components/calendar/demo/select.md correctly 1`] = `
          <span
            class="ant-select-arrow"
            style="user-select:none;-webkit-user-select:none"
-            unselectable="unselectable"
+            unselectable="on"
          >
            <b />
          </span>
@@ -3498,7 +3498,7 @@ exports[`renders ./components/calendar/demo/select.md correctly 1`] = `
          <span
            class="ant-select-arrow"
            style="user-select:none;-webkit-user-select:none"
-            unselectable="unselectable"
+            unselectable="on"
          >
            <b />
          </span>
--- a/components/calendar/locale/sl_SI.tsx
+++ b/components/calendar/locale/sl_SI.tsx
@@ -0,0 +1,2 @@
+import sl_SI from '../../date-picker/locale/sl_SI';
+export default sl_SI;
--- a/components/card/tests/snapshots/demo.test.js.snap
+++ b/components/card/tests/snapshots/demo.test.js.snap
@@ -371,79 +371,175 @@ exports[`renders ./components/card/demo/inner.md correctly 1`] = `
 `;

 exports[`renders ./components/card/demo/loading.md correctly 1`] = `
-<div
-  class="ant-card ant-card-loading ant-card-bordered"
-  style="width:34%"
->
+<div>
  <div
-    class="ant-card-head"
+    class="ant-card ant-card-loading ant-card-bordered"
  >
    <div
-      class="ant-card-head-wrapper"
+      class="ant-card-head"
    >
      <div
-        class="ant-card-head-title"
+        class="ant-card-head-wrapper"
      >
-        Card title
+        <div
+          class="ant-card-head-title"
+        >
+          Card title
+        </div>
+      </div>
+    </div>
+    <div
+      class="ant-card-body"
+    >
+      <div
+        class="ant-card-loading-content"
+      >
+        <div
+          class="ant-row"
+          style="margin-left:-4px;margin-right:-4px"
+        >
+          <div
+            class="ant-col-22"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+        </div>
+        <div
+          class="ant-row"
+          style="margin-left:-4px;margin-right:-4px"
+        >
+          <div
+            class="ant-col-8"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+          <div
+            class="ant-col-15"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+        </div>
+        <div
+          class="ant-row"
+          style="margin-left:-4px;margin-right:-4px"
+        >
+          <div
+            class="ant-col-6"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+          <div
+            class="ant-col-18"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+        </div>
+        <div
+          class="ant-row"
+          style="margin-left:-4px;margin-right:-4px"
+        >
+          <div
+            class="ant-col-13"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+          <div
+            class="ant-col-9"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+        </div>
+        <div
+          class="ant-row"
+          style="margin-left:-4px;margin-right:-4px"
+        >
+          <div
+            class="ant-col-4"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+          <div
+            class="ant-col-3"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+          <div
+            class="ant-col-16"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+        </div>
+        <div
+          class="ant-row"
+          style="margin-left:-4px;margin-right:-4px"
+        >
+          <div
+            class="ant-col-8"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+          <div
+            class="ant-col-6"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+          <div
+            class="ant-col-8"
+            style="padding-left:4px;padding-right:4px"
+          >
+            <div
+              class="ant-card-loading-block"
+            />
+          </div>
+        </div>
      </div>
    </div>
  </div>
-  <div
-    class="ant-card-body"
+  <button
+    class="ant-btn"
+    style="margin-top:16px"
+    type="button"
  >
-    <div
-      class="ant-card-loading-content"
-    >
-      <p
-        class="ant-card-loading-block"
-        style="width:94%"
-      />
-      <p>
-        <span
-          class="ant-card-loading-block"
-          style="width:28%"
-        />
-        <span
-          class="ant-card-loading-block"
-          style="width:62%"
-        />
-      </p>
-      <p>
-        <span
-          class="ant-card-loading-block"
-          style="width:22%"
-        />
-        <span
-          class="ant-card-loading-block"
-          style="width:66%"
-        />
-      </p>
-      <p>
-        <span
-          class="ant-card-loading-block"
-          style="width:56%"
-        />
-        <span
-          class="ant-card-loading-block"
-          style="width:39%"
-        />
-      </p>
-      <p>
-        <span
-          class="ant-card-loading-block"
-          style="width:21%"
-        />
-        <span
-          class="ant-card-loading-block"
-          style="width:15%"
-        />
-        <span
-          class="ant-card-loading-block"
-          style="width:40%"
-        />
-      </p>
-    </div>
-  </div>
+    <span>
+      Toggle loading
+    </span>
+  </button>
 </div>
 `;

--- a/components/card/tests/snapshots/index.test.js.snap
+++ b/components/card/tests/snapshots/index.test.js.snap
@@ -0,0 +1,152 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Card should still have padding when card which set padding to 0 is loading 1`] = `
+<div
+  class="ant-card ant-card-loading ant-card-bordered"
+>
+  <div
+    class="ant-card-body"
+    style="padding: 0px;"
+  >
+    <div
+      class="ant-card-loading-content"
+      style="padding: 24px;"
+    >
+      <div
+        class="ant-row"
+        style="margin-left: -4px; margin-right: -4px;"
+      >
+        <div
+          class="ant-col-22"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+      </div>
+      <div
+        class="ant-row"
+        style="margin-left: -4px; margin-right: -4px;"
+      >
+        <div
+          class="ant-col-8"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+        <div
+          class="ant-col-15"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+      </div>
+      <div
+        class="ant-row"
+        style="margin-left: -4px; margin-right: -4px;"
+      >
+        <div
+          class="ant-col-6"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+        <div
+          class="ant-col-18"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+      </div>
+      <div
+        class="ant-row"
+        style="margin-left: -4px; margin-right: -4px;"
+      >
+        <div
+          class="ant-col-13"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+        <div
+          class="ant-col-9"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+      </div>
+      <div
+        class="ant-row"
+        style="margin-left: -4px; margin-right: -4px;"
+      >
+        <div
+          class="ant-col-4"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+        <div
+          class="ant-col-3"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+        <div
+          class="ant-col-16"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+      </div>
+      <div
+        class="ant-row"
+        style="margin-left: -4px; margin-right: -4px;"
+      >
+        <div
+          class="ant-col-8"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+        <div
+          class="ant-col-6"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+        <div
+          class="ant-col-8"
+          style="padding-left: 4px; padding-right: 4px;"
+        >
+          <div
+            class="ant-card-loading-block"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
--- a/components/card/tests/index.test.js
+++ b/components/card/tests/index.test.js
@@ -34,4 +34,9 @@ describe('Card', () => {
    wrapper.update();
    expect(wrapper.find('.ant-card-wider-padding').length).toBe(0);
  });
+
+  it('should still have padding when card which set padding to 0 is loading', () => {
+    const wrapper = mount(<Card loading bodyStyle={{ padding: 0 }}>xxx</Card>);
+    expect(wrapper.render()).toMatchSnapshot();
+  });
 });
--- a/components/card/demo/loading.md
+++ b/components/card/demo/loading.md
@@ -14,11 +14,30 @@ title:
 Shows a loading indicator while the contents of the card is being fetched.

 ````jsx
-import { Card } from 'antd';
+import { Card, Button } from 'antd';
+
+class LoadingCard extends React.Component {
+  state = {
+    loading: true,
+  }
+
+  handleClick = () => {
+    this.setState({ loading: !this.state.loading });
+  }
+
+  render() {
+    return (
+      <div>
+        <Card loading={this.state.loading} title="Card title">
+          Whatever content
+        </Card>
+        <Button onClick={this.handleClick} style={{ marginTop: 16 }}>Toggle loading</Button>
+      </div>
+    );
+  }
+}

 ReactDOM.render(
-  <Card loading title="Card title" style={{ width: '34%' }}>
-    Whatever content
-  </Card>
+  <LoadingCard />
 , mountNode);
 ````
--- a/components/card/index.tsx
+++ b/components/card/index.tsx
@@ -5,8 +5,11 @@ import omit from 'omit.js';
 import Grid from './Grid';
 import Meta from './Meta';
 import Tabs from '../tabs';
+import Row from '../row';
+import Col from '../col';
 import { throttleByAnimationFrameDecorator } from '../_util/throttleByAnimationFrame';
 import warning from '../_util/warning';
+import { Omit } from '../_util/type';

 export { CardGridProps } from './Grid';
 export { CardMetaProps } from './Meta';
@@ -18,7 +21,7 @@ export interface CardTabListType {
  tab: React.ReactNode;
 }

-export interface CardProps {
+export interface CardProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'title'> {
  prefixCls?: string;
  title?: React.ReactNode;
  extra?: React.ReactNode;
@@ -40,14 +43,20 @@ export interface CardProps {
  defaultActiveTabKey?: string;
 }

-export default class Card extends React.Component<CardProps, {}> {
+export interface CardState {
+  widerPadding: boolean;
+}
+
+export default class Card extends React.Component<CardProps, CardState> {
  static Grid: typeof Grid = Grid;
  static Meta: typeof Meta = Meta;
-  resizeEvent: any;
-  updateWiderPaddingCalled: boolean;
+
  state = {
    widerPadding: false,
  };
+
+  private resizeEvent: any;
+  private updateWiderPaddingCalled: boolean = false;
  private container: HTMLDivElement;
  componentDidMount() {
    this.updateWiderPadding();
@@ -56,9 +65,9 @@ export default class Card extends React.Component<CardProps, {}> {
    if ('noHovering' in this.props) {
      warning(
        !this.props.noHovering,
-        '`noHovering` of Card is deperated, you can remove it safely or use `hoverable` instead.',
+        '`noHovering` of Card is deprecated, you can remove it safely or use `hoverable` instead.',
      );
-      warning(!!this.props.noHovering, '`noHovering={false}` of Card is deperated, use `hoverable` instead.');
+      warning(!!this.props.noHovering, '`noHovering={false}` of Card is deprecated, use `hoverable` instead.');
    }
  }
  componentWillUnmount() {
@@ -72,14 +81,14 @@ export default class Card extends React.Component<CardProps, {}> {
    if (!this.container) {
      return;
    }
-    // 936 is a magic card width pixer number indicated by designer
-    const WIDTH_BOUDARY_PX = 936;
-    if (this.container.offsetWidth >= WIDTH_BOUDARY_PX && !this.state.widerPadding) {
+    // 936 is a magic card width pixel number indicated by designer
+    const WIDTH_BOUNDARY_PX = 936;
+    if (this.container.offsetWidth >= WIDTH_BOUNDARY_PX && !this.state.widerPadding) {
      this.setState({ widerPadding: true }, () => {
        this.updateWiderPaddingCalled = true; // first render without css transition
      });
    }
-    if (this.container.offsetWidth < WIDTH_BOUDARY_PX && this.state.widerPadding) {
+    if (this.container.offsetWidth < WIDTH_BOUNDARY_PX && this.state.widerPadding) {
      this.setState({ widerPadding: false }, () => {
        this.updateWiderPaddingCalled = true; // first render without css transition
      });
@@ -124,7 +133,7 @@ export default class Card extends React.Component<CardProps, {}> {
  }
  render() {
    const {
-      prefixCls = 'ant-card', className, extra, bodyStyle, noHovering, hoverable, title, loading,
+      prefixCls = 'ant-card', className, extra, bodyStyle = {}, noHovering, hoverable, title, loading,
      bordered = true, type, cover, actions, tabList, children, activeTabKey, defaultActiveTabKey, ...others,
    } = this.props;

@@ -139,26 +148,65 @@ export default class Card extends React.Component<CardProps, {}> {
      [`${prefixCls}-type-${type}`]: !!type,
    });

+    const loadingBlockStyle = (bodyStyle.padding === 0 || bodyStyle.padding === '0px')
+      ? { padding: 24 } : undefined;
+
    const loadingBlock = (
-      <div className={`${prefixCls}-loading-content`}>
-        <p className={`${prefixCls}-loading-block`} style={{ width: '94%' }} />
-        <p>
-          <span className={`${prefixCls}-loading-block`} style={{ width: '28%' }} />
-          <span className={`${prefixCls}-loading-block`} style={{ width: '62%' }} />
-        </p>
-        <p>
-          <span className={`${prefixCls}-loading-block`} style={{ width: '22%' }} />
-          <span className={`${prefixCls}-loading-block`} style={{ width: '66%' }} />
-        </p>
-        <p>
-          <span className={`${prefixCls}-loading-block`} style={{ width: '56%' }} />
-          <span className={`${prefixCls}-loading-block`} style={{ width: '39%' }} />
-        </p>
-        <p>
-          <span className={`${prefixCls}-loading-block`} style={{ width: '21%' }} />
-          <span className={`${prefixCls}-loading-block`} style={{ width: '15%' }} />
-          <span className={`${prefixCls}-loading-block`} style={{ width: '40%' }} />
-        </p>
+      <div
+        className={`${prefixCls}-loading-content`}
+        style={loadingBlockStyle}
+      >
+        <Row gutter={8}>
+          <Col span={22}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+        </Row>
+        <Row gutter={8}>
+          <Col span={8}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+          <Col span={15}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+        </Row>
+        <Row gutter={8}>
+          <Col span={6}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+          <Col span={18}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+        </Row>
+        <Row gutter={8}>
+          <Col span={13}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+          <Col span={9}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+        </Row>
+        <Row gutter={8}>
+          <Col span={4}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+          <Col span={3}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+          <Col span={16}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+        </Row>
+        <Row gutter={8}>
+          <Col span={8}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+          <Col span={6}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+          <Col span={8}>
+            <div className={`${prefixCls}-loading-block`} />
+          </Col>
+        </Row>
      </div>
    );

--- a/components/card/style/index.less
+++ b/components/card/style/index.less
@@ -72,7 +72,7 @@
    .clearfix;
  }

-  &-contain-grid &-body {
+  &-contain-grid:not(&-loading) {
    margin: -1px 0 0 -1px;
    padding: 0;
  }
@@ -135,10 +135,16 @@

        & > .anticon {
          font-size: 16px;
+          line-height: 22px;
+          display: block;
+          width: 100%;
        }

        a {
          color: @text-color-secondary;
+          line-height: 22px;
+          display: inline-block;
+          width: 100%;

          &:hover {
            color: @primary-color;
@@ -165,10 +171,6 @@
    transition: padding .3s;
  }

-  &-padding-transition &-extra {
-    transition: right .3s;
-  }
-
  &-type-inner &-head {
    padding: 0 @card-padding-base;
    background: @background-color-light;
@@ -219,20 +221,17 @@

  &-loading &-body {
    user-select: none;
-    padding: 0;
  }

  &-loading-content {
-    padding: @card-padding-base;
    p {
      margin: 0;
    }
  }

  &-loading-block {
-    display: inline-block;
-    margin: 5px 2% 0 0;
    height: 14px;
+    margin: 4px 0;
    border-radius: @border-radius-sm;
    background: linear-gradient(90deg, rgba(207, 216, 220, .2), rgba(207, 216, 220, .4), rgba(207, 216, 220, .2));
    animation: card-loading 1.4s ease infinite;
--- a/components/carousel/tests/snapshots/demo.test.js.snap
+++ b/components/carousel/tests/snapshots/demo.test.js.snap
@@ -5,7 +5,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
  class="ant-carousel"
 >
  <div
-    class="slick-initialized slick-slider"
+    class="slick-slider slick-initialized"
    dir="ltr"
  >
    <div
@@ -13,94 +13,205 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
    >
      <div
        class="slick-track"
+        style="width:900%;left:-100%"
      >
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="-1"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-active slick-cloned slick-current"
+          aria-hidden="false"
+          class="slick-slide slick-active slick-current"
          data-index="0"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            1
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                1
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="1"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            2
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                2
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="2"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            3
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                3
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="3"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="4"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            1
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                1
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="5"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            2
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                2
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="6"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            3
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                3
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="7"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
      </div>
    </div>
+    <ul
+      class="slick-dots"
+      style="display:block"
+    >
+      <li
+        class="slick-active"
+      >
+        <button>
+          1
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          2
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          3
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          4
+        </button>
+      </li>
+    </ul>
  </div>
 </div>
 `;
@@ -110,7 +221,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
  class="ant-carousel"
 >
  <div
-    class="slick-initialized slick-slider"
+    class="slick-slider slick-initialized"
    dir="ltr"
  >
    <div
@@ -118,94 +229,205 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
    >
      <div
        class="slick-track"
+        style="width:900%;left:-100%"
      >
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="-1"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-active slick-cloned slick-current"
+          aria-hidden="false"
+          class="slick-slide slick-active slick-current"
          data-index="0"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            1
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                1
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="1"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            2
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                2
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="2"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            3
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                3
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="3"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="4"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            1
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                1
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="5"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            2
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                2
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="6"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            3
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                3
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="7"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
      </div>
    </div>
+    <ul
+      class="slick-dots"
+      style="display:block"
+    >
+      <li
+        class="slick-active"
+      >
+        <button>
+          1
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          2
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          3
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          4
+        </button>
+      </li>
+    </ul>
  </div>
 </div>
 `;
@@ -215,7 +437,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
  class="ant-carousel"
 >
  <div
-    class="slick-initialized slick-slider"
+    class="slick-slider slick-initialized"
    dir="ltr"
  >
    <div
@@ -223,49 +445,115 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
    >
      <div
        class="slick-track"
+        style="width:900%;left:-100%"
      >
        <div
-          class="slick-slide slick-active slick-cloned slick-current"
+          aria-hidden="false"
+          class="slick-slide slick-active slick-current"
          data-index="0"
-          style="outline:none;position:relative;left:0;opacity:1;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
+          style="outline:none;width:11.11111111111111%;position:relative;left:0;opacity:1;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
          tabindex="-1"
        >
-          <h3>
-            1
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                1
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="1"
-          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
+          style="outline:none;width:11.11111111111111%;position:relative;left:-11px;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
          tabindex="-1"
        >
-          <h3>
-            2
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                2
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="2"
-          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
+          style="outline:none;width:11.11111111111111%;position:relative;left:-22px;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
          tabindex="-1"
        >
-          <h3>
-            3
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                3
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="3"
-          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
+          style="outline:none;width:11.11111111111111%;position:relative;left:-33px;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
      </div>
    </div>
+    <ul
+      class="slick-dots"
+      style="display:block"
+    >
+      <li
+        class="slick-active"
+      >
+        <button>
+          1
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          2
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          3
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          4
+        </button>
+      </li>
+    </ul>
  </div>
 </div>
 `;
@@ -275,7 +563,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
  class="ant-carousel ant-carousel-vertical"
 >
  <div
-    class="slick-initialized slick-slider slick-vertical"
+    class="slick-slider slick-vertical slick-initialized"
    dir="ltr"
  >
    <div
@@ -283,94 +571,205 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
    >
      <div
        class="slick-track"
+        style="width:900%;left:-100%"
      >
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="-1"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-active slick-cloned slick-current"
+          aria-hidden="false"
+          class="slick-slide slick-active slick-current"
          data-index="0"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            1
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                1
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="1"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            2
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                2
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="2"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            3
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                3
+              </h3>
+            </div>
+          </div>
        </div>
        <div
-          class="slick-slide slick-cloned"
+          aria-hidden="true"
+          class="slick-slide"
          data-index="3"
-          style="outline:none"
+          style="outline:none;width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="4"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            1
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                1
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="5"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            2
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                2
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="6"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            3
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                3
+              </h3>
+            </div>
+          </div>
        </div>
        <div
+          aria-hidden="true"
          class="slick-slide slick-cloned"
          data-index="7"
+          style="width:11.11111111111111%"
          tabindex="-1"
        >
-          <h3>
-            4
-          </h3>
+          <div>
+            <div
+              style="width:100%;display:inline-block"
+              tabindex="-1"
+            >
+              <h3>
+                4
+              </h3>
+            </div>
+          </div>
        </div>
      </div>
    </div>
+    <ul
+      class="slick-dots"
+      style="display:block"
+    >
+      <li
+        class="slick-active"
+      >
+        <button>
+          1
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          2
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          3
+        </button>
+      </li>
+      <li
+        class=""
+      >
+        <button>
+          4
+        </button>
+      </li>
+    </ul>
  </div>
 </div>
 `;
--- a/components/cascader/tests/snapshots/demo.test.js.snap
+++ b/components/cascader/tests/snapshots/demo.test.js.snap
@@ -143,6 +143,28 @@ exports[`renders ./components/cascader/demo/disabled-option.md correctly 1`] = `
 </span>
 `;

+exports[`renders ./components/cascader/demo/fileds-name.md correctly 1`] = `
+<span
+  class="ant-cascader-picker"
+  tabindex="0"
+>
+  <span
+    class="ant-cascader-picker-label"
+  />
+  <input
+    autocomplete="off"
+    class="ant-input ant-cascader-input "
+    placeholder="Please select"
+    readonly=""
+    type="text"
+    value=""
+  />
+  <i
+    class="anticon anticon-down ant-cascader-picker-arrow"
+  />
+</span>
+`;
+
 exports[`renders ./components/cascader/demo/hover.md correctly 1`] = `
 <span
  class="ant-cascader-picker"
--- a/components/cascader/demo/fileds-name.md
+++ b/components/cascader/demo/fileds-name.md
@@ -0,0 +1,50 @@
+---
+order: 10
+title:
+  zh-CN: 自定义字段名
+  en-US: Custom Filed Names
+---
+
+## zh-CN
+
+自定义字段名。
+
+## en-US
+
+Custom filed names.
+
+````jsx
+import { Cascader } from 'antd';
+
+const options = [{
+  code: 'zhejiang',
+  name: 'Zhejiang',
+  items: [{
+    code: 'hangzhou',
+    name: 'Hangzhou',
+    items: [{
+      code: 'xihu',
+      name: 'West Lake',
+    }],
+  }],
+}, {
+  code: 'jiangsu',
+  name: 'Jiangsu',
+  items: [{
+    code: 'nanjing',
+    name: 'Nanjing',
+    items: [{
+      code: 'zhonghuamen',
+      name: 'Zhong Hua Men',
+    }],
+  }],
+}];
+
+function onChange(value) {
+  console.log(value);
+}
+
+ReactDOM.render(
+  <Cascader filedNames={{ label: 'name', value: 'code', children: 'items' }} options={options} onChange={onChange} placeholder="Please select" />
+, mountNode);
+````
--- a/components/cascader/index.en-US.md
+++ b/components/cascader/index.en-US.md
@@ -42,6 +42,7 @@ Cascade selection box.
 | value | selected value | string\[] | - |
 | onChange | callback when finishing cascader select | `(value, selectedOptions) => void` | - |
 | onPopupVisibleChange | callback when popup shown or hidden | `(value) => void` | - |
+| filedNames | custom field name for label and value and children | object | `{ label: 'label', value: 'value', children: 'children' }` |

 Fields in `showSearch`:

--- a/components/cascader/index.tsx
+++ b/components/cascader/index.tsx
@@ -8,19 +8,37 @@ import Input from '../input';
 import Icon from '../icon';

 export interface CascaderOptionType {
-  value: string;
-  label: React.ReactNode;
+  value?: string;
+  label?: React.ReactNode;
  disabled?: boolean;
  children?: Array<CascaderOptionType>;
  __IS_FILTERED_OPTION?: boolean;
+  [key: string]: any;
+}
+
+export interface FiledNamesType {
+  value?: string;
+  label?: string;
+  children?: string;
+}
+
+export interface FilledFiledNamesType {
+  value: string;
+  label: string;
+  children: string;
 }

 export type CascaderExpandTrigger = 'click' | 'hover';

 export interface ShowSearchType {
-  filter?: (inputValue: string, path: CascaderOptionType[]) => boolean;
-  render?: (inputValue: string, path: CascaderOptionType[], prefixCls: string | undefined) => React.ReactNode;
-  sort?: (a: CascaderOptionType[], b: CascaderOptionType[], inputValue: string) => number;
+  filter?: (inputValue: string, path: CascaderOptionType[], names: FilledFiledNamesType) => boolean;
+  render?: (
+    inputValue: string,
+    path: CascaderOptionType[],
+    prefixCls: string | undefined,
+    names: FilledFiledNamesType,
+  ) => React.ReactNode;
+  sort?: (a: CascaderOptionType[], b: CascaderOptionType[], inputValue: string, names: FilledFiledNamesType) => number;
  matchInputWidth?: boolean;
 }

@@ -64,6 +82,7 @@ export interface CascaderProps {
  inputPrefixCls?: string;
  getPopupContainer?: (triggerNode?: HTMLElement) => HTMLElement;
  popupVisible?: boolean;
+  filedNames?: FiledNamesType;
 }

 export interface CascaderState {
@@ -82,26 +101,41 @@ function highlightKeyword(str: string, keyword: string, prefixCls: string | unde
    ]);
 }

-function defaultFilterOption(inputValue: string, path: CascaderOptionType[]) {
-  return path.some(option => (option.label as string).indexOf(inputValue) > -1);
+function defaultFilterOption(inputValue: string, path: CascaderOptionType[], names: FilledFiledNamesType) {
+  return path.some(option => (option[names.label] as string).indexOf(inputValue) > -1);
 }

-function defaultRenderFilteredOption(inputValue: string, path: CascaderOptionType[], prefixCls: string | undefined) {
-  return path.map(({ label }, index) => {
+function defaultRenderFilteredOption(
+  inputValue: string,
+  path: CascaderOptionType[],
+  prefixCls: string | undefined,
+  names: FilledFiledNamesType,
+) {
+  return path.map((option, index) => {
+    const label = option[names.label];
    const node = (label as string).indexOf(inputValue) > -1 ?
      highlightKeyword(label as string, inputValue, prefixCls) : label;
    return index === 0 ? node : [' / ', node];
  });
 }

-function defaultSortFilteredOption(a: any[], b: any[], inputValue: string) {
+function defaultSortFilteredOption(a: any[], b: any[], inputValue: string, names: FilledFiledNamesType) {
  function callback(elem: CascaderOptionType) {
-    return (elem.label as string).indexOf(inputValue) > -1;
+    return (elem[names.label] as string).indexOf(inputValue) > -1;
  }

  return a.findIndex(callback) - b.findIndex(callback);
 }

+function getFilledFieldNames(filedNames: FiledNamesType = {}) {
+  const names: FilledFiledNamesType = {
+    children: filedNames.children || 'children',
+    label: filedNames.label || 'label',
+    value: filedNames.value || 'value',
+  };
+  return names;
+}
+
 const defaultDisplayRender = (label: string[]) => label.join(' / ');

 export default class Cascader extends React.Component<CascaderProps, CascaderState> {
@@ -128,7 +162,7 @@ export default class Cascader extends React.Component<CascaderProps, CascaderSta
      inputValue: '',
      inputFocused: false,
      popupVisible: props.popupVisible,
-      flattenOptions: props.showSearch && this.flattenTree(props.options, props.changeOnSelect),
+      flattenOptions: props.showSearch && this.flattenTree(props.options, props.changeOnSelect, props.filedNames),
    };
  }

@@ -140,7 +174,9 @@ export default class Cascader extends React.Component<CascaderProps, CascaderSta
      this.setState({ popupVisible: nextProps.popupVisible });
    }
    if (nextProps.showSearch && this.props.options !== nextProps.options) {
-      this.setState({ flattenOptions: this.flattenTree(nextProps.options, nextProps.changeOnSelect) });
+      this.setState({
+        flattenOptions: this.flattenTree(nextProps.options, nextProps.changeOnSelect, nextProps.filedNames),
+      });
    }
  }

@@ -207,13 +243,14 @@ export default class Cascader extends React.Component<CascaderProps, CascaderSta
  }

  getLabel() {
-    const { options, displayRender = defaultDisplayRender as Function } = this.props;
+    const { options, displayRender = defaultDisplayRender as Function, filedNames } = this.props;
+    const names = getFilledFieldNames(filedNames);
    const value = this.state.value;
    const unwrappedValue = Array.isArray(value[0]) ? value[0] : value;
    const selectedOptions: CascaderOptionType[] = arrayTreeFilter(options,
-      (o: CascaderOptionType, level: number) => o.value === unwrappedValue[level],
+      (o: CascaderOptionType, level: number) => o[names.value] === unwrappedValue[level],
    );
-    const label = selectedOptions.map(o => o.label);
+    const label = selectedOptions.map(o => o[names.label]);
    return displayRender(label, selectedOptions);
  }

@@ -228,43 +265,58 @@ export default class Cascader extends React.Component<CascaderProps, CascaderSta
    }
  }

-  flattenTree(options: CascaderOptionType[], changeOnSelect: boolean | undefined, ancestor: CascaderOptionType[] = []) {
+  flattenTree(
+    options: CascaderOptionType[],
+    changeOnSelect: boolean | undefined,
+    filedNames: FiledNamesType | undefined,
+    ancestor: CascaderOptionType[] = [],
+  ) {
+    const names: FiledNamesType = getFilledFieldNames(filedNames);
    let flattenOptions: any = [];
+    let childrenName: any = names.children;
    options.forEach((option) => {
      const path = ancestor.concat(option);
-      if (changeOnSelect || !option.children || !option.children.length) {
+      if (changeOnSelect || !option[childrenName] || !option[childrenName].length) {
        flattenOptions.push(path);
      }
-      if (option.children) {
-        flattenOptions = flattenOptions.concat(this.flattenTree(option.children, changeOnSelect, path));
+      if (option[childrenName]) {
+        flattenOptions = flattenOptions.concat(
+          this.flattenTree(
+            option[childrenName],
+            changeOnSelect,
+            filedNames,
+            path,
+          ),
+        );
      }
    });
    return flattenOptions;
  }

  generateFilteredOptions(prefixCls: string | undefined) {
-    const { showSearch, notFoundContent } = this.props;
+    const { showSearch, notFoundContent, filedNames } = this.props;
+    const names: FilledFiledNamesType = getFilledFieldNames(filedNames);
    const {
      filter = defaultFilterOption,
      render = defaultRenderFilteredOption,
      sort = defaultSortFilteredOption,
    } = showSearch as ShowSearchType;
    const { flattenOptions, inputValue } = this.state;
-    const filtered = flattenOptions.filter((path) => filter(this.state.inputValue, path))
-      .sort((a, b) => sort(a, b, inputValue));
+    const filtered = flattenOptions.filter((path) => filter(this.state.inputValue, path, names))
+      .sort((a, b) => sort(a, b, inputValue, names));

    if (filtered.length > 0) {
      return filtered.map((path: any) => {
        return {
          __IS_FILTERED_OPTION: true,
          path,
-          label: render(inputValue, path, prefixCls),
-          value: path.map((o: CascaderOptionType) => o.value),
+          [names.label]: render(inputValue, path, prefixCls, names),
+          [names.value]: path.map((o: CascaderOptionType) => o[names.value]),
          disabled: path.some((o: CascaderOptionType) => o.disabled),
        } as CascaderOptionType;
      });
    }
-    return [{ label: notFoundContent, value: 'ANT_CASCADER_NOT_FOUND', disabled: true }];
+    return [{ [names.label]: notFoundContent, [names.value]: 'ANT_CASCADER_NOT_FOUND', disabled: true }];
  }

  focus() {
@@ -328,6 +380,7 @@ export default class Cascader extends React.Component<CascaderProps, CascaderSta
      'renderFilteredOption',
      'sortFilteredOption',
      'notFoundContent',
+      'filedNames',
    ]);

    let options = props.options;
--- a/components/cascader/index.zh-CN.md
+++ b/components/cascader/index.zh-CN.md
@@ -43,6 +43,7 @@ subtitle: 级联选择
 | value | 指定选中项 | string\[] | - |
 | onChange | 选择完成后的回调 | `(value, selectedOptions) => void` | - |
 | onPopupVisibleChange | 显示/隐藏浮层的回调 | `(value) => void` | - |
+| filedNames | 自定义 options 中 label name children 的字段 | object | `{ label: 'label', value: 'value', children: 'children' }` |

 `showSearch` 为对象时，其中的字段：

--- a/components/cascader/style/index.less
+++ b/components/cascader/style/index.less
@@ -14,6 +14,7 @@
    cursor: pointer;
    width: 100%;
    display: block;
+    position: static;
  }

  &-picker {
--- a/components/checkbox/Checkbox.tsx
+++ b/components/checkbox/Checkbox.tsx
@@ -35,7 +35,7 @@ export interface CheckboxChangeEvent {
  target: CheckboxChangeEventTarget;
  stopPropagation: () => void;
  preventDefault: () => void;
-  nativeEvent: MouseEvent;
+  nativeEvent: Event;
 }

 export default class Checkbox extends React.Component<CheckboxProps, {}> {
--- a/components/checkbox/Group.tsx
+++ b/components/checkbox/Group.tsx
@@ -41,7 +41,7 @@ export interface CheckboxGroupContext {
 export default class CheckboxGroup extends React.Component<CheckboxGroupProps, CheckboxGroupState> {
  static defaultProps = {
    options: [],
-    prefixCls: 'ant-checkbox-group',
+    prefixCls: 'ant-checkbox',
  };

  static propTypes = {
@@ -115,23 +115,25 @@ export default class CheckboxGroup extends React.Component<CheckboxGroupProps, C
  render() {
    const { props, state } = this;
    const { prefixCls, className, style, options } = props;
+    const groupPrefixCls = `${prefixCls}-group`;
    let children = props.children;
    if (options && options.length > 0) {
      children = this.getOptions().map(option => (
        <Checkbox
+          prefixCls={prefixCls}
          key={option.value}
          disabled={'disabled' in option ? option.disabled : props.disabled}
          value={option.value}
          checked={state.value.indexOf(option.value) !== -1}
          onChange={() => this.toggleOption(option)}
-          className={`${prefixCls}-item`}
+          className={`${groupPrefixCls}-item`}
        >
          {option.label}
        </Checkbox>
      ));
    }

-    const classString = classNames(prefixCls, className);
+    const classString = classNames(groupPrefixCls, className);
    return (
      <div className={classString} style={style}>
        {children}
--- a/components/checkbox/tests/snapshots/group.test.js.snap
+++ b/components/checkbox/tests/snapshots/group.test.js.snap
@@ -0,0 +1,46 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CheckboxGroup passes prefixCls down to checkbox 1`] = `
+<div
+  class="my-checkbox-group"
+>
+  <label
+    class="my-checkbox-group-item my-checkbox-wrapper"
+  >
+    <span
+      class="my-checkbox"
+    >
+      <input
+        class="my-checkbox-input"
+        type="checkbox"
+        value="Apple"
+      />
+      <span
+        class="my-checkbox-inner"
+      />
+    </span>
+    <span>
+      Apple
+    </span>
+  </label>
+  <label
+    class="my-checkbox-group-item my-checkbox-wrapper"
+  >
+    <span
+      class="my-checkbox"
+    >
+      <input
+        class="my-checkbox-input"
+        type="checkbox"
+        value="Orange"
+      />
+      <span
+        class="my-checkbox-inner"
+      />
+    </span>
+    <span>
+      Orange
+    </span>
+  </label>
+</div>
+`;
--- a/components/checkbox/tests/group.test.js
+++ b/components/checkbox/tests/group.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { mount } from 'enzyme';
+import { mount, render } from 'enzyme';
 import Checkbox from '../index';

 describe('CheckboxGroup', () => {
@@ -51,4 +51,17 @@ describe('CheckboxGroup', () => {
    groupWrapper.find('.ant-checkbox-input').at(1).simulate('change');
    expect(onChangeGroup).toBeCalledWith(['Apple']);
  });
+
+  it('passes prefixCls down to checkbox', () => {
+    const options = [
+      { label: 'Apple', value: 'Apple' },
+      { label: 'Orange', value: 'Orange' },
+    ];
+
+    const wrapper = render(
+      <Checkbox.Group prefixCls="my-checkbox" options={options} />
+    );
+
+    expect(wrapper).toMatchSnapshot();
+  });
 });
--- a/components/checkbox/style/mixin.less
+++ b/components/checkbox/style/mixin.less
@@ -72,7 +72,6 @@
    &-input {
      position: absolute;
      left: 0;
-      z-index: 1;
      cursor: pointer;
      opacity: 0;
      top: 0;
--- a/components/collapse/tests/snapshots/demo.test.js.snap
+++ b/components/collapse/tests/snapshots/demo.test.js.snap
@@ -3,15 +3,16 @@
 exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
 <div
  class="ant-collapse"
+  role="tablist"
 >
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
      role="tab"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -21,12 +22,12 @@ exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
      role="tab"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -36,12 +37,12 @@ exports[`renders ./components/collapse/demo/accordion.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
      role="tab"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -58,12 +59,12 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
 >
  <div
    class="ant-collapse-item ant-collapse-item-active"
-    role="tablist"
  >
    <div
      aria-expanded="true"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -72,7 +73,6 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
    </div>
    <div
      class="ant-collapse-content ant-collapse-content-active"
-      role="tabpanel"
    >
      <div
        class="ant-collapse-content-box"
@@ -89,12 +89,12 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -104,12 +104,12 @@ exports[`renders ./components/collapse/demo/basic.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item ant-collapse-item-disabled"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="-1"
    >
      <i
        class="arrow"
@@ -126,12 +126,12 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
 >
  <div
    class="ant-collapse-item ant-collapse-item-active"
-    role="tablist"
  >
    <div
      aria-expanded="true"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -140,7 +140,6 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
    </div>
    <div
      class="ant-collapse-content ant-collapse-content-active"
-      role="tabpanel"
    >
      <div
        class="ant-collapse-content-box"
@@ -155,12 +154,12 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -170,12 +169,12 @@ exports[`renders ./components/collapse/demo/borderless.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -192,13 +191,13 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
 >
  <div
    class="ant-collapse-item ant-collapse-item-active"
-    role="tablist"
    style="background:#f7f7f7;border-radius:4px;margin-bottom:24px;border:0;overflow:hidden"
  >
    <div
      aria-expanded="true"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -207,7 +206,6 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
    </div>
    <div
      class="ant-collapse-content ant-collapse-content-active"
-      role="tabpanel"
    >
      <div
        class="ant-collapse-content-box"
@@ -224,13 +222,13 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
    style="background:#f7f7f7;border-radius:4px;margin-bottom:24px;border:0;overflow:hidden"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -240,13 +238,13 @@ exports[`renders ./components/collapse/demo/custom.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
    style="background:#f7f7f7;border-radius:4px;margin-bottom:24px;border:0;overflow:hidden"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -263,12 +261,12 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
 >
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -278,12 +276,12 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -293,12 +291,12 @@ exports[`renders ./components/collapse/demo/mix.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -315,12 +313,12 @@ exports[`renders ./components/collapse/demo/noarrow.md correctly 1`] = `
 >
  <div
    class="ant-collapse-item ant-collapse-item-active"
-    role="tablist"
  >
    <div
      aria-expanded="true"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      <i
        class="arrow"
@@ -329,7 +327,6 @@ exports[`renders ./components/collapse/demo/noarrow.md correctly 1`] = `
    </div>
    <div
      class="ant-collapse-content ant-collapse-content-active"
-      role="tabpanel"
    >
      <div
        class="ant-collapse-content-box"
@@ -346,12 +343,12 @@ exports[`renders ./components/collapse/demo/noarrow.md correctly 1`] = `
  </div>
  <div
    class="ant-collapse-item ant-collapse-no-arrow"
-    role="tablist"
  >
    <div
      aria-expanded="false"
      class="ant-collapse-header"
-      role="tab"
+      role="button"
+      tabindex="0"
    >
      This is panel header with no arrow icon
    </div>
--- a/components/collapse/style/index.less
+++ b/components/collapse/style/index.less
@@ -3,9 +3,6 @@

@collapse-prefix-cls: ~"@{ant-prefix}-collapse";

-@collapse-header-bg: @background-color-light;
-@collapse-active-bg: @background-color-base;
-
 .collapse-close() {
  transform: rotate(0);
 }
@@ -32,7 +29,7 @@

    > .@{collapse-prefix-cls}-header {
      line-height: 22px;
-      padding: 12px 0 12px 40px;
+      padding: @collapse-header-padding;
      color: @heading-color;
      cursor: pointer;
      position: relative;
@@ -53,6 +50,10 @@
          content: "\E61F";
        }
      }
+
+      &:focus {
+        outline: none;
+      }
    }

    &.@{collapse-prefix-cls}-no-arrow {
@@ -69,13 +70,11 @@
  &-content {
    overflow: hidden;
    color: @text-color;
-    padding: 0 @padding-md;
-    background-color: @component-background;
+    background-color: @collapse-content-bg;
    border-top: @border-width-base @border-style-base @border-color-base;

    & > &-box {
-      padding-top: @padding-md;
-      padding-bottom: @padding-md;
+      padding: @collapse-content-padding;
    }

    &-inactive {
--- a/components/date-picker/WeekPicker.tsx
+++ b/components/date-picker/WeekPicker.tsx
@@ -40,8 +40,8 @@ export default class WeekPicker extends React.Component<any, any> {
    const selectedValue = this.state.value;
    const { prefixCls } = this.props;
    if (selectedValue &&
-        current.year() === selectedValue.year() &&
-        current.week() === selectedValue.week()) {
+      current.year() === selectedValue.year() &&
+      current.week() === selectedValue.week()) {
      return (
        <div className={`${prefixCls}-selected-day`}>
          <div className={`${prefixCls}-date`}>
@@ -51,7 +51,7 @@ export default class WeekPicker extends React.Component<any, any> {
      );
    }
    return (
-      <div className={`${prefixCls}-calendar-date`}>
+      <div className={`${prefixCls}-date`}>
        {current.date()}
      </div>
    );
@@ -84,6 +84,7 @@ export default class WeekPicker extends React.Component<any, any> {
    const {
      prefixCls, className, disabled, pickerClass, popupStyle,
      pickerInputClass, format, allowClear, locale, localeCode, disabledDate,
+      style, onFocus, onBlur,
    } = this.props;

    const pickerValue = this.state.value;
@@ -123,8 +124,9 @@ export default class WeekPicker extends React.Component<any, any> {
            value={(value && value.format(format)) || ''}
            placeholder={placeholder}
            className={pickerInputClass}
-            onFocus={this.props.onFocus}
-            onBlur={this.props.onBlur}
+            onFocus={onFocus}
+            onBlur={onBlur}
+            style={style}
          />
          {clearIcon}
          <span className={`${prefixCls}-picker-icon`} />
--- a/components/date-picker/tests/WeekPicker.test.js
+++ b/components/date-picker/tests/WeekPicker.test.js
@@ -1,3 +1,5 @@
+import React from 'react';
+import { mount } from 'enzyme';
 import DatePicker from '..';
 import focusTest from '../../../tests/shared/focusTest';

@@ -5,4 +7,11 @@ const { WeekPicker } = DatePicker;

 describe('WeekPicker', () => {
  focusTest(WeekPicker);
+
+  it('should support style prop', () => {
+    const wrapper = mount(
+      <WeekPicker style={{ width: 400 }} />
+    );
+    expect(wrapper.render()).toMatchSnapshot();
+  });
 });
--- a/components/date-picker/tests/snapshots/WeekPicker.test.js.snap
+++ b/components/date-picker/tests/snapshots/WeekPicker.test.js.snap
@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`WeekPicker should support style prop 1`] = `
+<span
+  class="ant-calendar-picker"
+>
+  <span>
+    <input
+      class="ant-calendar-picker-input ant-input"
+      placeholder="Select date"
+      readonly=""
+      style="width: 400px;"
+      value=""
+    />
+    <span
+      class="ant-calendar-picker-icon"
+    />
+  </span>
+</span>
+`;
--- a/components/date-picker/tests/snapshots/other.test.js.snap
+++ b/components/date-picker/tests/snapshots/other.test.js.snap
@@ -443,7 +443,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月27日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      27
                    </div>
@@ -454,7 +454,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月28日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      28
                    </div>
@@ -465,7 +465,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月29日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      29
                    </div>
@@ -476,7 +476,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月30日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      30
                    </div>
@@ -487,7 +487,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月31日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      31
                    </div>
@@ -539,7 +539,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月3日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      3
                    </div>
@@ -550,7 +550,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月4日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      4
                    </div>
@@ -561,7 +561,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月5日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      5
                    </div>
@@ -572,7 +572,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月6日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      6
                    </div>
@@ -583,7 +583,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月7日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      7
                    </div>
@@ -594,7 +594,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月8日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      8
                    </div>
@@ -605,7 +605,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月9日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      9
                    </div>
@@ -627,7 +627,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月10日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      10
                    </div>
@@ -638,7 +638,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月11日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      11
                    </div>
@@ -649,7 +649,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月12日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      12
                    </div>
@@ -660,7 +660,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月13日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      13
                    </div>
@@ -671,7 +671,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月14日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      14
                    </div>
@@ -682,7 +682,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月15日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      15
                    </div>
@@ -693,7 +693,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月16日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      16
                    </div>
@@ -715,7 +715,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月17日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      17
                    </div>
@@ -726,7 +726,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月18日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      18
                    </div>
@@ -737,7 +737,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月19日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      19
                    </div>
@@ -748,7 +748,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月20日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      20
                    </div>
@@ -759,7 +759,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月21日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      21
                    </div>
@@ -770,7 +770,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月22日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      22
                    </div>
@@ -781,7 +781,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月23日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      23
                    </div>
@@ -803,7 +803,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月24日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      24
                    </div>
@@ -814,7 +814,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月25日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      25
                    </div>
@@ -825,7 +825,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月26日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      26
                    </div>
@@ -836,7 +836,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月27日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      27
                    </div>
@@ -847,7 +847,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月28日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      28
                    </div>
@@ -858,7 +858,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月29日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      29
                    </div>
@@ -869,7 +869,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月30日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      30
                    </div>
@@ -891,7 +891,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月31日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      31
                    </div>
@@ -902,7 +902,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月1日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      1
                    </div>
@@ -913,7 +913,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月2日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      2
                    </div>
@@ -924,7 +924,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月3日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      3
                    </div>
@@ -935,7 +935,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月4日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      4
                    </div>
@@ -946,7 +946,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月5日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      5
                    </div>
@@ -957,7 +957,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月6日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      6
                    </div>
--- a/components/date-picker/index.en-US.md
+++ b/components/date-picker/index.en-US.md
@@ -51,6 +51,8 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker, WeekPicke
 | size | determine the size of the input box, the height of `large` and `small`, are 40px and 24px respectively, while default size is 32px | string | - |
 | style | to customize the style of the input box | object | {} |
 | onOpenChange | a callback function, can be executed whether the popup calendar is popped up or closed | function(status) | - |
+| mode | picker panel mode | `time|date|month|year` | 'date' |
+| onPanelChange | callback when picker panel mode is changed | function(value, mode) | - |

 ### Common Methods

--- a/components/date-picker/index.zh-CN.md
+++ b/components/date-picker/index.zh-CN.md
@@ -74,6 +74,8 @@ subtitle: 日期选择框
 | value | 日期 | [moment](http://momentjs.com/) | 无 |
 | onChange | 时间发生变化的回调 | function(date: moment, dateString: string) | 无 |
 | onOk | 点击确定按钮的回调 | function() | - |
+| mode | 日期面板的状态 | `time|date|month|year` | 'date' |
+| onPanelChange | 日期面板变化时的回调 | function(value, mode) | - |

 ### MonthPicker

--- a/components/date-picker/locale/sl_SI.tsx
+++ b/components/date-picker/locale/sl_SI.tsx
@@ -0,0 +1,43 @@
+import TimePickerLocale from '../../time-picker/locale/sl_SI';
+
+// Merge into a locale object
+const locale = {
+  lang: {
+    placeholder: 'Izberite datum',
+    rangePlaceholder: ['Začetni datum', 'Končni datum'],
+    today: 'Danes',
+    now: 'Trenutno',
+    backToToday: 'Nazaj na trenutni datum',
+    ok: 'Ok',
+    clear: 'Počisti',
+    month: 'Mesec',
+    year: 'Leto',
+    timeSelect: 'Izberi čas',
+    dateSelect: 'Izberi datum',
+    monthSelect: 'Izberite mesec',
+    yearSelect: 'Izberite leto',
+    decadeSelect: 'Izberite desetletje',
+    yearFormat: 'YYYY',
+    dateFormat: 'D.M.YYYY',
+    dayFormat: 'D',
+    dateTimeFormat: 'D.M.YYYY HH:mm:ss',
+    monthFormat: 'MMMM',
+    monthBeforeYear: true,
+    previousMonth: 'Prejšnji mesec (PageUp)',
+    nextMonth: 'Naslednji mesec (PageDown)',
+    previousYear: 'Lansko leto (Control + left)',
+    nextYear: 'Naslednje leto (Control + right)',
+    previousDecade: 'Prejšnje desetletje',
+    nextDecade: 'Naslednje desetletje',
+    previousCentury: 'Zadnje stoletje',
+    nextCentury: 'Naslednje stoletje',
+  },
+  timePickerLocale: {
+    ...TimePickerLocale,
+  },
+};
+
+// All settings at:
+// https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json
+
+export default locale;
--- a/components/divider/tests/snapshots/demo.test.js.snap
+++ b/components/divider/tests/snapshots/demo.test.js.snap
@@ -29,13 +29,18 @@ exports[`renders ./components/divider/demo/horizontal.md correctly 1`] = `
  <p>
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.
  </p>
+</div>
+`;
+
+exports[`renders ./components/divider/demo/orientation.md correctly 1`] = `
+<div>
  <div
    class="ant-divider ant-divider-horizontal ant-divider-with-text-left"
  >
    <span
      class="ant-divider-inner-text"
    >
-      With Text
+      Left Text
    </span>
  </div>
  <p>
@@ -47,7 +52,7 @@ exports[`renders ./components/divider/demo/horizontal.md correctly 1`] = `
    <span
      class="ant-divider-inner-text"
    >
-      With Text
+      Right Text
    </span>
  </div>
  <p>
--- a/components/divider/demo/horizontal.md
+++ b/components/divider/demo/horizontal.md
@@ -25,10 +25,6 @@ ReactDOM.render(
    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
    <Divider dashed />
    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
-    <Divider orientation="left">With Text</Divider>
-    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
-    <Divider orientation="right">With Text</Divider>
-    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
  </div>
 , mountNode);
 ````
--- a/components/divider/demo/orientation.md
+++ b/components/divider/demo/orientation.md
@@ -0,0 +1,27 @@
+---
+order: 2
+title:
+  zh-CN: 标题位置
+  en-US: Orientation of title
+---
+
+## zh-CN
+
+修改分割线标题的位置。
+
+## en-US
+
+Set orientation of divider to left or right.
+
+````jsx
+import { Divider } from 'antd';
+
+ReactDOM.render(
+  <div>
+    <Divider orientation="left">Left Text</Divider>
+    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
+    <Divider orientation="right">Right Text</Divider>
+    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
+  </div>
+, mountNode);
+````
--- a/components/divider/index.en-US.md
+++ b/components/divider/index.en-US.md
@@ -20,4 +20,4 @@ A divider line separates different content.
 | -------- | ----------- | ---- | ------- |
 | dashed | whether line is dashed | Boolean | false |
 | type | direction type of divider | enum: `horizontal` `vertical` | `horizontal` |
-| orientation | this is optional, if not set it will have the text in the center | enum: `left` `right` | `center` |
+| orientation | position of title inside divider | enum: `left` `right` `center` | `center` |
--- a/components/divider/index.zh-CN.md
+++ b/components/divider/index.zh-CN.md
@@ -18,3 +18,4 @@ subtitle: 分割线
 | --- | --- | --- | --- |
 | dashed | 是否虚线 | Boolean | false |
 | type | 水平还是垂直类型 | enum: `horizontal` `vertical` | `horizontal` |
+| orientation | 分割线标题的位置 | enum: `left` `right` | `center` |
--- a/components/divider/style/index.less
+++ b/components/divider/style/index.less
@@ -22,6 +22,7 @@
    height: 1px;
    width: 100%;
    margin: 24px 0;
+    clear: both;
  }
  &-horizontal&-with-text {
    display: table;
@@ -119,7 +120,9 @@
    background: none;
    border-top: 1px dashed @border-color-split;
  }
-  &-horizontal&-with-text&-dashed {
+  &-horizontal&-with-text&-dashed,
+  &-horizontal&-with-text-left&-dashed,
+  &-horizontal&-with-text-right&-dashed {
    border-top: 0;
    &:before,
    &:after {
--- a/components/dropdown/tests/snapshots/demo.test.js.snap
+++ b/components/dropdown/tests/snapshots/demo.test.js.snap
@@ -35,11 +35,11 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
      </span>
    </button>
    <button
-      class="ant-btn ant-dropdown-trigger ant-btn-default"
+      class="ant-btn ant-dropdown-trigger ant-btn-default ant-btn-icon-only"
      type="button"
    >
      <i
-        class="anticon anticon-down"
+        class="anticon anticon-ellipsis"
      />
    </button>
  </div>
@@ -57,12 +57,12 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
      </span>
    </button>
    <button
-      class="ant-btn ant-dropdown-trigger ant-btn-default"
+      class="ant-btn ant-dropdown-trigger ant-btn-default ant-btn-icon-only"
      disabled=""
      type="button"
    >
      <i
-        class="anticon anticon-down"
+        class="anticon anticon-ellipsis"
      />
    </button>
  </div>
--- a/components/dropdown/dropdown-button.tsx
+++ b/components/dropdown/dropdown-button.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import Button from '../button';
 import { ButtonGroupProps } from '../button/button-group';
-import Icon from '../icon';
 import Dropdown, { DropDownProps } from './dropdown';
 import classNames from 'classnames';
 const ButtonGroup = Button.Group;
@@ -9,7 +8,7 @@ const ButtonGroup = Button.Group;
 export interface DropdownButtonProps extends ButtonGroupProps, DropDownProps {
  type?: 'primary' | 'ghost' | 'dashed';
  disabled?: boolean;
-  onClick?: React.MouseEventHandler<any>;
+  onClick?: React.MouseEventHandler<HTMLButtonElement>;
  children?: any;
 }

@@ -54,9 +53,7 @@ export default class DropdownButton extends React.Component<DropdownButtonProps,
          {children}
        </Button>
        <Dropdown {...dropdownProps}>
-          <Button type={type}>
-            <Icon type="down" />
-          </Button>
+          <Button type={type} icon="ellipsis" />
        </Dropdown>
      </ButtonGroup>
    );
--- a/components/dropdown/dropdown.tsx
+++ b/components/dropdown/dropdown.tsx
@@ -59,10 +59,12 @@ export default class Dropdown extends React.Component<DropDownProps, any> {
      disabled,
    });
    // menu cannot be selectable in dropdown defaultly
-    const selectable = overlay.props.selectable || false;
+    // menu should be focusable in dropdown defaultly
+    const { selectable = false, focusable = true }  = overlay.props;
    const fixedModeOverlay = React.cloneElement(overlay, {
      mode: 'vertical',
      selectable,
+      focusable,
    });
    return (
      <RcDropdown
--- a/components/dropdown/style/index.less
+++ b/components/dropdown/style/index.less
@@ -208,6 +208,9 @@
  .@{iconfont-css-prefix}-down {
    .iconfont-size-under-12px(10px);
  }
+  .@{iconfont-css-prefix}-ellipsis {
+    text-shadow: 0 0 currentColor;
+  }
 }

 .@{dropdown-prefix-cls}-button {
--- a/components/form/Form.tsx
+++ b/components/form/Form.tsx
@@ -3,21 +3,23 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import createDOMForm from 'rc-form/lib/createDOMForm';
 import createFormField from 'rc-form/lib/createFormField';
-import PureRenderMixin from 'rc-util/lib/PureRenderMixin';
 import omit from 'omit.js';
 import warning from '../_util/warning';
 import FormItem from './FormItem';
 import { FIELD_META_PROP, FIELD_DATA_PROP } from './constants';
+import { Omit } from '../_util/type';

 export interface FormCreateOption<T> {
  onFieldsChange?: (props: T, fields: Array<any>) => void;
-  onValuesChange?: (props: T, values: any) => void;
+  onValuesChange?: (props: T, changedValues: any, allValues: any) => void;
  mapPropsToFields?: (props: T) => void;
  withRef?: boolean;
 }

+export type FormLayout = 'horizontal' | 'inline' | 'vertical';
+
 export interface FormProps {
-  layout?: 'horizontal' | 'inline' | 'vertical';
+  layout?: FormLayout;
  form?: WrappedFormUtils;
  onSubmit?: React.FormEventHandler<any>;
  style?: React.CSSProperties;
@@ -113,20 +115,20 @@ export interface FormComponentProps {
  form: WrappedFormUtils;
 }

-export type Diff<T extends string, U extends string> =
-  ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
-export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+export interface RcBaseFormProps {
+   wrappedComponentRef?: any;
+}

 export interface ComponentDecorator {
  <P extends FormComponentProps>(
    component: React.ComponentClass<P> | React.SFC<P>,
-  ): React.ComponentClass<Omit<P, keyof FormComponentProps>>;
+  ): React.ComponentClass<RcBaseFormProps & Omit<P, keyof FormComponentProps>>;
 }

 export default class Form extends React.Component<FormProps, any> {
  static defaultProps = {
    prefixCls: 'ant-form',
-    layout: 'horizontal',
+    layout: 'horizontal' as FormLayout,
    hideRequiredMark: false,
    onSubmit(e: React.FormEvent<HTMLFormElement>) {
      e.preventDefault();
@@ -164,10 +166,6 @@ export default class Form extends React.Component<FormProps, any> {
    warning(!props.form, 'It is unnecessary to pass `form` to `Form` after antd@1.7.0.');
  }

-  shouldComponentUpdate(...args: any[]) {
-    return PureRenderMixin.shouldComponentUpdate.apply(this, args);
-  }
-
  getChildContext() {
    const { layout } = this.props;
    return {
--- a/components/form/FormItem.tsx
+++ b/components/form/FormItem.tsx
@@ -3,7 +3,6 @@ import * as ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import Animate from 'rc-animate';
-import PureRenderMixin from 'rc-util/lib/PureRenderMixin';
 import Row from '../grid/row';
 import Col, { ColProps } from '../grid/col';
 import warning from '../_util/warning';
@@ -56,7 +55,7 @@ export default class FormItem extends React.Component<FormItemProps, any> {

  context: FormItemContext;

-  state = { helpShow: false };
+  helpShow = false;

  componentDidMount() {
    warning(
@@ -66,10 +65,6 @@ export default class FormItem extends React.Component<FormItemProps, any> {
    );
  }

-  shouldComponentUpdate(...args: any[]) {
-    return PureRenderMixin.shouldComponentUpdate.apply(this, args);
-  }
-
  getHelpMsg() {
    const props = this.props;
    const onlyControl = this.getOnlyControl();
@@ -129,7 +124,10 @@ export default class FormItem extends React.Component<FormItemProps, any> {
  }

  onHelpAnimEnd = (_key: string, helpShow: boolean) => {
-    this.setState({ helpShow });
+    this.helpShow = helpShow;
+    if (!helpShow) {
+      this.setState({});
+    }
  }

  renderHelp() {
@@ -140,6 +138,9 @@ export default class FormItem extends React.Component<FormItemProps, any> {
        {help}
      </div>
    ) : null;
+    if (children) {
+      this.helpShow = !!children;
+    }
    return (
      <Animate
        transitionName="show-help"
@@ -248,7 +249,8 @@ export default class FormItem extends React.Component<FormItemProps, any> {
      if (typeof label === 'string') {
        e.preventDefault();
      }
-      const control = ReactDOM.findDOMNode(this).querySelector(`[id="${id}"]`) as HTMLElement;
+      const formItemNode = ReactDOM.findDOMNode(this) as Element;
+      const control = formItemNode.querySelector(`[id="${id}"]`) as HTMLElement;
      if (control && control.focus) {
        control.focus();
      }
@@ -310,11 +312,10 @@ export default class FormItem extends React.Component<FormItemProps, any> {
    const style = props.style;
    const itemClassName = {
      [`${prefixCls}-item`]: true,
-      [`${prefixCls}-item-with-help`]: !!this.getHelpMsg() || this.state.helpShow,
+      [`${prefixCls}-item-with-help`]: this.helpShow,
      [`${prefixCls}-item-no-colon`]: !props.colon,
      [`${props.className}`]: !!props.className,
    };
-
    return (
      <Row className={classNames(itemClassName)} style={style}>
        {children}
--- a/components/form/tests/snapshots/demo.test.js.snap
+++ b/components/form/tests/snapshots/demo.test.js.snap
@@ -20,7 +20,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-0"
              title="Field 0"
            >
@@ -61,7 +61,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-1"
              title="Field 1"
            >
@@ -102,7 +102,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-2"
              title="Field 2"
            >
@@ -143,7 +143,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-3"
              title="Field 3"
            >
@@ -184,7 +184,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-4"
              title="Field 4"
            >
@@ -225,7 +225,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-5"
              title="Field 5"
            >
@@ -266,7 +266,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-6"
              title="Field 6"
            >
@@ -307,7 +307,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-7"
              title="Field 7"
            >
@@ -348,7 +348,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-8"
              title="Field 8"
            >
@@ -389,7 +389,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-9"
              title="Field 9"
            >
@@ -543,7 +543,7 @@ exports[`renders ./components/form/demo/coordinated.md correctly 1`] = `
                <div
                  class="ant-select-selection__placeholder"
                  style="display:block;user-select:none;-webkit-user-select:none"
-                  unselectable="unselectable"
+                  unselectable="on"
                >
                  Select a option and change input text above
                </div>
@@ -551,7 +551,7 @@ exports[`renders ./components/form/demo/coordinated.md correctly 1`] = `
              <span
                class="ant-select-arrow"
                style="user-select:none;-webkit-user-select:none"
-                unselectable="unselectable"
+                unselectable="on"
              >
                <b />
              </span>
@@ -649,7 +649,7 @@ exports[`renders ./components/form/demo/customized-form-controls.md correctly 1`
                <span
                  class="ant-select-arrow"
                  style="user-select:none;-webkit-user-select:none"
-                  unselectable="unselectable"
+                  unselectable="on"
                >
                  <b />
                </span>
@@ -1637,7 +1637,7 @@ exports[`renders ./components/form/demo/register.md correctly 1`] = `
                    <span
                      class="ant-select-arrow"
                      style="user-select:none;-webkit-user-select:none"
-                      unselectable="unselectable"
+                      unselectable="on"
                    >
                      <b />
                    </span>
@@ -1698,7 +1698,7 @@ exports[`renders ./components/form/demo/register.md correctly 1`] = `
                <div
                  class="ant-select-selection__placeholder"
                  style="display:block;user-select:none;-webkit-user-select:none"
-                  unselectable="unselectable"
+                  unselectable="on"
                >
                  website
                </div>
@@ -1726,7 +1726,7 @@ exports[`renders ./components/form/demo/register.md correctly 1`] = `
              <span
                class="ant-select-arrow"
                style="user-select:none;-webkit-user-select:none"
-                unselectable="unselectable"
+                unselectable="on"
              >
                <b />
              </span>
@@ -2263,7 +2263,7 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
                <div
                  class="ant-select-selection__placeholder"
                  style="display:block;user-select:none;-webkit-user-select:none"
-                  unselectable="unselectable"
+                  unselectable="on"
                >
                  Please select a country
                </div>
@@ -2271,7 +2271,7 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
              <span
                class="ant-select-arrow"
                style="user-select:none;-webkit-user-select:none"
-                unselectable="unselectable"
+                unselectable="on"
              >
                <b />
              </span>
@@ -2321,7 +2321,7 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
                <div
                  class="ant-select-selection__placeholder"
                  style="display:block;user-select:none;-webkit-user-select:none"
-                  unselectable="unselectable"
+                  unselectable="on"
                >
                  Please select favourite colors
                </div>
@@ -3340,7 +3340,7 @@ exports[`renders ./components/form/demo/validate-static.md correctly 1`] = `
              <span
                class="ant-select-arrow"
                style="user-select:none;-webkit-user-select:none"
-                unselectable="unselectable"
+                unselectable="on"
              >
                <b />
              </span>
--- a/components/form/demo/advanced-search.md
+++ b/components/form/demo/advanced-search.md
@@ -52,7 +52,12 @@ class AdvancedSearchForm extends React.Component {
      children.push(
        <Col span={8} key={i} style={{ display: i < count ? 'block' : 'none' }}>
          <FormItem label={`Field ${i}`}>
-            {getFieldDecorator(`field-${i}`)(
+            {getFieldDecorator(`field-${i}`, {
+              rules: [{
+                required: true,
+                message: 'Input something!',
+              }],
+            })(
              <Input placeholder="placeholder" />
            )}
          </FormItem>
--- a/components/form/demo/customized-form-controls.md
+++ b/components/form/demo/customized-form-controls.md
@@ -28,7 +28,7 @@ class PriceInput extends React.Component {
  constructor(props) {
    super(props);

-    const value = this.props.value || {};
+    const value = props.value || {};
    this.state = {
      number: value.number || 0,
      currency: value.currency || 'rmb',
--- a/components/form/demo/form-in-modal.md
+++ b/components/form/demo/form-in-modal.md
@@ -11,7 +11,7 @@ title:

 ## en-US

-When user visit a page with a list of items, and want to create a new item. The page can popup a form in Modal, then let user fills in the form to create an item.
+When user visit a page with a list of items, and want to create a new item. The page can popup a form in Modal, then let user fill in the form to create an item.

 ````jsx
 import { Button, Modal, Form, Input, Radio } from 'antd';
--- a/components/form/demo/global-state.md
+++ b/components/form/demo/global-state.md
@@ -58,9 +58,9 @@ class Demo extends React.Component {
    },
  };
  handleFormChange = (changedFields) => {
-    this.setState({
-      fields: { ...this.state.fields, ...changedFields },
-    });
+    this.setState(({ fields }) => ({
+      fields: { ...fields, ...changedFields },
+    }));
  }
  render() {
    const fields = this.state.fields;
--- a/components/form/index.en-US.md
+++ b/components/form/index.en-US.md
@@ -56,7 +56,7 @@ The following `options` are available:
 | mapPropsToFields | Convert props to field value(e.g. reading the values from Redux store). And you must mark returned fields with [`Form.createFormField`](#Form.createFormField) | (props) => Object{ fieldName: FormField { value } } |
 | validateMessages | Default validate message. And its format is similar with [newMessages](https://github.com/yiminghe/async-validator/blob/master/src/messages.js)'s returned value | Object { [nested.path]&#x3A; String } |
 | onFieldsChange | Specify a function that will be called when the value a `Form.Item` gets changed. Usage example: saving the field's value to Redux store. | Function(props, fields) |
-| onValuesChange | A handler while value of any field is changed | (props, values) => void |
+| onValuesChange | A handler while value of any field is changed | (props, changedValues, allValues) => void |

 If the form has been decorated by `Form.create` then it has `this.props.form` property. `this.props.form` provides some APIs as follows:

--- a/components/form/index.zh-CN.md
+++ b/components/form/index.zh-CN.md
@@ -58,7 +58,7 @@ CustomizedForm = Form.create({})(CustomizedForm);
 | mapPropsToFields | 把父组件的属性映射到表单项上（如：把 Redux store 中的值读出），需要对返回值中的表单域数据用 [`Form.createFormField`](#Form.createFormField) 标记 | (props) => Object{ fieldName: FormField { value } } |
 | validateMessages | 默认校验信息，可用于把默认错误信息改为中文等，格式与 [newMessages](https://github.com/yiminghe/async-validator/blob/master/src/messages.js) 返回值一致 | Object { [nested.path]&#x3A; String } |
 | onFieldsChange | 当 `Form.Item` 子节点的值发生改变时触发，可以把对应的值转存到 Redux store | Function(props, fields) |
-| onValuesChange | 任一表单域的值发生改变时的回调 | (props, values) => void |
+| onValuesChange | 任一表单域的值发生改变时的回调 | (props, changedValues, allValues) => void |

 经过 `Form.create` 包装的组件将会自带 `this.props.form` 属性，`this.props.form` 提供的 API 如下：

--- a/components/form/style/index.less
+++ b/components/form/style/index.less
@@ -132,8 +132,9 @@ input[type="checkbox"] {
 .@{form-prefix-cls}-extra {
  color: @text-color-secondary;
  line-height: @line-height-base;
-  transition: color .15s @ease-out;
+  transition: color .3s @ease-out; // sync input color transition
  margin-top: @form-help-margin-top;
+  clear: both;
 }

 .@{form-prefix-cls}-extra {
@@ -251,7 +252,9 @@ form {
  }

  // fix input with addon position. https://github.com/ant-design/ant-design/issues/8243
+  :not(.@{ant-prefix}-input-group-wrapper) > .@{ant-prefix}-input-group,
  .@{ant-prefix}-input-group-wrapper {
+    display: inline-block;
    vertical-align: middle;
    position: relative;
    top: -1px;
@@ -554,7 +557,11 @@ form {

 .@{ant-prefix}-advanced-search-form {
  .@{form-prefix-cls}-item {
-    margin-bottom: 24px;
+    margin-bottom: @form-item-margin-bottom;
+
+    &-with-help {
+      margin-bottom: @form-item-margin-bottom - @font-size-base * @line-height-base - @form-help-margin-top;
+    }
  }
 }

@@ -570,7 +577,7 @@ form {
  }
 }

-.show-help-motion(show-help, antShowHelp, 0.15s);
+.show-help-motion(show-help, antShowHelp, 0.3s);

@keyframes antShowHelpIn {
  0% {
--- a/components/grid/demo/responsive.md
+++ b/components/grid/demo/responsive.md
@@ -7,11 +7,11 @@ title:

 ## zh-CN

-参照 Bootstrap 的 [响应式设计](http://getbootstrap.com/css/#grid-media-queries)，预设五个响应尺寸：`xs` `sm` `md` `lg` `xl`  `xxl`。
+参照 Bootstrap 的 [响应式设计](http://getbootstrap.com/css/#grid-media-queries)，预设六个响应尺寸：`xs` `sm` `md` `lg` `xl`  `xxl`。

 ## en-US

-Referring to the Bootstrap [responsive design] (http://getbootstrap.com/css/#grid-media-queries), here preset five dimensions: `xs` `sm` `md` `lg` `xl`.
+Referring to the Bootstrap [responsive design] (http://getbootstrap.com/css/#grid-media-queries), here preset six dimensions: `xs` `sm` `md` `lg` `xl`.

 ````jsx
 import { Row, Col } from 'antd';
--- a/components/index.tsx
+++ b/components/index.tsx
@@ -2,7 +2,6 @@
 // this file is not used if use https://github.com/ant-design/babel-plugin-import
 const ENV = process.env.NODE_ENV;
 if (ENV !== 'production' &&
-    ENV !== 'test' &&
    typeof console !== 'undefined' &&
    console.warn &&
    typeof window !== 'undefined') {
--- a/components/input/Search.tsx
+++ b/components/input/Search.tsx
@@ -40,7 +40,7 @@ export default class Search extends React.Component<SearchProps, any> {
  }

  getButtonOrIcon() {
-    const { enterButton, prefixCls, size } = this.props;
+    const { enterButton, prefixCls, size, disabled } = this.props;
    if (!enterButton) {
      return <Icon className={`${prefixCls}-icon`} type="search" key="searchIcon" />;
    }
@@ -59,6 +59,7 @@ export default class Search extends React.Component<SearchProps, any> {
        className={`${prefixCls}-button`}
        type="primary"
        size={size}
+        disabled={disabled}
        onClick={this.onSearch}
        key="enterButton"
      >
--- a/components/input/tests/Search.test.js
+++ b/components/input/tests/Search.test.js
@@ -20,4 +20,11 @@ describe('Input.Search', () => {
    );
    expect(wrapper.render()).toMatchSnapshot();
  });
+
+  it('should disable enter button when disabled prop is true', () => {
+    const wrapper = mount(
+      <Search placeholder="input search text" enterButton disabled />
+    );
+    expect(wrapper.find('.ant-btn-primary[disabled]')).toHaveLength(1);
+  });
 });
--- a/components/input/tests/snapshots/demo.test.js.snap
+++ b/components/input/tests/snapshots/demo.test.js.snap
@@ -68,7 +68,7 @@ exports[`renders ./components/input/demo/addon.md correctly 1`] = `
              <span
                class="ant-select-arrow"
                style="user-select:none;-webkit-user-select:none"
-                unselectable="unselectable"
+                unselectable="on"
              >
                <b />
              </span>
@@ -110,7 +110,7 @@ exports[`renders ./components/input/demo/addon.md correctly 1`] = `
              <span
                class="ant-select-arrow"
                style="user-select:none;-webkit-user-select:none"
-                unselectable="unselectable"
+                unselectable="on"
              >
                <b />
              </span>
@@ -242,7 +242,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -285,7 +285,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -399,7 +399,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -431,7 +431,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -468,7 +468,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -524,7 +524,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -548,7 +548,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
          <div
            class="ant-select-selection__placeholder"
            style="display:block;user-select:none;-webkit-user-select:none"
-            unselectable="unselectable"
+            unselectable="on"
          >
            Email
          </div>
@@ -576,7 +576,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
@@ -614,7 +614,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
        <span
          class="ant-select-arrow"
          style="user-select:none;-webkit-user-select:none"
-          unselectable="unselectable"
+          unselectable="on"
        >
          <b />
        </span>
--- a/components/input/style/mixin.less
+++ b/components/input/style/mixin.less
@@ -311,20 +311,19 @@
  display: inline-block;
  width: 100%;

-  .@{inputClass} {
-    z-index: 1;
-  }
-
  &:hover .@{inputClass}:not(.@{inputClass}-disabled) {
    .hover();
  }

+  .@{inputClass} {
+    position: static;
+  }
+
  .@{inputClass}-prefix,
  .@{inputClass}-suffix {
    position: absolute;
    top: 50%;
    transform: translateY(-50%);
-    z-index: 2;
    line-height: 0;
    color: @input-color;
    :not(.anticon) {
--- a/components/layout/Sider.tsx
+++ b/components/layout/Sider.tsx
@@ -44,13 +44,13 @@ export interface SiderProps extends React.HTMLAttributes<HTMLDivElement> {
  breakpoint?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl';
 }

-export interface SliderState {
+export interface SiderState {
  collapsed?: boolean;
  below: boolean;
  belowShow?: boolean;
 }

-export interface SliderContext {
+export interface SiderContext {
  siderCollapsed: boolean;
 }

@@ -62,7 +62,7 @@ const generateId = (() => {
  };
 })();

-export default class Sider extends React.Component<SiderProps, SliderState> {
+export default class Sider extends React.Component<SiderProps, SiderState> {
  static __ANT_LAYOUT_SIDER: any = true;

  static defaultProps = {
@@ -180,9 +180,11 @@ export default class Sider extends React.Component<SiderProps, SliderState> {
    } = this.props;
    const divProps = omit(others, ['collapsed',
      'defaultCollapsed', 'onCollapse', 'breakpoint']);
-    const siderWidth = this.state.collapsed ? collapsedWidth : width;
+    const rawWidth = this.state.collapsed ? collapsedWidth : width;
+    // use "px" as fallback unit for width
+    const siderWidth = typeof rawWidth === 'number' ? `${rawWidth}px` : String(rawWidth || 0);
    // special trigger when collapsedWidth == 0
-    const zeroWidthTrigger = collapsedWidth === 0 || collapsedWidth === '0' || collapsedWidth === '0px' ? (
+    const zeroWidthTrigger = parseFloat(String(collapsedWidth || 0)) === 0 ? (
      <span onClick={this.toggle} className={`${prefixCls}-zero-width-trigger`}>
        <Icon type="bars" />
      </span>
@@ -203,16 +205,16 @@ export default class Sider extends React.Component<SiderProps, SliderState> {
    );
    const divStyle = {
      ...style,
-      flex: `0 0 ${siderWidth}px`,
-      maxWidth: `${siderWidth}px`, // Fix width transition bug in IE11
-      minWidth: `${siderWidth}px`, // https://github.com/ant-design/ant-design/issues/6349
-      width: `${siderWidth}px`,
+      flex: `0 0 ${siderWidth}`,
+      maxWidth: siderWidth, // Fix width transition bug in IE11
+      minWidth: siderWidth, // https://github.com/ant-design/ant-design/issues/6349
+      width: siderWidth,
    };
    const siderCls = classNames(className, prefixCls, {
      [`${prefixCls}-collapsed`]: !!this.state.collapsed,
      [`${prefixCls}-has-trigger`]: collapsible && trigger !== null && !zeroWidthTrigger,
      [`${prefixCls}-below`]: !!this.state.below,
-      [`${prefixCls}-zero-width`]: siderWidth === 0 || siderWidth === '0' || siderWidth === '0px',
+      [`${prefixCls}-zero-width`]: parseFloat(siderWidth) === 0,
    });
    return (
      <div className={siderCls} {...divProps} style={divStyle}>
--- a/components/layout/tests/snapshots/demo.test.js.snap
+++ b/components/layout/tests/snapshots/demo.test.js.snap
@@ -138,13 +138,10 @@ exports[`renders ./components/layout/demo/custom-trigger.md correctly 1`] = `
        class="logo"
      />
      <ul
-        aria-activedescendant=""
        class="ant-menu ant-menu-dark ant-menu-root ant-menu-inline"
        role="menu"
-        tabindex="0"
      >
        <li
-          aria-selected="true"
          class="ant-menu-item ant-menu-item-selected"
          role="menuitem"
          style="padding-left:24px"
@@ -157,7 +154,6 @@ exports[`renders ./components/layout/demo/custom-trigger.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -170,7 +166,6 @@ exports[`renders ./components/layout/demo/custom-trigger.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -218,28 +213,23 @@ exports[`renders ./components/layout/demo/fixed.md correctly 1`] = `
      class="logo"
    />
    <ul
-      aria-activedescendant=""
      class="ant-menu ant-menu-dark ant-menu-root ant-menu-horizontal"
      role="menu"
      style="line-height:64px"
-      tabindex="0"
    >
      <li
-        aria-selected="false"
        class="ant-menu-item"
        role="menuitem"
      >
        nav 1
      </li>
      <li
-        aria-selected="true"
        class="ant-menu-item ant-menu-item-selected"
        role="menuitem"
      >
        nav 2
      </li>
      <li
-        aria-selected="false"
        class="ant-menu-item"
        role="menuitem"
      >
@@ -322,13 +312,10 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
        class="logo"
      />
      <ul
-        aria-activedescendant=""
        class="ant-menu ant-menu-dark ant-menu-root ant-menu-inline"
        role="menu"
-        tabindex="0"
      >
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -343,7 +330,6 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -358,7 +344,6 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -373,7 +358,6 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="true"
          class="ant-menu-item ant-menu-item-selected"
          role="menuitem"
          style="padding-left:24px"
@@ -388,7 +372,6 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -403,7 +386,6 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -418,7 +400,6 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -433,7 +414,6 @@ exports[`renders ./components/layout/demo/fixed-sider.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -587,13 +567,10 @@ exports[`renders ./components/layout/demo/responsive.md correctly 1`] = `
        class="logo"
      />
      <ul
-        aria-activedescendant=""
        class="ant-menu ant-menu-dark ant-menu-root ant-menu-inline"
        role="menu"
-        tabindex="0"
      >
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -608,7 +585,6 @@ exports[`renders ./components/layout/demo/responsive.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -623,7 +599,6 @@ exports[`renders ./components/layout/demo/responsive.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -638,7 +613,6 @@ exports[`renders ./components/layout/demo/responsive.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="true"
          class="ant-menu-item ant-menu-item-selected"
          role="menuitem"
          style="padding-left:24px"
@@ -698,13 +672,10 @@ exports[`renders ./components/layout/demo/side.md correctly 1`] = `
        class="logo"
      />
      <ul
-        aria-activedescendant=""
        class="ant-menu ant-menu-dark ant-menu-root ant-menu-inline"
        role="menu"
-        tabindex="0"
      >
        <li
-          aria-selected="true"
          class="ant-menu-item ant-menu-item-selected"
          role="menuitem"
          style="padding-left:24px"
@@ -717,7 +688,6 @@ exports[`renders ./components/layout/demo/side.md correctly 1`] = `
          </span>
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -731,11 +701,11 @@ exports[`renders ./components/layout/demo/side.md correctly 1`] = `
        </li>
        <li
          class="ant-menu-submenu ant-menu-submenu-inline"
+          role="menuitem"
        >
          <div
            aria-expanded="false"
            aria-haspopup="true"
-            aria-owns="sub1$Menu"
            class="ant-menu-submenu-title"
            style="padding-left:24px"
          >
@@ -751,14 +721,15 @@ exports[`renders ./components/layout/demo/side.md correctly 1`] = `
              class="ant-menu-submenu-arrow"
            />
          </div>
+          <div />
        </li>
        <li
          class="ant-menu-submenu ant-menu-submenu-inline"
+          role="menuitem"
        >
          <div
            aria-expanded="false"
            aria-haspopup="true"
-            aria-owns="sub2$Menu"
            class="ant-menu-submenu-title"
            style="padding-left:24px"
          >
@@ -774,9 +745,9 @@ exports[`renders ./components/layout/demo/side.md correctly 1`] = `
              class="ant-menu-submenu-arrow"
            />
          </div>
+          <div />
        </li>
        <li
-          aria-selected="false"
          class="ant-menu-item"
          role="menuitem"
          style="padding-left:24px"
@@ -866,28 +837,23 @@ exports[`renders ./components/layout/demo/top.md correctly 1`] = `
      class="logo"
    />
    <ul
-      aria-activedescendant=""
      class="ant-menu ant-menu-dark ant-menu-root ant-menu-horizontal"
      role="menu"
      style="line-height:64px"
-      tabindex="0"
    >
      <li
-        aria-selected="false"
        class="ant-menu-item"
        role="menuitem"
      >
        nav 1
      </li>
      <li
-        aria-selected="true"
        class="ant-menu-item ant-menu-item-selected"
        role="menuitem"
      >
        nav 2
      </li>
      <li
-        aria-selected="false"
        class="ant-menu-item"
        role="menuitem"
      >
@@ -966,28 +932,23 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
      class="logo"
    />
    <ul
-      aria-activedescendant=""
      class="ant-menu ant-menu-dark ant-menu-root ant-menu-horizontal"
      role="menu"
      style="line-height:64px"
-      tabindex="0"
    >
      <li
-        aria-selected="false"
        class="ant-menu-item"
        role="menuitem"
      >
        nav 1
      </li>
      <li
-        aria-selected="true"
        class="ant-menu-item ant-menu-item-selected"
        role="menuitem"
      >
        nav 2
      </li>
      <li
-        aria-selected="false"
        class="ant-menu-item"
        role="menuitem"
      >
@@ -1052,14 +1013,13 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
          class="ant-layout-sider-children"
        >
          <ul
-            aria-activedescendant=""
            class="ant-menu ant-menu-light ant-menu-root ant-menu-inline"
            role="menu"
            style="height:100%"
-            tabindex="0"
          >
            <li
              class="ant-menu-submenu ant-menu-submenu-inline ant-menu-submenu-open ant-menu-submenu-selected"
+              role="menuitem"
            >
              <div
                aria-expanded="true"
@@ -1079,13 +1039,11 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
                />
              </div>
              <ul
-                aria-activedescendant=""
                class="ant-menu  ant-menu-sub ant-menu-inline"
                id="sub1$Menu"
                role="menu"
              >
                <li
-                  aria-selected="true"
                  class="ant-menu-item ant-menu-item-selected"
                  role="menuitem"
                  style="padding-left:48px"
@@ -1093,7 +1051,6 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
                  option1
                </li>
                <li
-                  aria-selected="false"
                  class="ant-menu-item"
                  role="menuitem"
                  style="padding-left:48px"
@@ -1101,7 +1058,6 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
                  option2
                </li>
                <li
-                  aria-selected="false"
                  class="ant-menu-item"
                  role="menuitem"
                  style="padding-left:48px"
@@ -1109,7 +1065,6 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
                  option3
                </li>
                <li
-                  aria-selected="false"
                  class="ant-menu-item"
                  role="menuitem"
                  style="padding-left:48px"
@@ -1120,11 +1075,11 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
            </li>
            <li
              class="ant-menu-submenu ant-menu-submenu-inline"
+              role="menuitem"
            >
              <div
                aria-expanded="false"
                aria-haspopup="true"
-                aria-owns="sub2$Menu"
                class="ant-menu-submenu-title"
                style="padding-left:24px"
              >
@@ -1138,14 +1093,15 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
                  class="ant-menu-submenu-arrow"
                />
              </div>
+              <div />
            </li>
            <li
              class="ant-menu-submenu ant-menu-submenu-inline"
+              role="menuitem"
            >
              <div
                aria-expanded="false"
                aria-haspopup="true"
-                aria-owns="sub3$Menu"
                class="ant-menu-submenu-title"
                style="padding-left:24px"
              >
@@ -1159,6 +1115,7 @@ exports[`renders ./components/layout/demo/top-side.md correctly 1`] = `
                  class="ant-menu-submenu-arrow"
                />
              </div>
+              <div />
            </li>
          </ul>
        </div>
@@ -1191,28 +1148,23 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
      class="logo"
    />
    <ul
-      aria-activedescendant=""
      class="ant-menu ant-menu-dark ant-menu-root ant-menu-horizontal"
      role="menu"
      style="line-height:64px"
-      tabindex="0"
    >
      <li
-        aria-selected="false"
        class="ant-menu-item"
        role="menuitem"
      >
        nav 1
      </li>
      <li
-        aria-selected="true"
        class="ant-menu-item ant-menu-item-selected"
        role="menuitem"
      >
        nav 2
      </li>
      <li
-        aria-selected="false"
        class="ant-menu-item"
        role="menuitem"
      >
@@ -1231,14 +1183,13 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
        class="ant-layout-sider-children"
      >
        <ul
-          aria-activedescendant=""
          class="ant-menu ant-menu-light ant-menu-root ant-menu-inline"
          role="menu"
          style="height:100%;border-right:0"
-          tabindex="0"
        >
          <li
            class="ant-menu-submenu ant-menu-submenu-inline ant-menu-submenu-open ant-menu-submenu-selected"
+            role="menuitem"
          >
            <div
              aria-expanded="true"
@@ -1258,13 +1209,11 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
              />
            </div>
            <ul
-              aria-activedescendant=""
              class="ant-menu  ant-menu-sub ant-menu-inline"
              id="sub1$Menu"
              role="menu"
            >
              <li
-                aria-selected="true"
                class="ant-menu-item ant-menu-item-selected"
                role="menuitem"
                style="padding-left:48px"
@@ -1272,7 +1221,6 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
                option1
              </li>
              <li
-                aria-selected="false"
                class="ant-menu-item"
                role="menuitem"
                style="padding-left:48px"
@@ -1280,7 +1228,6 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
                option2
              </li>
              <li
-                aria-selected="false"
                class="ant-menu-item"
                role="menuitem"
                style="padding-left:48px"
@@ -1288,7 +1235,6 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
                option3
              </li>
              <li
-                aria-selected="false"
                class="ant-menu-item"
                role="menuitem"
                style="padding-left:48px"
@@ -1299,11 +1245,11 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
          </li>
          <li
            class="ant-menu-submenu ant-menu-submenu-inline"
+            role="menuitem"
          >
            <div
              aria-expanded="false"
              aria-haspopup="true"
-              aria-owns="sub2$Menu"
              class="ant-menu-submenu-title"
              style="padding-left:24px"
            >
@@ -1317,14 +1263,15 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
                class="ant-menu-submenu-arrow"
              />
            </div>
+            <div />
          </li>
          <li
            class="ant-menu-submenu ant-menu-submenu-inline"
+            role="menuitem"
          >
            <div
              aria-expanded="false"
              aria-haspopup="true"
-              aria-owns="sub3$Menu"
              class="ant-menu-submenu-title"
              style="padding-left:24px"
            >
@@ -1338,6 +1285,7 @@ exports[`renders ./components/layout/demo/top-side-2.md correctly 1`] = `
                class="ant-menu-submenu-arrow"
              />
            </div>
+            <div />
          </li>
        </ul>
      </div>
--- a/components/layout/tests/index.test.js
+++ b/components/layout/tests/index.test.js
@@ -34,4 +34,25 @@ describe('Layout', () => {
    );
    expect(wrapper.find('.ant-layout-sider').hasClass('ant-layout-sider-has-trigger')).toBe(true);
  });
+
+  it('should have 50% width of sidebar', async () => {
+    const wrapper = mount(
+      <Layout>
+        <div><Sider width="50%">Sider</Sider></div>
+        <Content>Content</Content>
+      </Layout>
+    );
+    expect(wrapper.find('.ant-layout-sider').at(0).prop('style').width).toBe('50%');
+    expect(wrapper.find('.ant-layout-sider').at(0).prop('style').flex).toBe('0 0 50%');
+  });
+
+  it('detect ant-layout-sider-zero-width class in sider when its width is 0%', async () => {
+    const wrapper = mount(
+      <Layout>
+        <div><Sider width="0%">Sider</Sider></div>
+        <Content>Content</Content>
+      </Layout>
+    );
+    expect(wrapper.find('.ant-layout-sider').hasClass('ant-layout-sider-zero-width')).toBe(true);
+  });
 });
--- a/components/layout/style/index.less
+++ b/components/layout/style/index.less
@@ -97,7 +97,7 @@
        height: @layout-zero-trigger-height;
        line-height: @layout-zero-trigger-height;
        background: @layout-sider-background;
-        color: #fff;
+        color: @layout-trigger-color;
        font-size: @layout-zero-trigger-width / 2;
        border-radius: 0 @border-radius-base @border-radius-base 0;
        cursor: pointer;
--- a/components/list/tests/snapshots/demo.test.js.snap
+++ b/components/list/tests/snapshots/demo.test.js.snap
--- a/components/list/tests/snapshots/empty.test.js.snap
+++ b/components/list/tests/snapshots/empty.test.js.snap
@@ -4,18 +4,16 @@ exports[`List renders empty list 1`] = `
 <div
  class="ant-list ant-list-split"
 >
-  <div>
+  <div
+    class="ant-spin-nested-loading"
+  >
    <div
-      class="ant-spin-nested-loading"
+      class="ant-spin-container"
    >
      <div
-        class="ant-spin-container"
+        class="ant-list-empty-text"
      >
-        <div
-          class="ant-list-empty-text"
-        >
-          No data
-        </div>
+        No data
      </div>
    </div>
  </div>
--- a/components/list/tests/snapshots/pagination.test.js.snap
+++ b/components/list/tests/snapshots/pagination.test.js.snap
@@ -0,0 +1,80 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`List.pagination renders pagination correctly 1`] = `
+<div
+  class="ant-list ant-list-vertical ant-list-split ant-list-something-after-last-item"
+>
+  <div
+    class="ant-spin-nested-loading"
+  >
+    <div
+      class="ant-spin-container"
+    >
+      <div
+        class="ant-list-item"
+      >
+        <div
+          class="ant-list-item-content ant-list-item-content-single"
+        >
+          Jack
+        </div>
+      </div>
+      <div
+        class="ant-list-item"
+      >
+        <div
+          class="ant-list-item-content ant-list-item-content-single"
+        >
+          Lucy
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    class="ant-list-pagination"
+  >
+    <ul
+      class="ant-pagination my-page"
+      unselectable="unselectable"
+    >
+      <li
+        aria-disabled="true"
+        class="ant-pagination-disabled ant-pagination-prev"
+        title="Previous Page"
+      >
+        <a
+          class="ant-pagination-item-link"
+        />
+      </li>
+      <li
+        class="ant-pagination-item ant-pagination-item-1 ant-pagination-item-active"
+        tabindex="0"
+        title="1"
+      >
+        <a>
+          1
+        </a>
+      </li>
+      <li
+        class="ant-pagination-item ant-pagination-item-2"
+        tabindex="0"
+        title="2"
+      >
+        <a>
+          2
+        </a>
+      </li>
+      <li
+        aria-disabled="false"
+        class=" ant-pagination-next"
+        tabindex="0"
+        title="Next Page"
+      >
+        <a
+          class="ant-pagination-item-link"
+        />
+      </li>
+    </ul>
+  </div>
+</div>
+`;
--- a/components/list/tests/index.test.js
+++ b/components/list/tests/index.test.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import List from '..';
+
+const ListItem = List.Item;
+
+describe('List', () => {
+  it('locale not passed to internal div', async () => {
+    const locale = { emptyText: 'Custom text' };
+    const renderItem = item => <ListItem>{item}</ListItem>;
+    const dataSource = [];
+
+    const wrapper = mount(
+      <List renderItem={renderItem} dataSource={dataSource} locale={locale} />
+    );
+    expect(wrapper.find('div').first().props().locale).toBe(undefined);
+  });
+});
--- a/components/list/tests/pagination.test.js
+++ b/components/list/tests/pagination.test.js
@@ -0,0 +1,129 @@
+import React from 'react';
+import { render, mount } from 'enzyme';
+import List from '..';
+
+describe('List.pagination', () => {
+  const data = [
+    { key: 0, name: 'Jack' },
+    { key: 1, name: 'Lucy' },
+    { key: 2, name: 'Tom' },
+    { key: 3, name: 'Jerry' },
+  ];
+
+  const pagination = { className: 'my-page', pageSize: 2 };
+
+  function createList(props) {
+    return (
+      <List
+        itemLayout="vertical"
+        pagination={pagination}
+        dataSource={data}
+        renderItem={item => (
+          <List.Item key={item.key} >
+            {item.name}
+          </List.Item>
+        )}
+        {...props}
+      />
+    );
+  }
+
+  function renderedNames(wrapper) {
+    return wrapper.find('.ant-list-item-content').map(row => row.text());
+  }
+
+  it('renders pagination correctly', () => {
+    const wrapper = render(createList());
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('should not show pager if pagination.hideOnSinglePage is true and only 1 page', () => {
+    const wrapper = mount(
+      createList({ pagination: { pageSize: 3, hideOnSinglePage: true } })
+    );
+    expect(wrapper.find('.ant-pagination')).toHaveLength(1);
+    wrapper.setProps({ pagination: { pageSize: 3, hideOnSinglePage: false } });
+    expect(wrapper.find('.ant-pagination')).toHaveLength(1);
+    wrapper.setProps({ pagination: { pageSize: 4, hideOnSinglePage: true } });
+    expect(wrapper.find('.ant-pagination')).toHaveLength(0);
+    wrapper.setProps({ pagination: { pageSize: 4, hideOnSinglePage: false } });
+    expect(wrapper.find('.ant-pagination')).toHaveLength(1);
+    wrapper.setProps({ pagination: { pageSize: 5, hideOnSinglePage: true } });
+    expect(wrapper.find('.ant-pagination')).toHaveLength(0);
+    wrapper.setProps({ pagination: { pageSize: 5, hideOnSinglePage: false } });
+    expect(wrapper.find('.ant-pagination')).toHaveLength(1);
+  });
+
+  it('paginate data', () => {
+    const wrapper = mount(createList());
+
+    expect(renderedNames(wrapper)).toEqual(['Jack', 'Lucy']);
+    wrapper
+      .find('Pager')
+      .last()
+      .simulate('click');
+    expect(renderedNames(wrapper)).toEqual(['Tom', 'Jerry']);
+  });
+
+  it('repaginates when pageSize change', () => {
+    const wrapper = mount(createList());
+
+    wrapper.setProps({ pagination: { pageSize: 1 } });
+    expect(renderedNames(wrapper)).toEqual(['Jack']);
+  });
+
+  it('fires change event', () => {
+    const handlePaginationChange = jest.fn();
+    const noop = () => {};
+    const wrapper = mount(
+      createList({
+        pagination: {
+          ...pagination,
+          onChange: handlePaginationChange,
+          onShowSizeChange: noop,
+        },
+      })
+    );
+
+    wrapper
+      .find('Pager')
+      .last()
+      .simulate('click');
+
+    expect(handlePaginationChange).toBeCalledWith(2, 2);
+  });
+
+  // https://github.com/ant-design/ant-design/issues/4532
+  // https://codepen.io/afc163/pen/pWVRJV?editors=001
+  it('should display pagination as prop pagination change between true and false', () => {
+    const wrapper = mount(createList());
+    expect(wrapper.find('.ant-pagination')).toHaveLength(1);
+    expect(wrapper.find('.ant-pagination-item')).toHaveLength(2);
+    wrapper.setProps({ pagination: false });
+    expect(wrapper.find('.ant-pagination')).toHaveLength(0);
+    wrapper.setProps({ pagination });
+    wrapper.update();
+    expect(wrapper.find('.ant-pagination')).toHaveLength(1);
+    expect(wrapper.find('.ant-pagination-item')).toHaveLength(2);
+    wrapper.find('.ant-pagination-item-2').simulate('click');
+    expect(renderedNames(wrapper)).toEqual(['Tom', 'Jerry']);
+    wrapper.setProps({ pagination: false });
+    expect(wrapper.find('.ant-pagination')).toHaveLength(0);
+    wrapper.setProps({ pagination: true });
+    expect(wrapper.find('.ant-pagination')).toHaveLength(1);
+    expect(wrapper.find('.ant-pagination-item')).toHaveLength(1); // pageSize will be 10
+    expect(renderedNames(wrapper)).toEqual(['Jack', 'Lucy', 'Tom', 'Jerry']);
+  });
+
+  // https://github.com/ant-design/ant-design/issues/5259
+  it('change to correct page when data source changes', () => {
+    const wrapper = mount(createList({ pagination: { pageSize: 1 } }));
+    wrapper.find('.ant-pagination-item-3').simulate('click');
+    wrapper.setProps({ dataSource: [data[0]] });
+    expect(
+      wrapper
+        .find('.ant-pagination-item-1')
+        .hasClass('ant-pagination-item-active')
+    ).toBe(true);
+  });
+});
--- a/components/list/demo/basic.md
+++ b/components/list/demo/basic.md
@@ -1,7 +1,7 @@
 ---
 order: 1
 title:
-  zh-CN: 基础列表 
+  zh-CN: 基础列表
  en-US: Basic list
 ---

--- a/components/list/demo/grid.md
+++ b/components/list/demo/grid.md
@@ -1,7 +1,7 @@
 ---
 order: 4
 title:
-  zh-CN: 栅格列表 
+  zh-CN: 栅格列表
  en-US: Grid
 ---

--- a/components/list/demo/infinite-load.md
+++ b/components/list/demo/infinite-load.md
@@ -38,7 +38,7 @@ class InfiniteListExample extends React.Component {
      },
    });
  }
-  componentWillMount() {
+  componentDidMount() {
    this.getData((res) => {
      this.setState({
        data: res.results,
@@ -89,7 +89,11 @@ class InfiniteListExample extends React.Component {
              </List.Item>
            )}
          >
-            {this.state.loading && this.state.hasMore && <Spin className="demo-loading" />}
+            {this.state.loading && this.state.hasMore && (
+              <div className="demo-loading-container">
+                <Spin />
+              </div>
+            )}
          </List>
        </InfiniteScroll>
      </div>
@@ -108,9 +112,10 @@ ReactDOM.render(<InfiniteListExample />, mountNode);
  padding: 8px 24px;
  height: 300px;
 }
-.demo-loading {
+.demo-loading-container {
  position: absolute;
-  bottom: -40px;
-  left: 50%;
+  bottom: 40px;
+  width: 100%;
+  text-align: center;
 }
 ````
--- a/Show More
+++ b/Show More