Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(dashboard): use dark text on the crash screen reload button

Yudhi Armyndharisfdda5f1da0de
diff --git a/dashboard/src/components/ErrorBoundary.tsx b/dashboard/src/components/ErrorBoundary.tsx
index 4f97630ae..dcf440be5 100644
--- a/dashboard/src/components/ErrorBoundary.tsx
+++ b/dashboard/src/components/ErrorBoundary.tsx
@@ -57,7 +57,7 @@ export class ErrorBoundary extends Component<Props, State> {
gap: '0.5rem',
padding: '0.75rem 1.5rem',
backgroundColor: 'var(--primary)',
- color: 'white',
+ color: '#0f172a',
border: 'none',
borderRadius: '0.5rem',
cursor: 'pointer',
diff --git a/dashboard/src/contrast-pairs.test.ts b/dashboard/src/contrast-pairs.test.ts
index 325cc5221..3d98493d6 100644
--- a/dashboard/src/contrast-pairs.test.ts
+++ b/dashboard/src/contrast-pairs.test.ts
@@ -3,6 +3,7 @@ import assert from 'node:assert/strict';
import { readFileSync, readdirSync } from 'node:fs';
import { fileURLToPath } from 'node:url';
import { dirname, join } from 'node:path';
+import ts from 'typescript';
// The brand green (#25d366) and the amber warning fill are light colours: white on them is 1.98:1 and 2.15:1,
// far under the 4.5:1 AA needs, and the green as text on white is the same 1.98:1. Text and icons on those fills are
@@ -49,6 +50,44 @@ test('no rule sets white text on the brand green or amber fill', () => {
assert.deepEqual(offenders, []);
});
+// The same pair written as an inline style object, e.g. { backgroundColor: 'var(--primary)', color: 'white' }: the
+// stylesheet scan above cannot see it. Returns the line of every object literal that pairs them.
+function inlineWhiteOnFill(source: string): number[] {
+ const file = ts.createSourceFile('inline.tsx', source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
+ const found: number[] = [];
+ const walk = (node: ts.Node): void => {
+ if (ts.isObjectLiteralExpression(node)) {
+ const values: Record<string, string> = {};
+ for (const p of node.properties) {
+ if (ts.isPropertyAssignment(p) && ts.isStringLiteralLike(p.initializer))
+ values[p.name.getText(file)] = p.initializer.text;
+ }
+ if (WHITE.test(values.color ?? '') && LIGHT_FILL.test(values.backgroundColor ?? values.background ?? ''))
+ found.push(file.getLineAndCharacterOfPosition(node.getStart(file)).line + 1);
+ }
+ ts.forEachChild(node, walk);
+ };
+ walk(file);
+ return found;
+}
+
+test('no inline style sets white text on the brand green or amber fill', () => {
+ const offenders = filesUnder(SRC, ['.tsx']).flatMap(full =>
+ inlineWhiteOnFill(readFileSync(full, 'utf8')).map(line => `${full.slice(SRC.length + 1)}:${line}`),
+ );
+ assert.deepEqual(offenders, []);
+});
+
+test('the inline scan sees white on a light fill and leaves dark text alone', () => {
+ assert.deepEqual(
+ inlineWhiteOnFill(`const a = <b style={{ backgroundColor: 'var(--primary)', color: 'white' }} />;`),
+ [1],
+ );
+ assert.deepEqual(inlineWhiteOnFill(`const a = { background: '#f59e0b', color: '#FFF' };`), [1]);
+ assert.deepEqual(inlineWhiteOnFill(`const a = { backgroundColor: 'var(--primary)', color: '#0f172a' };`), []);
+ assert.deepEqual(inlineWhiteOnFill(`const a = { backgroundColor: 'var(--error)', color: 'white' };`), []);
+});
+
test('the brand green is never used as a text colour', () => {
const css = rules()
.filter(r => /^(?:var\(--primary(?:,[^)]*)?\)|#25d366)$/i.test(r.decl.color ?? ''))