From 1ad3fcf20c142b98849ebdbf6d0de311bbed1be0 Mon Sep 17 00:00:00 2001
From: Lucie <25330882+lihbr@users.noreply.github.com>
Date: Fri, 25 Nov 2022 18:46:25 -0500
Subject: [PATCH] feat(a11y): improve focus state (#116)

---
 components/account/AccountAvatar.vue     |  4 +--
 components/nav/NavSide.vue               | 36 ++++++++++++------------
 components/nav/NavTitle.vue              |  2 +-
 components/status/StatusActionButton.vue | 11 +++++---
 components/status/StatusActions.vue      | 14 ++++-----
 components/status/StatusAttachment.vue   | 30 ++++++++++++--------
 components/status/StatusCard.vue         |  2 +-
 layouts/default.vue                      |  2 +-
 8 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/components/account/AccountAvatar.vue b/components/account/AccountAvatar.vue
index 45ef44114..5cf74ad78 100644
--- a/components/account/AccountAvatar.vue
+++ b/components/account/AccountAvatar.vue
@@ -18,8 +18,8 @@ defineOptions({
         :account="account"
         absolute top-0 left-0 z-10
         op0 pointer-events-none rotate--2 mt--100vh
-        font-normal delay-300 duration-300 transition transform
-        group-hover="pointer-events-auto op100 rotate-0 mt-0"
+        font-normal delay-300 duration-300 transition transform invisible
+        group-hover="visible pointer-events-auto op100 rotate-0 mt-0"
         translate="x-[calc(-1rem-1px)] y-[calc(-1rem-1px)]"
         class="ease-[cubic-bezier(0.4, 0.0, 0.2, 1)]"
         style="transform-origin: calc(1rem + 1px) calc(0.75rem + 1px);"
diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 2d41a2d3a..df320acec 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -4,58 +4,58 @@
 <template>
   <div px3 py4 flex="~ col gap2" text-lg>
     <template v-if="currentUser">
-      <NuxtLink to="/home" active-class="text-primary" group>
-        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active>
+      <NuxtLink to="/home" active-class="text-primary" group focus:outline-none>
+        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active group-focus-visible:ring="2 current">
           <div i-ri:home-5-line />
           <span>Home</span>
         </div>
       </NuxtLink>
-      <NuxtLink to="/notifications" active-class="text-primary" group>
-        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active>
+      <NuxtLink to="/notifications" active-class="text-primary" group focus:outline-none>
+        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active group-focus-visible:ring="2 current">
           <div i-ri:notification-4-line />
           <span>Notifications</span>
         </div>
       </NuxtLink>
     </template>
-    <NuxtLink to="/explore" active-class="text-primary" group>
-      <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active>
+    <NuxtLink to="/explore" active-class="text-primary" group focus:outline-none>
+      <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active group-focus-visible:ring="2 current">
         <div i-ri:hashtag />
         <span>Explore</span>
       </div>
     </NuxtLink>
-    <NuxtLink group to="/public/local" active-class="text-primary">
-      <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active>
+    <NuxtLink to="/public/local" active-class="text-primary" group focus:outline-none>
+      <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active group-focus-visible:ring="2 current">
         <div i-ri:group-2-line />
         <span>Local</span>
       </div>
     </NuxtLink>
-    <NuxtLink to="/public" active-class="text-primary" group>
-      <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active>
+    <NuxtLink to="/public" active-class="text-primary" group focus:outline-none>
+      <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active group-focus-visible:ring="2 current">
         <div i-ri:earth-line />
         <span>Federated</span>
       </div>
     </NuxtLink>
     <template v-if="currentUser">
-      <NuxtLink to="/conversations" active-class="text-primary" group>
-        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active>
+      <NuxtLink to="/conversations" active-class="text-primary" group focus:outline-none>
+        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active group-focus-visible:ring="2 current">
           <div i-ri:at-line />
           <span>Conversations</span>
         </div>
       </NuxtLink>
-      <NuxtLink to="/favourites" active-class="text-primary" group>
-        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active>
+      <NuxtLink to="/favourites" active-class="text-primary" group focus:outline-none>
+        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active group-focus-visible:ring="2 current">
           <div i-ri:heart-3-line />
           <span>Favorites</span>
         </div>
       </NuxtLink>
-      <NuxtLink to="/bookmarks" active-class="text-primary" group>
-        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active>
+      <NuxtLink to="/bookmarks" active-class="text-primary" group focus:outline-none>
+        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 group-hover:bg-active group-focus-visible:ring="2 current">
           <div i-ri:bookmark-line />
           <span>Bookmarks</span>
         </div>
       </NuxtLink>
-      <NuxtLink :to="getAccountPath(currentUser.account)" active-class="text-primary" group>
-        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 hover:bg-active>
+      <NuxtLink :to="getAccountPath(currentUser.account)" active-class="text-primary" group focus:outline-none>
+        <div flex w-fit px5 py2 gap2 items-center transition-100 rounded-10 hover:bg-active group-focus-visible:ring="2 current">
           <AccountAvatar :account="currentUser.account" h="1.2em" />
           <span>Profile</span>
         </div>
diff --git a/components/nav/NavTitle.vue b/components/nav/NavTitle.vue
index fa22f24fc..3897f2abd 100644
--- a/components/nav/NavTitle.vue
+++ b/components/nav/NavTitle.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- Use external to force refresh page and jump to top of timeline -->
-  <NuxtLink flex items-center text-2xl gap-2 to="/" external>
+  <NuxtLink flex px3 py2 items-center text-2xl gap-2 hover:bg-active focus-visible:ring="2 current" rounded-full to="/" external>
     <img aria-label="Elk Logo" src="/logo.svg" w-10 h-10>
     <div>
       Elk <sup text-sm italic op50 mt-1>alpha</sup>
diff --git a/components/status/StatusActionButton.vue b/components/status/StatusActionButton.vue
index 794845c0b..7128b618b 100644
--- a/components/status/StatusActionButton.vue
+++ b/components/status/StatusActionButton.vue
@@ -8,6 +8,7 @@ defineProps<{
   groupHover: string
   active?: boolean
   disabled?: boolean
+  as?: string
 }>()
 
 defineOptions({
@@ -16,15 +17,17 @@ defineOptions({
 </script>
 
 <template>
-  <button
-    flex gap-1 items-center rounded :hover="`op100 ${hover}`" group
+  <component
+    :is="as || 'button'"
+    flex gap-1 items-center rounded group
+    :hover="`op100 ${hover}`" focus:outline-none :focus-visible="`op100 ${hover}`"
     :class="active ? [color, 'op100'] : 'op50'"
     v-bind="$attrs"
   >
-    <div rounded-full p2 :group-hover="groupHover">
+    <div rounded-full p2 :group-hover="groupHover" :group-focus-visible="groupHover" group-focus-visible:ring="2 current">
       <div :class="[active && activeIcon ? activeIcon : icon, { 'pointer-events-none': disabled }]" />
     </div>
 
     <span v-if="text">{{ text }}</span>
-  </button>
+  </component>
 </template>
diff --git a/components/status/StatusActions.vue b/components/status/StatusActions.vue
index 18e891dfd..c706127ed 100644
--- a/components/status/StatusActions.vue
+++ b/components/status/StatusActions.vue
@@ -117,13 +117,13 @@ function editStatus() {
 <template>
   <div flex justify-between>
     <CommonTooltip placement="bottom" content="Reply">
-      <RouterLink :to="getStatusPath(status)">
-        <StatusActionButton
-          :text="status.repliesCount"
-          color="text-blue" hover="text-blue" group-hover="bg-blue/10"
-          icon="i-ri:chat-3-line"
-        />
-      </RouterLink>
+      <StatusActionButton
+        as="router-link"
+        :to="getStatusPath(status)"
+        :text="status.repliesCount"
+        color="text-blue" hover="text-blue" group-hover="bg-blue/10"
+        icon="i-ri:chat-3-line"
+      />
     </CommonTooltip>
 
     <CommonTooltip placement="bottom" content="Boost">
diff --git a/components/status/StatusAttachment.vue b/components/status/StatusAttachment.vue
index 74f8a71a4..168438d10 100644
--- a/components/status/StatusAttachment.vue
+++ b/components/status/StatusAttachment.vue
@@ -55,21 +55,29 @@ const aspectRatio = computed(() => {
     </audio>
   </template>
   <template v-else>
-    <CommonBlurhash
-      :blurhash="attachment.blurhash"
-      class="status-attachment-image"
-      :src="attachment.url || attachment.previewUrl!"
-      :alt="attachment.description!"
-      :style="{
-        aspectRatio,
-      }"
-      border="~ base"
-      object-cover
+    <button
+      focus:outline-none
+      focus:ring="2 primary inset"
       rounded-lg
       @click="openImagePreviewDialog({
         src: attachment.url || attachment.previewUrl!,
         alt: attachment.description!,
       })"
-    />
+    >
+      <CommonBlurhash
+        :blurhash="attachment.blurhash"
+        class="status-attachment-image"
+        :src="attachment.url || attachment.previewUrl!"
+        :alt="attachment.description!"
+        :style="{
+          aspectRatio,
+        }"
+        border="~ base"
+        rounded-lg
+        h-full
+        w-full
+        object-cover
+      />
+    </button>
   </template>
 </template>
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index ca4aaf13b..0f5e405a8 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -68,7 +68,7 @@ const timeago = useTimeAgo(() => status.createdAt, {
 </script>
 
 <template>
-  <div ref="el" flex flex-col gap-2 px-4 transition-100 :class="{ 'hover:bg-active': hover }" @click="onclick">
+  <div ref="el" flex flex-col gap-2 px-4 transition-100 :class="{ 'hover:bg-active': hover }" tabindex="0" focus:outline-none focus-visible:ring="2 primary" @click="onclick" @keydown.enter="onclick">
     <div v-if="rebloggedBy" pl8>
       <div flex="~ wrap" gap-1 items-center text-gray:75 text-sm>
         <div i-ri:repeat-fill mr-1 />
diff --git a/layouts/default.vue b/layouts/default.vue
index 53744b438..186728c9e 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,7 +4,7 @@
       <div class="hidden md:block w-1/4 zen-hide" relative>
         <div sticky top-0 h-screen flex="~ col">
           <slot name="left">
-            <NavTitle px6 pt6 pb4 />
+            <NavTitle mx3 mt4 mb2 self-start />
             <div flex="~ col" overflow-y-auto>
               <NavSide />
               <PublishButton v-if="currentUser" m5 />