Skip to content

Commit c4b7219

Browse files
authored
Merge pull request #38359 from nextcloud/backport/38294/stable25
[stable25] Use aria-expanded correctly on toggle user actions
2 parents 9d20c90 + eb9d0ca commit c4b7219

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

apps/settings/src/components/UserList/UserRow.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@
220220
</NcActions>
221221
<div v-click-outside="hideMenu" class="userPopoverMenuWrapper">
222222
<button class="icon-more"
223+
:aria-expanded="openedMenu"
224+
:aria-label="t('settings', 'Toggle user actions menu')"
223225
@click.prevent="toggleMenu" />
224226
<div :class="{ 'open': openedMenu }" class="popovermenu">
225227
<NcPopoverMenu :menu="userActions" />

apps/settings/src/components/UserList/UserRowSimple.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@
6565
<div class="userPopoverMenuWrapper">
6666
<button v-click-outside="hideMenu"
6767
class="icon-more"
68+
:aria-expanded="openedMenu"
6869
:aria-label="t('settings', 'Toggle user actions menu')"
6970
@click.prevent="toggleMenu" />
70-
<div class="popovermenu" :class="{ 'open': openedMenu }" :aria-expanded="openedMenu">
71+
<div class="popovermenu" :class="{ 'open': openedMenu }">
7172
<NcPopoverMenu :menu="userActions" />
7273
</div>
7374
</div>

dist/settings-users-8351.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-users-8351.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-vue-settings-apps-users-management.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/settings-vue-settings-apps-users-management.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)