Fix ts error temporarily, DefinitelyTyped/DefinitelyTyped#25342

3.4.4
Fix upload onChange arg type when beforeUpload return false, close #10293
2026-02-15 13:59:19 +08:00 · 2018-04-28 15:02:25 +08:00 · 2018-04-28 14:32:20 +08:00 · 2018-04-28 14:17:29 +08:00 · 2018-04-28 14:17:01 +08:00 · 2018-04-23 17:23:35 +08:00
123 changed files with 3176 additions and 1677 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -61,6 +61,7 @@ if (process.env.RUN_ENV === 'DEMO') {
    'no-console': 0,
    'no-plusplus': 0,
    'eol-last': 0,
+    'no-script-url': 0,
    'prefer-rest-params': 0,
    'react/no-multi-comp': 0,
    'react/prefer-stateless-function': 0,
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ matrix:
      - env: REACT=15 TEST_TYPE=test:es
      - env: REACT=15 TEST_TYPE=test:dom
      - env: REACT=15 TEST_TYPE=test:node
-      - env: REACT=16 TEST_TYPE=bisheng:build

 before_script:
  - scripts/install-react.sh
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -15,6 +15,53 @@ timeline: true

 ---

+## 3.4.4
+
+`2018-04-28`
+
+- 🐞 Fix that Upload file in`onChange({ file })` is not a File instance introduced in `3.4.2`. [#10293](https://github.com/ant-design/ant-design/issues/10293)
+- 🐞 Fix style lose bug when use tree shaking in webpack@4. [#10217](https://github.com/ant-design/ant-design/pull/10217) [@whtsky](https://github.com/whtsky)
+
+## 3.4.3
+
+`2018-04-23`
+
+- 🐞 Fix style lose bug when use tree shaking in webpack@4. [#10197](https://github.com/ant-design/ant-design/pull/10197) [@Aladdin-ADD](https://github.com/Aladdin-ADD)
+- 🐞 Fix `Menu` item's clickable region in dark theme. [#10187](https://github.com/ant-design/ant-design/pull/10187) [@dgeibi ](https://github.com/dgeibi )
+
+## 3.4.2
+
+`2018-04-22`
+
+- 💄 Deployed site by [netlify](http://netlify.com/) to avoid blocking by GFW.
+- 🐞 Fix TypeScript definitions of Menu, Tooltip, Card, Anchor, Avatar, Form, Tabs, Transfer, Tree, AutoComplete and etc.
+- 💄 Added `sideEffects` to `package.json` for better Tree-Shaking. [#10043](https://github.com/ant-design/ant-design/pull/10043) [@Aladdin-ADD](https://github.com/Aladdin-ADD)
+- List
+  - 🐞 Fix extra border. [#10028](https://github.com/ant-design/ant-design/issues/10028)
+  - 🐞 Fix extra prop warning of `locale`. [#10128](https://github.com/ant-design/ant-design/pull/10128) [@slonoed](https://github.com/slonoed)
+- 🐞 Fix wrong preview image of Upload list when file.url contains url params. [#10102](https://github.com/ant-design/ant-design/issues/10102)
+- 🐞 Fix Progress when percent is out of range. [0eb8357](https://github.com/ant-design/ant-design/commit/0eb835772dbaa7ed14babe03fc177821c5bd5ca5)
+- Menu
+  - 🐞 Fix arrow style of disabled SubMenu. [#10113](https://github.com/ant-design/ant-design/issues/10113)
+  - 🐞 Fix that menu width is wrong when `collapsedWidth` is assigned as px string like `40px`. [#10140](https://github.com/ant-design/ant-design/issues/10140)
+- 🐞 Fix that sometimes controlled input in Form cannot be edited. [#9790](https://github.com/ant-design/ant-design/issues/9790)
+- 🐞 Fix padding jumping issue of loading Card. [#10052](https://github.com/ant-design/ant-design/pull/10052) [@zheeeng](https://github.com/zheeeng)
+- 🐞 Fix that Avatar's fallback text don't scale as the text avatar does. [#10184](https://github.com/ant-design/ant-design/pull/10184)
+- 🐞 Fix Table `getCheckboxProps` cannot be updated as expected. [#10133](https://github.com/ant-design/ant-design/issues/10133)
+- 🐞 Fix CheckboxGroup `prefixCls` prop not passed to Checkbox. [#9950](https://github.com/ant-design/ant-design/issues/9950)
+
+## 3.4.1
+
+`2018-04-08`
+
+- 🐞 Fix TypeScript type error caused by code error of Badge. [#9931](https://github.com/ant-design/ant-design/issues/9931)
+- 💄 Improve clicking region of Card `actions`. [#9882](https://github.com/ant-design/ant-design/issues/9882)
+- 🐞 Fix Divider style issue when used with float elements. [#9956](https://github.com/ant-design/ant-design/issues/9956)
+- 🐞 Fix style issue of Form in advanced-search mode. [#9907](https://github.com/ant-design/ant-design/issues/9907)
+- 🐞 Add `onHeaderRow` TypeScript type definitions for Table. [#9902](https://github.com/ant-design/ant-design/pull/9902) [@Nokecy](https://github.com/Nokecy)
+- 💄 Improve the customized-icon demo of Tree. [#9893](https://github.com/ant-design/ant-design/pull/9893)
+- 🐞 Fix image url display with non-image extention in Upload. [#9936](https://github.com/ant-design/ant-design/pull/9936)
+
 ## 3.4.0

 `2018-04-01`
@@ -30,7 +77,7 @@ timeline: true
 - 🐞 Fixed a less syntax error. [#9832](https://github.com/ant-design/ant-design/pull/9832) [@jojoLockLock](https://github.com/jojoLockLock)
 - 🐞 Fixed `moment.locale` invoking error in LocaleProvider. [#9853](https://github.com/ant-design/ant-design/pull/9853)
 - 🐞 Fixed issue resulting in `style` of WeekPicker not works. [#9848](https://github.com/ant-design/ant-design/issues/9848)
- 🐞 Fixed type definition of  Layout.Sider. [#9885](https://github.com/ant-design/ant-design/pull/9885) [@zachguo](https://github.com/zachguo)
+- 🐞 Fixed type definition of Layout.Sider. [#9885](https://github.com/ant-design/ant-design/pull/9885) [@zachguo](https://github.com/zachguo)
 - 💄 Improved style of Modal for long contents. [#9592](https://github.com/ant-design/ant-design/pull/9592)
 - 🌟 Added new locale Slovenian.

@@ -153,7 +200,7 @@ timeline: true
  - 🐞 Fix issue resulting date panel being closed without animation when click on the preset range. [#6364](https://github.com/ant-design/ant-design/issues/6364)
  - 🐞 Fix issue resulting `onOk` is not being trigged, when click on the preset range. [#7747](https://github.com/ant-design/ant-design/issues/7747)
 - Select
-  - 🌟 Improve `onChange`、`onDeselect`, they will receive selected `Option` as second paramteter.
+  - 🌟 Improve `onChange`, `onDeselect`, they will receive selected `Option` as second paramteter.
  - 🐞 Fix issue resulting in `onSelect` is not trigged when using automatic tokenization. [#9094](https://github.com/ant-design/ant-design/issues/9094)
  - 🐞 Fix the missing scrollbar in Chrome.
 - 🌟 Improve Table's `rowSelection[getCheckboxProps]` prop, now the all the properties returned by `getCheckboxProps` will be passed to checkbox. [#9054](https://github.com/ant-design/ant-design/pull/9054) [@mgrdevport](https://github.com/ant-design/ant-design/pull/9054)
@@ -418,7 +465,7 @@ We provide a [migration tool](https://github.com/ant-design/antd-migration-helpe
  - 🌟 `status` can use whith `children` now. [#8164](https://github.com/ant-design/ant-design/issues/8164)
 - Card
  - 🌟 Added new `inner` type. [Demo](https://ant.design/components/card/#components-card-demo-inner)。
-  - 🌟 Added `cover`、`actions` and a new `Meta` component. [Demo](https://ant.design/components/card/#components-card-demo-meta)。
+  - 🌟 Added `cover`, `actions` and a new `Meta` component. [Demo](https://ant.design/components/card/#components-card-demo-meta)。
 - DatePicker
  - 🌟 Added `mode` and `onPanelChange`，to allow controlling the panel mode. [Demo](https://ant.design/components/date-picker/#components-date-picker-demo-mode)。
  - 🌟 Added `WeekPicker` component. [Demo](https://ant.design/components/date-picker/#components-date-picker-demo-basic)
@@ -454,7 +501,7 @@ We provide a [migration tool](https://github.com/ant-design/antd-migration-helpe
  - 🌟 Added `column[defaultSortOrder]` to allow setting default sort order. [#8111](https://github.com/ant-design/ant-design/pull/8111) [@megawac](https://github.com/megawac)
  - 🌟 Added `rowSelection[fixed]` to allow fixing the selection column.。
  - 🙅 Deprecated `getBodyWrapper`, please use `components` instead.
-  - 🙅 Deprecated `onRowClick`，`onRowDoubleClick`、`onRowContextMenu`、`onRowMouseEnter`、`onRowMouseLeave`, please use `onRow` instead.
+  - 🙅 Deprecated `onRowClick`，`onRowDoubleClick`, `onRowContextMenu`, `onRowMouseEnter`, `onRowMouseLeave`, please use `onRow` instead.
    ```javascript
    <Table onRow={(record) => ({
      onClick: () => {},
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -15,6 +15,53 @@ timeline: true

 ---

+## 3.4.4
+
+`2018-04-28`
+
+- 🐞 修复 3.4.2 中引入的 Upload 中 onChange 参数 `{ file }` file 不是 File 实例的问题。[#10293](https://github.com/ant-design/ant-design/issues/10293)
+- 🐞 修复 webpack@4 下使用 Tree Shaking 样式丢失的问题。[#10217](https://github.com/ant-design/ant-design/pull/10217) [@whtsky](https://github.com/whtsky)
+
+## 3.4.3
+
+`2018-04-23`
+
+- 🐞 修复了 webpack@4 下使用 Tree Shaking 样式丢失的问题。[#10197](https://github.com/ant-design/ant-design/pull/10197) [@Aladdin-ADD](https://github.com/Aladdin-ADD)
+- 🐞 修复 `Menu` 组件在 `dark` 主题下点击区域的问题。[#10187](https://github.com/ant-design/ant-design/pull/10187) [@dgeibi](https://github.com/dgeibi)
+
+## 3.4.2
+
+`2018-04-22`
+
+- 💄 部署网站到 [netlify](http://netlify.com/)，解决网站被墙的问题。
+- 🐞 修复和调整 Menu、Tooltip、Card、Anchor、Avatar、Form、Tabs、Transfer、Tree、AutoComplete 等组件的 TypeScript 定义。
+- 💄 增加 `sideEffects` 配置以优化 Tree Shaking 效果。[#10043](https://github.com/ant-design/ant-design/pull/10043) [@Aladdin-ADD](https://github.com/Aladdin-ADD)
+- List
+  - 🐞 修复多余边框问题。[#10028](https://github.com/ant-design/ant-design/issues/10028)
+  - 🐞 修复 `locale` 属性被传递给 div 的警告。[#10128](https://github.com/ant-design/ant-design/pull/10128) [@slonoed](https://github.com/slonoed)
+- 🐞 修复 Upload 的文件 url 带有参数时，图片预览效果失效的问题。[#10102](https://github.com/ant-design/ant-design/issues/10102)
+- 🐞 修复 Progress 的百分比越界时的展现。[0eb8357](https://github.com/ant-design/ant-design/commit/0eb835772dbaa7ed14babe03fc177821c5bd5ca5)
+- Menu
+  - 🐞 修复 SubMenu 的失效箭头样式。[#10113](https://github.com/ant-design/ant-design/issues/10113)
+  - 🐞 修复 `collapsedWidth` 为像素字符串 `40px` 菜单宽度失效的问题。[#10140](https://github.com/ant-design/ant-design/issues/10140)
+- 🐞 修复一个某些情况下 Form 内使用受控组件时无法编辑的问题。[#9790](https://github.com/ant-design/ant-design/issues/9790)
+- 🐞 修复 Card 切换 loading 状态时的内边距跳动问题。[#10052](https://github.com/ant-design/ant-design/pull/10052) [@zheeeng](https://github.com/zheeeng)
+- 🐞 修复 Avatar 图片加载失败时的文字没有正确缩放的问题。[#10184](https://github.com/ant-design/ant-design/pull/10184)
+- 🐞 修复 Table 的 `getCheckboxProps` 无法动态更新的问题。[#10133](https://github.com/ant-design/ant-design/issues/10133)
+- 🐞 修复 CheckGroup 指定 `prefixCls` 没有传递给 Checkbox 的问题。[#9950](https://github.com/ant-design/ant-design/issues/9950)
+
+## 3.4.1
+
+`2018-04-08`
+
+- 🐞 修复了 Badge 代码错误引起的 TypeScript 类型报错。[#9931](https://github.com/ant-design/ant-design/issues/9931)
+- 💄 优化了 Card `actions` 点击区域的范围。[#9882](https://github.com/ant-design/ant-design/issues/9882)
+- 🐞 修复了 Divider 与浮动元素一起使用时的样式问题。[#9956](https://github.com/ant-design/ant-design/issues/9956)
+- 🐞 修复了 Form 高级搜索模式下的样式问题。[#9907](https://github.com/ant-design/ant-design/issues/9907)
+- 🐞 补充了 Table 缺失的 `onHeaderRow` TypeScript 定义。[#9902](https://github.com/ant-design/ant-design/pull/9902) [@Nokecy](https://github.com/Nokecy)
+- 💄 优化了 Tree 自定义图标示例。[#9893](https://github.com/ant-design/ant-design/pull/9893)
+- 🐞 修复了 Upload 对无扩展名图片地址的预览展示问题。[#9936](https://github.com/ant-design/ant-design/pull/9936)
+
 ## 3.4.0

 `2018-04-01`
--- a/README-zh_CN.md
+++ b/README-zh_CN.md
@@ -88,6 +88,7 @@ import 'antd/dist/antd.css';  // or 'antd/dist/antd.less'

 ```bash
 $ git clone git@github.com:ant-design/ant-design.git
+$ cd ant-design
 $ npm install
 $ npm start
 ```
--- a/components/_util/type.ts
+++ b/components/_util/type.ts
@@ -0,0 +1,3 @@
+export type Diff<T extends string, U extends string> = ({ [P in T]: P } &
+  { [P in U]: never } & { [x: string]: never })[T];
+export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
--- a/components/alert/demo/smooth-closed.md
+++ b/components/alert/demo/smooth-closed.md
@@ -18,16 +18,16 @@ import { Alert } from 'antd';

 class App extends React.Component {
  state = {
-    visiable: true,
+    visible: true,
  }
  handleClose = () => {
-    this.setState({ visiable: false });
+    this.setState({ visible: false });
  }
  render() {
    return (
      <div>
        {
-          this.state.visiable ? (
+          this.state.visible ? (
            <Alert
              message="Alert Message Text"
              type="success"
--- a/components/anchor/Anchor.tsx
+++ b/components/anchor/Anchor.tsx
@@ -221,7 +221,8 @@ export default class Anchor extends React.Component<AnchorProps, any> {
      return;
    }
    const { prefixCls } = this.props;
-    const linkNode = ReactDOM.findDOMNode(this as any).getElementsByClassName(`${prefixCls}-link-title-active`)[0];
+    const anchorNode = ReactDOM.findDOMNode(this) as Element;
+    const linkNode = anchorNode.getElementsByClassName(`${prefixCls}-link-title-active`)[0];
    if (linkNode) {
      this.inkNode.style.top = `${(linkNode as any).offsetTop + linkNode.clientHeight / 2 - 4.5}px`;
    }
--- a/components/auto-complete/index.tsx
+++ b/components/auto-complete/index.tsx
@@ -21,7 +21,7 @@ export type ValidInputElement =
 export interface AutoCompleteProps extends AbstractSelectProps {
  value?: SelectValue;
  defaultValue?: SelectValue;
-  dataSource: DataSourceItemType[];
+  dataSource?: DataSourceItemType[];
  optionLabelProp?: string;
  onChange?: (value: SelectValue) => void;
  onSelect?: (value: SelectValue, option: Object) => any;
--- a/components/avatar/tests/Avatar.test.js
+++ b/components/avatar/tests/Avatar.test.js
@@ -8,4 +8,22 @@ describe('Avatar Render', () => {
    const children = wrapper.find('.ant-avatar-string');
    expect(children.length).toBe(1);
  });
+
+  it('should render fallback string correctly', () => {
+    const div = global.document.createElement('div');
+    global.document.body.appendChild(div);
+
+    const wrapper = mount(<Avatar src="http://error.url">Fallback</Avatar>, { attachTo: div });
+    wrapper.instance().setScale = jest.fn(() => wrapper.instance().setState({ scale: 0.5 }));
+    wrapper.setState({ isImgExist: false });
+
+    const children = wrapper.find('.ant-avatar-string');
+    expect(children.length).toBe(1);
+    expect(children.text()).toBe('Fallback');
+    expect(wrapper.instance().setScale).toBeCalled();
+    expect(div.querySelector('.ant-avatar-string').style.transform).toBe('scale(0.5)');
+
+    wrapper.detach();
+    global.document.body.removeChild(div);
+  });
 });
--- a/components/avatar/index.tsx
+++ b/components/avatar/index.tsx
@@ -46,7 +46,8 @@ export default class Avatar extends React.Component<AvatarProps, AvatarState> {

  componentDidUpdate(prevProps: AvatarProps, prevState: AvatarState) {
    if (prevProps.children !== this.props.children
-        || (prevState.scale !== this.state.scale && this.state.scale === 1)) {
+        || (prevState.scale !== this.state.scale && this.state.scale === 1)
+        || (prevState.isImgExist !== this.state.isImgExist)) {
      this.setScale();
    }
  }
@@ -55,7 +56,8 @@ export default class Avatar extends React.Component<AvatarProps, AvatarState> {
    const childrenNode = this.avatarChildren;
    if (childrenNode) {
      const childrenWidth = childrenNode.offsetWidth;
-      const avatarWidth = ReactDOM.findDOMNode(this).getBoundingClientRect().width;
+      const avatarNode = ReactDOM.findDOMNode(this) as Element;
+      const avatarWidth = avatarNode.getBoundingClientRect().width;
      // add 4px gap for each side to get better performance
      if (avatarWidth - 8 < childrenWidth) {
        this.setState({
--- a/components/badge/ScrollNumber.tsx
+++ b/components/badge/ScrollNumber.tsx
@@ -106,7 +106,7 @@ export default class ScrollNumber extends Component<ScrollNumberProps, ScrollNum
    return createElement('span', {
      className: `${this.props.prefixCls}-only`,
      style: {
-        transition: removeTransition && 'none',
+        transition: removeTransition ? 'none' : undefined,
        msTransform: `translateY(${-position * 100}%)`,
        WebkitTransform: `translateY(${-position * 100}%)`,
        transform: `translateY(${-position * 100}%)`,
--- a/components/button/tests/snapshots/demo.test.js.snap
+++ b/components/button/tests/snapshots/demo.test.js.snap
@@ -212,7 +212,7 @@ exports[`renders ./components/button/demo/disabled.md correctly 1`] = `
  </button>
  <br />
  <button
-    class="ant-btn"
+    class="ant-btn ant-btn-background-ghost"
    type="button"
  >
    <span>
@@ -220,7 +220,7 @@ exports[`renders ./components/button/demo/disabled.md correctly 1`] = `
    </span>
  </button>
  <button
-    class="ant-btn"
+    class="ant-btn ant-btn-background-ghost"
    disabled=""
    type="button"
  >
--- a/components/button/button.tsx
+++ b/components/button/button.tsx
@@ -34,7 +34,7 @@ function insertSpace(child: React.ReactChild, needInserted: boolean) {
  return child;
 }

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

--- a/components/button/demo/disabled.md
+++ b/components/button/demo/disabled.md
@@ -24,8 +24,8 @@ ReactDOM.render(
    <Button>Default</Button>
    <Button disabled>Default(disabled)</Button>
    <br />
-    <Button>Ghost</Button>
-    <Button disabled>Ghost(disabled)</Button>
+    <Button ghost>Ghost</Button>
+    <Button ghost disabled>Ghost(disabled)</Button>
    <br />
    <Button type="dashed">Dashed</Button>
    <Button type="dashed" disabled>Dashed(disabled)</Button>
--- a/components/card/tests/snapshots/demo.test.js.snap
+++ b/components/card/tests/snapshots/demo.test.js.snap
@@ -371,79 +371,175 @@ exports[`renders ./components/card/demo/inner.md correctly 1`] = `
 `;

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

--- a/components/card/demo/loading.md
+++ b/components/card/demo/loading.md
@@ -14,11 +14,30 @@ title:
 Shows a loading indicator while the contents of the card is being fetched.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 describe('CheckboxGroup', () => {
@@ -51,4 +51,17 @@ describe('CheckboxGroup', () => {
    groupWrapper.find('.ant-checkbox-input').at(1).simulate('change');
    expect(onChangeGroup).toBeCalledWith(['Apple']);
  });
+
+  it('passes prefixCls down to checkbox', () => {
+    const options = [
+      { label: 'Apple', value: 'Apple' },
+      { label: 'Orange', value: 'Orange' },
+    ];
+
+    const wrapper = render(
+      <Checkbox.Group prefixCls="my-checkbox" options={options} />
+    );
+
+    expect(wrapper).toMatchSnapshot();
+  });
 });
--- a/components/date-picker/WeekPicker.tsx
+++ b/components/date-picker/WeekPicker.tsx
@@ -51,7 +51,7 @@ export default class WeekPicker extends React.Component<any, any> {
      );
    }
    return (
-      <div className={`${prefixCls}-calendar-date`}>
+      <div className={`${prefixCls}-date`}>
        {current.date()}
      </div>
    );
--- a/components/date-picker/tests/snapshots/other.test.js.snap
+++ b/components/date-picker/tests/snapshots/other.test.js.snap
@@ -443,7 +443,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月27日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      27
                    </div>
@@ -454,7 +454,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月28日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      28
                    </div>
@@ -465,7 +465,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月29日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      29
                    </div>
@@ -476,7 +476,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月30日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      30
                    </div>
@@ -487,7 +487,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="1999年12月31日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      31
                    </div>
@@ -539,7 +539,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月3日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      3
                    </div>
@@ -550,7 +550,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月4日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      4
                    </div>
@@ -561,7 +561,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月5日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      5
                    </div>
@@ -572,7 +572,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月6日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      6
                    </div>
@@ -583,7 +583,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月7日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      7
                    </div>
@@ -594,7 +594,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月8日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      8
                    </div>
@@ -605,7 +605,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月9日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      9
                    </div>
@@ -627,7 +627,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月10日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      10
                    </div>
@@ -638,7 +638,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月11日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      11
                    </div>
@@ -649,7 +649,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月12日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      12
                    </div>
@@ -660,7 +660,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月13日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      13
                    </div>
@@ -671,7 +671,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月14日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      14
                    </div>
@@ -682,7 +682,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月15日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      15
                    </div>
@@ -693,7 +693,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月16日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      16
                    </div>
@@ -715,7 +715,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月17日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      17
                    </div>
@@ -726,7 +726,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月18日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      18
                    </div>
@@ -737,7 +737,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月19日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      19
                    </div>
@@ -748,7 +748,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月20日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      20
                    </div>
@@ -759,7 +759,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月21日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      21
                    </div>
@@ -770,7 +770,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月22日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      22
                    </div>
@@ -781,7 +781,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月23日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      23
                    </div>
@@ -803,7 +803,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月24日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      24
                    </div>
@@ -814,7 +814,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月25日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      25
                    </div>
@@ -825,7 +825,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月26日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      26
                    </div>
@@ -836,7 +836,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月27日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      27
                    </div>
@@ -847,7 +847,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月28日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      28
                    </div>
@@ -858,7 +858,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月29日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      29
                    </div>
@@ -869,7 +869,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月30日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      30
                    </div>
@@ -891,7 +891,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年1月31日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      31
                    </div>
@@ -902,7 +902,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月1日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      1
                    </div>
@@ -913,7 +913,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月2日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      2
                    </div>
@@ -924,7 +924,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月3日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      3
                    </div>
@@ -935,7 +935,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月4日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      4
                    </div>
@@ -946,7 +946,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月5日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      5
                    </div>
@@ -957,7 +957,7 @@ exports[`MonthPicker and WeekPicker render WeekPicker 1`] = `
                    title="2000年2月6日"
                  >
                    <div
-                      class="ant-calendar-calendar-date"
+                      class="ant-calendar-date"
                    >
                      6
                    </div>
--- a/components/divider/tests/snapshots/demo.test.js.snap
+++ b/components/divider/tests/snapshots/demo.test.js.snap
@@ -29,13 +29,18 @@ exports[`renders ./components/divider/demo/horizontal.md correctly 1`] = `
  <p>
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.
  </p>
+</div>
+`;
+
+exports[`renders ./components/divider/demo/orientation.md correctly 1`] = `
+<div>
  <div
    class="ant-divider ant-divider-horizontal ant-divider-with-text-left"
  >
    <span
      class="ant-divider-inner-text"
    >
-      With Text
+      Left Text
    </span>
  </div>
  <p>
@@ -47,7 +52,7 @@ exports[`renders ./components/divider/demo/horizontal.md correctly 1`] = `
    <span
      class="ant-divider-inner-text"
    >
-      With Text
+      Right Text
    </span>
  </div>
  <p>
--- a/components/divider/demo/horizontal.md
+++ b/components/divider/demo/horizontal.md
@@ -25,10 +25,6 @@ ReactDOM.render(
    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
    <Divider dashed />
    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
-    <Divider orientation="left">With Text</Divider>
-    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
-    <Divider orientation="right">With Text</Divider>
-    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
  </div>
 , mountNode);
 ````
--- a/components/divider/demo/orientation.md
+++ b/components/divider/demo/orientation.md
@@ -0,0 +1,27 @@
+---
+order: 2
+title:
+  zh-CN: 标题位置
+  en-US: Orientation of title
+---
+
+## zh-CN
+
+修改分割线标题的位置。
+
+## en-US
+
+Set orientation of divider to left or right.
+
+````jsx
+import { Divider } from 'antd';
+
+ReactDOM.render(
+  <div>
+    <Divider orientation="left">Left Text</Divider>
+    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
+    <Divider orientation="right">Right Text</Divider>
+    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed nonne merninisti licere mihi ista probare, quae sunt a te dicta? Refert tamen, quo modo.</p>
+  </div>
+, mountNode);
+````
--- a/components/divider/index.en-US.md
+++ b/components/divider/index.en-US.md
@@ -20,4 +20,4 @@ A divider line separates different content.
 | -------- | ----------- | ---- | ------- |
 | dashed | whether line is dashed | Boolean | false |
 | type | direction type of divider | enum: `horizontal` `vertical` | `horizontal` |
-| orientation | this is optional, if not set it will have the text in the center | enum: `left` `right` | `center` |
+| orientation | position of title inside divider | enum: `left` `right` `center` | `center` |
--- a/components/divider/index.zh-CN.md
+++ b/components/divider/index.zh-CN.md
@@ -18,3 +18,4 @@ subtitle: 分割线
 | --- | --- | --- | --- |
 | dashed | 是否虚线 | Boolean | false |
 | type | 水平还是垂直类型 | enum: `horizontal` `vertical` | `horizontal` |
+| orientation | 分割线标题的位置 | enum: `left` `right` | `center` |
--- a/components/divider/style/index.less
+++ b/components/divider/style/index.less
@@ -22,6 +22,7 @@
    height: 1px;
    width: 100%;
    margin: 24px 0;
+    clear: both;
  }
  &-horizontal&-with-text {
    display: table;
--- a/components/form/Form.tsx
+++ b/components/form/Form.tsx
@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import createDOMForm from 'rc-form/lib/createDOMForm';
 import createFormField from 'rc-form/lib/createFormField';
-import PureRenderMixin from 'rc-util/lib/PureRenderMixin';
 import omit from 'omit.js';
 import warning from '../_util/warning';
 import FormItem from './FormItem';
 import { FIELD_META_PROP, FIELD_DATA_PROP } from './constants';
+import { Omit } from '../_util/type';

 export interface FormCreateOption<T> {
  onFieldsChange?: (props: T, fields: Array<any>) => void;
@@ -16,8 +16,10 @@ export interface FormCreateOption<T> {
  withRef?: boolean;
 }

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

-export type Diff<T extends string, U extends string> =
-  ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
-export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
-
 export interface ComponentDecorator {
  <P extends FormComponentProps>(
    component: React.ComponentClass<P> | React.SFC<P>,
@@ -126,7 +124,7 @@ export interface ComponentDecorator {
 export default class Form extends React.Component<FormProps, any> {
  static defaultProps = {
    prefixCls: 'ant-form',
-    layout: 'horizontal',
+    layout: 'horizontal' as FormLayout,
    hideRequiredMark: false,
    onSubmit(e: React.FormEvent<HTMLFormElement>) {
      e.preventDefault();
@@ -164,10 +162,6 @@ export default class Form extends React.Component<FormProps, any> {
    warning(!props.form, 'It is unnecessary to pass `form` to `Form` after antd@1.7.0.');
  }

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

-  shouldComponentUpdate(...args: any[]) {
-    return PureRenderMixin.shouldComponentUpdate.apply(this, args);
-  }
-
  getHelpMsg() {
    const props = this.props;
    const onlyControl = this.getOnlyControl();
@@ -248,7 +243,8 @@ export default class FormItem extends React.Component<FormItemProps, any> {
      if (typeof label === 'string') {
        e.preventDefault();
      }
-      const control = ReactDOM.findDOMNode(this).querySelector(`[id="${id}"]`) as HTMLElement;
+      const formItemNode = ReactDOM.findDOMNode(this) as Element;
+      const control = formItemNode.querySelector(`[id="${id}"]`) as HTMLElement;
      if (control && control.focus) {
        control.focus();
      }
--- a/components/form/tests/snapshots/demo.test.js.snap
+++ b/components/form/tests/snapshots/demo.test.js.snap
@@ -20,7 +20,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-0"
              title="Field 0"
            >
@@ -61,7 +61,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-1"
              title="Field 1"
            >
@@ -102,7 +102,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-2"
              title="Field 2"
            >
@@ -143,7 +143,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-3"
              title="Field 3"
            >
@@ -184,7 +184,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-4"
              title="Field 4"
            >
@@ -225,7 +225,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-5"
              title="Field 5"
            >
@@ -266,7 +266,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-6"
              title="Field 6"
            >
@@ -307,7 +307,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-7"
              title="Field 7"
            >
@@ -348,7 +348,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-8"
              title="Field 8"
            >
@@ -389,7 +389,7 @@ exports[`renders ./components/form/demo/advanced-search.md correctly 1`] = `
            class="ant-form-item-label"
          >
            <label
-              class=""
+              class="ant-form-item-required"
              for="field-9"
              title="Field 9"
            >
--- a/components/form/demo/advanced-search.md
+++ b/components/form/demo/advanced-search.md
@@ -52,7 +52,12 @@ class AdvancedSearchForm extends React.Component {
      children.push(
        <Col span={8} key={i} style={{ display: i < count ? 'block' : 'none' }}>
          <FormItem label={`Field ${i}`}>
-            {getFieldDecorator(`field-${i}`)(
+            {getFieldDecorator(`field-${i}`, {
+              rules: [{
+                required: true,
+                message: 'Input something!',
+              }],
+            })(
              <Input placeholder="placeholder" />
            )}
          </FormItem>
--- a/components/form/demo/customized-form-controls.md
+++ b/components/form/demo/customized-form-controls.md
@@ -28,7 +28,7 @@ class PriceInput extends React.Component {
  constructor(props) {
    super(props);

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

 ## en-US

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

 ````jsx
 import { Button, Modal, Form, Input, Radio } from 'antd';
--- a/components/form/style/index.less
+++ b/components/form/style/index.less
@@ -554,7 +554,11 @@ form {

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

--- a/components/grid/demo/responsive.md
+++ b/components/grid/demo/responsive.md
@@ -7,11 +7,11 @@ title:

 ## zh-CN

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

 ## en-US

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

 ````jsx
 import { Row, Col } from 'antd';
--- a/components/layout/Sider.tsx
+++ b/components/layout/Sider.tsx
@@ -201,12 +201,15 @@ export default class Sider extends React.Component<SiderProps, SiderState> {
        </div>
      ) : null
    );
+    // For collapsedWidth="40px"
+    // https://github.com/ant-design/ant-design/issues/10140
+    const siderWidthNumber = (siderWidth || 0).toString().replace(/px$/, '');
    const divStyle = {
      ...style,
-      flex: `0 0 ${siderWidth}px`,
-      maxWidth: `${siderWidth}px`, // Fix width transition bug in IE11
-      minWidth: `${siderWidth}px`, // https://github.com/ant-design/ant-design/issues/6349
-      width: `${siderWidth}px`,
+      flex: `0 0 ${siderWidthNumber}px`,
+      maxWidth: `${siderWidthNumber}px`, // Fix width transition bug in IE11
+      minWidth: `${siderWidthNumber}px`, // https://github.com/ant-design/ant-design/issues/6349
+      width: `${siderWidthNumber}px`,
    };
    const siderCls = classNames(className, prefixCls, {
      [`${prefixCls}-collapsed`]: !!this.state.collapsed,
--- a/components/list/tests/snapshots/demo.test.js.snap
+++ b/components/list/tests/snapshots/demo.test.js.snap
--- a/components/list/tests/snapshots/empty.test.js.snap
+++ b/components/list/tests/snapshots/empty.test.js.snap
@@ -4,18 +4,16 @@ exports[`List renders empty list 1`] = `
 <div
  class="ant-list ant-list-split"
 >
-  <div>
+  <div
+    class="ant-spin-nested-loading"
+  >
    <div
-      class="ant-spin-nested-loading"
+      class="ant-spin-container"
    >
      <div
-        class="ant-spin-container"
+        class="ant-list-empty-text"
      >
-        <div
-          class="ant-list-empty-text"
-        >
-          No data
-        </div>
+        No data
      </div>
    </div>
  </div>
--- a/components/list/tests/index.test.js
+++ b/components/list/tests/index.test.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import List from '..';
+
+const ListItem = List.Item;
+
+describe('List', () => {
+  it('locale not passed to internal div', async () => {
+    const locale = { emptyText: 'Custom text' };
+    const renderItem = item => <ListItem>{item}</ListItem>;
+    const dataSource = [];
+
+    const wrapper = mount(
+      <List renderItem={renderItem} dataSource={dataSource} locale={locale} />
+    );
+    expect(wrapper.find('div').first().props().locale).toBe(undefined);
+  });
+});
--- a/components/list/demo/basic.md
+++ b/components/list/demo/basic.md
@@ -1,7 +1,7 @@
 ---
 order: 1
 title:
-  zh-CN: 基础列表 
+  zh-CN: 基础列表
  en-US: Basic list
 ---

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

--- a/components/list/demo/infinite-load.md
+++ b/components/list/demo/infinite-load.md
@@ -38,7 +38,7 @@ class InfiniteListExample extends React.Component {
      },
    });
  }
-  componentWillMount() {
+  componentDidMount() {
    this.getData((res) => {
      this.setState({
        data: res.results,
@@ -89,7 +89,11 @@ class InfiniteListExample extends React.Component {
              </List.Item>
            )}
          >
-            {this.state.loading && this.state.hasMore && <Spin className="demo-loading" />}
+            {this.state.loading && this.state.hasMore && (
+              <div className="demo-loading-container">
+                <Spin />
+              </div>
+            )}
          </List>
        </InfiniteScroll>
      </div>
@@ -108,9 +112,10 @@ ReactDOM.render(<InfiniteListExample />, mountNode);
  padding: 8px 24px;
  height: 300px;
 }
-.demo-loading {
+.demo-loading-container {
  position: absolute;
-  bottom: -40px;
-  left: 50%;
+  bottom: 40px;
+  width: 100%;
+  text-align: center;
 }
 ````
--- a/components/list/demo/infinite-virtualized-load.md
+++ b/components/list/demo/infinite-virtualized-load.md
@@ -46,7 +46,7 @@ class VirtualizedExample extends React.Component {
      },
    });
  }
-  componentWillMount() {
+  componentDidMount() {
    this.getData((res) => {
      this.setState({
        data: res.results,
@@ -129,7 +129,7 @@ class VirtualizedExample extends React.Component {
      <List>
        {
          data.length > 0 && (
-            <WindowScroller scrollElement={null}>
+            <WindowScroller>
              {infiniteLoader}
            </WindowScroller>
          )
--- a/components/list/demo/vertical.md
+++ b/components/list/demo/vertical.md
@@ -47,6 +47,7 @@ ReactDOM.render(
    size="large"
    pagination={pagination}
    dataSource={listData}
+    footer={<div><b>ant design</b> footer part</div>}
    renderItem={item => (
      <List.Item
        key={item.title}
--- a/components/list/index.en-US.md
+++ b/components/list/index.en-US.md
@@ -23,6 +23,7 @@ A list can be used to display content related to a single subject. The content c
 | header | List header renderer | string\|ReactNode | - |
 | itemLayout | The layout of list, default is `horizontal`, If a vertical list is desired, set the itemLayout property to `vertical` | string | - |
 | loading | Shows a loading indicator while the contents of the list are being fetched | boolean\|[object](https://ant.design/components/spin-cn/#API) ([more](https://github.com/ant-design/ant-design/issues/8659)) | false |
+| locale | i18n text including empty text | object | emptyText: 'No Data' <br> |
 | loadMore | Shows a load more content | string\|ReactNode | - |
 | pagination | Pagination [config](https://ant.design/components/pagination/), hide it by setting it to false | boolean \| object | false |
 | split | Toggles rendering of the split under the list item | boolean | true |
--- a/components/list/index.tsx
+++ b/components/list/index.tsx
@@ -101,7 +101,7 @@ export default class List extends React.Component<ListProps> {
    return renderItem(item, index);
  }

-  isSomethingAfterLastTtem() {
+  isSomethingAfterLastItem() {
    const { loadMore, pagination, footer } = this.props;
    return !!(loadMore || pagination || footer);
  }
@@ -129,6 +129,7 @@ export default class List extends React.Component<ListProps> {
      header,
      footer,
      loading,
+      locale,
      ...rest,
    } = this.props;

@@ -160,17 +161,17 @@ export default class List extends React.Component<ListProps> {
      [`${prefixCls}-bordered`]: bordered,
      [`${prefixCls}-loading`]: isLoading,
      [`${prefixCls}-grid`]: grid,
-      [`${prefixCls}-something-after-last-item`]: this.isSomethingAfterLastTtem(),
+      [`${prefixCls}-something-after-last-item`]: this.isSomethingAfterLastItem(),
    });

-    const paginationContent = (
+    const paginationContent = pagination ? (
      <div className={`${prefixCls}-pagination`}>
        <Pagination {...pagination} />
      </div>
-    );
+    ) : null;

    let childrenContent;
-    childrenContent = isLoading && (<div style={{ minHeight: 53 }} />);
+    childrenContent = isLoading && <div style={{ minHeight: 53 }} />;
    if (dataSource.length > 0) {
      const items = dataSource.map((item: any, index: number) => this.renderItem(item, index));
      const childrenList = React.Children.map(items, (child: any, index) => React.cloneElement(child, {
@@ -192,20 +193,15 @@ export default class List extends React.Component<ListProps> {
      );
    }

-    const content = (
-      <div>
-        <Spin {...loadingProp}>{childrenContent}</Spin>
-        {loadMore}
-        {(!loadMore && pagination) ? paginationContent : null}
-      </div>
-    );
-
    return (
      <div className={classString} {...rest}>
        {header && <div className={`${prefixCls}-header`}>{header}</div>}
-        {content}
-        {children}
+        <Spin {...loadingProp}>
+          {childrenContent}
+          {children}
+        </Spin>
        {footer && <div className={`${prefixCls}-footer`}>{footer}</div>}
+        {loadMore || paginationContent}
      </div>
    );
  }
--- a/components/list/index.zh-CN.md
+++ b/components/list/index.zh-CN.md
@@ -24,6 +24,7 @@ cols: 1
 | header | 列表头部 | string\|ReactNode | - |
 | itemLayout | 设置 `List.Item` 布局, 设置成 `vertical` 则竖直样式显示, 默认横排 | string | - |
 | loading | 当卡片内容还在加载中时，可以用 `loading` 展示一个占位 | boolean\|[object](https://ant.design/components/spin-cn/#API) ([更多](https://github.com/ant-design/ant-design/issues/8659)) | false |
+| locale | 默认文案设置，目前包括空数据文案 | object | emptyText: '暂无数据' |
 | loadMore | 加载更多 | string\|ReactNode | - |
 | pagination | 对应的 `pagination` 配置, 设置 `false` 不显示 | boolean\|object | false |
 | size | list 的尺寸 | `default` \| `middle` \| `small` | `default` |
--- a/components/list/style/index.less
+++ b/components/list/style/index.less
@@ -137,7 +137,7 @@
    min-height: 32px;
  }

-  &-something-after-last-item &-item:last-child {
+  &-something-after-last-item .@{ant-prefix}-spin-container > &-item:last-child {
    border-bottom: 1px solid @border-color-split;
  }

@@ -196,7 +196,7 @@
    border-bottom: none;
    padding-top: 0;
    padding-bottom: 0;
-    margin-bottom: 20px;
+    margin-bottom: 16px;
    &-content {
      display: block;
    }
--- a/components/locale-provider/tests/snapshots/demo.test.js.snap
+++ b/components/locale-provider/tests/snapshots/demo.test.js.snap
@@ -1553,7 +1553,7 @@ exports[`renders ./components/locale-provider/demo/basic.md correctly 1`] = `
    <li
      aria-disabled="true"
      class="ant-pagination-disabled ant-pagination-prev"
-      title="Previous Page"
+      title="上一页"
    >
      <a
        class="ant-pagination-item-link"
@@ -1608,7 +1608,7 @@ exports[`renders ./components/locale-provider/demo/basic.md correctly 1`] = `
      aria-disabled="false"
      class=" ant-pagination-next"
      tabindex="0"
-      title="Next Page"
+      title="下一页"
    >
      <a
        class="ant-pagination-item-link"
@@ -1635,9 +1635,9 @@ exports[`renders ./components/locale-provider/demo/basic.md correctly 1`] = `
            <div
              class="ant-select-selection-selected-value"
              style="display:block;opacity:1"
-              title="10 / page"
+              title="10 条/页"
            >
-              10 / page
+              10 条/页
            </div>
          </div>
          <span
--- a/components/locale-provider/demo/all.md
+++ b/components/locale-provider/demo/all.md
@@ -125,8 +125,8 @@ class App extends React.Component {
      <div>
        <div className="change-locale">
          <span style={{ marginRight: 16 }}>Change locale of components: </span>
-          <Radio.Group defaultValue={null} onChange={this.changeLocale}>
-            <Radio.Button key="en" value={null}>English</Radio.Button>
+          <Radio.Group defaultValue={undefined} onChange={this.changeLocale}>
+            <Radio.Button key="en" value={undefined}>English</Radio.Button>
            <Radio.Button key="cn" value={zhCN}>中文</Radio.Button>
          </Radio.Group>
        </div>
--- a/components/locale-provider/demo/basic.md
+++ b/components/locale-provider/demo/basic.md
@@ -15,7 +15,7 @@ Wrap your app with `LocaleProvider`, and apply the corresponding language packag

 ````jsx
 import { Pagination, LocaleProvider } from 'antd';
-import enUS from 'antd/lib/locale-provider/en_US';
+import zhCN from 'antd/lib/locale-provider/zh_CN';

 const App = () => (
  <div>
@@ -24,7 +24,7 @@ const App = () => (
 );

 ReactDOM.render(
-  <LocaleProvider locale={enUS}>
+  <LocaleProvider locale={zhCN}>
    <App />
  </LocaleProvider>
 , mountNode);
--- a/components/locale-provider/index.tsx
+++ b/components/locale-provider/index.tsx
@@ -44,6 +44,12 @@ export default class LocaleProvider extends React.Component<LocaleProviderProps,
    antLocale: PropTypes.object,
  };

+  constructor(props: LocaleProviderProps) {
+    super(props);
+    setMomentLocale(props.locale);
+    changeConfirmLocale(props.locale && props.locale.Modal);
+  }
+
  getChildContext() {
    return {
      antLocale: {
@@ -53,11 +59,6 @@ export default class LocaleProvider extends React.Component<LocaleProviderProps,
    };
  }

-  componentWillMount() {
-    setMomentLocale(this.props.locale);
-    this.componentDidUpdate();
-  }
-
  componentWillReceiveProps(nextProps: LocaleProviderProps) {
    const { locale } = this.props;
    const nextLocale = nextProps.locale;
--- a/components/menu/index.tsx
+++ b/components/menu/index.tsx
@@ -26,9 +26,11 @@ export interface ClickParam {

 export type MenuMode = 'vertical' | 'vertical-left' | 'vertical-right' | 'horizontal' | 'inline';

+export type MenuTheme = 'light' | 'dark';
+
 export interface MenuProps {
  id?: string;
-  theme?: 'light' | 'dark';
+  theme?: MenuTheme;
  mode?: MenuMode;
  selectable?: boolean;
  selectedKeys?: Array<string>;
@@ -49,6 +51,7 @@ export interface MenuProps {
  inlineCollapsed?: boolean;
  subMenuCloseDelay?: number;
  subMenuOpenDelay?: number;
+  getPopupContainer?: (triggerNode: Element) => HTMLElement;
 }

 export interface MenuState {
@@ -63,7 +66,7 @@ export default class Menu extends React.Component<MenuProps, MenuState> {
  static defaultProps = {
    prefixCls: 'ant-menu',
    className: '',
-    theme: 'light',  // or dark
+    theme: 'light' as MenuTheme,  // or dark
  };
  static childContextTypes = {
    inlineCollapsed: PropTypes.bool,
@@ -119,8 +122,9 @@ export default class Menu extends React.Component<MenuProps, MenuState> {
    }
    if ((nextProps.inlineCollapsed && !this.props.inlineCollapsed) ||
        (nextContext.siderCollapsed && !this.context.siderCollapsed)) {
+      const menuNode = findDOMNode(this) as Element;
      this.switchModeFromInline =
-        !!this.state.openKeys.length && !!findDOMNode(this).querySelectorAll(`.${prefixCls}-submenu-open`).length;
+        !!this.state.openKeys.length && !!menuNode.querySelectorAll(`.${prefixCls}-submenu-open`).length;
      this.inlineOpenKeys = this.state.openKeys;
      this.setState({ openKeys: [] });
    }
--- a/components/menu/style/dark.less
+++ b/components/menu/style/dark.less
@@ -33,6 +33,10 @@
    border-bottom: 0;
  }

+  &-dark&-horizontal > &-item > a:before {
+    bottom: 0;
+  }
+
  &-dark &-item,
  &-dark &-item-group-title,
  &-dark &-item > a {
@@ -113,6 +117,12 @@
    }
    > .@{menu-prefix-cls}-submenu-title {
      color: @disabled-color-dark !important;
+      > .@{menu-prefix-cls}-submenu-arrow {
+        &:before,
+        &:after {
+          background: @disabled-color-dark !important;
+        }
+      }
    }
  }
 }
--- a/components/menu/style/index.less
+++ b/components/menu/style/index.less
@@ -277,16 +277,16 @@
        border-bottom: 2px solid @menu-highlight-color;
        color: @menu-highlight-color;
      }
+    }

-      > a {
-        display: block;
-        color: @menu-item-color;
-        &:hover {
-          color: @menu-highlight-color;
-        }
-        &:before {
-          bottom: -2px;
-        }
+    > .@{menu-prefix-cls}-item > a {
+      display: block;
+      color: @menu-item-color;
+      &:hover {
+        color: @menu-highlight-color;
+      }
+      &:before {
+        bottom: -2px;
      }
    }

@@ -455,6 +455,12 @@
    > .@{menu-prefix-cls}-submenu-title {
      color: @disabled-color !important;
      cursor: not-allowed;
+      > .@{menu-prefix-cls}-submenu-arrow {
+        &:before,
+        &:after {
+          background: @disabled-color !important;
+        }
+      }
    }
  }
 }
--- a/components/message/index.en-US.md
+++ b/components/message/index.en-US.md
@@ -26,7 +26,7 @@ This components provides some static methods, with usage and arguments as follow
 | Argument | Description | Type | Default |
 | -------- | ----------- | ---- | ------- |
 | content | content of the message | string\|ReactNode | - |
-| duration | time before auto-dismiss, in seconds | number | 1.5 |
+| duration | time(seconds) before auto-dismiss, don't dismiss if set to 0 | number | 1.5 |
 | onClose | Specify a function that will be called when the message is closed | Function | - |

 Methods for global configuration and destruction are also provided:
--- a/components/message/index.zh-CN.md
+++ b/components/message/index.zh-CN.md
@@ -27,7 +27,7 @@ title: Message
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
 | content | 提示内容 | string\|ReactNode | - |
-| duration | 自动关闭的延时，单位秒 | number | 3 |
+| duration | 自动关闭的延时，单位秒。设为 0 时不自动关闭。 | number | 3 |
 | onClose | 关闭时触发的回调函数 | Function | - |

 还提供了全局配置和全局销毁方法：
--- a/components/modal/Modal.tsx
+++ b/components/modal/Modal.tsx
@@ -97,7 +97,7 @@ export default class Modal extends React.Component<ModalProps, {}> {
    maskTransitionName: 'fade',
    confirmLoading: false,
    visible: false,
-    okType: 'primary',
+    okType: 'primary' as ButtonType,
  };

  static propTypes = {
--- a/components/modal/index.en-US.md
+++ b/components/modal/index.en-US.md
@@ -69,6 +69,7 @@ The properties of the object are follows:
 | title | Title | string\|ReactNode | - |
 | width | Width of the modal dialog | string\|number | 416 |
 | zIndex | The `z-index` of the Modal | Number | 1000 |
+| keyboard | Whether support press esc to close | Boolean | true |
 | onCancel | Specify a function that will be called when the user clicks the Cancel button. The parameter of this function is a function whose execution should include closing the dialog. You can also just return a promise and when the promise is resolved, the modal dialog will also be closed | function | - |
 | onOk | Specify a function that will be called when the user clicks the OK button. The parameter of this function is a function whose execution should include closing the dialog. You can also just return a promise and when the promise is resolved, the modal dialog will also be closed | function | - |

--- a/components/modal/index.zh-CN.md
+++ b/components/modal/index.zh-CN.md
@@ -36,6 +36,7 @@ title: Modal
 | width | 宽度 | string\|number | 520 |
 | wrapClassName | 对话框外层容器的类名 | string | - |
 | zIndex | 设置 Modal 的 `z-index` | Number | 1000 |
+| keyboard | 是否支持键盘esc关闭 | boolean | true |
 | onCancel | 点击遮罩层或右上角叉或取消按钮的回调 | function(e) | 无 |
 | onOk | 点击确定回调 | function(e) | 无 |

--- a/components/popover/index.tsx
+++ b/components/popover/index.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
-import Tooltip from '../tooltip';
-import { AbstractTooltipProps } from '../tooltip';
+import Tooltip, { AbstractTooltipProps, TooltipPlacement, TooltipTrigger } from '../tooltip';
 import warning from '../_util/warning';

 export interface PopoverProps extends AbstractTooltipProps {
@@ -11,9 +10,9 @@ export interface PopoverProps extends AbstractTooltipProps {
 export default class Popover extends React.Component<PopoverProps, {}> {
  static defaultProps = {
    prefixCls: 'ant-popover',
-    placement: 'top',
+    placement: 'top' as TooltipPlacement,
    transitionName: 'zoom-big',
-    trigger: 'hover',
+    trigger: 'hover' as TooltipTrigger,
    mouseEnterDelay: 0.1,
    mouseLeaveDelay: 0.1,
    overlayStyle: {},
--- a/components/progress/tests/snapshots/index.test.js.snap
+++ b/components/progress/tests/snapshots/index.test.js.snap
@@ -0,0 +1,113 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Progress render negetive progress 1`] = `
+<div
+  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+>
+  <div>
+    <div
+      class="ant-progress-outer"
+    >
+      <div
+        class="ant-progress-inner"
+      >
+        <div
+          class="ant-progress-bg"
+          style="width: 0%; height: 8px;"
+        />
+      </div>
+    </div>
+    <span
+      class="ant-progress-text"
+    >
+      0%
+    </span>
+  </div>
+</div>
+`;
+
+exports[`Progress render negetive successPercent 1`] = `
+<div
+  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+>
+  <div>
+    <div
+      class="ant-progress-outer"
+    >
+      <div
+        class="ant-progress-inner"
+      >
+        <div
+          class="ant-progress-bg"
+          style="width: 50%; height: 8px;"
+        />
+        <div
+          class="ant-progress-success-bg"
+          style="width: 0%; height: 8px;"
+        />
+      </div>
+    </div>
+    <span
+      class="ant-progress-text"
+    >
+      50%
+    </span>
+  </div>
+</div>
+`;
+
+exports[`Progress render out-of-range progress 1`] = `
+<div
+  class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-default"
+>
+  <div>
+    <div
+      class="ant-progress-outer"
+    >
+      <div
+        class="ant-progress-inner"
+      >
+        <div
+          class="ant-progress-bg"
+          style="width: 100%; height: 8px;"
+        />
+      </div>
+    </div>
+    <span
+      class="ant-progress-text"
+    >
+      <i
+        class="anticon anticon-check-circle"
+      />
+    </span>
+  </div>
+</div>
+`;
+
+exports[`Progress render out-of-range progress with info 1`] = `
+<div
+  class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-default"
+>
+  <div>
+    <div
+      class="ant-progress-outer"
+    >
+      <div
+        class="ant-progress-inner"
+      >
+        <div
+          class="ant-progress-bg"
+          style="width: 100%; height: 8px;"
+        />
+      </div>
+    </div>
+    <span
+      class="ant-progress-text"
+    >
+      <i
+        class="anticon anticon-check-circle"
+      />
+    </span>
+  </div>
+</div>
+`;
--- a/components/progress/tests/index.test.js
+++ b/components/progress/tests/index.test.js
@@ -10,4 +10,24 @@ describe('Progress', () => {
    wrapper.setProps({ percent: 50, successPercent: 100 });
    expect(wrapper.find('.ant-progress-status-success')).toHaveLength(1);
  });
+
+  it('render out-of-range progress', async () => {
+    const wrapper = mount(<Progress percent={120} />);
+    expect(wrapper.render()).toMatchSnapshot();
+  });
+
+  it('render out-of-range progress with info', async () => {
+    const wrapper = mount(<Progress percent={120} showInfo />);
+    expect(wrapper.render()).toMatchSnapshot();
+  });
+
+  it('render negetive progress', async () => {
+    const wrapper = mount(<Progress percent={-20} />);
+    expect(wrapper.render()).toMatchSnapshot();
+  });
+
+  it('render negetive successPercent', async () => {
+    const wrapper = mount(<Progress percent={50} successPercent={-20} />);
+    expect(wrapper.render()).toMatchSnapshot();
+  });
 });
--- a/components/progress/progress.tsx
+++ b/components/progress/progress.tsx
@@ -10,10 +10,13 @@ const statusColorMap = {
  success: '#87d068',
 };

+export type ProgressType = 'line' | 'circle' | 'dashboard';
+export type ProgressSize = 'default' | 'small';
+
 export interface ProgressProps {
  prefixCls?: string;
  className?: string;
-  type?: 'line' | 'circle' | 'dashboard';
+  type?: ProgressType;
  percent?: number;
  successPercent?: number;
  format?: (percent: number) => string;
@@ -25,20 +28,29 @@ export interface ProgressProps {
  style?: React.CSSProperties;
  gapDegree?: number;
  gapPosition?: 'top' | 'bottom' | 'left' | 'right';
-  size?: 'default' | 'small';
+  size?: ProgressSize;
 }

+const validProgress = (progress: number | undefined) => {
+  if (!progress || progress < 0) {
+    return 0;
+  } else if (progress > 100) {
+    return 100;
+  }
+  return progress;
+};
+
 export default class Progress extends React.Component<ProgressProps, {}> {
  static Line: any;
  static Circle: any;

  static defaultProps = {
-    type: 'line',
+    type: 'line' as ProgressType,
    percent: 0,
    showInfo: true,
    trailColor: '#f3f3f3',
    prefixCls: 'ant-progress',
-    size: 'default',
+    size: 'default' as ProgressSize,
  };

  static propTypes = {
@@ -70,22 +82,22 @@ export default class Progress extends React.Component<ProgressProps, {}> {
      let text;
      const iconType = (type === 'circle' || type === 'dashboard') ? '' : '-circle';
      if (progressStatus === 'exception') {
-        text = format ? textFormatter(percent) : <Icon type={`cross${iconType}`} />;
+        text = format ? textFormatter(validProgress(percent)) : <Icon type={`cross${iconType}`} />;
      } else if (progressStatus === 'success') {
-        text = format ? textFormatter(percent) : <Icon type={`check${iconType}`} />;
+        text = format ? textFormatter(validProgress(percent)) : <Icon type={`check${iconType}`} />;
      } else {
-        text = textFormatter(percent);
+        text = textFormatter(validProgress(percent));
      }
      progressInfo = <span className={`${prefixCls}-text`}>{text}</span>;
    }

    if (type === 'line') {
      const percentStyle = {
-        width: `${percent}%`,
+        width: `${validProgress(percent)}%`,
        height: strokeWidth || (size === 'small' ? 6 : 8),
      };
      const successPercentStyle = {
-        width: `${successPercent}%`,
+        width: `${validProgress(successPercent)}%`,
        height: strokeWidth || (size === 'small' ? 6 : 8),
      };
      const successSegment = successPercent !== undefined
@@ -115,7 +127,7 @@ export default class Progress extends React.Component<ProgressProps, {}> {
      progress = (
        <div className={`${prefixCls}-inner`} style={circleStyle}>
          <Circle
-            percent={percent}
+            percent={validProgress(percent)}
            strokeWidth={circleWidth}
            trailWidth={circleWidth}
            strokeColor={(statusColorMap as any)[progressStatus]}
--- a/components/radio/tests/snapshots/group.test.js.snap
+++ b/components/radio/tests/snapshots/group.test.js.snap
@@ -0,0 +1,46 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Radio passes prefixCls down to radio 1`] = `
+<div
+  class="my-radio-group"
+>
+  <label
+    class="my-radio-wrapper"
+  >
+    <span
+      class="my-radio"
+    >
+      <input
+        class="my-radio-input"
+        type="radio"
+        value="Apple"
+      />
+      <span
+        class="my-radio-inner"
+      />
+    </span>
+    <span>
+      Apple
+    </span>
+  </label>
+  <label
+    class="my-radio-wrapper"
+  >
+    <span
+      class="my-radio"
+    >
+      <input
+        class="my-radio-input"
+        type="radio"
+        value="Orange"
+      />
+      <span
+        class="my-radio-inner"
+      />
+    </span>
+    <span>
+      Orange
+    </span>
+  </label>
+</div>
+`;
--- a/components/radio/tests/group.test.js
+++ b/components/radio/tests/group.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { shallow, mount } from 'enzyme';
+import { shallow, mount, render } from 'enzyme';
 import Radio from '../radio';
 import RadioGroup from '../group';

@@ -112,4 +112,17 @@ describe('Radio', () => {
      expect(el.props().name).toEqual(GROUP_NAME);
    }));
  });
+
+  it('passes prefixCls down to radio', () => {
+    const options = [
+      { label: 'Apple', value: 'Apple' },
+      { label: 'Orange', value: 'Orange' },
+    ];
+
+    const wrapper = render(
+      <RadioGroup prefixCls="my-radio" options={options} />
+    );
+
+    expect(wrapper).toMatchSnapshot();
+  });
 });
--- a/components/radio/group.tsx
+++ b/components/radio/group.tsx
@@ -20,6 +20,7 @@ function getCheckedValue(children: React.ReactNode) {
 export default class RadioGroup extends React.Component<RadioGroupProps, RadioGroupState> {
  static defaultProps = {
    disabled: false,
+    prefixCls: 'ant-radio',
  };

  static childContextTypes = {
@@ -89,9 +90,10 @@ export default class RadioGroup extends React.Component<RadioGroupProps, RadioGr
  }
  render() {
    const props = this.props;
-    const { prefixCls = 'ant-radio-group', className = '', options } = props;
-    const classString = classNames(prefixCls, {
-      [`${prefixCls}-${props.size}`]: props.size,
+    const { prefixCls, className = '', options } = props;
+    const groupPrefixCls = `${prefixCls}-group`;
+    const classString = classNames(groupPrefixCls, {
+      [`${groupPrefixCls}-${props.size}`]: props.size,
    }, className);

    let children: React.ReactChildren[] | React.ReactElement<any>[] | React.ReactNode = props.children;
@@ -103,6 +105,7 @@ export default class RadioGroup extends React.Component<RadioGroupProps, RadioGr
          return (
            <Radio
              key={index}
+              prefixCls={prefixCls}
              disabled={this.props.disabled}
              value={option}
              onChange={this.onRadioChange}
@@ -115,6 +118,7 @@ export default class RadioGroup extends React.Component<RadioGroupProps, RadioGr
          return (
            <Radio
              key={index}
+              prefixCls={prefixCls}
              disabled={option.disabled || this.props.disabled}
              value={option.value}
              onChange={this.onRadioChange}
--- a/components/slider/demo/input-number.md
+++ b/components/slider/demo/input-number.md
@@ -11,7 +11,7 @@ title:

 ## en-US

-Synchronize with [InptNumber](/components/input-number/) component.
+Synchronize with [InputNumber](/components/input-number/) component.

 ````jsx
 import { Slider, InputNumber, Row, Col } from 'antd';
--- a/components/slider/demo/tip-formatter.md
+++ b/components/slider/demo/tip-formatter.md
@@ -2,7 +2,7 @@
 order: 3
 title:
  zh-CN: 自定义提示
-  en-US: Customerize tooltip
+  en-US: Customize tooltip
 ---

 ## zh-CN
--- a/components/spin/index.tsx
+++ b/components/spin/index.tsx
@@ -5,6 +5,7 @@ import Animate from 'rc-animate';
 import isCssAnimationSupported from '../_util/isCssAnimationSupported';
 import omit from 'omit.js';

+export type SpinSize = 'small' | 'default' | 'large';
 export type SpinIndicator = React.ReactElement<any>;

 export interface SpinProps {
@@ -12,7 +13,7 @@ export interface SpinProps {
  className?: string;
  spinning?: boolean;
  style?: React.CSSProperties;
-  size?: 'small' | 'default' | 'large';
+  size?: SpinSize;
  tip?: string;
  delay?: number;
  wrapperClassName?: string;
@@ -28,7 +29,7 @@ export default class Spin extends React.Component<SpinProps, SpinState> {
  static defaultProps = {
    prefixCls: 'ant-spin',
    spinning: true,
-    size: 'default',
+    size: 'default' as SpinSize,
    wrapperClassName: '',
  };

--- a/components/style/color/tinyColor.less
+++ b/components/style/color/tinyColor.less
@@ -1,4 +1,4 @@
-/* stylelint-disable declaration-bang-space-before,no-duplicate-selectors */
+/* stylelint-disable declaration-bang-space-before,no-duplicate-selectors,string-no-newline */
 .tinyColorMixin() {
@functions: ~`(function() {
 // TinyColor v1.4.1
--- a/components/table/Table.tsx
+++ b/components/table/Table.tsx
@@ -179,21 +179,17 @@ export default class Table<T> extends React.Component<TableProps<T>, TableState<
      this.store.setState({
        selectedRowKeys: nextProps.rowSelection.selectedRowKeys || [],
      });
-      const { rowSelection } = this.props;
-      if (rowSelection && (
-        nextProps.rowSelection.getCheckboxProps !== rowSelection.getCheckboxProps
-      )) {
-        this.CheckboxPropsCache = {};
-      }
    }
    if ('dataSource' in nextProps &&
        nextProps.dataSource !== this.props.dataSource) {
      this.store.setState({
        selectionDirty: false,
      });
-      this.CheckboxPropsCache = {};
    }

+    // https://github.com/ant-design/ant-design/issues/10133
+    this.CheckboxPropsCache = {};
+
    if (this.getSortOrderColumns(this.columns).length > 0) {
      const sortState = this.getSortStateFromColumns(this.columns);
      if (sortState.sortColumn !== this.state.sortColumn ||
--- a/components/table/tests/Table.rowSelection.test.js
+++ b/components/table/tests/Table.rowSelection.test.js
@@ -299,6 +299,34 @@ describe('Table.rowSelection', () => {
    });
  });

+  // https://github.com/ant-design/ant-design/issues/4245
+  it('should allow dynamic getCheckboxProps', () => {
+    class App extends React.Component {
+      state = {
+        disableName: 'Jack',
+      };
+      render() {
+        return (
+          <Table
+            columns={columns}
+            dataSource={data}
+            rowSelection={{
+              getCheckboxProps: record => ({ disabled: record.name === this.state.disableName }),
+            }}
+          />
+        );
+      }
+    }
+    const wrapper = mount(<App />);
+    let checkboxs = wrapper.find('input');
+    expect(checkboxs.at(1).props().disabled).toBe(true);
+    expect(checkboxs.at(2).props().disabled).toBe(false);
+    wrapper.setState({ disableName: 'Lucy' });
+    checkboxs = wrapper.find('input');
+    expect(checkboxs.at(1).props().disabled).toBe(false);
+    expect(checkboxs.at(2).props().disabled).toBe(true);
+  });
+
  // https://github.com/ant-design/ant-design/issues/4779
  it('should not switch pagination when select record', () => {
    const newData = [];
--- a/components/table/tests/snapshots/demo.test.js.snap
+++ b/components/table/tests/snapshots/demo.test.js.snap
@@ -175,7 +175,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      John Brown
                    </a>
@@ -195,7 +195,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                  >
                    <span>
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Action 一 John Brown
                      </a>
@@ -203,7 +203,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                        class="ant-divider ant-divider-vertical"
                      />
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Delete
                      </a>
@@ -212,7 +212,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                      />
                      <a
                        class="ant-dropdown-link"
-                        href="#"
+                        href="javascript:;"
                      >
                        More actions 
                        <i
@@ -233,7 +233,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Jim Green
                    </a>
@@ -253,7 +253,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                  >
                    <span>
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Action 一 Jim Green
                      </a>
@@ -261,7 +261,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                        class="ant-divider ant-divider-vertical"
                      />
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Delete
                      </a>
@@ -270,7 +270,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                      />
                      <a
                        class="ant-dropdown-link"
-                        href="#"
+                        href="javascript:;"
                      >
                        More actions 
                        <i
@@ -291,7 +291,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Joe Black
                    </a>
@@ -311,7 +311,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                  >
                    <span>
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Action 一 Joe Black
                      </a>
@@ -319,7 +319,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                        class="ant-divider ant-divider-vertical"
                      />
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Delete
                      </a>
@@ -328,7 +328,7 @@ exports[`renders ./components/table/demo/basic.md correctly 1`] = `
                      />
                      <a
                        class="ant-dropdown-link"
-                        href="#"
+                        href="javascript:;"
                      >
                        More actions 
                        <i
@@ -453,7 +453,7 @@ exports[`renders ./components/table/demo/bordered.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      John Brown
                    </a>
@@ -480,7 +480,7 @@ exports[`renders ./components/table/demo/bordered.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Jim Green
                    </a>
@@ -507,7 +507,7 @@ exports[`renders ./components/table/demo/bordered.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Joe Black
                    </a>
@@ -648,7 +648,7 @@ exports[`renders ./components/table/demo/colspan-rowspan.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      John Brown
                    </a>
@@ -685,7 +685,7 @@ exports[`renders ./components/table/demo/colspan-rowspan.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Jim Green
                    </a>
@@ -722,7 +722,7 @@ exports[`renders ./components/table/demo/colspan-rowspan.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Joe Black
                    </a>
@@ -760,7 +760,7 @@ exports[`renders ./components/table/demo/colspan-rowspan.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Jim Red
                    </a>
@@ -793,7 +793,7 @@ exports[`renders ./components/table/demo/colspan-rowspan.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Jake White
                    </a>
@@ -1835,7 +1835,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -1855,7 +1855,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -1863,7 +1863,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -1872,7 +1872,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -1917,7 +1917,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -1937,7 +1937,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -1945,7 +1945,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -1954,7 +1954,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -1999,7 +1999,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -2019,7 +2019,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -2027,7 +2027,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -2036,7 +2036,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -2081,7 +2081,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -2101,7 +2101,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -2109,7 +2109,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -2118,7 +2118,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -2163,7 +2163,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -2183,7 +2183,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -2191,7 +2191,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -2200,7 +2200,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -2245,7 +2245,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -2265,7 +2265,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -2273,7 +2273,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -2282,7 +2282,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -2327,7 +2327,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -2347,7 +2347,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -2355,7 +2355,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -2364,7 +2364,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -2409,7 +2409,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -2429,7 +2429,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -2437,7 +2437,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -2446,7 +2446,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -2491,7 +2491,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -2511,7 +2511,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -2519,7 +2519,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -2528,7 +2528,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -2573,7 +2573,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        John Brown
                      </a>
@@ -2593,7 +2593,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                    >
                      <span>
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Action 一 John Brown
                        </a>
@@ -2601,7 +2601,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                          class="ant-divider ant-divider-vertical"
                        />
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          Delete
                        </a>
@@ -2610,7 +2610,7 @@ exports[`renders ./components/table/demo/dynamic-settings.md correctly 1`] = `
                        />
                        <a
                          class="ant-dropdown-link"
-                          href="#"
+                          href="javascript:;"
                        >
                          More actions 
                          <i
@@ -2781,7 +2781,7 @@ exports[`renders ./components/table/demo/edit-cell.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Delete
                      </a>
@@ -2824,7 +2824,7 @@ exports[`renders ./components/table/demo/edit-cell.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Delete
                      </a>
@@ -3543,7 +3543,7 @@ exports[`renders ./components/table/demo/expand.md correctly 1`] = `
                    class=""
                  >
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Delete
                    </a>
@@ -3578,7 +3578,7 @@ exports[`renders ./components/table/demo/expand.md correctly 1`] = `
                    class=""
                  >
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Delete
                    </a>
@@ -3613,7 +3613,7 @@ exports[`renders ./components/table/demo/expand.md correctly 1`] = `
                    class=""
                  >
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Delete
                    </a>
@@ -4077,7 +4077,7 @@ exports[`renders ./components/table/demo/fixed-columns.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -4144,7 +4144,7 @@ exports[`renders ./components/table/demo/fixed-columns.md correctly 1`] = `
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -4280,7 +4280,7 @@ exports[`renders ./components/table/demo/fixed-columns.md correctly 1`] = `
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -4293,7 +4293,7 @@ exports[`renders ./components/table/demo/fixed-columns.md correctly 1`] = `
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -4592,7 +4592,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -4659,7 +4659,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -4726,7 +4726,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -4793,7 +4793,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -4860,7 +4860,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -4927,7 +4927,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -4994,7 +4994,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -5061,7 +5061,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -5128,7 +5128,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -5195,7 +5195,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                      class=""
                    >
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        action
                      </a>
@@ -5506,7 +5506,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5519,7 +5519,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5532,7 +5532,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5545,7 +5545,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5558,7 +5558,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5571,7 +5571,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5584,7 +5584,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5597,7 +5597,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5610,7 +5610,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -5623,7 +5623,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
                        class=""
                      >
                        <a
-                          href="#"
+                          href="javascript:;"
                        >
                          action
                        </a>
@@ -8513,7 +8513,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                  >
                    <span>
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Action 一 
                      </a>
@@ -8521,7 +8521,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                        class="ant-divider ant-divider-vertical"
                      />
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Delete
                      </a>
@@ -8530,7 +8530,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                      />
                      <a
                        class="ant-dropdown-link"
-                        href="#"
+                        href="javascript:;"
                      >
                        More actions 
                        <i
@@ -8572,7 +8572,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                  >
                    <span>
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Action 一 
                      </a>
@@ -8580,7 +8580,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                        class="ant-divider ant-divider-vertical"
                      />
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Delete
                      </a>
@@ -8589,7 +8589,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                      />
                      <a
                        class="ant-dropdown-link"
-                        href="#"
+                        href="javascript:;"
                      >
                        More actions 
                        <i
@@ -8631,7 +8631,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                  >
                    <span>
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Action 一 
                      </a>
@@ -8639,7 +8639,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                        class="ant-divider ant-divider-vertical"
                      />
                      <a
-                        href="#"
+                        href="javascript:;"
                      >
                        Delete
                      </a>
@@ -8648,7 +8648,7 @@ exports[`renders ./components/table/demo/jsx.md correctly 1`] = `
                      />
                      <a
                        class="ant-dropdown-link"
-                        href="#"
+                        href="javascript:;"
                      >
                        More actions 
                        <i
@@ -8841,7 +8841,7 @@ exports[`renders ./components/table/demo/nested-table.md correctly 1`] = `
                    class=""
                  >
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Publish
                    </a>
@@ -8891,7 +8891,7 @@ exports[`renders ./components/table/demo/nested-table.md correctly 1`] = `
                    class=""
                  >
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Publish
                    </a>
@@ -8941,7 +8941,7 @@ exports[`renders ./components/table/demo/nested-table.md correctly 1`] = `
                    class=""
                  >
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Publish
                    </a>
@@ -9394,7 +9394,7 @@ exports[`renders ./components/table/demo/row-selection.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      John Brown
                    </a>
@@ -9443,7 +9443,7 @@ exports[`renders ./components/table/demo/row-selection.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Jim Green
                    </a>
@@ -9492,7 +9492,7 @@ exports[`renders ./components/table/demo/row-selection.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Joe Black
                    </a>
@@ -9542,7 +9542,7 @@ exports[`renders ./components/table/demo/row-selection.md correctly 1`] = `
                      style="padding-left:0px"
                    />
                    <a
-                      href="#"
+                      href="javascript:;"
                    >
                      Disabled User
                    </a>
--- a/components/table/demo/basic.md
+++ b/components/table/demo/basic.md
@@ -20,7 +20,7 @@ const columns = [{
  title: 'Name',
  dataIndex: 'name',
  key: 'name',
-  render: text => <a href="#">{text}</a>,
+  render: text => <a href="javascript:;">{text}</a>,
 }, {
  title: 'Age',
  dataIndex: 'age',
@@ -34,11 +34,11 @@ const columns = [{
  key: 'action',
  render: (text, record) => (
    <span>
-      <a href="#">Action 一 {record.name}</a>
+      <a href="javascript:;">Action 一 {record.name}</a>
      <Divider type="vertical" />
-      <a href="#">Delete</a>
+      <a href="javascript:;">Delete</a>
      <Divider type="vertical" />
-      <a href="#" className="ant-dropdown-link">
+      <a href="javascript:;" className="ant-dropdown-link">
        More actions <Icon type="down" />
      </a>
    </span>
--- a/components/table/demo/bordered.md
+++ b/components/table/demo/bordered.md
@@ -19,7 +19,7 @@ import { Table } from 'antd';
 const columns = [{
  title: 'Name',
  dataIndex: 'name',
-  render: text => <a href="#">{text}</a>,
+  render: text => <a href="javascript:;">{text}</a>,
 }, {
  title: 'Cash Assets',
  className: 'column-money',
--- a/components/table/demo/colspan-rowspan.md
+++ b/components/table/demo/colspan-rowspan.md
@@ -38,10 +38,10 @@ const columns = [{
  dataIndex: 'name',
  render: (text, row, index) => {
    if (index < 4) {
-      return <a href="#">{text}</a>;
+      return <a href="javascript:;">{text}</a>;
    }
    return {
-      children: <a href="#">{text}</a>,
+      children: <a href="javascript:;">{text}</a>,
      props: {
        colSpan: 5,
      },
--- a/components/table/demo/dynamic-settings.md
+++ b/components/table/demo/dynamic-settings.md
@@ -22,7 +22,7 @@ const columns = [{
  dataIndex: 'name',
  key: 'name',
  width: 150,
-  render: text => <a href="#">{text}</a>,
+  render: text => <a href="javascript:;">{text}</a>,
 }, {
  title: 'Age',
  dataIndex: 'age',
@@ -38,11 +38,11 @@ const columns = [{
  width: 360,
  render: (text, record) => (
    <span>
-      <a href="#">Action 一 {record.name}</a>
+      <a href="javascript:;">Action 一 {record.name}</a>
      <Divider type="vertical" />
-      <a href="#">Delete</a>
+      <a href="javascript:;">Delete</a>
      <Divider type="vertical" />
-      <a href="#" className="ant-dropdown-link">
+      <a href="javascript:;" className="ant-dropdown-link">
        More actions <Icon type="down" />
      </a>
    </span>
--- a/components/table/demo/edit-cell.md
+++ b/components/table/demo/edit-cell.md
@@ -94,7 +94,7 @@ class EditableTable extends React.Component {
          this.state.dataSource.length > 1 ?
          (
            <Popconfirm title="Sure to delete?" onConfirm={() => this.onDelete(record.key)}>
-              <a href="#">Delete</a>
+              <a href="javascript:;">Delete</a>
            </Popconfirm>
          ) : null
        );
--- a/components/table/demo/expand.md
+++ b/components/table/demo/expand.md
@@ -20,7 +20,7 @@ const columns = [
  { title: 'Name', dataIndex: 'name', key: 'name' },
  { title: 'Age', dataIndex: 'age', key: 'age' },
  { title: 'Address', dataIndex: 'address', key: 'address' },
-  { title: 'Action', dataIndex: '', key: 'x', render: () => <a href="#">Delete</a> },
+  { title: 'Action', dataIndex: '', key: 'x', render: () => <a href="javascript:;">Delete</a> },
 ];

 const data = [
--- a/components/table/demo/fixed-columns-header.md
+++ b/components/table/demo/fixed-columns-header.md
@@ -40,7 +40,7 @@ const columns = [
    key: 'operation',
    fixed: 'right',
    width: 100,
-    render: () => <a href="#">action</a>,
+    render: () => <a href="javascript:;">action</a>,
  },
 ];

--- a/components/table/demo/fixed-columns.md
+++ b/components/table/demo/fixed-columns.md
@@ -40,7 +40,7 @@ const columns = [
    key: 'operation',
    fixed: 'right',
    width: 100,
-    render: () => <a href="#">action</a>,
+    render: () => <a href="javascript:;">action</a>,
  },
 ];

--- a/components/table/demo/jsx.md
+++ b/components/table/demo/jsx.md
@@ -71,11 +71,11 @@ ReactDOM.render(
      key="action"
      render={(text, record) => (
        <span>
-          <a href="#">Action 一 {record.name}</a>
+          <a href="javascript:;">Action 一 {record.name}</a>
          <Divider type="vertical" />
-          <a href="#">Delete</a>
+          <a href="javascript:;">Delete</a>
          <Divider type="vertical" />
-          <a href="#" className="ant-dropdown-link">
+          <a href="javascript:;" className="ant-dropdown-link">
            More actions <Icon type="down" />
          </a>
        </span>
--- a/components/table/demo/nested-table.md
+++ b/components/table/demo/nested-table.md
@@ -41,10 +41,10 @@ function NestedTable() {
        key: 'operation',
        render: () => (
          <span className="table-operation">
-            <a href="#">Pause</a>
-            <a href="#">Stop</a>
+            <a href="javascript:;">Pause</a>
+            <a href="javascript:;">Stop</a>
            <Dropdown overlay={menu}>
-              <a href="#">
+              <a href="javascript:;">
                More <Icon type="down" />
              </a>
            </Dropdown>
@@ -78,7 +78,7 @@ function NestedTable() {
    { title: 'Upgraded', dataIndex: 'upgradeNum', key: 'upgradeNum' },
    { title: 'Creator', dataIndex: 'creator', key: 'creator' },
    { title: 'Date', dataIndex: 'createdAt', key: 'createdAt' },
-    { title: 'Action', key: 'operation', render: () => <a href="#">Publish</a> },
+    { title: 'Action', key: 'operation', render: () => <a href="javascript:;">Publish</a> },
  ];

  const data = [];
--- a/components/table/demo/row-selection.md
+++ b/components/table/demo/row-selection.md
@@ -23,7 +23,7 @@ import { Table } from 'antd';
 const columns = [{
  title: 'Name',
  dataIndex: 'name',
-  render: text => <a href="#">{text}</a>,
+  render: text => <a href="javascript:;">{text}</a>,
 }, {
  title: 'Age',
  dataIndex: 'age',
--- a/components/table/index.en-US.md
+++ b/components/table/index.en-US.md
@@ -53,6 +53,7 @@ const columns = [{
 | Property | Description | Type | Default |
 | -------- | ----------- | ---- | ------- |
 | bordered | Whether to show all table borders | boolean | `false` |
+| childrenColumnName | The column contains children to display | string\[] | children |
 | columns | Columns of table | [ColumnProps](https://git.io/vMMXC)\[] | - |
 | components | Override default table elements | object | - |
 | dataSource | Data record array to be displayed | any\[] | - |
--- a/components/table/index.zh-CN.md
+++ b/components/table/index.zh-CN.md
@@ -54,6 +54,7 @@ const columns = [{
 | 参数 | 说明 | 类型 | 默认值 |
 | --- | --- | --- | --- |
 | bordered | 是否展示外边框和列边框 | boolean | false |
+| childrenColumnName | 指定树形结构的列名 | string\[] | children |
 | columns | 表格列的配置描述，具体项见下表 | [ColumnProps](https://git.io/vMMXC)\[] | - |
 | components | 覆盖默认的 table 元素 | object | - |
 | dataSource | 数据数组 | any\[] |  |
--- a/components/table/interface.tsx
+++ b/components/table/interface.tsx
@@ -105,6 +105,7 @@ export interface TableProps<T> {
  indentSize?: number;
  onRowClick?: (record: T, index: number, event: Event) => any;
  onRow?: (record: T, index: number) => any;
+  onHeaderRow?: (columns: ColumnProps<T>[], index: number) => any;
  useFixedHeader?: boolean;
  bordered?: boolean;
  showHeader?: boolean;
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@@ -271,6 +271,15 @@
      line-height: 4px;
      height: 4px;
      transition: all .3s;
+      position: relative;
+    }
+
+    &-down {
+      margin-top: 1.5px;
+    }
+
+    .@{iconfont-css-prefix}-caret-down {
+      top: -1.5px;
    }
  }

--- a/components/tabs/index.tsx
+++ b/components/tabs/index.tsx
@@ -79,7 +79,7 @@ export default class Tabs extends React.Component<TabsProps, any> {

  componentDidMount() {
    const NO_FLEX = ' no-flex';
-    const tabNode = ReactDOM.findDOMNode(this);
+    const tabNode = ReactDOM.findDOMNode(this) as Element;
    if (tabNode && !isFlexSupported() && tabNode.className.indexOf(NO_FLEX) === -1) {
      tabNode.className += NO_FLEX;
    }
--- a/components/timeline/Timeline.tsx
+++ b/components/timeline/Timeline.tsx
@@ -25,10 +25,10 @@ export default class Timeline extends React.Component<TimelineProps, any> {
      [`${prefixCls}-pending`]: !!pending,
    }, className);
    // Remove falsy items
-    const falsylessItems = React.Children.toArray(children).filter(item => !!item);
-    const items = React.Children.map(falsylessItems, (ele: React.ReactElement<any>, idx) =>
+    const truthyItems = React.Children.toArray(children).filter(item => !!item);
+    const items = React.Children.map(truthyItems, (ele: React.ReactElement<any>, idx) =>
      React.cloneElement(ele, {
-        last: idx === (React.Children.count(falsylessItems) - 1),
+        last: idx === (React.Children.count(truthyItems) - 1),
      }),
    );
    const pendingItem = (!!pending) ? (
--- a/components/timeline/TimelineItem.tsx
+++ b/components/timeline/TimelineItem.tsx
@@ -39,7 +39,7 @@ export default class TimelineItem extends React.Component<TimeLineItemProps, any
        <div className={`${prefixCls}-item-tail`} />
        <div
          className={dotClassName}
-          style={{ borderColor: /blue|red|green/.test(color) ? null : color }}
+          style={{ borderColor: /blue|red|green/.test(color) ? undefined : color }}
        >
          {dot}
        </div>
--- a/components/tooltip/index.tsx
+++ b/components/tooltip/index.tsx
@@ -12,6 +12,8 @@ export type TooltipPlacement =
  'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight' |
  'leftTop' | 'leftBottom' | 'rightTop' | 'rightBottom';

+export type TooltipTrigger = 'hover' | 'focus' | 'click' | 'contextMenu';
+
 export interface AbstractTooltipProps {
  prefixCls?: string;
  overlayClassName?: string;
@@ -25,7 +27,7 @@ export interface AbstractTooltipProps {
  mouseEnterDelay?: number;
  mouseLeaveDelay?: number;
  transitionName?: string;
-  trigger?: 'hover' | 'focus' | 'click' | 'contextMenu';
+  trigger?: TooltipTrigger;
  openClassName?: string;
  arrowPointAtCenter?: boolean;
  autoAdjustOverflow?: boolean | AdjustOverflow;
@@ -44,20 +46,20 @@ export interface TooltipProps extends AbstractTooltipProps {

 const splitObject = (obj: any, keys: string[]) => {
  const picked: any = {};
-  const omited: any = { ...obj };
+  const omitted: any = { ...obj };
  keys.forEach(key => {
    if (obj && key in obj) {
      picked[key] = obj[key];
-      delete omited[key];
+      delete omitted[key];
    }
  });
-  return { picked, omited };
+  return { picked, omitted };
 };

 export default class Tooltip extends React.Component<TooltipProps, any> {
  static defaultProps = {
    prefixCls: 'ant-tooltip',
-    placement: 'top',
+    placement: 'top' as TooltipPlacement,
    transitionName: 'zoom-big-fast',
    mouseEnterDelay: 0.1,
    mouseLeaveDelay: 0.1,
@@ -123,7 +125,7 @@ export default class Tooltip extends React.Component<TooltipProps, any> {
        element.props.disabled && this.isHoverTrigger()) {
      // Pick some layout related style properties up to span
      // Prevent layout bugs like https://github.com/ant-design/ant-design/issues/5254
-      const { picked, omited } = splitObject(
+      const { picked, omitted } = splitObject(
        element.props.style,
        ['position', 'left', 'right', 'top', 'bottom', 'float', 'display', 'zIndex'],
      );
@@ -133,7 +135,7 @@ export default class Tooltip extends React.Component<TooltipProps, any> {
        cursor: 'not-allowed',
      };
      const buttonStyle = {
-        ...omited,
+        ...omitted,
        pointerEvents: 'none',
      };
      const child = cloneElement(element, {
--- a/components/transfer/list.tsx
+++ b/components/transfer/list.tsx
@@ -101,7 +101,8 @@ export default class TransferList extends React.Component<TransferListProps, any
    // Manually trigger scroll event for lazy search bug
    // https://github.com/ant-design/ant-design/issues/5631
    this.triggerScrollTimer = window.setTimeout(() => {
-      const listNode = ReactDOM.findDOMNode(this).querySelectorAll('.ant-transfer-list-content')[0];
+      const transferNode = ReactDOM.findDOMNode(this) as Element;
+      const listNode = transferNode.querySelectorAll('.ant-transfer-list-content')[0];
      if (listNode) {
        triggerEvent(listNode, 'scroll');
      }
--- a/components/tree/tests/snapshots/demo.test.js.snap
+++ b/components/tree/tests/snapshots/demo.test.js.snap
@@ -40,7 +40,7 @@ exports[`renders ./components/tree/demo/basic.md correctly 1`] = `
          class="ant-tree-switcher ant-tree-switcher_open"
        />
        <span
-          class="ant-tree-checkbox ant-tree-checkbox-disabled"
+          class="ant-tree-checkbox ant-tree-checkbox-checked ant-tree-checkbox-disabled"
        >
          <span
            class="ant-tree-checkbox-inner"
@@ -486,7 +486,7 @@ exports[`renders ./components/tree/demo/basic-controlled.md correctly 1`] = `

 exports[`renders ./components/tree/demo/customized-icon.md correctly 1`] = `
 <ul
-  class="ant-tree ant-tree-show-line"
+  class="ant-tree"
  role="tree-node"
  unselectable="on"
 >
@@ -501,8 +501,12 @@ exports[`renders ./components/tree/demo/customized-icon.md correctly 1`] = `
      title="parent 1"
    >
      <span
-        class="ant-tree-iconEle ant-tree-icon__open"
-      />
+        class="ant-tree-iconEle ant-tree-icon__customize"
+      >
+        <i
+          class="anticon anticon-smile-o"
+        />
+      </span>
      <span
        class="ant-tree-title"
      >
@@ -517,111 +521,25 @@ exports[`renders ./components/tree/demo/customized-icon.md correctly 1`] = `
        class=""
      >
        <span
-          class="ant-tree-switcher ant-tree-switcher_open"
+          class="ant-tree-switcher ant-tree-switcher-noop"
        />
        <span
-          class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open ant-tree-node-selected"
-          title="parent 1-0"
+          class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal ant-tree-node-selected"
+          title="leaf"
        >
          <span
-            class="ant-tree-iconEle ant-tree-icon__open"
-          />
+            class="ant-tree-iconEle ant-tree-icon__customize"
+          >
+            <i
+              class="anticon anticon-meh-o"
+            />
+          </span>
          <span
            class="ant-tree-title"
          >
-            parent 1-0
+            leaf
          </span>
        </span>
-        <ul
-          class="ant-tree-child-tree ant-tree-child-tree-open"
-          data-expanded="true"
-        >
-          <li
-            class=""
-          >
-            <span
-              class="ant-tree-switcher ant-tree-switcher-noop"
-            />
-            <span
-              class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-              title="leaf"
-            >
-              <span
-                class="ant-tree-iconEle ant-tree-icon__docu"
-              />
-              <span
-                class="ant-tree-title"
-              >
-                leaf
-              </span>
-            </span>
-          </li>
-          <li
-            class=""
-          >
-            <span
-              class="ant-tree-switcher ant-tree-switcher-noop"
-            />
-            <span
-              class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-              title="leaf"
-            >
-              <span
-                class="ant-tree-iconEle ant-tree-icon__docu"
-              />
-              <span
-                class="ant-tree-title"
-              >
-                leaf
-              </span>
-            </span>
-          </li>
-        </ul>
-      </li>
-      <li
-        class=""
-      >
-        <span
-          class="ant-tree-switcher ant-tree-switcher_open"
-        />
-        <span
-          class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-open"
-          title="parent 1-1"
-        >
-          <span
-            class="ant-tree-iconEle ant-tree-icon__open"
-          />
-          <span
-            class="ant-tree-title"
-          >
-            parent 1-1
-          </span>
-        </span>
-        <ul
-          class="ant-tree-child-tree ant-tree-child-tree-open"
-          data-expanded="true"
-        >
-          <li
-            class=""
-          >
-            <span
-              class="ant-tree-switcher ant-tree-switcher-noop"
-            />
-            <span
-              class="ant-tree-node-content-wrapper ant-tree-node-content-wrapper-normal"
-              title="leaf"
-            >
-              <span
-                class="ant-tree-iconEle ant-tree-icon__docu"
-              />
-              <span
-                class="ant-tree-title"
-              >
-                leaf
-              </span>
-            </span>
-          </li>
-        </ul>
      </li>
      <li
        class=""
@@ -634,8 +552,12 @@ exports[`renders ./components/tree/demo/customized-icon.md correctly 1`] = `
          title="leaf"
        >
          <span
-            class="ant-tree-iconEle ant-tree-icon__docu"
-          />
+            class="ant-tree-iconEle ant-tree-icon__customize"
+          >
+            <i
+              class="anticon anticon-frown-o"
+            />
+          </span>
          <span
            class="ant-tree-title"
          >
--- a/components/tree/demo/customized-icon.md
+++ b/components/tree/demo/customized-icon.md
@@ -1,6 +1,5 @@
 ---
 order: 6
-debug: true
 title:
  zh-CN: 自定义图标
  en-US: Customize Icon
@@ -8,38 +7,33 @@ title:

 ## zh-CN

-可以针对不同节点采用样式覆盖的方式定制图标。
+可以针对不同的节点定制图标。

 ## en-US

-You can customize icons for different nodes by styles override.
+You can customize icons for different nodes.

 ````jsx
-import { Tree } from 'antd';
+import { Tree, Icon } from 'antd';
 const TreeNode = Tree.TreeNode;

 class Demo extends React.Component {
-  onSelect = (selectedKeys, info) => {
-    console.log('selected', selectedKeys, info);
-  }
  render() {
    return (
      <Tree
        showIcon
-        showLine
-        defaultExpandedKeys={['0-0-0', '0-0-1']}
-        defaultSelectedKeys={['0-0-0', '0-0-1']}
-        onSelect={this.onSelect}
+        defaultExpandAll
+        defaultSelectedKeys={['0-0-0']}
      >
-        <TreeNode title="parent 1" key="0-0">
-          <TreeNode title="parent 1-0" key="0-0-0">
-            <TreeNode title="leaf" key="0-0-0-0" />
-            <TreeNode title="leaf" key="0-0-0-1" />
-          </TreeNode>
-          <TreeNode title="parent 1-1" key="0-0-1">
-            <TreeNode title="leaf" key="0-0-1-0" />
-          </TreeNode>
-          <TreeNode title="leaf" key="0-0-2" />
+        <TreeNode icon={<Icon type="smile-o" />} title="parent 1" key="0-0">
+          <TreeNode icon={<Icon type="meh-o" />} title="leaf" key="0-0-0" />
+          <TreeNode
+            icon={({ selected }) => (
+              <Icon type={selected ? 'frown' : 'frown-o'} />
+            )}
+            title="leaf"
+            key="0-0-1"
+          />
        </TreeNode>
      </Tree>
    );
@@ -48,39 +42,3 @@ class Demo extends React.Component {

 ReactDOM.render(<Demo />, mountNode);
 ````
-
-```css
-#components-tree-demo-customized-icon .ant-tree-iconEle {
-  position: absolute;
-  left: 0;
-  background: #fff;
-}
-#components-tree-demo-customized-icon .ant-tree-iconEle::after {
-  font-size: 12px;
-  zoom: 1;
-  display: inline-block;
-  font-family: 'anticon';
-  text-rendering: optimizeLegibility;
-  color: #999;
-  transition: transform .3s ease;
-  margin-top: 2px;
-  background: #fff;
-}
-#components-tree-demo-customized-icon .ant-tree-iconEle.ant-tree-icon__docu::after {
-  content: "\E664";
-}
-#components-tree-demo-customized-icon .ant-tree-iconEle.ant-tree-icon__open::after {
-  content: "\E699";
-}
-#components-tree-demo-customized-icon .ant-tree-iconEle.ant-tree-icon__close::after {
-  content: "\E662";
-}
-#components-tree-demo-customized-icon .ant-tree-switcher {
-  position: relative;
-  z-index: 1;
-  background: transparent;
-}
-#components-tree-demo-customized-icon .ant-tree-switcher::after {
-  opacity: 0;
-}
-```
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
afc163	b6a617f2e9	Fix ts error temporarily, DefinitelyTyped/DefinitelyTyped#25342	2018-04-28 15:02:25 +08:00
afc163	1a790a5a9f	3.4.4	2018-04-28 14:32:20 +08:00
afc163	2a411130bc	Fix upload onChange arg type when beforeUpload return false, close #10293	2018-04-28 14:17:29 +08:00
Wu Haotian	bf22853f41	add `lib/*/style/` as sideEffects (#10217 )	2018-04-28 14:17:01 +08:00
愚指导	4101d182e0	Bump 3.4.3 (#10198 )	2018-04-23 17:23:35 +08:00
薛定谔的猫	14dbcb95ed	fix: sideEffects: false cause css file not bundled (fixes #10190 ) (#10197 )	2018-04-23 17:08:24 +08:00
dependabot[bot]	14fa376dff	Update majo requirement to ^0.6.2 (#10195 ) Updates the requirements on [majo](https://github.com/egoist/majo) to permit the latest version. - [Release notes](https://github.com/egoist/majo/releases) - [Commits](https://github.com/egoist/majo/commits/v0.6.2) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-04-23 16:00:37 +08:00
Zheeeng	6a3e6f55cf	Fix typo (#10193 )	2018-04-23 16:00:24 +08:00
Wei Zhu	fa5491a390	Add @babel/types@7.0.0-beta.44 as devDependencies	2018-04-23 15:03:17 +08:00
Zheeeng	4ad5985df7	Prefer using 'truthy' over 'falsyless' (#10191 )	2018-04-23 11:23:25 +08:00
Jiabin Peng	bb720aaab9	Fix menu item's clickable region in dark theme (#10187 ) * remove redundant style for submenu * Fix menu item's clickable region in dark theme	2018-04-23 00:31:36 +08:00
afc163	8ab4aeb9c4	site: fix ad flush	2018-04-22 22:37:58 +08:00
Benjy Cui	e444dc5e39	chore: add ad for yuque (#10182 )	2018-04-22 18:58:40 +08:00
偏右	631596022e	Add changelog for 3.4.2 (#10185 ) * Add changelog for 3.4.2 * update	2018-04-22 17:21:58 +08:00
Wei Zhu	7ee2eca848	Pass CheckboxGroup/RadioGroup prefixCls down to children (#10002 ) Close #9950	2018-04-22 16:35:34 +08:00
afc163	15c6d58796	Table getCheckboxProps should be updated when rerender close #10133	2018-04-22 15:19:04 +08:00
afc163	2078354bc5	Fix collapsedWidth string bug, close #10140	2018-04-22 13:56:23 +08:00
Jin ZHANG	a95209cf55	scale fallback string (#10184 )	2018-04-22 13:09:42 +08:00
yiminanci	26f35280a8	Update README-zh_CN.md (#10181 )	2018-04-21 15:43:22 +08:00
afc163	f4ae9294c0	Improve card loading style, ref #9862	2018-04-20 11:19:30 +08:00
Zheeeng	572ae5ce14	Bugfix issue.9862 (#10052 ) * Fix issue 9862 * Update Card test snapshot	2018-04-20 10:44:33 +08:00
Dmitry Gladkikh	0d0632b2f3	Add getPopupContainer method decl to MenuProps interface (#10158 ) * add getPopupContainer to MenuProps see https://github.com/ant-design/ant-design/issues/10145 * Update getPopupContainer signature of MenuProps * getPopupContainer prop is optional	2018-04-19 20:33:12 +08:00
Wei Zhu	410fb50f44	site: use qingting	2018-04-19 18:05:27 +08:00
Wei Zhu	a9f4a6cc85	site: use https	2018-04-19 17:50:36 +08:00
Wei Zhu	163f2aae64	site: fix typo	2018-04-19 17:49:29 +08:00
Wei Zhu	05d6d80e3d	site: more verbose redirects	2018-04-19 17:23:38 +08:00
Wei Zhu	1f39cbf36a	site: Tweak redirects	2018-04-19 17:15:34 +08:00
Wei Zhu	9aa914922d	site: Add more redirects	2018-04-19 17:08:49 +08:00
Wei Zhu	9ba7818b69	site: Add redirects	2018-04-19 16:56:40 +08:00
Wei Zhu	81adba222d	site: set production build command	2018-04-19 16:41:06 +08:00
Wei Zhu	22bfc68f33	Remove ID	2018-04-19 16:39:18 +08:00
Wei Zhu	10aaee0e27	Copy netlify.toml to _site	2018-04-19 16:32:34 +08:00
VTHINKXIE	fbad7efacb	doc: add stream compute user case (#10155 ) * doc: add stream compute user case * Update cases.en-US.md	2018-04-19 16:27:26 +08:00
Wei Zhu	bbf3163cc2	Add netlify.toml	2018-04-19 16:23:13 +08:00
Zheeeng	069e9207a9	Swap positions between List.footer and List.pagination (#10045 ) * Swap positions between List.footer and List.pagination * Update List test snapshots	2018-04-19 13:48:55 +08:00
afc163	649d733048	fix snapshot ci	2018-04-19 11:54:44 +08:00
Wu Haotian	7eb2792072	fix typing for `Upload.beforeUpload` (#10059 ) * fix typing for `Upload.beforeUpload` fix #9775 * add RcFile interface, fix tests * fix typing of `Upload.onStart`	2018-04-19 11:54:28 +08:00
Zheeeng	d0d69fbf13	Remove useless style (#10054 )	2018-04-19 11:50:28 +08:00
Wei Zhu	61e4f8011a	Remove sCU from Form (#10029 ) Related #9790 Form and Form.Item are not considered as pure components	2018-04-19 11:49:50 +08:00
Zen	d7f9270a6f	fix button/demo/disabled.md (#10009 ) add `ghost` property to ghost buttons	2018-04-19 11:43:22 +08:00
afc163	a7513bfac1	fix stylelint	2018-04-19 11:40:58 +08:00
afc163	f0660836b7	fix snapshot ci	2018-04-19 11:34:19 +08:00
afc163	d4a0cf8054	Merge branch 'master' of github.com:ant-design/ant-design	2018-04-19 11:09:27 +08:00
dependabot[bot]	1cc7ebc03b	Update react-slick requirement to ~0.23.1 (#9948 ) 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) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-04-19 11:07:29 +08:00
dependabot[bot]	d0906c6661	Update stylelint requirement to 9.2.0 (#9897 ) 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.2.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-04-19 11:07:05 +08:00
afc163	61502ef942	Fix form demo error in IE9	2018-04-18 14:08:06 +08:00
afc163	04b3aad451	Fix menu arrow style of disabled, close #10113	2018-04-18 13:47:40 +08:00
afc163	2604623b7e	fix showInfo when precent is out of range	2018-04-18 11:10:32 +08:00
afc163	0eb835772d	Fix invalid progress like <Progress precent={120} />	2018-04-18 10:45:07 +08:00
Dmitry Manannikov	c0e60f8097	Fix wrong List property (#10123 ) (#10128 ) This diff excludes `locale` from `rest` variable to avoid passing to div. Close #10123	2018-04-18 00:15:22 +08:00
Zheeeng	05a522c343	Update ButtonType (#10129 )	2018-04-17 23:54:55 +08:00
Open Next	ad721111a4	fix bug in getting-started - date is null when clear the DatePick (#10111 )	2018-04-17 16:49:11 +08:00
刘红	ee4f788ae0	添加BMP的支持 (#10110 )	2018-04-17 14:44:43 +08:00
Jin ZHANG	f3f3c63c30	fix class for week date render (#10081 )	2018-04-17 13:50:27 +08:00
afc163	3b00cf8971	Fix image when file.url has query or hash close #10102	2018-04-17 13:49:03 +08:00
何志勇	7e8295769a	Markdown error (#10100 ) There are six preset values, not five	2018-04-17 10:50:14 +08:00
Pierre	09fec16b6f	[TS] AutoComplete : Make dataSource optional (#10077 ) When using children : https://ant.design/components/auto-complete/#components-auto-complete-demo-options	2018-04-16 17:42:31 +08:00
dependabot[bot]	e5030dfa64	Update majo requirement to ^0.5.1 (#10069 ) Updates the requirements on [majo](https://github.com/egoist/majo) to permit the latest version. - [Release notes](https://github.com/egoist/majo/releases) - [Commits](https://github.com/egoist/majo/commits/v0.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-04-16 16:00:24 +08:00
薛定谔的猫	63c0c2e38a	chore: set sideEffects: false (#10043 ) so webpack can do better tree-shaking.	2018-04-16 15:28:32 +08:00
Wei Zhu	1a26268bd5	Remove duplicate SpinSize	2018-04-16 15:02:03 +08:00
诸岳	265770b4e3	Fix incompatible type error for Spin[size] prop, close #10053 (#10055 )	2018-04-16 14:44:42 +08:00
Rallets	8157be2f4a	Add files via upload (#10068 )	2018-04-16 14:16:43 +08:00
Albert 理斯特	b7411febce	A: 新增关于 childrenColumnName 的文档，fix #9035 (#10062 )	2018-04-16 13:26:33 +08:00
Ed Moore	31e50e50b6	Fix types (#10063 ) * Fix types Fix https://github.com/ant-design/ant-design/issues/8796 * Fix exported types	2018-04-16 10:58:17 +08:00
Charles Covey-Brandt	e1efa990ca	Update Alert smooth-closed demo for spelling "visible" (#10060 )	2018-04-16 09:41:53 +08:00
afc163	8fdce7cb4f	test: remove bisheng:build test to speed up the progress	2018-04-15 17:27:30 +08:00
Zheeeng	b41af97d1f	Fix typo (#10050 )	2018-04-15 16:52:04 +08:00
偏右	88cacb6c35	Revert "Feature time line.reverse (#10026 )" (#10056 ) This reverts commit `92a07d1b9d`.	2018-04-15 16:51:05 +08:00
Zheeeng	92a07d1b9d	Feature time line.reverse (#10026 ) * Add reverse api for Timeline * Update TimeLine test snapshot	2018-04-15 16:50:02 +08:00
afc163	9b64a778d0	demo: fix console warning	2018-04-15 15:13:59 +08:00
afc163	4486c569f2	demo: update localeProvider demo	2018-04-15 15:11:59 +08:00
afc163	e1a5063daf	test: fix ci warning	2018-04-15 15:10:25 +08:00
afc163	e3446840fa	Fix test case of LocaleProvider which is broken by #10047 use constructor over componentDidMount	2018-04-15 15:09:13 +08:00
Zheeeng	08f5c27b0b	Use componentDidMount to replace componentWillMount: componentWillMount is deprecating (#10047 )	2018-04-14 13:37:24 +08:00
Zheeeng	b92779f821	Fix the infinite & virtualized List is invisible that caused by its height can't be calculated (#10046 )	2018-04-14 11:18:34 +08:00
afc163	92eeb7f8c9	Tweak list grid margin	2018-04-13 15:35:51 +08:00
afc163	2939aea4ec	Fix list extra border, close #10028	2018-04-13 15:35:51 +08:00
afc163	5f51d8dc43	update demo	2018-04-13 15:35:51 +08:00
afc163	d94e7bd7f0	fix typo	2018-04-13 15:35:51 +08:00
Chenjia	5634881eda	add docs for keyboard props on modal component #8818 (#10030 )	2018-04-13 12:01:51 +08:00
Bill Fienberg	66f5e75cff	Fix typo in link to InputNumber component (#9994 ) Before: >Synchronize with [InptNumber](/components/input-number/) component. After: >Synchronize with [InputNumber](/components/input-number/) component.	2018-04-11 23:18:10 +08:00
Wei Zhu	82b721a432	Extend CardProps from native div element attributes Close #9933	2018-04-11 19:41:54 +08:00
Wei Zhu	f9b8bf7e4d	Revert "Checkbox[disabled] should have higher priority than Checkbox.Group[disabled]" This reverts commit `5580791a70`.	2018-04-11 16:59:22 +08:00
Wei Zhu	5580791a70	Checkbox[disabled] should have higher priority than Checkbox.Group[disabled] Fix #9973	2018-04-11 16:35:05 +08:00
Bill Fienberg	833e076eb7	Fix typo (#9991 ) Before: >Customerize tooltip After: >Customize tooltip	2018-04-11 15:49:12 +08:00
afc163	3612144c6d	site: avoid hash jump in demo	2018-04-11 15:15:24 +08:00
Wei Zhu	2a5479a524	Fix type errors Close #9988	2018-04-11 12:01:28 +08:00
zombiej	0437d858f2	update testcase sync with Tree 1.8.12. Ref: https://github.com/ant-design/ant-design/issues/9899	2018-04-10 19:29:18 +08:00
Wei Zhu	921361313a	Add explicit types for default props Fix #8796 Close #8820	2018-04-10 10:50:59 +08:00
jim	a5e2020908	add icon prop in .d.ts	2018-04-09 14:22:06 +08:00
ddcat1115	9578083b92	update changelog	2018-04-08 22:12:25 +08:00
ddcat1115	0f01459d77	bump 3.4.1	2018-04-08 18:25:27 +08:00
afc163	e8d8741ec5	Fix divider layout with float elements, close #9956	2018-04-08 12:37:24 +08:00
偏右	a7f898e4b2	Update zh-CN.js	2018-04-08 00:20:57 +08:00
Wei Zhu	43537ed368	Fix type error Close #9931	2018-04-04 17:51:51 +08:00
偏右	a9376ef1ca	Fix image url display with non-image extention in Upload (#9936 ) now we treat url following below rules: 1. `data:image..` => image 2. `http://xxx.com/xxxx.(webp\|svg\|png\|gif\|jpg\|jpeg)` => image 3. `http://xxx.com/xxx.zip` other extensions => non-image 4. `data:application..` other minetypes in base64 text => non-image 5. `http://xxx.com/xxx` without any extensions => image close #9835 close #9681 ref #9621	2018-04-04 17:17:01 +08:00
zombieJ	49719b20d8	update tree doc for customize icon (#9893 ) * update doc for customize icon * add test case	2018-04-04 16:39:50 +08:00
ddcat1115	1612ef6990	fix #9882	2018-04-04 16:01:14 +08:00
afc163	e6b3490a8e	fix test case	2018-04-04 15:50:08 +08:00
ddcat1115	a402fdd8b3	fix #9907 (#9908 ) * fix #9907 * update snapshot	2018-04-04 15:29:59 +08:00
dependabot[bot]	d71834011c	Update eslint-plugin-babel requirement to ^5.0.0 (#9896 ) Updates the requirements on [eslint-plugin-babel](https://github.com/babel/eslint-plugin-babel) to permit the latest version. - [Release notes](https://github.com/babel/eslint-plugin-babel/releases) - [Commits](https://github.com/babel/eslint-plugin-babel/commits/v5.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-04-04 15:08:21 +08:00
Wei Zhu	5336bd688f	Fix type error	2018-04-04 14:49:14 +08:00
André	245e1cf3d0	Minor typo (#9922 ) Fixes minor typo	2018-04-03 22:00:31 +08:00
afc163	cab162b562	doc: update divider doc and demo	2018-04-03 14:25:47 +08:00
afc163	779a35e4cc	doc: update message duration description	2018-04-03 13:41:44 +08:00
afc163	bf6e91be3a	Tweak table sorter icon click area again	2018-04-03 11:33:37 +08:00
Nokecy	98d56b2dd0	Fixed typescript definition and add table props onHeaderRow (#9902 )	2018-04-02 17:15:17 +08:00
dependabot[bot]	2807d75937	Update enquire-js requirement to ^0.2.1 (#9895 ) Updates the requirements on [enquire-js](https://github.com/jljsj/enquire-js) to permit the latest version. - [Release notes](https://github.com/jljsj/enquire-js/releases) - [Commits](https://github.com/jljsj/enquire-js/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>	2018-04-02 15:42:34 +08:00
Wei Zhu	ef3f10ab8e	docs: Remove extra whitespace	2018-04-01 21:15:50 +08:00