[verified] redesign trash with deadline groups

frontend/src/visual-polish.test.ts

@@ -71,7 +71,7 @@ describe('approved five-detail polish', () => {
     expect(css).toMatch(/@media\(max-width:930px\)\{[\s\S]*?\.countdown-focus\{[^}]*height:140px/)
   })
 
-  it('uses approved Today-sourced page headers for task lists and Upcoming without changing Trash IA', () => {
+  it('uses approved Today-sourced page headers and the grouped Trash layout', () => {
     expect(app).toContain('v-if="activeView===\'tasks\' || activeView===\'upcoming\'" class="list-page-context"')
     expect(app).toContain('<h1 class="list-page-title" :title="activeName">{{ activeName }}</h1>')
     expect(app).toContain('<p class="list-page-summary">{{ taskOpenTotal === null ? \'待完成统计暂不可用\' : `还有 ${taskOpenTotal} 项待完成` }}</p>')
@@ -105,7 +105,8 @@ describe('approved five-detail polish', () => {
     expect(app).toContain(":aria-labelledby=\"activeView==='today' ? 'today-tasks-heading' : (activeView==='tasks' || activeView==='upcoming') ? 'task-list-title' : undefined\"")
     const taskTopbar = app.slice(app.indexOf('<header class="topbar"'), app.indexOf('</header>'))
     expect(taskTopbar).not.toContain('CompletedFilterPill v-if="activeView!==\'today\'"')
-    expect(app).toContain('v-if="activeView===\'trash\'" class="list-toolbar"')
+    expect(app).toContain('v-if="activeView===\'trash\'" class="trash-page-context"')
+    expect(app).toContain('class="trash-groups"')
     expect(css).toContain('.list-page-context{width:min(100%,630px);margin:0 auto 0;display:grid;grid-template-columns:minmax(0,1fr) auto;align-items:start;gap:0 16px}')
     expect(css).toContain('.list-page-title{margin:0;font-size:34px;line-height:1.15;font-weight:700;letter-spacing:-.035em}')
     expect(css).toContain('.list-page-summary{margin:8px 0 18px;color:var(--muted);font-size:13px}')
@@ -143,11 +144,10 @@ describe('approved five-detail polish', () => {
 
   it('uses one 58px plain-list contract for active task and habit rows', () => {
     expect(app).toContain("class=\"task-list plain-list\"")
-    expect(app).toContain("'task-row--trash':activeView==='trash'")
-    expect(app).toContain(':role="activeView===\'trash\' ? undefined : \'button\'"')
-    expect(app).toContain(':tabindex="activeView===\'trash\' ? undefined : 0"')
-    expect(app).toContain('@click="activeView===\'trash\'?undefined:selectTaskUnlessSwiped(node.task)"')
-    expect(app).toContain('v-if="activeView!==\'trash\'" class="task-check"')
+    expect(app).toContain('class="task-row task-row--trash"')
+    expect(app).toContain('class="task-main" role="button" tabindex="0"')
+    expect(app).toContain('@click="selectTaskUnlessSwiped(node.task)"')
+    expect(app).toContain('class="task-check" :aria-label="node.task.completed')
     expect(habits).toContain('class=\"habit-list plain-list\"')
     expect(habits).toContain('class=\"habit-row habit-row--full swipeable\"')
     expect(css).toContain('.plain-list{display:grid;gap:0;background:transparent;border:0;border-radius:0;box-shadow:none;overflow:visible}')