From 5e3d62a6b8b0732696ade841b88a07d01fe3ac83 Mon Sep 17 00:00:00 2001
From: zeeshaun <1766264+zeeshaun@users.noreply.github.com>
Date: Tue, 2 Jun 2026 16:49:12 -0500
Subject: [PATCH] Improve chat and match confirm accessibility

---
 components/chat/ChatLobby.vue                 | 33 ++++++++-
 components/matchmaking/MatchmakingConfirm.vue | 73 ++++++++++++++++++-
 i18n/locales/en.json                          |  3 +
 3 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/components/chat/ChatLobby.vue b/components/chat/ChatLobby.vue
index 8f805f04..13cadb33 100644
--- a/components/chat/ChatLobby.vue
+++ b/components/chat/ChatLobby.vue
@@ -72,14 +72,20 @@ import Empty from "~/components/ui/empty/Empty.vue";
           <button
             type="button"
             class="underline-offset-2 hover:underline"
+            aria-haspopup="dialog"
+            :aria-expanded="showParticipants ? 'true' : 'false'"
+            :aria-label="participantsToggleLabel"
             @click.stop="showParticipants = !showParticipants"
           >
-            {{ participantsCount }} in chat
+            {{ participantsSummaryLabel }}
           </button>
         </div>
       </div>
       <div
         v-if="showParticipants"
+        role="dialog"
+        aria-modal="false"
+        :aria-label="participantsPopupLabel"
         class="absolute z-50 top-11 left-2 right-2 rounded-md border bg-popover text-popover-foreground shadow-md p-3 text-xs max-h-52 overflow-y-auto"
       >
         <div
@@ -88,7 +94,7 @@ import Empty from "~/components/ui/empty/Empty.vue";
         >
           {{ $t("chat.no_participants", "No one else is in this chat yet.") }}
         </div>
-        <ul v-else class="space-y-1.5">
+        <ul v-else class="space-y-1.5" role="list">
           <li
             v-for="user in participants"
             :key="(user as any).steam_id"
@@ -183,9 +189,12 @@ import Empty from "~/components/ui/empty/Empty.vue";
         <button
           type="button"
           class="underline-offset-2 hover:underline"
+          aria-haspopup="dialog"
+          :aria-expanded="showParticipants ? 'true' : 'false'"
+          :aria-label="participantsToggleLabel"
           @click.stop="showParticipants = !showParticipants"
         >
-          {{ participantsCount }} in chat
+          {{ participantsSummaryLabel }}
         </button>
       </div>
       <NuxtLink
@@ -198,6 +207,9 @@ import Empty from "~/components/ui/empty/Empty.vue";
     </div>
     <div
       v-if="showParticipants"
+      role="dialog"
+      aria-modal="false"
+      :aria-label="participantsPopupLabel"
       class="absolute z-20 top-10 right-4 left-4 rounded-md border bg-popover text-popover-foreground shadow-md p-3 text-xs max-h-52 overflow-y-auto"
     >
       <div
@@ -206,7 +218,7 @@ import Empty from "~/components/ui/empty/Empty.vue";
       >
         {{ $t("chat.no_participants", "No one else is in this chat yet.") }}
       </div>
-      <ul v-else class="space-y-1.5">
+      <ul v-else class="space-y-1.5" role="list">
         <li
           v-for="user in participants"
           :key="(user as any).steam_id"
