Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions ui-web/src/features/tasks/BoardList.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,29 @@ describe('the task board', () => {
.toEqual([['Which fix?', 1], ['Clear it too?', 1]])
})

it('draws a question s Ignore as an icon button, keeping its accessible name', async () => {
board.groups = [asking(group('a', NOW - 3e6, 'needs_you'), ['Which fix?'])]
await draw()

const label = 'gui.tasks.board.ignore_question {"n":1}'
const ignore = document.querySelector('.tkq .tkqignore') as HTMLButtonElement
expect(ignore.textContent).toBe('')
expect(ignore.querySelector('svg')).not.toBeNull()
expect(ignore.getAttribute('aria-label')).toBe(label)
expect(ignore.getAttribute('title')).toBe(label)
})

it('draws the whole-group Ignore as the same icon button', async () => {
board.groups = [group('a', NOW - 3e6, 'needs_you')]
await draw()

const ignore = document.querySelector('.tkaskbtn[data-kind="ignore"]') as HTMLButtonElement
expect(ignore.textContent).toBe('')
expect(ignore.querySelector('svg')).not.toBeNull()
expect(ignore.getAttribute('aria-label')).toBe('gui.tasks.board.ignore')
expect(ignore.getAttribute('title')).toBe('gui.tasks.board.ignore')
})

it('an Ignore sets its one question aside, and the answer draft drops it too', async () => {
board.groups = [asking(group('a', NOW - 3e6, 'needs_you'), ['Which fix?', 'Clear it too?'])]
await draw()
Expand Down
44 changes: 28 additions & 16 deletions ui-web/src/features/tasks/BoardList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* desk's to perform.
*/

import { ArrowRight01Icon, ArrowRight02Icon, ArrowTurnBackwardIcon, Tick02Icon } from '@hugeicons/core-free-icons'
import { ArrowRight01Icon, ArrowRight02Icon, ArrowTurnBackwardIcon, Cancel01Icon, Tick02Icon } from '@hugeicons/core-free-icons'
import { useEffect, useRef, useState, useSyncExternalStore } from 'react'

import { Icon } from '../../components/Icon'
Expand Down Expand Up @@ -175,30 +175,42 @@ function Questions({ group, verbs }: { group: TaskGroup; verbs: ThreadVerbs }):
if (!step || !questions.length) return null
return (
<ol className="tkasklist" aria-label={t('gui.tasks.board.questions')}>
{questions.map((q, n) => (
<li key={`${n}:${q}`} className="tkq">
<span className="tkqtext">{q}</span>
<button
type="button"
className="tkqignore"
aria-label={t('gui.tasks.board.ignore_question', { n: n + 1 })}
onClick={() => verbs.ignore(group, step, q)}
>
{t('gui.tasks.board.ignore')}
</button>
</li>
))}
{questions.map((q, n) => {
const label = t('gui.tasks.board.ignore_question', { n: n + 1 })
return (
<li key={`${n}:${q}`} className="tkq">
<span className="tkqtext">{q}</span>
<button
type="button"
className="tkqignore"
aria-label={label}
title={label}
onClick={() => verbs.ignore(group, step, q)}
>
<Icon icon={Cancel01Icon} size={11} stroke={2} />
</button>
</li>
)
})}
</ol>
)
}

function AskButtons({ group, verbs }: { group: TaskGroup; verbs: ThreadVerbs }): JSX.Element {
const named = (group.steps[group.steps.length - 1]?.questions ?? []).length > 0
const ignoreLabel = t('gui.tasks.board.ignore')
return (
<>
{named ? null : (
<button type="button" className="tkaskbtn" data-kind="ignore" onClick={() => verbs.setStatus(group, 'idle')}>
{t('gui.tasks.board.ignore')}
<button
type="button"
className="tkaskbtn"
data-kind="ignore"
aria-label={ignoreLabel}
title={ignoreLabel}
onClick={() => verbs.setStatus(group, 'idle')}
>
<Icon icon={Cancel01Icon} size={11} stroke={2} />
</button>
)}
<button type="button" className="tkaskbtn" data-kind="answer" onClick={() => verbs.answer(group)}>
Expand Down
28 changes: 21 additions & 7 deletions ui-web/src/features/tasks/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -749,20 +749,34 @@
}
.tkqtext { flex: 1; min-width: 0; color: var(--text); font-size: 12.5px; line-height: 1.5; overflow-wrap: anywhere; }
.tkqtext::before { content: counter(tkq) ". "; color: var(--muted); }
.tkqignore {
.tkqignore,
.tkaskbtn[data-kind="ignore"] {
display: inline-flex;
align-items: center;
justify-content: center;
flex: none;
padding: 1px 8px;
width: 22px;
height: 22px;
padding: 0;
border: 1px solid var(--line);
border-radius: 6px;
background: var(--paper);
color: var(--muted);
font: inherit;
font-size: 11.5px;
white-space: nowrap;
cursor: pointer;
transition: background .14s ease, border-color .14s ease, color .14s ease;
}
.tkqignore:hover,
.tkaskbtn[data-kind="ignore"]:hover {
border-color: var(--faint);
background: var(--raised);
color: var(--text);
}
.tkqignore:hover { border-color: var(--faint); color: var(--text); }
.tkaskacts { display: flex; justify-content: flex-end; gap: 6px; margin-top: 8px; }
.tkqignore:active,
.tkaskbtn[data-kind="ignore"]:active { background: var(--line-soft); }
.tkqignore:focus-visible,
.tkaskbtn[data-kind="ignore"]:focus-visible { outline: 2px solid var(--amber); outline-offset: 1px; }
.tkaskacts { display: flex; align-items: center; justify-content: flex-end; gap: 6px; margin-top: 8px; }
.tkaskbtn {
padding: 3px 12px;
white-space: nowrap;
Expand Down Expand Up @@ -1011,7 +1025,7 @@
margin-top: 2px;
}
.tkthreadacts .tkgroupact:not(:only-child) { margin-right: auto; }
.tkaskpair { display: inline-flex; gap: 6px; }
.tkaskpair { display: inline-flex; align-items: center; gap: 6px; }
.tkthread .tkasklist { margin-bottom: 8px; }
.tkgroupact {
display: inline-flex;
Expand Down
Loading