Skip to content

fix(QDrawer): route aria-label* attributes to aside element (fix #18058) #18059

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

Open
chrisjung-dev wants to merge 2 commits into
base: dev
Choose a base branch
from
+20 −2
Open

fix(QDrawer): route aria-label* attributes to aside element (fix #18058) #18059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e8de96
fix: route aria-label* attributes to aside element (fix #18058)
chrisjung-dev Jun 27, 2025
a281733
chore: apply codestyles
chrisjung-dev Jun 27, 2025
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
2 changes: 2 additions & 0 deletions ui/playground/src/pages/layout/layout-container-drawer-loop.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
side="right"
v-model="drawer"
bordered
aria-label="This is an ARIA-Label"
test-attribute="This is an Test attribute"
>
<div v-for="n in contentSize * 2 + 5" :key="n">
Drawer {{ n }} / {{ contentSize * 2 + 5 }}
Expand Down
2 changes: 2 additions & 0 deletions ui/playground/src/pages/layout/layout-drawer-loop.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
side="right"
v-model="drawer"
bordered
aria-label="This is an ARIA-Label"
test-attribute="This is an Test attribute"
>
<div v-for="n in contentSize" :key="n">
Drawer {{ n }} / {{ contentSize }}
Expand Down
18 changes: 16 additions & 2 deletions ui/src/components/drawer/QDrawer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,23 @@ export default createComponent({
}

const mini = isMini.value === true && slots.mini !== void 0

const sortedAttrs = Object.entries(attrs).reduce(
(acc, [ key, value ]) => {
if (key.startsWith('aria-label')) {
acc.labelAttibutes[ key ] = value
}
else {
acc.other[ key ] = value
}
return acc
},
{ labelAttibutes: {}, other: {} }
)

const content = [
h('div', {
...attrs,
...sortedAttrs.other,
key: '' + mini, // required otherwise Vue will not diff correctly
class: [
contentClass.value,
Expand All @@ -696,7 +710,7 @@ export default createComponent({
child.push(
hDir(
'aside',
{ ref: 'content', class: classes.value, style: style.value },
{ ref: 'content', class: classes.value, style: style.value, ...sortedAttrs.labelAttributes },
content,
'contentclose',
props.noSwipeClose !== true && belowBreakpoint.value === true,
Expand Down