From 8a6b76acdedbed190ae42b8cf88d233dc9ba6974 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 28 Feb 2018 11:07:26 +0800
Subject: [PATCH 01/36] support less vars for tabs title font size

---
 components/style/themes/default.less | 2 ++
 components/tabs/style/index.less     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 343e374e31..c9865f25d1 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -387,6 +387,8 @@
 @tabs-card-height: 40px;
 @tabs-card-active-color: @primary-color;
 @tabs-title-font-size: @font-size-base;
+@tabs-title-font-size-lg: @font-size-sm;
+@tabs-title-font-size-sm: @font-size-base;
 @tabs-ink-bar-bg-color: @primary-color;
 @tab-bar-margin: 0 0 16px 0;
 @tab-horizontal-margin: 0 32px 0 0;
diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less
index 93f23936e8..b2f71b26cd 100644
--- a/components/tabs/style/index.less
+++ b/components/tabs/style/index.less
@@ -207,7 +207,7 @@
   }
 
   &-large &-nav-container {
-    font-size: @font-size-lg;
+    font-size: @tabs-title-font-size-lg;
   }
 
   &-large &-tab {
@@ -215,7 +215,7 @@
   }
 
   &-small &-nav-container {
-    font-size: @font-size-base;
+    font-size: @tabs-title-font-size-sm;
   }
 
   &-small &-tab {

From 9634bea391dd2b7b17f1e89383577e248081a044 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Wed, 28 Feb 2018 14:35:02 +0800
Subject: [PATCH 02/36] Complicate with less 3

Fix #7850
---
 components/style/color/bezierEasing.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/style/color/bezierEasing.less b/components/style/color/bezierEasing.less
index 78d94d5509..cf1fc066c4 100644
--- a/components/style/color/bezierEasing.less
+++ b/components/style/color/bezierEasing.less
@@ -100,6 +100,8 @@
   };
 
   this.colorEasing = BezierEasing(0.26, 0.09, 0.37, 0.18);