@@ -397,6 +409,19 @@ export default {
     participantsCount() {
       return this.participants.length;
     },
+    participantsSummaryLabel() {
+      return this.$t("layouts.chat_panel.participants_in_chat", {
+        count: this.participantsCount,
+      });
+    },
+    participantsPopupLabel() {
+      return this.$t("chat.participants", "Chat participants");
+    },
+    participantsToggleLabel() {
+      return this.showParticipants
+        ? this.$t("chat.hide_participants", "Hide chat participants")
+        : this.$t("chat.show_participants", "Show chat participants");
+    },
     matchInfo() {
       if (this.type !== "match") {
         return null;
diff --git a/components/matchmaking/MatchmakingConfirm.vue b/components/matchmaking/MatchmakingConfirm.vue
index 6d45d778..3577fc26 100644
--- a/components/matchmaking/MatchmakingConfirm.vue
+++ b/components/matchmaking/MatchmakingConfirm.vue
@@ -1,12 +1,29 @@
 <script setup lang="ts">
-import { AlertDialog, AlertDialogContent } from "@/components/ui/alert-dialog";
+import {
+  AlertDialog,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from "@/components/ui/alert-dialog";
+import { X } from "lucide-vue-next";
 </script>
 
 <template>
-  <AlertDialog :open="!!shouldShow">
+  <AlertDialog :open="!!shouldShow" @update:open="handleOpenChange">
     <AlertDialogContent
       class="!max-w-md !gap-0 overflow-visible !border-0 !bg-transparent !p-0 !shadow-none"
+      @keydown.esc.stop.prevent="dismiss"
     >
+      <AlertDialogTitle class="sr-only">
+        {{ $t("matchmaking.match_found") }}
+      </AlertDialogTitle>
+      <AlertDialogDescription class="sr-only">
+        {{
+          confirmation?.isReady
+            ? $t("matchmaking.waiting_on_others")
+            : $t("matchmaking.waiting_for_players")
+        }}
+      </AlertDialogDescription>
       <div
         class="relative overflow-hidden rounded-lg border border-border px-6 py-8 [backdrop-filter:blur(10px)] [background:linear-gradient(180deg,hsl(var(--card)/0.95)_0%,hsl(var(--card)/0.85)_100%)]"
         :class="
@@ -153,6 +170,15 @@ import { AlertDialog, AlertDialogContent } from "@/components/ui/alert-dialog";
             {{ $t("matchmaking.locked_in") }}
           </div>
         </div>
+
+        <button
+          type="button"
+          class="absolute right-3 top-3 z-20 inline-flex h-6 w-6 items-center justify-center rounded text-muted-foreground transition-colors hover:text-foreground"
+          :aria-label="$t('common.close')"
+          @click="dismiss"
+        >
+          <X class="h-4 w-4" />
+        </button>
       </div>
     </AlertDialogContent>
   </AlertDialog>
@@ -163,11 +189,13 @@ import { useMatchmakingStore } from "~/stores/MatchmakingStore";
 import { useMatchReadyModal } from "~/composables/useMatchReadyModal";
 import socket from "~/web-sockets/Socket";
 import { useSound } from "~/composables/useSound";
+import { useAuthStore } from "~/stores/AuthStore";
 
 export default {
   data() {
     return {
       remainingSeconds: 0,
+      dismissedConfirmationId: undefined as string | undefined,
       routedConfirmedId: undefined as string | undefined,
       countdownInterval: undefined as NodeJS.Timeout | undefined,
       playCountdownSound: useSound().playCountdownSound,
@@ -179,8 +207,25 @@ export default {
     confirmation() {
       return useMatchmakingStore().joinedMatchmakingQueues?.confirmation;
     },
+    showPref(): boolean {
+      return useAuthStore().me?.show_match_ready_modal !== false;
+    },
+    manuallyOpened(): boolean {
+      return useMatchReadyModal().manuallyOpened.value;
+    },
     shouldShow(): boolean {
-      return !!this.confirmation && !this.confirmation.matchId;
+      if (!this.confirmation || this.confirmation.matchId) {
+        return false;
+      }
+
+      if (
+        this.dismissedConfirmationId === this.confirmation.confirmationId &&
+        !this.manuallyOpened
+      ) {
+        return false;
+      }
+
+      return this.showPref || this.manuallyOpened;
     },
     formattedCountdown(): string {
       const total = Math.max(0, this.remainingSeconds);
@@ -207,7 +252,9 @@ export default {
           if (this.countdownInterval) {
             clearInterval(this.countdownInterval);
           }
-          this.playMatchFoundSound();
+          if (this.shouldShow) {
+            this.playMatchFoundSound();
+          }
           this.updateCountdown();
           this.countdownInterval = setInterval(this.updateCountdown, 1000);
         }
@@ -224,8 +271,22 @@ export default {
         }
       },
     },
+    shouldShow(show) {
+      if (show) {
+        this.updateCountdown();
+      }
+    },
   },
   methods: {
+    dismiss() {
+      this.dismissedConfirmationId = this.confirmation?.confirmationId;
+      useMatchReadyModal().closeMatchReadyModal();
+    },
+    handleOpenChange(open: boolean) {
+      if (!open) {
+        this.dismiss();
+      }
+    },
     ready() {
       if (!this.confirmation) {
         return;
@@ -235,6 +296,10 @@ export default {
       });
     },
     updateCountdown() {
+      if (!this.shouldShow) {
+        return;
+      }
+
       if (
         this.confirmation?.expiresAt &&
         this.confirmation.confirmed !== this.confirmation.players
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index e826dc9d..0817da1d 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -3399,6 +3399,9 @@
     "start_the_conversation": "Say something to start the conversation.",
     "jump_to_new": "Jump to new",
     "new_messages": "New messages",
+    "participants": "Chat participants",
+    "show_participants": "Show chat participants",
+    "hide_participants": "Hide chat participants",
     "organizers": {
       "title": "Organizer Chat",
       "no_access": "You do not have access to this page.",