Skip to content

Commit ca22399

Browse files
fix(Dialog): custom cancelBtn text retains t-dialog__cancel className (Tencent#5157)
* fix(Dialog): custom `cancelBtn` text, retains `t-dialog__cancel` className * chore: update snapshot --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent b900665 commit ca22399

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

packages/components/dialog/hooks/useAction.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export function useAction(action: BtnAction) {
128128
}
129129
// 如果属性存在,优先返回属性配置
130130
if (cancelBtn && ['string', 'object'].includes(typeof cancelBtn)) {
131-
return getButtonByProps(cancelBtn as string | ButtonProps, { defaultButtonProps });
131+
return getButtonByProps(cancelBtn as string | ButtonProps, { defaultButtonProps, className });
132132
}
133133
// 渲染插槽 或 function 类型的 confirmBtn,属性优先级更高
134134
return renderTNodeJSX('cancelBtn');

packages/tdesign-vue-next/test/unit/snap/__snapshots__/csr.test.js.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55689,7 +55689,7 @@ exports[`csr snapshot test > csr test ./packages/components/dialog/_example/cust
5568955689
>
5569055690
<div>
5569155691
<button
55692-
class="t-button t-button--variant-base t-button--theme-default"
55692+
class="t-button t-button--variant-base t-button--theme-default t-dialog__cancel"
5569355693
href=""
5569455694
tabindex="0"
5569555695
type="button"
@@ -55791,7 +55791,7 @@ exports[`csr snapshot test > csr test ./packages/components/dialog/_example/cust
5579155791
>
5579255792
<div>
5579355793
<button
55794-
class="t-button t-button--variant-outline t-button--theme-default"
55794+
class="t-button t-button--variant-outline t-button--theme-default t-dialog__cancel"
5579555795
href=""
5579655796
tabindex="0"
5579755797
type="button"
@@ -55893,7 +55893,7 @@ exports[`csr snapshot test > csr test ./packages/components/dialog/_example/cust
5589355893
>
5589455894
<div>
5589555895
<button
55896-
class="t-button t-button--variant-base t-button--theme-default"
55896+
class="t-button t-button--variant-base t-button--theme-default t-dialog__cancel"
5589755897
href=""
5589855898
tabindex="0"
5589955899
type="button"
@@ -56001,7 +56001,7 @@ exports[`csr snapshot test > csr test ./packages/components/dialog/_example/cust
5600156001
>
5600256002
<div>
5600356003
<button
56004-
class="t-button t-button--variant-base t-button--theme-default"
56004+
class="t-button t-button--variant-base t-button--theme-default t-dialog__cancel"
5600556005
href=""
5600656006
tabindex="0"
5600756007
type="button"
@@ -59691,7 +59691,7 @@ exports[`csr snapshot test > csr test ./packages/components/drawer/_example/cust
5969159691
</span>
5969259692
</button>
5969359693
<button
59694-
class="t-button t-button--variant-base t-button--theme-default"
59694+
class="t-button t-button--variant-base t-button--theme-default t-drawer__cancel"
5969559695
href=""
5969659696
tabindex="0"
5969759697
type="button"

0 commit comments

Comments
 (0)