mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-24 11:10:01 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Merge branch 'feature' into next-merge-feature

Browse Source
This commit is contained in:
MadCcc 2022-10-22 13:14:19 +08:00
commit ca72c10feb
7 changed files with 95 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
View File

@ -1787,10 +1787,10 @@ Array [
</span> </span>
</button>, </button>,
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -1798,7 +1798,7 @@ Array [
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span

6
components/button/__tests__/__snapshots__/demo.test.ts.snap
View File

@ -1451,10 +1451,10 @@ Array [
</span> </span>
</button>, </button>,
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -1462,7 +1462,7 @@ Array [
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span

42
components/config-provider/__tests__/__snapshots__/components.test.tsx.snap
View File

@ -14690,10 +14690,10 @@ exports[`ConfigProvider components Drawer prefixCls 1`] = `
exports[`ConfigProvider components Dropdown configProvider 1`] = ` exports[`ConfigProvider components Dropdown configProvider 1`] = `
<div <div
class="config-btn-group config-dropdown-button" class="config-space-compact config-space-compact-block config-dropdown-button"
> >
<button <button
class="config-btn config-btn-default" class="config-btn config-btn-default config-btn-compact-item config-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -14701,7 +14701,7 @@ exports[`ConfigProvider components Dropdown configProvider 1`] = `
</span> </span>
</button> </button>
<button <button
class="config-btn config-btn-default config-btn-icon-only config-dropdown-trigger" class="config-btn config-btn-default config-btn-icon-only config-btn-compact-item config-btn-compact-last-item config-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -14729,10 +14729,10 @@ exports[`ConfigProvider components Dropdown configProvider 1`] = `
exports[`ConfigProvider components Dropdown configProvider componentDisabled 1`] = ` exports[`ConfigProvider components Dropdown configProvider componentDisabled 1`] = `
<div <div
class="config-btn-group config-dropdown-button" class="config-space-compact config-space-compact-block config-dropdown-button"
> >
<button <button
class="config-btn config-btn-default" class="config-btn config-btn-default config-btn-compact-item config-btn-compact-first-item"
disabled="" disabled=""
type="button" type="button"
> >
@ -14741,7 +14741,7 @@ exports[`ConfigProvider components Dropdown configProvider componentDisabled 1`]
</span> </span>
</button> </button>
<button <button
class="config-btn config-btn-default config-btn-icon-only config-dropdown-trigger" class="config-btn config-btn-default config-btn-icon-only config-btn-compact-item config-btn-compact-last-item config-dropdown-trigger"
disabled="" disabled=""
type="button" type="button"
> >
@ -14770,10 +14770,10 @@ exports[`ConfigProvider components Dropdown configProvider componentDisabled 1`]
exports[`ConfigProvider components Dropdown configProvider componentSize large 1`] = ` exports[`ConfigProvider components Dropdown configProvider componentSize large 1`] = `
<div <div
class="config-btn-group config-dropdown-button" class="config-space-compact config-space-compact-block config-dropdown-button"
> >
<button <button
class="config-btn config-btn-default config-btn-lg" class="config-btn config-btn-default config-btn-compact-item config-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -14781,7 +14781,7 @@ exports[`ConfigProvider components Dropdown configProvider componentSize large 1
</span> </span>
</button> </button>
<button <button
class="config-btn config-btn-default config-btn-lg config-btn-icon-only config-dropdown-trigger" class="config-btn config-btn-default config-btn-icon-only config-btn-compact-item config-btn-compact-last-item config-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -14809,10 +14809,10 @@ exports[`ConfigProvider components Dropdown configProvider componentSize large 1
exports[`ConfigProvider components Dropdown configProvider componentSize middle 1`] = ` exports[`ConfigProvider components Dropdown configProvider componentSize middle 1`] = `
<div <div
class="config-btn-group config-dropdown-button" class="config-space-compact config-space-compact-block config-dropdown-button"
> >
<button <button
class="config-btn config-btn-default" class="config-btn config-btn-default config-btn-compact-item config-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -14820,7 +14820,7 @@ exports[`ConfigProvider components Dropdown configProvider componentSize middle
</span> </span>
</button> </button>
<button <button
class="config-btn config-btn-default config-btn-icon-only config-dropdown-trigger" class="config-btn config-btn-default config-btn-icon-only config-btn-compact-item config-btn-compact-last-item config-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -14848,10 +14848,10 @@ exports[`ConfigProvider components Dropdown configProvider componentSize middle
exports[`ConfigProvider components Dropdown configProvider virtual and dropdownMatchSelectWidth 1`] = ` exports[`ConfigProvider components Dropdown configProvider virtual and dropdownMatchSelectWidth 1`] = `
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -14859,7 +14859,7 @@ exports[`ConfigProvider components Dropdown configProvider virtual and dropdownM
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -14887,10 +14887,10 @@ exports[`ConfigProvider components Dropdown configProvider virtual and dropdownM
exports[`ConfigProvider components Dropdown normal 1`] = ` exports[`ConfigProvider components Dropdown normal 1`] = `
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -14898,7 +14898,7 @@ exports[`ConfigProvider components Dropdown normal 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -14926,10 +14926,10 @@ exports[`ConfigProvider components Dropdown normal 1`] = `
exports[`ConfigProvider components Dropdown prefixCls 1`] = ` exports[`ConfigProvider components Dropdown prefixCls 1`] = `
<div <div
class="ant-btn-group prefix-Dropdown-button" class="ant-space-compact ant-space-compact-block prefix-Dropdown"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -14937,7 +14937,7 @@ exports[`ConfigProvider components Dropdown prefixCls 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span

54
components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
View File

@ -3091,10 +3091,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="margin-right:8px;padding-bottom:8px" style="margin-right:8px;padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -3102,7 +3102,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -3373,10 +3373,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="margin-right:8px;padding-bottom:8px" style="margin-right:8px;padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -3384,7 +3384,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -3655,10 +3655,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="margin-right:8px;padding-bottom:8px" style="margin-right:8px;padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
disabled="" disabled=""
type="button" type="button"
> >
@ -3667,7 +3667,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
disabled="" disabled=""
type="button" type="button"
> >
@ -3939,10 +3939,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="margin-right:8px;padding-bottom:8px" style="margin-right:8px;padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -3974,7 +3974,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
</div> </div>
</div> </div>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-loading ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-loading ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -4533,10 +4533,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
style="padding-bottom:8px" style="padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default ant-btn-dangerous" class="ant-btn ant-btn-default ant-btn-dangerous ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -4544,7 +4544,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md extend context co
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-dangerous ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-dangerous ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -5289,10 +5289,10 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
style="margin-bottom:8px" style="margin-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-primary ant-btn-loading" class="ant-btn ant-btn-primary ant-btn-loading ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span <span
@ -5323,7 +5323,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-primary ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-primary ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -5427,10 +5427,10 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
style="margin-bottom:8px" style="margin-bottom:8px"
> >
<div <div
class="ant-btn-group ant-btn-group-sm ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-primary ant-btn-sm ant-btn-loading" class="ant-btn ant-btn-primary ant-btn-sm ant-btn-loading ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span <span
@ -5461,7 +5461,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -5565,10 +5565,10 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
style="margin-bottom:8px" style="margin-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-primary" class="ant-btn ant-btn-primary ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -5576,7 +5576,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-primary ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-primary ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -5679,10 +5679,10 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
class="ant-space-item" class="ant-space-item"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -5690,7 +5690,7 @@ exports[`renders ./components/dropdown/demo/loading.md extend context correctly
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span

54
components/dropdown/__tests__/__snapshots__/demo.test.ts.snap
View File

@ -167,10 +167,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
style="margin-right:8px;padding-bottom:8px" style="margin-right:8px;padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -178,7 +178,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -208,10 +208,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
style="margin-right:8px;padding-bottom:8px" style="margin-right:8px;padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -219,7 +219,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -249,10 +249,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
style="margin-right:8px;padding-bottom:8px" style="margin-right:8px;padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
disabled="" disabled=""
type="button" type="button"
> >
@ -261,7 +261,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
disabled="" disabled=""
type="button" type="button"
> >
@ -292,10 +292,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
style="margin-right:8px;padding-bottom:8px" style="margin-right:8px;padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -303,7 +303,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-loading ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-loading ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -380,10 +380,10 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
style="padding-bottom:8px" style="padding-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default ant-btn-dangerous" class="ant-btn ant-btn-default ant-btn-dangerous ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -391,7 +391,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-dangerous ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-dangerous ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -508,10 +508,10 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
style="margin-bottom:8px" style="margin-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-primary ant-btn-loading" class="ant-btn ant-btn-primary ant-btn-loading ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span <span
@ -542,7 +542,7 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-primary ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-primary ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -572,10 +572,10 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
style="margin-bottom:8px" style="margin-bottom:8px"
> >
<div <div
class="ant-btn-group ant-btn-group-sm ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-primary ant-btn-sm ant-btn-loading" class="ant-btn ant-btn-primary ant-btn-sm ant-btn-loading ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span <span
@ -606,7 +606,7 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-primary ant-btn-sm ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -636,10 +636,10 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
style="margin-bottom:8px" style="margin-bottom:8px"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-primary" class="ant-btn ant-btn-primary ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -647,7 +647,7 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-primary ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-primary ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span
@ -676,10 +676,10 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
class="ant-space-item" class="ant-space-item"
> >
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
type="button" type="button"
> >
<span> <span>
@ -687,7 +687,7 @@ exports[`renders ./components/dropdown/demo/loading.md correctly 1`] = `
</span> </span>
</button> </button>
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span

12
components/dropdown/__tests__/__snapshots__/dropdown-button.test.tsx.snap
View File

@ -2,14 +2,14 @@
exports[`DropdownButton rtl render component should be rendered correctly in RTL direction 1`] = ` exports[`DropdownButton rtl render component should be rendered correctly in RTL direction 1`] = `
<div <div
class="ant-btn-group ant-btn-group-rtl ant-dropdown-button" class="ant-space-compact ant-space-compact-rtl ant-space-compact-block ant-dropdown-button"
> >
<button <button
class="ant-btn ant-btn-default ant-btn-rtl" class="ant-btn ant-btn-default ant-btn-rtl ant-btn-compact-item ant-btn-compact-first-item ant-btn-compact-item-rtl"
type="button" type="button"
/> />
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-rtl ant-dropdown-trigger ant-dropdown-rtl" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-rtl ant-btn-compact-item ant-btn-compact-last-item ant-btn-compact-item-rtl ant-dropdown-trigger ant-dropdown-rtl"
type="button" type="button"
> >
<span <span
@ -37,14 +37,14 @@ exports[`DropdownButton rtl render component should be rendered correctly in RTL
exports[`DropdownButton should support href like Button 1`] = ` exports[`DropdownButton should support href like Button 1`] = `
<div <div
class="ant-btn-group ant-dropdown-button" class="ant-space-compact ant-space-compact-block ant-dropdown-button"
> >
<a <a
class="ant-btn ant-btn-default" class="ant-btn ant-btn-default ant-btn-compact-item ant-btn-compact-first-item"
href="https://ant.design" href="https://ant.design"
/> />
<button <button
class="ant-btn ant-btn-default ant-btn-icon-only ant-dropdown-trigger" class="ant-btn ant-btn-default ant-btn-icon-only ant-btn-compact-item ant-btn-compact-last-item ant-dropdown-trigger"
type="button" type="button"
> >
<span <span

13
components/dropdown/dropdown-button.tsx
View File

@ -6,12 +6,12 @@ import Button from '../button';
import type { ButtonHTMLType } from '../button/button'; import type { ButtonHTMLType } from '../button/button';
import type { ButtonGroupProps } from '../button/button-group'; import type { ButtonGroupProps } from '../button/button-group';
import { ConfigContext } from '../config-provider'; import { ConfigContext } from '../config-provider';
import { useCompactItemContext } from '../space/Compact';
import type { DropdownProps } from './dropdown'; import type { DropdownProps } from './dropdown';
import Dropdown from './dropdown'; import Dropdown from './dropdown';
import Space from '../space';
import useStyle from './style'; import useStyle from './style';
const ButtonGroup = Button.Group;
export type DropdownButtonType = 'default' | 'primary' | 'ghost' | 'dashed' | 'link' | 'text'; export type DropdownButtonType = 'default' | 'primary' | 'ghost' | 'dashed' | 'link' | 'text';
export interface DropdownButtonProps extends ButtonGroupProps, DropdownProps { export interface DropdownButtonProps extends ButtonGroupProps, DropdownProps {
@ -85,7 +85,10 @@ const DropdownButton: DropdownButtonInterface = props => {
overlayClassName, overlayClassName,
overlayStyle, overlayStyle,
destroyPopupOnHide, destroyPopupOnHide,
}; } as DropdownProps;
const { compactSize, compactItemClassnames } = useCompactItemContext(prefixCls, direction);
const classes = classNames(buttonPrefixCls, compactItemClassnames, className, hashId);
if ('open' in props) { if ('open' in props) {
dropdownProps.open = open; dropdownProps.open = open;
@ -117,10 +120,10 @@ const DropdownButton: DropdownButtonInterface = props => {
const [leftButtonToRender, rightButtonToRender] = buttonsRender([leftButton, rightButton]); const [leftButtonToRender, rightButtonToRender] = buttonsRender([leftButton, rightButton]);
return wrapSSR( return wrapSSR(
<ButtonGroup {...restProps} className={classNames(buttonPrefixCls, className, hashId)}> <Space.Compact className={classes} size={compactSize} block {...restProps}>
{leftButtonToRender} {leftButtonToRender}
<Dropdown {...dropdownProps}>{rightButtonToRender}</Dropdown> <Dropdown {...dropdownProps}>{rightButtonToRender}</Dropdown>
</ButtonGroup>, </Space.Compact>,
); );
}; };