-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41122 from nextcloud/enh/a11y/separate-profile-entry
enh(a11y): Separate profile and user status user menu entries
- Loading branch information
Showing
12 changed files
with
220 additions
and
145 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| <!-- | ||
| - @copyright 2023 Christopher Ng <chrng8@gmail.com> | ||
| - | ||
| - @author Christopher Ng <chrng8@gmail.com> | ||
| - | ||
| - @license AGPL-3.0-or-later | ||
| - | ||
| - This program is free software: you can redistribute it and/or modify | ||
| - it under the terms of the GNU Affero General Public License as | ||
| - published by the Free Software Foundation, either version 3 of the | ||
| - License, or (at your option) any later version. | ||
| - | ||
| - This program is distributed in the hope that it will be useful, | ||
| - but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| - GNU Affero General Public License for more details. | ||
| - | ||
| - You should have received a copy of the GNU Affero General Public License | ||
| - along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| - | ||
| --> | ||
|
|
||
| <template> | ||
| <li :id="id" | ||
| class="menu-entry"> | ||
| <component :is="profileEnabled ? 'a' : 'span'" | ||
| class="menu-entry__wrapper" | ||
| :class="{ | ||
| active, | ||
| 'menu-entry__wrapper--link': profileEnabled, | ||
| }" | ||
| :href="profileEnabled ? href : undefined" | ||
| @click.exact="handleClick"> | ||
| <span class="menu-entry__content"> | ||
| <span class="menu-entry__displayname">{{ displayName }}</span> | ||
| <NcLoadingIcon v-if="loading" :size="18" /> | ||
| </span> | ||
| <span v-if="profileEnabled">{{ name }}</span> | ||
| </component> | ||
| </li> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { loadState } from '@nextcloud/initial-state' | ||
| import { getCurrentUser } from '@nextcloud/auth' | ||
| import { subscribe, unsubscribe } from '@nextcloud/event-bus' | ||
|
|
||
| import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js' | ||
|
|
||
| const { profileEnabled } = loadState('user_status', 'profileEnabled', false) | ||
|
|
||
| export default { | ||
| name: 'ProfileUserMenuEntry', | ||
|
|
||
| components: { | ||
| NcLoadingIcon, | ||
| }, | ||
|
|
||
| props: { | ||
| id: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| name: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| href: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| active: { | ||
| type: Boolean, | ||
| required: true, | ||
| }, | ||
| }, | ||
|
|
||
| data() { | ||
| return { | ||
| profileEnabled, | ||
| displayName: getCurrentUser().displayName, | ||
| loading: false, | ||
| } | ||
| }, | ||
|
|
||
| mounted() { | ||
| subscribe('settings:profile-enabled:updated', this.handleProfileEnabledUpdate) | ||
| subscribe('settings:display-name:updated', this.handleDisplayNameUpdate) | ||
| }, | ||
|
|
||
| beforeDestroy() { | ||
| unsubscribe('settings:profile-enabled:updated', this.handleProfileEnabledUpdate) | ||
| unsubscribe('settings:display-name:updated', this.handleDisplayNameUpdate) | ||
| }, | ||
|
|
||
| methods: { | ||
| handleClick() { | ||
| if (this.profileEnabled) { | ||
| this.loading = true | ||
| } | ||
| }, | ||
|
|
||
| handleProfileEnabledUpdate(profileEnabled) { | ||
| this.profileEnabled = profileEnabled | ||
| }, | ||
|
|
||
| handleDisplayNameUpdate(displayName) { | ||
| this.displayName = displayName | ||
| }, | ||
| }, | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| .menu-entry { | ||
| &__wrapper { | ||
| box-sizing: border-box; | ||
| display: inline-flex; | ||
| flex-direction: column; | ||
| align-items: flex-start !important; | ||
| padding: 10px 12px 5px 12px !important; | ||
| height: var(--header-menu-item-height); | ||
| color: var(--color-text-maxcontrast); | ||
|
|
||
| &--link { | ||
| height: calc(var(--header-menu-item-height) * 1.5) !important; | ||
| color: var(--color-main-text); | ||
| } | ||
| } | ||
|
|
||
| &__content { | ||
| display: inline-flex; | ||
| gap: 0 10px; | ||
| } | ||
|
|
||
| &__displayname { | ||
| font-weight: bold; | ||
| } | ||
| } | ||
| </style> |
Oops, something went wrong.