Skip to content

Commit 61835dd

Browse files
committed
fix(CDropdown): disabled prop on toggler doesn't work properly
1 parent 8450aa4 commit 61835dd

File tree

1 file changed

+24
-9
lines changed

1 file changed

+24
-9
lines changed

packages/coreui-vue/src/components/dropdown/CDropdownToggle.ts

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,30 @@ const CDropdownToggle = defineComponent({
112112
]
113113

114114
const triggers = {
115-
...((props.trigger === 'click' || props.trigger.includes('click')) &&
116-
!props.disabled && {
117-
onClick: () => toggleMenu(),
118-
}),
119-
...((props.trigger === 'focus' || props.trigger.includes('focus')) &&
120-
!props.disabled && {
121-
onfocus: () => toggleMenu(true),
122-
onblur: () => toggleMenu(false),
123-
}),
115+
...((props.trigger === 'click' || props.trigger.includes('click')) && {
116+
onClick: () => {
117+
if (props.disabled) {
118+
return
119+
}
120+
121+
toggleMenu()
122+
},
123+
}),
124+
...((props.trigger === 'focus' || props.trigger.includes('focus')) && {
125+
onfocus: () => {
126+
if (props.disabled) {
127+
return
128+
}
129+
130+
toggleMenu(true)
131+
},
132+
onblur: () => {
133+
if (props.disabled) {
134+
return
135+
}
136+
toggleMenu(false)
137+
},
138+
}),
124139
}
125140

126141
onMounted(() => {

0 commit comments

Comments
 (0)