+  // less 3 requires a return
+  return '';
 })()`;
 }
 // It is hacky way to make this function will be compiled preferentially by less

From 1b3118e1dc513c1e0c386bcd9e3913867eef6fa6 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Thu, 1 Mar 2018 17:24:06 +0800
Subject: [PATCH 03/36] Use week year

Fix #9463
---
 components/date-picker/WeekPicker.tsx | 2 +-
 components/date-picker/index.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/date-picker/WeekPicker.tsx b/components/date-picker/WeekPicker.tsx
index c6b97fe48d..6a127ef229 100644
--- a/components/date-picker/WeekPicker.tsx
+++ b/components/date-picker/WeekPicker.tsx
@@ -11,7 +11,7 @@ function formatValue(value: moment.Moment | null, format: string): string {
 
 export default class WeekPicker extends React.Component<any, any> {
   static defaultProps = {
-    format: 'YYYY-wo',
+    format: 'gggg-wo',
     allowClear: true,
   };
 
diff --git a/components/date-picker/index.tsx b/components/date-picker/index.tsx
index 7c8e6d2b44..9d3e6de58d 100755
--- a/components/date-picker/index.tsx
+++ b/components/date-picker/index.tsx
@@ -14,7 +14,7 @@ const MonthPicker = wrapPicker(createPicker(MonthCalendar), 'YYYY-MM');
 Object.assign(DatePicker, {
   RangePicker: wrapPicker(RangePicker),
   MonthPicker,
-  WeekPicker: wrapPicker(WeekPicker, 'YYYY-wo'),
+  WeekPicker: wrapPicker(WeekPicker, 'gggg-wo'),
 });
 
 export default DatePicker as DatePickerDecorator;

From f24e41806d9206df3d7f7ae8dd8135232aa4d2cb Mon Sep 17 00:00:00 2001
From: Karthik K <imkarthikk@users.noreply.github.com>
Date: Thu, 1 Mar 2018 19:38:31 +0530
Subject: [PATCH 04/36] Minor punctuation correction (#9472)

---
 components/mention/index.en-US.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/mention/index.en-US.md b/components/mention/index.en-US.md
index 3895a8c338..fbe9029721 100644
--- a/components/mention/index.en-US.md
+++ b/components/mention/index.en-US.md
@@ -4,7 +4,7 @@ type: Data Entry
 title: Mention
 ---
 
-Mention component。
+Mention component.
 
 ## When To Use
 

From c51f041ebcba0787599414316086f1373f2fd94f Mon Sep 17 00:00:00 2001
From: Chang Wang <cheapsteak@gmail.com>
Date: Thu, 1 Mar 2018 21:13:48 -0500
Subject: [PATCH 05/36] Update downloads badge to point to graph of downloads
 (#9477)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 76d612e871..84f6fb472a 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 [![Dependency Status](https://img.shields.io/gemnasium/react-component/trigger.svg?style=flat-square)](https://gemnasium.com/ant-design/ant-design)
 
 [![npm package](https://img.shields.io/npm/v/antd.svg?style=flat-square)](https://www.npmjs.org/package/antd)
-[![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](https://npmjs.org/package/antd)
+[![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](https://npmcharts.com/compare/antd?minimal=true)
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/ant-design/ant-design.svg)](http://isitmaintained.com/project/ant-design/ant-design "Percentage of issues still open")
 [![Gitter](https://badges.gitter.im/ant-design/ant-design-english.svg)](https://gitter.im/ant-design/ant-design-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) (English)
 [![Join the chat at https://gitter.im/ant-design/ant-design](https://img.shields.io/gitter/room/ant-design/ant-design.svg?style=flat-square)](https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)（中文）

From d816879e78fc18db23122d285cf31e795a309623 Mon Sep 17 00:00:00 2001
From: twobin <twobin@live.com>
Date: Fri, 2 Mar 2018 10:15:01 +0800
Subject: [PATCH 06/36] fix: add props of onPopupScroll in Select (#9475)

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

diff --git a/components/select/index.tsx b/components/select/index.tsx
index 378ee5ef01..4d36a7cf7b 100755
--- a/components/select/index.tsx
+++ b/components/select/index.tsx
@@ -43,6 +43,7 @@ export interface SelectProps extends AbstractSelectProps {
   onDeselect?: (value: SelectValue) => any;
   onBlur?: () => any;
   onFocus?: () => any;
+  onPopupScroll?: () => any;
   onInputKeyDown?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
   maxTagCount?: number;
   maxTagPlaceholder?: React.ReactNode | ((omittedValues: SelectValue[]) => React.ReactNode);

From 2548a4bcf927fcb2c4b516e08860f77418878412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=84=9A=E6=8C=87=E5=AF=BC?= <yutingzhao1991@sina.com>
Date: Fri, 2 Mar 2018 11:49:56 +0800
Subject: [PATCH 07/36] add polyfill for ie (#9444)

---
 site/theme/static/template.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/site/theme/static/template.html b/site/theme/static/template.html
index e5b2ad5d31..db6c5f2483 100644
--- a/site/theme/static/template.html
+++ b/site/theme/static/template.html
@@ -6,6 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="An enterprise-class UI design language and React-based implementation with a set of high-quality React components, one of best React UI library for enterprises">
     <title>Ant Design - A UI Design Language</title>
+    <!-- Polyfills -->
+    <!--[if IE]>
+    <script src="https://as.alipayobjects.com/g/component/??es6-shim/0.35.1/es6-sham.min.js,es6-shim/0.35.1/es6-shim.min.js"></script>
+    <![endif]-->
     <script>
     (function() {
       function isLocalStorageNameSupported() {

From 7d3573d4717097464053e153e1315783739b51d7 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 2 Mar 2018 12:04:25 +0800
Subject: [PATCH 08/36] use more clear function name, close #9465

---
 components/form/demo/register.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/components/form/demo/register.md b/components/form/demo/register.md
index 586475001e..16f7633d91 100644
--- a/components/form/demo/register.md
+++ b/components/form/demo/register.md
@@ -60,7 +60,7 @@ class RegistrationForm extends React.Component {
     const value = e.target.value;
     this.setState({ confirmDirty: this.state.confirmDirty || !!value });
   }
-  checkPassword = (rule, value, callback) => {
+  compareToFirstPassword = (rule, value, callback) => {
     const form = this.props.form;
     if (value && value !== form.getFieldValue('password')) {
       callback('Two passwords that you enter is inconsistent!');
@@ -68,14 +68,13 @@ class RegistrationForm extends React.Component {
       callback();
     }
   }
-  checkConfirm = (rule, value, callback) => {
+  validateToNextPassword = (rule, value, callback) => {
     const form = this.props.form;
     if (value && this.state.confirmDirty) {
       form.validateFields(['confirm'], { force: true });
     }
     callback();
   }
-
   handleWebsiteChange = (value) => {
     let autoCompleteResult;
     if (!value) {
@@ -85,7 +84,6 @@ class RegistrationForm extends React.Component {
     }
     this.setState({ autoCompleteResult });
   }
-
   render() {
     const { getFieldDecorator } = this.props.form;
     const { autoCompleteResult } = this.state;
@@ -149,7 +147,7 @@ class RegistrationForm extends React.Component {
             rules: [{
               required: true, message: 'Please input your password!',
             }, {
-              validator: this.checkConfirm,
+              validator: this.validateToNextPassword,
             }],
           })(
             <Input type="password" />
@@ -163,7 +161,7 @@ class RegistrationForm extends React.Component {
             rules: [{
               required: true, message: 'Please confirm your password!',
             }, {
-              validator: this.checkPassword,
+              validator: this.compareToFirstPassword,
             }],
           })(
             <Input type="password" onBlur={this.handleConfirmBlur} />

From 98f938798d1c092516b931b612abbbcaa4ca69a6 Mon Sep 17 00:00:00 2001
From: byuanama <byuan@ama.com.au>
Date: Fri, 2 Mar 2018 16:18:06 +1100
Subject: [PATCH 09/36] Update index.en-US.md (#9479)

---
 components/layout/index.en-US.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/layout/index.en-US.md b/components/layout/index.en-US.md
index 9270dbb142..a3e61857b5 100644
--- a/components/layout/index.en-US.md
+++ b/components/layout/index.en-US.md
@@ -43,7 +43,7 @@ The first level navigation is inclined left near a logo, and the secondary menu
 
 - **Enlarge the size of the font**
 
-  `12px`、`14px` is a standard font size of navigations，`14px` is used for the first and the second level of the navigation. You can choose a approprigate font size in terms of the level of your navigation.
+  `12px`、`14px` is a standard font size of navigations，`14px` is used for the first and the second level of the navigation. You can choose a appropriate font size in terms of the level of your navigation.
 
 ## Component Overview
 

From 2fe64d429aa6638ad2c1d788a4040cbf7b52b6d1 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 2 Mar 2018 15:24:55 +0800
Subject: [PATCH 10/36] Fix button group align issue in chrome, close #1019

---
 components/button/style/mixin.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less
index b90615b4bd..3e1f2dee97 100644
--- a/components/button/style/mixin.less
+++ b/components/button/style/mixin.less
@@ -108,6 +108,7 @@
   display: inline-block;
   > .@{btnClassName} {
     position: relative;
+    line-height: @btn-height-base - 2px;
 
     &:hover,
     &:focus,
@@ -124,10 +125,12 @@
   // size
   &-lg > .@{btnClassName} {
     .button-size(@btn-height-lg; @btn-padding-lg; @btn-font-size-lg; @btn-border-radius-base);
+    line-height: @btn-height-lg - 2px;
   }
 
   &-sm > .@{btnClassName} {
     .button-size(@btn-height-sm; @btn-padding-sm; @font-size-base; @btn-border-radius-sm);
+    line-height: @btn-height-sm - 2px;
     > .@{iconfont-css-prefix} {
       font-size: @font-size-base;
     }

From fd147deb758e65560355e17749eaa5e3ed8e1d2e Mon Sep 17 00:00:00 2001
From: Sam Chen <chenxsan@gmail.com>
Date: Fri, 2 Mar 2018 15:26:05 +0800
Subject: [PATCH 11/36] Update input group demo (#9482)

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

diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap
index 8886819ce3..22573ef73d 100644
--- a/components/input/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/input/__tests__/__snapshots__/demo.test.js.snap
@@ -177,7 +177,7 @@ exports[`renders ./components/input/demo/group.md correctly 1`] = `
     class="ant-input-group ant-input-group-lg"
   >
     <div
-      class="ant-col-4"
+      class="ant-col-5"
     >
       <input
         class="ant-input"
