From 1b0e2e827989b4b3afddee499be7de93be1dcf0d Mon Sep 17 00:00:00 2001
From: zhangshengming <1464963064@qq.com>
Date: Sun, 18 Oct 2026 16:40:35 +0800
Subject: [PATCH] fix(client): make timeline events keyboard accessible

---
 packages/client/src/pages/timeline.vue        |  18 ++-
 ...ue-885-timeline-keyboard-selection.test.ts | 124 ++++++++++++++++++
 2 files changed, 139 insertions(+), 3 deletions(-)
 create mode 100644 tests/integration/client/issue-885-timeline-keyboard-selection.test.ts

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index d1b936302..f4bd13909 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -400,9 +400,16 @@ onUnmounted(() => {
                     :prerender="20"
                   >
                     <template #default="{ item: event }">
-                      <div
-                        class="relative h-7 cursor-pointer pl-3 pr-3 flex items-center gap-3 text-3.25 hover:bg-#8881"
+                      <button
+                        class="timeline-event relative h-7 w-full cursor-pointer border-0 bg-transparent pl-3 pr-3 py-0 color-base flex items-center gap-3 text-left text-3.25 hover:bg-#8881"
                         :class="{ 'bg-#8882! hover:bg-#8882': selectedEvent?.id === event.id }"
+                        type="button"
+                        :aria-pressed="selectedEvent?.id === event.id"
+                        :aria-label="
+                          [event.title ?? event.label, event.subtitle, formatClock(event.time)]
+                            .filter(Boolean)
+                            .join(', ')
+                        "
                         @click="selectEvent(event.id)"
                       >
                         <span
@@ -458,7 +465,7 @@ onUnmounted(() => {
                           <span class="op50">{{ formatClock(event.time).slice(0, 6) }}</span
                           >{{ formatClock(event.time).slice(6) }}
                         </span>
-                      </div>
+                      </button>
                     </template>
                   </RecycleScroller>
                 </div>
@@ -531,6 +538,11 @@ onUnmounted(() => {
 </template>
 
 <style scoped>
+.timeline-event:focus-visible {
+  outline: 2px solid #00a86f;
+  outline-offset: -2px;
+}
+
 @keyframes pulse {
   50% {
     opacity: 0.5;
diff --git a/tests/integration/client/issue-885-timeline-keyboard-selection.test.ts b/tests/integration/client/issue-885-timeline-keyboard-selection.test.ts
new file mode 100644
index 000000000..8f53987d8
--- /dev/null
+++ b/tests/integration/client/issue-885-timeline-keyboard-selection.test.ts
@@ -0,0 +1,124 @@
+// @vitest-environment happy-dom
+
+import type { TimelineEntry } from '../../../packages/client/src/composables/devtools-client'
+import { flushPromises, mount } from '@vue/test-utils'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { ref } from 'vue'
+import Timeline from '../../../packages/client/src/pages/timeline.vue'
+
+const { inspectTimelineEvent } = vi.hoisted(() => ({ inspectTimelineEvent: vi.fn() }))
+
+vi.mock('../../../packages/client/src/composables/devtools-client', () => ({
+  useDevtoolsClient: () => ({
+    apps: ref([]),
+    clearTimelineEvents: vi.fn(),
+    formatValue: vi.fn(),
+    isTimelineLayerEnabled: () => true,
+    inspectTimelineEvent,
+    selectedTimelineLayerId: ref('component-event'),
+    selectedAppId: ref('app:0'),
+    selectTimelineLayer: vi.fn(),
+    timeline: ref<TimelineEntry[]>([
+      {
+        id: 1,
+        type: 'timeline:eventAdded',
+        time: 1_000,
+        label: 'submit',
+        title: 'Form submit',
+        subtitle: 'start',
+        layerId: 'component-event',
+        groupId: 1,
+      },
+      {
+        id: 2,
+        type: 'timeline:eventAdded',
+        time: 1_010,
+        label: 'submit',
+        title: 'Form submit',
+        subtitle: 'end',
+        layerId: 'component-event',
+        groupId: 1,
+      },
+      {
+        id: 3,
+        type: 'timeline:eventAdded',
+        time: 1_020,
+        label: 'change',
+        layerId: 'component-event',
+      },
+    ]),
+    timelineLayers: ref([]),
+    timelineRecording: ref(true),
+    toggleTimelineLayerEnabled: vi.fn(),
+    toggleTimelineRecording: vi.fn(),
+  }),
+}))
+
+let wrapper: ReturnType<typeof mount> | undefined
+afterEach(() => wrapper?.unmount())
+
+function mountTimeline() {
+  wrapper = mount(Timeline, {
+    attachTo: document.body,
+    global: {
+      directives: { tooltip: {} },
+      stubs: {
+        AppList: true,
+        Pane: { template: '<div><slot /></div>' },
+        Splitpanes: { template: '<div><slot /></div>' },
+        RecycleScroller: {
+          props: ['items'],
+          methods: { scrollToItem: vi.fn() },
+          template:
+            '<ul class="event-list"><li v-for="item in items" :key="item.id"><slot :item="item" /></li></ul>',
+        },
+      },
+    },
+  })
+  return wrapper
+}
+
+// https://github.com/vuejs/devtools/issues/885
+describe('Timeline event keyboard selection', () => {
+  it('renders focusable native buttons with complete names and the current selection', async () => {
+    const page = mountTimeline()
+    await flushPromises()
+    const rows = page.get('.event-list').findAll('li > button')
+
+    expect(rows).toHaveLength(3)
+    for (const row of rows) {
+      const button = row.element as HTMLButtonElement
+      expect(row.attributes('type')).toBe('button')
+      expect(button.tabIndex).toBe(0)
+      button.focus()
+      expect(document.activeElement).toBe(row.element)
+    }
+    expect(rows.map((row) => row.attributes('aria-pressed'))).toEqual(['false', 'false', 'true'])
+    expect(rows[0]!.attributes('aria-label')).toContain('Form submit, start')
+    // Grouped rows omit the repeated visible title, but must retain it in their accessible name.
+    expect(rows[1]!.text()).not.toContain('Form submit')
+    expect(rows[1]!.attributes('aria-label')).toContain('Form submit, end')
+    expect(rows[2]!.attributes('aria-label')).toContain('change')
+    expect(inspectTimelineEvent).not.toHaveBeenCalled()
+  })
+
+  it('selects and inspects the activated event, including repeated activation', async () => {
+    const page = mountTimeline()
+    await flushPromises()
+    const rows = page.get('.event-list').findAll('li > button')
+
+    expect(rows).toHaveLength(3)
+
+    await rows[0]!.trigger('click')
+    expect(rows.map((row) => row.attributes('aria-pressed'))).toEqual(['true', 'false', 'false'])
+    expect(inspectTimelineEvent).toHaveBeenLastCalledWith(expect.objectContaining({ id: 1 }))
+
+    await rows[1]!.trigger('click')
+    expect(rows.map((row) => row.attributes('aria-pressed'))).toEqual(['false', 'true', 'false'])
+    expect(inspectTimelineEvent).toHaveBeenLastCalledWith(expect.objectContaining({ id: 2 }))
+
+    await rows[1]!.trigger('click')
+    expect(rows[1]!.attributes('aria-pressed')).toBe('true')
+    expect(inspectTimelineEvent).toHaveBeenCalledTimes(3)
+  })
+})