Merge pull request #3618 from nextcloud/fix/a11y-non-interactive-avatar

skjnldsv · web-flow · commit 89b74370ea7f · 2023-01-06T11:06:19.000+01:00
diff --git a/src/components/NcAvatar/NcAvatar.vue b/src/components/NcAvatar/NcAvatar.vue
@@ -384,10 +384,12 @@ export default {
 	},
 	computed: {
 		avatarAriaLabel() {
+			if (!this.hasMenu) {
+				return
+			}
 			if (this.ariaLabel !== null) {
 				return this.ariaLabel
 			}
-
 			if (this.hasStatus && this.showUserStatus && this.showUserStatusCompact) {
 				return t('Avatar of {displayName}, {status}', { displayName: this.displayName ?? this.user, status: this.userStatus.status })
 			}

Original file line number	Diff line number	Diff line change
`@@ -384,10 +384,12 @@ export default {`
`384`	`384`	`},`
`385`	`385`	`computed: {`
`386`	`386`	`avatarAriaLabel() {`
	`387`	`+ if (!this.hasMenu) {`
	`388`	`+ return`
	`389`	`+ }`
`387`	`390`	`if (this.ariaLabel !== null) {`
`388`	`391`	`return this.ariaLabel`
`389`	`392`	`}`
`390`		`-`
`391`	`393`	`if (this.hasStatus && this.showUserStatus && this.showUserStatusCompact) {`
`392`	`394`	`return t('Avatar of {displayName}, {status}', { displayName: this.displayName ?? this.user, status: this.userStatus.status })`
`393`	`395`	`}`