Skip to content

Commit

Permalink
chore: auto merge branchs (ant-design#34056)
Browse files Browse the repository at this point in the history
chore: feature merge master
  • Loading branch information
github-actions[bot] authored Feb 15, 2022
2 parents 37e0423 + 186ba3a commit a94d086
Show file tree
Hide file tree
Showing 100 changed files with 1,438 additions and 1,077 deletions.
1 change: 1 addition & 0 deletions .github/workflows/verify-files-modify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
comment: |
Hi @${{ github.event.pull_request.user.login }}. Thanks for your contribution. The path `.github/` or `scripts/` and `CHANGELOG` `package.json` is only maintained by team members. This current PR will be closed and team members will help on this.
close: true
set-failed: false

- name: verify-less
uses: actions-cool/verify-files-modify@v1
Expand Down
34 changes: 27 additions & 7 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,38 @@ timeline: true

---

## 4.18.7

`2022-02-14`

- Typography
- 🛠 Fix Typography `useLayoutEffect` warning in SSR. [#33818](https://github.com/ant-design/ant-design/pull/33818) [@SoYoung210](https://github.com/SoYoung210)
- 🐞 Fix Typography with `ellipsis` makes screen show the scroll bar in some case. [#34007](https://github.com/ant-design/ant-design/pull/34007)
- 🐞 Typography copy click event is now `stopPropagation` by default. [#33998](https://github.com/ant-design/ant-design/pull/33998) [@linxianxi](https://github.com/linxianxi)
- 🐞 Fix Typography edit & copy button not trigger by enter key. [#33976](https://github.com/ant-design/ant-design/pull/33976) [@mrwd2009](https://github.com/mrwd2009)
- 🐞 Fix Form `undefined` text of min/max validators in pl_PL locale. [#34024](https://github.com/ant-design/ant-design/pull/34024) [@MichalPodeszwa](https://github.com/MichalPodeszwa)
- 🐞 Fix Input.TextArea cut text logic when `maxLength` configured. [#33910](https://github.com/ant-design/ant-design/pull/33910) [@chenyizhongx](https://github.com/chenyizhongx)
- 💄 Button with `type=default` will provide `.ant-btn-default` className. [#34013](https://github.com/ant-design/ant-design/pull/34013)
- 💄 Improve Menu `:focus-visible` style. [#34008](https://github.com/ant-design/ant-design/pull/34008)
- 💄 Fix Pagination and Rate style problem in Safari. [#34002](https://github.com/ant-design/ant-design/pull/34002)
- 💄 Fix Row and Col component styles when using prefixCls. [#33969](https://github.com/ant-design/ant-design/pull/33969) [@mic-web](https://github.com/mic-web)
- 🐞 Fix Timeline icons with custom color not working. [#33951](https://github.com/ant-design/ant-design/pull/33951) [@MadCcc](https://github.com/MadCcc)
- TypeScript
- 🤖 Optimize Cascader `onChange` definition with `multiple` prop. [#33947](https://github.com/ant-design/ant-design/pull/33947) [@babycannotsay](https://github.com/babycannotsay)

## 4.18.6

`2022-02-07`

- 🐞 Hide the empty popover when the props' content is undefined or null. [#33835](https://github.com/ant-design/ant-design/pull/33835) [@DawnLck](https://github.com/DawnLck)
- 🐞 Fix DatePicker `ref` TypeScript definition. [#33901](https://github.com/ant-design/ant-design/pull/33901) [@Amour1688](https://github.com/Amour1688)
- 🐞 Fix the problem that tooltip didn't show on ellipsis with rows larger than 1. [#33875](https://github.com/ant-design/ant-design/pull/33875) [@MadCcc](https://github.com/MadCcc)
- 🐞 Fix the empty Popover displayed when `content` and `title` is undefined or null. [#33835](https://github.com/ant-design/ant-design/pull/33835) [@DawnLck](https://github.com/DawnLck)
- 🐞 Fix the problem that Tooltip didn't show on `ellipsis` with rows larger than 1. [#33875](https://github.com/ant-design/ant-design/pull/33875)
- Button
- 🐞 Fix the issue that block not work when small size. [#33878](https://github.com/ant-design/ant-design/pull/33878) [@tangjinzhou](https://github.com/tangjinzhou)
- 🐞 Clear timer of delayed loading after Button is unmounted. [#33858](https://github.com/ant-design/ant-design/pull/33858) [@mrwd2009](https://github.com/mrwd2009)
- 🐞 Fix the problem that Tooltip cannot be displayed when it is used with switch in loading state. [#33860](https://github.com/ant-design/ant-design/pull/33860) [@MadCcc](https://github.com/MadCcc)
- 🐞 fix the upload button sometimes flashes after the upload button is changed from hidden to display when the upload component is a picture-card type. [#33820](https://github.com/ant-design/ant-design/pull/33820) [@credred](https://github.com/credred)
- 🐞 Fix the issue that `block` of Button not work when small size. [#33878](https://github.com/ant-design/ant-design/pull/33878) [@tangjinzhou](https://github.com/tangjinzhou)
- 🐞 Fix the issue that `loading.delay` of Button cause React memory leak warning [#33858](https://github.com/ant-design/ant-design/pull/33858) [@mrwd2009](https://github.com/mrwd2009)
- 🐞 Fix the problem that Tooltip cannot be displayed when it is used with Switch in `loading` state. [#33860](https://github.com/ant-design/ant-design/pull/33860)
- 🐞 Fix the Upload button sometimes flashes after changed from hidden to display when the Upload component is a `picture-card` type. [#33820](https://github.com/ant-design/ant-design/pull/33820) [@credred](https://github.com/credred)
- TypeScript
- 🤖 Fix DatePicker `ref` TypeScript definition. [#33901](https://github.com/ant-design/ant-design/pull/33901) [@Amour1688](https://github.com/Amour1688)

## 4.18.5

Expand Down
34 changes: 27 additions & 7 deletions CHANGELOG.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,38 @@ timeline: true

---

## 4.18.7

`2022-02-14`

- Typography
- 🛠 修复 Typography 在 SSR 渲染时警告 `useLayoutEffect` 的问题。[#33818](https://github.com/ant-design/ant-design/pull/33818) [@SoYoung210](https://github.com/SoYoung210)
- 🐞 修复 Typography 配置 `ellipsis` 后在某些情况下会出现滚动条的问题。[#34007](https://github.com/ant-design/ant-design/pull/34007)
- 🐞 Typography 复制按钮点击事件不在冒泡。[#33998](https://github.com/ant-design/ant-design/pull/33998) [@linxianxi](https://github.com/linxianxi)
- 🐞 修复 Typography 中编辑和拷贝按钮无法响应 Enter 按键的问题。[#33976](https://github.com/ant-design/ant-design/pull/33976) [@mrwd2009](https://github.com/mrwd2009)
- 🐞 修复 Form 波兰语中表单校验部分文案未定义的问题。[#34024](https://github.com/ant-design/ant-design/pull/34024) [@MichalPodeszwa](https://github.com/MichalPodeszwa)
- 🐞 修复 Input.TextArea 设置 `maxLength` 时光标位置会影响超出部分截取的问题。[#33910](https://github.com/ant-design/ant-design/pull/33910) [@chenyizhongx](https://github.com/chenyizhongx)
- 💄 Button 对于 `type=default` 也会提供 `.ant-btn-default` 的样式类名。[#34013](https://github.com/ant-design/ant-design/pull/34013)
- 💄 优化 Menu `:focus-visible` 的样式。[#34008](https://github.com/ant-design/ant-design/pull/34008)
- 💄 修复 Pagination 和 Rate 在 Safari 下部分样式丢失的问题,比如分页按钮禁用样式失效。[#34002](https://github.com/ant-design/ant-design/pull/34002)
- 💄 修复 Row 与 Col 在配置 `prefixCls` 的样式问题。[#33969](https://github.com/ant-design/ant-design/pull/33969) [@mic-web](https://github.com/mic-web)
- 🐞 修复 Timeline 的自定义图标颜色无效的问题。[#33951](https://github.com/ant-design/ant-design/pull/33951) [@MadCcc](https://github.com/MadCcc)
- TypeScript
- 🤖 优化 Cascader `multiple` 属性对应的 `onChange` 类型推断。[#33947](https://github.com/ant-design/ant-design/pull/33947) [@babycannotsay](https://github.com/babycannotsay)

## 4.18.6

`2022-02-07`

- 🐞 修复当传入的内容参数和标题参数都为空时,气泡组件仍旧会渲染空气泡的问题。[#33835](https://github.com/ant-design/ant-design/pull/33835) [@DawnLck](https://github.com/DawnLck)
- 🐞 修复 DatePicker `ref` TypeScript 定义。[#33901](https://github.com/ant-design/ant-design/pull/33901) [@Amour1688](https://github.com/Amour1688)
- 🐞 修复 Typography ellipsis 行数大于 1 时 Tooltip 不显示的问题。[#33875](https://github.com/ant-design/ant-design/pull/33875) [@MadCcc](https://github.com/MadCcc)
- 🐞 修复当传入的内容参数和标题参数都为空时,Popover 仍旧会渲染空气泡的问题。[#33835](https://github.com/ant-design/ant-design/pull/33835) [@DawnLck](https://github.com/DawnLck)
- 🐞 修复 Typography `ellipsis` 行数大于 1 时 Tooltip 不显示的问题。[#33875](https://github.com/ant-design/ant-design/pull/33875)
- Button
- 🐞 修复小尺寸下 Button 组件 block 属性无效的问题[#33878](https://github.com/ant-design/ant-design/pull/33878) [@tangjinzhou](https://github.com/tangjinzhou)
- 🐞 Button 组件卸载后,清理延迟加载定时器。[#33858](https://github.com/ant-design/ant-design/pull/33858) [@mrwd2009](https://github.com/mrwd2009)
- 🐞 修复 Tooltip 套在 loading 状态的 switch 上时无法正常显示的问题。[#33860](https://github.com/ant-design/ant-design/pull/33860) [@MadCcc](https://github.com/MadCcc)
- 🐞 修复 Upload 组件为 picture-card 类型时,由隐藏上传按钮改为显示后,上传按钮有时会闪烁的问题。[#33820](https://github.com/ant-design/ant-design/pull/33820) [@credred](https://github.com/credred)
- 🐞 修复小尺寸下 Button 组件 `block` 属性无效的问题[#33878](https://github.com/ant-design/ant-design/pull/33878) [@tangjinzhou](https://github.com/tangjinzhou)
- 🐞 修复 Button 组件 `loading.delay` 定时器未清除导致的内存泄漏警告[#33858](https://github.com/ant-design/ant-design/pull/33858) [@mrwd2009](https://github.com/mrwd2009)
- 🐞 修复 Tooltip 套在 `loading` 状态的 Switch 上时无法正常显示的问题。[#33860](https://github.com/ant-design/ant-design/pull/33860)
- 🐞 修复 Upload 组件为 `picture-card` 类型时,由隐藏上传按钮改为显示后,上传按钮有时会闪烁的问题。[#33820](https://github.com/ant-design/ant-design/pull/33820) [@credred](https://github.com/credred)
- Typescript
- 🤖 修复 DatePicker `ref` TypeScript 定义。[#33901](https://github.com/ant-design/ant-design/pull/33901) [@Amour1688](https://github.com/Amour1688)

## 4.18.5

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ exports[`renders ./components/affix/demo/on-change.md extend context correctly 1
class=""
>
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span>
Expand Down
2 changes: 1 addition & 1 deletion components/affix/__tests__/__snapshots__/demo.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ exports[`renders ./components/affix/demo/on-change.md correctly 1`] = `
class=""
>
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Array [
class="ant-alert-action"
>
<button
class="ant-btn ant-btn-sm ant-btn-dangerous"
class="ant-btn ant-btn-default ant-btn-sm ant-btn-dangerous"
type="button"
>
<span>
Expand Down Expand Up @@ -954,7 +954,7 @@ Array [

exports[`renders ./components/alert/demo/error-boundary.md extend context correctly 1`] = `
<button
class="ant-btn ant-btn-dangerous"
class="ant-btn ant-btn-default ant-btn-dangerous"
type="button"
>
<span>
Expand Down
4 changes: 2 additions & 2 deletions components/alert/__tests__/__snapshots__/demo.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Array [
class="ant-alert-action"
>
<button
class="ant-btn ant-btn-sm ant-btn-dangerous"
class="ant-btn ant-btn-default ant-btn-sm ant-btn-dangerous"
type="button"
>
<span>
Expand Down Expand Up @@ -954,7 +954,7 @@ Array [

exports[`renders ./components/alert/demo/error-boundary.md correctly 1`] = `
<button
class="ant-btn ant-btn-dangerous"
class="ant-btn ant-btn-default ant-btn-dangerous"
type="button"
>
<span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ exports[`renders ./components/auto-complete/demo/certain-category.md extend cont
class="ant-input-group-addon"
>
<button
class="ant-btn ant-btn-lg ant-btn-icon-only ant-input-search-button"
class="ant-btn ant-btn-default ant-btn-lg ant-btn-icon-only ant-input-search-button"
type="button"
>
<span
Expand Down Expand Up @@ -1395,7 +1395,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md extend context co
class="ant-input-group-addon"
>
<button
class="ant-btn ant-btn-icon-only ant-input-search-button"
class="ant-btn ant-btn-default ant-btn-icon-only ant-input-search-button"
type="button"
>
<span
Expand Down Expand Up @@ -1618,7 +1618,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md extend context co
class="ant-input-group-addon"
>
<button
class="ant-btn ant-btn-icon-only ant-input-search-button"
class="ant-btn ant-btn-default ant-btn-icon-only ant-input-search-button"
type="button"
>
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ exports[`renders ./components/auto-complete/demo/certain-category.md correctly 1
class="ant-input-group-addon"
>
<button
class="ant-btn ant-btn-lg ant-btn-icon-only ant-input-search-button"
class="ant-btn ant-btn-default ant-btn-lg ant-btn-icon-only ant-input-search-button"
type="button"
>
<span
Expand Down Expand Up @@ -751,7 +751,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md correctly 1`] = `
class="ant-input-group-addon"
>
<button
class="ant-btn ant-btn-icon-only ant-input-search-button"
class="ant-btn ant-btn-default ant-btn-icon-only ant-input-search-button"
type="button"
>
<span
Expand Down Expand Up @@ -900,7 +900,7 @@ exports[`renders ./components/auto-complete/demo/form-debug.md correctly 1`] = `
class="ant-input-group-addon"
>
<button
class="ant-btn ant-btn-icon-only ant-input-search-button"
class="ant-btn ant-btn-default ant-btn-icon-only ant-input-search-button"
type="button"
>
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ Array [
</span>
</span>,
<button
class="ant-btn ant-btn-sm"
class="ant-btn ant-btn-default ant-btn-sm"
style="margin:0 16px;vertical-align:middle"
type="button"
>
Expand All @@ -303,7 +303,7 @@ Array [
</span>
</button>,
<button
class="ant-btn ant-btn-sm"
class="ant-btn ant-btn-default ant-btn-sm"
style="vertical-align:middle"
type="button"
>
Expand Down Expand Up @@ -869,23 +869,23 @@ exports[`renders ./components/avatar/demo/responsive.md extend context correctly
exports[`renders ./components/avatar/demo/toggle-debug.md extend context correctly 1`] = `
Array [
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span>
Toggle Avatar visibility
</span>
</button>,
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span>
Toggle Avatar size
</span>
</button>,
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span>
Expand Down
10 changes: 5 additions & 5 deletions components/avatar/__tests__/__snapshots__/demo.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ Array [
</span>
</span>,
<button
class="ant-btn ant-btn-sm"
class="ant-btn ant-btn-default ant-btn-sm"
style="margin:0 16px;vertical-align:middle"
type="button"
>
Expand All @@ -303,7 +303,7 @@ Array [
</span>
</button>,
<button
class="ant-btn ant-btn-sm"
class="ant-btn ant-btn-default ant-btn-sm"
style="vertical-align:middle"
type="button"
>
Expand Down Expand Up @@ -548,23 +548,23 @@ exports[`renders ./components/avatar/demo/responsive.md correctly 1`] = `
exports[`renders ./components/avatar/demo/toggle-debug.md correctly 1`] = `
Array [
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span>
Toggle Avatar visibility
</span>
</button>,
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span>
Toggle Avatar size
</span>
</button>,
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Array [
class="ant-btn-group"
>
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span
Expand All @@ -145,7 +145,7 @@ Array [
</span>
</button>
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span
Expand Down Expand Up @@ -173,7 +173,7 @@ Array [
</span>
</button>
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span
Expand Down
6 changes: 3 additions & 3 deletions components/badge/__tests__/__snapshots__/demo.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Array [
class="ant-btn-group"
>
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span
Expand All @@ -145,7 +145,7 @@ Array [
</span>
</button>
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span
Expand Down Expand Up @@ -173,7 +173,7 @@ Array [
</span>
</button>
<button
class="ant-btn"
class="ant-btn ant-btn-default"
type="button"
>
<span
Expand Down
Loading

0 comments on commit a94d086

Please sign in to comment.