From 41e3e266e475a4fbcc4b2215a73d6c17038c0406 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Fri, 28 Feb 2020 12:40:43 +0100
Subject: [PATCH 1/2] Hide user avatars from screen readers in group and room
 user lists.

Like in pill components, these only duplicate information for screen readers, so hide them.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/views/groups/GroupMemberTile.js | 2 +-
 src/components/views/rooms/EntityTile.js       | 2 +-
 src/components/views/rooms/MemberTile.js       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 68513cf0db..659cfb5a91 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -59,7 +59,7 @@ export default createReactClass({
         );
 
         const av = (
-            <BaseAvatar
+            <BaseAvatar aria-hidden="true"
                 name={this.props.member.displayname || this.props.member.userId}
                 idName={this.props.member.userId}
                 width={36} height={36}
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index fd92cb8e57..e04e1d4965 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -175,7 +175,7 @@ const EntityTile = createReactClass({
 
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
 
-        const av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} />;
+        const av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} aria-hidden="true" />;
 
         // The wrapping div is required to make the magic mouse listener work, for some reason.
         return (
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 649e1b4277..1f1d8389b1 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -208,7 +208,7 @@ export default createReactClass({
         }
 
         const av = (
-            <MemberAvatar member={member} width={36} height={36} />
+            <MemberAvatar member={member} width={36} height={36} aria-hidden="true" />
         );
 
         if (member.user) {

From f4937a81cf050995ab3053038e34ffa720289634 Mon Sep 17 00:00:00 2001
From: Marco Zehe <marcozehe@mailbox.org>
Date: Fri, 28 Feb 2020 12:56:53 +0100
Subject: [PATCH 2/2] Fix formatting

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
---
 src/components/views/groups/GroupMemberTile.js | 3 ++-
 src/components/views/rooms/EntityTile.js       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 659cfb5a91..f99d5c768c 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -59,7 +59,8 @@ export default createReactClass({
         );
 
         const av = (
-            <BaseAvatar aria-hidden="true"
+            <BaseAvatar
+                aria-hidden="true"
                 name={this.props.member.displayname || this.props.member.userId}
                 idName={this.props.member.userId}
                 width={36} height={36}
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index e04e1d4965..b6d2bce785 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -175,7 +175,8 @@ const EntityTile = createReactClass({
 
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
 
-        const av = this.props.avatarJsx || <BaseAvatar name={this.props.name} width={36} height={36} aria-hidden="true" />;
+        const av = this.props.avatarJsx ||
+            <BaseAvatar name={this.props.name} width={36} height={36} aria-hidden="true" />;
 
         // The wrapping div is required to make the magic mouse listener work, for some reason.
         return (