From 9509e1ccdad19acb145fcd549c897b42456815db Mon Sep 17 00:00:00 2001
From: shuaiyafei <16618929+shuaiyafei@users.noreply.github.com>
Date: Fri, 2 Oct 2026 13:01:28 +0800
Subject: [PATCH] fix(client): make app list keyboard accessible

---
 .../src/components/components/AppList.vue     | 46 +++++++------
 tests/integration/client/app-list.test.ts     | 65 +++++++++++++++++++
 2 files changed, 90 insertions(+), 21 deletions(-)
 create mode 100644 tests/integration/client/app-list.test.ts

diff --git a/packages/client/src/components/components/AppList.vue b/packages/client/src/components/components/AppList.vue
index a4a8b314..ba1218b2 100644
--- a/packages/client/src/components/components/AppList.vue
+++ b/packages/client/src/components/components/AppList.vue
@@ -20,30 +20,34 @@ function frameLabel(frame: DevtoolsExtensionFrameDescriptor): string {
 <template>
   <div class="no-scrollbar h-full min-h-0 select-none overflow-auto">
     <ul v-if="frames.length > 1" class="m-0 list-none border-b border-base p-2">
-      <li
-        v-for="frame in frames"
-        :key="frame.frameId"
-        class="selectable-item"
-        :class="{ active: activeFrameId === frame.frameId }"
-        :title="frame.url"
-        @click="selectFrame(frame.frameId)"
-      >
-        <span class="min-w-0 truncate">
-          {{ frameLabel(frame) }}
-        </span>
+      <li v-for="frame in frames" :key="frame.frameId">
+        <button
+          class="selectable-item w-full border-0 bg-transparent color-inherit text-left font-[inherit]"
+          :class="{ active: activeFrameId === frame.frameId }"
+          type="button"
+          :title="frame.url"
+          :aria-pressed="activeFrameId === frame.frameId"
+          @click="selectFrame(frame.frameId)"
+        >
+          <span class="min-w-0 truncate">
+            {{ frameLabel(frame) }}
+          </span>
+        </button>
       </li>
     </ul>
     <ul class="m-0 list-none p-2">
-      <li
-        v-for="app in apps"
-        :key="app.id"
-        class="selectable-item"
-        :class="{ active: selectedAppId === app.id }"
-        @click="selectApp(app.id)"
-      >
-        <span class="min-w-0 truncate">
-          {{ app.name }}{{ app.version ? ` (${app.version})` : '' }}
-        </span>
+      <li v-for="app in apps" :key="app.id">
+        <button
+          class="selectable-item w-full border-0 bg-transparent color-inherit text-left font-[inherit]"
+          :class="{ active: selectedAppId === app.id }"
+          type="button"
+          :aria-pressed="selectedAppId === app.id"
+          @click="selectApp(app.id)"
+        >
+          <span class="min-w-0 truncate">
+            {{ app.name }}{{ app.version ? ` (${app.version})` : '' }}
+          </span>
+        </button>
       </li>
     </ul>
   </div>
diff --git a/tests/integration/client/app-list.test.ts b/tests/integration/client/app-list.test.ts
new file mode 100644
index 00000000..86c71e56
--- /dev/null
+++ b/tests/integration/client/app-list.test.ts
@@ -0,0 +1,65 @@
+// @vitest-environment happy-dom
+
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+import AppList from '../../../packages/client/src/components/components/AppList.vue'
+
+const activeFrameId = ref('frame:top')
+const selectedAppId = ref('app:one')
+const selectApp = vi.fn()
+const selectFrame = vi.fn()
+
+vi.mock('../../../packages/client/src/composables/devtools-client', () => ({
+  useDevtoolsClient: () => ({
+    activeFrameId,
+    apps: ref([
+      { id: 'app:one', name: 'First app', version: '3.5.0' },
+      { id: 'app:two', name: 'Second app' },
+    ]),
+    frames: ref([
+      { frameId: 'frame:top', main: true },
+      { frameId: 'frame:nested', url: 'https://example.com/nested' },
+    ]),
+    selectApp,
+    selectFrame,
+    selectedAppId,
+  }),
+}))
+
+describe('AppList', () => {
+  beforeEach(() => {
+    activeFrameId.value = 'frame:top'
+    selectedAppId.value = 'app:one'
+    selectApp.mockClear()
+    selectFrame.mockClear()
+  })
+
+  it('exposes frame and app entries as focusable selection buttons', async () => {
+    const wrapper = mount(AppList, { attachTo: document.body })
+    const buttons = wrapper.findAll('button')
+
+    expect(buttons.map((button) => button.text())).toEqual([
+      'Top frame',
+      'example.com/nested',
+      'First app (3.5.0)',
+      'Second app',
+    ])
+    expect(buttons.map((button) => button.attributes('aria-pressed'))).toEqual([
+      'true',
+      'false',
+      'true',
+      'false',
+    ])
+
+    buttons[0]!.element.focus()
+    expect(document.activeElement).toBe(buttons[0]!.element)
+
+    await buttons[1]!.trigger('click')
+    await buttons[3]!.trigger('click')
+    expect(selectFrame).toHaveBeenCalledWith('frame:nested')
+    expect(selectApp).toHaveBeenCalledWith('app:two')
+
+    wrapper.unmount()
+  })
+})