diff --git a/components/input/demo/group.md b/components/input/demo/group.md
index 0dba1e9537..8da84397c9 100644
--- a/components/input/demo/group.md
+++ b/components/input/demo/group.md
@@ -63,7 +63,7 @@ class CompactDemo extends React.Component {
     return (
       <div>
         <InputGroup size="large">
-          <Col span={4}>
+          <Col span={5}>
             <Input defaultValue="0571" />
           </Col>
           <Col span={8}>

From cdfbb6a3bdfbe047b37be078b1bc33069bf4691f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=84=9A=E6=8C=87=E5=AF=BC?= <yutingzhao1991@sina.com>
Date: Fri, 2 Mar 2018 20:12:06 +0800
Subject: [PATCH 12/36] Bump 3.2.3

---
 CHANGELOG.en-US.md | 12 ++++++++++++
 CHANGELOG.zh-CN.md | 12 ++++++++++++
 package.json       |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 228bdd4d4b..e84efa0e80 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -15,6 +15,18 @@ timeline: true
 
 ---
 
+## 3.2.3
+
+`2018-03-02`
+
+- 🐞 Fix props `onPopupScroll` ts define in `Select`. [#9475](https://github.com/ant-design/ant-design/pull/9475) [@twobin](https://github.com/twobin)
+- 🐞 Fix `Table` filter dropdown menu popup container. [#9209](https://github.com/ant-design/ant-design/issues/9209)
+- 🐞 Fix `Timeline` head custom style error in chrome. [#9429](https://github.com/ant-design/ant-design/pull/9429) [@vthinkxie](https://github.com/vthinkxie)
+- 🐞 Fix `Select` dropdown border. [82092c1](https://github.com/ant-design/ant-design/commit/82092c154ac1fa7ff2f89e1adbdf0aaf22e3ff53)
+- 🐞 Fix compatibility with less 3. [#7850](https://github.com/ant-design/ant-design/issues/7850)
+- 🐞 Fix `DatePicker.WeekPicker` year. [#9463](https://github.com/ant-design/ant-design/issues/9463)
+- 🐞 Fix `Button.Group` align issue in chrome. [#9457](https://github.com/ant-design/ant-design/issues/9457)
+
 ## 3.2.2
 
 `2018-02-24`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 82a8ea9bca..63615ab903 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -15,6 +15,18 @@ timeline: true
 
 ---
 
+## 3.2.3
+
+`2018-03-02`
+
+- 🐞 修复组件 `Select` 中的 `onPopupScroll` 属性的 ts 定义。 [#9475](https://github.com/ant-design/ant-design/pull/9475) [@twobin](https://github.com/twobin)
+- 🐞 修复 `Table` 过滤条件下拉选择框的问题。 [#9209](https://github.com/ant-design/ant-design/issues/9209)
+- 🐞 修复 `Timeline` 自定义头部样式在 Chrome 下的显示问题。 [#9429](https://github.com/ant-design/ant-design/pull/9429) [@vthinkxie](https://github.com/vthinkxie)
+- 🐞 修复 `Select` 下拉窗口的边框显示问题。 [82092c1](https://github.com/ant-design/ant-design/commit/82092c154ac1fa7ff2f89e1adbdf0aaf22e3ff53)
+- 🐞 修复对 less 3 的兼容性问题。 [#7850](https://github.com/ant-design/ant-design/issues/7850)
+- 🐞 修复 `DatePicker.WeekPicker` 年份问题。 [#9463](https://github.com/ant-design/ant-design/issues/9463)
+- 🐞 修复 `Button.Group` 在 Chrome 下的定位对齐问题。 [#9457](https://github.com/ant-design/ant-design/issues/9457)
+
 ## 3.2.2
 
 `2018-02-24`
diff --git a/package.json b/package.json
index 8e1510cb80..dbfbdeeaf0 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "title": "Ant Design",
   "description": "An enterprise-class UI design language and React-based implementation",
   "homepage": "http://ant.design/",

From d40a3408c6dc8c02e429b6d7d119d5f8cc770ecb Mon Sep 17 00:00:00 2001
From: Arnab Sen <arnabsen@gmail.com>
Date: Fri, 2 Mar 2018 15:19:10 +0100
Subject: [PATCH 13/36] Corrected typo (#9490)

---
 components/divider/index.en-US.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/divider/index.en-US.md b/components/divider/index.en-US.md
index ca64ba8869..d876fd94eb 100644
--- a/components/divider/index.en-US.md
+++ b/components/divider/index.en-US.md
@@ -18,5 +18,5 @@ A divider line separates different content.
 
 | Property | Description | Type | Default |
 | -------- | ----------- | ---- | ------- |
-| dashed | whether line is dasded | Boolean | false |
+| dashed | whether line is dashed | Boolean | false |
 | type | direction type of divider | enum: `horizontal` `vertical` | `horizontal` |

From d0c58946ee09d97607b4b5c65245d94061b5e772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= <afc163@gmail.com>
Date: Sat, 3 Mar 2018 15:35:30 +0800
Subject: [PATCH 14/36] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 84f6fb472a..96d57afb81 100644
--- a/README.md
+++ b/README.md
@@ -26,10 +26,10 @@ An enterprise-class UI design language and React-based implementation.
 
 ## Features
 
-- An enterprise-class UI design language for web applications.
+- An enterprise-class UI design system for desktop applications.
 - A set of high-quality React components out of the box.
-- Written in TypeScript with complete define types.
-- A npm + webpack + [dva](https://github.com/dvajs/dva) front-end development workflow.
+- Written in TypeScript with predictable static types.
+- Work with great development and design resources and tools.
 
 ## Environment Support
 

From a2018e7c44f78424cd3f6b23571115c8381f9b47 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sat, 3 Mar 2018 16:26:40 +0800
Subject: [PATCH 15/36] site: fix scroll to current hash in chrome

---
 site/theme/template/Content/MainContent.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/theme/template/Content/MainContent.jsx b/site/theme/template/Content/MainContent.jsx
index be36f0c910..0b181520d8 100644
--- a/site/theme/template/Content/MainContent.jsx
+++ b/site/theme/template/Content/MainContent.jsx
@@ -71,7 +71,7 @@ export default class MainContent extends React.Component {
     }
     this.timer = setTimeout(() => {
       if (window.location.hash) {
-        window.location.hash = window.location.hash;
+        document.querySelector(window.location.hash).scrollIntoView();
       }
     }, 10);
   }

From af8e54f1d6ac2891892e39b153cbe3e998370f61 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sat, 3 Mar 2018 16:42:31 +0800
Subject: [PATCH 16/36] Fix table radius in chrome

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

diff --git a/components/table/style/index.less b/components/table/style/index.less
index baf9965908..bee497bbee 100644
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@@ -33,6 +33,14 @@
     font-weight: 500;
     border-bottom: @border-width-base @border-style-base @border-color-split;
 
+    &:first-child {
+      border-top-left-radius: @border-radius-base;
+    }
+
+    &:last-child {
+      border-top-right-radius: @border-radius-base;
+    }
+
     &[colspan] {
       text-align: center;
       border-bottom: 0;
@@ -539,6 +547,9 @@
     table {
       border-radius: @border-radius-base 0 0 0;
     }
+    .ant-table-thead > tr > th:last-child {
+      border-top-right-radius: 0;
+    }
   }
 
   &-fixed-right {
@@ -554,6 +565,9 @@
       color: transparent;
       pointer-events: none;
     }
+    .ant-table-thead > tr > th:first-child {
+      border-top-left-radius: 0;
+    }
   }
 
   &&-scroll-position-left &-fixed-left {

From 192c6bbb3876a4e13da945dd4aa63423207ae57b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Mar 2018 17:44:57 +0800
Subject: [PATCH 17/36] Update scrollama requirement to ^1.4.1 (#9507)

Updates the requirements on [scrollama](https://github.com/russellgoldenberg/scrollama) to permit the latest version.
- [Commits](https://github.com/russellgoldenberg/scrollama/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 package.json

diff --git a/package.json b/package.json
old mode 100755
new mode 100644
index dbfbdeeaf0..313d320095
--- a/package.json
+++ b/package.json
@@ -158,7 +158,7 @@
     "remark-yaml-config": "^4.0.1",
     "reqwest": "^2.0.5",
     "rimraf": "^2.5.4",
-    "scrollama": "^0.6.1",
+    "scrollama": "^1.4.1",
     "stylelint": "^8.0.0",
     "stylelint-config-standard": "^18.0.0",
     "typescript": "~2.6.1",

From b2bb35b13d4a5788f7c1122af2abd8bef077a85c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Mar 2018 17:45:38 +0800
Subject: [PATCH 18/36] Update react-slick requirement to ~0.19.0 (#9504)

Updates the requirements on [react-slick](https://github.com/akiran/react-slick) to permit the latest version.
- [Release notes](https://github.com/akiran/react-slick/releases)
- [Changelog](https://github.com/akiran/react-slick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/akiran/react-slick/commits/0.19.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 313d320095..3b3e7d579f 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "rc-upload": "~2.4.0",
     "rc-util": "^4.0.4",
     "react-lazy-load": "^3.0.12",
-    "react-slick": "~0.17.0",
+    "react-slick": "~0.19.0",
     "shallowequal": "^1.0.1",
     "warning": "~3.0.0"
   },

From 5839c852a4839c1ef16581e985f4ce0709dd03ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Mar 2018 18:05:50 +0800
Subject: [PATCH 19/36] Update stylelint requirement to ^9.1.1 (#9508)

Updates the requirements on [stylelint](https://github.com/stylelint/stylelint) to permit the latest version.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint/commits/9.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3b3e7d579f..a3a7fc9fd6 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "reqwest": "^2.0.5",
     "rimraf": "^2.5.4",
     "scrollama": "^1.4.1",
-    "stylelint": "^8.0.0",
+    "stylelint": "^9.1.1",
     "stylelint-config-standard": "^18.0.0",
     "typescript": "~2.6.1",
     "unified": "^6.1.5",

From 3793412e6dbbed5ee587048c2023ca349558e0be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Mar 2018 18:06:02 +0800
Subject: [PATCH 20/36] Update eslint-plugin-react requirement to 7.7.0 (#9506)

Updates the requirements on [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) to permit the latest version.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/commits/v7.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a3a7fc9fd6..6ff09b5c76 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-markdown": "~1.0.0-beta.4",
-    "eslint-plugin-react": "7.5.1",
+    "eslint-plugin-react": "7.7.0",
     "eslint-tinker": "^0.4.0",
     "fetch-jsonp": "^1.0.3",
     "glob": "^7.1.1",

From c0e9a22fa99e10d0d7f045c6efc60067f5fc4c37 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Mon, 5 Mar 2018 11:23:26 +0800
Subject: [PATCH 21/36] Update snapshot

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

diff --git a/components/carousel/__tests__/__snapshots__/demo.test.js.snap b/components/carousel/__tests__/__snapshots__/demo.test.js.snap
index 645229bc33..f4cf22b15c 100644
--- a/components/carousel/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/carousel/__tests__/__snapshots__/demo.test.js.snap
@@ -22,7 +22,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
           </h3>
         </div>
         <div
-          class="slick-slide slick-active slick-cloned"
+          class="slick-slide slick-active slick-cloned slick-current"
           data-index="0"
           style="outline:none"
           tabindex="-1"
@@ -121,7 +121,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
           </h3>
         </div>
         <div
-          class="slick-slide slick-active slick-cloned"
+          class="slick-slide slick-active slick-cloned slick-current"
           data-index="0"
           style="outline:none"
           tabindex="-1"
@@ -212,9 +212,9 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
         class="slick-track"
       >
         <div
-          class="slick-slide slick-active slick-cloned"
+          class="slick-slide slick-active slick-cloned slick-current"
           data-index="0"
-          style="outline:none;position:relative;left:0;opacity:1;transition:opacity 500ms ease;-webkit-transition:opacity 500ms ease"
+          style="outline:none;position:relative;left:0;opacity:1;visibility:visible;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
           tabindex="-1"
         >
           <h3>
@@ -224,7 +224,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="1"
-          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease;-webkit-transition:opacity 500ms ease"
+          style="outline:none;position:relative;left:0;opacity:0;visibility:hidden;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
           tabindex="-1"
         >
           <h3>
@@ -234,7 +234,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="2"
-          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease;-webkit-transition:opacity 500ms ease"
+          style="outline:none;position:relative;left:0;opacity:0;visibility:hidden;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
           tabindex="-1"
         >
           <h3>
@@ -244,7 +244,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="3"
-          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease;-webkit-transition:opacity 500ms ease"
+          style="outline:none;position:relative;left:0;opacity:0;visibility:hidden;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
           tabindex="-1"
         >
           <h3>
@@ -279,7 +279,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
           </h3>
         </div>
         <div
-          class="slick-slide slick-active slick-cloned"
+          class="slick-slide slick-active slick-cloned slick-current"
           data-index="0"
           style="outline:none"
           tabindex="-1"

From 765beb7570ee12e294f3b54ce71e44be735c5033 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Mar 2018 15:41:01 +0800
Subject: [PATCH 22/36] Update lint-staged requirement to ^7.0.0 (#9519)

Updates the requirements on [lint-staged](https://github.com/okonet/lint-staged) to permit the latest version.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/commits/v7.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6ff09b5c76..9049645fa0 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "immutability-helper": "^2.5.0",
     "jest": "^21.1.0",
     "jsonml.js": "^0.1.0",
-    "lint-staged": "^6.0.0",
+    "lint-staged": "^7.0.0",
     "lz-string": "^1.4.4",
     "majo": "^0.4.1",
     "mockdate": "^2.0.1",

From d250f35cf38c2cf9a9ad56f3b78c49d4a6fcc24e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Mar 2018 15:44:36 +0800
Subject: [PATCH 23/36] Update jest requirement to ^22.4.2 (#9521)

Updates the requirements on [jest](https://github.com/facebook/jest) to permit the latest version.
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v22.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9049645fa0..ea660834a9 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "fetch-jsonp": "^1.0.3",
     "glob": "^7.1.1",
     "immutability-helper": "^2.5.0",
-    "jest": "^21.1.0",
+    "jest": "^22.4.2",
     "jsonml.js": "^0.1.0",
     "lint-staged": "^7.0.0",
     "lz-string": "^1.4.4",

From c611fe74c068c6fc633e67ccf853fc1bf66d887f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Mar 2018 15:46:16 +0800
Subject: [PATCH 24/36] Update remark-stringify requirement to ^5.0.0 (#9523)

Updates the requirements on [remark-stringify](https://github.com/remarkjs/remark) to permit the latest version.
- [Release notes](https://github.com/remarkjs/remark/releases)
- [Commits](https://github.com/remarkjs/remark/commits/remark@5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ea660834a9..5a95dca3f6 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
     "react-virtualized": "~9.13.0",
     "remark-frontmatter": "^1.1.0",
     "remark-parse": "^4.0.0",
-    "remark-stringify": "^4.0.0",
+    "remark-stringify": "^5.0.0",
     "remark-yaml-config": "^4.0.1",
     "reqwest": "^2.0.5",
     "rimraf": "^2.5.4",

From c7dd7cbbc4b7d58472d432dac9992f32db1e60c1 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 5 Mar 2018 18:35:33 +0800
Subject: [PATCH 25/36] Fix large tabs font size, close #9509

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

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index c9865f25d1..447929183e 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -387,7 +387,7 @@
 @tabs-card-height: 40px;
 @tabs-card-active-color: @primary-color;
 @tabs-title-font-size: @font-size-base;
-@tabs-title-font-size-lg: @font-size-sm;
+@tabs-title-font-size-lg: @font-size-lg;
 @tabs-title-font-size-sm: @font-size-base;
 @tabs-ink-bar-bg-color: @primary-color;
 @tab-bar-margin: 0 0 16px 0;

From 56e4ce099d950601538d72243563021e8083776b Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Tue, 6 Mar 2018 10:43:56 +0800
Subject: [PATCH 26/36] docs: Add TreeSelect[dropdownClassName]

---
 components/tree-select/index.en-US.md | 1 +
 components/tree-select/index.zh-CN.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/components/tree-select/index.en-US.md b/components/tree-select/index.en-US.md
index d0efbdaeb3..74654b5520 100644
--- a/components/tree-select/index.en-US.md
+++ b/components/tree-select/index.en-US.md
@@ -20,6 +20,7 @@ Any data whose entries are defined in a hierarchical manner is fit to use this c
 | allowClear | Whether allow clear | boolean | false |
 | defaultValue | To set the initial selected treeNode(s). | string\|string\[] | - |
 | disabled | Disabled or not | boolean | false |
+| dropdownClassName | className of dropdown menu | string | - |
 | dropdownMatchSelectWidth | Determine whether the dropdown menu and the select input are the same width | boolean | true |
 | dropdownStyle | To set the style of the dropdown menu | object | - |
 | filterTreeNode | Whether to filter treeNodes by input value. The value of `treeNodeFilterProp` is used for filtering by default. | boolean\|Function(inputValue: string, treeNode: TreeNode) (should return boolean) | Function |
diff --git a/components/tree-select/index.zh-CN.md b/components/tree-select/index.zh-CN.md
index 71740174d1..aaa30fe66e 100644
--- a/components/tree-select/index.zh-CN.md
+++ b/components/tree-select/index.zh-CN.md
@@ -20,6 +20,7 @@ title: TreeSelect
 | allowClear | 显示清除按钮 | boolean | false |
 | defaultValue | 指定默认选中的条目 | string/string\[] | - |
 | disabled | 是否禁用 | boolean | false |
+| dropdownClassName | 下拉菜单的 className 属性 | string | - |
 | dropdownMatchSelectWidth | 下拉菜单和选择器同宽 | boolean | true |
 | dropdownStyle | 下拉菜单的样式 | object | - |
 | filterTreeNode | 是否根据输入项进行筛选，默认用 treeNodeFilterProp 的值作为要筛选的 TreeNode 的属性值 | boolean\|Function(inputValue: string, treeNode: TreeNode) (函数需要返回bool值) | Function |

From 69b154f9a9cfa5f2d89a82b6ed730d4d8793de73 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Tue, 6 Mar 2018 11:23:03 +0800
Subject: [PATCH 27/36] Fix passing dropdownClassName to tree-select

---
 components/tree-select/index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/tree-select/index.tsx b/components/tree-select/index.tsx
index 26d5011272..d98d9d2d0c 100644
--- a/components/tree-select/index.tsx
+++ b/components/tree-select/index.tsx
@@ -19,7 +19,6 @@ export default class TreeSelect extends React.Component<TreeSelectProps, any> {
     transitionName: 'slide-up',
     choiceTransitionName: 'zoom',
     showSearch: false,
-    dropdownClassName: 'ant-select-tree-dropdown',
   };
 
   private rcTreeSelect: any;
@@ -52,6 +51,7 @@ export default class TreeSelect extends React.Component<TreeSelectProps, any> {
       size,
       notFoundContent,
       dropdownStyle,
+      dropdownClassName,
       ...restProps,
     } = this.props;
 
@@ -67,6 +67,7 @@ export default class TreeSelect extends React.Component<TreeSelectProps, any> {
     return (
       <RcTreeSelect
         {...restProps}
+        dropdownClassName={classNames(dropdownClassName, `${prefixCls}-tree-dropdown`)}
         prefixCls={prefixCls}
         className={cls}
         dropdownStyle={{ maxHeight: '100vh', overflow: 'auto', ...dropdownStyle }}

From 8466028b5aa6b8f9faa890953559d6a191367159 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Mar 2018 15:14:43 +0800
Subject: [PATCH 28/36] build: update remark-parse requirement to ^5.0.0
 (#9545)

Updates the requirements on [remark-parse](https://github.com/remarkjs/remark) to permit the latest version.
- [Release notes](https://github.com/remarkjs/remark/releases)
- [Commits](https://github.com/remarkjs/remark/commits/remark@5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5a95dca3f6..78f10bcc45 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "react-sublime-video": "^0.2.0",
     "react-virtualized": "~9.13.0",
     "remark-frontmatter": "^1.1.0",
-    "remark-parse": "^4.0.0",
+    "remark-parse": "^5.0.0",
     "remark-stringify": "^5.0.0",
     "remark-yaml-config": "^4.0.1",
     "reqwest": "^2.0.5",

From 26934b37c85ccf1d495dcc4440041a1611d283ba Mon Sep 17 00:00:00 2001
From: jim <wasd2144@hotmail.com>
Date: Tue, 6 Mar 2018 15:21:37 +0800
Subject: [PATCH 29/36] add Tooltip  contextMenu doc

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

diff --git a/components/tooltip/index.en-US.md b/components/tooltip/index.en-US.md
index 83536672dc..cae0b70291 100644
--- a/components/tooltip/index.en-US.md
+++ b/components/tooltip/index.en-US.md
@@ -32,7 +32,7 @@ The following APIs are shared by Tooltip, Popconfirm, Popover.
 | overlayClassName | Class name of the tooltip card | string | - |
 | overlayStyle | Style of the tooltip card | object | - |
 | placement | The position of the tooltip relative to the target, which can be one of `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | `top` |
-| trigger | Tooltip trigger mode | `hover` \| `focus` \| `click` | `hover` |
+| trigger | Tooltip trigger mode | `hover` \| `focus` \| `click` \| `contextMenu` | `hover` |
 | visible | Whether the floating tooltip card is visible or not | boolean | `false` |
 | onVisibleChange | Callback executed when visibility of the tooltip card is changed | (visible) => void | - |
 
diff --git a/components/tooltip/index.tsx b/components/tooltip/index.tsx
index 954d155fcc..69fc57f26e 100644
--- a/components/tooltip/index.tsx
+++ b/components/tooltip/index.tsx
@@ -25,7 +25,7 @@ export interface AbstractTooltipProps {
   mouseEnterDelay?: number;
   mouseLeaveDelay?: number;
   transitionName?: string;
-  trigger?: 'hover' | 'focus' | 'click';
+  trigger?: 'hover' | 'focus' | 'click' | 'contextMenu';
   openClassName?: string;
   arrowPointAtCenter?: boolean;
   autoAdjustOverflow?: boolean | AdjustOverflow;
diff --git a/components/tooltip/index.zh-CN.md b/components/tooltip/index.zh-CN.md
index 6c6422e60a..4c38daf556 100644
--- a/components/tooltip/index.zh-CN.md
+++ b/components/tooltip/index.zh-CN.md
@@ -34,7 +34,7 @@ title: Tooltip
 | overlayClassName | 卡片类名 | string | 无 |
 | overlayStyle | 卡片样式 | object | 无 |
 | placement | 气泡框位置，可选 `top` `left` `right` `bottom` `topLeft` `topRight` `bottomLeft` `bottomRight` `leftTop` `leftBottom` `rightTop` `rightBottom` | string | top |
-| trigger | 触发行为，可选 `hover/focus/click` | string | hover |
+| trigger | 触发行为，可选 `hover/focus/click/contextMenu` | string | hover |
 | visible | 用于手动控制浮层显隐 | boolean | false |
 | onVisibleChange | 显示隐藏的回调 | (visible) => void | 无 |
 

From 518c424ca4a023f3faebce0adf64219989be0018 Mon Sep 17 00:00:00 2001
From: Wei Zhu <yesmeck@gmail.com>
Date: Tue, 6 Mar 2018 15:51:06 +0800
Subject: [PATCH 30/36] Improve Grid and Layout type definition

---
 components/grid/col.tsx      | 4 +---
 components/grid/row.tsx      | 4 +---
 components/layout/Sider.tsx  | 4 +---
 components/layout/layout.tsx | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/components/grid/col.tsx b/components/grid/col.tsx
index 3cb60341d7..3faf9bfcf0 100644
--- a/components/grid/col.tsx
+++ b/components/grid/col.tsx
@@ -13,8 +13,7 @@ export interface ColSize {
   pull?: number;
 }
 
-export interface ColProps {
-  className?: string;
+export interface ColProps extends React.HTMLAttributes<HTMLDivElement> {
   span?: number;
   order?: number;
   offset?: number;
@@ -27,7 +26,6 @@ export interface ColProps {
   xl?: number | ColSize;
   xxl?: number | ColSize;
   prefixCls?: string;
-  style?: React.CSSProperties;
 }
 
 export default class Col extends React.Component<ColProps, {}> {
diff --git a/components/grid/row.tsx b/components/grid/row.tsx
index a58c3fa698..1cd599c11e 100644
--- a/components/grid/row.tsx
+++ b/components/grid/row.tsx
@@ -31,13 +31,11 @@ export type BreakpointMap = {
   xxl?: string
 };
 
-export interface RowProps {
-  className?: string;
+export interface RowProps extends React.HTMLAttributes<HTMLDivElement> {
   gutter?: number | BreakpointMap;
   type?: 'flex';
   align?: 'top' | 'middle' | 'bottom';
   justify?: 'start' | 'end' | 'center' | 'space-around' | 'space-between';
-  style?: React.CSSProperties;
   prefixCls?: string;
 }
 
diff --git a/components/layout/Sider.tsx b/components/layout/Sider.tsx
index d7765a8f31..e8cbf777fa 100644
--- a/components/layout/Sider.tsx
+++ b/components/layout/Sider.tsx
@@ -31,10 +31,8 @@ const dimensionMap = {
 
 export type CollapseType = 'clickTrigger' | 'responsive';
 
-export interface SiderProps {
-  style?: React.CSSProperties;
+export interface SiderProps extends React.HTMLAttributes<HTMLDivElement> {
   prefixCls?: string;
-  className?: string;
   collapsible?: boolean;
   collapsed?: boolean;
   defaultCollapsed?: boolean;
diff --git a/components/layout/layout.tsx b/components/layout/layout.tsx
index c7fb224c19..39f7e73d50 100644
--- a/components/layout/layout.tsx
+++ b/components/layout/layout.tsx
@@ -3,10 +3,8 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { SiderProps } from './Sider';
 
-export interface BasicProps {
-  style?: React.CSSProperties;
+export interface BasicProps extends React.HTMLAttributes<HTMLDivElement> {
   prefixCls?: string;
-  className?: string;
   hasSider?: boolean;
 }
 

From cc06f0f7a5f96d2f04222fcdd927200f973c7fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E7=A6=BB?= <surgesoft@gmail.com>
Date: Tue, 6 Mar 2018 20:59:03 +0800
Subject: [PATCH 31/36] fix: focus editor (#9548)

---
 components/mention/demo/popupContainer.md | 14 +++++++++++++-
 components/mention/index.tsx              |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/components/mention/demo/popupContainer.md b/components/mention/demo/popupContainer.md
index 19cebe1f31..e20ddacb2e 100644
--- a/components/mention/demo/popupContainer.md
+++ b/components/mention/demo/popupContainer.md
@@ -29,9 +29,15 @@ class PopoverContainer extends React.Component {
   getSuggestionContainer = () => {
     return this.popover.getPopupDomNode();
   }
+  visibleChange = (visible) => {
+    if (visible && this.mention) {
+      this.mention.focus();
+    }
+  }
   render() {
     const mention = (
       <Mention
+        ref={ele => this.mention = ele}
         style={{ width: '100%' }}
         onChange={onChange}
         defaultValue={toContentState('@afc163')}
@@ -41,7 +47,13 @@ class PopoverContainer extends React.Component {
       />
     );
     return (
-      <Popover trigger="click" content={mention} title="Title" ref={popover => this.popover = popover}>
+      <Popover
+        trigger="click"
+        content={mention}
+        title="Title"
+        ref={popover => this.popover = popover}
+        onVisibleChange={this.visibleChange}
+      >
         <Button type="primary">Click Me</Button>
       </Popover>
     );
diff --git a/components/mention/index.tsx b/components/mention/index.tsx
index 64d4c6fb29..f1114c1524 100644
--- a/components/mention/index.tsx
+++ b/components/mention/index.tsx
@@ -111,7 +111,7 @@ export default class Mention extends React.Component<MentionProps, MentionState>
     }
   }
   focus = () => {
-    this.mentionEle._editor.focus();
+    this.mentionEle._editor.focusEditor();
   }
   mentionRef = (ele: any) => {
     this.mentionEle = ele;

From 8226ede38ec11e3eb314d7514abfc65dd596578c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= <afc163@gmail.com>
Date: Tue, 6 Mar 2018 21:21:01 +0800
Subject: [PATCH 32/36] Fix test case for new jsdom (#9527)

* Fix test case for new jsdom

* use setTimeout as raf in jest jsdom

* Fix cancelAnimationFrame

* Add comment for facebook/jest#5147

* longer timeout

* fix snap

* upgrade antd-tools
---
 .jest.js                                      |  1 -
 .../__snapshots__/index.test.js.snap          | 70 +++++++++++++++++++
 .../__tests__/__snapshots__/demo.test.js.snap |  2 +-
 .../upload/__tests__/uploadlist.test.js       |  2 +-
 package.json                                  |  8 +--
 tests/setup.js                                | 15 ++--
 6 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/.jest.js b/.jest.js
index 9806ba7732..f2b15bb87f 100644
--- a/.jest.js
+++ b/.jest.js
@@ -43,7 +43,6 @@ module.exports = {
   snapshotSerializers: [
     'enzyme-to-json/serializer',
   ],
-  mapCoverage: true,
   globals: {
     'ts-jest': {
       tsConfigFile: './tsconfig.test.json',
diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
index 071938912a..f7f93a6669 100644
--- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
+++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
@@ -5703,6 +5703,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -5789,6 +5790,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -10299,6 +10301,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -10385,6 +10388,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -14895,6 +14899,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -14981,6 +14986,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -19491,6 +19497,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -19577,6 +19584,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -24087,6 +24095,7 @@ exports[`Locale Provider should display the text as de 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -24173,6 +24182,7 @@ exports[`Locale Provider should display the text as de 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -28683,6 +28693,7 @@ exports[`Locale Provider should display the text as el 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -28769,6 +28780,7 @@ exports[`Locale Provider should display the text as el 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -33279,6 +33291,7 @@ exports[`Locale Provider should display the text as en 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -33365,6 +33378,7 @@ exports[`Locale Provider should display the text as en 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -37875,6 +37889,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -37961,6 +37976,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -42471,6 +42487,7 @@ exports[`Locale Provider should display the text as es 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -42557,6 +42574,7 @@ exports[`Locale Provider should display the text as es 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -47067,6 +47085,7 @@ exports[`Locale Provider should display the text as et 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -47153,6 +47172,7 @@ exports[`Locale Provider should display the text as et 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -51663,6 +51683,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -51749,6 +51770,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -56259,6 +56281,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -56345,6 +56368,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -60855,6 +60879,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -60941,6 +60966,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -65451,6 +65477,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -65537,6 +65564,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -70047,6 +70075,7 @@ exports[`Locale Provider should display the text as is 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -70133,6 +70162,7 @@ exports[`Locale Provider should display the text as is 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -74643,6 +74673,7 @@ exports[`Locale Provider should display the text as it 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -74729,6 +74760,7 @@ exports[`Locale Provider should display the text as it 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -79239,6 +79271,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -79325,6 +79358,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -83835,6 +83869,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -83921,6 +83956,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -88431,6 +88467,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -88517,6 +88554,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -93027,6 +93065,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -93113,6 +93152,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -97623,6 +97663,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -97709,6 +97750,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -102219,6 +102261,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -102305,6 +102348,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -106815,6 +106859,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -106901,6 +106946,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -111411,6 +111457,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -111497,6 +111544,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -116007,6 +116055,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -116093,6 +116142,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -120603,6 +120653,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -120689,6 +120740,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -125199,6 +125251,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -125285,6 +125338,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -129795,6 +129849,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -129881,6 +129936,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -134391,6 +134447,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -134477,6 +134534,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -138987,6 +139045,7 @@ exports[`Locale Provider should display the text as th 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -139073,6 +139132,7 @@ exports[`Locale Provider should display the text as th 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -143583,6 +143643,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -143669,6 +143730,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -148179,6 +148241,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -148265,6 +148328,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -152775,6 +152839,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -152861,6 +152926,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -157371,6 +157437,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -157457,6 +157524,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -161967,6 +162035,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
@@ -162053,6 +162122,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
             <input
               class="ant-checkbox-input"
               type="checkbox"
+              value="on"
             />
             <span
               class="ant-checkbox-inner"
diff --git a/components/tree/__tests__/__snapshots__/demo.test.js.snap b/components/tree/__tests__/__snapshots__/demo.test.js.snap
index 814330530c..206afb3f41 100644
--- a/components/tree/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/tree/__tests__/__snapshots__/demo.test.js.snap
@@ -37,7 +37,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
         class="ant-tree-treenode-disabled"
       >
         <span
-          class="ant-tree-switcher ant-tree-switcher_open ant-tree-switcher-disabled"
+          class="ant-tree-switcher ant-tree-switcher_open"
         />
         <span
           class="ant-tree-checkbox ant-tree-checkbox-checked ant-tree-checkbox-disabled"
diff --git a/components/upload/__tests__/uploadlist.test.js b/components/upload/__tests__/uploadlist.test.js
index af439b0398..659b074802 100644
--- a/components/upload/__tests__/uploadlist.test.js
+++ b/components/upload/__tests__/uploadlist.test.js
@@ -258,7 +258,7 @@ describe('Upload List', () => {
       </Upload>
     );
     wrapper.setState({});
-    await delay(0);
+    await delay(10);
     expect(wrapper.state().fileList[2].thumbUrl).not.toBeFalsy();
   });
 });
diff --git a/package.json b/package.json
index 78f10bcc45..bd3c1cc280 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@types/react": "^16.0.0",
     "@types/react-dom": "^16.0.0",
     "ansi-styles": "^3.2.0",
-    "antd-tools": "^5.1.0",
+    "antd-tools": "^5.1.2",
     "babel-cli": "^6.18.0",
     "babel-eslint": "^8.1.1",
     "babel-plugin-import": "^1.0.0",
@@ -199,14 +199,14 @@
   },
   "lint-staged": {
     "components/**/*.tsx": [
-      "lint-staged:ts"
+      "npm run lint-staged:ts"
     ],
     "{tests,site,scripts,components}/**/*.{js,jsx}": [
-      "lint-staged:es"
+      "npm run lint-staged:es"
     ],
     "{site,components}/**/*.less": "stylelint --syntax less",
     "components/*/demo/*.md": [
-      "lint-staged:demo"
+      "npm run lint-staged:demo"
     ]
   },
   "pre-commit": [
diff --git a/tests/setup.js b/tests/setup.js
index fa3a247a0b..5b0168f9a5 100644
--- a/tests/setup.js
+++ b/tests/setup.js
@@ -1,12 +1,5 @@
 /* eslint-disable global-require */
-import { jsdom } from 'jsdom';
-
-// fixed jsdom miss
 if (typeof window !== 'undefined') {
-  const documentHTML = '<!doctype html><html><body><div id="root"></div></body></html>';
-  global.document = jsdom(documentHTML);
-  global.window = document.parentWindow;
-
   global.window.resizeTo = (width, height) => {
     global.window.innerWidth = width || global.window.innerWidth;
     global.window.innerHeight = height || global.window.innerHeight;
@@ -14,10 +7,16 @@ if (typeof window !== 'undefined') {
   };
 }
 
-global.requestAnimationFrame = global.requestAnimationFrame || function (cb) {
+// The built-in requestAnimationFrame and cancelAnimationFrame not working with jest.runFakeTimes()
+// https://github.com/facebook/jest/issues/5147
+global.requestAnimationFrame = function (cb) {
   return setTimeout(cb, 0);
 };
 
+global.cancelAnimationFrame = function (cb) {
+  return clearTimeout(cb, 0);
+};
+
 const Enzyme = require('enzyme');
 
 let Adapter;

From 442673a93442ee3c93dff962c42db7e5627c34d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Mar 2018 21:28:35 +0800
Subject: [PATCH 33/36] Update typescript requirement to ~2.7.2 (#9522)

Updates the requirements on [typescript](https://github.com/Microsoft/TypeScript) to permit the latest version.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/commits/v2.7.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bd3c1cc280..0e3c9d4638 100644
--- a/package.json
+++ b/package.json
@@ -161,7 +161,7 @@
     "scrollama": "^1.4.1",
     "stylelint": "^9.1.1",
     "stylelint-config-standard": "^18.0.0",
-    "typescript": "~2.6.1",
+    "typescript": "~2.7.2",
     "unified": "^6.1.5",
     "values.js": "^1.0.3",
     "xhr2": "^0.1.3"

From 2f427e172af825b217a0813fe3ee4f3b0eaf6f61 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 6 Mar 2018 21:28:54 +0800
Subject: [PATCH 34/36] Fix a ts error

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

diff --git a/components/_util/throttleByAnimationFrame.tsx b/components/_util/throttleByAnimationFrame.tsx
index 213b213d5d..a1c9279ca1 100644
--- a/components/_util/throttleByAnimationFrame.tsx
+++ b/components/_util/throttleByAnimationFrame.tsx
@@ -2,7 +2,7 @@ import getRequestAnimationFrame, { cancelRequestAnimationFrame } from '../_util/
 
 const reqAnimFrame = getRequestAnimationFrame();
 
-export default function throttleByAnimationFrame(fn: () => void) {
+export default function throttleByAnimationFrame(fn: (...args: any[]) => void) {
   let requestId: number | null;
 
   const later = (args: any[]) => () => {

From 324e07fbf0259e1da9e4b53cbd57d1af64a12402 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Mar 2018 21:29:54 +0800
Subject: [PATCH 35/36] build: update react-slick requirement to ~0.20.0
 (#9543)

Updates the requirements on [react-slick](https://github.com/akiran/react-slick) to permit the latest version.
- [Changelog](https://github.com/akiran/react-slick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/akiran/react-slick/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0e3c9d4638..dfda7d18d1 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "rc-upload": "~2.4.0",
     "rc-util": "^4.0.4",
     "react-lazy-load": "^3.0.12",
-    "react-slick": "~0.19.0",
+    "react-slick": "~0.20.0",
     "shallowequal": "^1.0.1",
     "warning": "~3.0.0"
   },

From 15e69d09ca622f201af6fbb44fc577855fa5cfdb Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 6 Mar 2018 21:47:05 +0800
Subject: [PATCH 36/36] Fix test cases

---
 components/back-top/__tests__/index.test.js   |  2 +-
 .../__tests__/__snapshots__/demo.test.js.snap | 23 +++++++++++++++----
 .../upload/__tests__/uploadlist.test.js       |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/components/back-top/__tests__/index.test.js b/components/back-top/__tests__/index.test.js
index 614fe8c8d8..305147cb81 100644
--- a/components/back-top/__tests__/index.test.js
+++ b/components/back-top/__tests__/index.test.js
@@ -19,6 +19,6 @@ describe('BackTop', () => {
     jest.runAllTimers();
     wrapper.find('.ant-back-top').simulate('click');
     jest.runAllTimers();
-    expect(Math.round(document.documentElement.scrollTop)).toBe(0);
+    expect(Math.abs(Math.round(document.documentElement.scrollTop))).toBe(0);
   });
 });
diff --git a/components/carousel/__tests__/__snapshots__/demo.test.js.snap b/components/carousel/__tests__/__snapshots__/demo.test.js.snap
index f4cf22b15c..56dde97843 100644
--- a/components/carousel/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/carousel/__tests__/__snapshots__/demo.test.js.snap
@@ -16,6 +16,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="-1"
+          tabindex="-1"
         >
           <h3>
             4
@@ -64,6 +65,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="4"
+          tabindex="-1"
         >
           <h3>
             1
@@ -72,6 +74,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="5"
+          tabindex="-1"
         >
           <h3>
             2
@@ -80,6 +83,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="6"
+          tabindex="-1"
         >
           <h3>
             3
@@ -88,6 +92,7 @@ exports[`renders ./components/carousel/demo/autoplay.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="7"
+          tabindex="-1"
         >
           <h3>
             4
@@ -115,6 +120,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="-1"
+          tabindex="-1"
         >
           <h3>
             4
@@ -163,6 +169,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="4"
+          tabindex="-1"
         >
           <h3>
             1
@@ -171,6 +178,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="5"
+          tabindex="-1"
         >
           <h3>
             2
@@ -179,6 +187,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="6"
+          tabindex="-1"
         >
           <h3>
             3
@@ -187,6 +196,7 @@ exports[`renders ./components/carousel/demo/basic.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="7"
+          tabindex="-1"
         >
           <h3>
             4
@@ -214,7 +224,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
         <div
           class="slick-slide slick-active slick-cloned slick-current"
           data-index="0"
-          style="outline:none;position:relative;left:0;opacity:1;visibility:visible;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
+          style="outline:none;position:relative;left:0;opacity:1;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
           tabindex="-1"
         >
           <h3>
@@ -224,7 +234,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="1"
-          style="outline:none;position:relative;left:0;opacity:0;visibility:hidden;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
+          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
           tabindex="-1"
         >
           <h3>
@@ -234,7 +244,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="2"
-          style="outline:none;position:relative;left:0;opacity:0;visibility:hidden;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
+          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
           tabindex="-1"
         >
           <h3>
@@ -244,7 +254,7 @@ exports[`renders ./components/carousel/demo/fade.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="3"
-          style="outline:none;position:relative;left:0;opacity:0;visibility:hidden;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
+          style="outline:none;position:relative;left:0;opacity:0;transition:opacity 500ms ease, visibility 500ms ease;-webkit-transition:opacity 500ms ease, visibility 500ms ease"
           tabindex="-1"
         >
           <h3>
@@ -273,6 +283,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="-1"
+          tabindex="-1"
         >
           <h3>
             4
@@ -321,6 +332,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="4"
+          tabindex="-1"
         >
           <h3>
             1
@@ -329,6 +341,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="5"
+          tabindex="-1"
         >
           <h3>
             2
@@ -337,6 +350,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="6"
+          tabindex="-1"
         >
           <h3>
             3
@@ -345,6 +359,7 @@ exports[`renders ./components/carousel/demo/vertical.md correctly 1`] = `
         <div
           class="slick-slide slick-cloned"
           data-index="7"
+          tabindex="-1"
         >
           <h3>
             4
diff --git a/components/upload/__tests__/uploadlist.test.js b/components/upload/__tests__/uploadlist.test.js
index 659b074802..f555b0463b 100644
--- a/components/upload/__tests__/uploadlist.test.js
+++ b/components/upload/__tests__/uploadlist.test.js
@@ -258,7 +258,7 @@ describe('Upload List', () => {
       </Upload>
     );
     wrapper.setState({});
-    await delay(10);
+    await delay(20);
     expect(wrapper.state().fileList[2].thumbUrl).not.toBeFalsy();
   });
 });