Merge pull request #18852 from ant-design/master

chore: merge master into feature
2024-11-24 11:10:01 +08:00 · 2019-09-17 02:40:54 -04:00 · 2019-09-17 02:40:54 -04:00 · 0f3f3dc521
commit 0f3f3dc521
parent 8846122060 7404a7ea32
22 changed files with 136 additions and 24 deletions
--- a/.github/workflows/deploy-site.yml
+++ b/.github/workflows/deploy-site.yml
@ -1,10 +1,10 @@
 name: Deploy website
 on:
  release:
-    actions:
-      - published
+    types: [published]
    branches:
      - master
+
 jobs:
  build-and-deploy:
    runs-on: ubuntu-latest
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@ -15,6 +15,21 @@ timeline: true

 ---

+## 3.23.3
+
+`2019-09-16`
+
+- 🐞 Fix ConfigProvider `locale` not working with Modal in some situation. [#18732](https://github.com/ant-design/ant-design/pull/18732)
+- 🐞 Fix Avatar extrusion style when using long pictures. [#18768](https://github.com/ant-design/ant-design/pull/18768) [@Eusen](https://github.com/Eusen)
+- 🐞 Fix InputNumber active border style. [#18791](https://github.com/ant-design/ant-design/pull/18791) [@escorponox](https://github.com/escorponox)
+- 🐞 Fix Input.Search not trigger `onSearch` when click clear icon. [#18783](https://github.com/ant-design/ant-design/pull/18783)
+- 🐞 Fix text color of Button inside Menu. [#18820](https://github.com/ant-design/ant-design/pull/18820)
+- 🐞 Fix `size="small"` Table header missing right border. [#18821](https://github.com/ant-design/ant-design/pull/18821)
+- ⌨️ Enhance accessibility of Alert close button. [#18750](https://github.com/ant-design/ant-design/pull/18750) [@MrHeer](https://github.com/MrHeer)
+- 💄 Tweak Button `type="link"` should not insert space. [#18724](https://github.com/ant-design/ant-design/pull/18724)
+- TypeScript
+  - 🐞 Fix type definition of `onMouseEnter` and `onMouseLeave` for Tree. [#18796](https://github.com/ant-design/ant-design/pull/18796) [@MrHeer](https://github.com/MrHeer)
+
 ## 3.23.2

 `2019-09-06`
@ -25,7 +40,7 @@ timeline: true
 - 🐞 Fix Icon that `component` and `children` prop should have priority over `type` prop. [#18592](https://github.com/ant-design/ant-design/pull/18592)
 - 🐞 Fix Layout.Sider boundary values for max-width. [#18553](https://github.com/ant-design/ant-design/pull/18553) [@Nikitenkova](https://github.com/Nikitenkova)
 - 🐞 Fix PageHeader that back icon can't coexist with breadcrumb. [#18691](https://github.com/ant-design/ant-design/pull/18691)
- 🗑Deprecated Select `inputValue` prop and use `searchValue` instead. [#18629](https://github.com/ant-design/ant-design/pull/18629)
+- 🗑 Deprecated Select `inputValue` prop and use `searchValue` instead. [#18629](https://github.com/ant-design/ant-design/pull/18629)
 - TypeScript
  - 🐞 Fix type definition of `status` for Result. [#18445](https://github.com/ant-design/ant-design/pull/18445)
  - 🐞 Fix type definition of `target` for Anchor.Link. [#18646](https://github.com/ant-design/ant-design/pull/18646)
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@ -15,6 +15,21 @@ timeline: true

 ---

+## 3.23.3
+
+`2019-09-16`
+
+- 🐞 修复 ConfigProvider `locale` 国际化在某些场景下对 Modal 不生效的问题。[#18732](https://github.com/ant-design/ant-design/pull/18732)
+- 🐞 修复 Avatar 长图片时被挤压的样式问题。[#18768](https://github.com/ant-design/ant-design/pull/18768) [@Eusen](https://github.com/Eusen)
+- 🐞 修复 InputNumber 高亮边框的样式问题。[#18791](https://github.com/ant-design/ant-design/pull/18791) [@escorponox](https://github.com/escorponox)
+- 🐞 修复 Input.Search 点击清除图标时没有触发 `onSearch` 的问题。[#18783](https://github.com/ant-design/ant-design/pull/18783)
+- 🐞 修复 Menu 内的 Button 字体颜色。[#18820](https://github.com/ant-design/ant-design/pull/18820)
+- 🐞 修复 Table `size="small"` 时丢失列头右边框的问题。[#18821](https://github.com/ant-design/ant-design/pull/18821)
+- ⌨️ 增强 Alert 关闭按钮的可访问性。[#18750](https://github.com/ant-design/ant-design/pull/18750) [@MrHeer](https://github.com/MrHeer)
+- 💄 优化 Button 类型为 `link` 时，中文字符之间不再自动插入空格。[#18724](https://github.com/ant-design/ant-design/pull/18724)
+- TypeScript
+  - 🐞 修复 Tree 中 `onMouseEnter` 和 `onMouseLeave` 类型。[#18796](https://github.com/ant-design/ant-design/pull/18796) [@MrHeer](https://github.com/MrHeer)
+
 ## 3.23.2

 `2019-09-06`
--- a/components/_util/responsiveObserve.ts
+++ b/components/_util/responsiveObserve.ts
@ -2,6 +2,7 @@
 // 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 {
@ -11,7 +12,8 @@ if (typeof window !== 'undefined') {
      removeListener() {},
    };
  };
-  window.matchMedia = window.matchMedia || matchMediaPolyfill;
+  // 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');
 }
--- a/components/alert/style/index.less
+++ b/components/alert/style/index.less
@ -74,8 +74,8 @@
    overflow: hidden;
    font-size: @font-size-sm;
    line-height: 22px;
-    border: none;
    background-color: transparent;
+    border: none;
    cursor: pointer;

    .@{iconfont-css-prefix}-close {
--- a/components/carousel/index.tsx
+++ b/components/carousel/index.tsx
@ -6,6 +6,7 @@ import warning from '../_util/warning';

 // matchMedia polyfill for
 // https://github.com/WickyNilliams/enquire.js/issues/82
+// TODO: Will be removed in antd 4.0 because we will no longer support ie9
 if (typeof window !== 'undefined') {
  const matchMediaPolyfill = (mediaQuery: string) => {
    return {
@ -15,7 +16,8 @@ if (typeof window !== 'undefined') {
      removeListener() {},
    };
  };
-  window.matchMedia = window.matchMedia || matchMediaPolyfill;
+  // ref: https://github.com/ant-design/ant-design/issues/18774
+  if (!window.matchMedia) window.matchMedia = matchMediaPolyfill as any;
 }
 // Use require over import (will be lifted up)
 // make sure matchMedia polyfill run before require('react-slick')
--- a/components/input-number/style/index.less
+++ b/components/input-number/style/index.less
@ -140,8 +140,8 @@
  }

  &-handler-up {
-    cursor: pointer;
    border-top-right-radius: @border-radius-base;
+    cursor: pointer;
    &-inner {
      top: 50%;
      margin-top: -5px;
--- a/components/layout/Sider.tsx
+++ b/components/layout/Sider.tsx
@ -11,6 +11,7 @@ import isNumeric from '../_util/isNumeric';

 // matchMedia polyfill for
 // https://github.com/WickyNilliams/enquire.js/issues/82
+// TODO: Will be removed in antd 4.0 because we will no longer support ie9
 if (typeof window !== 'undefined') {
  const matchMediaPolyfill = (mediaQuery: string) => {
    return {
@ -20,7 +21,8 @@ if (typeof window !== 'undefined') {
      removeListener() {},
    };
  };
-  window.matchMedia = window.matchMedia || matchMediaPolyfill;
+  // ref: https://github.com/ant-design/ant-design/issues/18774
+  if (!window.matchMedia) window.matchMedia = matchMediaPolyfill as any;
 }

 const dimensionMaxMap = {
--- a/components/menu/style/dark.less
+++ b/components/menu/style/dark.less
@ -108,7 +108,7 @@
    .@{iconfont-css-prefix} {
      color: @menu-dark-selected-item-icon-color;
    }
-    span {
+    .@{iconfont-css-prefix} + span {
      color: @menu-dark-selected-item-text-color;
    }
  }
--- a/components/table/style/size.less
+++ b/components/table/style/size.less
@ -138,7 +138,7 @@
      border-left: 0;
    }

-    .@{table-prefix-cls}-thead > tr > th:last-child,
+    .@{table-prefix-cls}-thead > tr:only-child > th:last-child,
    .@{table-prefix-cls}-tbody > tr > td:last-child {
      border-right: none;
    }
--- a/components/tabs/style/index.less
+++ b/components/tabs/style/index.less
@ -280,7 +280,6 @@
    height: 100%;
    border-bottom: 0;

-    .@{tab-prefix-cls}-tab-arrow-show,
    .@{tab-prefix-cls}-tab-arrow-show {
      width: 100%;
      height: @tabs-scrolling-size;
--- a/components/timeline/style/index.less
+++ b/components/timeline/style/index.less
@ -134,6 +134,7 @@
      .@{timeline-prefix-cls}-item-tail,
      .@{timeline-prefix-cls}-item-head,
      .@{timeline-prefix-cls}-item-head-custom {
+        // stylelint-disable-next-line function-calc-no-invalid
        left: calc(100% - 4px - @timeline-width);
      }
      .@{timeline-prefix-cls}-item-content {
--- a/components/transfer/tests/index.test.js
+++ b/components/transfer/tests/index.test.js
@ -144,6 +144,18 @@ describe('Transfer', () => {
    expect(handleSelectChange).toHaveBeenLastCalledWith(['a'], ['b']);
  });

+  it('should not check checkbox when component disabled', () => {
+    const handleSelectChange = jest.fn();
+    const wrapper = mount(
+      <Transfer {...listCommonProps} disabled onSelectChange={handleSelectChange} />,
+    );
+    wrapper
+      .find(TransferItem)
+      .filterWhere(n => n.prop('item').key === 'a')
+      .simulate('click');
+    expect(handleSelectChange).not.toHaveBeenCalled();
+  });
+
  it('should not check checkbox when click on disabled item', () => {
    const handleSelectChange = jest.fn();
    const wrapper = mount(<Transfer {...listCommonProps} onSelectChange={handleSelectChange} />);
--- a/components/transfer/renderListBody.tsx
+++ b/components/transfer/renderListBody.tsx
@ -68,7 +68,14 @@ class ListBody extends React.Component<TransferListBodyProps> {

  render() {
    const { mounted } = this.state;
-    const { prefixCls, onScroll, filteredRenderItems, lazy, selectedKeys } = this.props;
+    const {
+      prefixCls,
+      onScroll,
+      filteredRenderItems,
+      lazy,
+      selectedKeys,
+      disabled: globalDisabled,
+    } = this.props;

    return (
      <Animate
@ -84,7 +91,7 @@ class ListBody extends React.Component<TransferListBodyProps> {

          return (
            <ListItem
-              disabled={disabled}
+              disabled={globalDisabled || disabled}
              key={item.key}
              item={item}
              lazy={lazy}
--- a/components/typography/style/index.less
+++ b/components/typography/style/index.less
@ -172,6 +172,7 @@
    div& {
      left: -@input-padding-horizontal - 1px;
      margin-top: -@input-padding-vertical-base - 1px;
+      // stylelint-disable-next-line function-calc-no-invalid
      margin-bottom: calc(1em - @input-padding-vertical-base - 2px);
    }

--- a/docs/react/getting-started.en-US.md
+++ b/docs/react/getting-started.en-US.md
@ -139,7 +139,7 @@ import Button from 'antd/es/button';
 import 'antd/es/button/style'; // or antd/es/button/style/css for css format file
 ```

-> Note: antd support ES6 tree shaking, so `import { Button } from 'antd';` will drop the js code you don't use too.
+> Note: antd supports ES6 tree shaking, so `import { Button } from 'antd';` will drop the js code you don't use too.

 We strongly recommend using [babel-plugin-import](https://github.com/ant-design/babel-plugin-import), which can convert the following code to the 'antd/es/xxx' way:

--- a/docs/spec/article.en-US.md
+++ b/docs/spec/article.en-US.md
@ -0,0 +1,30 @@
+---
+order: 2
+category: Other
+title: Article
+---
+
+想要了解 Ant Design 设计体系背后的故事？如何才能更好的应用 Ant Design？你可以查阅下述我们为你精挑细选的文章。也欢迎关注 [Ant Design 官方专栏](https://zhuanlan.zhihu.com/antdesign)，这里常有关于 Ant Design 设计体系下相关话题内容的最新分享和讨论，如 Ant Design、AntV 可视化、Kitchen 设计插件、B 端产品设计、SaaS 产品设计、自然交互、增长设计、智能设计、设计工程化等。
+
+## 设计
+
+- [「自然交互」Ant Design 设计价值观解析](https://zhuanlan.zhihu.com/p/44809866)
+- [「自然交互 1」前馈：让功能找到用户；让用户体验美好](https://zhuanlan.zhihu.com/p/41952711)
+- [「自然交互 4」理解元数据，让人机自然交互](https://zhuanlan.zhihu.com/p/43613398)
+- [「自然交互 5」传感器——系统的五感【上】](https://zhuanlan.zhihu.com/p/52648777)
+- [1 块钱 6 周 DAU 增长翻倍：Ant Design 设计工具 Kitchen 获客增长实践](https://zhuanlan.zhihu.com/p/68707241)
+- [专访蚂蚁金服体验技术 UED：Ant Design 希望成为世界级设计体系](https://zhuanlan.zhihu.com/p/66781635)
+- [写给设计师的 Ant Design 栅格指南](https://zhuanlan.zhihu.com/p/63580649)
+- [Ant Design 情感化设计](https://zhuanlan.zhihu.com/p/55364776)
+- [Ant Design 资产一起造 工作坊（上）](https://zhuanlan.zhihu.com/p/54887681)
+- [Ant Design 资产一起造 工作坊（下）](https://zhuanlan.zhihu.com/p/54901534)
+- [轻推转型之门：Ant Design Pro 在企业级产品的实践（附演讲视频）](https://zhuanlan.zhihu.com/p/32771546)
+- [Ant Design 3.0 背后的故事（附演讲视频）](https://zhuanlan.zhihu.com/p/32746810)
+- [用户故事地图浅析](https://zhuanlan.zhihu.com/p/31503749)
+- [体验，不只是用户的！Ant Design 在蚂蚁中台的应用](https://zhuanlan.zhihu.com/p/26846739)
+- [在用 Sketch 和 iconfont？试试 Kitchen 吧！](https://zhuanlan.zhihu.com/p/36657030)
+
+## 技术
+
+- [Ant Design 色板生成算法演进之路](https://zhuanlan.zhihu.com/p/32422584)
+- [如何向开源项目提交无法解答的问题](https://zhuanlan.zhihu.com/p/25795393)
--- a/docs/spec/article.zh-CN.md
+++ b/docs/spec/article.zh-CN.md
@ -0,0 +1,30 @@
+---
+order: 2
+category: 其他
+title: 文章
+---
+
+想要了解 Ant Design 设计体系背后的故事？如何才能更好的应用 Ant Design？你可以查阅下述我们为你精挑细选的文章。也欢迎关注 [Ant Design 官方专栏](https://zhuanlan.zhihu.com/antdesign)，这里常有关于 Ant Design 设计体系下相关话题内容的最新分享和讨论，如 Ant Design、AntV 可视化、Kitchen 设计插件、B 端产品设计、SaaS 产品设计、自然交互、增长设计、智能设计、设计工程化等。
+
+## 设计
+
+- [「自然交互」Ant Design 设计价值观解析](https://zhuanlan.zhihu.com/p/44809866)
+- [「自然交互 1」前馈：让功能找到用户；让用户体验美好](https://zhuanlan.zhihu.com/p/41952711)
+- [「自然交互 4」理解元数据，让人机自然交互](https://zhuanlan.zhihu.com/p/43613398)
+- [「自然交互 5」传感器——系统的五感【上】](https://zhuanlan.zhihu.com/p/52648777)
+- [1 块钱 6 周 DAU 增长翻倍：Ant Design 设计工具 Kitchen 获客增长实践](https://zhuanlan.zhihu.com/p/68707241)
+- [专访蚂蚁金服体验技术 UED：Ant Design 希望成为世界级设计体系](https://zhuanlan.zhihu.com/p/66781635)
+- [写给设计师的 Ant Design 栅格指南](https://zhuanlan.zhihu.com/p/63580649)
+- [Ant Design 情感化设计](https://zhuanlan.zhihu.com/p/55364776)
+- [Ant Design 资产一起造 工作坊（上）](https://zhuanlan.zhihu.com/p/54887681)
+- [Ant Design 资产一起造 工作坊（下）](https://zhuanlan.zhihu.com/p/54901534)
+- [轻推转型之门：Ant Design Pro 在企业级产品的实践（附演讲视频）](https://zhuanlan.zhihu.com/p/32771546)
+- [Ant Design 3.0 背后的故事（附演讲视频）](https://zhuanlan.zhihu.com/p/32746810)
+- [用户故事地图浅析](https://zhuanlan.zhihu.com/p/31503749)
+- [体验，不只是用户的！Ant Design 在蚂蚁中台的应用](https://zhuanlan.zhihu.com/p/26846739)
+- [在用 Sketch 和 iconfont？试试 Kitchen 吧！](https://zhuanlan.zhihu.com/p/36657030)
+
+## 技术
+
+- [Ant Design 色板生成算法演进之路](https://zhuanlan.zhihu.com/p/32422584)
+- [如何向开源项目提交无法解答的问题](https://zhuanlan.zhihu.com/p/25795393)
--- a/docs/spec/work-with-us.en-US.md
+++ b/docs/spec/work-with-us.en-US.md
@ -1,5 +1,5 @@
 ---
-order: 2
+order: 3
 category: Other
 title: Work with Us
 ---
--- a/docs/spec/work-with-us.zh-CN.md
+++ b/docs/spec/work-with-us.zh-CN.md
@ -1,13 +1,11 @@
 ---
-order: 2
+order: 3
 category: 其他
 title: 加入我们
 ---

 我们（蚂蚁金服体验技术部）是一支兼具设计视角和工程视角的团队，服务蚂蚁金服上百个中后台系统，主打产品 Ant Design 服务全球 100 万设计师和工程师，是西湖区学院路西侧最具影响力的设计语言。欢迎来这里和我们一起打造优雅高效的人机设计/研发体系。

-
-
 ## UI/UE 设计师

 简历和作品集请投递：lindong.lld#alipay.com
@ -29,8 +27,8 @@ title: 加入我们
  - 参与 Ant Design 的打磨，将其建设成全球卓越的设计体系。
  - 参与 AntV 的打磨，将其建设成全球一流的数据可视化体系。
 - One More Thing ❤️ ：
+
  - 你们总是为世界带去美好，但总是忘却你们也需要美好。我们正在努力打造 [🍳 Kitchen：一款为设计师提效的 Sketch 工具集](https://kitchen.alipay.com/)、[语雀画板](https://yuque.com/) 等专属设计师的产品，让设计真正变成财富。期待志同道合的你，一道给设计行业带来「微小而美好的改变」。
-  

 ## 前端工程师

@ -50,7 +48,6 @@ title: 加入我们
  - 负责 Ant Design 前端基础设施研发。
  - 负责中后台设计/前端工具体系建设。

-
 ## ADI（Artificial Design Intelligence） 工程师

 简历和作品集请投递：lindong.lld#alipay.com
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "antd",
-  "version": "3.23.2",
+  "version": "3.23.3",
  "description": "An enterprise-class UI design language and React components implementation",
  "keywords": [
    "ant",
@ -225,10 +225,10 @@
    "rimraf": "^3.0.0",
    "scrollama": "^2.0.0",
    "simple-git": "^1.113.0",
-    "stylelint": "^10.0.1",
+    "stylelint": "^11.0.0",
    "stylelint-config-prettier": "^5.2.0",
    "stylelint-config-rational-order": "^0.1.2",
-    "stylelint-config-standard": "^18.3.0",
+    "stylelint-config-standard": "^19.0.0",
    "stylelint-declaration-block-no-ignored-properties": "^2.1.0",
    "stylelint-order": "^3.0.0",
    "typescript": "~3.6.2",
--- a/site/theme/static/markdown.less
+++ b/site/theme/static/markdown.less
@ -353,7 +353,6 @@
    text-align: center;
    border: none;
  }
-  .ant-row .demo-col-1,
  .ant-row .demo-col-1 {
    background: fade(#00a0e9, 70%);
  }