File tree Expand file tree Collapse file tree 3 files changed +19
-21
lines changed
packages/vuetify/src/components Expand file tree Collapse file tree 3 files changed +19
-21
lines changed Original file line number Diff line number Diff line change @@ -192,7 +192,7 @@ export default {
192
192
}
193
193
}
194
194
195
- if ( this . $scopedSlots . activator && ! this . $slots . activator ) {
195
+ if ( this . $scopedSlots . activator && this . $scopedSlots . activator . length ) {
196
196
const activator = this . $scopedSlots . activator ( { on : listeners } )
197
197
this . activatorNode = activator
198
198
return activator
@@ -204,7 +204,7 @@ export default {
204
204
'v-dialog__activator--disabled' : this . disabled
205
205
} ,
206
206
on : listeners
207
- } , [ this . $slots . activator ] )
207
+ } , this . $slots . activator )
208
208
}
209
209
} ,
210
210
Original file line number Diff line number Diff line change @@ -15,23 +15,21 @@ export default {
15
15
}
16
16
}
17
17
18
- if ( this . $slots . activator ) {
19
- const options = {
20
- staticClass : 'v-menu__activator' ,
21
- 'class' : {
22
- 'v-menu__activator--active' : this . hasJustFocused || this . isActive ,
23
- 'v-menu__activator--disabled' : this . disabled
24
- } ,
25
- ref : 'activator' ,
26
- on : listeners
27
- }
28
-
29
- return this . $createElement ( 'div' , options , this . $slots . activator )
30
- } else if ( this . $scopedSlots . activator ) {
18
+ if ( this . $scopedSlots . activator && this . $scopedSlots . activator . length ) {
31
19
const activator = this . $scopedSlots . activator ( { on : listeners } )
32
20
this . activatorNode = activator
33
21
return activator
34
22
}
23
+
24
+ return this . $createElement ( 'div' , {
25
+ staticClass : 'v-menu__activator' ,
26
+ 'class' : {
27
+ 'v-menu__activator--active' : this . hasJustFocused || this . isActive ,
28
+ 'v-menu__activator--disabled' : this . disabled
29
+ } ,
30
+ ref : 'activator' ,
31
+ on : listeners
32
+ } , this . $slots . activator )
35
33
} ,
36
34
37
35
genTransition ( ) {
Original file line number Diff line number Diff line change @@ -158,16 +158,16 @@ export default {
158
158
}
159
159
}
160
160
161
- if ( this . $slots . activator ) {
162
- return this . $createElement ( 'span' , {
163
- on : listeners ,
164
- ref : 'activator'
165
- } , this . $slots . activator )
166
- } else if ( this . $scopedSlots . activator ) {
161
+ if ( this . $scopedSlots . activator && this . $scopedSlots . activator . length ) {
167
162
const activator = this . $scopedSlots . activator ( { on : listeners } )
168
163
this . activatorNode = activator
169
164
return activator
170
165
}
166
+
167
+ return this . $createElement ( 'span' , {
168
+ on : listeners ,
169
+ ref : 'activator'
170
+ } , this . $slots . activator )
171
171
}
172
172
} ,
173
173
You can’t perform that action at this time.
0 commit comments