File tree 1 file changed +7
-5
lines changed
packages/vuetify/src/mixins/activatable
1 file changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -135,11 +135,10 @@ export default baseMixins.extend({
135
135
// HTMLElement | Element
136
136
activator = this . activator
137
137
}
138
- } else if ( e ) {
139
- // Activated by a click event
140
- activator = ( e . currentTarget || e . target ) as HTMLElement
141
- } else if ( this . activatorNode . length ) {
142
- // Last resort, use the contents of the activator slot
138
+ } else if ( this . activatorNode . length === 1 || ! e ) {
139
+ // Use the contents of the activator slot
140
+ // There's either only one element in it or we
141
+ // don't have a click event to use as a last resort
143
142
const vm = this . activatorNode [ 0 ] . componentInstance
144
143
if (
145
144
vm &&
@@ -151,6 +150,9 @@ export default baseMixins.extend({
151
150
} else {
152
151
activator = this . activatorNode [ 0 ] . elm as HTMLElement
153
152
}
153
+ } else if ( e ) {
154
+ // Activated by a click event
155
+ activator = ( e . currentTarget || e . target ) as HTMLElement
154
156
}
155
157
156
158
this . activatorElement = activator
You can’t perform that action at this time.
0 commit comments