docs: ❇️ release 3.26.13 (#21967)

close #21674

chore: remove log

fix: timer leak

fix: willUnmount

test: cov

.antd-tools.config.js

@@ -1,18 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-// eslint-disable-next-line import/no-extraneous-dependencies
 const packageInfo = require('./package.json');
-const defaultVars = require('./scripts/default-vars');
-const darkVars = require('./scripts/dark-vars');
-const compactVars = require('./scripts/compact-vars');
-
-function generateThemeFileContent(theme) {
-  return `const { ${theme}ThemeSingle } = require('./theme');\nconst defaultTheme = require('./default-theme');\n
-module.exports = {
-  ...defaultTheme,
-  ...${theme}ThemeSingle
-}`;
-}
 
 // We need compile additional content for antd user
 function finalizeCompile() {
@@ -28,7 +16,7 @@ function finalizeCompile() {
         `{ version: '${packageInfo.version}' }`,
       ),
     );
-    // eslint-disable-next-line no-console
+    // eslint-disable-next-line
     console.log('Wrote version into lib/version/index.js');
 
     // Build package.json version to lib/version/index.d.ts
@@ -38,7 +26,7 @@ function finalizeCompile() {
       versionDefPath,
       `declare var _default: "${packageInfo.version}";\nexport default _default;\n`,
     );
-    // eslint-disable-next-line no-console
+    // eslint-disable-next-line
     console.log('Wrote version into lib/version/index.d.ts');
 
     // Build a entry less file to dist/antd.less
@@ -59,42 +47,6 @@ function finalizeCompile() {
   }
 }
 
-function buildThemeFile(theme, vars) {
-  // Build less entry file: dist/antd.${theme}.less
-  if (theme !== 'default') {
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', `antd.${theme}.less`),
-      `@import "../lib/style/${theme}.less";\n@import "../lib/style/components.less";`,
-    );
-    // eslint-disable-next-line no-console
-    console.log(`Built a entry less file to dist/antd.${theme}.less`);
-  } else {
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', `default-theme.js`),
-      `module.exports = ${JSON.stringify(vars, null, 2)};\n`,
-    );
-    return;
-  }
-
-  // Build ${theme}.js: dist/${theme}-theme.js, for less-loader
-
-  fs.writeFileSync(
-    path.join(process.cwd(), 'dist', `theme.js`),
-    `const ${theme}ThemeSingle = ${JSON.stringify(vars, null, 2)};\n`,
-    {
-      flag: 'a',
-    },
-  );
-
-  fs.writeFileSync(
-    path.join(process.cwd(), 'dist', `${theme}-theme.js`),
-    generateThemeFileContent(theme),
-  );
-
-  // eslint-disable-next-line no-console
-  console.log(`Built a ${theme} theme js file to dist/${theme}-theme.js`);
-}
-
 function finalizeDist() {
   if (fs.existsSync(path.join(__dirname, './dist'))) {
     // Build less entry file: dist/antd.less
@@ -102,48 +54,9 @@ function finalizeDist() {
       path.join(process.cwd(), 'dist', 'antd.less'),
       '@import "../lib/style/index.less";\n@import "../lib/style/components.less";',
     );
-    // eslint-disable-next-line no-console
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', 'theme.js'),
-      `const defaultTheme = require('./default-theme.js');\n`,
-    );
-    // eslint-disable-next-line no-console
-    console.log('Built a entry less file to dist/antd.less');
-    buildThemeFile('default', defaultVars);
-    buildThemeFile('dark', darkVars);
-    buildThemeFile('compact', compactVars);
-    fs.writeFileSync(
-      path.join(process.cwd(), 'dist', `theme.js`),
-      `
-function getThemeVariables(options = {}) {
-  let themeVar = {
-    'hack': \`true;@import "\${require.resolve('antd/lib/style/color/colorPalette.less')}";\`,
-    ...defaultTheme
-  };
-  if(options.dark) {
-    themeVar = {
-      ...themeVar,
-      ...darkThemeSingle
-    }
-  }
-  if(options.compact){
-    themeVar = {
-      ...themeVar,
-      ...compactThemeSingle
-    }
-  }
-  return themeVar;
-}
 
-module.exports = {
-  darkThemeSingle,
-  compactThemeSingle,
-  getThemeVariables
-}`,
-      {
-        flag: 'a',
-      },
-    );
+    // eslint-disable-next-line
+    console.log('Built a entry less file to dist/antd.less');
   }
 }
 
@@ -154,6 +67,4 @@ module.exports = {
   dist: {
     finalize: finalizeDist,
   },
-  generateThemeFileContent,
 };
-finalizeDist();

.circleci/config.yml

@@ -10,6 +10,13 @@ references:
     attach_workspace:
       at: ~/ant-design
 
+  install_react: &install_react
+    run: REACT=15 ./scripts/install-react.sh
+
+  react_15: &react_15
+    environment:
+      REACT: 15
+
   react_16: &react_16
     environment:
       REACT: 16
@@ -44,6 +51,21 @@ references:
       - test_node:
           requires:
             - setup
+      - test_dist_15:
+          requires:
+            - dist
+      - test_lib_15:
+          requires:
+            - compile
+      - test_es_15:
+          requires:
+            - compile
+      - test_dom_15:
+          requires:
+            - setup
+      - test_node_15:
+          requires:
+            - setup
       - check_metadata:
           requires:
             - setup
@@ -151,6 +173,69 @@ jobs:
       - *attach_workspace
       - run: npm run test-node -- -w 1
 
+  test_dist_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run:
+          command: npm test -- -w 1 -u
+          environment:
+            LIB_DIR: dist
+            REACT: 15
+
+  test_lib_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run:
+          command: npm test -- -w 1 -u
+          environment:
+            LIB_DIR: lib
+            REACT: 15
+
+  test_es_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run:
+          command: npm test -- -w 1 -u
+          environment:
+            LIB_DIR: es
+            REACT: 15
+
+  test_dom_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run:
+          command: npm test -- -w 1 -u
+          environment:
+            REACT: 15
+
+  test_node_15:
+    <<: *container_config
+    <<: *react_15
+    steps:
+      - checkout
+      - *attach_workspace
+      - *install_react
+      - run:
+          command: npm run test-node -- -w 1 -u
+          environment:
+            REACT: 15
+
   check_metadata:
     <<: *container_config
     steps:

.depslintrc.js

@@ -10,17 +10,9 @@ module.exports = {
     '**/*.json',
   ],
   modulePattern: [
-    {
-      pattern: /ConfigContext.*renderEmpty/ms,
-      module: '../empty',
-    },
     {
       pattern: /ConfigConsumer.*renderEmpty/ms,
       module: '../empty',
     },
-    {
-      pattern: /config-provider\/context.*renderEmpty/ms,
-      module: '../empty',
-    },
   ],
 };

.eslintignore

@@ -4,19 +4,8 @@ components/**/*.jsx
 !components/*/demo/*
 !.*.js
 # Docs templates
-site/theme/template/Color/ColorPicker.jsx
 site/theme/template/IconDisplay/*.js
 site/theme/template/IconDisplay/*.jsx
-site/theme/template/IconDisplay/fields.js
-site/theme/template/Home/**/*.jsx
-site/theme/template/utils.jsx
-site/theme/template/Layout/**/*.jsx
-site/theme/template/Layout/Footer.jsx
-site/theme/template/Content/Article.jsx
-site/theme/template/Content/EditButton.jsx
-site/theme/template/Resources/*.jsx
-site/theme/template/Resources/**/*.jsx
-site/theme/template/NotFound.jsx
 typings
 es/**/*
 lib/**/*
@@ -24,5 +13,3 @@ node_modules
 _site
 dist
 **/*.d.ts
-# Scripts
-scripts/previewEditor/**/*

.eslintrc.js

