Skip to content

Replay your coding agent sessions as a map and a timeline

a11y(viewer): raise secondary text and focus ring contrast to WCAG AA

rav4nnd9763cc2967f
diff --git a/viewer/src/components/ui/button.tsx b/viewer/src/components/ui/button.tsx
index 02fb387..cacba2b 100644
--- a/viewer/src/components/ui/button.tsx
+++ b/viewer/src/components/ui/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
import { cn } from '@/lib/utils';
const buttonVariants = cva(
- 'motion-tap inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-[10px] text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ds-brand-subtler disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
+ 'motion-tap inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-[10px] text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ds-brand-subtle focus-visible:ring-offset-1 focus-visible:ring-offset-ds-surface-white disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
{
variants: {
variant: {
diff --git a/viewer/src/components/ui/input.tsx b/viewer/src/components/ui/input.tsx
index 9b55289..96fd20d 100644
--- a/viewer/src/components/ui/input.tsx
+++ b/viewer/src/components/ui/input.tsx
@@ -8,7 +8,7 @@ const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<'input'>>(
<input
type={type}
className={cn(
- 'flex h-9 w-full rounded-md border border-ds-border-subtlest bg-ds-surface-white px-3 py-1 text-base text-ds-text-darker shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-ds-text-default placeholder:text-ds-text-subtle focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ds-brand-subtler focus-visible:ring-offset-1 focus-visible:ring-offset-ds-surface-white disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+ 'flex h-9 w-full rounded-md border border-ds-border-subtlest bg-ds-surface-white px-3 py-1 text-base text-ds-text-darker shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-ds-text-default placeholder:text-ds-text-subtle focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ds-brand-subtle focus-visible:ring-offset-1 focus-visible:ring-offset-ds-surface-white disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
className
)}
ref={ref}
diff --git a/viewer/src/explorer/FixNowDialog.tsx b/viewer/src/explorer/FixNowDialog.tsx
index 26749c5..b0a131b 100644
--- a/viewer/src/explorer/FixNowDialog.tsx
+++ b/viewer/src/explorer/FixNowDialog.tsx
@@ -74,7 +74,7 @@ export function FixNowDialog({ c }: { c: SampleComment }) {
aria-checked={delivery === d.id}
onClick={() => setDelivery(d.id)}
className={cn(
- 'flex cursor-pointer flex-col gap-0.5 rounded-lg border p-3 text-left transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ds-brand-subtler',
+ 'flex cursor-pointer flex-col gap-0.5 rounded-lg border p-3 text-left transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ds-brand-subtle focus-visible:ring-offset-1 focus-visible:ring-offset-ds-surface-white',
delivery === d.id
? 'border-ds-brand-subtler bg-ds-brand-lightest'
: 'border-ds-border-subtlest hover:bg-ds-gray-subtlest'
diff --git a/viewer/src/explorer/ReviewLoopBlock.tsx b/viewer/src/explorer/ReviewLoopBlock.tsx
index bff07bb..17d013f 100644
--- a/viewer/src/explorer/ReviewLoopBlock.tsx
+++ b/viewer/src/explorer/ReviewLoopBlock.tsx
@@ -229,7 +229,7 @@ function SampleComment({
aria-pressed={picked}
aria-label={`Light the path to ${c.file} ${c.line} on the map`}
onClick={onPick}
- className="-m-1 flex cursor-pointer flex-col gap-1.5 rounded p-1 text-left transition-colors hover:bg-ds-gray-subtlest focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ds-brand-subtler"
+ className="-m-1 flex cursor-pointer flex-col gap-1.5 rounded p-1 text-left transition-colors hover:bg-ds-gray-subtlest focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ds-brand-subtle focus-visible:ring-offset-1 focus-visible:ring-offset-ds-surface-white"
>
{body}
</button>
diff --git a/viewer/src/explorer/SessionList.tsx b/viewer/src/explorer/SessionList.tsx
index 4266ab0..c0cd990 100644
--- a/viewer/src/explorer/SessionList.tsx
+++ b/viewer/src/explorer/SessionList.tsx
@@ -264,7 +264,7 @@ function SessionRow({
aria-current={selected ? 'true' : undefined}
onClick={onSelect}
onDoubleClick={onOpen}
- className="flex cursor-pointer flex-col gap-1 rounded-lg p-2 text-left focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ds-brand-subtler"
+ className="flex cursor-pointer flex-col gap-1 rounded-lg p-2 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ds-brand-subtle focus-visible:ring-offset-1 focus-visible:ring-offset-ds-surface-white"
>
<span className="line-clamp-2 ds-text-body-xs-medium text-ds-text-darker">
{sessionTitle(s)}
diff --git a/viewer/src/styles/contrast.test.ts b/viewer/src/styles/contrast.test.ts
new file mode 100644
index 0000000..e900209
--- /dev/null
+++ b/viewer/src/styles/contrast.test.ts
@@ -0,0 +1,83 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, expect, it } from 'vitest';
+import { ds } from '../../tailwind.config';
+
+type Theme = 'light' | 'dark';
+
+const css = fs.readFileSync(path.resolve(__dirname, 'index.css'), 'utf8');
+
+const SURFACES = {
+ card: 'var(--ds-surface-white)',
+ page: 'var(--primitive-white-off-white)',
+ 'raised row': 'var(--ds-gray-subtlest)',
+ 'selected card': 'var(--ds-brand-lightest)',
+};
+const SECONDARY_TEXT = {
+ 'text-ds-text-subtle': ds.text.subtle,
+ 'text-ds-text-subtler': ds.text.subtler,
+ '--ds-text-subtle': 'var(--ds-text-subtle)',
+ '--ds-text-subtler': 'var(--ds-text-subtler)',
+};
+
+function themeVars(theme: Theme): Map<string, string> {
+ const source = css.replace(/\/\*[\s\S]*?\*\//g, '');
+ const vars = new Map<string, string>();
+ for (const [, selector, body] of source.matchAll(/(?:^|[{}])\s*(:root|\.dark)\s*\{([^{}]*)\}/g)) {
+ if (selector === '.dark' && theme === 'light') continue;
+ for (const [, name, value] of body.matchAll(/(--[\w-]+)\s*:\s*([^;]+);/g)) {
+ vars.set(name, value.trim());
+ }
+ }
+ return vars;
+}
+
+function resolve(vars: Map<string, string>, value: string): string {
+ const ref = /^var\((--[\w-]+)\)$/.exec(value);
+ if (!ref) return value;
+ const next = vars.get(ref[1]);
+ if (next === undefined) throw new Error(`${ref[1]} is not defined`);
+ return resolve(vars, next);
+}
+
+function luminance(hex: string): number {
+ const match = /^#([0-9a-f]{6})$/i.exec(hex);
+ if (!match) throw new Error(`${hex} is not a #rrggbb colour`);
+ const n = parseInt(match[1], 16);
+ const [r, g, b] = [n >> 16, (n >> 8) & 255, n & 255].map((v) => {
+ const c = v / 255;
+ return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
+ });
+ return 0.2126 * r + 0.7152 * g + 0.0722 * b;
+}
+
+function contrast(a: string, b: string): number {
+ const [hi, lo] = [luminance(a), luminance(b)].sort((x, y) => y - x);
+ return (hi + 0.05) / (lo + 0.05);
+}
+
+describe.each<Theme>(['light', 'dark'])('%s theme', (theme) => {
+ const vars = themeVars(theme);
+ const color = (value: string) => resolve(vars, value);
+
+ it.each(
+ Object.entries(SECONDARY_TEXT).flatMap(([text, value]) =>
+ Object.entries(SURFACES).map(([surface, bg]) => [text, surface, value, bg])
+ )
+ )('%s on the %s surface meets WCAG AA for normal text', (_text, _surface, value, bg) => {
+ expect(contrast(color(value), color(bg)), `${color(value)} on ${color(bg)}`).toBeGreaterThanOrEqual(4.5);
+ });
+
+ it.each(Object.entries(SURFACES))(
+ 'the focus ring colour reaches 3:1 on the %s surface',
+ (_surface, bg) => {
+ expect(contrast(color(ds.brand.subtle), color(bg))).toBeGreaterThanOrEqual(3);
+ }
+ );
+
+ it('keeps subtler quieter than subtle, and subtle quieter than default', () => {
+ const onCard = (text: string) => contrast(color(text), color(SURFACES.card));
+ expect(onCard(ds.text.subtler)).toBeLessThan(onCard(ds.text.subtle));
+ expect(onCard(ds.text.subtle)).toBeLessThan(onCard(ds.text.default));
+ });
+});
diff --git a/viewer/src/styles/index.css b/viewer/src/styles/index.css
index fe45cff..66fa842 100644
--- a/viewer/src/styles/index.css
+++ b/viewer/src/styles/index.css
@@ -52,6 +52,8 @@
--primitive-gray-300: #bdbdbd;
--primitive-gray-400: #989898;
--primitive-gray-500: #7b7b7b;
+ --primitive-gray-600: #707070;
+ --primitive-gray-700: #575757;
--primitive-gray-800: #404040;
--primitive-gray-900: #2c2c2c;
--primitive-purple-100: #ece8ff;
@@ -83,8 +85,8 @@
--ds-border-default: var(--primitive-gray-800);
--ds-border-darker: var(--primitive-gray-900);
- --ds-text-subtler: var(--primitive-gray-300);
- --ds-text-subtle: var(--primitive-gray-500);
+ --ds-text-subtler: var(--primitive-gray-600);
+ --ds-text-subtle: var(--primitive-gray-700);
--ds-text-default: var(--primitive-gray-800);
--ds-text-darker: var(--primitive-gray-900);
@@ -224,6 +226,8 @@
--primitive-gray-300: #525252;
--primitive-gray-400: #656565;
--primitive-gray-500: #7b7b7b;
+ --primitive-gray-600: #919191;
+ --primitive-gray-700: #b5b5b5;
--primitive-gray-800: #dbdbdb;
--primitive-gray-900: #efeef0;
/* Purple: dark-mode values of the semantic purple ramp. */
diff --git a/viewer/tailwind.config.ts b/viewer/tailwind.config.ts
index be0de7b..22f5e31 100644
--- a/viewer/tailwind.config.ts
+++ b/viewer/tailwind.config.ts
@@ -3,7 +3,7 @@ import tailwindPlugin from 'tailwindcss/plugin';
import type { Config } from 'tailwindcss';
/** Design token colors mapped to primitive CSS vars. */
-const ds = {
+export const ds = {
gray: {
lightest: 'var(--primitive-gray-50)',
subtlest: 'var(--primitive-gray-100)',
@@ -58,8 +58,8 @@ const ds = {
},
text: {
subtlest: 'var(--primitive-gray-100)',
- subtler: 'var(--primitive-gray-300)',
- subtle: 'var(--primitive-gray-500)',
+ subtler: 'var(--primitive-gray-600)',
+ subtle: 'var(--primitive-gray-700)',
default: 'var(--primitive-gray-800)',
darker: 'var(--primitive-gray-900)',
},