chore: Conflict 4.0-prepare into master

.github/workflows/deploy-site.yml

@@ -1,10 +1,10 @@
 name: Deploy website
 on:
   release:
-    actions:
-      - published
+    types: [published]
     branches:
       - master
+
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest

.github/workflows/publish-to-github-package.yml

@@ -0,0 +1,28 @@
+name: Publish to github-package
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@master
+
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+          registry-url: 'https://npm.pkg.github.com'
+
+      - name: install
+        run: npm install
+
+      - name: compile
+        run: npm run compile
+
+      - name: publish
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.zh-CN.md

@@ -66,7 +66,7 @@ timeline: true
 - Descriptions
   - 🐞 修复 Descriptions.Item 最后一个宽度计算不正确的问题。[#18568](https://github.com/ant-design/ant-design/pull/18568)
   - 🐞 Description.Item 在渲染时会复用用户提供的 `key`。[#18578](https://github.com/ant-design/ant-design/pull/18578)
-- 🐞 修复 Tab 内容宽度在 Safari 下不正确的问题。[#18574](https://github.com/ant-design/ant-design/pull/18574)
+- 🐞 修复 Tabs 内容宽度在 Safari 下不正确的问题。[#18574](https://github.com/ant-design/ant-design/pull/18574)
 - 🐞 修复 Mentions 的 `prefix` 为空字符串时，弹窗位置不正确的问题。[#18576](https://github.com/ant-design/ant-design/pull/18576)
 - 🐞 修复 Upload.Dragger 在 `multiple` 为 false 时，仍然可以上传多份文件的问题。[#18580](https://github.com/ant-design/ant-design/pull/18580)
 - 🐞 修复 `Button[href]` 在 Card `actions` 中样式变形的问题。[#18588](https://github.com/ant-design/ant-design/pull/18588)

README-zh_CN.md

@@ -8,7 +8,7 @@
 
 <div align="center">
 
-一套企业级的 UI 设计语言和 React 实现。
+一套企业级 UI 设计语言和 React 组件库。
 
 [![CircleCI branch](https://img.shields.io/circleci/project/github/ant-design/ant-design/master.svg?style=flat-square)](https://circleci.com/gh/ant-design/ant-design) [![Codecov](https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square)](https://codecov.io/gh/ant-design/ant-design/branch/master) [![npm package](https://img.shields.io/npm/v/antd.svg?style=flat-square)](https://www.npmjs.org/package/antd) [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://npmjs.com/antd)
 

README.md

@@ -8,7 +8,7 @@
 
 <div align="center">
 
-An enterprise-class UI design language and React implementation.
+An enterprise-class UI design language and React UI library.
 
 [![CircleCI branch](https://img.shields.io/circleci/project/github/ant-design/ant-design/master.svg?style=flat-square)](https://circleci.com/gh/ant-design/ant-design) [![Codecov](https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square)](https://codecov.io/gh/ant-design/ant-design/branch/master) [![](https://flat.badgen.net/npm/v/antd?icon=npm)](https://www.npmjs.com/package/antd) [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://npmjs.com/antd)
 

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

@@ -68,10 +68,10 @@ exports[`renders ./components/alert/demo/banner.md correctly 1`] = `
     <span
       class="ant-alert-description"
     />
-    <span
+    <button
       class="ant-alert-close-icon"
-      role="button"
       tabindex="0"
+      type="button"
     >
       <span
         aria-label="close"
@@ -93,7 +93,7 @@ exports[`renders ./components/alert/demo/banner.md correctly 1`] = `
           />
         </svg>
       </span>
-    </span>
+    </button>
   </div>
   <br />
   <div
@@ -176,10 +176,10 @@ exports[`renders ./components/alert/demo/closable.md correctly 1`] = `
     <span
       class="ant-alert-description"
     />
-    <span
+    <button
       class="ant-alert-close-icon"
-      role="button"
       tabindex="0"
+      type="button"
     >
       <span
         aria-label="close"
@@ -201,7 +201,7 @@ exports[`renders ./components/alert/demo/closable.md correctly 1`] = `
           />
         </svg>
       </span>
-    </span>
+    </button>
   </div>
   <div
     class="ant-alert ant-alert-error ant-alert-with-description ant-alert-no-icon ant-alert-closable"
@@ -217,10 +217,10 @@ exports[`renders ./components/alert/demo/closable.md correctly 1`] = `
     >
       Error Description Error Description Error Description Error Description Error Description Error Description
     </span>
-    <span
+    <button
       class="ant-alert-close-icon"
-      role="button"
       tabindex="0"
+      type="button"
     >
       <span
         aria-label="close"
@@ -242,7 +242,7 @@ exports[`renders ./components/alert/demo/closable.md correctly 1`] = `
           />
         </svg>
       </span>
-    </span>
+    </button>
   </div>
 </div>
 `;
@@ -260,17 +260,17 @@ exports[`renders ./components/alert/demo/close-text.md correctly 1`] = `
   <span
     class="ant-alert-description"
   />
-  <span
+  <button
     class="ant-alert-close-icon"
-    role="button"
     tabindex="0"
+    type="button"
   >
     <span
       class="ant-alert-close-text"
     >
       Close Now
     </span>
-  </span>
+  </button>
 </div>
 `;
 
@@ -932,10 +932,10 @@ exports[`renders ./components/alert/demo/smooth-closed.md correctly 1`] = `
     <span
       class="ant-alert-description"
     />
-    <span
+    <button
       class="ant-alert-close-icon"
-      role="button"
       tabindex="0"
+      type="button"
     >
       <span
         aria-label="close"
@@ -957,7 +957,7 @@ exports[`renders ./components/alert/demo/smooth-closed.md correctly 1`] = `
           />
         </svg>
       </span>
-    </span>
+    </button>
   </div>
   <p>
     placeholder text here

components/alert/index.tsx

@@ -33,7 +33,7 @@ export interface AlertProps {
   /** Additional content of Alert */
   description?: React.ReactNode;
   /** Callback when close Alert */
-  onClose?: React.MouseEventHandler<HTMLAnchorElement>;
+  onClose?: React.MouseEventHandler<HTMLButtonElement>;
   /** Trigger when animation ending of Alert */
   afterClose?: () => void;
   /** Whether to show icon */
@@ -70,7 +70,7 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
     closed: false,
   };
 
-  handleClose = (e: React.MouseEvent<HTMLAnchorElement>) => {
+  handleClose = (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault();
     const dom = ReactDOM.findDOMNode(this) as HTMLElement;
     dom.style.height = `${dom.offsetHeight}px`;
@@ -134,14 +134,14 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
     );
 
     const closeIcon = closable ? (
-      <span
-        role="button"
+      <button
+        type="button"
         onClick={this.handleClose}
         className={`${prefixCls}-close-icon`}
         tabIndex={0}
       >
         {closeText ? <span className={`${prefixCls}-close-text`}>{closeText}</span> : <Close />}
-      </span>
+      </button>
     ) : null;
 
     const dataOrAriaProps = getDataOrAriaProps(this.props);

components/alert/style/index.less

@@ -74,6 +74,8 @@
     overflow: hidden;
     font-size: @font-size-sm;
     line-height: 22px;
+    border: none;
+    background-color: transparent;
     cursor: pointer;
 
     .@{iconfont-css-prefix}-close {

components/auto-complete/index.en-US.md

@@ -20,6 +20,7 @@ When there is a need for autocomplete functionality.
 | backfill | backfill selected item the input when using keyboard | boolean | false |  |
 | children (for customize input element) | customize input element | HTMLInputElement <br /><br /> HTMLTextAreaElement <br /><br /> `React.ReactElement<InputProps>` | `<Input />` |  |
 | children (for dataSource) | Data source to auto complete | `React.ReactElement<OptionProps>` <br /><br /> `Array<React.ReactElement<OptionProps>>` | - |  |
+| dropdownMenuStyle | additional style applied to dropdown menu | object |  |  |
 | defaultActiveFirstOption | Whether active first option by default | boolean | true |  |
 | defaultValue | Initial selected option. | string\|string\[] | - |  |
 | disabled | Whether disabled select | boolean | false |  |

components/auto-complete/index.tsx

@@ -10,7 +10,7 @@ import toArray from 'rc-util/lib/Children/toArray';
 import { SelectProps as RcSelectProps } from 'rc-select';
 import classNames from 'classnames';
 import omit from 'omit.js';
-import Select, { InternalSelectProps, OptionType } from '../select';
+import Select, { InternalSelectProps, OptionType, SelectValue } from '../select';
 import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
 import warning from '../_util/warning';
 
@@ -22,11 +22,17 @@ export interface DataSourceItemObject {
   value: string;
   text: string;
 }
-export type DataSourceItemType = string | DataSourceItemObject;
 
 export interface AutoCompleteProps
   extends Omit<InternalSelectProps<string>, 'inputIcon' | 'loading' | 'mode' | 'optionLabelProp'> {
-  dataSource?: DataSourceItemType[];
+  dropdownMenuStyle?: React.CSSProperties;
+  autoFocus?: boolean;
+  backfill?: boolean;
+  optionLabelProp?: string;
+  onChange?: (value: SelectValue) => void;
+  onSelect?: (value: SelectValue, option: Object) => any;
+  onBlur?: (value: SelectValue) => void;
+  onFocus?: () => void;
 }
 
 function isSelectOptionOrSelectOptGroup(child: any): Boolean {

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

@@ -21,6 +21,7 @@ title: AutoComplete
 | backfill | 使用键盘选择选项的时候把选中项回填到输入框中 | boolean | false |  |
 | children (自定义输入框) | 自定义输入框 | HTMLInputElement <br /><br /> HTMLTextAreaElement <br /><br /> `React.ReactElement<InputProps>` | `<Input />` |  |
 | children (自动完成的数据源) | 自动完成的数据源 | `React.ReactElement<OptionProps>` <br /><br /> `Array<React.ReactElement<OptionProps>>` | - |  |
+| dropdownMenuStyle | dropdown 菜单自定义样式 | object |  |  |
 | defaultActiveFirstOption | 是否默认高亮第一个选项。 | boolean | true |  |
 | defaultValue | 指定默认选中的条目 | string\|string\[]\| 无 |  |
 | disabled | 是否禁用 | boolean | false |  |

components/avatar/style/index.less

@@ -37,6 +37,7 @@
     display: block;
     width: 100%;
     height: 100%;
+    object-fit: cover;
   }
 }
 

components/button/__tests__/__snapshots__/index.test.js.snap

@@ -155,6 +155,17 @@ exports[`Button renders Chinese characters correctly 6`] = `
 </button>
 `;
 
+exports[`Button renders Chinese characters correctly 7`] = `
+<button
+  class="ant-btn"
+  type="button"
+>
+  <span>
+    按 钮
+  </span>
+</button>
+`;
+
 exports[`Button renders correctly 1`] = `
 <button
   class="ant-btn"
@@ -189,6 +200,17 @@ exports[`Button should merge text if children using variable 1`] = `
 </button>
 `;
 
+exports[`Button should not insert space to link button 1`] = `
+<button
+  class="ant-btn ant-btn-link"
+  type="button"
+>
+  <span>
+    按钮
+  </span>
+</button>
+`;
+
 exports[`Button should not render as link button when href is undefined 1`] = `
 <button
   class="ant-btn ant-btn-primary"
@@ -200,6 +222,23 @@ exports[`Button should not render as link button when href is undefined 1`] = `
 </button>
 `;
 
+exports[`Button should render empty button without errors 1`] = `
+<Button
+  block={false}
+  ghost={false}
+  htmlType="button"
+  loading={false}
+>
+  <Wave>
+    <button
+      className="ant-btn"
+      onClick={[Function]}
+      type="button"
+    />
+  </Wave>
+</Button>
+`;
+
 exports[`Button should support link button 1`] = `
 <a
   class="ant-btn"