🌐 AI搜索 & 代理 主页
Skip to content

fix(b-dropdown): only apply heading role to header when not a header tag (closes #6273) #6274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacobmllr95 merged 1 commit into from
Dec 30, 2020
Merged

fix(b-dropdown): only apply heading role to header when not a header tag (closes #6273) #6274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/components/dropdown/dropdown-group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Vue, mergeData } from '../../vue'
import { NAME_DROPDOWN_GROUP } from '../../constants/components'
import { PROP_TYPE_ARRAY_OBJECT_STRING, PROP_TYPE_STRING } from '../../constants/props'
import { SLOT_NAME_DEFAULT, SLOT_NAME_HEADER } from '../../constants/slots'
import { isTag } from '../../utils/dom'
import { identity } from '../../utils/identity'
import { hasNormalizedSlot, normalizeSlot } from '../../utils/normalize-slot'
import { omit } from '../../utils/object'
Expand Down Expand Up @@ -29,24 +30,25 @@ export const BDropdownGroup = /*#__PURE__*/ Vue.extend({
functional: true,
props,
render(h, { props, data, slots, scopedSlots }) {
const { id, variant, header, headerTag } = props
const $slots = slots()
const $scopedSlots = scopedSlots || {}
const slotScope = {}
const headerId = props.id ? `_bv_${props.id}_group_dd_header` : null
const headerId = id ? `_bv_${id}_group_dd_header` : null

let $header = h()
if (hasNormalizedSlot(SLOT_NAME_HEADER, $scopedSlots, $slots) || props.header) {
if (hasNormalizedSlot(SLOT_NAME_HEADER, $scopedSlots, $slots) || header) {
$header = h(
props.headerTag,
headerTag,
{
staticClass: 'dropdown-header',
class: [props.headerClasses, { [`text-${props.variant}`]: props.variant }],
class: [props.headerClasses, { [`text-${variant}`]: variant }],
attrs: {
id: headerId,
role: 'heading'
role: isTag(headerTag, 'header') ? null : 'heading'
}
},
normalizeSlot(SLOT_NAME_HEADER, slotScope, $scopedSlots, $slots) || props.header
normalizeSlot(SLOT_NAME_HEADER, slotScope, $scopedSlots, $slots) || header
)
}

Expand All @@ -58,7 +60,7 @@ export const BDropdownGroup = /*#__PURE__*/ Vue.extend({
staticClass: 'list-unstyled',
attrs: {
...(data.attrs || {}),
id: props.id || null,
id,
role: 'group',
'aria-describedby':
[headerId, props.ariaDescribedBy]
Expand Down
7 changes: 4 additions & 3 deletions src/components/dropdown/dropdown-header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Vue, mergeData } from '../../vue'
import { NAME_DROPDOWN_HEADER } from '../../constants/components'
import { PROP_TYPE_STRING } from '../../constants/props'
import { isTag } from '../../utils/dom'
import { omit } from '../../utils/object'
import { makeProp, makePropsConfigurable } from '../../utils/props'

Expand All @@ -23,18 +24,18 @@ export const BDropdownHeader = /*#__PURE__*/ Vue.extend({
functional: true,
props,
render(h, { props, data, children }) {
const { variant } = props
const { tag, variant } = props

return h('li', mergeData(omit(data, ['attrs']), { attrs: { role: 'presentation' } }), [
h(
props.tag,
tag,
{
staticClass: 'dropdown-header',
class: { [`text-${variant}`]: variant },
attrs: {
...(data.attrs || {}),
id: props.id || null,
role: 'heading'
role: isTag(tag, 'header') ? null : 'heading'
},
ref: 'header'
},
Expand Down