@@ -1,4 +1,4 @@
-module.exports = {
+const eslintrc = {
   extends: [
     'airbnb',
     'prettier',
@@ -20,38 +20,13 @@ module.exports = {
     },
   },
   parser: '@typescript-eslint/parser',
-  plugins: ['markdown', 'react', 'babel', 'jest', '@typescript-eslint', 'react-hooks', 'unicorn'],
+  plugins: ['markdown', 'react', 'babel', 'jest', '@typescript-eslint'],
   // https://github.com/typescript-eslint/typescript-eslint/issues/46#issuecomment-470486034
   overrides: [
     {
       files: ['*.ts', '*.tsx'],
       rules: {
         '@typescript-eslint/no-unused-vars': [2, { args: 'none' }],
-        'no-unused-expressions': 'off',
-        '@typescript-eslint/no-unused-expressions': 2,
-      },
-    },
-    {
-      files: ['*.md'],
-      globals: {
-        React: true,
-        ReactDOM: true,
-        mountNode: true,
-      },
-      rules: {
-        indent: 0,
-        'no-console': 0,
-        'no-plusplus': 0,
-        'eol-last': 0,
-        'no-script-url': 0,
-        'prefer-rest-params': 0,
-        'react/no-access-state-in-setstate': 0,
-        'react/destructuring-assignment': 0,
-        'react/no-multi-comp': 0,
-        'jsx-a11y/href-no-hash': 0,
-        'import/no-extraneous-dependencies': 0,
-        'import/no-unresolved': 0,
-        'jsx-a11y/control-has-associated-label': 0,
       },
     },
   ],
@@ -62,7 +37,6 @@ module.exports = {
     'react/forbid-prop-types': 0,
     'react/jsx-indent': 0,
     'react/jsx-wrap-multilines': ['error', { declaration: false, assignment: false }],
-    'import/extensions': 0,
     'import/no-extraneous-dependencies': [
       'error',
       {
@@ -113,13 +87,35 @@ module.exports = {
     'react/static-property-placement': 0,
     'jest/no-test-callback': 0,
     'jest/expect-expect': 0,
-    'react-hooks/rules-of-hooks': 2, // Checks rules of Hooks
-    'unicorn/better-regex': 2,
-    'unicorn/prefer-trim-start-end': 2,
-    'unicorn/expiring-todo-comments': 2,
-    'unicorn/no-abusive-eslint-disable': 2,
+    'import/extensions': 0,
   },
   globals: {
     gtag: true,
   },
 };
+
+if (process.env.RUN_ENV === 'DEMO') {
+  eslintrc.globals = Object.assign(eslintrc.globals, {
+    React: true,
+    ReactDOM: true,
+    mountNode: true,
+  });
+
+  Object.assign(eslintrc.rules, {
+    indent: 0,
+    'no-console': 0,
+    'no-plusplus': 0,
+    'eol-last': 0,
+    'no-script-url': 0,
+    'prefer-rest-params': 0,
+    'react/no-access-state-in-setstate': 0,
+    'react/destructuring-assignment': 0,
+    'react/no-multi-comp': 0,
+    'jsx-a11y/href-no-hash': 0,
+    'import/no-extraneous-dependencies': 0,
+    'import/no-unresolved': 0,
+    'jsx-a11y/control-has-associated-label': 0,
+  });
+}
+
+module.exports = eslintrc;

.github/FUNDING.yml

@@ -4,6 +4,5 @@ github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, u
 open_collective: ant-design
 patreon: ant_design
 ko_fi: # Replace with a single Ko-fi username
-issuehunt: ant-design/ant-design
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 custom: # Replace with a single custom sponsorship URL

.github/PULL_REQUEST_TEMPLATE.md

@@ -48,8 +48,6 @@ Describe changes from userside, and list all potential break changes or other ri
 
 ### ☑️ Self Check before Merge
 
-⚠️ Please check all items below before review. ⚠️ 
-
 - [ ] Doc is updated/provided or not needed
 - [ ] Demo is updated/provided or not needed
 - [ ] TypeScript definition is updated/provided or not needed

.github/PULL_REQUEST_TEMPLATE/pr_cn.md

@@ -46,9 +46,9 @@
 | 🇺🇸 英文 |          |
 | 🇨🇳 中文 |          |
 
-### ☑️ 请求合并前的自查清单
+- 中文（可选）:
 
-⚠️ 请自检并全部**勾选全部选项**。⚠️ 
+### ☑️ 请求合并前的自查清单
 
 - [ ] 文档已补充或无须补充
 - [ ] 代码演示已提供或无须提供

.github/workflows/deploy-site.yml

@@ -3,7 +3,7 @@ on:
   release:
     types: [published]
     branches:
-      - master
+      - 3.x-stable
 
 jobs:
   build-and-deploy:

.github/workflows/gitleaks.yml

@@ -1,17 +0,0 @@
-name: gitleaks
-
-on: [push,pull_request]
-
-jobs:
-  gitleaks:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: '1'
-    - name: wget
-      uses: wei/wget@v1
-      with:
-        args: -O .gitleaks.toml https://raw.githubusercontent.com/ycjcl868/gitleaks/master/.gitleaks.toml
-    - name: gitleaks-action
-      uses: zricethezav/gitleaks-action@master

.github/workflows/mirror.yml

@@ -1,15 +0,0 @@
-name: Mirror
-
-on: [push]
-
-jobs:
-  to_gitee:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: pixta-dev/repository-mirroring-action@v1
-      with:
-        target_repo_url:
-          git@gitee.com:ant-design/ant-design.git
-        ssh_private_key:
-          ${{ secrets.GITEE_SSH_PRIVATE_KEY }}

.github/workflows/rebase.yml

@@ -5,20 +5,10 @@ name: Automatic Rebase
 jobs:
   rebase:
     name: Rebase
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@master
-      with:
-        fetch-depth: 0
     - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.2
+      uses: cirrus-actions/rebase@master
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  # https://github.community/t5/GitHub-Actions/Workflow-is-failing-if-no-job-can-be-ran-due-to-condition/m-p/38186#M3250
-  always_job:
-    name: Always run job
-    runs-on: ubuntu-latest
-    steps:
-      - name: Always run
-        run: echo "This job is used to prevent the workflow to fail when all other jobs are skipped."

.gitignore

@@ -25,7 +25,6 @@ nohup.out
 _site
 _data
 dist
-report.html
 /lib
 /es
 elasticsearch-*
@@ -39,21 +38,8 @@ components/**/*.jsx
 !components/**/__tests__/**/*.js
 !components/**/__tests__/**/*.js.snap
 /.history
-*.tmp
-
 # Docs templates
-site/theme/template/Color/ColorPicker.jsx
 site/theme/template/IconDisplay/*.js
 site/theme/template/IconDisplay/*.jsx
 site/theme/template/IconDisplay/fields.js
-site/theme/template/Home/**/*.jsx
-site/theme/template/utils.jsx
-site/theme/template/Layout/Footer.jsx
-site/theme/template/Layout/Header/**/*.jsx
-site/theme/template/Layout/SiteContext.jsx
-site/theme/template/Content/Article.jsx
-site/theme/template/Content/EditButton.jsx
-site/theme/template/Resources/*.jsx
-site/theme/template/Resources/**/*.jsx
-site/theme/template/NotFound.jsx
-scripts/previewEditor/index.html
+*.tmp

.jest.js

@@ -1,21 +1,13 @@
+const libDir = process.env.LIB_DIR;
+
 const transformIgnorePatterns = [
   '/dist/',
-  // Ignore modules without es dir.
-  // Update: @babel/runtime should also be transformed
-  'node_modules/(?!.*@babel)[^/]+?/(?!(es|node_modules)/)',
+  'node_modules/[^/]+?/(?!(es|node_modules)/)', // Ignore modules without es dir
 ];
 
-function getTestRegex(libDir) {
-  if (libDir === 'dist') {
-    return 'demo\\.test\\.js$';
-  }
-  return '.*\\.test\\.(j|t)sx?$';
-}
-
 module.exports = {
   verbose: true,
   setupFiles: ['./tests/setup.js'],
-  setupFilesAfterEnv: ['./tests/setupAfterEnv.ts'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'md'],
   modulePathIgnorePatterns: ['/_site/'],
   moduleNameMapper: {
@@ -33,7 +25,7 @@ module.exports = {
     '\\.md$': './node_modules/@ant-design/tools/lib/jest/demoPreprocessor',
     '\\.(jpg|png|gif|svg)$': './node_modules/@ant-design/tools/lib/jest/imagePreprocessor',
   },
-  testRegex: getTestRegex(process.env.LIB_DIR),
+  testRegex: `${libDir === 'dist' ? 'demo' : '.*'}\\.test\\.js$`,
   collectCoverageFrom: [
     'components/**/*.{ts,tsx}',
     '!components/*/style/index.tsx',

.jest.node.js

@@ -3,7 +3,6 @@ const { moduleNameMapper, transformIgnorePatterns } = require('./.jest');
 // jest config for server render environment
 module.exports = {
   setupFiles: ['./tests/setup.js'],
-  setupFilesAfterEnv: ['./tests/setupAfterEnv.ts'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'md'],
   moduleNameMapper,
   transform: {
@@ -12,7 +11,7 @@ module.exports = {
     '\\.md$': './node_modules/@ant-design/tools/lib/jest/demoPreprocessor',
     '\\.(jpg|png|gif|svg)$': './node_modules/@ant-design/tools/lib/jest/imagePreprocessor',
   },
-  testRegex: 'demo\\.test\\.(j|t)s$',
+  testRegex: 'demo\\.test\\.js$',
   testEnvironment: 'node',
   transformIgnorePatterns,
   snapshotSerializers: ['enzyme-to-json/serializer'],

.prettierrc

@@ -3,7 +3,6 @@
   "trailingComma": "all",
   "printWidth": 100,
   "proseWrap": "never",
-  "arrowParens": "avoid",
   "overrides": [
     {
       "files": ".prettierrc",

.remarkrc.js

@@ -1,9 +0,0 @@
-const config = {
-  plugins: [
-    'remark-preset-lint-recommended',
-    ['remark-lint-list-item-indent', 'space'],
-    ['remark-lint-no-literal-urls', false],
-  ],
-};
-
-module.exports = config;

.travis.yml

@@ -13,11 +13,19 @@ matrix:
   fast_finish: true
   include:
     - env: TEST_TYPE=lint
-    - env: TEST_TYPE=test:dist
-    - env: TEST_TYPE=test:lib
-    - env: TEST_TYPE=test:es
-    - env: TEST_TYPE=test:dom
-    - env: TEST_TYPE=test:node
+    - env: REACT=16 TEST_TYPE=test:dist
+    - env: REACT=16 TEST_TYPE=test:lib
+    - env: REACT=16 TEST_TYPE=test:es
+    - env: REACT=16 TEST_TYPE=test:dom
+    - env: REACT=16 TEST_TYPE=test:node
+    - env: REACT=15 TEST_TYPE=test:dist
+    - env: REACT=15 TEST_TYPE=test:lib
+    - env: REACT=15 TEST_TYPE=test:es
+    - env: REACT=15 TEST_TYPE=test:dom
+    - env: REACT=15 TEST_TYPE=test:node
+
+before_script:
+  - scripts/install-react.sh
 
 script:
   - scripts/travis-script.sh

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [xingmin.zhu@alipay.com.](mailto:xingmin.zhu@alipay.com.) The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at xingmin.zhu@alipay.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

README-pt_BR.md

@@ -1,138 +0,0 @@
-<p align="center">
-  <a href="http://ant.design">
-    <img width="200" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg">
-  </a>
-</p>
-
-<h1 align="center">Ant Design</h1>
-
-<div align="center">
-
-Uma solução empresarial de design e biblioteca UI para 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) ![CI Status](https://github.com/ant-design/ant-design/workflows/test/badge.svg) [![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)
-
-[![Dependencies](https://img.shields.io/david/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design) [![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design?type=dev) [![Total alerts](https://flat.badgen.net/lgtm/alerts/g/ant-design/ant-design)](https://lgtm.com/projects/g/ant-design/ant-design/alerts/) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fant-design%2Fant-design.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fant-design%2Fant-design?ref=badge_shield) [![Issues need help](https://flat.badgen.net/github/label-issues/ant-design/ant-design/help%20wanted/open)](https://github.com/ant-design/ant-design/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
-
-[![](https://img.shields.io/twitter/follow/AntDesignUI.svg?label=Ant%20Design&style=social)](https://twitter.com/AntDesignUI) [![Gitter](https://img.shields.io/gitter/room/ant-design/ant-design-english.svg?style=flat-square&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjEyMzUiIGhlaWdodD0iNjUwIiB2aWV3Qm94PSIwIDAgNzQxMCAzOTAwIj4NCjxyZWN0IHdpZHRoPSI3NDEwIiBoZWlnaHQ9IjM5MDAiIGZpbGw9IiNiMjIyMzQiLz4NCjxwYXRoIGQ9Ik0wLDQ1MEg3NDEwbTAsNjAwSDBtMCw2MDBINzQxMG0wLDYwMEgwbTAsNjAwSDc0MTBtMCw2MDBIMCIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjMwMCIvPg0KPHJlY3Qgd2lkdGg9IjI5NjQiIGhlaWdodD0iMjEwMCIgZmlsbD0iIzNjM2I2ZSIvPg0KPGcgZmlsbD0iI2ZmZiI%2BDQo8ZyBpZD0iczE4Ij4NCjxnIGlkPSJzOSI%2BDQo8ZyBpZD0iczUiPg0KPGcgaWQ9InM0Ij4NCjxwYXRoIGlkPSJzIiBkPSJNMjQ3LDkwIDMxNy41MzQyMzAsMzA3LjA4MjAzOSAxMzIuODczMjE4LDE3Mi45MTc5NjFIMzYxLjEyNjc4MkwxNzYuNDY1NzcwLDMwNy4wODIwMzl6Ii8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB5PSI0MjAiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHk9Ijg0MCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTI2MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTY4MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjczQiIHg9IjI0NyIgeT0iMjEwIi8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzOSIgeD0iNDk0Ii8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzMTgiIHg9Ijk4OCIvPg0KPHVzZSB4bGluazpocmVmPSIjczkiIHg9IjE5NzYiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3M1IiB4PSIyNDcwIi8%2BDQo8L2c%2BDQo8L3N2Zz4%3D)](https://gitter.im/ant-design/ant-design-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Join the chat at https://gitter.im/ant-design/ant-design](https://img.shields.io/gitter/room/ant-design/ant-design.svg?style=flat-square&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjkwMCIgaGVpZ2h0PSI2MDAiIHZpZXdCb3g9IjAgMCAzMCAyMCI%2BDQo8ZGVmcz4NCjxwYXRoIGlkPSJzIiBkPSJNMCwtMSAwLjU4Nzc4NSwwLjgwOTAxNyAtMC45NTEwNTcsLTAuMzA5MDE3SDAuOTUxMDU3TC0wLjU4Nzc4NSwwLjgwOTAxN3oiIGZpbGw9IiNmZmRlMDAiLz4NCjwvZGVmcz4NCjxyZWN0IHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0iI2RlMjkxMCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNSw1KSBzY2FsZSgzKSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsMikgcm90YXRlKDIzLjAzNjI0MykiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEyLDQpIHJvdGF0ZSg0NS44Njk4OTgpIi8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMiw3KSByb3RhdGUoNjkuOTQ1Mzk2KSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsOSkgcm90YXRlKDIwLjY1OTgwOCkiLz4NCjwvc3ZnPg%3D%3D)](https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-</div>
-
-[![](https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*Yl83RJhUE7kAAAAAAAAAAABkARQnAQ)](http://ant.design)
-
-[English](./README.md) | Português | [简体中文](./README-zh_CN.md)
-
-## ✨ Funcionalidades
-
-- 🌈 Design empresarial de interface para aplicações web.
-- 📦 Um conjunto de alta qualidade, componentes React prontos para uso.
-- 🛡 Escrito em TypeScript com tipos previsíveis.
-- ⚙️ Pacote completo de recursos de design e ferramentas de desenvolvimento.
-- 🌍 Suporte de internacionalização para dezenas de idiomas.
-- 🎨 Personalização poderosa do tema em todos os detalhes.
-
-## 🖥 Suporte aos ambientes
-
-- Navegadores modernos e Internet Explorer 11 (com [polyfills](https://ant.design/docs/react/getting-started#Compatibility))
-- Renderização no lado do servidor (server-side)
-- [Electron](https://www.electronjs.org/)
-
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
-| --- | --- | --- | --- | --- | --- |
-| IE11, Edge | últimas 2 versões | últimas 2 versões | últimas 2 versões | últimas 2 versões | últimas 2 versões |
-
-## 📦 Instalação
-
-```bash
-npm install antd
-```
-
-```bash
-yarn add antd
-```
-
-## 🔨 Uso
-
-```jsx
-import { Button, DatePicker } from 'antd';
-
-const App = () => (
-  <>
-    <Button type="primary">PRESS ME</Button>
-    <DatePicker />
-  </>
-);
-```
-
-Importe o estilo manualmente:
-
-```jsx
-import 'antd/dist/antd.css'; // ou 'antd/dist/antd.less'
-```
-
-Ou use [babel-plugin-import](https://ant.design/docs/react/getting-started#Import-on-Demand).
-
-### TypeScript
-
-Veja [Uso no Typescript](https://ant.design/docs/react/use-in-typescript).
-
-## 🌍 Internacionalização
-
-Veja [i18n](http://ant.design/docs/react/i18n).
-
-## 🔗 Links
-
-- [Página inicial](http://ant.design/)
-- [Componentes](http://ant.design/docs/react/introduce)
-- [Ant Design Pro](http://pro.ant.design/)
-- [Change Log](CHANGELOG.en-US.md)
-- [rc-components](http://react-component.github.io/)
-- [Mobile UI](http://mobile.ant.design)
-- [Ant Design Icones](https://github.com/ant-design/ant-design-icons)
-- [Ant Design Cores](https://github.com/ant-design/ant-design-colors)
-- [Ant Design Pro Layout](https://github.com/ant-design/ant-design-pro-layout)
-- [Ant Design Pro Blocks](https://github.com/ant-design/pro-blocks)
-- [Tema escuro](https://github.com/ant-design/ant-design-dark-theme)
-- [Página de aterrissagem](https://landing.ant.design)
-- [Motion](https://motion.ant.design)
-- [Mercado de páginas](http://scaffold.ant.design)
-- [Instruções ao desenvolvedor](https://github.com/ant-design/ant-design/wiki/Development)
-- [Versionando as notas de atualização](https://github.com/ant-design/ant-design/wiki/%E8%BD%AE%E5%80%BC%E8%A7%84%E5%88%99%E5%92%8C%E7%89%88%E6%9C%AC%E5%8F%91%E5%B8%83%E6%B5%81%E7%A8%8B)
-- [FAQ](https://ant.design/docs/react/faq)
-- [CodeSandbox Template](https://u.ant.design/codesandbox-repro) para relatório de erros
-- [Awesome Ant Design](https://github.com/websemantics/awesome-ant-design)
-- [Customize Theme](http://ant.design/docs/react/customize-theme)
-- [How to Apply for Being A Collaborator](https://github.com/ant-design/ant-design/wiki/Collaborators#how-to-apply-for-being-a-collaborator)
-
-## ⌨️ Desenvolvimento
-
-Use Gitpod, um ambiente de desenvolvimento online para GitHub.
-
-[![Abrir no Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ant-design/ant-design)
-
-Ou clone localmente:
-
-```bash
-$ git clone git@github.com:ant-design/ant-design.git
-$ cd ant-design
-$ npm install
-$ npm start
-```
-
-Abra seu navegador e visite http://127.0.0.1:8001, veja mais em [Desenvolvimento](https://github.com/ant-design/ant-design/wiki/Development).
-
-## 🤝 Contribuição [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
-
-Leia nosso [guia de contribução](https://ant.design/docs/react/contributing) e vamos contruir um melhor antd juntos.
-
-Nós saudamos todas as contribuições. Por favor, leia nosso [CONTRIBUTING.md](https://github.com/ant-design/ant-design/blob/master/.github/CONTRIBUTING.md) primeiro. Você pode submeter todas as ideias como [Pull Requests](https://github.com/ant-design/ant-design/pulls) ou como [GitHub issues](https://github.com/ant-design/ant-design/issues). Se você quiser melhorar o código, verifique [instruções ao desenvolvedor](https://github.com/ant-design/ant-design/wiki/Development) e divirta-se! :)
-
-Se você é um colaborador, por favor siga nossa [Pull Request princípio](https://github.com/ant-design/ant-design/wiki/PR-principle) para criar um Pull Request através do [template do colaborador](https://github.com/ant-design/ant-design/compare?expand=1&template=collaborator.md).
-
-[![Let's fund issues in this repository](https://issuehunt.io/static/embed/issuehunt-button-v1.svg)](https://issuehunt.io/repos/34526884)
-
-## ❤️ Patrocionadores e Apoiadores [![](https://opencollective.com/ant-design/tiers/sponsors/badge.svg?label=Sponsors&color=brightgreen)](https://opencollective.com/ant-design#support) [![](https://opencollective.com/ant-design/tiers/backers/badge.svg?label=Backers&color=brightgreen)](https://opencollective.com/ant-design#support)
-
-[![](https://opencollective.com/ant-design/tiers/sponsors.svg?avatarHeight=36)](https://opencollective.com/ant-design#support)
-
-[![](https://opencollective.com/ant-design/tiers/backers.svg?avatarHeight=36)](https://opencollective.com/ant-design#support)

README-zh_CN.md

@@ -10,7 +10,7 @@
 
 一套企业级 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) ![CI Status](https://github.com/ant-design/ant-design/workflows/Node%20CI/badge.svg) [![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)
+[![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) ![CI Status](https://github.com/ant-design/ant-design/workflows/Node%20CI/badge.svg) [![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) [![](https://badgen.net/npm/v/antd/next)](https://www.npmjs.com/package/antd) [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://npmjs.com/antd)
 
 [![Dependencies](https://img.shields.io/david/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design) [![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design?type=dev) [![Total alerts](https://flat.badgen.net/lgtm/alerts/g/ant-design/ant-design)](https://lgtm.com/projects/g/ant-design/ant-design/alerts/) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fant-design%2Fant-design.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fant-design%2Fant-design?ref=badge_shield) [![Issues need help](https://flat.badgen.net/github/label-issues/ant-design/ant-design/help%20wanted/open)](https://github.com/ant-design/ant-design/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
 
@@ -18,9 +18,9 @@
 
 </div>
 
-[![](https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*Ey3wTo-5__QAAAAAAAAAAABkARQnAQ)](http://ant.design/index-cn)
+[![](https://cdn-images-1.medium.com/max/2000/1*NIlj0-TdLMbo_hzSBP8tmg.png)](http://ant.design/index-cn)
 
-[English](./README.md) | [Português](./README-pt_BR.md) | 简体中文
+[English](./README.md) | 简体中文
 
 ## ✨ 特性
 
@@ -33,13 +33,13 @@
 
 ## 🖥 支持环境
 
-- 现代浏览器和 IE11（需要 [polyfills](https://ant.design/docs/react/getting-started-cn#兼容性)）。
+- 现代浏览器和 IE9 及以上。
 - 支持服务端渲染。
-- [Electron](https://www.electronjs.org/)
+- [Electron](http://electron.atom.io/)
 
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Electron |
-| --- | --- | --- | --- | --- |
-| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
+| --- | --- | --- | --- | --- | --- |
+| IE9, IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
 
 ## 📦 安装
 
@@ -53,7 +53,7 @@ yarn add antd
 
 ## 🔨 示例
 
-```jsx
+````jsx
 import { Button, DatePicker } from 'antd';
 
 const App = () => (
@@ -62,23 +62,18 @@ const App = () => (
     <DatePicker />
   </>
 );
-```
 
 引入样式：
 
 ```jsx
 import 'antd/dist/antd.css'; // or 'antd/dist/antd.less'
-```
+````
 
 你也可以使用 [babel-plugin-import](https://ant.design/docs/react/getting-started-cn#按需加载)。
 
-### 🌈 定制主题
-
-参考 [定制主题](https://ant.design/docs/react/customize-theme-cn) 文档。
-
 ### 🛡 TypeScript
 
-参考 [在 TypeScript 中使用](https://ant.design/docs/react/use-in-typescript-cn)。
+参考 [在 TypeScript 中使用](https://ant.design/docs/react/use-in-typescript-cn)
 
 ## 🌍 国际化
 
@@ -107,7 +102,6 @@ import 'antd/dist/antd.css'; // or 'antd/dist/antd.less'
 - [CodeSandbox 模板](https://u.ant.design/codesandbox-repro) for bug reports
 - [Awesome Ant Design](https://github.com/websemantics/awesome-ant-design)
 - [定制主题](http://ant.design/docs/react/customize-theme-cn)
-- [成为社区协作成员](https://github.com/ant-design/ant-design/wiki/Collaborators#how-to-apply-for-being-a-collaborator)
 
 ## ⌨️ 本地开发
 

README.md

@@ -10,46 +10,17 @@
 
 An enterprise-class UI design language and React UI library.
 
-[![CircleCI status][circleci-image]][circleci-url] [![CI status][github-action-image]][github-action-url] [![codecov][codecov-image]][codecov-url] [![NPM version][npm-image]][npm-url] [![NPM downloads][download-image]][download-url]
+[![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) ![CI Status](https://github.com/ant-design/ant-design/workflows/test/badge.svg) [![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) [![](https://badgen.net/npm/v/antd/next)](https://www.npmjs.com/package/antd) [![NPM downloads](http://img.shields.io/npm/dm/antd.svg?style=flat-square)](http://npmjs.com/antd)
 
-[![david deps][david-image]][david-url] [![david devDeps][david-dev-image]][david-dev-url] [![Total alerts][lgtm-image]][lgtm-url] [![FOSSA Status][fossa-image]][fossa-url] [![Issues need help][help-wanted-image]][help-wanted-url]
+[![Dependencies](https://img.shields.io/david/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design) [![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design.svg?style=flat-square)](https://david-dm.org/ant-design/ant-design?type=dev) [![Total alerts](https://flat.badgen.net/lgtm/alerts/g/ant-design/ant-design)](https://lgtm.com/projects/g/ant-design/ant-design/alerts/) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fant-design%2Fant-design.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fant-design%2Fant-design?ref=badge_shield) [![Issues need help](https://flat.badgen.net/github/label-issues/ant-design/ant-design/help%20wanted/open)](https://github.com/ant-design/ant-design/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
 
-[![Follow Twitter][twitter-image]][twitter-url] [![Gitter][gitter-english-image]][gitter-english-url] [![Gitter][gitter-chinese-image]][gitter-chinese-url] [![[SemVer stability]][semver-stability-image]][semver-stability-url]
-
-[npm-image]: http://img.shields.io/npm/v/antd.svg?style=flat-square
-[npm-url]: http://npmjs.org/package/antd
-[circleci-image]: https://img.shields.io/travis/com/ant-design/ant-design.svg?style=flat-square
-[circleci-url]: https://travis-ci.com/ant-design/ant-design
-[github-action-image]: https://github.com/ant-design/ant-design/workflows/test/badge.svg
-[github-action-url]: https://github.com/ant-design/ant-design/actions?query=workflow%3Atest
-[codecov-image]: https://img.shields.io/codecov/c/github/ant-design/ant-design/master.svg?style=flat-square
-[codecov-url]: https://codecov.io/gh/ant-design/ant-design/branch/master
-[david-image]: https://david-dm.org/ant-design/ant-design/status.svg?style=flat-square
-[david-dev-url]: https://david-dm.org/ant-design/ant-design?type=dev
-[david-dev-image]: https://david-dm.org/ant-design/ant-design/dev-status.svg?style=flat-square
-[david-url]: https://david-dm.org/ant-design/ant-design
-[download-image]: https://img.shields.io/npm/dm/antd.svg?style=flat-square
-[download-url]: https://npmjs.org/package/antd
-[lgtm-image]: https://flat.badgen.net/lgtm/alerts/g/ant-design/ant-design
-[lgtm-url]: https://lgtm.com/projects/g/ant-design/ant-design/alerts/
-[fossa-image]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fant-design%2Fant-design.svg?type=shield
-[fossa-url]: https://app.fossa.io/projects/git%2Bgithub.com%2Fant-design%2Fant-design?ref=badge_shield
-[help-wanted-image]: https://flat.badgen.net/github/label-issues/ant-design/ant-design/help%20wanted/open
-[help-wanted-url]: https://github.com/ant-design/ant-design/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22
-[twitter-image]: https://img.shields.io/twitter/follow/AntDesignUI.svg?label=Ant%20Design&style=social
-[twitter-url]: https://twitter.com/AntDesignUI
-[gitter-english-image]: https://img.shields.io/gitter/room/ant-design/ant-design-english.svg?style=flat-square&logoWidth=18&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjEyMzUiIGhlaWdodD0iNjUwIiB2aWV3Qm94PSIwIDAgNzQxMCAzOTAwIj4NCjxyZWN0IHdpZHRoPSI3NDEwIiBoZWlnaHQ9IjM5MDAiIGZpbGw9IiNiMjIyMzQiLz4NCjxwYXRoIGQ9Ik0wLDQ1MEg3NDEwbTAsNjAwSDBtMCw2MDBINzQxMG0wLDYwMEgwbTAsNjAwSDc0MTBtMCw2MDBIMCIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjMwMCIvPg0KPHJlY3Qgd2lkdGg9IjI5NjQiIGhlaWdodD0iMjEwMCIgZmlsbD0iIzNjM2I2ZSIvPg0KPGcgZmlsbD0iI2ZmZiI%2BDQo8ZyBpZD0iczE4Ij4NCjxnIGlkPSJzOSI%2BDQo8ZyBpZD0iczUiPg0KPGcgaWQ9InM0Ij4NCjxwYXRoIGlkPSJzIiBkPSJNMjQ3LDkwIDMxNy41MzQyMzAsMzA3LjA4MjAzOSAxMzIuODczMjE4LDE3Mi45MTc5NjFIMzYxLjEyNjc4MkwxNzYuNDY1NzcwLDMwNy4wODIwMzl6Ii8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB5PSI0MjAiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHk9Ijg0MCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTI2MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTY4MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjczQiIHg9IjI0NyIgeT0iMjEwIi8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzOSIgeD0iNDk0Ii8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzMTgiIHg9Ijk4OCIvPg0KPHVzZSB4bGluazpocmVmPSIjczkiIHg9IjE5NzYiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3M1IiB4PSIyNDcwIi8%2BDQo8L2c%2BDQo8L3N2Zz4%3D
-[gitter-english-url]: https://gitter.im/ant-design/ant-design-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
-[gitter-chinese-image]: https://img.shields.io/gitter/room/ant-design/ant-design.svg?style=flat-square&logoWidth=18&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjkwMCIgaGVpZ2h0PSI2MDAiIHZpZXdCb3g9IjAgMCAzMCAyMCI%2BDQo8ZGVmcz4NCjxwYXRoIGlkPSJzIiBkPSJNMCwtMSAwLjU4Nzc4NSwwLjgwOTAxNyAtMC45NTEwNTcsLTAuMzA5MDE3SDAuOTUxMDU3TC0wLjU4Nzc4NSwwLjgwOTAxN3oiIGZpbGw9IiNmZmRlMDAiLz4NCjwvZGVmcz4NCjxyZWN0IHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0iI2RlMjkxMCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNSw1KSBzY2FsZSgzKSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsMikgcm90YXRlKDIzLjAzNjI0MykiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEyLDQpIHJvdGF0ZSg0NS44Njk4OTgpIi8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMiw3KSByb3RhdGUoNjkuOTQ1Mzk2KSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsOSkgcm90YXRlKDIwLjY1OTgwOCkiLz4NCjwvc3ZnPg%3D%3D
-[gitter-chinese-url]: https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-[semver-stability-url]: https://dependabot.com/compatibility-score.html/?dependency-name=antd&package-manager=npm_and_yarn&new-version=latest
-[semver-stability-image]: https://api.dependabot.com/badges/compatibility_score?dependency-name=antd&package-manager=npm_and_yarn&target-version=latest&version-scheme=semver
+[![](https://img.shields.io/twitter/follow/AntDesignUI.svg?label=Ant%20Design&style=social)](https://twitter.com/AntDesignUI) [![Gitter](https://img.shields.io/gitter/room/ant-design/ant-design-english.svg?style=flat-square&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjEyMzUiIGhlaWdodD0iNjUwIiB2aWV3Qm94PSIwIDAgNzQxMCAzOTAwIj4NCjxyZWN0IHdpZHRoPSI3NDEwIiBoZWlnaHQ9IjM5MDAiIGZpbGw9IiNiMjIyMzQiLz4NCjxwYXRoIGQ9Ik0wLDQ1MEg3NDEwbTAsNjAwSDBtMCw2MDBINzQxMG0wLDYwMEgwbTAsNjAwSDc0MTBtMCw2MDBIMCIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjMwMCIvPg0KPHJlY3Qgd2lkdGg9IjI5NjQiIGhlaWdodD0iMjEwMCIgZmlsbD0iIzNjM2I2ZSIvPg0KPGcgZmlsbD0iI2ZmZiI%2BDQo8ZyBpZD0iczE4Ij4NCjxnIGlkPSJzOSI%2BDQo8ZyBpZD0iczUiPg0KPGcgaWQ9InM0Ij4NCjxwYXRoIGlkPSJzIiBkPSJNMjQ3LDkwIDMxNy41MzQyMzAsMzA3LjA4MjAzOSAxMzIuODczMjE4LDE3Mi45MTc5NjFIMzYxLjEyNjc4MkwxNzYuNDY1NzcwLDMwNy4wODIwMzl6Ii8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB5PSI0MjAiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHk9Ijg0MCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTI2MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTY4MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjczQiIHg9IjI0NyIgeT0iMjEwIi8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzOSIgeD0iNDk0Ii8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzMTgiIHg9Ijk4OCIvPg0KPHVzZSB4bGluazpocmVmPSIjczkiIHg9IjE5NzYiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3M1IiB4PSIyNDcwIi8%2BDQo8L2c%2BDQo8L3N2Zz4%3D)](https://gitter.im/ant-design/ant-design-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Join the chat at https://gitter.im/ant-design/ant-design](https://img.shields.io/gitter/room/ant-design/ant-design.svg?style=flat-square&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjkwMCIgaGVpZ2h0PSI2MDAiIHZpZXdCb3g9IjAgMCAzMCAyMCI%2BDQo8ZGVmcz4NCjxwYXRoIGlkPSJzIiBkPSJNMCwtMSAwLjU4Nzc4NSwwLjgwOTAxNyAtMC45NTEwNTcsLTAuMzA5MDE3SDAuOTUxMDU3TC0wLjU4Nzc4NSwwLjgwOTAxN3oiIGZpbGw9IiNmZmRlMDAiLz4NCjwvZGVmcz4NCjxyZWN0IHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0iI2RlMjkxMCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNSw1KSBzY2FsZSgzKSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsMikgcm90YXRlKDIzLjAzNjI0MykiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEyLDQpIHJvdGF0ZSg0NS44Njk4OTgpIi8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMiw3KSByb3RhdGUoNjkuOTQ1Mzk2KSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsOSkgcm90YXRlKDIwLjY1OTgwOCkiLz4NCjwvc3ZnPg%3D%3D)](https://gitter.im/ant-design/ant-design?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 </div>
 
-[![](https://gw.alipayobjects.com/mdn/rms_08e378/afts/img/A*Yl83RJhUE7kAAAAAAAAAAABkARQnAQ)](http://ant.design)
+[![](https://cdn-images-1.medium.com/max/2000/1*NIlj0-TdLMbo_hzSBP8tmg.png)](http://ant.design)
 
-English | [Português](./README-pt_BR.md) | [简体中文](./README-zh_CN.md)
+English | [简体中文](./README-zh_CN.md)
 
 ## ✨ Features
 
@@ -62,13 +33,13 @@ English | [Português](./README-pt_BR.md) | [简体中文](./README-zh_CN.md)
 
 ## 🖥 Environment Support
 
-- Modern browsers and Internet Explorer 11 (with [polyfills](https://ant.design/docs/react/getting-started#Compatibility))
+- Modern browsers and Internet Explorer 9+ (with [polyfills](https://ant.design/docs/react/getting-started#Compatibility))
 - Server-side Rendering
-- [Electron](https://www.electronjs.org/)
+- [Electron](http://electron.atom.io/)
 
-| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)<br>Electron |
-| --- | --- | --- | --- | --- |
-| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/electron/electron_48x48.png" alt="Electron" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Electron |
+| --- | --- | --- | --- | --- | --- |
+| IE9, IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
 
 ## 📦 Install
 
@@ -112,7 +83,7 @@ See [i18n](http://ant.design/docs/react/i18n).
 ## 🔗 Links
 
 - [Home page](http://ant.design/)
-- [Components](https://ant.design/components/button/)
+- [Components](http://ant.design/docs/react/introduce)
 - [Ant Design Pro](http://pro.ant.design/)
 - [Change Log](CHANGELOG.en-US.md)
 - [rc-components](http://react-component.github.io/)
@@ -131,7 +102,6 @@ See [i18n](http://ant.design/docs/react/i18n).
 - [CodeSandbox Template](https://u.ant.design/codesandbox-repro) for bug reports
 - [Awesome Ant Design](https://github.com/websemantics/awesome-ant-design)
 - [Customize Theme](http://ant.design/docs/react/customize-theme)
-- [How to Apply for Being A Collaborator](https://github.com/ant-design/ant-design/wiki/Collaborators#how-to-apply-for-being-a-collaborator)
 
 ## ⌨️ Development
 

azure-pipelines.yml

@@ -1,61 +1,69 @@
-name: Ant Design
+# Node.js
+# Build a general Node.js project with npm.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
+name: ant design
 
-trigger: none
-
-pr:
-  autoCancel: true
+trigger:
+  batch: true
   branches:
     exclude:
       - gh-pages
 
-pool:
-  vmImage: 'ubuntu-latest'
-
-stages:
-- stage: site
-  jobs:
-    - job: Build_Site
-      steps:
-        - checkout: self
-          displayName: 'Checkout'
-          clean: true
-          fetchDepth: 1
-        - task: NodeTool@0
-          displayName: 'Install Node.js'
-          inputs:
-            versionSpec: '12.13.1'
-        - script: npm install
-          displayName: 'Install modules'
-        - script: |
-            node ./scripts/azure-github-comment.js "[![Prepare preview](https://user-images.githubusercontent.com/5378891/72351368-2c979e00-371b-11ea-9652-eb4e825d745e.gif)](https://dev.azure.com/ant-design/ant-design/_build/results?buildId=$(Build.BuildId))"
-          displayName: 'Comment on github'
-        - script: npm run site
-          displayName: 'Build sites'
-        - script: ls -al _site/
-          displayName: 'List build'
-        - script: |
-            export DEPLOY_DOMAIN=https://preview-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ant-design.surge.sh
-            echo "Deploy to $DEPLOY_DOMAIN"
-            npx surge --project ./_site --domain $DEPLOY_DOMAIN
-          displayName: 'Deploy Site'
-        - script: |
-            export DEPLOY_DOMAIN=https://preview-${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER}-ant-design.surge.sh
-            node ./scripts/azure-github-comment.js "[<img width="306" src="https://user-images.githubusercontent.com/5378891/72400743-23dbb200-3785-11ea-9d13-1a2d92743846.png">]($DEPLOY_DOMAIN)"
-          displayName: 'Update comment on github'
-    - job: Build_Site_Failed
-      dependsOn: Build_Site
-      condition: failed()
-      steps:
-        - checkout: self
-          displayName: 'Checkout'
-          clean: true
-          fetchDepth: 1
-        - task: NodeTool@0
-          displayName: 'Install Node.js'
-          inputs:
-            versionSpec: '12.13.1'
-        - script: npm install
-          displayName: 'Install modules'
-        - script: |
-            node ./scripts/azure-github-comment.js "[<img width="534" src="https://user-images.githubusercontent.com/5378891/75333447-1e63a280-58c1-11ea-975d-235367fd1522.png">](https://dev.azure.com/ant-design/ant-design/_build/results?buildId=$(Build.BuildId))"
-          displayName: 'Comment on github'
+jobs:
+  - job: test_
+    pool:
+      vmImage: 'Ubuntu-16.04'
+    strategy:
+      matrix:
+        Lint:
+          TEST_TYPE: lint
+        dist-react@16:
+          REACT: 16
+          TEST_TYPE: test:dist
+        lib-react@16:
+          REACT: 16
+          TEST_TYPE: test:lib
+        es-react@16:
+          REACT: 16
+          TEST_TYPE: test:es
+        dom-react@16:
+          REACT: 16
+          TEST_TYPE: test:dom
+        node-react@16:
+          REACT: 16
+          TEST_TYPE: test:node
+        dist-react@15:
+          REACT: 15
+          TEST_TYPE: test:dist
+        lib-react@15:
+          REACT: 15
+          TEST_TYPE: test:lib
+        es-react@15:
+          REACT: 15
+          TEST_TYPE: test:es
+        dom-react@15:
+          REACT: 15
+          TEST_TYPE: test:dom
+        node-react@15:
+          REACT: 15
+          TEST_TYPE: test:node
+    steps:
+      - checkout: self
+        fetchDepth: 1
+        clean: false
+      - task: NodeTool@0
+        inputs:
+          versionSpec: '10.x'
+      - script: npm install
+        displayName: install
+      - script: scripts/install-react.sh
+        displayName: install-react
+      - script: scripts/travis-script.sh
+        displayName: test
+      - task: PublishBuildArtifacts@1
+        # 主分支，并且运行成功
+        condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+        inputs:
+          pathtoPublish: './package-lock.json'
+          artifactName: lock

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

@@ -27,11 +27,12 @@ Array [
   "Drawer",
   "Empty",
   "Form",
-  "Grid",
+  "Icon",
   "Input",
   "InputNumber",
   "Layout",
   "List",
+  "LocaleProvider",
   "message",
   "Menu",
   "Mentions",
@@ -50,7 +51,6 @@ Array [
   "Select",
   "Skeleton",
   "Slider",
-  "Space",
   "Spin",
   "Steps",
   "Switch",
@@ -64,6 +64,7 @@ Array [
   "Timeline",
   "Tooltip",
   "Typography",
+  "Mention",
   "Upload",
   "version",
 ]

components/__tests__/util/domHook.js

@@ -0,0 +1,58 @@
+const __NULL__ = { notExist: true };
+
+export function spyElementPrototypes(Element, properties) {
+  const propNames = Object.keys(properties);
+  const originDescriptors = {};
+
+  propNames.forEach(propName => {
+    const originDescriptor = Object.getOwnPropertyDescriptor(Element.prototype, propName);
+    originDescriptors[propName] = originDescriptor || __NULL__;
+
+    const spyProp = properties[propName];
+
+    if (typeof spyProp === 'function') {
+      // If is a function
+      Element.prototype[propName] = function spyFunc(...args) {
+        return spyProp.call(this, originDescriptor, ...args);
+      };
+    } else {
+      // Otherwise tread as a property
+      Object.defineProperty(Element.prototype, propName, {
+        ...spyProp,
+        set(value) {
+          if (spyProp.set) {
+            return spyProp.set.call(this, originDescriptor, value);
+          }
+          return originDescriptor.set(value);
+        },
+        get() {
+          if (spyProp.get) {
+            return spyProp.get.call(this, originDescriptor);
+          }
+          return originDescriptor.get();
+        },
+      });
+    }
+  });
+
+  return {
+    mockRestore() {
+      propNames.forEach(propName => {
+        const originDescriptor = originDescriptors[propName];
+        if (originDescriptor === __NULL__) {
+          delete Element.prototype[propName];
+        } else if (typeof originDescriptor === 'function') {
+          Element.prototype[propName] = originDescriptor;
+        } else {
+          Object.defineProperty(Element.prototype, propName, originDescriptor);
+        }
+      });
+    },
+  };
+}
+
+export function spyElementPrototype(Element, propName, property) {
+  return spyElementPrototypes(Element, {
+    [propName]: property,
+  });
+}

components/_util/__tests__/getScroll.test.js

@@ -1,11 +0,0 @@
-/**
- * @jest-environment node
- */
-import getScroll from '../getScroll';
-
-describe('getScroll', () => {
-  it('getScroll return 0 in node envioronment', async () => {
-    expect(getScroll(null, true)).toBe(0);
-    expect(getScroll(null, false)).toBe(0);
-  });
-});

components/_util/__tests__/scrollTo.test.js

@@ -1,9 +1,16 @@
 import scrollTo from '../scrollTo';
-import { sleep } from '../../../tests/utils';
 
 describe('Test ScrollTo function', () => {
   let dateNowMock;
 
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
   beforeEach(() => {
     dateNowMock = jest
       .spyOn(Date, 'now')
@@ -22,8 +29,8 @@ describe('Test ScrollTo function', () => {
     });
 
     scrollTo(1000);
-    await sleep(20);
 
+    jest.runAllTimers();
     expect(window.pageYOffset).toBe(1000);
 
     scrollToSpy.mockRestore();
@@ -34,7 +41,7 @@ describe('Test ScrollTo function', () => {
     scrollTo(1000, {
       callback: cbMock,
     });
-    await sleep(20);
+    jest.runAllTimers();
     expect(cbMock).toHaveBeenCalledTimes(1);
   });
 
@@ -43,7 +50,7 @@ describe('Test ScrollTo function', () => {
     scrollTo(1000, {
       getContainer: () => div,
     });
-    await sleep(20);
+    jest.runAllTimers();
     expect(div.scrollTop).toBe(1000);
   });
 });

components/_util/__tests__/unreachableException.test.js

@@ -1,8 +0,0 @@
-import UnreachableException from '../unreachableException';
-
-describe('UnreachableException', () => {
-  it('error thrown matches snapshot', () => {
-    const exception = new UnreachableException('some value');
-    expect(exception.message).toMatchInlineSnapshot(`"unreachable case: \\"some value\\""`);
-  });
-});

components/_util/__tests__/util.test.js

@@ -5,36 +5,41 @@ import KeyCode from 'rc-util/lib/KeyCode';
 import delayRaf from '../raf';
 import throttleByAnimationFrame from '../throttleByAnimationFrame';
 import getDataOrAriaProps from '../getDataOrAriaProps';
+import triggerEvent from '../triggerEvent';
 import Wave from '../wave';
 import TransButton from '../transButton';
 import openAnimation from '../openAnimation';
-import { sleep } from '../../../tests/utils';
-import focusTest from '../../../tests/shared/focusTest';
 
 describe('Test utils function', () => {
-  focusTest(TransButton);
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
 
-  it('throttle function should work', async () => {
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('throttle function should work', () => {
     const callback = jest.fn();
     const throttled = throttleByAnimationFrame(callback);
     expect(callback).not.toHaveBeenCalled();
 
     throttled();
     throttled();
-    await sleep(20);
 
+    jest.runAllTimers();
     expect(callback).toHaveBeenCalled();
     expect(callback.mock.calls.length).toBe(1);
   });
 
-  it('throttle function should be canceled', async () => {
+  it('throttle function should be canceled', () => {
     const callback = jest.fn();
     const throttled = throttleByAnimationFrame(callback);
 
     throttled();
     throttled.cancel();
-    await sleep(20);
 
+    jest.runAllTimers();
     expect(callback).not.toHaveBeenCalled();
   });
 
@@ -121,6 +126,19 @@ describe('Test utils function', () => {
     });
   });
 
+  it('triggerEvent', () => {
+    const button = document.createElement('button');
+    button.addEventListener(
+      'click',
+      () => {
+        button.style.width = '100px';
+      },
+      true,
+    );
+    triggerEvent(button, 'click');
+    expect(button.style.width).toBe('100px');
+  });
+
   describe('wave', () => {
     it('bindAnimationEvent should return when node is null', () => {
       const wrapper = mount(
@@ -165,6 +183,9 @@ describe('Test utils function', () => {
     });
 
     it('should not throw when no children', () => {
+      if (process.env.REACT === '15') {
+        return;
+      }
       expect(() => mount(<Wave />)).not.toThrow();
     });
   });

components/_util/__tests__/wave.test.js

@@ -1,107 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import Wave from '../wave';
-import ConfigProvider from '../../config-provider';
-import mountTest from '../../../tests/shared/mountTest';
-import { sleep } from '../../../tests/utils';
-
-describe('Wave component', () => {
-  mountTest(Wave);
-
-  afterEach(() => {
-    const styles = document.getElementsByTagName('style');
-    for (let i = 0; i < styles.length; i += 1) {
-      styles[i].remove();
-    }
-  });
-
-  it('isHidden works', () => {
-    const TEST_NODE_ENV = process.env.NODE_ENV;
-    process.env.NODE_ENV = 'development';
-    const wrapper = mount(<Wave><button type="button">button</button></Wave>);
-    expect(wrapper.find('button').getDOMNode().className).toBe('');
-    wrapper.find('button').getDOMNode().click();
-    expect(wrapper.find('button').getDOMNode().hasAttribute('ant-click-animating-without-extra-node')).toBe(false);
-    wrapper.unmount();
-    process.env.NODE_ENV = TEST_NODE_ENV;
-  });
-
-  it('isHidden is mocked', () => {
-    const wrapper = mount(<Wave><button type="button">button</button></Wave>);
-    expect(wrapper.find('button').getDOMNode().className).toBe('');
-    wrapper.find('button').getDOMNode().click();
-    expect(wrapper.find('button').getDOMNode().getAttribute('ant-click-animating-without-extra-node')).toBe('false');
-    wrapper.unmount();
-  });
-
-  it('wave color is grey', async () => {
-    const wrapper = mount(<Wave><button type="button" style={{ borderColor: 'rgb(0, 0, 0)' }}>button</button></Wave>);
-    wrapper.find('button').getDOMNode().click();
-    await sleep(0);
-    const styles = document.getElementsByTagName('style');
-    expect(styles.length).toBe(0);
-    wrapper.unmount();
-  });
-
-  it('wave color is not grey', async () => {
-    const wrapper = mount(<Wave><button type="button" style={{ borderColor: 'red' }}>button</button></Wave>);
-    wrapper.find('button').getDOMNode().click();
-    await sleep(200);
-    const styles = document.getElementsByTagName('style');
-    expect(styles.length).toBe(1);
-    expect(styles[0].innerHTML).toContain('--antd-wave-shadow-color: red;');
-    wrapper.unmount();
-  });
-
-  it('read wave color from border-top-color', async () => {
-    const wrapper = mount(<Wave><div style={{ borderTopColor: 'blue' }}>button</div></Wave>);
-    wrapper.find('div').getDOMNode().click();
-    await sleep(0);
-    const styles = document.getElementsByTagName('style');
-    expect(styles.length).toBe(1);
-    expect(styles[0].innerHTML).toContain('--antd-wave-shadow-color: blue;');
-    wrapper.unmount();
-  });
-
-  it('read wave color from background color', async () => {
-    const wrapper = mount(<Wave><div style={{ backgroundColor: 'green' }}>button</div></Wave>);
-    wrapper.find('div').getDOMNode().click();
-    await sleep(0);
-    const styles = document.getElementsByTagName('style');
-    expect(styles.length).toBe(1);
-    expect(styles[0].innerHTML).toContain('--antd-wave-shadow-color: green;');
-    wrapper.unmount();
-  });
-
-  it('read wave color from border firstly', async () => {
-    const wrapper = mount(<Wave><div style={{ borderColor: 'yellow', backgroundColor: 'green' }}>button</div></Wave>);
-    wrapper.find('div').getDOMNode().click();
-    await sleep(0);
-    const styles = document.getElementsByTagName('style');
-    expect(styles.length).toBe(1);
-    expect(styles[0].innerHTML).toContain('--antd-wave-shadow-color: yellow;');
-    wrapper.unmount();
-  });
-
-  it('hidden element with -leave className', async () => {
-    const wrapper = mount(<Wave><button type="button" className="xx-leave">button</button></Wave>);
-    wrapper.find('button').getDOMNode().click();
-    await sleep(0);
-    const styles = document.getElementsByTagName('style');
-    expect(styles.length).toBe(0);
-    wrapper.unmount();
-  });
-
-  it('ConfigProvider csp', async () => {
-    const wrapper = mount(
-      <ConfigProvider csp={{ nonce: 'YourNonceCode' }}>
-        <Wave><button type="button">button</button></Wave>
-      </ConfigProvider>,
-    );
-    wrapper.find('button').getDOMNode().click();
-    await sleep(0);
-    const styles = document.getElementsByTagName('style');
-    expect(styles[0].getAttribute('nonce')).toBe('YourNonceCode');
-    wrapper.unmount();
-  });
-});

components/_util/colors.ts

@@ -1,6 +1,5 @@
-import { ElementOf, tuple } from './type';
+import { tuple } from './type';
 
-export const PresetStatusColorTypes = tuple('success', 'processing', 'error', 'default', 'warning');
 // eslint-disable-next-line import/prefer-default-export
 export const PresetColorTypes = tuple(
   'pink',
@@ -18,5 +17,4 @@ export const PresetColorTypes = tuple(
   'lime',
 );
 
-export type PresetColorType = ElementOf<typeof PresetColorTypes>;
-export type PresetStatusColorType = ElementOf<typeof PresetStatusColorTypes>;
+export type PresetColorType = (typeof PresetColorTypes)[number];

components/_util/getRenderPropValue.ts

@@ -1,18 +0,0 @@
-import * as React from 'react';
-
-export type RenderFunction = () => React.ReactNode;
-
-export const getRenderPropValue = (
-  propValue?: React.ReactNode | RenderFunction,
-): React.ReactNode => {
-  if (!propValue) {
-    return null;
-  }
-
-  const isRenderFunction = typeof propValue === 'function';
-  if (isRenderFunction) {
-    return (propValue as RenderFunction)();
-  }
-
-  return propValue;
-};

components/_util/getScroll.tsx

@@ -1,27 +1,17 @@
-export function isWindow(obj: any) {
-  return obj !== null && obj !== undefined && obj === obj.window;
-}
-
-export default function getScroll(
-  target: HTMLElement | Window | Document | null,
-  top: boolean,
-): number {
+export default function getScroll(target: HTMLElement | Window | null, top: boolean): number {
   if (typeof window === 'undefined') {
     return 0;
   }
+
+  const prop = top ? 'pageYOffset' : 'pageXOffset';
   const method = top ? 'scrollTop' : 'scrollLeft';
-  let result = 0;
-  if (isWindow(target)) {
-    result = (target as Window)[top ? 'pageYOffset' : 'pageXOffset'];
-  } else if (target instanceof Document) {
-    result = target.documentElement[method];
-  } else if (target) {
-    result = (target as HTMLElement)[method];
+  const isWindow = target === window;
+
+  let ret = isWindow ? (target as Window)[prop] : (target as HTMLElement)[method];
+  // ie6,7,8 standard mode
+  if (isWindow && typeof ret !== 'number') {
+    ret = (document.documentElement as HTMLElement)[method];
   }
-  if (target && !isWindow(target) && typeof result !== 'number') {
-    result = ((target as HTMLElement).ownerDocument || (target as Document)).documentElement[
-      method
-    ];
-  }
-  return result;
+
+  return ret;
 }

components/_util/motion.tsx

@@ -9,7 +9,6 @@ interface Motion {
   motionEnter?: boolean;
   motionLeave?: boolean;
   motionLeaveImmediately?: boolean; // Trigger leave motion immediately
-  motionDeadline?: number;
   removeOnLeave?: boolean;
   leavedClassName?: string;
   onAppearStart?: MotionFunc;
@@ -36,7 +35,6 @@ const collapseMotion: Motion = {
   onEnterActive: getRealHeight,
   onLeaveStart: getCurrentHeight,
   onLeaveActive: getCollapsedHeight,
-  motionDeadline: 500,
 };
 
 export default collapseMotion;

components/_util/ref.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 
 export function fillRef<T>(ref: React.Ref<T>, node: T) {
   if (typeof ref === 'function') {

components/_util/responsiveObserve.ts

@@ -1,6 +1,25 @@
+// matchMedia polyfill for
+// https://github.com/WickyNilliams/enquire.js/issues/82
+let enquire: any;
+
+// TODO: Will be removed in antd 4.0 because we will no longer support ie9
+if (typeof window !== 'undefined') {
+  const matchMediaPolyfill = (mediaQuery: string) => {
+    return {
+      media: mediaQuery,
+      matches: false,
+      addListener() {},
+      removeListener() {},
+    };
+  };
+  // ref: https://github.com/ant-design/ant-design/issues/18774
+  if (!window.matchMedia) window.matchMedia = matchMediaPolyfill as any;
+  // eslint-disable-next-line global-require
+  enquire = require('enquire.js');
+}
+
 export type Breakpoint = 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs';
 export type BreakpointMap = Partial<Record<Breakpoint, string>>;
-export type ScreenMap = Partial<Record<Breakpoint, boolean>>;
 
 export const responsiveArray: Breakpoint[] = ['xxl', 'xl', 'lg', 'md', 'sm', 'xs'];
 
@@ -13,7 +32,7 @@ export const responsiveMap: BreakpointMap = {
   xxl: '(min-width: 1600px)',
 };
 
-type SubscribeFunc = (screens: ScreenMap) => void;
+type SubscribeFunc = (screens: BreakpointMap) => void;
 
 let subscribers: Array<{
   token: string;
@@ -23,8 +42,7 @@ let subUid = -1;
 let screens = {};
 
 const responsiveObserve = {
-  matchHandlers: {},
-  dispatch(pointMap: ScreenMap) {
+  dispatch(pointMap: BreakpointMap) {
     screens = pointMap;
     if (subscribers.length < 1) {
       return false;
@@ -55,32 +73,31 @@ const responsiveObserve = {
     }
   },
   unregister() {
-    Object.keys(responsiveMap).forEach((screen: Breakpoint) => {
-      const matchMediaQuery = responsiveMap[screen]!;
-      const handler = this.matchHandlers[matchMediaQuery];
-      if (handler && handler.mql && handler.listener) {
-        handler.mql.removeListener(handler.listener);
-      }
-    });
+    Object.keys(responsiveMap).map((screen: Breakpoint) =>
+      enquire.unregister(responsiveMap[screen]),
+    );
   },
   register() {
-    Object.keys(responsiveMap).forEach((screen: Breakpoint) => {
-      const matchMediaQuery = responsiveMap[screen]!;
-      const listener = ({ matches }: { matches: boolean }) => {
-        this.dispatch({
-          ...screens,
-          [screen]: matches,
-        });
-      };
-      const mql = window.matchMedia(matchMediaQuery);
-      mql.addListener(listener);
-      this.matchHandlers[matchMediaQuery] = {
-        mql,
-        listener,
-      };
-
-      listener(mql);
-    });
+    Object.keys(responsiveMap).map((screen: Breakpoint) =>
+      enquire.register(responsiveMap[screen], {
+        match: () => {
+          const pointMap = {
+            ...screens,
+            [screen]: true,
+          };
+          this.dispatch(pointMap);
+        },
+        unmatch: () => {
+          const pointMap = {
+            ...screens,
+            [screen]: false,
+          };
+          this.dispatch(pointMap);
+        },
+        // Keep a empty destory to avoid triggering unmatch when unregister
+        destroy() {},
+      }),
+    );
   },
 };
 

components/_util/scrollTo.ts

@@ -1,10 +1,10 @@
 import raf from 'raf';
-import getScroll, { isWindow } from './getScroll';
+import getScroll from './getScroll';
 import { easeInOutCubic } from './easings';
 
 interface ScrollToOptions {
   /** Scroll container, default as window */
-  getContainer?: () => HTMLElement | Window | Document;
+  getContainer?: () => HTMLElement | Window;
   /** Scroll end callback */
   callback?: () => any;
   /** Animation duration, default as 450 */
@@ -22,10 +22,8 @@ export default function scrollTo(y: number, options: ScrollToOptions = {}) {
     const timestamp = Date.now();
     const time = timestamp - startTime;
     const nextScrollTop = easeInOutCubic(time > duration ? duration : time, scrollTop, y, duration);
-    if (isWindow(container)) {
-      (container as Window).scrollTo(window.pageXOffset, nextScrollTop);
-    } else if (container instanceof Document) {
-      container.documentElement.scrollTop = nextScrollTop;
+    if (container === window) {
+      window.scrollTo(window.pageXOffset, nextScrollTop);
     } else {
       (container as HTMLElement).scrollTop = nextScrollTop;
     }

components/_util/transButton.tsx

@@ -8,7 +8,6 @@ import KeyCode from 'rc-util/lib/KeyCode';
 interface TransButtonProps extends React.HTMLAttributes<HTMLDivElement> {
   onClick?: (e?: React.MouseEvent<HTMLDivElement>) => void;
   noStyle?: boolean;
-  autoFocus?: boolean;
 }
 
 const inlineStyle: React.CSSProperties = {
@@ -24,13 +23,6 @@ class TransButton extends React.Component<TransButtonProps> {
 
   lastKeyCode?: number;
 
-  componentDidMount() {
-    const { autoFocus } = this.props;
-    if (autoFocus) {
-      this.focus();
-    }
-  }
-
   onKeyDown: React.KeyboardEventHandler<HTMLDivElement> = event => {
     const { keyCode } = event;
     if (keyCode === KeyCode.ENTER) {

components/_util/triggerEvent.tsx

@@ -0,0 +1,8 @@
+export default function triggerEvent(el: Element, type: string) {
+  if ('createEvent' in document) {
+    // modern browsers, IE9+
+    const e = document.createEvent('HTMLEvents');
+    e.initEvent(type, false, true);
+    el.dispatchEvent(e);
+  }
+}

components/_util/type.ts

@@ -3,14 +3,3 @@ export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 export const tuple = <T extends string[]>(...args: T) => args;
 
 export const tupleNum = <T extends number[]>(...args: T) => args;
-
-/**
- * https://stackoverflow.com/a/59187769
- * Extract the type of an element of an array/tuple without performing indexing
- */
-export type ElementOf<T> = T extends (infer E)[] ? E : T extends readonly (infer E)[] ? E : never;
-
-/**
- * https://github.com/Microsoft/TypeScript/issues/29729
- */
-export type LiteralUnion<T extends U, U> = T | (U & {});

components/_util/unreachableException.ts

@@ -1,5 +0,0 @@
-export default class UnreachableException {
-  constructor(value: never) {
-    return new Error(`unreachable case: ${JSON.stringify(value)}`);
-  }
-}

components/_util/usePatchElement.tsx

@@ -1,18 +0,0 @@
-import * as React from 'react';
-
-export default function usePatchElement(): [
-  React.ReactElement[],
-  (element: React.ReactElement) => Function,
-] {
-  const [elements, setElements] = React.useState<React.ReactElement[]>([]);
-
-  function patchElement(element: React.ReactElement) {
-    setElements(originElements => [...originElements, element]);
-
-    return () => {
-      setElements(originElements => originElements.filter(ele => ele !== element));
-    };
-  }
-
-  return [elements, patchElement];
-}

components/_util/wave.tsx

@@ -16,7 +16,7 @@ function isHidden(element: HTMLElement) {
 
 function isNotGrey(color: string) {
   // eslint-disable-next-line no-useless-escape
-  const match = (color || '').match(/rgba?\((\d*), (\d*), (\d*)(, [\d.]*)?\)/);
+  const match = (color || '').match(/rgba?\((\d*), (\d*), (\d*)(, [\.\d]*)?\)/);
   if (match && match[1] && match[2] && match[3]) {
     return !(match[1] === match[2] && match[2] === match[3]);
   }
@@ -36,7 +36,7 @@ export default class Wave extends React.Component<{ insertExtraNode?: boolean }>
 
   private animationStart: boolean = false;
 
-  private destroyed: boolean = false;
+  private destroy: boolean = false;
 
   private csp?: CSPConfig;
 
@@ -56,7 +56,7 @@ export default class Wave extends React.Component<{ insertExtraNode?: boolean }>
       clearTimeout(this.clickWaveTimeoutId);
     }
 
-    this.destroyed = true;
+    this.destroy = true;
   }
 
   onClick = (node: HTMLElement, waveColor: string) => {
@@ -76,7 +76,7 @@ export default class Wave extends React.Component<{ insertExtraNode?: boolean }>
       waveColor !== '#ffffff' &&
       waveColor !== 'rgb(255, 255, 255)' &&
       isNotGrey(waveColor) &&
-      !/rgba\((?:\d*, ){3}0\)/.test(waveColor) && // any transparent rgba color
+      !/rgba\(\d*, \d*, \d*, 0\)/.test(waveColor) && // any transparent rgba color
       waveColor !== 'transparent'
     ) {
       // Add nonce if CSP exist
@@ -101,16 +101,16 @@ export default class Wave extends React.Component<{ insertExtraNode?: boolean }>
   };
 
   onTransitionStart = (e: AnimationEvent) => {
-    if (this.destroyed) {
-      return;
-    }
+    if (this.destroy) return;
 
     const node = findDOMNode(this) as HTMLElement;
-    if (!e || e.target !== node || this.animationStart) {
+    if (!e || e.target !== node) {
       return;
     }
 
-    this.resetEffect(node);
+    if (!this.animationStart) {
+      this.resetEffect(node);
+    }
   };
 
   onTransitionEnd = (e: AnimationEvent) => {

components/affix/__tests__/Affix.test.js

@@ -0,0 +1,198 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import Affix from '..';
+import { getObserverEntities } from '../utils';
+import Button from '../../button';
+import { spyElementPrototype } from '../../__tests__/util/domHook';
+
+const events = {};
+
+class AffixMounter extends React.Component {
+  componentDidMount() {
+    this.container.addEventListener = jest.fn().mockImplementation((event, cb) => {
+      events[event] = cb;
+    });
+  }
+
+  getTarget = () => this.container;
+
+  render() {
+    return (
+      <div
+        ref={node => {
+          this.container = node;
+        }}
+        className="container"
+      >
+        <Affix
+          className="fixed"
+          target={this.getTarget}
+          ref={ele => {
+            this.affix = ele;
+          }}
+          {...this.props}
+        >
+          <Button type="primary">Fixed at the top of container</Button>
+        </Affix>
+      </div>
+    );
+  }
+}
+
+describe('Affix Render', () => {
+  let wrapper;
+  let domMock;
+
+  const classRect = {
+    container: {
+      top: 0,
+      bottom: 100,
+    },
+  };
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+    domMock = spyElementPrototype(HTMLElement, 'getBoundingClientRect', function mockBounding() {
+      return (
+        classRect[this.className] || {
+          top: 0,
+          bottom: 0,
+        }
+      );
+    });
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+    domMock.mockRestore();
+  });
+  const movePlaceholder = top => {
+    classRect.fixed = {
+      top,
+      bottom: top,
+    };
+    events.scroll({
+      type: 'scroll',
+    });
+    jest.runAllTimers();
+  };
+
+  it('Anchor render perfectly', () => {
+    document.body.innerHTML = '<div id="mounter" />';
+
+    wrapper = mount(<AffixMounter />, { attachTo: document.getElementById('mounter') });
+    jest.runAllTimers();
+
+    movePlaceholder(0);
+    expect(wrapper.instance().affix.state.affixStyle).toBeFalsy();
+
+    movePlaceholder(-100);
+    expect(wrapper.instance().affix.state.affixStyle).toBeTruthy();
+
+    movePlaceholder(0);
+    expect(wrapper.instance().affix.state.affixStyle).toBeFalsy();
+  });
+
+  it('support offsetBottom', () => {
+    document.body.innerHTML = '<div id="mounter" />';
+
+    wrapper = mount(<AffixMounter offsetBottom={0} />, {
+      attachTo: document.getElementById('mounter'),
+    });
+
+    jest.runAllTimers();
+
+    movePlaceholder(300);
+    expect(wrapper.instance().affix.state.affixStyle).toBeTruthy();
+
+    movePlaceholder(0);
+    expect(wrapper.instance().affix.state.affixStyle).toBeFalsy();
+
+    movePlaceholder(300);
+    expect(wrapper.instance().affix.state.affixStyle).toBeTruthy();
+  });
+
+  it('updatePosition when offsetTop changed', () => {
+    document.body.innerHTML = '<div id="mounter" />';
+
+    wrapper = mount(<AffixMounter offsetTop={0} />, {
+      attachTo: document.getElementById('mounter'),
+    });
+    jest.runAllTimers();
+
+    movePlaceholder(-100);
+    expect(wrapper.instance().affix.state.affixStyle.top).toBe(0);
+    wrapper.setProps({
+      offsetTop: 10,
+    });
+    jest.runAllTimers();
+    expect(wrapper.instance().affix.state.affixStyle.top).toBe(10);
+  });
+
+  describe('updatePosition when target changed', () => {
+    it('function change', () => {
+      document.body.innerHTML = '<div id="mounter" />';
+      const container = document.querySelector('#id');
+      const getTarget = () => container;
+      wrapper = mount(<Affix target={getTarget} />);
+      wrapper.setProps({ target: null });
+      expect(wrapper.instance().state.status).toBe(0);
+      expect(wrapper.instance().state.affixStyle).toBe(undefined);
+      expect(wrapper.instance().state.placeholderStyle).toBe(undefined);
+    });
+
+    it('instance change', () => {
+      const getObserverLength = () => Object.keys(getObserverEntities()).length;
+
+      const container = document.createElement('div');
+      document.body.appendChild(container);
+      let target = container;
+
+      const originLength = getObserverLength();
+      const getTarget = () => target;
+      wrapper = mount(<Affix target={getTarget} />);
+      jest.runAllTimers();
+
+      expect(getObserverLength()).toBe(originLength + 1);
+      target = null;
+      wrapper.setProps({});
+      wrapper.update();
+      jest.runAllTimers();
+      expect(getObserverLength()).toBe(originLength);
+    });
+  });
+
+  describe('updatePosition when size changed', () => {
+    function test(name, index) {
+      it(name, () => {
+        document.body.innerHTML = '<div id="mounter" />';
+
+        const updateCalled = jest.fn();
+        wrapper = mount(<AffixMounter offsetBottom={0} onTestUpdatePosition={updateCalled} />, {
+          attachTo: document.getElementById('mounter'),
+        });
+
+        jest.runAllTimers();
+
+        movePlaceholder(300);
+        expect(wrapper.instance().affix.state.affixStyle).toBeTruthy();
+        jest.runAllTimers();
+        wrapper.update();
+
+        // Mock trigger resize
+        updateCalled.mockReset();
+        wrapper
+          .find('ResizeObserver')
+          .at(index)
+          .instance()
+          .onResize([{ target: { getBoundingClientRect: () => ({ width: 99, height: 99 }) } }]);
+        jest.runAllTimers();
+
+        expect(updateCalled).toHaveBeenCalled();
+      });
+    }
+
+    test('inner', 0);
+    test('outer', 1);
+  });
+});

components/affix/__tests__/Affix.test.tsx

@@ -1,230 +0,0 @@
-import React from 'react';
-import { mount, ReactWrapper, HTMLAttributes } from 'enzyme';
-import ResizeObserverImpl from 'rc-resize-observer';
-import Affix, { AffixProps, AffixState } from '..';
-import { getObserverEntities } from '../utils';
-import Button from '../../button';
-import rtlTest from '../../../tests/shared/rtlTest';
-import { sleep } from '../../../tests/utils';
-
-const events: Partial<Record<keyof HTMLElementEventMap, (ev: Partial<Event>) => void>> = {};
-
-class AffixMounter extends React.Component<{
-  offsetBottom?: number;
-  offsetTop?: number;
-  onTestUpdatePosition?(): void;
-}> {
-  private container: HTMLDivElement;
-
-  public affix: Affix;
-
-  componentDidMount() {
-    this.container.addEventListener = jest
-      .fn()
-      .mockImplementation((event: keyof HTMLElementEventMap, cb: (ev: Partial<Event>) => void) => {
-        events[event] = cb;
-      });
-  }
-
-  getTarget = () => this.container;
-
-  render() {
-    return (
-      <div
-        ref={node => {
-          this.container = node!;
-        }}
-        className="container"
-      >
-        <Affix
-          className="fixed"
-          target={this.getTarget}
-          ref={ele => {
-            this.affix = ele!;
-          }}
-          {...this.props}
-        >
-          <Button type="primary">Fixed at the top of container</Button>
-        </Affix>
-      </div>
-    );
-  }
-}
-
-describe('Affix Render', () => {
-  rtlTest(Affix);
-
-  const domMock = jest.spyOn(HTMLElement.prototype, 'getBoundingClientRect');
-  let affixMounterWrapper: ReactWrapper<unknown, unknown, AffixMounter>;
-  let affixWrapper: ReactWrapper<AffixProps, AffixState, Affix>;
-
-  const classRect: Record<string, DOMRect> = {
-    container: {
-      top: 0,
-      bottom: 100,
-    } as DOMRect,
-  };
-
-  beforeAll(() => {
-    domMock.mockImplementation(function fn(this: HTMLElement) {
-      return (
-        classRect[this.className] || {
-          top: 0,
-          bottom: 0,
-        }
-      );
-    });
-  });
-
-  afterAll(() => {
-    domMock.mockRestore();
-  });
-
-  const movePlaceholder = async (top: number) => {
-    classRect.fixed = {
-      top,
-      bottom: top,
-    } as DOMRect;
-    if (events.scroll == null) {
-      throw new Error('scroll should be set');
-    }
-    events.scroll({
-      type: 'scroll',
-    });
-    await sleep(20);
-  };
-
-  it('Anchor render perfectly', async () => {
-    document.body.innerHTML = '<div id="mounter" />';
-
-    affixMounterWrapper = mount(<AffixMounter />, { attachTo: document.getElementById('mounter') });
-    await sleep(20);
-
-    await movePlaceholder(0);
-    expect(affixMounterWrapper.instance().affix.state.affixStyle).toBeFalsy();
-
-    await movePlaceholder(-100);
-    expect(affixMounterWrapper.instance().affix.state.affixStyle).toBeTruthy();
-
-    await movePlaceholder(0);
-    expect(affixMounterWrapper.instance().affix.state.affixStyle).toBeFalsy();
-  });
-
-  it('support offsetBottom', async () => {
-    document.body.innerHTML = '<div id="mounter" />';
-
-    affixMounterWrapper = mount(<AffixMounter offsetBottom={0} />, {
-      attachTo: document.getElementById('mounter'),
-    });
-
-    await sleep(20);
-
-    await movePlaceholder(300);
-    expect(affixMounterWrapper.instance().affix.state.affixStyle).toBeTruthy();
-
-    await movePlaceholder(0);
-    expect(affixMounterWrapper.instance().affix.state.affixStyle).toBeFalsy();
-
-    await movePlaceholder(300);
-    expect(affixMounterWrapper.instance().affix.state.affixStyle).toBeTruthy();
-  });
-
-  it('updatePosition when offsetTop changed', async () => {
-    document.body.innerHTML = '<div id="mounter" />';
-
-    affixMounterWrapper = mount(<AffixMounter offsetTop={0} />, {
-      attachTo: document.getElementById('mounter'),
-    });
-    await sleep(20);
-
-    await movePlaceholder(-100);
-    expect(affixMounterWrapper.instance().affix.state.affixStyle?.top).toBe(0);
-    affixMounterWrapper.setProps({
-      offsetTop: 10,
-    });
-    await sleep(20);
-    expect(affixMounterWrapper.instance().affix.state.affixStyle?.top).toBe(10);
-  });
-
-  describe('updatePosition when target changed', () => {
-    it('function change', () => {
-      document.body.innerHTML = '<div id="mounter" />';
-      const container = document.querySelector('#id') as HTMLDivElement;
-      const getTarget = () => container;
-      affixWrapper = mount(<Affix target={getTarget}>{null}</Affix>);
-      affixWrapper.setProps({ target: () => null });
-      expect(affixWrapper.instance().state.status).toBe(0);
-      expect(affixWrapper.instance().state.affixStyle).toBe(undefined);
-      expect(affixWrapper.instance().state.placeholderStyle).toBe(undefined);
-    });
-
-    it('instance change', async () => {
-      const getObserverLength = () => Object.keys(getObserverEntities()).length;
-
-      const container = document.createElement('div');
-      document.body.appendChild(container);
-      let target: HTMLDivElement | null = container;
-
-      const originLength = getObserverLength();
-      const getTarget = () => target;
-      affixWrapper = mount(<Affix target={getTarget}>{null}</Affix>);
-      await sleep(50);
-
-      expect(getObserverLength()).toBe(originLength + 1);
-      target = null;
-      affixWrapper.setProps({});
-      affixWrapper.update();
-      await sleep(50);
-      expect(getObserverLength()).toBe(originLength);
-    });
-  });
-
-  describe('updatePosition when size changed', () => {
-    it.each([
-      { name: 'inner', index: 0 },
-      { name: 'outer', index: 1 },
-    ])(name, async ({ index }) => {
-      document.body.innerHTML = '<div id="mounter" />';
-
-      const updateCalled = jest.fn();
-      affixMounterWrapper = mount(
-        <AffixMounter offsetBottom={0} onTestUpdatePosition={updateCalled} />,
-        {
-          attachTo: document.getElementById('mounter'),
-        },
-      );
-
-      await sleep(20);
-
-      await movePlaceholder(300);
-      expect(affixMounterWrapper.instance().affix.state.affixStyle).toBeTruthy();
-      await sleep(20);
-      affixMounterWrapper.update();
-
-      // Mock trigger resize
-      updateCalled.mockReset();
-      const resizeObserverInstance: ReactWrapper<
-        HTMLAttributes,
-        unknown,
-        ResizeObserverImpl
-      > = affixMounterWrapper.find('ResizeObserver') as any;
-      resizeObserverInstance
-        .at(index)
-        .instance()
-        .onResize(
-          [
-            {
-              target: {
-                getBoundingClientRect: () => ({ width: 99, height: 99 }),
-              } as Element,
-              contentRect: {} as DOMRect,
-            },
-          ],
-          ({} as unknown) as ResizeObserver,
-        );
-      await sleep(20);
-
-      expect(updateCalled).toHaveBeenCalled();
-    });
-  });
-});

components/affix/__tests__/__snapshots__/Affix.test.tsx.snap

@@ -1,9 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Affix Render rtl render component should be rendered correctly in RTL direction 1`] = `
-<div>
-  <div
-    class=""
-  />
-</div>
-`;

components/affix/demo/basic.md

@@ -13,30 +13,47 @@ title:
 
 The simplest usage.
 
-```tsx
-import React, { useState } from 'react';
+```jsx
 import { Affix, Button } from 'antd';
 
-const Demo: React.FC = () => {
-  const [top, setTop] = useState(10);
-  const [bottom, setBottom] = useState(10);
+class Demo extends React.Component {
+  state = {
+    top: 10,
+    bottom: 10,
+  };
 
-  return (
-    <div>
-      <Affix offsetTop={top}>
-        <Button type="primary" onClick={() => setTop(top + 10)}>
-          Affix top
-        </Button>
-      </Affix>
-      <br />
-      <Affix offsetBottom={bottom}>
-        <Button type="primary" onClick={() => setBottom(bottom + 10)}>
-          Affix bottom
-        </Button>
-      </Affix>
-    </div>
-  );
-};
+  render() {
+    return (
+      <div>
+        <Affix offsetTop={this.state.top}>
+          <Button
+            type="primary"
+            onClick={() => {
+              this.setState({
+                top: this.state.top + 10,
+              });
+            }}
+          >
+            Affix top
+          </Button>
+        </Affix>
+        <br />
+        <Affix offsetBottom={this.state.bottom}>
+          <Button
+            type="primary"
+            onClick={() => {
+              this.setState({
+                bottom: this.state.bottom + 10,
+              });
+            }}
+          >
+            Affix bottom
+          </Button>
+        </Affix>
+      </div>
+    );
+  }
+}
 
 ReactDOM.render(<Demo />, mountNode);
 ```

components/affix/demo/debug.md

@@ -1,8 +1,8 @@
 ---
 order: 99
 title:
-  zh-CN: 调整浏览器大小，观察 Affix 容器是否发生变化。跟随变化为正常。#17678
-  en-US:
+  zh-CN: 调试
+  en-US: Debug
 debug: true
 ---
 
@@ -14,26 +14,37 @@ DEBUG
 
 DEBUG
 
-```tsx
-import React, { useState } from 'react';
+```jsx
 import { Affix, Button } from 'antd';
 
-const Demo: React.FC = () => {
-  const [top, setTop] = useState(10);
-  return (
-    <div style={{ height: 10000 }}>
-      <div>Top</div>
-      <Affix offsetTop={top}>
-        <div style={{ background: 'red' }}>
-          <Button type="primary" onClick={() => setTop(top + 10)}>
-            Affix top
-          </Button>
-        </div>
-      </Affix>
-      <div>Bottom</div>
-    </div>
-  );
-};
+class Demo extends React.Component {
+  state = {
+    top: 10,
+  };
+
+  render() {
+    return (
+      <div style={{ height: 10000 }}>
+        <div>Top</div>
+        <Affix offsetTop={this.state.top}>
+          <div style={{ background: 'red' }}>
+            <Button
+              type="primary"
+              onClick={() => {
+                this.setState({
+                  top: this.state.top + 10,
+                });
+              }}
+            >
+              Affix top
+            </Button>
+          </div>
+        </Affix>
+        <div>Bottom</div>
+      </div>
+    );
+  }
+}
 
 ReactDOM.render(<Demo />, mountNode);
 ```

components/affix/demo/on-change.md

@@ -13,7 +13,7 @@ title:
 
 Callback with affixed state.
 
-```tsx
+```jsx
 import { Affix, Button } from 'antd';
 
 ReactDOM.render(

components/affix/demo/target.md

@@ -13,22 +13,27 @@ title:
 
 Set a `target` for 'Affix', which is listen to scroll event of target element (default is `window`).
 
-```tsx
-import React, { useState } from 'react';
+```jsx
 import { Affix, Button } from 'antd';
 
-const Demo: React.FC = () => {
-  const [container, setContainer] = useState(null);
-  return (
-    <div className="scrollable-container" ref={setContainer}>
-      <div className="background">
-        <Affix target={() => container}>
-          <Button type="primary">Fixed at the top of container</Button>
-        </Affix>
+class Demo extends React.Component {
+  render() {
+    return (
+      <div
+        className="scrollable-container"
+        ref={node => {
+          this.container = node;
+        }}
+      >
+        <div className="background">
+          <Affix target={() => this.container}>
+            <Button type="primary">Fixed at the top of container</Button>
+          </Affix>
+        </div>
       </div>
-    </div>
-  );
-};
+    );
+  }
+}
 
 ReactDOM.render(<Demo />, mountNode);
 ```

components/affix/index.en-US.md

@@ -14,12 +14,12 @@ Please note that Affix should not cover other content on the page, especially wh
 
 ## API
 
-| Property | Description | Type | Default |
-| --- | --- | --- | --- |
-| offsetBottom | Offset from the bottom of the viewport (in pixels) | number | - |
-| offsetTop | Offset from the top of the viewport (in pixels) | number | 0 |
-| target | Specifies the scrollable area DOM node | () => HTMLElement | () => window |
-| onChange | Callback for when Affix state is changed | Function(affixed) | - |
+| Property | Description | Type | Default | Version |
+| --- | --- | --- | --- | --- |
+| offsetBottom | Offset from the bottom of the viewport (in pixels) | number | - |  |
+| offsetTop | Offset from the top of the viewport (in pixels) | number | 0 |  |
+| target | Specifies the scrollable area DOM node | () => HTMLElement | () => window |  |
+| onChange | Callback for when Affix state is changed | Function(affixed) | - |  |
 
 **Note:** Children of `Affix` must not have the property `position: absolute`, but you can set `position: absolute` on `Affix` itself:
 

components/affix/index.tsx

@@ -1,10 +1,12 @@
 import * as React from 'react';
+import { polyfill } from 'react-lifecycles-compat';
 import classNames from 'classnames';
 import omit from 'omit.js';
 import ResizeObserver from 'rc-resize-observer';
-import { ConfigContext, ConfigConsumerProps } from '../config-provider';
+import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
 import { throttleByAnimationFrameDecorator } from '../_util/throttleByAnimationFrame';
 
+import warning from '../_util/warning';
 import {
   addObserveTarget,
   removeObserveTarget,
@@ -23,6 +25,7 @@ export interface AffixProps {
    * 距离窗口顶部达到指定偏移量后触发
    */
   offsetTop?: number;
+  offset?: number;
   /** 距离窗口底部达到指定偏移量后触发 */
   offsetBottom?: number;
   style?: React.CSSProperties;
@@ -32,7 +35,7 @@ export interface AffixProps {
   target?: () => Window | HTMLElement | null;
   prefixCls?: string;
   className?: string;
-  children: React.ReactNode;
+  children: React.ReactElement;
 }
 
 enum AffixStatus {
@@ -50,7 +53,9 @@ export interface AffixState {
 }
 
 class Affix extends React.Component<AffixProps, AffixState> {
-  static contextType = ConfigContext;
+  static defaultProps = {
+    target: getDefaultTarget,
+  };
 
   state: AffixState = {
     status: AffixStatus.None,
@@ -64,27 +69,14 @@ class Affix extends React.Component<AffixProps, AffixState> {
 
   private timeout: number;
 
-  context: ConfigConsumerProps;
-
-  private getTargetFunc() {
-    const { getTargetContainer } = this.context;
-    const { target } = this.props;
-
-    if (target !== undefined) {
-      return target;
-    }
-
-    return getTargetContainer || getDefaultTarget;
-  }
-
   // Event handler
   componentDidMount() {
-    const targetFunc = this.getTargetFunc();
-    if (targetFunc) {
+    const { target } = this.props;
+    if (target) {
       // [Legacy] Wait for parent component ref has its value.
       // We should use target as directly element instead of function which makes element check hard.
       this.timeout = setTimeout(() => {
-        addObserveTarget(targetFunc(), this);
+        addObserveTarget(target(), this);
         // Mock Event object.
         this.updatePosition();
       });
@@ -93,10 +85,10 @@ class Affix extends React.Component<AffixProps, AffixState> {
 
   componentDidUpdate(prevProps: AffixProps) {
     const { prevTarget } = this.state;
-    const targetFunc = this.getTargetFunc();
+    const { target } = this.props;
     let newTarget = null;
-    if (targetFunc) {
-      newTarget = targetFunc() || null;
+    if (target) {
+      newTarget = target() || null;
     }
 
     if (prevTarget !== newTarget) {
@@ -124,13 +116,20 @@ class Affix extends React.Component<AffixProps, AffixState> {
     clearTimeout(this.timeout);
     removeObserveTarget(this);
     (this.updatePosition as any).cancel();
-    // https://github.com/ant-design/ant-design/issues/22683
-    (this.lazyUpdatePosition as any).cancel();
   }
 
   getOffsetTop = () => {
-    const { offsetBottom } = this.props;
+    const { offset, offsetBottom } = this.props;
     let { offsetTop } = this.props;
+    if (typeof offsetTop === 'undefined') {
+      offsetTop = offset;
+      warning(
+        typeof offset === 'undefined',
+        'Affix',
+        '`offset` is deprecated. Please use `offsetTop` instead.',
+      );
+    }
+
     if (offsetBottom === undefined && offsetTop === undefined) {
       offsetTop = 0;
     }
@@ -152,16 +151,15 @@ class Affix extends React.Component<AffixProps, AffixState> {
   // =================== Measure ===================
   measure = () => {
     const { status, lastAffix } = this.state;
-    const { onChange } = this.props;
-    const targetFunc = this.getTargetFunc();
-    if (status !== AffixStatus.Prepare || !this.fixedNode || !this.placeholderNode || !targetFunc) {
+    const { target, onChange } = this.props;
+    if (status !== AffixStatus.Prepare || !this.fixedNode || !this.placeholderNode || !target) {
       return;
     }
 
     const offsetTop = this.getOffsetTop();
     const offsetBottom = this.getOffsetBottom();
 
-    const targetNode = targetFunc();
+    const targetNode = target();
     if (!targetNode) {
       return;
     }
@@ -232,15 +230,15 @@ class Affix extends React.Component<AffixProps, AffixState> {
 
   @throttleByAnimationFrameDecorator()
   lazyUpdatePosition() {
-    const targetFunc = this.getTargetFunc();
+    const { target } = this.props;
     const { affixStyle } = this.state;
 
     // Check position change before measure to make Safari smooth
-    if (targetFunc && affixStyle) {
+    if (target && affixStyle) {
       const offsetTop = this.getOffsetTop();
       const offsetBottom = this.getOffsetBottom();
 
-      const targetNode = targetFunc();
+      const targetNode = target();
       if (targetNode && this.placeholderNode) {
         const targetRect = getTargetRect(targetNode);
         const placeholderReact = getTargetRect(this.placeholderNode);
@@ -261,8 +259,7 @@ class Affix extends React.Component<AffixProps, AffixState> {
   }
 
   // =================== Render ===================
-  render = () => {
-    const { getPrefixCls } = this.context;
+  renderAffix = ({ getPrefixCls }: ConfigConsumerProps) => {
     const { affixStyle, placeholderStyle } = this.state;
     const { prefixCls, children } = this.props;
     const className = classNames({
@@ -296,6 +293,12 @@ class Affix extends React.Component<AffixProps, AffixState> {
       </ResizeObserver>
     );
   };
+
+  render() {
+    return <ConfigConsumer>{this.renderAffix}</ConfigConsumer>;
+  }
 }
 
+polyfill(Affix);
+
 export default Affix;

components/affix/index.zh-CN.md

@@ -15,12 +15,12 @@ title: Affix
 
 ## API
 
-| 成员 | 说明 | 类型 | 默认值 |
-| --- | --- | --- | --- |
-| offsetBottom | 距离窗口底部达到指定偏移量后触发 | number | - |
-| offsetTop | 距离窗口顶部达到指定偏移量后触发 | number | - |
-| target | 设置 `Affix` 需要监听其滚动事件的元素，值为一个返回对应 DOM 元素的函数 | () => HTMLElement | () => window |
-| onChange | 固定状态改变时触发的回调函数 | Function(affixed) | - |
+| 成员 | 说明 | 类型 | 默认值 | 版本 |
+| --- | --- | --- | --- | --- |
+| offsetBottom | 距离窗口底部达到指定偏移量后触发 | number |  |  |
+| offsetTop | 距离窗口顶部达到指定偏移量后触发 | number |  |  |
+| target | 设置 `Affix` 需要监听其滚动事件的元素，值为一个返回对应 DOM 元素的函数 | () => HTMLElement | () => window |  |
+| onChange | 固定状态改变时触发的回调函数 | Function(affixed) | 无 |  |
 
 **注意：**`Affix` 内的元素不要使用绝对定位，如需要绝对定位的效果，可以直接设置 `Affix` 为绝对定位：
 

components/alert/ErrorBoundary.tsx

@@ -1,42 +0,0 @@
-import * as React from 'react';
-import Alert from '.';
-
-interface ErrorBoundaryProps {
-  message?: React.ReactNode;
-  description?: React.ReactNode;
-}
-
-export default class ErrorBoundary extends React.Component<
-  ErrorBoundaryProps,
-  {
-    error?: Error | null;
-    info: {
-      componentStack?: string;
-    };
-  }
-> {
-  state = {
-    error: undefined,
-    info: {
-      componentStack: '',
-    },
-  };
-
-  componentDidCatch(error: Error | null, info: object) {
-    this.setState({ error, info });
-  }
-
-  render() {
-    const { message, description, children } = this.props;
-    const { error, info } = this.state;
-    const componentStack = info && info.componentStack ? info.componentStack : null;
-    const errorMessage = typeof message === 'undefined' ? (error || '').toString() : message;
-    const errorDescription = typeof description === 'undefined' ? componentStack : description;
-    if (error) {
-      return (
-        <Alert type="error" message={errorMessage} description={<pre>{errorDescription}</pre>} />
-      );
-    }
-    return children;
-  }
-}

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

@@ -1,15 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders ./components/alert/demo/banner.md correctly 1`] = `
-Array [
+<div>
   <div
     class="ant-alert ant-alert-warning ant-alert-banner"
     data-show="true"
   >
-    <span
-      aria-label="exclamation-circle"
+    <i
+      aria-label="icon: exclamation-circle"
       class="anticon anticon-exclamation-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -22,10 +21,10 @@ Array [
         width="1em"
       >
         <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 0 1 0-96 48.01 48.01 0 0 1 0 96z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -34,16 +33,15 @@ Array [
     <span
       class="ant-alert-description"
     />
-  </div>,
-  <br />,
+  </div>
+  <br />
   <div
     class="ant-alert ant-alert-warning ant-alert-banner ant-alert-closable"
     data-show="true"
   >
-    <span
-      aria-label="exclamation-circle"
+    <i
+      aria-label="icon: exclamation-circle"
       class="anticon anticon-exclamation-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -56,10 +54,10 @@ Array [
         width="1em"
       >
         <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 0 1 0-96 48.01 48.01 0 0 1 0 96z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -73,10 +71,9 @@ Array [
       tabindex="0"
       type="button"
     >
-      <span
-        aria-label="close"
+      <i
+        aria-label="icon: close"
         class="anticon anticon-close"
-        role="img"
       >
         <svg
           aria-hidden="true"
@@ -89,13 +86,13 @@ Array [
           width="1em"
         >
           <path
-            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
+            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
           />
         </svg>
-      </span>
+      </i>
     </button>
-  </div>,
-  <br />,
+  </div>
+  <br />
   <div
     class="ant-alert ant-alert-warning ant-alert-no-icon ant-alert-banner"
     data-show="true"
@@ -108,16 +105,15 @@ Array [
     <span
       class="ant-alert-description"
     />
-  </div>,
-  <br />,
+  </div>
+  <br />
   <div
     class="ant-alert ant-alert-error ant-alert-banner"
     data-show="true"
   >
-    <span
-      aria-label="close-circle"
+    <i
+      aria-label="icon: close-circle"
       class="anticon anticon-close-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -130,10 +126,10 @@ Array [
         width="1em"
       >
         <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 01-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 0 1-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -142,8 +138,8 @@ Array [
     <span
       class="ant-alert-description"
     />
-  </div>,
-]
+  </div>
+</div>
 `;
 
 exports[`renders ./components/alert/demo/basic.md correctly 1`] = `
@@ -181,10 +177,9 @@ exports[`renders ./components/alert/demo/closable.md correctly 1`] = `
       tabindex="0"
       type="button"
     >
-      <span
-        aria-label="close"
+      <i
+        aria-label="icon: close"
         class="anticon anticon-close"
-        role="img"
       >
         <svg
           aria-hidden="true"
@@ -197,10 +192,10 @@ exports[`renders ./components/alert/demo/closable.md correctly 1`] = `
           width="1em"
         >
           <path
-            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
+            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
           />
         </svg>
-      </span>
+      </i>
     </button>
   </div>
   <div
@@ -222,10 +217,9 @@ exports[`renders ./components/alert/demo/closable.md correctly 1`] = `
       tabindex="0"
       type="button"
     >
-      <span
-        aria-label="close"
+      <i
+        aria-label="icon: close"
         class="anticon anticon-close"
-        role="img"
       >
         <svg
           aria-hidden="true"
@@ -238,10 +232,10 @@ exports[`renders ./components/alert/demo/closable.md correctly 1`] = `
           width="1em"
         >
           <path
-            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
+            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
           />
         </svg>
-      </span>
+      </i>
     </button>
   </div>
 </div>
@@ -293,10 +287,9 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
     class="ant-alert ant-alert-success"
     data-show="true"
   >
-    <span
-      aria-label="smile"
+    <i
+      aria-label="icon: smile"
       class="anticon anticon-smile ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -309,10 +302,10 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"
+          d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -326,10 +319,9 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
     class="ant-alert ant-alert-info"
     data-show="true"
   >
-    <span
-      aria-label="smile"
+    <i
+      aria-label="icon: smile"
       class="anticon anticon-smile ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -342,10 +334,10 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"
+          d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -359,10 +351,9 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
     class="ant-alert ant-alert-warning"
     data-show="true"
   >
-    <span
-      aria-label="smile"
+    <i
+      aria-label="icon: smile"
       class="anticon anticon-smile ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -375,10 +366,10 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"
+          d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -392,10 +383,9 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
     class="ant-alert ant-alert-error"
     data-show="true"
   >
-    <span
-      aria-label="smile"
+    <i
+      aria-label="icon: smile"
       class="anticon anticon-smile ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -408,10 +398,10 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"
+          d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -425,10 +415,9 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
     class="ant-alert ant-alert-success ant-alert-with-description"
     data-show="true"
   >
-    <span
-      aria-label="smile"
+    <i
+      aria-label="icon: smile"
       class="anticon anticon-smile ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -441,10 +430,10 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"
+          d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -460,10 +449,9 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
     class="ant-alert ant-alert-info ant-alert-with-description"
     data-show="true"
   >
-    <span
-      aria-label="smile"
+    <i
+      aria-label="icon: smile"
       class="anticon anticon-smile ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -476,10 +464,10 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"
+          d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -495,10 +483,9 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
     class="ant-alert ant-alert-warning ant-alert-with-description"
     data-show="true"
   >
-    <span
-      aria-label="smile"
+    <i
+      aria-label="icon: smile"
       class="anticon anticon-smile ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -511,10 +498,10 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"
+          d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -530,10 +517,9 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
     class="ant-alert ant-alert-error ant-alert-with-description"
     data-show="true"
   >
-    <span
-      aria-label="smile"
+    <i
+      aria-label="icon: smile"
       class="anticon anticon-smile ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -546,10 +532,10 @@ exports[`renders ./components/alert/demo/custom-icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M288 421a48 48 0 1096 0 48 48 0 10-96 0zm352 0a48 48 0 1096 0 48 48 0 10-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 01248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 01249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 01775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 01775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 00-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 00-8-8.4z"
+          d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -629,27 +615,15 @@ exports[`renders ./components/alert/demo/description.md correctly 1`] = `
 </div>
 `;
 
-exports[`renders ./components/alert/demo/error-boundary.md correctly 1`] = `
-<button
-  class="ant-btn ant-btn-danger"
-  type="button"
->
-  <span>
-    Click me to throw a error
-  </span>
-</button>
-`;
-
 exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
 <div>
   <div
     class="ant-alert ant-alert-success"
     data-show="true"
   >
-    <span
-      aria-label="check-circle"
+    <i
+      aria-label="icon: check-circle"
       class="anticon anticon-check-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -662,10 +636,10 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm193.5 301.7l-210.6 292a31.8 31.8 0 01-51.7 0L318.5 484.9c-3.8-5.3 0-12.7 6.5-12.7h46.9c10.2 0 19.9 4.9 25.9 13.3l71.2 98.8 157.2-218c6-8.3 15.6-13.3 25.9-13.3H699c6.5 0 10.3 7.4 6.5 12.7z"
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm193.5 301.7l-210.6 292a31.8 31.8 0 0 1-51.7 0L318.5 484.9c-3.8-5.3 0-12.7 6.5-12.7h46.9c10.2 0 19.9 4.9 25.9 13.3l71.2 98.8 157.2-218c6-8.3 15.6-13.3 25.9-13.3H699c6.5 0 10.3 7.4 6.5 12.7z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -679,10 +653,9 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
     class="ant-alert ant-alert-info"
     data-show="true"
   >
-    <span
-      aria-label="info-circle"
+    <i
+      aria-label="icon: info-circle"
       class="anticon anticon-info-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -695,10 +668,10 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm32 664c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V456c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272zm-32-344a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm32 664c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V456c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272zm-32-344a48.01 48.01 0 0 1 0-96 48.01 48.01 0 0 1 0 96z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -709,13 +682,12 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
     />
   </div>
   <div
-    class="ant-alert ant-alert-warning ant-alert-closable"
+    class="ant-alert ant-alert-warning"
     data-show="true"
   >
-    <span
-      aria-label="exclamation-circle"
+    <i
+      aria-label="icon: exclamation-circle"
       class="anticon anticon-exclamation-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -728,10 +700,10 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 0 1 0-96 48.01 48.01 0 0 1 0 96z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -740,41 +712,14 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
     <span
       class="ant-alert-description"
     />
-    <button
-      class="ant-alert-close-icon"
-      tabindex="0"
-      type="button"
-    >
-      <span
-        aria-label="close"
-        class="anticon anticon-close"
-        role="img"
-      >
-        <svg
-          aria-hidden="true"
-          class=""
-          data-icon="close"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
-        >
-          <path
-            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
-          />
-        </svg>
-      </span>
-    </button>
   </div>
   <div
     class="ant-alert ant-alert-error"
     data-show="true"
   >
-    <span
-      aria-label="close-circle"
+    <i
+      aria-label="icon: close-circle"
       class="anticon anticon-close-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -787,10 +732,10 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 01-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
+          d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 0 1-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -804,10 +749,9 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
     class="ant-alert ant-alert-success ant-alert-with-description"
     data-show="true"
   >
-    <span
-      aria-label="check-circle"
+    <i
+      aria-label="icon: check-circle"
       class="anticon anticon-check-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -820,13 +764,13 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M699 353h-46.9c-10.2 0-19.9 4.9-25.9 13.3L469 584.3l-71.2-98.8c-6-8.3-15.6-13.3-25.9-13.3H325c-6.5 0-10.3 7.4-6.5 12.7l124.6 172.8a31.8 31.8 0 0051.7 0l210.6-292c3.9-5.3.1-12.7-6.4-12.7z"
+          d="M699 353h-46.9c-10.2 0-19.9 4.9-25.9 13.3L469 584.3l-71.2-98.8c-6-8.3-15.6-13.3-25.9-13.3H325c-6.5 0-10.3 7.4-6.5 12.7l124.6 172.8a31.8 31.8 0 0 0 51.7 0l210.6-292c3.9-5.3.1-12.7-6.4-12.7z"
         />
         <path
           d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -842,10 +786,9 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
     class="ant-alert ant-alert-info ant-alert-with-description"
     data-show="true"
   >
-    <span
-      aria-label="info-circle"
+    <i
+      aria-label="icon: info-circle"
       class="anticon anticon-info-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -861,10 +804,10 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
           d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
         />
         <path
-          d="M464 336a48 48 0 1096 0 48 48 0 10-96 0zm72 112h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V456c0-4.4-3.6-8-8-8z"
+          d="M464 336a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm72 112h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V456c0-4.4-3.6-8-8-8z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -877,13 +820,12 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
     </span>
   </div>
   <div
-    class="ant-alert ant-alert-warning ant-alert-with-description ant-alert-closable"
+    class="ant-alert ant-alert-warning ant-alert-with-description"
     data-show="true"
   >
-    <span
-      aria-label="exclamation-circle"
+    <i
+      aria-label="icon: exclamation-circle"
       class="anticon anticon-exclamation-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -899,10 +841,10 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
           d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
         />
         <path
-          d="M464 688a48 48 0 1096 0 48 48 0 10-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"
+          d="M464 688a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -913,41 +855,14 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
     >
       This is a warning notice about copywriting.
     </span>
-    <button
-      class="ant-alert-close-icon"
-      tabindex="0"
-      type="button"
-    >
-      <span
-        aria-label="close"
-        class="anticon anticon-close"
-        role="img"
-      >
-        <svg
-          aria-hidden="true"
-          class=""
-          data-icon="close"
-          fill="currentColor"
-          focusable="false"
-          height="1em"
-          viewBox="64 64 896 896"
-          width="1em"
-        >
-          <path
-            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
-          />
-        </svg>
-      </span>
-    </button>
   </div>
   <div
     class="ant-alert ant-alert-error ant-alert-with-description"
     data-show="true"
   >
-    <span
-      aria-label="close-circle"
+    <i
+      aria-label="icon: close-circle"
       class="anticon anticon-close-circle ant-alert-icon"
-      role="img"
     >
       <svg
         aria-hidden="true"
@@ -960,13 +875,13 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
         width="1em"
       >
         <path
-          d="M685.4 354.8c0-4.4-3.6-8-8-8l-66 .3L512 465.6l-99.3-118.4-66.1-.3c-4.4 0-8 3.5-8 8 0 1.9.7 3.7 1.9 5.2l130.1 155L340.5 670a8.32 8.32 0 00-1.9 5.2c0 4.4 3.6 8 8 8l66.1-.3L512 564.4l99.3 118.4 66 .3c4.4 0 8-3.5 8-8 0-1.9-.7-3.7-1.9-5.2L553.5 515l130.1-155c1.2-1.4 1.8-3.3 1.8-5.2z"
+          d="M685.4 354.8c0-4.4-3.6-8-8-8l-66 .3L512 465.6l-99.3-118.4-66.1-.3c-4.4 0-8 3.5-8 8 0 1.9.7 3.7 1.9 5.2l130.1 155L340.5 670a8.32 8.32 0 0 0-1.9 5.2c0 4.4 3.6 8 8 8l66.1-.3L512 564.4l99.3 118.4 66 .3c4.4 0 8-3.5 8-8 0-1.9-.7-3.7-1.9-5.2L553.5 515l130.1-155c1.2-1.4 1.8-3.3 1.8-5.2z"
         />
         <path
           d="M512 65C264.6 65 64 265.6 64 513s200.6 448 448 448 448-200.6 448-448S759.4 65 512 65zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
         />
       </svg>
-    </span>
+    </i>
     <span
       class="ant-alert-message"
     >
@@ -981,57 +896,6 @@ exports[`renders ./components/alert/demo/icon.md correctly 1`] = `
 </div>
 `;
 
-exports[`renders ./components/alert/demo/loop-banner.md correctly 1`] = `
-<div
-  class="ant-alert ant-alert-warning ant-alert-banner"
-  data-show="true"
->
-  <span
-    aria-label="exclamation-circle"
-    class="anticon anticon-exclamation-circle ant-alert-icon"
-    role="img"
-  >
-    <svg
-      aria-hidden="true"
-      class=""
-      data-icon="exclamation-circle"
-      fill="currentColor"
-      focusable="false"
-      height="1em"
-      viewBox="64 64 896 896"
-      width="1em"
-    >
-      <path
-        d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z"
-      />
-    </svg>
-  </span>
-  <span
-    class="ant-alert-message"
-  >
-    <div
-      class="x0 x1 x2 x3 "
-    >
-      <div
-        style="transition:width 150ms linear;height:auto;width:auto"
-      >
-        <div
-          class="x1 x4 x5 x6"
-          style="opacity:1;transform:translateY(0px);position:relative"
-        >
-          <div>
-            Notice message one
-          </div>
-        </div>
-      </div>
-    </div>
-  </span>
-  <span
-    class="ant-alert-description"
-  />
-</div>
-`;
-
 exports[`renders ./components/alert/demo/smooth-closed.md correctly 1`] = `
 <div>
   <div
@@ -1051,10 +915,9 @@ exports[`renders ./components/alert/demo/smooth-closed.md correctly 1`] = `
       tabindex="0"
       type="button"
     >
-      <span
-        aria-label="close"
+      <i
+        aria-label="icon: close"
         class="anticon anticon-close"
-        role="img"
       >
         <svg
           aria-hidden="true"
@@ -1067,10 +930,10 @@ exports[`renders ./components/alert/demo/smooth-closed.md correctly 1`] = `
           width="1em"
         >
           <path
-            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 00203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
+            d="M563.8 512l262.5-312.9c4.4-5.2.7-13.1-6.1-13.1h-79.8c-4.7 0-9.2 2.1-12.3 5.7L511.6 449.8 295.1 191.7c-3-3.6-7.5-5.7-12.3-5.7H203c-6.8 0-10.5 7.9-6.1 13.1L459.4 512 196.9 824.9A7.95 7.95 0 0 0 203 838h79.8c4.7 0 9.2-2.1 12.3-5.7l216.5-258.1 216.5 258.1c3 3.6 7.5 5.7 12.3 5.7h79.8c6.8 0 10.5-7.9 6.1-13.1L563.8 512z"
           />
         </svg>
-      </span>
+      </i>
     </button>
   </div>
   <p>

components/alert/__tests__/__snapshots__/index.test.tsx.snap

@@ -1,37 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Alert ErrorBoundary 1`] = `
-<div
-  class="ant-alert ant-alert-error ant-alert-with-description ant-alert-no-icon"
-  data-show="true"
->
-  <span
-    class="ant-alert-message"
-  >
-    ReferenceError: NotExisted is not defined
-  </span>
-  <span
-    class="ant-alert-description"
-  >
-    <pre>
-          in ThrowError
-    in ErrorBoundary (created by WrapperComponent)
-    in WrapperComponent
-    </pre>
-  </span>
-</div>
-`;
-
-exports[`Alert rtl render component should be rendered correctly in RTL direction 1`] = `
-<div
-  class="ant-alert ant-alert-info ant-alert-no-icon ant-alert-rtl"
-  data-show="true"
->
-  <span
-    class="ant-alert-message"
-  />
-  <span
-    class="ant-alert-description"
-  />
-</div>
-`;

components/alert/__tests__/index.test.js

@@ -0,0 +1,67 @@
+import React from 'react';
+import { mount } from 'enzyme';
+import Alert from '..';
+
+describe('Alert', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('could be closed', () => {
+    const onClose = jest.fn();
+    const afterClose = jest.fn();
+    const wrapper = mount(
+      <Alert
+        message="Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text"
+        type="warning"
+        closable
+        onClose={onClose}
+        afterClose={afterClose}
+      />,
+    );
+    wrapper.find('.ant-alert-close-icon').simulate('click');
+    expect(onClose).toHaveBeenCalled();
+    jest.runAllTimers();
+    expect(afterClose).toHaveBeenCalled();
+  });
+
+  describe('data and aria props', () => {
+    it('sets data attributes on input', () => {
+      const wrapper = mount(<Alert data-test="test-id" data-id="12345" />);
+      const input = wrapper.find('.ant-alert').getDOMNode();
+      expect(input.getAttribute('data-test')).toBe('test-id');
+      expect(input.getAttribute('data-id')).toBe('12345');
+    });
+
+    it('sets aria attributes on input', () => {
+      const wrapper = mount(<Alert aria-describedby="some-label" />);
+      const input = wrapper.find('.ant-alert').getDOMNode();
+      expect(input.getAttribute('aria-describedby')).toBe('some-label');
+    });
+
+    it('sets role attribute on input', () => {
+      const wrapper = mount(<Alert role="status" />);
+      const input = wrapper.find('.ant-alert').getDOMNode();
+      expect(input.getAttribute('role')).toBe('status');
+    });
+  });
+
+  it('warning for props#iconType', () => {
+    const warnSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+    mount(
+      <Alert
+        message="Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text"
+        type="warning"
+        iconType="up"
+      />,
+    );
+    expect(warnSpy).toHaveBeenCalledWith(
+      'Warning: [antd: Alert] `iconType` is deprecated. Please use `icon` instead.',
+    );
+    warnSpy.mockRestore();
+  });
+});

components/alert/__tests__/index.test.tsx

@@ -1,108 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import Alert from '..';
-import Tooltip from '../../tooltip';
-import Popconfirm from '../../popconfirm';
-import rtlTest from '../../../tests/shared/rtlTest';
-import { sleep } from '../../../tests/utils';
-
-const { ErrorBoundary } = Alert;
-
-describe('Alert', () => {
-  rtlTest(Alert);
-
-  beforeAll(() => {
-    jest.useFakeTimers();
-  });
-
-  afterAll(() => {
-    jest.useRealTimers();
-  });
-
-  it('could be closed', () => {
-    const onClose = jest.fn();
-    const afterClose = jest.fn();
-    const wrapper = mount(
-      <Alert
-        message="Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text"
-        type="warning"
-        closable
-        onClose={onClose}
-        afterClose={afterClose}
-      />,
-    );
-    wrapper.find('.ant-alert-close-icon').simulate('click');
-    expect(onClose).toHaveBeenCalled();
-    jest.runAllTimers();
-    expect(afterClose).toHaveBeenCalled();
-  });
-
-  describe('data and aria props', () => {
-    it('sets data attributes on input', () => {
-      const wrapper = mount(<Alert data-test="test-id" data-id="12345" message={null} />);
-      const input = wrapper.find('.ant-alert').getDOMNode();
-      expect(input.getAttribute('data-test')).toBe('test-id');
-      expect(input.getAttribute('data-id')).toBe('12345');
-    });
-
-    it('sets aria attributes on input', () => {
-      const wrapper = mount(<Alert aria-describedby="some-label" message={null} />);
-      const input = wrapper.find('.ant-alert').getDOMNode();
-      expect(input.getAttribute('aria-describedby')).toBe('some-label');
-    });
-
-    it('sets role attribute on input', () => {
-      const wrapper = mount(<Alert role="status" message={null} />);
-      const input = wrapper.find('.ant-alert').getDOMNode();
-      expect(input.getAttribute('role')).toBe('status');
-    });
-  });
-
-  const testIt = process.env.REACT === '15' ? it.skip : it;
-  testIt('ErrorBoundary', () => {
-    // TODO: Change to @ts-expect-error once typescript is at 3.9
-    // @ts-ignore
-    // eslint-disable-next-line react/jsx-no-undef
-    const ThrowError = () => <NotExisted />;
-    const wrapper = mount(
-      <ErrorBoundary>
-        <ThrowError />
-      </ErrorBoundary>,
-    );
-    // eslint-disable-next-line jest/no-standalone-expect
-    expect(wrapper.render()).toMatchSnapshot();
-  });
-
-  it('could be used with Tooltip', async () => {
-    jest.useRealTimers();
-    const wrapper = mount(
-      <Tooltip title="xxx" mouseEnterDelay={0}>
-        <Alert
-          message="Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text"
-          type="warning"
-        />
-      </Tooltip>,
-    );
-    wrapper.find('.ant-alert').simulate('mouseenter');
-    await sleep(0);
-    expect(wrapper.find<Tooltip>(Tooltip).instance().getPopupDomNode()).toBeTruthy();
-    jest.useFakeTimers();
-  });
-
-  it('could be used with Popconfirm', async () => {
-    const ref = React.createRef<any>();
-    jest.useRealTimers();
-    const wrapper = mount(
-      <Popconfirm ref={ref} title="xxx">
-        <Alert
-          message="Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text"
-          type="warning"
-        />
-      </Popconfirm>,
-    );
-    wrapper.find('.ant-alert').simulate('click');
-    await sleep(0);
-    expect(ref.current.getPopupDomNode()).toBeTruthy();
-    jest.useFakeTimers();
-  });
-});

components/alert/demo/banner.md

@@ -8,17 +8,17 @@ title:
 
 ## zh-CN
 
-页面顶部通告形式，默认有图标且 `type` 为 'warning'。
+页面顶部通告形式，默认有图标且`type` 为 'warning'。
 
 ## en-US
 
 Display Alert as a banner at top of page.
 
-```tsx
+```jsx
 import { Alert } from 'antd';
 
 ReactDOM.render(
-  <>
+  <div>
     <Alert message="Warning text" banner />
     <br />
     <Alert
@@ -30,7 +30,7 @@ ReactDOM.render(
     <Alert showIcon={false} message="Warning text without icon" banner />
     <br />
     <Alert type="error" message="Error text" banner />
-  </>,
+  </div>,
   mountNode,
 );
 ```

components/alert/demo/basic.md

@@ -13,14 +13,14 @@ title:
 
 The simplest usage for short messages.
 
-```tsx
+```jsx
 import { Alert } from 'antd';
 
 ReactDOM.render(<Alert message="Success Text" type="success" />, mountNode);
 ```
 
 <style>
-.code-box-demo .ant-alert {
+.ant-alert {
   margin-bottom: 16px;
 }
 </style>

components/alert/demo/closable.md

@@ -13,10 +13,10 @@ title:
 
 To show close button.
 
-```tsx
+```jsx
 import { Alert } from 'antd';
 
-const onClose = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
+const onClose = e => {
   console.log(e, 'I was closed.');
 };
 

components/alert/demo/close-text.md

@@ -13,7 +13,7 @@ title:
 
 Replace the default icon with customized text.
 
-```tsx
+```jsx
 import { Alert } from 'antd';
 
 ReactDOM.render(<Alert message="Info Text" type="info" closeText="Close Now" />, mountNode);

components/alert/demo/custom-icon.md

@@ -14,11 +14,10 @@ title:
 
 A relevant icon makes information clearer and more friendly.
 
-```tsx
-import { Alert } from 'antd';
-import { SmileOutlined } from '@ant-design/icons';
+```jsx
+import { Alert, Icon } from 'antd';
 
-const icon = <SmileOutlined />;
+const icon = <Icon type="smile" />;
 
 ReactDOM.render(
   <div>

components/alert/demo/description.md

@@ -13,7 +13,7 @@ title:
 
 Additional description for alert message.
 
-```tsx
+```jsx
 import { Alert } from 'antd';
 
 ReactDOM.render(

components/alert/demo/error-boundary.md

@@ -1,43 +0,0 @@
----
-order: 8
-title:
-  zh-CN: ErrorBoundary
-  en-US: React 错误处理
----
-
-## zh-CN
-
-友好的 [React 错误处理](https://reactjs.org/blog/2017/07/26/error-handling-in-react-16.html) 包裹组件。
-
-## en-US
-
-ErrorBoundary Component for making error handling easier in [React](https://reactjs.org/blog/2017/07/26/error-handling-in-react-16.html).
-
-```tsx
-import React, { useState } from 'react';
-import { Button, Alert } from 'antd';
-
-const { ErrorBoundary } = Alert;
-const ThrowError: React.FC = () => {
-  const [error, setError] = useState<Error>();
-  const onClick = () => {
-    setError(new Error('An Uncaught Error'));
-  };
-
-  if (error) {
-    throw error;
-  }
-  return (
-    <Button type="danger" onClick={onClick}>
-      Click me to throw a error
-    </Button>
-  );
-};
-
-ReactDOM.render(
-  <ErrorBoundary>
-    <ThrowError />
-  </ErrorBoundary>,
-  mountNode,
-);
-```

components/alert/demo/icon.md

@@ -13,14 +13,14 @@ title:
 
 A relevant icon will make information clearer and more friendly.
 
-```tsx
+```jsx
 import { Alert } from 'antd';
 
 ReactDOM.render(
   <div>
     <Alert message="Success Tips" type="success" showIcon />
     <Alert message="Informational Notes" type="info" showIcon />
-    <Alert message="Warning" type="warning" showIcon closable />
+    <Alert message="Warning" type="warning" showIcon />
     <Alert message="Error" type="error" showIcon />
     <Alert
       message="Success Tips"
@@ -39,7 +39,6 @@ ReactDOM.render(
       description="This is a warning notice about copywriting."
       type="warning"
       showIcon
-      closable
     />
     <Alert
       message="Error"

components/alert/demo/loop-banner.md

@@ -1,34 +0,0 @@
----
-order: 6.1
-title:
-  zh-CN: 轮播的公告
-  en-US: Loop Banner
----
-
-## zh-CN
-
-配合 [react-text-loop](https://npmjs.com/package/react-text-loop) 实现消息轮播通知栏。
-
-## en-US
-
-Show a loop banner by using with [react-text-loop](https://npmjs.com/package/react-text-loop).
-
-```tsx
-import { Alert } from 'antd';
-import TextLoop from 'react-text-loop';
-
-ReactDOM.render(
-  <Alert
-    banner
-    message={
-      <TextLoop mask>
-        <div>Notice message one</div>
-        <div>Notice message two</div>
-        <div>Notice message three</div>
-        <div>Notice message four</div>
-      </TextLoop>
-    }
-  />,
-  mountNode,
-);
-```

components/alert/demo/smooth-closed.md

@@ -13,24 +13,34 @@ title:
 
 Smoothly unmount Alert upon close.
 
-```tsx
-import React, { useState } from 'react';
+```jsx
 import { Alert } from 'antd';
 
-const App: React.FC = () => {
-  const [visible, setVisible] = useState(true);
-  const handleClose = () => {
-    setVisible(false);
+class App extends React.Component {
+  state = {
+    visible: true,
   };
-  return (
-    <div>
-      {visible ? (
-        <Alert message="Alert Message Text" type="success" closable afterClose={handleClose} />
-      ) : null}
-      <p>placeholder text here</p>
-    </div>
-  );
-};
+
+  handleClose = () => {
+    this.setState({ visible: false });
+  };
+
+  render() {
+    return (
+      <div>
+        {this.state.visible ? (
+          <Alert
+            message="Alert Message Text"
+            type="success"
+            closable
+            afterClose={this.handleClose}
+          />
+        ) : null}
+        <p>placeholder text here</p>
+      </div>
+    );
+  }
+}
 
 ReactDOM.render(<App />, mountNode);
 ```

components/alert/demo/style.md

@@ -13,7 +13,7 @@ title:
 
 There are 4 types of Alert: `success`, `info`, `warning`, `error`.
 
-```tsx
+```jsx
 import { Alert } from 'antd';
 
 ReactDOM.render(
@@ -26,9 +26,3 @@ ReactDOM.render(
   mountNode,
 );
 ```
-
-<style>
-[data-theme="compact"] .code-box-demo .ant-alert {
-  margin-bottom: 8px;
-}
-</style>

components/alert/index.en-US.md

@@ -13,22 +13,15 @@ Alert component for feedback.
 
 ## API
 
-| Property | Description | Type | Default |
-| --- | --- | --- | --- |
-| afterClose | Called when close animation is finished | () => void | - |
-| banner | Whether to show as banner | boolean | false |
-| closable | Whether Alert can be closed | boolean | - |
-| closeText | Close text to show | string\|ReactNode | - |
-| description | Additional content of Alert | string\|ReactNode | - |
-| icon | Custom icon, effective when `showIcon` is `true` | ReactNode | - |
-| message | Content of Alert | string\|ReactNode | - |
-| showIcon | Whether to show icon | boolean | false, in `banner` mode default is true |
-| type | Type of Alert styles, options: `success`, `info`, `warning`, `error` | string | `info`, in `banner` mode default is `warning` |
-| onClose | Callback when Alert is closed | (e: MouseEvent) => void | - |
-
-### Alert.ErrorBoundary
-
-| Property    | Description                      | Type      | Default             | Version |
-| ----------- | -------------------------------- | --------- | ------------------- | ------- |
-| message     | custom error message to show     | ReactNode | `{{ error }}`       |         |
-| description | custom error description to show | ReactNode | `{{ error stack }}` |         |
+| Property | Description | Type | Default | Version |
+| --- | --- | --- | --- | --- |
+| afterClose | Called when close animation is finished | () => void | - | 3.3.1 |
+| banner | Whether to show as banner | boolean | false |  |
+| closable | Whether Alert can be closed | boolean | - |  |
+| closeText | Close text to show | string\|ReactNode | - |  |
+| description | Additional content of Alert | string\|ReactNode | - |  |
+| icon | Custom icon, effective when `showIcon` is `true` | ReactNode | - | 3.10.0 |
+| message | Content of Alert | string\|ReactNode | - |  |
+| showIcon | Whether to show icon | boolean | false, in `banner` mode default is true |  |
+| type | Type of Alert styles, options: `success`, `info`, `warning`, `error` | string | `info`, in `banner` mode default is `warning` |  |
+| onClose | Callback when Alert is closed | (e: MouseEvent) => void | - |  |

components/alert/index.tsx

@@ -1,20 +1,11 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import CloseOutlined from '@ant-design/icons/CloseOutlined';
-import CheckCircleOutlined from '@ant-design/icons/CheckCircleOutlined';
-import ExclamationCircleOutlined from '@ant-design/icons/ExclamationCircleOutlined';
-import InfoCircleOutlined from '@ant-design/icons/InfoCircleOutlined';
-import CloseCircleOutlined from '@ant-design/icons/CloseCircleOutlined';
-import CheckCircleFilled from '@ant-design/icons/CheckCircleFilled';
-import ExclamationCircleFilled from '@ant-design/icons/ExclamationCircleFilled';
-import InfoCircleFilled from '@ant-design/icons/InfoCircleFilled';
-import CloseCircleFilled from '@ant-design/icons/CloseCircleFilled';
 import Animate from 'rc-animate';
 import classNames from 'classnames';
-
+import Icon, { ThemeType } from '../icon';
 import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
 import getDataOrAriaProps from '../_util/getDataOrAriaProps';
-import ErrorBoundary from './ErrorBoundary';
+import warning from '../_util/warning';
 
 function noop() {}
 
@@ -37,16 +28,12 @@ export interface AlertProps {
   afterClose?: () => void;
   /** Whether to show icon */
   showIcon?: boolean;
-  /** https://www.w3.org/TR/2014/REC-html5-20141028/dom.html#aria-role-attribute */
-  role?: string;
+  iconType?: string;
   style?: React.CSSProperties;
   prefixCls?: string;
   className?: string;
   banner?: boolean;
   icon?: React.ReactNode;
-  onMouseEnter?: React.MouseEventHandler<HTMLDivElement>;
-  onMouseLeave?: React.MouseEventHandler<HTMLDivElement>;
-  onClick?: React.MouseEventHandler<HTMLDivElement>;
 }
 
 export interface AlertState {
@@ -54,27 +41,21 @@ export interface AlertState {
   closed: boolean;
 }
 
-const iconMapFilled = {
-  success: CheckCircleFilled,
-  info: InfoCircleFilled,
-  error: CloseCircleFilled,
-  warning: ExclamationCircleFilled,
-};
-
-const iconMapOutlined = {
-  success: CheckCircleOutlined,
-  info: InfoCircleOutlined,
-  error: CloseCircleOutlined,
-  warning: ExclamationCircleOutlined,
-};
-
 export default class Alert extends React.Component<AlertProps, AlertState> {
-  static ErrorBoundary = ErrorBoundary;
+  constructor(props: AlertProps) {
+    super(props);
 
-  state = {
-    closing: false,
-    closed: false,
-  };
+    warning(
+      !('iconType' in props),
+      'Alert',
+      '`iconType` is deprecated. Please use `icon` instead.',
+    );
+
+    this.state = {
+      closing: false,
+      closed: false,
+    };
+  }
 
   handleClose = (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault();
@@ -98,7 +79,7 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
     (this.props.afterClose || noop)();
   };
 
-  renderAlert = ({ getPrefixCls, direction }: ConfigConsumerProps) => {
+  renderAlert = ({ getPrefixCls }: ConfigConsumerProps) => {
     const {
       description,
       prefixCls: customizePrefixCls,
@@ -108,11 +89,8 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
       className = '',
       style,
       icon,
-      onMouseEnter,
-      onMouseLeave,
-      onClick,
     } = this.props;
-    let { closable, type, showIcon } = this.props;
+    let { closable, type, showIcon, iconType } = this.props;
     const { closing, closed } = this.state;
 
     const prefixCls = getPrefixCls('alert', customizePrefixCls);
@@ -122,8 +100,30 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
     // banner模式默认为警告
     type = banner && type === undefined ? 'warning' : type || 'info';
 
-    // use outline icon in alert with description
-    const iconType = (description ? iconMapOutlined : iconMapFilled)[type] || null;
+    let iconTheme: ThemeType = 'filled';
+    if (!iconType) {
+      switch (type) {
+        case 'success':
+          iconType = 'check-circle';
+          break;
+        case 'info':
+          iconType = 'info-circle';
+          break;
+        case 'error':
+          iconType = 'close-circle';
+          break;
+        case 'warning':
+          iconType = 'exclamation-circle';
+          break;
+        default:
+          iconType = 'default';
+      }
+
+      // use outline icon in alert with description
+      if (description) {
+        iconTheme = 'outlined';
+      }
+    }
 
     // closeable when closeText is assigned
     if (closeText) {
@@ -139,7 +139,6 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
         [`${prefixCls}-no-icon`]: !showIcon,
         [`${prefixCls}-banner`]: !!banner,
         [`${prefixCls}-closable`]: closable,
-        [`${prefixCls}-rtl`]: direction === 'rtl',
       },
       className,
     );
@@ -154,25 +153,23 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
         {closeText ? (
           <span className={`${prefixCls}-close-text`}>{closeText}</span>
         ) : (
-          <CloseOutlined />
+          <Icon type="close" />
         )}
       </button>
     ) : null;
 
     const dataOrAriaProps = getDataOrAriaProps(this.props);
 
-    const iconNode =
-      (icon &&
-        (React.isValidElement<{ className?: string }>(icon) ? (
-          React.cloneElement(icon, {
-            className: classNames(`${prefixCls}-icon`, {
-              [icon.props.className as string]: icon.props.className,
-            }),
-          })
-        ) : (
-          <span className={`${prefixCls}-icon`}>{icon}</span>
-        ))) ||
-      React.createElement(iconType, { className: `${prefixCls}-icon` });
+    const iconNode = (icon &&
+      (React.isValidElement<{ className?: string }>(icon) ? (
+        React.cloneElement(icon, {
+          className: classNames(`${prefixCls}-icon`, {
+            [icon.props.className as string]: icon.props.className,
+          }),
+        })
+      ) : (
+        <span className={`${prefixCls}-icon`}>{icon}</span>
+      ))) || <Icon className={`${prefixCls}-icon`} type={iconType} theme={iconTheme} />;
 
     return closed ? null : (
       <Animate
@@ -181,15 +178,7 @@ export default class Alert extends React.Component<AlertProps, AlertState> {
         transitionName={`${prefixCls}-slide-up`}
         onEnd={this.animationEnd}
       >
-        <div
-          data-show={!closing}
-          className={alertCls}
-          style={style}
-          onMouseEnter={onMouseEnter}
-          onMouseLeave={onMouseLeave}
-          onClick={onClick}
-          {...dataOrAriaProps}
-        >
+        <div data-show={!closing} className={alertCls} style={style} {...dataOrAriaProps}>
           {showIcon ? iconNode : null}
           <span className={`${prefixCls}-message`}>{message}</span>
           <span className={`${prefixCls}-description`}>{description}</span>

components/alert/index.zh-CN.md

@@ -14,22 +14,15 @@ title: Alert
 
 ## API
 
-| 参数 | 说明 | 类型 | 默认值 |
-| --- | --- | --- | --- |
-| afterClose | 关闭动画结束后触发的回调函数 | () => void | - |
-| banner | 是否用作顶部公告 | boolean | false |
-| closable | 默认不显示关闭按钮 | boolean | 无 |
-| closeText | 自定义关闭按钮 | string\|ReactNode | 无 |
-| description | 警告提示的辅助性文字介绍 | string\|ReactNode | 无 |
-| icon | 自定义图标，`showIcon` 为 `true` 时有效 | ReactNode | - |
-| message | 警告提示内容 | string\|ReactNode | 无 |
-| showIcon | 是否显示辅助图标 | boolean | false，`banner` 模式下默认值为 true |
-| type | 指定警告提示的样式，有四种选择 `success`、`info`、`warning`、`error` | string | `info`，`banner` 模式下默认值为 `warning` |
-| onClose | 关闭时触发的回调函数 | (e: MouseEvent) => void | 无 |
-
-### Alert.ErrorBoundary
-
 | 参数 | 说明 | 类型 | 默认值 | 版本 |
 | --- | --- | --- | --- | --- |
-| message | 自定义错误标题，如果未指定会展示原生报错信息 | ReactNode | `{{ error }}` |  |
-| description | 自定义错误内容，如果未指定会展示报错堆栈 | ReactNode | `{{ error stack }}` |  |
+| afterClose | 关闭动画结束后触发的回调函数 | () => void | - | 3.3.1 |
+| banner | 是否用作顶部公告 | boolean | false |  |
+| closable | 默认不显示关闭按钮 | boolean | 无 |  |
+| closeText | 自定义关闭按钮 | string\|ReactNode | 无 |  |
+| description | 警告提示的辅助性文字介绍 | string\|ReactNode | 无 |  |
+| icon | 自定义图标，`showIcon` 为 `true` 时有效 | ReactNode | - | 3.10.0 |
+| message | 警告提示内容 | string\|ReactNode | 无 |  |
+| showIcon | 是否显示辅助图标 | boolean | false，`banner` 模式下默认值为 true |  |
+| type | 指定警告提示的样式，有四种选择 `success`、`info`、`warning`、`error` | string | `info`，`banner` 模式下默认值为 `warning` |  |
+| onClose | 关闭时触发的回调函数 | (e: MouseEvent) => void | 无 |  |

components/alert/style/index.less

@@ -3,6 +3,11 @@
 
 @alert-prefix-cls: ~'@{ant-prefix}-alert';
 
+@alert-message-color: @heading-color;
+@alert-text-color: @text-color;
+@alert-close-color: @text-color-secondary;
+@alert-close-hover-color: @icon-color-hover;
+
 .@{alert-prefix-cls} {
   .reset-component;
 
@@ -12,11 +17,7 @@
   border-radius: @border-radius-base;
 
   &&-no-icon {
-    padding: @alert-no-icon-padding-vertical 15px;
-    .@{alert-prefix-cls}-close-icon {
-      top: @alert-no-icon-padding-vertical + @font-size-base * @line-height-base / 2 -
-        @font-size-base / 2;
-    }
+    padding: 8px 15px;
   }
 
   &&-closable {
@@ -25,14 +26,14 @@
 
   &-icon {
     position: absolute;
-    top: @alert-icon-top;
+    top: 8px + @font-size-base * @line-height-base / 2 - @font-size-base / 2;
     left: 16px;
   }
 
   &-description {
     display: none;
     font-size: @font-size-base;
-    line-height: @font-size-base + 8px;
+    line-height: 22px;
   }
 
   &-success {
@@ -62,25 +63,19 @@
   &-error {
     background-color: @alert-error-bg-color;
     border: @border-width-base @border-style-base @alert-error-border-color;
-
     .@{alert-prefix-cls}-icon {
       color: @alert-error-icon-color;
     }
-
-    .@{alert-prefix-cls}-description > pre {
-      margin: 0;
-      padding: 0;
-    }
   }
 
   &-close-icon {
     position: absolute;
-    top: 8px + @font-size-base * @line-height-base / 2 - @font-size-base / 2;
+    top: 8px;
     right: 16px;
     padding: 0;
     overflow: hidden;
     font-size: @font-size-sm;
-    line-height: @font-size-sm;
+    line-height: 22px;
     background-color: transparent;
     border: none;
     outline: none;
@@ -105,27 +100,27 @@
 
   &-with-description {
     position: relative;
-    padding: @alert-with-description-padding;
+    padding: 15px 15px 15px 64px;
     color: @alert-text-color;
     line-height: @line-height-base;
     border-radius: @border-radius-base;
   }
 
   &-with-description&-no-icon {
-    padding: @alert-with-description-no-icon-padding-vertical 15px;
+    padding: 15px;
   }
 
   &-with-description &-icon {
     position: absolute;
-    top: @alert-with-description-icon-top;
-    left: @alert-with-description-icon-size;
-    font-size: @alert-with-description-icon-size;
+    top: 16px;
+    left: 24px;
+    font-size: 24px;
   }
 
   &-with-description &-close-icon {
     position: absolute;
-    top: @padding-xs;
-    right: @padding-xs;
+    top: 16px;
+    right: 16px;
     font-size: @font-size-base;
     cursor: pointer;
   }
@@ -191,5 +186,3 @@
     opacity: 0;
   }
 }
-
-@import './rtl';

components/alert/style/rtl.less

@@ -1,72 +0,0 @@
-@import '../../style/themes/index';
-@import '../../style/mixins/index';
-
-@alert-prefix-cls: ~'@{ant-prefix}-alert';
-
-.@{alert-prefix-cls} {
-  &&-rtl {
-    padding: 8px 37px 8px 15px;
-    direction: rtl;
-  }
-
-  &&-no-icon {
-    .@{alert-prefix-cls}-rtl& {
-      padding: @alert-no-icon-padding-vertical 15px;
-    }
-  }
-
-  &&-closable {
-    .@{alert-prefix-cls}.@{alert-prefix-cls}-rtl& {
-      padding-right: 37px;
-      padding-left: 30px;
-    }
-  }
-
-  &&-no-icon&-closable {
-    .@{alert-prefix-cls}.@{alert-prefix-cls}-rtl& {
-      padding-right: 15px;
-      padding-left: 30px;
-    }
-  }
-
-  &-icon {
-    .@{alert-prefix-cls}-rtl & {
-      right: 16px;
-      left: auto;
-    }
-  }
-
-  &-close-icon {
-    .@{alert-prefix-cls}-rtl & {
-      right: auto;
-      left: 16px;
-    }
-  }
-
-  &-with-description,
-  &-with-description&-closable {
-    .@{alert-prefix-cls}.@{alert-prefix-cls}-rtl& {
-      padding: 15px 64px 15px 15px;
-    }
-  }
-
-  &-with-description&-no-icon {
-    .@{alert-prefix-cls}.@{alert-prefix-cls}-rtl& {
-      padding: 15px;
-    }
-  }
-
-  &-with-description &-icon {
-    .@{alert-prefix-cls}-rtl& {
-      right: 24px;
-      left: auto;
-    }
-  }
-
-  &-with-description &-close-icon {
-    .@{alert-prefix-cls}-rtl& {
-      right: auto;
-      left: 16px;
-    }
-  }
-}

components/anchor/Anchor.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
+import * as PropTypes from 'prop-types';
 import classNames from 'classnames';
 import addEventListener from 'rc-util/lib/Dom/addEventListener';
 import Affix from '../affix';
 import AnchorLink from './AnchorLink';
-import { ConfigContext, ConfigConsumerProps } from '../config-provider';
+import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
 import scrollTo from '../_util/scrollTo';
 import getScroll from '../_util/getScroll';
-import AnchorContext from './context';
 
 function getDefaultContainer() {
   return window;
@@ -35,7 +35,7 @@ function getOffsetTop(element: HTMLElement, container: AnchorContainer): number
   return rect.top;
 }
 
-const sharpMatcherRegx = /#(\S+)$/;
+const sharpMatcherRegx = /#([^#]+)$/;
 
 type Section = {
   link: string;
@@ -88,22 +88,23 @@ export interface AntAnchor {
   ) => void;
 }
 
-export default class Anchor extends React.Component<AnchorProps, AnchorState, ConfigConsumerProps> {
+export default class Anchor extends React.Component<AnchorProps, AnchorState> {
   static Link: typeof AnchorLink;
 
   static defaultProps = {
     affix: true,
     showInkInFixed: false,
+    getContainer: getDefaultContainer,
   };
 
-  static contextType = ConfigContext;
+  static childContextTypes = {
+    antAnchor: PropTypes.object,
+  };
 
   state = {
     activeLink: null,
   };
 
-  content: ConfigConsumerProps;
-
   private inkNode: HTMLSpanElement;
 
   // scroll scope's container
@@ -117,38 +118,37 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
 
   private prefixCls?: string;
 
-  // Context
-  registerLink = (link: string) => {
-    if (!this.links.includes(link)) {
-      this.links.push(link);
-    }
-  };
-
-  unregisterLink = (link: string) => {
-    const index = this.links.indexOf(link);
-    if (index !== -1) {
-      this.links.splice(index, 1);
-    }
-  };
-
-  getContainer = () => {
-    const { getTargetContainer } = this.context;
-    const { getContainer } = this.props;
-
-    const getFunc = getContainer || getTargetContainer || getDefaultContainer;
-
-    return getFunc();
-  };
+  getChildContext() {
+    const antAnchor: AntAnchor = {
+      registerLink: (link: string) => {
+        if (!this.links.includes(link)) {
+          this.links.push(link);
+        }
+      },
+      unregisterLink: (link: string) => {
+        const index = this.links.indexOf(link);
+        if (index !== -1) {
+          this.links.splice(index, 1);
+        }
+      },
+      activeLink: this.state.activeLink,
+      scrollTo: this.handleScrollTo,
+      onClick: this.props.onClick,
+    };
+    return { antAnchor };
+  }
 
   componentDidMount() {
-    this.scrollContainer = this.getContainer();
+    const { getContainer } = this.props as AnchorDefaultProps;
+    this.scrollContainer = getContainer();
     this.scrollEvent = addEventListener(this.scrollContainer, 'scroll', this.handleScroll);
     this.handleScroll();
   }
 
   componentDidUpdate() {
     if (this.scrollEvent) {
-      const currentContainer = this.getContainer();
+      const { getContainer } = this.props as AnchorDefaultProps;
+      const currentContainer = getContainer();
       if (this.scrollContainer !== currentContainer) {
         this.scrollContainer = currentContainer;
         this.scrollEvent.remove();
@@ -178,7 +178,8 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
     }
 
     const linkSections: Array<Section> = [];
-    const container = this.getContainer();
+    const { getContainer } = this.props as AnchorDefaultProps;
+    const container = getContainer();
     this.links.forEach(link => {
       const sharpLinkMatch = sharpMatcherRegx.exec(link.toString());
       if (!sharpLinkMatch) {
@@ -204,10 +205,10 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
   }
 
   handleScrollTo = (link: string) => {
-    const { offsetTop, targetOffset } = this.props;
+    const { offsetTop, getContainer, targetOffset } = this.props as AnchorDefaultProps;
 
     this.setCurrentActiveLink(link);
-    const container = this.getContainer();
+    const container = getContainer();
     const scrollTop = getScroll(container, true);
     const sharpLinkMatch = sharpMatcherRegx.exec(link);
     if (!sharpLinkMatch) {
@@ -227,7 +228,7 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
       callback: () => {
         this.animating = false;
       },
-      getContainer: this.getContainer,
+      getContainer,
     });
   };
 
@@ -273,9 +274,7 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
     }
   };
 
-  render = () => {
-    const { getPrefixCls, direction } = this.context;
-
+  renderAnchor = ({ getPrefixCls }: ConfigConsumerProps) => {
     const {
       prefixCls: customizePrefixCls,
       className = '',
@@ -284,6 +283,7 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
       affix,
       showInkInFixed,
       children,
+      getContainer,
     } = this.props;
     const { activeLink } = this.state;
 
@@ -298,9 +298,7 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
       visible: activeLink,
     });
 
-    const wrapperClass = classNames(className, `${prefixCls}-wrapper`, {
-      [`${prefixCls}-rtl`]: direction === 'rtl',
-    });
+    const wrapperClass = classNames(className, `${prefixCls}-wrapper`);
 
     const anchorClass = classNames(prefixCls, {
       fixed: !affix && !showInkInFixed,
@@ -322,24 +320,16 @@ export default class Anchor extends React.Component<AnchorProps, AnchorState, Co
       </div>
     );
 
-    return (
-      <AnchorContext.Provider
-        value={{
-          registerLink: this.registerLink,
-          unregisterLink: this.unregisterLink,
-          activeLink: this.state.activeLink,
-          scrollTo: this.handleScrollTo,
-          onClick: this.props.onClick,
-        }}
-      >
-        {!affix ? (
-          anchorContent
-        ) : (
-          <Affix offsetTop={offsetTop} target={this.getContainer}>
-            {anchorContent}
-          </Affix>
-        )}
-      </AnchorContext.Provider>
+    return !affix ? (
+      anchorContent
+    ) : (
+      <Affix offsetTop={offsetTop} target={getContainer}>
+        {anchorContent}
+      </Affix>
     );
   };
+
+  render() {
+    return <ConfigConsumer>{this.renderAnchor}</ConfigConsumer>;
+  }
 }

components/anchor/AnchorLink.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
+import * as PropTypes from 'prop-types';
+import { polyfill } from 'react-lifecycles-compat';
 import classNames from 'classnames';
 import { AntAnchor } from './Anchor';
 import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
-import AnchorContext from './context';
 
 export interface AnchorLinkProps {
   prefixCls?: string;
@@ -13,33 +14,37 @@ export interface AnchorLinkProps {
   className?: string;
 }
 
-class AnchorLink extends React.Component<AnchorLinkProps, any, AntAnchor> {
+class AnchorLink extends React.Component<AnchorLinkProps, any> {
   static defaultProps = {
     href: '#',
   };
 
-  static contextType = AnchorContext;
+  static contextTypes = {
+    antAnchor: PropTypes.object,
+  };
 
-  context: AntAnchor;
+  context: {
+    antAnchor: AntAnchor;
+  };
 
   componentDidMount() {
-    this.context.registerLink(this.props.href);
+    this.context.antAnchor.registerLink(this.props.href);
   }
 
   componentDidUpdate({ href: prevHref }: AnchorLinkProps) {
     const { href } = this.props;
     if (prevHref !== href) {
-      this.context.unregisterLink(prevHref);
-      this.context.registerLink(href);
+      this.context.antAnchor.unregisterLink(prevHref);
+      this.context.antAnchor.registerLink(href);
     }
   }
 
   componentWillUnmount() {
-    this.context.unregisterLink(this.props.href);
+    this.context.antAnchor.unregisterLink(this.props.href);
   }
 
   handleClick = (e: React.MouseEvent<HTMLElement>) => {
-    const { scrollTo, onClick } = this.context;
+    const { scrollTo, onClick } = this.context.antAnchor;
     const { href, title } = this.props;
     if (onClick) {
       onClick(e, { title, href });
@@ -50,7 +55,7 @@ class AnchorLink extends React.Component<AnchorLinkProps, any, AntAnchor> {
   renderAnchorLink = ({ getPrefixCls }: ConfigConsumerProps) => {
     const { prefixCls: customizePrefixCls, href, title, children, className, target } = this.props;
     const prefixCls = getPrefixCls('anchor', customizePrefixCls);
-    const active = this.context.activeLink === href;
+    const active = this.context.antAnchor.activeLink === href;
     const wrapperClassName = classNames(className, `${prefixCls}-link`, {
       [`${prefixCls}-link-active`]: active,
     });
@@ -78,4 +83,6 @@ class AnchorLink extends React.Component<AnchorLinkProps, any, AntAnchor> {
   }
 }
 
+polyfill(AnchorLink);
+
 export default AnchorLink;

components/anchor/__tests__/Anchor.test.js

@@ -1,29 +1,27 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import Anchor from '..';
+import { spyElementPrototypes } from '../../__tests__/util/domHook';
 import { sleep } from '../../../tests/utils';
 
 const { Link } = Anchor;
 
 describe('Anchor Render', () => {
-  const getBoundingClientRectMock = jest.spyOn(
-    HTMLHeadingElement.prototype,
-    'getBoundingClientRect',
-  );
-  const getClientRectsMock = jest.spyOn(HTMLHeadingElement.prototype, 'getClientRects');
-
-  beforeAll(() => {
-    getBoundingClientRectMock.mockReturnValue({
-      width: 100,
-      height: 100,
-      top: 1000,
-    });
-    getClientRectsMock.mockReturnValue({ length: 1 });
+  const getBoundingClientRectMock = jest.fn(() => ({
+    width: 100,
+    height: 100,
+    top: 1000,
+  }));
+  const getClientRectsMock = jest.fn(() => ({
+    length: 1,
+  }));
+  const headingSpy = spyElementPrototypes(HTMLHeadingElement, {
+    getBoundingClientRect: getBoundingClientRectMock,
+    getClientRects: getClientRectsMock,
   });
 
   afterAll(() => {
-    getBoundingClientRectMock.mockRestore();
-    getClientRectsMock.mockRestore();
+    headingSpy.mockRestore();
   });
 
   it('Anchor render perfectly', () => {
@@ -49,28 +47,6 @@ describe('Anchor Render', () => {
     expect(wrapper.instance().state.activeLink).toBe('http://www.example.com/#API');
   });
 
-  it('Anchor render perfectly for complete href - hash router', async () => {
-    const scrollToSpy = jest.spyOn(window, 'scrollTo');
-    let root = document.getElementById('root');
-    if (!root) {
-      root = document.createElement('div', { id: 'root' });
-      root.id = 'root';
-      document.body.appendChild(root);
-    }
-    mount(<div id="/faq?locale=en#Q1">Q1</div>, { attachTo: root });
-    const wrapper = mount(
-      <Anchor>
-        <Link href="/#/faq?locale=en#Q1" title="Q1" />
-      </Anchor>,
-    );
-
-    wrapper.instance().handleScrollTo('/#/faq?locale=en#Q1');
-    expect(wrapper.instance().state.activeLink).toBe('/#/faq?locale=en#Q1');
-    expect(scrollToSpy).not.toHaveBeenCalled();
-    await sleep(1000);
-    expect(scrollToSpy).toHaveBeenCalled();
-  });
-
   it('Anchor render perfectly for complete href - scroll', () => {
     let root = document.getElementById('root');
     if (!root) {
@@ -96,7 +72,7 @@ describe('Anchor Render', () => {
       root.id = 'root';
       document.body.appendChild(root);
     }
-    mount(<div id="#API">Hello</div>, { attachTo: root });
+    mount(<div id="API">Hello</div>, { attachTo: root });
     const wrapper = mount(
       <Anchor>
         <Link href="##API" title="API" />
@@ -104,9 +80,9 @@ describe('Anchor Render', () => {
     );
     wrapper.instance().handleScrollTo('##API');
     expect(wrapper.instance().state.activeLink).toBe('##API');
-    const calls = scrollToSpy.mock.calls.length;
+    expect(scrollToSpy).not.toHaveBeenCalled();
     await sleep(1000);
-    expect(scrollToSpy.mock.calls.length).toBeGreaterThan(calls);
+    expect(scrollToSpy).toHaveBeenCalled();
   });
 
   it('should remove listener when unmount', async () => {
@@ -297,7 +273,9 @@ describe('Anchor Render', () => {
     expect(wrapper.instance().state.activeLink).toBe('#API2');
   });
 
-  it('Anchor targetOffset prop', async () => {
+  it('Anchor targetOffset prop', () => {
+    jest.useFakeTimers();
+
     let dateNowMock;
 
     function dataNowMockFn() {
@@ -326,22 +304,23 @@ describe('Anchor Render', () => {
       </Anchor>,
     );
     wrapper.instance().handleScrollTo('#API');
-    await sleep(30);
+    jest.runAllTimers();
     expect(scrollToSpy).toHaveBeenLastCalledWith(0, 1000);
     dateNowMock = dataNowMockFn();
 
     wrapper.setProps({ offsetTop: 100 });
     wrapper.instance().handleScrollTo('#API');
-    await sleep(30);
+    jest.runAllTimers();
     expect(scrollToSpy).toHaveBeenLastCalledWith(0, 900);
     dateNowMock = dataNowMockFn();
 
     wrapper.setProps({ targetOffset: 200 });
     wrapper.instance().handleScrollTo('#API');
-    await sleep(30);
+    jest.runAllTimers();
     expect(scrollToSpy).toHaveBeenLastCalledWith(0, 800);
 
     dateNowMock.mockRestore();
+    jest.useRealTimers();
   });
 
   it('Anchor onChange prop', async () => {

components/anchor/context.ts

@@ -1,6 +0,0 @@
-import * as React from 'react';
-import { AntAnchor } from './Anchor';
-
-const AnchorContext = React.createContext<AntAnchor>(null as any);
-
-export default AnchorContext;

components/anchor/demo/basic.md

@@ -13,7 +13,7 @@ title:
 
 The simplest usage.
 
-```tsx
+```jsx
 import { Anchor } from 'antd';
 
 const { Link } = Anchor;

components/anchor/demo/customizeHighlight.md

@@ -13,7 +13,7 @@ title:
 
 Customize the anchor highlight.
 
-```tsx
+```jsx
 import { Anchor } from 'antd';
 
 const { Link } = Anchor;

components/anchor/demo/onChange.md

@@ -13,12 +13,12 @@ title:
 
 Listening for anchor link change.
 
-```tsx
+```jsx
 import { Anchor } from 'antd';
 
 const { Link } = Anchor;
 
-const onChange = (link: string) => {
+const onChange = link => {
   console.log('Anchor:OnChange', link);
 };
 

components/anchor/demo/onClick.md

@@ -13,20 +13,14 @@ title:
 
 Clicking on an anchor does not record history.
 
-```tsx
+```jsx
 import { Anchor } from 'antd';
 
 const { Link } = Anchor;
 
-const handleClick = (
-    e: React.MouseEvent<HTMLElement>,
-    link: {
-      title: React.ReactNode;
-      href: string;
-    },
-  ) => {
-    e.preventDefault();
-    console.log(link);
+const handleClick = (e, link) => {
+  e.preventDefault();
+  console.log(link);
 };
 
 ReactDOM.render(

components/anchor/demo/static.md

@@ -13,7 +13,7 @@ title:
 
 Do not change state when page is scrolling.
 
-```tsx
+```jsx
 import { Anchor } from 'antd';
 
 const { Link } = Anchor;

components/anchor/demo/targetOffset.md

@@ -13,28 +13,35 @@ title:
 
 Anchor target scroll to screen center.
 
-```tsx
-import React, { useState, useEffect } from 'react';
+```jsx
 import { Anchor } from 'antd';
 
 const { Link } = Anchor;
 
-const AnchorExample: React.FC = () => {
-  const [targetOffset, setTargetOffset] = useState<number | undefined>(undefined);
-  useEffect(() => {
-    setTargetOffset(window.innerHeight / 2);
-  }, []);
-  return (
-    <Anchor targetOffset={targetOffset}>
-      <Link href="#components-anchor-demo-basic" title="Basic demo" />
-      <Link href="#components-anchor-demo-static" title="Static demo" />
-      <Link href="#API" title="API">
-        <Link href="#Anchor-Props" title="Anchor Props" />
-        <Link href="#Link-Props" title="Link Props" />
-      </Link>
-    </Anchor>
-  );
-};
+class AnchorExample extends React.Component {
+  state = {
+    targetOffset: undefined,
+  };
+
+  componentDidMount() {
+    this.setState({
+      targetOffset: window.innerHeight / 2,
+    });
+  }
+
+  render() {
+    return (
+      <Anchor targetOffset={this.state.targetOffset}>
+        <Link href="#components-anchor-demo-basic" title="Basic demo" />
+        <Link href="#components-anchor-demo-static" title="Static demo" />
+        <Link href="#API" title="API">
+          <Link href="#Anchor-Props" title="Anchor Props" />
+          <Link href="#Link-Props" title="Link Props" />
+        </Link>
+      </Anchor>
+    );
+  }
+}
 
 ReactDOM.render(<AnchorExample />, mountNode);
 ```

components/anchor/index.en-US.md

@@ -19,14 +19,14 @@ For displaying anchor hyperlinks on page and jumping between them.
 | --- | --- | --- | --- | --- |
 | affix | Fixed mode of Anchor | boolean | true |  |
 | bounds | Bounding distance of anchor area | number | 5(px) |  |
-| getContainer | Scrolling container | () => HTMLElement | () => window |  |
+| getContainer | Scrolling container | () => HTMLElement | () => window | 3.4.0 |
 | offsetBottom | Pixels to offset from bottom when calculating position of scroll | number | - |  |
 | offsetTop | Pixels to offset from top when calculating position of scroll | number | 0 |  |
 | showInkInFixed | Whether show ink-balls in Fixed mode | boolean | false |  |
-| onClick | set the handler to handle `click` event | Function(e: Event, link: Object) | - |  |
-| getCurrentAnchor | Customize the anchor highlight | () => string | - |  |
-| targetOffset | Anchor scroll offset, default as `offsetTop`, [example](#components-anchor-demo-targetOffset) | number | `offsetTop` |  |
-| onChange | Listening for anchor link change | (currentActiveLink: string) => void |  |  |
+| onClick | set the handler to handle `click` event | Function(e: Event, link: Object) | - | 3.9.0 |
+| getCurrentAnchor | Customize the anchor highlight | () => string | - | 3.22.0 |
+| targetOffset | Anchor scroll offset, default as `offsetTop`, [example](#components-anchor-demo-targetOffset) | number | `offsetTop` | 3.22.0 |
+| onChange | Listening for anchor link change | (currentActiveLink: string) => void |  | 3.24.0 |
 
 ### Link Props
 

components/anchor/index.zh-CN.md

@@ -20,14 +20,14 @@ title: Anchor
 | --- | --- | --- | --- | --- |
 | affix | 固定模式 | boolean | true |  |
 | bounds | 锚点区域边界 | number | 5(px) |  |
-| getContainer | 指定滚动的容器 | () => HTMLElement | () => window |  |
+| getContainer | 指定滚动的容器 | () => HTMLElement | () => window | 3.4.0 |
 | offsetBottom | 距离窗口底部达到指定偏移量后触发 | number |  |  |
 | offsetTop | 距离窗口顶部达到指定偏移量后触发 | number |  |  |
 | showInkInFixed | 固定模式是否显示小圆点 | boolean | false |  |
-| onClick | `click` 事件的 handler | Function(e: Event, link: Object) | - |  |
-| getCurrentAnchor | 自定义高亮的锚点 | () => string | - |  |
-| targetOffset | 锚点滚动偏移量，默认与 offsetTop 相同，[例子](#components-anchor-demo-targetOffset) | number | `offsetTop` |  |
-| onChange | 监听锚点链接改变 | (currentActiveLink: string) => void |  |  |
+| onClick | `click` 事件的 handler | Function(e: Event, link: Object) | - | 3.9.0 |
+| getCurrentAnchor | 自定义高亮的锚点 | () => string | - | 3.22.0 |
+| targetOffset | 锚点滚动偏移量，默认与 offsetTop 相同，[例子](#components-anchor-demo-targetOffset) | number | `offsetTop` | 3.22.0 |
+| onChange | 监听锚点链接改变 | (currentActiveLink: string) => void |  | 3.24.0 |
 
 ### Link Props
 

components/anchor/style/index.less

@@ -13,7 +13,7 @@
     margin-left: -4px;
     padding-left: 4px;
     overflow: auto;
-    background-color: @anchor-bg;
+    background-color: @component-background;
   }
 
   &-ink {
@@ -52,7 +52,7 @@
   }
 
   &-link {
-    padding: @anchor-link-padding;
+    padding: 7px 0 7px 16px;
     line-height: 1.143;
 
     &-title {
@@ -80,5 +80,3 @@
     padding-bottom: 5px;
   }
 }
-
-@import './rtl';

components/anchor/style/rtl.less

@@ -1,40 +0,0 @@
-@import '../../style/themes/index';
-@import '../../style/mixins/index';
-
-@anchor-border-width: 2px;
-
-.@{ant-prefix}-anchor {
-  &-rtl {
-    direction: rtl;
-  }
-
-  &-wrapper {
-    .@{ant-prefix}-anchor-rtl& {
-      margin-right: -4px;
-      margin-left: 0;
-      padding-right: 4px;
-      padding-left: 0;
-    }
-  }
-
-  &-ink {
-    .@{ant-prefix}-anchor-rtl & {
-      right: 0;
-      left: auto;
-    }
-
-    &-ball {
-      .@{ant-prefix}-anchor-rtl & {
-        right: 50%;
-        left: 0;
-        transform: translateX(50%);
-      }
-    }
-  }
-
-  &-link {
-    .@{ant-prefix}-anchor-rtl & {
-      padding: 7px 16px 7px 0;
-    }
-  }
-}

components/auto-complete/InputElement.tsx

@@ -0,0 +1,25 @@
+import * as React from 'react';
+
+export interface InputElementProps {
+  children: React.ReactElement<any>;
+}
+
+export default class InputElement extends React.Component<InputElementProps, any> {
+  saveRef = (ele: HTMLInputElement) => {
+    const { ref: childRef } = this.props.children as any;
+    if (typeof childRef === 'function') {
+      childRef(ele);
+    }
+  };
+
+  render() {
+    return React.cloneElement(
+      this.props.children,
+      {
+        ...this.props,
+        ref: this.saveRef,
+      },
+      null,
+    );
+  }
+}

components/auto-complete/__tests__/__snapshots__/index.test.js.snap

@@ -1,30 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AutoComplete with Custom Input Element Render rtl render component should be rendered correctly in RTL direction 1`] = `
-<div
-  class="ant-select ant-select-auto-complete ant-select-rtl ant-select-single ant-select-show-search"
->
-  <div
-    class="ant-select-selector"
-  >
-    <span
-      class="ant-select-selection-search"
-    >
-      <input
-        aria-activedescendant="undefined_list_0"
-        aria-autocomplete="list"
-        aria-controls="undefined_list"
-        aria-haspopup="listbox"
-        aria-owns="undefined_list"
-        autocomplete="off"
-        class="ant-select-selection-search-input"
-        role="combobox"
-        value=""
-      />
-    </span>
-    <span
-      class="ant-select-selection-placeholder"
-    />
-  </div>
-</div>
-`;

components/auto-complete/__tests__/focus.test.js

@@ -1,6 +1,11 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import AutoComplete from '..';
+import focusTest from '../../../tests/shared/focusTest';
+
+describe('AutoComplete could be focus', () => {
+  focusTest(AutoComplete);
+});
 
 describe('AutoComplete children could be focus', () => {
   beforeAll(() => {
@@ -62,11 +67,7 @@ describe('AutoComplete children could be focus', () => {
     let inputRef;
     mount(
       <AutoComplete dataSource={[]}>
-        <input
-          ref={node => {
-            inputRef = node;
-          }}
-        />
+        <input ref={node => { inputRef = node; }} />
       </AutoComplete>,
     );
     expect(typeof inputRef.focus).toBe('function');

components/auto-complete/__tests__/index.test.js

@@ -2,11 +2,9 @@ import React from 'react';
 import { mount } from 'enzyme';
 import AutoComplete from '..';
 import mountTest from '../../../tests/shared/mountTest';
-import rtlTest from '../../../tests/shared/rtlTest';
 
 describe('AutoComplete with Custom Input Element Render', () => {
   mountTest(AutoComplete);
-  rtlTest(AutoComplete);
 
   it('AutoComplete with custom Input render perfectly', () => {
     const wrapper = mount(
@@ -17,27 +15,34 @@ describe('AutoComplete with Custom Input Element Render', () => {
 
     expect(wrapper.find('textarea').length).toBe(1);
     wrapper.find('textarea').simulate('change', { target: { value: '123' } });
+    const dropdownWrapper = mount(
+      wrapper
+        .find('Trigger')
+        .instance()
+        .getComponent(),
+    );
 
     // should not filter data source defaultly
-    expect(wrapper.find('.ant-select-item-option').length).toBe(3);
+    expect(dropdownWrapper.find('MenuItem').length).toBe(3);
   });
 
   it('AutoComplete should work when dataSource is object array', () => {
     const wrapper = mount(
-      <AutoComplete
-        dataSource={[
-          { text: 'text', value: 'value' },
-          { text: 'abc', value: 'xxx' },
-        ]}
-      >
+      <AutoComplete dataSource={[{ text: 'text', value: 'value' }, { text: 'abc', value: 'xxx' }]}>
         <input />
       </AutoComplete>,
     );
     expect(wrapper.find('input').length).toBe(1);
     wrapper.find('input').simulate('change', { target: { value: 'a' } });
+    const dropdownWrapper = mount(
+      wrapper
+        .find('Trigger')
+        .instance()
+        .getComponent(),
+    );
 
     // should not filter data source defaultly
-    expect(wrapper.find('.ant-select-item-option').length).toBe(2);
+    expect(dropdownWrapper.find('MenuItem').length).toBe(2);
   });
 
   it('AutoComplete throws error when contains invalid dataSource', () => {

components/auto-complete/demo/basic.md

@@ -7,58 +7,61 @@ title:
 
 ## zh-CN
 
-基本使用。通过 options 设置自动完成的数据源
+基本使用。通过 dataSource 设置自动完成的数据源
 
 ## en-US
 
-Basic Usage, set data source of autocomplete with `options` property.
+Basic Usage, set data source of autocomplete with `dataSource` property.
 
-```tsx
-import React, { useState } from 'react';
+```jsx
 import { AutoComplete } from 'antd';
 
-const mockVal = (str: string, repeat: number = 1) => {
-  return {
-    value: str.repeat(repeat),
+function onSelect(value) {
+  console.log('onSelect', value);
+}
+
+class Complete extends React.Component {
+  state = {
+    value: '',
+    dataSource: [],
   };
-};
-const Complete: React.FC = () => {
-  const [value, setValue] = useState('');
-  const [options, setOptions] = useState<{ value: string }[]>([]);
-  const onSearch = (searchText: string) => {
-    setOptions(
-      !searchText ? [] : [mockVal(searchText), mockVal(searchText, 2), mockVal(searchText, 3)],
+
+  onSearch = searchText => {
+    this.setState({
+      dataSource: !searchText ? [] : [searchText, searchText.repeat(2), searchText.repeat(3)],
+    });
+  };
+
+  onChange = value => {
+    this.setState({ value });
+  };
+
+  render() {
+    const { dataSource, value } = this.state;
+    return (
+      <div>
+        <AutoComplete
+          dataSource={dataSource}
+          style={{ width: 200 }}
+          onSelect={onSelect}
+          onSearch={this.onSearch}
+          placeholder="input here"
+        />
+        <br />
+        <br />
+        <AutoComplete
+          value={value}
+          dataSource={dataSource}
+          style={{ width: 200 }}
+          onSelect={onSelect}
+          onSearch={this.onSearch}
+          onChange={this.onChange}
+          placeholder="control mode"
+        />
+      </div>
     );
-  };
-  const onSelect = (data: string) => {
-    console.log('onSelect', data);
-  };
-  const onChange = (data: string) => {
-    setValue(data);
-  };
-  return (
-    <div>
-      <AutoComplete
-        options={options}
-        style={{ width: 200 }}
-        onSelect={onSelect}
-        onSearch={onSearch}
-        placeholder="input here"
-      />
-      <br />
-      <br />
-      <AutoComplete
-        value={value}
-        options={options}
-        style={{ width: 200 }}
-        onSelect={onSelect}
-        onSearch={onSearch}
-        onChange={onChange}
-        placeholder="control mode"
-      />
-    </div>
-  );
-};
+  }
+}
 
 ReactDOM.render(<Complete />, mountNode);
 ```

components/auto-complete/demo/certain-category.md

@@ -11,13 +11,52 @@ title:
 
 ## en-US
 
-Demonstration of [Lookup Patterns: Certain Category](https://ant.design/docs/spec/reaction#Lookup-Patterns). Basic Usage, set options of autocomplete with `options` property.
+Demonstration of [Lookup Patterns: Certain Category](https://ant.design/docs/spec/reaction#Lookup-Patterns). Basic Usage, set datasource of autocomplete with `dataSource` property.
 
-```tsx
-import { Input, AutoComplete } from 'antd';
-import { UserOutlined } from '@ant-design/icons';
+```jsx
+import { Icon, Input, AutoComplete } from 'antd';
 
-const renderTitle = (title: string) => {
+const { Option, OptGroup } = AutoComplete;
+
+const dataSource = [
+  {
+    title: 'Libraries',
+    children: [
+      {
+        title: 'AntDesign',
+        count: 10000,
+      },
+      {
+        title: 'AntDesign UI',
+        count: 10600,
+      },
+    ],
+  },
+  {
+    title: 'Solutions',
+    children: [
+      {
+        title: 'AntDesign UI',
+        count: 60100,
+      },
+      {
+        title: 'AntDesign',
+        count: 30010,
+      },
+    ],
+  },
+  {
+    title: 'Articles',
+    children: [
+      {
+        title: 'AntDesign design language',
+        count: 100000,
+      },
+    ],
+  },
+];
+
+function renderTitle(title) {
   return (
     <span>
       {title}
@@ -31,59 +70,55 @@ const renderTitle = (title: string) => {
       </a>
     </span>
   );
-};
+}
 
-const renderItem = (title: string, count: number) => {
-  return {
-    value: title,
-    label: (
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-        }}
-      >
-        {title}
-        <span>
-          <UserOutlined /> {count}
-        </span>
-      </div>
-    ),
-  };
-};
+const options = dataSource
+  .map(group => (
+    <OptGroup key={group.title} label={renderTitle(group.title)}>
+      {group.children.map(opt => (
+        <Option key={opt.title} value={opt.title}>
+          {opt.title}
+          <span className="certain-search-item-count">{opt.count} people</span>
+        </Option>
+      ))}
+    </OptGroup>
+  ))
+  .concat([
+    <Option disabled key="all" className="show-all">
+      <a href="https://www.google.com/search?q=antd" target="_blank" rel="noopener noreferrer">
+        View all results
+      </a>
+    </Option>,
+  ]);
 
-const options = [
-  {
-    label: renderTitle('Libraries'),
-    options: [renderItem('AntDesign', 10000), renderItem('AntDesign UI', 10600)],
-  },
-  {
-    label: renderTitle('Solutions'),
-    options: [renderItem('AntDesign UI FAQ', 60100), renderItem('AntDesign FAQ', 30010)],
-  },
-  {
-    label: renderTitle('Articles'),
-    options: [renderItem('AntDesign design language', 100000)],
-  },
-];
-
-const Complete: React.FC = () => {
+function Complete() {
   return (
-    <AutoComplete
-      dropdownClassName="certain-category-search-dropdown"
-      dropdownMatchSelectWidth={500}
-      style={{ width: 250 }}
-      options={options}
-    >
-      <Input.Search size="large" placeholder="input here" />
-    </AutoComplete>
+    <div className="certain-category-search-wrapper" style={{ width: 250 }}>
+      <AutoComplete
+        className="certain-category-search"
+        dropdownClassName="certain-category-search-dropdown"
+        dropdownMatchSelectWidth={false}
+        dropdownStyle={{ width: 300 }}
+        size="large"
+        style={{ width: '100%' }}
+        dataSource={options}
+        placeholder="input here"
+        optionLabelProp="value"
+      >
+        <Input suffix={<Icon type="search" className="certain-category-icon" />} />
+      </AutoComplete>
+    </div>
   );
-};
+}
 
 ReactDOM.render(<Complete />, mountNode);
 ```
 
 ```css
+.certain-category-search.ant-select-auto-complete .ant-input-affix-wrapper .ant-input-suffix {
+  right: 12px;
+}
+
 .certain-category-search-dropdown .ant-select-dropdown-menu-item-group-title {
   color: #666;
   font-weight: bold;
@@ -105,4 +140,20 @@ ReactDOM.render(<Complete />, mountNode);
 .certain-category-search-dropdown .ant-select-dropdown-menu {
   max-height: 300px;
 }
+
+.certain-search-item-count {
+  position: absolute;
+  color: #999;
+  right: 16px;
+}
+
+.certain-category-search.ant-select-focused .certain-category-icon {
+  color: #108ee9;
+}
+
+.certain-category-icon {
+  color: #6e6e6e;
+  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  font-size: 16px;
+}
 ```