Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(comp:button): disabled btn when group's disabled is true #1508

Merged
merged 2 commits into from
Mar 24, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/components/button/src/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ export default defineComponent({
const mergedWaveless = computed(
() => mode.value === 'text' || mode.value === 'link' || (props.waveless ?? config.waveless),
)
const mergedDisabled = computed(() => props.disabled ?? groupProps.disabled)

const classes = computed(() => {
const {
block = groupProps.block,
danger = groupProps.danger,
disabled = groupProps.disabled,
ghost = groupProps.ghost,
loading,
icon,
Expand All @@ -51,7 +51,7 @@ export default defineComponent({
[prefixCls]: true,
[`${prefixCls}-block`]: block,
[`${prefixCls}-danger`]: danger,
[`${prefixCls}-disabled`]: disabled,
[`${prefixCls}-disabled`]: mergedDisabled.value,
[`${prefixCls}-ghost`]: ghost,
[`${prefixCls}-loading`]: loading,
[`${prefixCls}-icon-only`]: !slots.default && (icon || loading || slots.icon),
Expand All @@ -62,7 +62,7 @@ export default defineComponent({
})

const handleClick = (evt: MouseEvent) => {
if (props.disabled || props.loading) {
if (mergedDisabled.value || props.loading) {
evt.preventDefault()
evt.stopImmediatePropagation()
return
kovsu marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -75,7 +75,7 @@ export default defineComponent({
}

return () => {
const { disabled, loading, icon, type } = props
const { loading, icon, type } = props

const children: VNodeChild[] = []
if (loading) {
Expand All @@ -98,7 +98,7 @@ export default defineComponent({
)
}
return (
<button class={classes.value} disabled={disabled || loading} type={type} onClick={handleClick}>
<button class={classes.value} disabled={mergedDisabled.value || loading} type={type} onClick={handleClick}>
{children}
{!mergedWaveless.value && <ɵWave ref={waveRef} />}
</button>
kovsu marked this conversation as resolved.
Show resolved Hide resolved
Expand Down