Bump 3.7.2

React 16.4 call getDerivedStateFromProps on every render

close #11447
close #11440
close #11439
close #11416
close #11405

.circleci/config.yml

@@ -0,0 +1,221 @@
+version: 2
+
+references:
+  container_config: &container_config
+    docker:
+      - image: circleci/node:8
+    working_directory: ~/ant-design
+
+  attach_workspace: &attach_workspace
+    attach_workspace:
+      at: ~/ant-design
+
+  install_react: &install_react
+    run: REACT=15 ./scripts/install-react.sh
+
+  react_15: &react_15
+    environment:
+      REACT: 15
+
+  react_16: &react_16
+    environment:
+      REACT: 16
+
+jobs:
+  setup:
+    <<: *container_config
+    steps:
+      - checkout
+      - run: node -v
+      - run: npm -v
+      - run: npm install
+      - run:
+          command: |
+            set +eo
+            npm ls
+            true
+      - persist_to_workspace:
+          root: ~/ant-design
+          paths:
+            - node_modules
+
+  dist:
+    <<: *container_config
+    steps:
+      - checkout
+      - *attach_workspace
+      - run: npm run dist
+      - run: node ./tests/dekko/dist.test.js
+      - persist_to_workspace:
+          root: ~/ant-design
+          paths:
+            - dist
+
+  compile:
+    <<: *container_config
+    steps:
+      - checkout
+      - *attach_workspace
+      - run: npm run compile
+      - run: node ./tests/dekko/lib.test.js
+      - persist_to_workspace:
+          root: ~/ant-design
+          paths:
+            - lib
+            - es
+
+  lint:
+    <<: *container_config
+    steps:
+      - checkout
+      - *attach_workspace
+      - run: npm run lint
+
+  test_dist:
+    <<: *container_config
+    <<: *react_16
+    steps:
+      - checkout
+      - *attach_workspace
+      - run:
+          command: npm test -- -w 2
+          environment:
+            LIB_DIR: dist
+
+  test_lib:
+    <<: *container_config
+    <<: *react_16
+    steps:
+      - checkout
+      - *attach_workspace
+      - run:
+          command: npm test -- -w 2
+          environment:
+            LIB_DIR: lib
+
+  test_es:
+    <<: *container_config
+    <<: *react_16
+    steps:
+      - checkout
+      - *attach_workspace
+      - run:
+          command: npm test -- -w 2
+          environment:
+            LIB_DIR: es
+
+  test_dom:
+    <<: *container_config
+    <<: *react_16
+    steps:
+      - checkout
+      - *attach_workspace
+      - run: npm test -- -w 2 --coverage
+      - run: bash <(curl -s https://codecov.io/bash)
+
+  test_node:
+    <<: *container_config
+    <<: *react_16
+    steps:
+      - checkout
+      - *attach_workspace
+      - run: npm run test-node -- -w 2
+
+  test_dist_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run:
+          command: npm test -- -w 2 -u
+          environment:
+            LIB_DIR: dist
+
+  test_lib_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run:
+          command: npm test -- -w 2 -u
+          environment:
+            LIB_DIR: lib
+
+  test_es_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run:
+          command: npm test -- -w 2 -u
+          environment:
+            LIB_DIR: es
+
+  test_dom_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run: npm test -- -w 2 -u
+
+  test_node_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run: npm run test-node -- -w 2 -u
+
+workflows:
+  version: 2
+  build-test:
+    jobs:
+      - setup
+      - dist:
+          requires:
+          - setup
+      - compile:
+          requires:
+          - setup
+      - lint:
+          requires:
+            - setup
+      - test_dist:
+          requires:
+            - dist
+      - test_lib:
+          requires:
+            - compile
+      - test_es:
+          requires:
+            - compile
+      - test_dom:
+          requires:
+            - setup
+      - test_node:
+          requires:
+            - setup
+      - test_dist_15:
+          requires:
+            - dist
+      - test_lib_15:
+          requires:
+            - compile
+      - test_es_15:
+          requires:
+            - compile
+      - test_dom_15:
+          requires:
+            - setup
+      - test_node_15:
+          requires:
+            - setup

.travis.yml

@@ -8,7 +8,6 @@ node_js:
 cache:
   directories:
     - $HOME/.npm
-    - node_modules
 
 matrix:
   fast_finish: true

CHANGELOG.en-US.md

@@ -15,14 +15,46 @@ timeline: true
 
 ---
 
+## 3.7.2
+
+`2018-07-25`
+
+- DatePicker
+  - 🐞 **Fix issue resulting in year and month can not be changed in control mode.** [b9992f4](https://github.com/ant-design/ant-design/commit/b9992f4a08574efb47b6e6cd80eb1e888b9a1ede)
+  - 🐞 Fix warning of `getDerivedStateFromProp`. [#11398](https://github.com/ant-design/ant-design/pull/11398) [@yoyo837](https://github.com/yoyo837)
+- Drawer
+  - 🐞 Fix close animation when setting `destroyOnClose`. [#11307](https://github.com/ant-design/ant-design/issues/11307)
+  - 🐞 Fix display issue when using a `vw` value as `width`. [#11326](https://github.com/ant-design/ant-design/issues/11326)
+  - 🐞 Fix `wrapClassName` now working.
+- 🐞 Fix text overflow of Tooltip. [#11402](https://github.com/ant-design/ant-design/pull/11402) [@weidapao](https://github.com/weidapao)
+- 🐞 Fix style issue of dark theme Menu in Layout.Header. [#11400](https://github.com/ant-design/ant-design/pull/11400) [@hongxuWei](https://github.com/hongxuWei)
+- 🐞 Fix the arrow buttons of InputNumber showing wrong positon in a fixed table. [#11408](https://github.com/ant-design/ant-design/issues/11408)
+- 🐞 Fix issue resulting in Select.Option shows wrong border radius in Select.OptGroup. [6cb6f5c](https://github.com/ant-design/ant-design/commit/6cb6f5c83ed634e67d5b5d0816d11aa0788a74d8)
+- 🐞 Fix issue resulting in `onChange` was trigged twice when click the filter icon of Table. [#11164](https://github.com/ant-design/ant-design/issues/11164) [@adybionka](https://github.com/adybionka)
+- 🐞 Fix issue resulting title of Model.confirm shows scrollbar on Firefox. [#11432](https://github.com/ant-design/ant-design/issues/11432)
+- TypeScript
+  - 🐞 Fix type definition of Radio.Group. [#11409](https://github.com/ant-design/ant-design/pull/11409) [@eddiemoore](https://github.com/eddiemoore)
+  - 🐞 Fix type definition of TreeSelect. [#11442](https://github.com/ant-design/ant-design/pull/11442) [@JribiBelhassen](https://github.com/JribiBelhassen)
+  - 🐞 Fix type definition of Badge. [#11421](https://github.com/ant-design/ant-design/pull/11421) [@zongzi531](https://github.com/zongzi531)
+
+## 3.7.1
+
+`2018-07-21`
+
+- 🐞 Fix popup content can't display in Drawer component.[#11304](https://github.com/ant-design/ant-design/issues/11304)
+- 🐞 Card using `tabList` support `disabled` prop.[#11212](https://github.com/ant-design/ant-design/issues/11212)
+- 🐞 Fix Link of Anchor not sync when `href` update.[#11287](https://github.com/ant-design/ant-design/pull/11287/files) [@tangjinzhou](https://github.com/tangjinzhou)
+- 🐞 Fix Menu component style.[#11299](https://github.com/ant-design/ant-design/issues/11299)
+- 🐞 Fix Drawer component don't have animation when `destroyOnClose` is set.[#11307](https://github.com/ant-design/ant-design/issues/11307)
+- 🐞 Fix DirectoryTree can't expand when `expandedKeys` is in control.[#11366](https://github.com/ant-design/ant-design/issues/11366)
+- 🐞 Fix Button with Tooltip under ButtonGroup style issue when Button is `disabled`.[11321](https://github.com/ant-design/ant-design/pull/11321) [@tangjinzhou](https://github.com/tangjinzhou)
+
 ## 3.7.0
 
-3.7.0 is a heavy update that brings a lot of exciting changes and new features.  
+3.7.0 is a heavy update that brings a lot of exciting changes and new features.
 Here are some highlights ✨:
 
 - 🌟 Add drawer component : [Drawer](https://ant.design/components/drawer-cn/). [#10791](https://github.com/ant-design/ant-design/pull/10791)
-- 🌟 Horizontal menu automatically collapses when there is no enough space. [#11234](https://github.com/ant-design/ant-design/pull/11234)
-![demo](https://user-images.githubusercontent.com/1731837/42550555-0fef7878-8505-11e8-9d2f-f708fec66b44.gif)
 - 🌟 Add `Tree.DirectoryTree` component as the built-in directory tree. [#7749](https://github.com/ant-design/ant-design/issues/7749)
 
 Component Fixes / Enhancements:
@@ -33,8 +65,8 @@ Component Fixes / Enhancements:
   - 🌟 Add `maxTagCount` prop to set the max count of visible tags. [fb96c9d](https://github.com/ant-design/ant-design/commit/fb96c9db351e44a202f64f780470c6319a8a9626)
   - 🌟 Add `maxTagPlaceholder` prop to set the content when the tag is hidden. [fb96c9d](https://github.com/ant-design/ant-design/commit/fb96c9db351e44a202f64f780470c6319a8a9626)
   - 🌟 Search input now supports case sensitive search. [#10990](https://github.com/ant-design/ant-design/issues/10990)
-  - 🗑 Remove `label` prop and use `title` prop instead in the `treeData`. 
-- Upgrade `rc-upload` to `2.5.0` for Upload. 
+  - 🗑 Remove `label` prop and use `title` prop instead in the `treeData`.
+- Upgrade `rc-upload` to `2.5.0` for Upload.
   - 🌟 Add `directory` prop to support folder uploading. [#7315](https://github.com/ant-design/ant-design/issues/7315)
   - 🌟 `action` prop supports to be the a function which returns a Promise object. [fd96967](https://github.com/ant-design/ant-design/commit/fd96967c872600b79bb608e9ddf9f8c38814a704)
 - Dropdown

CHANGELOG.zh-CN.md

@@ -15,14 +15,46 @@ timeline: true
 
 ---
 
+## 3.7.2
+
+`2018-07-25`
+
+- DatePicker
+  - 🐞 **修复在受控模式下不能切换年月的问题。**[b9992f4](https://github.com/ant-design/ant-design/commit/b9992f4a08574efb47b6e6cd80eb1e888b9a1ede)
+  - 🐞 修复在 `getDerivedStateFromProp` 的警告。[#11398](https://github.com/ant-design/ant-design/pull/11398) [@yoyo837](https://github.com/yoyo837)
+- Drawer
+  - 🐞 修复使用 `destroyOnClose` 时没有关闭动画的问题。[#11307](https://github.com/ant-design/ant-design/issues/11307)
+  - 🐞 修复 `width` 以 `vw` 为单位时的显示错误。[#11326](https://github.com/ant-design/ant-design/issues/11326)
+  - 🐞 修复 `wrapClassName` 属性无效的问题。
+- 🐞 修复 Tooltip 文字溢出的问题。[#11402](https://github.com/ant-design/ant-design/pull/11402) [@weidapao](https://github.com/weidapao)
+- 🐞 修复 Menu 在 `theme` 为 `dark` 是在 Layout.Header 里的样式问题。[#11400](https://github.com/ant-design/ant-design/pull/11400) [@hongxuWei](https://github.com/hongxuWei)
+- 🐞 修复 InputNumber 的箭头按钮在使用了固定列的 Table 里显示错位的问题。[#11408](https://github.com/ant-design/ant-design/issues/11408)
+- 🐞 修复 Select 使用分组时 Option 的圆角显示错误。[6cb6f5c](https://github.com/ant-design/ant-design/commit/6cb6f5c83ed634e67d5b5d0816d11aa0788a74d8)
+- 🐞 修复 Table 第一次点击过滤按钮的时候 `onChange` 会被触发两次的问题。[#11164](https://github.com/ant-design/ant-design/issues/11164) [@adybionka](https://github.com/adybionka)
+- 🐞 修复 Model.confirm 的标题在 Firefox 下会显示滚动条的问题。[#11432](https://github.com/ant-design/ant-design/issues/11432)
+- TypeScript
+  - 🐞 修复 Radio.Group 类型定义。[#11409](https://github.com/ant-design/ant-design/pull/11409) [@eddiemoore](https://github.com/eddiemoore)
+  - 🐞 修复 TreeSelect 类型定义。[#11442](https://github.com/ant-design/ant-design/pull/11442) [@JribiBelhassen](https://github.com/JribiBelhassen)
+  - 🐞 修复 Badge 类型定义。[#11421](https://github.com/ant-design/ant-design/pull/11421) [@zongzi531](https://github.com/zongzi531)
+
+## 3.7.1
+
+`2018-07-21`
+
+- 🐞 修复 Drawer 内无法显示弹层组件的问题。[#11304](https://github.com/ant-design/ant-design/issues/11304)
+- 🐞 带页签的卡片页签支持 disabled 属性。[#11212](https://github.com/ant-design/ant-design/issues/11212)
+- 🐞 修复锚点链接组件 href 改变不更新的问题。 [#11287](https://github.com/ant-design/ant-design/pull/11287/files) [@tangjinzhou](https://github.com/tangjinzhou)
+- 🐞 修复 Menu 样式细节问题。[#11299](https://github.com/ant-design/ant-design/issues/11299)
+- 🐞 修复 Drawer 组件设置 `destroyOnClose` 后关闭动画消失。[#11307](https://github.com/ant-design/ant-design/issues/11307)
+- 🐞 修复 DirectoryTree 在 `expandedKeys` 属性可控时点击无法展开的问题。[#11366](https://github.com/ant-design/ant-design/issues/11366)
+- 🐞 修复 ButtonGroup 中使用 Tooltip 的 Button 在 `disabled` 时样式不正确的问题。[11321](https://github.com/ant-design/ant-design/pull/11321) [@tangjinzhou](https://github.com/tangjinzhou)
+
 ## 3.7.0
 
-3.7.0是一个重磅更新，带来了很多激动人心的变化和新特性。  
+3.7.0 是一个重磅更新，带来了很多激动人心的变化和新特性。
 以下是一些亮点✨：
 
 - 🔥 增加抽屉组件 : [`Drawer`](https://ant.design/components/drawer-cn/) [#10791](https://github.com/ant-design/ant-design/pull/10791)
-- 🔥 Menu 增加一个横向菜单在空间不足时溢出部分自动收起的特性。[#11234](https://github.com/ant-design/ant-design/pull/11234)
-![demo](https://user-images.githubusercontent.com/1731837/42550555-0fef7878-8505-11e8-9d2f-f708fec66b44.gif)
 - 🔥 新增 `Tree.DirectoryTree` 组件，作为内置的目录树。[#7749](https://github.com/ant-design/ant-design/issues/7749)
 
 组件修复/功能增强：
@@ -46,7 +78,7 @@ timeline: true
   - 🌟 `filterIcon` 属性支持作为一个返回 `ReactNode` 的函数。[1af4392](https://github.com/ant-design/ant-design/commit/1af4392ae9fbdaa6fcfbf2f0de5413100ef4a84a)
   - 🐞 修复在固定列时导致的行错位的问题。[#10392](https://github.com/ant-design/ant-design/issues/10392)
   - 🐞 修复在组件中使用 `combobox` 模式的 `Select` 导致的重影问题。[#10828](https://github.com/ant-design/ant-design/issues/10828)
-  - 🐞 修复 Table 自定义组件不会更改。 [c380186](https://github.com/ant-design/ant-design/commit/c380186e794a7735ae91e992f25a313158ee4984)
+  - 🐞 修复 components 属性值不能变化的问题。[c380186](https://github.com/ant-design/ant-design/commit/c380186e794a7735ae91e992f25a313158ee4984)
 - 🗑 Select 组件废弃了 `combobox` 模式，请使用 `AutoComplete` 组件代替。[53046a4](https://github.com/ant-design/ant-design/commit/53046a454ad83ca03dc313e63f56474ed1173002)
 - 🌟 Alert 组件允许传递 `data-*`、`aria-*` 和 `role-*` 属性到组件内部。[f0b684d](https://github.com/ant-design/ant-design/commit/f0b684de6a7c422f0de56e1ef72aeb35ab25a858)
 - 🌟 Avatar 组件新增 `alt` 属性，用于设置图像无法显示时的替代文本。[#10798](https://github.com/ant-design/ant-design/pull/10798)
@@ -63,8 +95,8 @@ timeline: true
   - 🌟 新增 `onLoad` 属性，作为节点加载完毕时的回调函数。[c488aca](https://github.com/ant-design/ant-design/commit/c488aca05e11d942d77c1b6bff45d12bbb1a2bd6)
 - 🌟 增加 `okButtonDisabled` and `cancelButtonDisabled` 属性用于禁用确定和取消按钮。[#10955](https://github.com/ant-design/ant-design/pull/10955)
 - 🌟 Cascader 新增 fieldNames 并废弃拼写错误的 filedNames。 [#10896](https://github.com/ant-design/ant-design/issues/10896)
-- 🐞 修复时间轴不能与`Tooltip`一起使用的问题。  [0e3b67e](https://github.com/ant-design/ant-design/commit/0e3b67e9999d867cc304f3be61a8a042a2ab92ee)
-- 🐞 修复当 Avata 自定义大小时，圆角不改变的问题。[e1e6523](https://github.com/ant-design/ant-design/commit/e1e6523452286ba56f20b73abad762a58ea7d7bc)
+- 🐞 修复时间轴不能与`Tooltip`一起使用的问题。 [0e3b67e](https://github.com/ant-design/ant-design/commit/0e3b67e9999d867cc304f3be61a8a042a2ab92ee)
+- 🐞 修复当 Avatar 自定义大小时，圆角不改变的问题。[e1e6523](https://github.com/ant-design/ant-design/commit/e1e6523452286ba56f20b73abad762a58ea7d7bc)
 
 ## 3.6.6
 

README-zh_CN.md

@@ -9,7 +9,7 @@
 [![](https://img.shields.io/travis/ant-design/ant-design.svg?style=flat-square)](https://travis-ci.org/ant-design/ant-design)
 [![Codecov](https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square)](https://codecov.io/gh/ant-design/ant-design/branch/master)
 [![Dependencies](https://img.shields.io/david/ant-design/ant-design.svg)](https://david-dm.org/ant-design/ant-design)
-[![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg)](https://david-dm.org/ant-design/ant-design#info=devDependencies&view=list)
+[![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg)](https://david-dm.org/ant-design/ant-design?type=dev)
 
 [![npm package](https://img.shields.io/npm/v/antd.svg?style=flat-square)](https://www.npmjs.org/package/antd)
 [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://www.npmtrends.com/antd)
@@ -34,6 +34,10 @@
 * 支持服务端渲染。
 * [Electron](http://electron.atom.io/)
 
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
+| --------- | --------- | --------- | --------- | --------- | --------- |
+| IE9, IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions| last 2 versions
+
 ## 参与共建 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 
 请参考[贡献指南](https://ant.design/docs/react/contributing-cn).
@@ -94,7 +98,7 @@ $ npm install
 $ npm start
 ```
 
-打开浏览器访问 http://127.0.0.1:8001 ，更多本地开发文档参见: https://github.com/ant-design/ant-design/wiki/Development 。
+打开浏览器访问 http://127.0.0.1:8001 ，更多[本地开发文档](https://github.com/ant-design/ant-design/wiki/Development)。
 
 ## 如何贡献
 

README.md

@@ -9,7 +9,7 @@
 [![](https://img.shields.io/travis/ant-design/ant-design/master.svg?style=flat-square)](https://travis-ci.org/ant-design/ant-design)
 [![Codecov](https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square)](https://codecov.io/gh/ant-design/ant-design/branch/master)
 [![Dependencies](https://img.shields.io/david/ant-design/ant-design.svg)](https://david-dm.org/ant-design/ant-design)
-[![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg)](https://david-dm.org/ant-design/ant-design#info=devDependencies&view=list)
+[![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg)](https://david-dm.org/ant-design/ant-design?type=dev)
 
 [![npm package](https://img.shields.io/npm/v/antd.svg?style=flat-square)](https://www.npmjs.org/package/antd)
 [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://www.npmtrends.com/antd)
@@ -38,6 +38,10 @@ An enterprise-class UI design language and React-based implementation.
 * Server-side Rendering
 * [Electron](http://electron.atom.io/)
 
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
+| --------- | --------- | --------- | --------- | --------- | --------- |
+| IE9, IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions| last 2 versions| last 2 versions
+
 ## Let's build a better antd together [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 
 Read our [contributing guide](https://ant.design/docs/react/contributing).
@@ -67,7 +71,6 @@ Or [import components on demand](https://ant.design/docs/react/getting-started#I
 
 See [Use in TypeScript](https://ant.design/docs/react/use-in-typescript)
 
-
 ## Internationalization
 
 See [i18n](http://ant.design/docs/react/i18n).
@@ -98,7 +101,7 @@ $ npm install
 $ npm start
 ```
 
-Open your browser and visit http://127.0.0.1:8001 , see more at https://github.com/ant-design/ant-design/wiki/Development .
+Open your browser and visit http://127.0.0.1:8001 , see more at [Development](https://github.com/ant-design/ant-design/wiki/Development).
 
 ## Contributing
 

components/anchor/AnchorLink.tsx

@@ -27,6 +27,14 @@ export default class AnchorLink extends React.Component<AnchorLinkProps, any> {
     this.context.antAnchor.registerLink(this.props.href);
   }
 
+  componentWillReceiveProps(nextProps: AnchorLinkProps) {
+    const { href } = nextProps;
+    if (this.props.href !== href) {
+      this.context.antAnchor.unregisterLink(this.props.href);
+      this.context.antAnchor.registerLink(href);
+    }
+  }
+
   componentWillUnmount() {
     this.context.antAnchor.unregisterLink(this.props.href);
   }

components/anchor/__tests__/Anchor.test.js

@@ -90,4 +90,20 @@ describe('Anchor Render', () => {
     wrapper.setProps({ children: null });
     expect(wrapper.instance().links).toEqual([]);
   });
+
+  it('should update links when link href update', async () => {
+    let anchorInstance = null;
+    function AnchorUpdate({ href }) {
+      return (
+        <Anchor ref={c => anchorInstance = c}>
+          <Link href={href} title="API" />
+        </Anchor>
+      );
+    }
+    const wrapper = mount(<AnchorUpdate href="#API" />);
+
+    expect(anchorInstance.links).toEqual(['#API']);
+    wrapper.setProps({ href: '#API_1' });
+    expect(anchorInstance.links).toEqual(['#API_1']);
+  });
 });

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

@@ -34,9 +34,9 @@ const dataSource = ['12345', '23456', '34567'];
 | optionLabelProp | 回填到选择框的 Option 的属性值，默认是 Option 的子元素。比如在子元素需要高亮效果时，此值可以设为 `value`。 | string | `children` |
 | placeholder | 输入框提示 | string | - |
 | value | 指定当前选中的条目 | string\|string\[]\|{ key: string, label: string\|ReactNode }\|Array<{ key: string, label: string\|ReactNode }> | 无 |
-| onBlur | 获取焦点时的回调 | function() | - |
+| onBlur | 失去焦点时的回调 | function() | - |
 | onChange | 选中 option，或 input 的 value 变化时，调用此函数 | function(value) | 无 |
-| onFocus | 失去焦点时的回调 | function() | - |
+| onFocus | 获得焦点时的回调 | function() | - |
 | onSearch | 搜索补全项的时候调用 | function(value) | 无 |
 | onSelect | 被选中时调用，参数为选中项的 value 值 | function(value, option) | 无 |
 

components/badge/ScrollNumber.tsx

@@ -3,7 +3,7 @@ import { createElement, Component } from 'react';
 import omit from 'omit.js';
 import classNames from 'classnames';
 
-function getNumberArray(num: string | number | undefined) {
+function getNumberArray(num: string | number | undefined | null) {
   return num ?
     num.toString()
       .split('')
@@ -14,16 +14,16 @@ function getNumberArray(num: string | number | undefined) {
 export interface ScrollNumberProps {
   prefixCls?: string;
   className?: string;
-  count?: string | number;
+  count?: string | number | null;
   component?: string;
   onAnimated?: Function;
   style?: React.CSSProperties;
-  title?: string | number;
+  title?: string | number | null;
 }
 
 export interface ScrollNumberState {
   animateStarted?: boolean;
-  count?: string | number;
+  count?: string | number | null;
 }
 
 export default class ScrollNumber extends Component<ScrollNumberProps, ScrollNumberState> {

components/badge/index.tsx

@@ -8,7 +8,7 @@ export { ScrollNumberProps } from './ScrollNumber';
 
 export interface BadgeProps {
   /** Number to show in badge */
-  count?: number | string;
+  count?: number | string | null;
   showZero?: boolean;
   /** Max count to show */
   overflowCount?: number;

components/button/style/mixin.less

@@ -109,7 +109,8 @@
 .button-group-base(@btnClassName) {
   position: relative;
   display: inline-block;
-  > .@{btnClassName} {
+  > .@{btnClassName},
+  > span > .@{btnClassName} {
     position: relative;
     line-height: @btn-height-base - 2px;
 
@@ -126,13 +127,15 @@
   }
 
   // size
-  &-lg > .@{btnClassName} {
-    .button-size(@btn-height-lg; @btn-padding-lg; @btn-font-size-lg; @btn-border-radius-base);
+  &-lg > .@{btnClassName},
+  &-lg > span > .@{btnClassName} {
+    .button-size(@btn-height-lg; @btn-padding-lg; @btn-font-size-lg; 0);
     line-height: @btn-height-lg - 2px;
   }
 
-  &-sm > .@{btnClassName} {
-    .button-size(@btn-height-sm; @btn-padding-sm; @font-size-base; @btn-border-radius-sm);
+  &-sm > .@{btnClassName},
+  &-sm > span > .@{btnClassName} {
+    .button-size(@btn-height-sm; @btn-padding-sm; @font-size-base; 0);
     line-height: @btn-height-sm - 2px;
     > .@{iconfont-css-prefix} {
       font-size: @font-size-base;
@@ -260,7 +263,7 @@
     border-left-color: transparent;
   }
 
-  .@{btnClassName}:not(:first-child):not(:last-child) {
+  .@{btnClassName} {
     border-radius: 0;
   }
 
@@ -268,17 +271,42 @@
   > span:first-child > .@{btnClassName} {
     margin-left: 0;
   }
+  > .@{btnClassName}:only-child {
+    border-radius: @btn-border-radius-base;
+  }
+  > span:only-child > .@{btnClassName} {
+    border-radius: @btn-border-radius-base;
+  }
 
   > .@{btnClassName}:first-child:not(:last-child),
   > span:first-child:not(:last-child) > .@{btnClassName} {
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
+    border-bottom-left-radius: @btn-border-radius-base;
+    border-top-left-radius: @btn-border-radius-base;
   }
 
   > .@{btnClassName}:last-child:not(:first-child),
   > span:last-child:not(:first-child) > .@{btnClassName} {
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
+    border-bottom-right-radius: @btn-border-radius-base;
+    border-top-right-radius: @btn-border-radius-base;
+  }
+
+  &-sm {
+    > .@{btnClassName}:only-child {
+      border-radius: @btn-border-radius-sm;
+    }
+    > span:only-child > .@{btnClassName} {
+      border-radius: @btn-border-radius-sm;
+    }
+    > .@{btnClassName}:first-child:not(:last-child),
+    > span:first-child:not(:last-child) > .@{btnClassName} {
+      border-bottom-left-radius: @btn-border-radius-sm;
+      border-top-left-radius: @btn-border-radius-sm;
+    }
+    > .@{btnClassName}:last-child:not(:first-child),
+    > span:last-child:not(:first-child) > .@{btnClassName} {
+      border-bottom-right-radius: @btn-border-radius-sm;
+      border-top-right-radius: @btn-border-radius-sm;
+    }
   }
 
   & > & {

components/card/index.tsx

@@ -19,6 +19,7 @@ export type CardType = 'inner';
 export interface CardTabListType {
   key: string;
   tab: React.ReactNode;
+  disabled?: boolean;
 }
 
 export interface CardProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'title'> {
@@ -225,7 +226,7 @@ export default class Card extends React.Component<CardProps, CardState> {
         size="large"
         onChange={this.onTabChange}
       >
-        {tabList.map(item => <Tabs.TabPane tab={item.tab} key={item.key} />)}
+        {tabList.map(item => <Tabs.TabPane tab={item.tab} disabled={item.disabled} key={item.key} />)}
       </Tabs>
     ) : null;
     if (title || extra || tabs) {

components/checkbox/index.en-US.md

@@ -4,7 +4,7 @@ type: Data Entry
 title: Checkbox
 ---
 
-Checkbox.
+Checkbox component.
 
 ## When To Use
 

components/date-picker/RangePicker.tsx

@@ -1,9 +1,11 @@
 /* tslint:disable jsx-no-multiline-js */
 import * as React from 'react';
 import * as moment from 'moment';
+import { polyfill } from 'react-lifecycles-compat';
 import RangeCalendar from 'rc-calendar/lib/RangeCalendar';
 import RcDatePicker from 'rc-calendar/lib/Picker';
 import classNames from 'classnames';
+import shallowequal from 'shallowequal';
 import Icon from '../icon';
 import Tag from '../tag';
 import warning from '../_util/warning';
@@ -63,13 +65,36 @@ function fixLocale(value: RangePickerValue | undefined, localeCode: string) {
   }
 }
 
-export default class RangePicker extends React.Component<any, RangePickerState> {
+class RangePicker extends React.Component<any, RangePickerState> {
   static defaultProps = {
     prefixCls: 'ant-calendar',
     allowClear: true,
     showToday: false,
   };
 
+  static getDerivedStateFromProps(nextProps: any, prevState: any) {
+    let state = null;
+    if ('value' in nextProps) {
+      const value = nextProps.value || [];
+      state = {
+        value,
+      };
+      if (!shallowequal(nextProps.value, prevState.value)) {
+        state = {
+          ...state,
+          showDate: getShowDateFromValue(value) || prevState.showDate,
+        };
+      }
+    }
+    if (('open' in nextProps) && prevState.open !== nextProps.open) {
+      state = {
+        ...state,
+        open: nextProps.open,
+      };
+    }
+    return state;
+  }
+
   private picker: HTMLSpanElement;
 
   constructor(props: any) {
@@ -93,22 +118,6 @@ export default class RangePicker extends React.Component<any, RangePickerState>
     };
   }
 
-  componentWillReceiveProps(nextProps: any) {
-    if ('value' in nextProps) {
-      const state = this.state;
-      const value = nextProps.value || [];
-      this.setState({
-        value,
-        showDate: getShowDateFromValue(value) || state.showDate,
-      });
-    }
-    if ('open' in nextProps) {
-      this.setState({
-        open: nextProps.open,
-      });
-    }
-  }
-
   clearSelection = (e: React.MouseEvent<HTMLElement>) => {
     e.preventDefault();
     e.stopPropagation();
@@ -366,3 +375,7 @@ export default class RangePicker extends React.Component<any, RangePickerState>
     );
   }
 }
+
+polyfill(RangePicker);
+
+export default RangePicker;

components/date-picker/WeekPicker.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import * as moment from 'moment';
+import { polyfill } from 'react-lifecycles-compat';
 import Calendar from 'rc-calendar';
 import RcDatePicker from 'rc-calendar/lib/Picker';
 import classNames from 'classnames';
@@ -10,12 +11,19 @@ function formatValue(value: moment.Moment | null, format: string): string {
   return (value && value.format(format)) || '';
 }
 
-export default class WeekPicker extends React.Component<any, any> {
+class WeekPicker extends React.Component<any, any> {
   static defaultProps = {
     format: 'gggg-wo',
     allowClear: true,
   };
 
+  static getDerivedStateFromProps(nextProps: any) {
+    if ('value' in nextProps) {
+      return { value: nextProps.value };
+    }
+    return null;
+  }
+
   private input: any;
 
   constructor(props: any) {
@@ -31,11 +39,6 @@ export default class WeekPicker extends React.Component<any, any> {
       value,
     };
   }
-  componentWillReceiveProps(nextProps: any) {
-    if ('value' in nextProps) {
-      this.setState({ value: nextProps.value });
-    }
-  }
   weekDateRender = (current: any) => {
     const selectedValue = this.state.value;
     const { prefixCls } = this.props;
@@ -149,3 +152,7 @@ export default class WeekPicker extends React.Component<any, any> {
     );
   }
 }
+
+polyfill(WeekPicker);
+
+export default WeekPicker;

components/date-picker/__tests__/DatePicker.test.js

@@ -165,4 +165,15 @@ describe('DatePicker', () => {
     const input = wrapper.find('.ant-calendar-picker-input').getDOMNode();
     expect(input.getAttribute('role')).toBe('search');
   });
+
+  it('changes year/month when under control', () => {
+    const wrapper = mount(
+      <DatePicker value={moment('2018-07-01')} />
+    );
+    openPanel(wrapper);
+    expect(wrapper.find('.ant-calendar-my-select').text()).toBe('Jul2018');
+    wrapper.find('.ant-calendar-prev-year-btn').simulate('click');
+    wrapper.find('.ant-calendar-prev-month-btn').simulate('click');
+    expect(wrapper.find('.ant-calendar-my-select').text()).toBe('Jun2017');
+  });
 });

components/date-picker/__tests__/RangePicker.test.js

@@ -3,7 +3,7 @@ import { mount, render } from 'enzyme';
 import moment from 'moment';
 import DatePicker from '..';
 import { setMockDate, resetMockDate } from '../../../tests/utils';
-import { selectDate } from './utils';
+import { selectDate, openPanel } from './utils';
 import focusTest from '../../../tests/shared/focusTest';
 
 const { RangePicker } = DatePicker;
@@ -215,4 +215,13 @@ describe('RangePicker', () => {
       wrapper.find('.ant-calendar-input').at(1).simulate('change', { target: { value: '2016-01-01' } })
     )).not.toThrow();
   });
+
+  it('changes year/month when under control', () => {
+    const wrapper = mount(<RangePicker value={[moment('2018-07-01'), moment('2018-07-02')]} />);
+    openPanel(wrapper);
+    expect(wrapper.find('.ant-calendar-my-select').first().text()).toBe('Jul2018');
+    wrapper.find('.ant-calendar-prev-year-btn').first().simulate('click');
+    wrapper.find('.ant-calendar-prev-month-btn').first().simulate('click');
+    expect(wrapper.find('.ant-calendar-my-select').first().text()).toBe('Jun2017');
+  });
 });

components/date-picker/createPicker.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import * as moment from 'moment';
+import { polyfill } from 'react-lifecycles-compat';
 import MonthCalendar from 'rc-calendar/lib/MonthCalendar';
 import RcDatePicker from 'rc-calendar/lib/Picker';
 import classNames from 'classnames';
@@ -15,13 +16,29 @@ export interface PickerProps {
 }
 
 export default function createPicker(TheCalendar: React.ComponentClass): any {
-  return class CalenderWrapper extends React.Component<any, any> {
+  class CalenderWrapper extends React.Component<any, any> {
     static defaultProps = {
       prefixCls: 'ant-calendar',
       allowClear: true,
       showToday: true,
     };
 
+    static getDerivedStateFromProps(nextProps: PickerProps, prevState: any) {
+      let state = null;
+      if ('value' in nextProps) {
+        state = {
+          value: nextProps.value,
+        };
+        if (nextProps.value !== prevState.value) {
+          state = {
+            ...state,
+            showDate: nextProps.value,
+          };
+        }
+      }
+      return state;
+    }
+
     private input: any;
 
     constructor(props: any) {
@@ -39,15 +56,6 @@ export default function createPicker(TheCalendar: React.ComponentClass): any {
       };
     }
 
-    componentWillReceiveProps(nextProps: PickerProps) {
-      if ('value' in nextProps) {
-        this.setState({
-          value: nextProps.value,
-          showDate: nextProps.value,
-        });
-      }
-    }
-
     renderFooter = (...args: any[]) => {
       const { prefixCls, renderExtraFooter } = this.props;
       return renderExtraFooter ? (
@@ -195,5 +203,7 @@ export default function createPicker(TheCalendar: React.ComponentClass): any {
         </span>
       );
     }
-  };
+  }
+  polyfill(CalenderWrapper);
+  return CalenderWrapper;
 }

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

@@ -81,7 +81,7 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker, WeekPicke
 | format | to set the date format, refer to [moment.js](http://momentjs.com/) | string | "YYYY-MM-DD" |
 | renderExtraFooter | render extra footer in panel | () => React.ReactNode | - |
 | showTime | to provide an additional time selection | object\|boolean | [TimePicker Options](/components/time-picker/#API) |
-| showTime.defaultValue | to set default time of selected date, [demo](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/) | moment() |
+| showTime.defaultValue | to set default time of selected date, [demo](#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/) | moment() |
 | showToday | whether to show "Today" button | boolean | true |
 | value | to set date | [moment](http://momentjs.com/) | - |
 | onCalendarChange | a callback function, can be executed when the start time or the end time of the range is changing | function(dates: [moment, moment], dateStrings: [string, string]) | 无 |
@@ -118,7 +118,7 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker, WeekPicke
 | ranges | preseted ranges for quick selection | { \[range: string]: [moment](http://momentjs.com/)\[] } \| () => { \[range: string]: [moment](http://momentjs.com/)\[] } | - |
 | renderExtraFooter | render extra footer in panel | () => React.ReactNode | - |
 | showTime | to provide an additional time selection | object\|boolean | [TimePicker Options](/components/time-picker/#API) |
-| showTime.defaultValue | to set default time of selected date, [demo](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)\[] | [moment(), moment()] |
+| showTime.defaultValue | to set default time of selected date, [demo](#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)\[] | [moment(), moment()] |
 | value | to set date | \[[moment](http://momentjs.com/), [moment](http://momentjs.com/)] | - |
 | onChange | a callback function, can be executed when the selected time is changing | function(dates: [moment, moment], dateStrings: [string, string]) | - |
 | onOk | callback when click ok button | function() | - |

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

@@ -37,7 +37,7 @@ import locale from 'antd/lib/date-picker/locale/zh_CN';
 ```jsx
 // 默认语言为 en-US，如果你需要设置其他语言，推荐在入口文件全局设置 locale
 import moment from 'moment';
-mport 'moment/locale/zh-cn';
+import 'moment/locale/zh-cn';
 
 <DatePicker defaultValue={moment('2015-01-01', 'YYYY-MM-DD')} />
 ```
@@ -81,7 +81,7 @@ mport 'moment/locale/zh-cn';
 | mode | 日期面板的状态 | `time|date|month|year` | 'date' |
 | renderExtraFooter | 在面板中添加额外的页脚 | () => React.ReactNode | - |
 | showTime | 增加时间选择功能 | Object\|boolean | [TimePicker Options](/components/time-picker/#API) |
-| showTime.defaultValue | 设置用户选择日期时默认的时分秒，[例子](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/) | moment() |
+| showTime.defaultValue | 设置用户选择日期时默认的时分秒，[例子](#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/) | moment() |
 | showToday | 是否展示“今天”按钮 | boolean | true |
 | value | 日期 | [moment](http://momentjs.com/) | 无 |
 | onChange | 时间发生变化的回调 | function(date: moment, dateString: string) | 无 |
@@ -118,7 +118,7 @@ mport 'moment/locale/zh-cn';
 | ranges       | 预设时间范围快捷选择 | { \[range: string]: [moment](http://momentjs.com/)\[] } \| () => { \[range: string]: [moment](http://momentjs.com/)\[] } | 无 |
 | renderExtraFooter | 在面板中添加额外的页脚 | () => React.ReactNode | - |
 | showTime | 增加时间选择功能 | Object\|boolean | [TimePicker Options](/components/time-picker/#API) |
-| showTime.defaultValue | 设置用户选择日期时默认的时分秒，[例子](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)\[] | [moment(), moment()] |
+| showTime.defaultValue | 设置用户选择日期时默认的时分秒，[例子](#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)\[] | [moment(), moment()] |
 | value | 日期 | [moment](http://momentjs.com/)\[] | 无 |
 | onCalendarChange | 待选日期发生变化的回调 | function(dates: [moment, moment], dateStrings: [string, string]) | 无 |
 | onChange | 日期范围发生变化的回调 | function(dates: [moment, moment], dateStrings: [string, string]) | 无 |

components/divider/style/index.less

@@ -50,7 +50,6 @@
 
   &-horizontal&-with-text-left,
   &-horizontal&-with-text-right {
-    font-size: @font-size-base;
     .@{divider-prefix-cls}-inner-text {
       display: inline-block;
       padding: 0 10px;

components/drawer/__tests__/Drawer.test.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import { mount } from 'enzyme';
+import { render } from 'enzyme';
 import Drawer from '..';
 
 describe('Drawer', () => {
   it('render correctly', () => {
-    const wrapper = mount(
+    const wrapper = render(
       <Drawer
         visible
         width={400}
@@ -13,11 +13,11 @@ describe('Drawer', () => {
         Here is content of Drawer
       </Drawer>
     );
-    expect(wrapper.render()).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   it('have a title', () => {
-    const wrapper = mount(
+    const wrapper = render(
       <Drawer
         visible
         title="Test Title"
@@ -26,11 +26,11 @@ describe('Drawer', () => {
         Here is content of Drawer
       </Drawer>
     );
-    expect(wrapper.render()).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   it('closable is false', () => {
-    const wrapper = mount(
+    const wrapper = render(
       <Drawer
         visible
         closable={false}
@@ -39,11 +39,11 @@ describe('Drawer', () => {
         Here is content of Drawer
       </Drawer>
     );
-    expect(wrapper.render()).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   it('destroyOnClose is true', () => {
-    const wrapper = mount(
+    const wrapper = render(
       <Drawer
         destroyOnClose
         visible={false}
@@ -52,6 +52,20 @@ describe('Drawer', () => {
         Here is content of Drawer
       </Drawer>
     );
-    expect(wrapper.render()).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('wrapClassName is test_drawer', () => {
+    const wrapper = render(
+      <Drawer
+        destroyOnClose
+        visible={false}
+        wrapClassName="test_drawer"
+        getContainer={false}
+      >
+        Here is content of Drawer
+      </Drawer>
+    );
+    expect(wrapper).toMatchSnapshot();
   });
 });

components/drawer/__tests__/DrawerEvent.test.js

@@ -33,7 +33,6 @@ class DrawerEventTester extends React.Component {
         <Drawer
           visible={visible}
           onClose={this.onClose}
-          destroyOnClose
           getContainer={false}
           {...this.props}
         >
@@ -88,4 +87,26 @@ describe('Drawer', () => {
     wrapper.find('.ant-drawer-mask').simulate('click');
     expect(wrapper.instance().state.visible).toBe(true);
   });
+
+  it('destroyOnClose is true onClose', () => {
+    const wrapper = mount(<DrawerEventTester destroyOnClose />);
+    wrapper.find('button.ant-btn').simulate('click');
+    expect(wrapper.find('.ant-drawer-wrapper-body').exists()).toBe(true);
+
+    wrapper.setState({
+      visible: false,
+    });
+    wrapper.find('.ant-drawer-wrapper-body').simulate('transitionend');
+    expect(wrapper.find('.ant-drawer-wrapper-body').exists()).toBe(false);
+  });
+
+  it('no mask and no closable', () => {
+    const wrapper = mount(<DrawerEventTester destroyOnClose />);
+
+    wrapper.find('button.ant-btn').simulate('click');
+    expect(wrapper.instance().state.visible).toBe(true);
+
+    wrapper.find('.ant-drawer-close').simulate('click');
+    expect(wrapper.instance().state.visible).toBe(false);
+  });
 });

components/drawer/__tests__/MultiDrawer.test.js

@@ -0,0 +1,116 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import Drawer from '..';
+import Button from '../../button';
+
+class MultiDrawer extends React.Component {
+  state = { visible: false, childrenDrawer: false };
+
+  showDrawer = () => {
+    this.setState({
+      visible: true,
+    });
+  };
+
+  onClose = () => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  showChildrenDrawer = () => {
+    this.setState({
+      childrenDrawer: true,
+    });
+  };
+
+  onChildrenDrawerClose = () => {
+    this.setState({
+      childrenDrawer: false,
+    });
+  };
+
+  render() {
+    const { childrenDrawer, visible } = this.state;
+    const { placement } = this.props;
+    return (
+      <div>
+        <Button type="primary" id="open_drawer" onClick={this.showDrawer}>
+          Open drawer
+        </Button>
+        <Drawer
+          title="Multi-level drawer"
+          wrapClassName="test_drawer"
+          width={520}
+          closable={false}
+          onClose={this.onClose}
+          getContainer={false}
+          placement={placement}
+          visible={visible}
+        >
+          <Button type="primary" id="open_two_drawer" onClick={this.showChildrenDrawer}>
+              Two-level drawer
+          </Button>
+          <Drawer
+            title="Two-level Drawer"
+            width={320}
+            closable={false}
+            getContainer={false}
+            placement={placement}
+            onClose={this.onChildrenDrawerClose}
+            visible={childrenDrawer}
+          >
+            <div id="two_drawer_text">
+              This is two-level drawer
+            </div>
+          </Drawer>
+          <div
+            style={{
+              position: 'absolute',
+              bottom: 0,
+              width: '100%',
+              borderTop: '1px solid #e8e8e8',
+              padding: '10px 16px',
+              textAlign: 'right',
+              left: 0,
+              background: '#fff',
+              borderRadius: '0 0 4px 4px',
+            }}
+          >
+            <Button
+              style={{
+                marginRight: 8,
+              }}
+              onClick={this.onClose}
+            >
+              Cancel
+            </Button>
+            <Button onClick={this.onClose} type="primary">
+              Submit
+            </Button>
+          </div>
+        </Drawer>
+      </div>
+    );
+  }
+}
+
+describe('Drawer', () => {
+  it('render right MultiDrawer', () => {
+    const wrapper = mount(<MultiDrawer placement="right" />);
+    wrapper.find('button#open_drawer').simulate('click');
+    wrapper.find('button#open_two_drawer').simulate('click');
+    const translateX = wrapper.find('.ant-drawer.test_drawer').get(0).props.style.transform;
+    expect(translateX).toEqual('translateX(-180px)');
+    expect(wrapper.find('#two_drawer_text').exists()).toBe(true);
+  });
+
+  it('render right MultiDrawer', () => {
+    const wrapper = mount(<MultiDrawer placement="left" />);
+    wrapper.find('button#open_drawer').simulate('click');
+    wrapper.find('button#open_two_drawer').simulate('click');
+    const translateX = wrapper.find('.ant-drawer.test_drawer').get(0).props.style.transform;
+    expect(translateX).toEqual('translateX(180px)');
+    expect(wrapper.find('#two_drawer_text').exists()).toBe(true);
+  });
+});

components/drawer/__tests__/__snapshots__/Drawer.test.js.snap

@@ -5,19 +5,21 @@ exports[`Drawer closable is false 1`] = `
   class=""
 >
   <div
-    class="ant-drawer ant-drawer-right ant-drawer-open"
+    class="ant-drawer ant-drawer-right"
   >
     <div
       class="ant-drawer-mask"
     />
     <div
       class="ant-drawer-content-wrapper"
+      style="transform:translateX(100%);width:256px"
     >
       <div
         class="ant-drawer-content"
       >
         <div
-          style="overflow: auto; height: 100%; width: 256px;"
+          class="ant-drawer-wrapper-body"
+          style="overflow:auto;height:100%"
         >
           <div
             class="ant-drawer-body"
@@ -43,10 +45,30 @@ exports[`Drawer destroyOnClose is true 1`] = `
     />
     <div
       class="ant-drawer-content-wrapper"
+      style="transform:translateX(100%);width:256px"
     >
       <div
         class="ant-drawer-content"
-      />
+      >
+        <div
+          class="ant-drawer-wrapper-body"
+          style="overflow:auto;height:100%;opacity:0;transition:opacity .3s"
+        >
+          <button
+            aria-label="Close"
+            class="ant-drawer-close"
+          >
+            <span
+              class="ant-drawer-close-x"
+            />
+          </button>
+          <div
+            class="ant-drawer-body"
+          >
+            Here is content of Drawer
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
@@ -57,19 +79,21 @@ exports[`Drawer have a title 1`] = `
   class=""
 >
   <div
-    class="ant-drawer ant-drawer-right ant-drawer-open"
+    class="ant-drawer ant-drawer-right"
   >
     <div
       class="ant-drawer-mask"
     />
     <div
       class="ant-drawer-content-wrapper"
+      style="transform:translateX(100%);width:256px"
     >
       <div
         class="ant-drawer-content"
       >
         <div
-          style="overflow: auto; height: 100%; width: 256px;"
+          class="ant-drawer-wrapper-body"
+          style="overflow:auto;height:100%"
         >
           <div
             class="ant-drawer-header"
@@ -105,19 +129,62 @@ exports[`Drawer render correctly 1`] = `
   class=""
 >
   <div
-    class="ant-drawer ant-drawer-right ant-drawer-open"
+    class="ant-drawer ant-drawer-right"
   >
     <div
       class="ant-drawer-mask"
     />
     <div
       class="ant-drawer-content-wrapper"
+      style="transform:translateX(100%);width:400px"
     >
       <div
         class="ant-drawer-content"
       >
         <div
-          style="overflow: auto; height: 100%; width: 400px;"
+          class="ant-drawer-wrapper-body"
+          style="overflow:auto;height:100%"
+        >
+          <button
+            aria-label="Close"
+            class="ant-drawer-close"
+          >
+            <span
+              class="ant-drawer-close-x"
+            />
+          </button>
+          <div
+            class="ant-drawer-body"
+          >
+            Here is content of Drawer
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Drawer wrapClassName is test_drawer 1`] = `
+<div
+  class=""
+>
+  <div
+    class="ant-drawer ant-drawer-right test_drawer"
+  >
+    <div
+      class="ant-drawer-mask"
+    />
+    <div
+      class="ant-drawer-content-wrapper"
+      style="transform:translateX(100%);width:256px"
+    >
+      <div
+        class="ant-drawer-content"
+      >
+        <div
+          class="ant-drawer-wrapper-body"
+          style="overflow:auto;height:100%;opacity:0;transition:opacity .3s"
         >
           <button
             aria-label="Close"

components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap

@@ -21,12 +21,14 @@ exports[`Drawer render correctly 1`] = `
       />
       <div
         class="ant-drawer-content-wrapper"
+        style="width: 256px;"
       >
         <div
           class="ant-drawer-content"
         >
           <div
-            style="overflow: auto; height: 100%; width: 256px;"
+            class="ant-drawer-wrapper-body"
+            style="overflow: auto; height: 100%;"
           >
             <button
               aria-label="Close"

components/drawer/demo/multi-level-drawer.md

@@ -52,16 +52,16 @@ class App extends React.Component {
         <Drawer
           title="Multi-level drawer"
           width={520}
+          wrapClassName="test_drawer"
           closable={false}
           onClose={this.onClose}
           visible={this.state.visible}
-          push={this.state.childrenDrawer}
         >
           <Button type="primary" onClick={this.showChildrenDrawer}>
               Two-level drawer
           </Button>
           <Drawer
-            title="Food"
+            title="Two-level Drawer"
             width={320}
             closable={false}
             onClose={this.onChildrenDrawerClose}

components/drawer/index.tsx

@@ -2,7 +2,6 @@ import * as React from 'react';
 import RcDrawer from 'rc-drawer';
 import PropTypes from 'prop-types';
 import createReactContext, { Context } from 'create-react-context';
-import isNumeric from '../_util/isNumeric';
 
 const DrawerContext: Context<Drawer | null> = createReactContext(null);
 
@@ -73,6 +72,7 @@ export default class Drawer extends React.Component<DrawerProps, IDrawerState> {
   };
 
   praentDrawer: Drawer;
+  destoryClose: boolean;
   public componentDidUpdate(preProps: DrawerProps) {
     if (preProps.visible !== this.props.visible && this.praentDrawer) {
       if (this.props.visible) {
@@ -106,11 +106,38 @@ export default class Drawer extends React.Component<DrawerProps, IDrawerState> {
       push: false,
     });
   }
+  onDestoryTransitionEnd = () => {
+    const isDestroyOnClose = this.getDestoryOnClose();
+    if (!isDestroyOnClose) {
+      return;
+    }
+    if (!this.props.visible) {
+      this.destoryClose = true;
+      this.forceUpdate();
+    }
+  }
+
+  getDestoryOnClose = () => (this.props.destroyOnClose && !this.props.visible);
+
   renderBody = () => {
-    const { destroyOnClose, visible, width, placement } = this.props;
-    if (destroyOnClose && !visible) {
+    if (this.destoryClose && !this.props.visible) {
       return null;
     }
+    this.destoryClose = false;
+    const { placement } = this.props;
+
+    const containerStyle: React.CSSProperties = placement === 'left'
+      || placement === 'right' ? {
+        overflow: 'auto',
+        height: '100%',
+      } : {};
+
+    const isDestroyOnClose = this.getDestoryOnClose();
+    if (isDestroyOnClose) {
+      // Increase the opacity transition, delete children after closing.
+      containerStyle.opacity = 0;
+      containerStyle.transition = 'opacity .3s';
+    }
     const { prefixCls, title, closable } = this.props;
     let header;
     if (title) {
@@ -132,16 +159,13 @@ export default class Drawer extends React.Component<DrawerProps, IDrawerState> {
         </button>
       );
     }
-    let containerStyle: React.CSSProperties = { width };
-    if (placement === 'left' || placement === 'right') {
-      containerStyle = {
-        overflow: 'auto',
-        height: '100%',
-        width,
-      };
-    }
+
     return (
-      <div style={containerStyle}>
+      <div
+        className={`${prefixCls}-wrapper-body`}
+        style={containerStyle}
+        onTransitionEnd={this.onDestoryTransitionEnd}
+      >
         {header}
         {closer}
         <div className={`${prefixCls}-body`} style={this.props.style}>
@@ -151,15 +175,12 @@ export default class Drawer extends React.Component<DrawerProps, IDrawerState> {
     );
   }
   renderProvider = (value: Drawer) => {
-    let { width, zIndex, style, placement, ...rest } = this.props;
-    if (isNumeric(width)) {
-      width = `${width}px`;
-    }
+    let { zIndex, style, placement, ...rest } = this.props;
     const RcDrawerStyle = this.state.push
       ? {
-          zIndex,
-          transform: `translateX(${placement === 'left' ? 180 : -180}px)`,
-        }
+        zIndex,
+        transform: `translateX(${placement === 'left' ? 180 : -180}px)`,
+      }
       : { zIndex };
     this.praentDrawer = value;
     return (
@@ -172,6 +193,7 @@ export default class Drawer extends React.Component<DrawerProps, IDrawerState> {
           showMask={this.props.mask}
           placement={placement}
           style={RcDrawerStyle}
+          className={this.props.wrapClassName}
         >
           {this.renderBody()}
         </RcDrawer>

components/drawer/style/drawer.less

@@ -8,10 +8,10 @@
   width: 100%;
   height: 100%;
   pointer-events: none;
-  z-index: 99999;
-  transition: transform .3s @ease-in-out-circ;
-  >* {
-    transition: transform .3s @ease-in-out-circ;
+  z-index: @zindex-modal;
+  transition: transform 0.3s @ease-in-out-circ;
+  > * {
+    transition: transform 0.3s @ease-in-out-circ;
   }
 
   &-content-wrapper {
@@ -27,10 +27,8 @@
   }
   &-left {
     &.@{dawer-prefix-cls}-open {
-      .@{dawer-prefix-cls} {
-        &-wrapper {
-          box-shadow: 2px 0 8px rgba(0, 0, 0, 0.15);
-        }
+      .@{dawer-prefix-cls}-content-wrapper {
+        box-shadow: @shadow-1-right;
       }
     }
   }
@@ -41,10 +39,8 @@
       }
     }
     &.@{dawer-prefix-cls}-open {
-      & .@{dawer-prefix-cls} {
-        &-wrapper {
-          box-shadow: -2px 0 8px rgba(0, 0, 0, 0.15);
-        }
+      .@{dawer-prefix-cls}-content-wrapper {
+        box-shadow: @shadow-1-left;
       }
     }
   }
@@ -140,7 +136,7 @@
     opacity: 0;
     background-color: @modal-mask-bg;
     height: 100%;
-    transition: opacity .3s  @ease-in-out-circ;
+    transition: opacity 0.3s @ease-in-out-circ;
     filter: ~"alpha(opacity=50)";
   }
 
@@ -151,4 +147,3 @@
     }
   }
 }
-

components/form/style/index.less

@@ -236,8 +236,13 @@ form {
     margin-left: 0;
   }
 
-  .@{ant-prefix}-input-number + .@{form-prefix-cls}-text {
-    margin-left: 8px;
+  .@{ant-prefix}-input-number {
+    + .@{form-prefix-cls}-text {
+      margin-left: 8px;
+    }
+    &-handler-wrap {
+      z-index: 2; // https://github.com/ant-design/ant-design/issues/6289
+    }
   }
 
   .@{ant-prefix}-select,

components/input-number/style/index.less

@@ -109,7 +109,6 @@
     opacity: 0;
     border-radius: 0 @border-radius-base @border-radius-base 0;
     transition: opacity 0.24s linear 0.1s;
-    z-index: 2; // https://github.com/ant-design/ant-design/issues/6289
   }
 
   &-handler-wrap:hover &-handler {

components/layout/Sider.tsx

@@ -19,6 +19,7 @@ import classNames from 'classnames';
 import omit from 'omit.js';
 import PropTypes from 'prop-types';
 import Icon from '../icon';
+import isNumeric from '../_util/isNumeric';
 
 const dimensionMap = {
   xs: '480px',
@@ -66,10 +67,6 @@ const generateId = (() => {
   };
 })();
 
-const isNumeric = (n: any) => {
-  return !isNaN(parseFloat(n)) && isFinite(n);
-};
-
 export default class Sider extends React.Component<SiderProps, SiderState> {
   static __ANT_LAYOUT_SIDER: any = true;
 

components/layout/index.zh-CN.md

@@ -100,7 +100,6 @@ title: Layout
 | trigger | 自定义 trigger，设置为 null 时隐藏 trigger | string\|ReactNode | - |
 | width | 宽度 | number\|string | 200 |
 | onCollapse | 展开-收起时的回调函数，有点击 trigger 以及响应式反馈两种方式可以触发 | (collapsed, type) => {} | - |
-| theme | 主题颜色 | string: `light` `dark` | `dark` |
 | onBreakpoint | 触发响应式布局[断点](/components/grid#api)时的回调 | (broken) => {} | - |
 
 #### breakpoint width

components/mention/index.tsx

@@ -10,20 +10,21 @@ export interface MentionProps {
   prefixCls?: string;
   suggestionStyle?: React.CSSProperties;
   suggestions?: Array<any>;
-  onSearchChange?: Function;
-  onChange?: Function;
+  onSearchChange?: (value: string, trigger: string) => any;
+  onChange?: (contentState: any) => any;
   notFoundContent?: any;
-  loading?: Boolean;
+  loading?: boolean;
   style?: React.CSSProperties;
   defaultValue?: any;
   value?: any;
   className?: string;
-  multiLines?: Boolean;
-  prefix?: string;
+  multiLines?: boolean;
+  prefix?: string | string[];
   placeholder?: string;
   getSuggestionContainer?: (triggerNode: Element) => HTMLElement;
   onFocus?: React.FocusEventHandler<HTMLElement>;
   onBlur?: React.FocusEventHandler<HTMLElement>;
+  onSelect?: (suggestion: string, data?: any) => any;
   readOnly?: boolean;
   disabled?: boolean;
   placement?: MentionPlacement;

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

@@ -33,9 +33,7 @@ exports[`renders ./components/menu/demo/horizontal.md correctly 1`] = `
       aria-haspopup="true"
       class="ant-menu-submenu-title"
     >
-      <span
-        class="submenu-title-wrapper"
-      >
+      <span>
         <i
           class="anticon anticon-setting"
         />

components/menu/__tests__/index.test.js

@@ -85,7 +85,6 @@ describe('Menu', () => {
     wrapper.update();
     expect(wrapper.find('.ant-menu-sub').hostNodes().at(0).hasClass('ant-menu-hidden')).toBe(true);
     wrapper.setProps({ openKeys: ['1'] });
-    wrapper.update();
     expect(wrapper.find('.ant-menu-sub').hostNodes().at(0).hasClass('ant-menu-hidden')).not.toBe(true);
   });
 
@@ -104,7 +103,6 @@ describe('Menu', () => {
     wrapper.update();
     expect(wrapper.find('.ant-menu-sub').hostNodes().at(0).hasClass('ant-menu-hidden')).toBe(true);
     wrapper.setProps({ openKeys: ['1'] });
-    wrapper.update();
     expect(wrapper.find('.ant-menu-sub').hostNodes().at(0).hasClass('ant-menu-hidden')).not.toBe(true);
   });
 
@@ -123,7 +121,6 @@ describe('Menu', () => {
     wrapper.update();
     expect(wrapper.find('.ant-menu-sub').hostNodes().at(0).hasClass('ant-menu-hidden')).toBe(true);
     wrapper.setProps({ openKeys: ['1'] });
-    wrapper.update();
     expect(wrapper.find('.ant-menu-sub').hostNodes().at(0).hasClass('ant-menu-hidden')).not.toBe(true);
   });
 

components/menu/demo/horizontal.md

@@ -44,7 +44,7 @@ class App extends React.Component {
         <Menu.Item key="app" disabled>
           <Icon type="appstore" />Navigation Two
         </Menu.Item>
-        <SubMenu title={<span className="submenu-title-wrapper"><Icon type="setting" />Navigation Three - Submenu</span>}>
+        <SubMenu title={<span><Icon type="setting" />Navigation Three - Submenu</span>}>
           <MenuItemGroup title="Item 1">
             <Menu.Item key="setting:1">Option 1</Menu.Item>
             <Menu.Item key="setting:2">Option 2</Menu.Item>

components/menu/style/dark.less

@@ -24,13 +24,15 @@
   }
 
   &-dark&-horizontal {
-    border-bottom-color: @menu-dark-bg;
+    border-bottom: 0;
   }
 
   &-dark&-horizontal > &-item,
   &-dark&-horizontal > &-submenu {
     border-color: @menu-dark-bg;
     border-bottom: 0;
+    top: 0;
+    margin-top: 0;
   }
 
   &-dark&-horizontal > &-item > a:before {

components/menu/style/index.less

@@ -179,10 +179,6 @@
       position: absolute;
       border-radius: @border-radius-base;
       z-index: @zindex-dropdown;
-
-      .submenu-title-wrapper {
-        padding-right: 20px;
-      }
     }
 
     > .@{menu-prefix-cls} {
@@ -266,13 +262,12 @@
     border-bottom: @border-width-base @border-style-base @border-color-split;
     box-shadow: none;
     line-height: 46px;
-    white-space: nowrap;
 
     > .@{menu-prefix-cls}-item,
     > .@{menu-prefix-cls}-submenu {
       position: relative;
       top: 1px;
-      display: inline-block;
+      float: left;
       border-bottom: 2px solid transparent;
 
       &:hover,

components/message/style/index.less

@@ -21,7 +21,7 @@
   }
 
   &-notice-content {
-    padding: 10px 16px;
+    padding: @message-notice-content-padding;
     border-radius: @border-radius-base;
     box-shadow: @shadow-2;
     background: @component-background;

components/modal/style/confirm.less

@@ -24,7 +24,7 @@
       color: @heading-color;
       font-weight: 500;
       font-size: @font-size-lg;
-      line-height: 22px;
+      line-height: 1.4;
       display: block;
       // create BFC to avoid
       // https://user-images.githubusercontent.com/507615/37702510-ba844e06-2d2d-11e8-9b67-8e19be57f445.png

components/notification/index.en-US.md

@@ -24,6 +24,7 @@ used in the following cases:
 - `notification.info(config)`
 - `notification.warning(config)`
 - `notification.warn(config)`
+- `notification.open(config)`
 - `notification.close(key: String)`
 - `notification.destroy()`
 

components/notification/index.zh-CN.md

@@ -23,6 +23,7 @@ subtitle: 通知提醒框
 - `notification.info(config)`
 - `notification.warning(config)`
 - `notification.warn(config)`
+- `notification.open(config)`
 - `notification.close(key: String)`
 - `notification.destroy()`
 

components/radio/group.tsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import shallowEqual from 'shallowequal';
 import Radio from './radio';
-import { RadioGroupProps, RadioGroupState, RadioChangeEvent } from './interface';
+import { RadioGroupProps, RadioGroupState, RadioChangeEvent, RadioGroupButtonStyle } from './interface';
 
 function getCheckedValue(children: React.ReactNode) {
   let value = null;
@@ -21,7 +21,7 @@ export default class RadioGroup extends React.Component<RadioGroupProps, RadioGr
   static defaultProps = {
     disabled: false,
     prefixCls: 'ant-radio',
-    buttonStyle: 'outline',
+    buttonStyle: 'outline' as RadioGroupButtonStyle,
   };
 
   static childContextTypes = {

components/radio/interface.tsx

@@ -2,6 +2,8 @@ import * as React from 'react';
 import { AbstractCheckboxGroupProps } from '../checkbox/Group';
 import { AbstractCheckboxProps } from '../checkbox/Checkbox';
 
+export type RadioGroupButtonStyle = 'outline' | 'solid';
+
 export interface RadioGroupProps extends AbstractCheckboxGroupProps {
   defaultValue?: any;
   value?: any;
@@ -12,7 +14,7 @@ export interface RadioGroupProps extends AbstractCheckboxGroupProps {
   name?: string;
   children?: React.ReactNode;
   id?: string;
-  buttonStyle?: 'outline' | 'solid';
+  buttonStyle?: RadioGroupButtonStyle;
 }
 
 export interface RadioGroupState {

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

@@ -407,16 +407,11 @@ exports[`renders ./components/select/demo/search-box.md correctly 1`] = `
     >
       <div
         class="ant-select-selection__placeholder"
-        style="display:none;user-select:none;-webkit-user-select:none"
+        style="display:block;user-select:none;-webkit-user-select:none"
         unselectable="on"
       >
         input search text
       </div>
-      <div
-        class="ant-select-selection-selected-value"
-        style="display:block;opacity:1"
-        title=""
-      />
       <div
         class="ant-select-search ant-select-search--inline"
         style="display:none"

components/select/demo/search-box.md

@@ -58,7 +58,7 @@ function fetch(value, callback) {
 class SearchInput extends React.Component {
   state = {
     data: [],
-    value: '',
+    value: undefined,
   }
 
   handleSearch = (value) => {

components/select/index.en-US.md

@@ -26,7 +26,7 @@ Select component to select value from options.
 | allowClear | Show clear button. | boolean | false |
 | autoFocus | Get focus by default | boolean | false |
 | defaultActiveFirstOption | Whether active first option by default | boolean | true |
-| defaultValue | Initial selected option. | string\|number\|string\[]\|number\[] | - |
+| defaultValue | Initial selected option. | string\|string\[]<br />number\|number\[] | - |
 | disabled | Whether disabled select | boolean | false |
 | dropdownClassName | className of dropdown menu | string | - |
 | dropdownMatchSelectWidth | Whether dropdown's width is same with select. | boolean | true |

components/select/index.tsx

@@ -49,6 +49,8 @@ export interface SelectProps extends AbstractSelectProps {
   onFocus?: () => any;
   onPopupScroll?: () => any;
   onInputKeyDown?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+  onMouseEnter?: (e: React.MouseEvent<HTMLInputElement>) => any;
+  onMouseLeave?: (e: React.MouseEvent<HTMLInputElement>) => any;
   maxTagCount?: number;
   maxTagPlaceholder?: React.ReactNode | ((omittedValues: SelectValue[]) => React.ReactNode);
   optionFilterProp?: string;

components/select/index.zh-CN.md

@@ -27,7 +27,7 @@ title: Select
 | allowClear | 支持清除 | boolean | false |
 | autoFocus | 默认获取焦点 | boolean | false |
 | defaultActiveFirstOption | 是否默认高亮第一个选项。 | boolean | true |
-| defaultValue | 指定默认选中的条目 | string\|string\[]\|number\|number\[] | - |
+| defaultValue | 指定默认选中的条目 | string\|string\[]<br />number\|number\[] | - |
 | disabled | 是否禁用 | boolean | false |
 | dropdownClassName | 下拉菜单的 className 属性 | string | - |
 | dropdownMatchSelectWidth | 下拉菜单和选择器同宽 | boolean | true |

components/select/style/index.less

@@ -38,6 +38,7 @@
   .reset-component;
   display: inline-block;
   position: relative;
+  outline: 0;
 
   ul,
   ol {
@@ -480,6 +481,11 @@
       font-size: @font-size-sm;
     }
 
+    &-item-group-list &-item:first-child:not(:last-child),
+    &-item-group:not(:last-child) &-item-group-list &-item:last-child {
+      border-radius: 0;
+    }
+
     &-item {
       position: relative;
       display: block;

components/style/themes/default.less

@@ -482,4 +482,8 @@
 @collapse-content-padding:            @padding-md;
 @collapse-content-bg:                 @component-background;
 
+// Message
+// ---
+@message-notice-content-padding:      10px 16px;
+
 @import "./default.deperated.less";

components/switch/style/index.less

@@ -104,23 +104,16 @@
   }
 
   &-small&-checked {
-    &:before,
-    &:after {
+    &:before {
       left: 100%;
       margin-left: @switch-sm-checked-margin-left;
     }
-
     .@{switch-prefix-cls}-inner {
       margin-left: 3px;
       margin-right: 18px;
     }
   }
 
-  &-small:active&-checked:before,
-  &-small:active&-checked:after {
-    margin-left: -16.5px;
-  }
-
   &-small&-loading:before {
     animation: AntSwitchSmallLoadingCircle 1s infinite linear;
     font-weight: bold;
@@ -134,15 +127,15 @@
       margin-right: 24px;
     }
 
-    &:before,
-    &:after {
+    &:before {
       left: 100%;
       margin-left: -19px;
     }
 
-    &:active:before,
-    &:active:after {
-      margin-left: -25px;
+    &:after {
+      left: 100%;
+      transform: translateX(-100%);
+      margin-left: -1px;
     }
   }
 

components/table/Table.tsx

@@ -626,7 +626,8 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
     const recordKey = (typeof rowKey === 'function') ?
       rowKey(record, index) :  (record as any)[rowKey as string];
     warning(recordKey !== undefined,
-      'Each record in dataSource of table should have a unique `key` prop, or set `rowKey` to an unique primary key,' +
+      'Each record in dataSource of table should have a unique `key` prop, ' +
+      'or set `rowKey` of Table to an unique primary key, ' +
       'see https://u.ant.design/table-row-key',
     );
     return recordKey === undefined ? index : recordKey;

components/table/__tests__/Table.filter.test.js

@@ -223,6 +223,16 @@ describe('Table.filter', () => {
     expect(handleChange).toBeCalledWith({}, { name: ['boy'] }, {});
   });
 
+  it('should not fire change event on close filterDropdown without changing anything', () => {
+    const handleChange = jest.fn();
+    const wrapper = mount(createTable({ onChange: handleChange }));
+    const dropdownWrapper = mount(wrapper.find('Trigger').instance().getComponent());
+
+    dropdownWrapper.find('.clear').simulate('click');
+
+    expect(handleChange).not.toHaveBeenCalled();
+  });
+
   it('three levels menu', () => {
     const filters = [
       { text: 'Upper', value: 'Upper' },

components/table/__tests__/__snapshots__/Table.filter.test.js.snap

@@ -109,6 +109,7 @@ exports[`Table.filter renders filter correctly 1`] = `
               >
                 <tr
                   class="ant-table-row  ant-table-row-level-0"
+                  data-row-key="0"
                 >
                   <td
                     class="ant-table-column-has-filters"
@@ -122,6 +123,7 @@ exports[`Table.filter renders filter correctly 1`] = `
                 </tr>
                 <tr
                   class="ant-table-row  ant-table-row-level-0"
+                  data-row-key="1"
                 >
                   <td
                     class="ant-table-column-has-filters"
@@ -135,6 +137,7 @@ exports[`Table.filter renders filter correctly 1`] = `
                 </tr>
                 <tr
                   class="ant-table-row  ant-table-row-level-0"
+                  data-row-key="2"
                 >
                   <td
                     class="ant-table-column-has-filters"
@@ -148,6 +151,7 @@ exports[`Table.filter renders filter correctly 1`] = `
                 </tr>
                 <tr
                   class="ant-table-row  ant-table-row-level-0"
+                  data-row-key="3"
                 >
                   <td
                     class="ant-table-column-has-filters"

components/table/__tests__/__snapshots__/Table.pagination.test.js.snap

@@ -43,6 +43,7 @@ exports[`Table.pagination renders pagination correctly 1`] = `
               >
                 <tr
                   class="ant-table-row  ant-table-row-level-0"
+                  data-row-key="0"
                 >
                   <td
                     class=""
@@ -56,6 +57,7 @@ exports[`Table.pagination renders pagination correctly 1`] = `
                 </tr>
                 <tr
                   class="ant-table-row  ant-table-row-level-0"
+                  data-row-key="1"
                 >
                   <td
                     class=""

components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap

@@ -72,6 +72,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                 >
                   <tr
                     class="ant-table-row  ant-table-row-level-0"
+                    data-row-key="0"
                   >
                     <td
                       class="ant-table-fixed-columns-in-body ant-table-selection-column"
@@ -106,6 +107,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   </tr>
                   <tr
                     class="ant-table-row  ant-table-row-level-0"
+                    data-row-key="1"
                   >
                     <td
                       class="ant-table-fixed-columns-in-body ant-table-selection-column"
@@ -140,6 +142,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   </tr>
                   <tr
                     class="ant-table-row  ant-table-row-level-0"
+                    data-row-key="2"
                   >
                     <td
                       class="ant-table-fixed-columns-in-body ant-table-selection-column"
@@ -174,6 +177,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   </tr>
                   <tr
                     class="ant-table-row  ant-table-row-level-0"
+                    data-row-key="3"
                   >
                     <td
                       class="ant-table-fixed-columns-in-body ant-table-selection-column"
@@ -262,6 +266,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                   >
                     <tr
                       class="ant-table-row  ant-table-row-level-0"
+                      data-row-key="0"
                     >
                       <td
                         class="ant-table-selection-column"
@@ -287,6 +292,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                     </tr>
                     <tr
                       class="ant-table-row  ant-table-row-level-0"
+                      data-row-key="1"
                     >
                       <td
                         class="ant-table-selection-column"
@@ -312,6 +318,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                     </tr>
                     <tr
                       class="ant-table-row  ant-table-row-level-0"
+                      data-row-key="2"
                     >
                       <td
                         class="ant-table-selection-column"
@@ -337,6 +344,7 @@ exports[`Table.rowSelection fix selection column on the left 1`] = `
                     </tr>
                     <tr
                       class="ant-table-row  ant-table-row-level-0"
+                      data-row-key="3"
                     >
                       <td
                         class="ant-table-selection-column"

components/table/__tests__/__snapshots__/Table.test.js.snap

@@ -70,6 +70,7 @@ exports[`Table renders JSX correctly 1`] = `
               >
                 <tr
                   class="ant-table-row  ant-table-row-level-0"
+                  data-row-key="1"
                 >
                   <td
                     class=""
@@ -93,6 +94,7 @@ exports[`Table renders JSX correctly 1`] = `
                 </tr>
                 <tr
                   class="ant-table-row  ant-table-row-level-0"
+                  data-row-key="2"
                 >
                   <td
                     class=""

components/table/demo/edit-row.md

@@ -162,7 +162,7 @@ class EditableTable extends React.Component {
         });
         this.setState({ data: newData, editingKey: '' });
       } else {
-        newData.push(data);
+        newData.push(row);
         this.setState({ data: newData, editingKey: '' });
       }
     });

components/table/filterDropdown.tsx

@@ -108,8 +108,10 @@ export default class FilterMenu<T> extends React.Component<FilterMenuProps<T>, F
   }
 
   confirmFilter() {
-    if (this.state.selectedKeys !== this.props.selectedKeys) {
-      this.props.confirmFilter(this.props.column, this.state.selectedKeys);
+    const { selectedKeys } = this.state;
+
+    if (!shallowequal(selectedKeys, this.props.selectedKeys)) {
+      this.props.confirmFilter(this.props.column, selectedKeys);
     }
   }
 

components/table/index.zh-CN.md

@@ -160,7 +160,7 @@ const columns = [{
 | selectedRowKeys | 指定选中项的 key 数组，需要和 onChange 进行配合 | string\[] | \[] |
 | selections | 自定义选择项 [配置项](#selection), 设为 `true` 时使用默认选择项 | object\[]\|boolean | true |
 | type | 多选/单选，`checkbox` or `radio` | string | `checkbox` |
-| onChange | 选中项发生变化的时的回调 | Function(selectedRowKeys, selectedRows) | - |
+| onChange | 选中项发生变化时的回调 | Function(selectedRowKeys, selectedRows) | - |
 | onSelect | 用户手动选择/取消选择某列的回调 | Function(record, selected, selectedRows, nativeEvent) | - |
 | onSelectAll | 用户手动选择/取消选择所有列的回调 | Function(selected, selectedRows, changeRows) | - |
 | onSelectInvert | 用户手动选择反选的回调 | Function(selectedRows) | - |

components/table/interface.tsx

@@ -106,7 +106,7 @@ export interface TableProps<T> {
   onExpandedRowsChange?: (expandedRowKeys: string[] | number[]) => void;
   onExpand?: (expanded: boolean, record: T) => void;
   onChange?: (
-    pagination: PaginationConfig | boolean,
+    pagination: PaginationConfig,
     filters: Record<keyof T, string[]>,
     sorter: SorterResult<T>,
   ) => void;

components/tooltip/style/index.less

@@ -47,6 +47,7 @@
     border-radius: @border-radius-base;
     box-shadow: @box-shadow-base;
     min-height: 32px;
+    word-break: break-all;
   }
 
   // Arrows

components/tree-select/interface.tsx

@@ -4,7 +4,11 @@ import { AbstractSelectProps } from '../select';
 export interface TreeData {
   key: string;
   value: string;
-  label: React.ReactNode;
+  /**
+   * @deprecated Please use `title` instead.
+   */
+  label?: React.ReactNode;
+  title?: React.ReactNode;
   children?: TreeData[];
 }
 

components/tree/DirectoryTree.tsx

@@ -158,6 +158,7 @@ export default class DirectoryTree extends React.Component<DirectoryTreeProps, D
 
   expandFolderNode = (event: React.MouseEvent<HTMLElement>, node: AntTreeNode) => {
     const { expandedKeys = [] } = this.state;
+    const { onExpand } = this.props;
     const { eventKey = '', expanded, isLeaf } = node.props;
 
     if (isLeaf || event.shiftKey || event.metaKey || event.ctrlKey) {
@@ -176,6 +177,14 @@ export default class DirectoryTree extends React.Component<DirectoryTreeProps, D
     this.setUncontrolledState({
       expandedKeys: newExpandedKeys,
     });
+
+    if (onExpand) {
+      onExpand(newExpandedKeys, {
+        expanded: !expanded,
+        node,
+        nativeEvent: event.nativeEvent,
+      });
+    }
   }
 
   setUncontrolledState = (state: DirectoryTreeState) => {

components/tree/__tests__/__snapshots__/directory.test.js.snap

@@ -664,6 +664,132 @@ exports[`Directory Tree expand double click 2`] = `
 </ul>
 `;
 
+exports[`Directory Tree expand with state control click 1`] = `
+<ul
+  class="ant-tree ant-tree-directory"
+  role="tree-node"
+  unselectable="on"
+>
+  <li
+    class="ant-tree-treenode-switcher-open ant-tree-treenode-selected"
+  >
+    <span
+      class="ant-tree-switcher ant-tree-switcher_open"
+    />
+    <span
+      class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open ant-tree-node-selected"
+      title="parent"
+    >
+      <span
+        class="ant-tree-iconEle ant-tree-icon__customize"
+      >
+        <i
+          class="anticon anticon-folder-open"
+        />
+      </span>
+      <span
+        class="ant-tree-title"
+      >
+        parent
+      </span>
+    </span>
+    <ul
+      class="ant-tree-child-tree ant-tree-child-tree-open"
+      data-expanded="true"
+      style=""
+    >
+      <li
+        class="ant-tree-treenode-switcher-close"
+      >
+        <span
+          class="ant-tree-switcher ant-tree-switcher-noop"
+        />
+        <span
+          class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
+          title="children"
+        >
+          <span
+            class="ant-tree-iconEle ant-tree-icon__customize"
+          >
+            <i
+              class="anticon anticon-folder"
+            />
+          </span>
+          <span
+            class="ant-tree-title"
+          >
+            children
+          </span>
+        </span>
+      </li>
+    </ul>
+  </li>
+</ul>
+`;
+
+exports[`Directory Tree expand with state control doubleClick 1`] = `
+<ul
+  class="ant-tree ant-tree-directory"
+  role="tree-node"
+  unselectable="on"
+>
+  <li
+    class="ant-tree-treenode-switcher-open"
+  >
+    <span
+      class="ant-tree-switcher ant-tree-switcher_open"
+    />
+    <span
+      class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
+      title="parent"
+    >
+      <span
+        class="ant-tree-iconEle ant-tree-icon__customize"
+      >
+        <i
+          class="anticon anticon-folder-open"
+        />
+      </span>
+      <span
+        class="ant-tree-title"
+      >
+        parent
+      </span>
+    </span>
+    <ul
+      class="ant-tree-child-tree ant-tree-child-tree-open"
+      data-expanded="true"
+      style=""
+    >
+      <li
+        class="ant-tree-treenode-switcher-close"
+      >
+        <span
+          class="ant-tree-switcher ant-tree-switcher-noop"
+        />
+        <span
+          class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
+          title="children"
+        >
+          <span
+            class="ant-tree-iconEle ant-tree-icon__customize"
+          >
+            <i
+              class="anticon anticon-folder"
+            />
+          </span>
+          <span
+            class="ant-tree-title"
+          >
+            children
+          </span>
+        </span>
+      </li>
+    </ul>
+  </li>
+</ul>
+`;
+
 exports[`Directory Tree expandedKeys update 1`] = `
 <ul
   class="ant-tree ant-tree-directory"

components/tree/__tests__/directory.test.js

@@ -49,6 +49,42 @@ describe('Directory Tree', () => {
       wrapper.find(TreeNode).find('.ant-tree-node-content-wrapper').at(0).simulate('doubleClick');
       expect(wrapper.render()).toMatchSnapshot();
     });
+
+    describe('with state control', () => {
+      class StateDirTree extends React.Component {
+        state = {
+          expandedKeys: [],
+        };
+
+        onExpand = (expandedKeys) => {
+          this.setState({ expandedKeys });
+        };
+
+        render() {
+          const { expandedKeys } = this.state;
+
+          return (
+            <DirectoryTree expandedKeys={expandedKeys} onExpand={this.onExpand} {...this.props}>
+              <TreeNode key="0-0" title="parent">
+                <TreeNode key="0-0-0" title="children" />
+              </TreeNode>
+            </DirectoryTree>
+          );
+        }
+      }
+
+      ['click', 'doubleClick'].forEach((action) => {
+        it(action, () => {
+          const wrapper = mount(
+            <StateDirTree expandAction={action} />
+          );
+
+          wrapper.find(TreeNode).find('.ant-tree-node-content-wrapper').at(0).simulate(action);
+          jest.runAllTimers();
+          expect(wrapper.render()).toMatchSnapshot();
+        });
+      });
+    });
   });
 
   it('defaultExpandAll', () => {

docs/spec/values.en-US.md

@@ -4,7 +4,7 @@ order: 1
 title: Design Values
 ---
 
-Ant Design provides a practical evaluation of better design for both designers of Ant Design and designers who are using it. At the same time, it build a foundation for design principles and design patterns which could provide guideline and general solutions for specified design goal.
+Ant Design provides a practical evaluation of better design for both designers of Ant Design and designers who are using it. At the same time, it builds a foundation for design principles and design patterns which could provide guideline and general solutions for specified design goal.
 
 <div>
   <img src="https://gw.alipayobjects.com/zos/rmsportal/kEwBspjVFChYqhqafCiW.png" />

docs/spec/visual.md

@@ -7,7 +7,7 @@ title:
 
 可视化语言是基于中台设计语言 Ant Design 衍生的一套具有数据可视化特性的设计指导原则，让数据表达更符合用户心理，帮助『设计者』孵化出更具业务特性的可视化解决方案以满足个性化设计需求，屏蔽不必要的设计差异和实现成本，从而解放『设计者』和前端的研发资源，实现全面提高数据图表的研发效率。
 
-同时，这是一份动态更新的设计文档，你的阅读和反馈正是我们不断前进的动力，[Github 反馈地址](https://github.com/antvis/site/issues)。
+同时，这是一份动态更新的设计文档，你的阅读和反馈正是我们不断前进的动力，[GitHub 反馈地址](https://github.com/antvis/site/issues)。
 
 ## 设计资源
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "3.7.0",
+  "version": "3.7.2",
   "title": "Ant Design",
   "description": "An enterprise-class UI design language and React-based implementation",
   "homepage": "http://ant.design/",
@@ -59,12 +59,12 @@
     "rc-checkbox": "~2.1.5",
     "rc-collapse": "~1.9.0",
     "rc-dialog": "~7.1.0",
-    "rc-drawer": "~1.5.3",
+    "rc-drawer": "~1.6.2",
     "rc-dropdown": "~2.2.0",
     "rc-editor-mention": "^1.0.2",
     "rc-form": "^2.1.0",
     "rc-input-number": "~4.0.0",
-    "rc-menu": "~7.2.2",
+    "rc-menu": "~7.0.2",
     "rc-notification": "~3.1.1",
     "rc-pagination": "~1.16.1",
     "rc-progress": "~2.2.2",
@@ -83,7 +83,7 @@
     "rc-upload": "~2.5.0",
     "rc-util": "^4.0.4",
     "react-lazy-load": "^3.0.12",
-    "react-lifecycles-compat": "^3.0.4",
+    "react-lifecycles-compat": "^3.0.2",
     "react-slick": "~0.23.1",
     "shallowequal": "^1.0.1",
     "warning": "~4.0.1"
@@ -92,6 +92,7 @@
     "@babel/types": "7.0.0-beta.44",
     "@types/react": "^16.0.0",
     "@types/react-dom": "^16.0.0",
+    "@yesmeck/offline-plugin": "^5.0.5",
     "ansi-styles": "^3.2.0",
     "ant-design-palettes": "^1.0.0",
     "antd-theme-generator": "1.0.7",
@@ -104,7 +105,7 @@
     "babel-preset-react": "^6.16.0",
     "babel-preset-stage-0": "^6.16.0",
     "bezier-easing": "^2.0.3",
-    "bisheng": "^0.29.0",
+    "bisheng": "^0.28.0",
     "bisheng-plugin-antd": "^0.16.0",
     "bisheng-plugin-description": "^0.1.1",
     "bisheng-plugin-react": "^0.6.0",
@@ -140,7 +141,6 @@
     "majo": "^0.6.2",
     "mockdate": "^2.0.1",
     "moment-timezone": "^0.5.5",
-    "offline-plugin": "yesmeck/offline-plugin#fix-cache-key",
     "pre-commit": "^1.2.2",
     "preact": "^8.2.5",
     "preact-compat": "^3.17.0",
@@ -151,8 +151,8 @@
     "react": "^16.3.2",
     "react-color": "^2.11.7",
     "react-copy-to-clipboard": "^5.0.0",
-    "react-dnd": "^3.0.2",
-    "react-dnd-html5-backend": "^3.0.2",
+    "react-dnd": "^5.0.0",
+    "react-dnd-html5-backend": "^5.0.1",
     "react-document-title": "^2.0.1",
     "react-dom": "^16.3.2",
     "react-github-button": "^0.1.1",

site/bisheng.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const CSSSplitWebpackPlugin = require('css-split-webpack-plugin').default;
-const OfflinePlugin = require('offline-plugin');
+const OfflinePlugin = require('@yesmeck/offline-plugin');
 const replaceLib = require('antd-tools/lib/replaceLib');
 const getExternalResources = require('./getExternalResources');
 

site/theme/en-US.js

@@ -24,7 +24,7 @@ module.exports = {
     'app.demo.codepen': 'Open in CodePen',
     'app.demo.codesandbox': 'Open in CodeSandbox',
     'app.demo.riddle': 'Open in Riddle',
-    'app.home.slogan': 'A UI Design Language',
+    'app.home.slogan': 'The world\'s second most popular React UI framework',
     'app.home.introduce': 'A design system with values of Nature and Determinacy for better user experience of enterprise applications',
     'app.home.design-language': 'Design Language',
     'app.home.solution': 'Solution',

site/theme/static/markdown.less

@@ -202,20 +202,31 @@
 .markdown.api-container table {
   font-size: @font-size-base;
   line-height: @line-height-base;
+  font-family: @code-family;
+  border-width: 0;
+  margin: 2em 0;
+  th, td {
+    padding: 14px 16px;
+    border-width: 1px 0;
+    border-color: @border-color-split;
+  }
+  th {
+    border-width: 0 0 2px 0;
+  }
   td:first-child {
     font-weight: 500;
     width: 20%;
-    font-family: "Lucida Console", Consolas, Menlo, Courier, monospace;
+    color: @blue-9;
   }
   td:nth-child(3) {
     width: 22%;
-    font-size: 12px;
-    font-family: "Lucida Console", Consolas, Menlo, Courier, monospace;
+    font-size: @font-size-base - 1px;
+    color: @magenta-7;
+    word-break: break-all;
   }
   td:last-child {
     width: 13%;
-    font-size: 12px;
-    font-family: "Lucida Console", Consolas, Menlo, Courier, monospace;
+    font-size: @font-size-base - 1px;
   }
 }
 

site/theme/template/Layout/index.jsx

@@ -6,7 +6,7 @@ import { addLocaleData, IntlProvider } from 'react-intl';
 import 'moment/locale/zh-cn';
 import { LocaleProvider } from 'antd';
 import zhCN from 'antd/lib/locale-provider/zh_CN';
-import OfflineRuntime from 'offline-plugin/runtime';
+import OfflineRuntime from '@yesmeck/offline-plugin/runtime';
 import Header from './Header';
 import Footer from './Footer';
 import enLocale from '../../en-US';

tests/__mocks__/react.js

@@ -1,11 +1,18 @@
+import createReactContext from 'create-react-context/lib/implementation';
+
 const React = require.requireActual('react');
 
 if (!React.createContext) {
-  React.createContext = () => {
-    const Provider = ({ children }) => children;
-    const Consumer = ({ children }) => children();
-    return { Provider, Consumer };
+  React.createContext = createReactContext;
+}
+
+if (!React.createRef) {
+  React.createRef = () => {
+    const ref = function setRef(node) {
+      ref.current = node;
+    };
+    return ref;
   };
 }
 
-module.exports = React;
+Object.assign(module.exports, React);