merge master

.eslintignore

@@ -4,7 +4,6 @@ components/*/__tests__/type.tsx
 !components/*/__tests__/**/*.js
 !components/*/demo/*
 !.*.js
-
 # Docs templates
 site/theme/template/IconDisplay/*.js
 site/theme/template/IconDisplay/*.jsx

.eslintrc.js

@@ -14,33 +14,18 @@ const eslintrc = {
     'babel',
   ],
   rules: {
-    'func-names': 0,
-    'arrow-body-style': 0,
-    'react/sort-comp': 0,
-    'react/prop-types': 0,
-    'react/jsx-first-prop-new-line': 0,
     'react/jsx-one-expression-per-line': 0,
+    'react/prop-types': 0,
     'react/forbid-prop-types': 0,
+    'import/no-extraneous-dependencies': ['error', {
+      devDependencies: ['site/**', 'tests/**', 'scripts/**', '**/*.test.js', '**/__tests__/*', '*.config.js', '**/*.md'],
+    }],
     'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx', '.md'] }],
-    'import/extensions': 0,
-    'import/no-unresolved': 0,
-    'import/no-extraneous-dependencies': 0,
-    'prefer-destructuring': 0,
-    'no-param-reassign': 0,
-    'no-return-assign': 0,
-    'max-len': 0,
-    'consistent-return': 0,
-    'no-redeclare': 0,
-    'react/require-extension': 0,
     'jsx-a11y/no-static-element-interactions': 0,
     'jsx-a11y/anchor-has-content': 0,
     'jsx-a11y/click-events-have-key-events': 0,
     'jsx-a11y/anchor-is-valid': 0,
-    'react/no-danger': 0,
     'comma-dangle': ['error', 'always-multiline'],
-    'function-paren-newline': 0,
-    'object-curly-newline': 0,
-    'no-restricted-globals': 0,
   },
 };
 
@@ -61,9 +46,13 @@ if (process.env.RUN_ENV === 'DEMO') {
     'react/no-access-state-in-setstate': 0,
     'react/destructuring-assignment': 0,
     'react/no-multi-comp': 0,
-    'react/prefer-stateless-function': 0,
     'jsx-a11y/href-no-hash': 0,
-    'import/newline-after-import': 0,
+    'prefer-destructuring': 0, // TODO: remove later
+    'max-len': 0, // TODO: remove later
+    'consistent-return': 0, // TODO: remove later
+    'no-return-assign': 0, // TODO: remove later
+    'no-param-reassign': 0, // TODO: remove later
+    'import/no-extraneous-dependencies': 0,
   });
 }
 

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,13 @@
 <!--
- ⚠️ ⚠️ ⚠️  IMPORTANT: Please use the following link to create a new issue:
+ ⚠️ ⚠️ ⚠️  IMPORTANT: Please use the following link to create a new issue: ⚠️ ⚠️ ⚠️
 
   http://new-issue.ant.design
 
 If your issue was not created using the app above, it will be closed immediately.
 -->
 
 <!--
- ⚠️ ⚠️ ⚠️  注意：请使用下面的链接来新建 issue：
+ ⚠️ ⚠️ ⚠️  注意：请使用下面的链接来新建 issue： ⚠️ ⚠️ ⚠️
 
   http://new-issue.ant.design
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,12 @@
 First of all, thank you for your contribution! :-)
 
-Please makes sure that these checkboxes are checked before submitting your PR, thank you!
+Please makes sure that these checkboxes are checked before submitting your pull request, thank you!
 
-* [ ] Make sure that you propose PR to right branch: bugfix for `master`, feature for branch `feature`.
+* [ ] Make sure that you propose pull request to right branch: bugfix for `master`, feature for branch `feature`.
 * [ ] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
 * [ ] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
-* [ ] Rebase before creating a PR to keep commit history clear.
-* [ ] Add some descriptions and refer relative issues for you PR.
+* [ ] Rebase before creating a pull request to keep commit history clear.
+* [ ] Add some descriptions and refer relative issues for you pull request.
 
 Extra checklist:
 

.gitignore

