From 54db8752d28e323c8d061773312c978682be55b2 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sun, 15 Sep 2019 18:27:52 -0700
Subject: [PATCH] fix: remove avatars from tab order / screenreaders (#1491)

* fix: remove avatars from tab order / screenreaders

* fixup
---
 src/routes/_components/compose/ComposeAuthor.html | 11 ++++++++---
 src/routes/_components/status/StatusSidebar.html  |  2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/routes/_components/compose/ComposeAuthor.html b/src/routes/_components/compose/ComposeAuthor.html
index 360b741b..0e69bf6a 100644
--- a/src/routes/_components/compose/ComposeAuthor.html
+++ b/src/routes/_components/compose/ComposeAuthor.html
@@ -1,14 +1,17 @@
 <a {href}
    rel="prefetch"
    class="compose-box-avatar {loaded ? 'loaded' : 'not-loaded'}"
-   aria-hidden={true}
+   aria-hidden="true"
+   tabindex="-1"
    on:click="onClick(event)"
 >
+  <!-- the avatar is duplicated information, so hide from tab order and screenreaders -->
   <Avatar account={verifyCredentials} size="small"/>
 </a>
 <a class="compose-box-display-name {loaded ? 'loaded' : 'not-loaded'}"
    {href}
-   aria-hidden={!loaded}
+   aria-busy={!loaded}
+   aria-live="off"
    rel="prefetch"
    on:click="onClick(event)"
 >
@@ -16,7 +19,9 @@
 </a>
 
 <span class="compose-box-handle {loaded ? 'loaded' : 'not-loaded'}"
-      aria-hidden={!loaded} >
+      aria-busy={!loaded}
+      aria-live="off"
+>
   {'@' + verifyCredentials.acct}
 </span>
 <style>
diff --git a/src/routes/_components/status/StatusSidebar.html b/src/routes/_components/status/StatusSidebar.html
index a1dfe630..44b55d6a 100644
--- a/src/routes/_components/status/StatusSidebar.html
+++ b/src/routes/_components/status/StatusSidebar.html
@@ -3,7 +3,9 @@
    rel="prefetch"
    href="/accounts/{originalAccountId}"
    aria-hidden="true"
+   tabindex="-1"
 >
+  <!-- the avatar is duplicated information, so hide from tab order and screenreaders -->
   <Avatar account={originalAccount}
           isLink="true"
           {size} />