+40
-30
lines changedFilter options
+40
-30
lines changed Original file line number Diff line number Diff line change
@@ -12,21 +12,20 @@ export const props = {
12 12
export const BDropdownDivider = /*#__PURE__*/ Vue.extend({
13 13
name: 'BDropdownDivider',
14 14
functional: true,
15 -
inheritAttrs: false,
16 15
props,
17 16
render(h, { props, data }) {
18 -
return h('li', { attrs: { role: 'presentation' } }, [
19 -
h(
20 -
props.tag,
21 -
mergeData(data, {
22 -
staticClass: 'dropdown-divider',
23 -
attrs: {
24 -
role: 'separator',
25 -
'aria-orientation': 'horizontal'
26 -
},
27 -
ref: 'divider'
28 -
})
29 -
)
17 +
const $attrs = data.attrs || {}
18 +
data.attrs = {}
19 +
return h('li', mergeData(data, { attrs: { role: 'presentation' } }), [
20 +
h(props.tag, {
21 +
staticClass: 'dropdown-divider',
22 +
attrs: {
23 +
...$attrs,
24 +
role: 'separator',
25 +
'aria-orientation': 'horizontal'
26 +
},
27 +
ref: 'divider'
28 +
})
30 29
])
31 30
}
32 31
})
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ import { BForm, props as formProps } from '../form/form'
5 5
export const BDropdownForm = /*#__PURE__*/ Vue.extend({
6 6
name: 'BDropdownForm',
7 7
functional: true,
8 -
inheritAttrs: false,
9 8
props: {
10 9
...formProps,
11 10
disabled: {
@@ -14,20 +13,26 @@ export const BDropdownForm = /*#__PURE__*/ Vue.extend({
14 13
}
15 14
},
16 15
render(h, { props, data, children }) {
17 -
return h('li', { attrs: { role: 'presentation' } }, [
16 +
const $attrs = data.attrs || {}
17 +
const $listeners = data.on || {}
18 +
data.attrs = {}
19 +
data.on = {}
20 +
return h('li', mergeData(data, { attrs: { role: 'presentation' } }), [
18 21
h(
19 22
BForm,
20 -
mergeData(data, {
23 +
{
21 24
ref: 'form',
22 25
staticClass: 'b-dropdown-form',
23 26
class: { disabled: props.disabled },
24 27
props,
25 28
attrs: {
29 +
...$attrs,
26 30
disabled: props.disabled,
27 31
// Tab index of -1 for keyboard navigation
28 32
tabindex: props.disabled ? null : '-1'
29 -
}
30 -
}),
33 +
},
34 +
on: $listeners
35 +
},
31 36
children
32 37
)
33 38
])
@@ -33,11 +33,12 @@ export const props = {
33 33
export const BDropdownGroup = /*#__PURE__*/ Vue.extend({
34 34
name: 'BDropdownGroup',
35 35
functional: true,
36 -
inheritAttrs: false,
37 36
props,
38 37
render(h, { props, data, slots, scopedSlots }) {
39 38
const $slots = slots()
40 39
const $scopedSlots = scopedSlots || {}
40 +
const $attrs = data.attrs || {}
41 +
data.attrs = {}
41 42
let header
42 43
let headerId = null
43 44
@@ -62,18 +63,19 @@ export const BDropdownGroup = /*#__PURE__*/ Vue.extend({
62 63
.join(' ')
63 64
.trim()
64 65 65 -
return h('li', { attrs: { role: 'presentation' } }, [
66 +
return h('li', mergeData(data, { attrs: { role: 'presentation' } }), [
66 67
header || h(),
67 68
h(
68 69
'ul',
69 -
mergeData(data, {
70 +
{
70 71
staticClass: 'list-unstyled',
71 72
attrs: {
73 +
...$attrs,
72 74
id: props.id || null,
73 75
role: 'group',
74 76
'aria-describedby': adb || null
75 77
}
76 -
}),
78 +
},
77 79
normalizeSlot('default', {}, $scopedSlots, $slots)
78 80
)
79 81
])
@@ -20,23 +20,25 @@ export const props = {
20 20
export const BDropdownHeader = /*#__PURE__*/ Vue.extend({
21 21
name: 'BDropdownHeader',
22 22
functional: true,
23 -
inheritAttrs: false,
24 23
props,
25 24
render(h, { props, data, children }) {
26 -
return h('li', { attrs: { role: 'presentation' } }, [
25 +
const $attrs = data.attrs || {}
26 +
data.attrs = {}
27 +
return h('li', mergeData(data, { attrs: { role: 'presentation' } }), [
27 28
h(
28 29
props.tag,
29 -
mergeData(data, {
30 +
{
30 31
staticClass: 'dropdown-header',
31 32
class: {
32 33
[`text-${props.variant}`]: props.variant
33 34
},
34 35
attrs: {
36 +
...$attrs,
35 37
id: props.id || null,
36 38
role: 'heading'
37 39
},
38 40
ref: 'header'
39 -
}),
41 +
},
40 42
children
41 43
)
42 44
])
@@ -5,7 +5,6 @@ import { mergeData } from 'vue-functional-data-merge'
5 5
export const BDropdownText = /*#__PURE__*/ Vue.extend({
6 6
name: 'BDropdownText',
7 7
functional: true,
8 -
inheritAttrs: false,
9 8
props: {
10 9
tag: {
11 10
type: String,
@@ -17,17 +16,20 @@ export const BDropdownText = /*#__PURE__*/ Vue.extend({
17 16
}
18 17
},
19 18
render(h, { props, data, children }) {
20 -
return h('li', { attrs: { role: 'presentation' } }, [
19 +
const $attrs = data.attrs || {}
20 +
data.attrs = {}
21 +
return h('li', mergeData(data, { attrs: { role: 'presentation' } }), [
21 22
h(
22 23
props.tag,
23 -
mergeData(data, {
24 +
{
24 25
staticClass: 'b-dropdown-text',
25 26
class: {
26 27
[`text-${props.variant}`]: props.variant
27 28
},
28 29
props,
30 +
attrs: $attrs,
29 31
ref: 'text'
30 -
}),
32 +
},
31 33
children
32 34
)
33 35
])
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4