@@ -38,8 +38,8 @@ components/**/*.jsx
 !components/**/__tests__/*.js
 !components/**/__tests__/*.js.snap
 /.history
-
 # Docs templates
 site/theme/template/IconDisplay/*.js
 site/theme/template/IconDisplay/*.jsx
 site/theme/template/IconDisplay/fields.js
+*.tmp

.jest.js

@@ -31,7 +31,7 @@ module.exports = {
     '\\.js$': './node_modules/antd-tools/lib/jest/codePreprocessor',
     '\\.md$': './node_modules/antd-tools/lib/jest/demoPreprocessor',
   },
-  testRegex: libDir === 'dist' ? 'demo\\.test\\.js$' : '.*\\.test\\.js$',
+  testRegex: `${libDir === 'dist' ? 'demo' : '.*'}\\.test\\.js$`,
   collectCoverageFrom: [
     'components/**/*.{ts,tsx}',
     '!components/*/style/index.tsx',

.jest.node.js

@@ -1,3 +1,4 @@
+// jest config for server render environment
 module.exports = {
   setupFiles: [
     './tests/setup.js',

.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 language: node_js
 
 node_js:
-  - 10
+  - 11
 
 cache:
   directories:

AUTHORS.txt

@@ -75,6 +75,7 @@ Cordaro <[email protected]>
 D & R <[email protected]>
 Daewoong Moon <[email protected]>
 Damian Green <[email protected]>
+Damian Green <[email protected]>
 Dan Minshew <[email protected]>
 Dane David <[email protected]>
 Daniel Gomez <[email protected]>
@@ -201,6 +202,7 @@ Knacktus <[email protected]>
 Kyle Kelley <[email protected]>
 Kyle Rosenberg <[email protected]>
 LLinFan- <[email protected]>
+Laith <[email protected]>
 Larry Laski <[email protected]>
 LeeHarlan <[email protected]>
 LeezQ <[email protected]>
@@ -390,6 +392,7 @@ afc163 <[email protected]>
 agent-z <[email protected]>
 ahalimkara <[email protected]>
 alex <[email protected]>
+arifemrecelik <[email protected]>
 ascoders <[email protected]>
 ashishg-qburst <[email protected]>
 bLue <[email protected]>
@@ -431,6 +434,7 @@ ezpub <[email protected]>
 feng zhi hao <[email protected]>
 fengmk2 <[email protected]>
 flashback313 <[email protected]>
+frezc <[email protected]>
 genie <[email protected]>
 gregahren <[email protected]>
 guifu <[email protected]>
@@ -546,6 +550,7 @@ snail <[email protected]>
 sojournerc <[email protected]>
 sorrycc <[email protected]>
 sosohime <[email protected]>
+spideeee <[email protected]>
 stickmy <[email protected]>
 swindme <[email protected]>
 syssam <[email protected]>

CHANGELOG.en-US.md

@@ -19,13 +19,13 @@ timeline: true
 
 `2018-11-24`
 
-- 🌟 Checkbox provides status css class.[#13199](https://github.com/ant-design/ant-design/issues/13199) [@walker27](https://github.com/walker27)
-- 🐞 Fix TimePicker input exceeds the boundary of container.[#13194](https://github.com/ant-design/ant-design/issues/13194)
-- 🌟 Adjust Table sort order from desc -> asc to asc -> desc.[#13069](https://github.com/ant-design/ant-design/pull/13069) [@OvestLabs](https://github.com/OvestLabs)
-- 🐞 Fix Switch can be operated when loading.[#13219](https://github.com/ant-design/ant-design/pull/13219) [@jojoLockLock](https://github.com/jojoLockLock)
-- 🐞 Fix Carousel can not be interactive in fade mode.[#13215](https://github.com/ant-design/ant-design/issues/13215)
-- 🌟 DatePicker add `tabIndex` prop.[#13265](https://github.com/ant-design/ant-design/pull/13265) [@arifemrecelik](https://github.com/arifemrecelik)
-- 🌟 TreeSelect do not call `loadData` when searching.[#13245](https://github.com/ant-design/ant-design/issues/13245)
+- 🐞 Fix disabled Checkbox label cursor style. [#13199](https://github.com/ant-design/ant-design/issues/13199) [@walker27](https://github.com/walker27)
+- 🐞 Fix TimePicker input exceeds the boundary of container. [#13194](https://github.com/ant-design/ant-design/issues/13194)
+- 🌟 Adjust Table sort order from `desc -> asc` to `asc -> desc`. [#13069](https://github.com/ant-design/ant-design/pull/13069) [@OvestLabs](https://github.com/OvestLabs)
+- 🐞 Fix Switch can be operated when loading. [#13219](https://github.com/ant-design/ant-design/pull/13219) [@jojoLockLock](https://github.com/jojoLockLock)
+- 🐞 Fix Carousel can not be interactive in fade mode. [#13215](https://github.com/ant-design/ant-design/issues/13215)
+- 🐞 Fix DatePicker don't support `tabIndex` prop. [#13265](https://github.com/ant-design/ant-design/pull/13265) [@arifemrecelik](https://github.com/arifemrecelik)
+- 🐞 TreeSelect won't call `loadData` when searching to avoid lagging problem. [#13245](https://github.com/ant-design/ant-design/issues/13245)
 
 # 3.10.8
 

CHANGELOG.zh-CN.md

@@ -19,13 +19,13 @@ timeline: true
 
 `2018-11-24`
 
-- 🌟 Checkbox 添加状态相关 css class。[#13199](https://github.com/ant-design/ant-design/issues/13199) [@walker27](https://github.com/walker27)
+- 🐞 修复 Checkbox 标签名鼠标失效样式没有生效的问题。[#13199](https://github.com/ant-design/ant-design/issues/13199) [@walker27](https://github.com/walker27)
 - 🐞 修复 TimePicker 输入框超出边界的样式问题。[#13194](https://github.com/ant-design/ant-design/issues/13194)
 - 🌟 Table 排序调整为先升序后降序。[#13069](https://github.com/ant-design/ant-design/pull/13069) [@OvestLabs](https://github.com/OvestLabs)
 - 🐞 修复 loading 状态下，Switch 仍然可以被操作的问题。[#13219](https://github.com/ant-design/ant-design/pull/13219) [@jojoLockLock](https://github.com/jojoLockLock)
 - 🐞 修复 Carousel 组件渐显效果下轮播区域无法点击的问题。[#13215](https://github.com/ant-design/ant-design/issues/13215)
-- 🌟 DatePicker 添加 `tabIndex` 支持。[#13265](https://github.com/ant-design/ant-design/pull/13265) [@arifemrecelik](https://github.com/arifemrecelik)
-- 🌟 TreeSelect 现在在搜索时不再调用 `loadData` 以避免卡死。[#13245](https://github.com/ant-design/ant-design/issues/13245)
+- 🐞 修复 DatePicker 对 `tabIndex` 属性的支持。[#13265](https://github.com/ant-design/ant-design/pull/13265) [@arifemrecelik](https://github.com/arifemrecelik)
+- 🐞 TreeSelect 现在在搜索时不再调用 `loadData` 以避免卡死。[#13245](https://github.com/ant-design/ant-design/issues/13245)
 
 # 3.10.8
 

CODE_OF_CONDUCT.md

@@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version].
 
 [homepage]: http://contributor-covenant.org
 [version]: http://contributor-covenant.org/version/1/4/

LICENSE

@@ -1,6 +1,6 @@
 MIT LICENSE
 
-Copyright (c) 2015-present Alipay.com, https://www.alipay.com/
+Copyright (c) 2015-present Ant UED, https://xtech.antfin.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README-zh_CN.md

@@ -79,11 +79,11 @@ import 'antd/dist/antd.css';  // or 'antd/dist/antd.less'
 - [组件库](http://ant.design/docs/react/introduce)
 - [Ant Design Pro](http://pro.ant.design/)
 - [更新日志](CHANGELOG.en-US.md)
-- [脚手架市场](http://scaffold.ant.design)
 - [React 底层基础组件](http://react-component.github.io/)
 - [移动端组件](http://mobile.ant.design)
+- [首页模板集](https://landing.ant.design)
 - [动效](https://motion.ant.design)
-- [Landing 模板集](https://landing.ant.design)
+- [脚手架市场](http://scaffold.ant.design)
 - [设计规范速查手册](https://github.com/ant-design/ant-design/wiki/Ant-Design-%E8%AE%BE%E8%AE%A1%E5%9F%BA%E7%A1%80%E7%AE%80%E7%89%88)
 - [开发者说明](https://github.com/ant-design/ant-design/wiki/Development)
 - [版本发布规则](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)

README.md

@@ -79,11 +79,11 @@ See [i18n](http://ant.design/docs/react/i18n).
 - [Components](http://ant.design/docs/react/introduce)
 - [Ant Design Pro](http://pro.ant.design/)
 - [Change Log](CHANGELOG.en-US.md)
-- [Scaffold Market](http://scaffold.ant.design)
 - [rc-components](http://react-component.github.io/)
 - [Mobile UI](http://mobile.ant.design)
+- [Landing Pages](https://landing.ant.design)
 - [Motion](https://motion.ant.design)
-- [Landing Templates](https://landing.ant.design)
+- [Scaffold Market](http://scaffold.ant.design)
 - [Developer Instruction](https://github.com/ant-design/ant-design/wiki/Development)
 - [Versioning Release Note](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)

components/affix/__tests__/Affix.test.js

@@ -12,9 +12,7 @@ class AffixMounter extends React.Component {
     });
   }
 
-  getTarget = () => {
-    return this.container;
-  }
+  getTarget = () => this.container
 
   render() {
     return (
@@ -34,7 +32,7 @@ class AffixMounter extends React.Component {
         >
           <Affix
             target={() => this.container}
-            ref={ele => this.affix = ele}
+            ref={(ele) => { this.affix = ele; }}
             {...this.props}
           >
             <Button type="primary">
@@ -59,11 +57,9 @@ describe('Affix Render', () => {
   });
 
   const scrollTo = (top) => {
-    wrapper.instance().affix.fixedNode.parentNode.getBoundingClientRect = jest.fn(() => {
-      return {
-        bottom: 100, height: 28, left: 0, right: 0, top: 50 - top, width: 195,
-      };
-    });
+    wrapper.instance().affix.fixedNode.parentNode.getBoundingClientRect = jest.fn(() => ({
+      bottom: 100, height: 28, left: 0, right: 0, top: 50 - top, width: 195,
+    }));
     wrapper.instance().container.scrollTop = top;
     events.scroll({
       type: 'scroll',

components/alert/demo/banner.md

@@ -27,5 +27,6 @@ ReactDOM.render(
     <br />
     <Alert type="error" message="Error text" banner />
   </div>,
-  mountNode);
+  mountNode
+);
 ````

components/alert/demo/basic.md

@@ -18,7 +18,8 @@ import { Alert } from 'antd';
 
 ReactDOM.render(
   <Alert message="Success Text" type="success" />,
-  mountNode);
+  mountNode
+);
 ````
 
 <style>

components/alert/demo/closable.md

@@ -16,7 +16,7 @@ To show close button.
 ````jsx
 import { Alert } from 'antd';
 
-const onClose = function (e) {
+const onClose = (e) => {
   console.log(e, 'I was closed.');
 };
 
@@ -36,5 +36,6 @@ ReactDOM.render(
       onClose={onClose}
     />
   </div>,
-  mountNode);
+  mountNode
+);
 ````

components/alert/demo/close-text.md

@@ -18,5 +18,6 @@ import { Alert } from 'antd';
 
 ReactDOM.render(
   <Alert message="Info Text" type="info" closeText="Close Now" />,
-  mountNode);
+  mountNode
+);
 ````

components/alert/demo/custom-icon.md

@@ -55,5 +55,6 @@ ReactDOM.render(
       showIcon
     />
   </div>,
-  mountNode);
+  mountNode
+);
 ````

components/alert/demo/description.md

@@ -39,5 +39,6 @@ ReactDOM.render(
       type="error"
     />
   </div>,
-  mountNode);
+  mountNode
+);
 ````

components/alert/demo/icon.md

@@ -47,5 +47,6 @@ ReactDOM.render(
       showIcon
     />
   </div>,
-  mountNode);
+  mountNode
+);
 ````

components/alert/demo/smooth-closed.md

@@ -46,5 +46,6 @@ class App extends React.Component {
 
 ReactDOM.render(
   <App />,
-  mountNode);
+  mountNode
+);
 ````

components/alert/demo/style.md

@@ -23,5 +23,6 @@ ReactDOM.render(
     <Alert message="Warning Text" type="warning" />
     <Alert message="Error Text" type="error" />
   </div>,
-  mountNode);
+  mountNode
+);
 ````

components/anchor/__tests__/Anchor.test.js

@@ -92,7 +92,7 @@ describe('Anchor Render', () => {
     let anchorInstance = null;
     function AnchorUpdate({ href }) {
       return (
-        <Anchor ref={c => anchorInstance = c}>
+        <Anchor ref={(c) => { anchorInstance = c; }}>
           <Link href={href} title="API" />
         </Anchor>
       );
@@ -107,7 +107,7 @@ describe('Anchor Render', () => {
   it('Anchor onClick event', () => {
     let event;
     let link;
-    const handleClick = (...arg) => ([event, link] = arg);
+    const handleClick = (...arg) => { [event, link] = arg; };
 
     const href = '#API';
     const title = 'API';

components/anchor/demo/basic.md

@@ -27,7 +27,8 @@ ReactDOM.render(
       <Link href="#Link-Props" title="Link Props" />
     </Link>
   </Anchor>,
-  mountNode);
+  mountNode
+);
 ```
 
 <style>