Skip to content

Commit 026bb6f

Browse files
Tofandelrstoenescu
andauthored
fix(QBadge): doesn't render slot if has label (#13462)
* fix(QBadge): doesn't render slot if has label This is particularly problematic when using ```vue <QBadge label="Foo"><QMenu>Doesn't show</QMenu></QBadge> ``` * Remove one too many space * Update QBadge.js Co-authored-by: Razvan Stoenescu <razvan.stoenescu@gmail.com>
1 parent 0d55196 commit 026bb6f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ui/src/components/badge/QBadge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { h, computed } from 'vue'
22

33
import { createComponent } from '../../utils/private/create.js'
4-
import { hSlot } from '../../utils/private/render.js'
4+
import { hMergeSlot } from '../../utils/private/render.js'
55

66
const alignValues = [ 'top', 'middle', 'bottom' ]
77

@@ -55,6 +55,6 @@ export default createComponent({
5555
style: style.value,
5656
role: 'alert',
5757
'aria-label': props.label
58-
}, props.label !== void 0 ? props.label : hSlot(slots.default))
58+
}, hMergeSlot(slots.default, props.label !== void 0 ? [ props.label ] : [])))
5959
}
6060
})

0 commit comments

Comments
 (0)