π OpenHands: AI-Driven Development
fix(lint): theme hook diagnostics and status badges (#18534)
Engel Nyst433edb9a1f03
diff --git a/__tests__/components/shared/hook-execution-event-message.test.tsx b/__tests__/components/shared/hook-execution-event-message.test.tsxindex e15c528f79..78e9075e6d 100644--- a/__tests__/components/shared/hook-execution-event-message.test.tsx+++ b/__tests__/components/shared/hook-execution-event-message.test.tsx@@ -1,6 +1,9 @@import { render, screen } from "@testing-library/react";+import { compile } from "@tailwindcss/node";+import { readFile } from "node:fs/promises";+import { resolve } from "node:path";import type { ReactNode } from "react";-import { describe, expect, it, vi } from "vitest";+import { beforeAll, describe, expect, it, vi } from "vitest";import { HookExecutionEventMessage } from "#/components/shared/hook-execution-event-message";import { I18nKey } from "#/i18n/declaration";import type {@@ -62,7 +65,54 @@ const makeHookEvent = (const renderHookEvent = (overrides: Partial<HookExecutionEvent> = {}) =>render(<HookExecutionEventMessage event={makeHookEvent(overrides)} />);+let compiler: Awaited<ReturnType<typeof compile>>;++beforeAll(async () => {+ compiler = await compile(+ await readFile(resolve("src/tailwind.css"), "utf8"),+ { base: resolve("src"), onDependency: () => {} },+ );+});+describe("hook execution event message", () => {+ it.each([+ ["blocked", { blocked: true, success: false }, "--oh-feedback-warning"],+ ["ok", { blocked: false, success: true }, "--oh-feedback-success"],+ ["failed", { blocked: false, success: false }, "--oh-feedback-error"],+ ] as const)(+ "builds theme feedback ink and tint for the %s badge",+ (status, event, role) => {+ renderHookEvent(event);+ const badge = screen.getByText(status);++ // Compile the component's emitted classes through the production stylesheet.+ // This checks the CSS contract without prescribing a utility class spelling.+ const css = compiler.build([...badge.classList]);+ const declarations = [+ ...css.matchAll(/\.((?:\\.|[\w-])+)\s*\{([^}]+)\}/g),+ ]+ .filter(([, selector]) =>+ badge.classList.contains(selector.replace(/\\(.)/g, "$1")),+ )+ .map(([, , body]) => body)+ .join("\n");++ const property = (name: "color" | "background-color") =>+ [+ ...declarations.matchAll(+ new RegExp(String.raw`(?:^|\n)\s*${name}:\s*([^;]+);`, "g"),+ ),+ ]+ .at(-1)?.[1]+ .trim();++ expect(property("color")).toBe(`var(${role})`);+ expect(property("background-color")).toBe(+ `color-mix(in oklab, var(${role}) 10%, transparent)`,+ );+ },+ );+it("renders nothing for an event from another event family", () => {const event = {id: "state-event-1",@@ -96,10 +146,7 @@ describe("hook execution event message", () => {`${icon} ${I18nKey.HOOK$HOOK_LABEL}: ${hookType}`,);expect(message).toHaveAttribute("data-success", "success");- expect(screen.getByText("ok")).toHaveClass(- "bg-green-900/50",- "text-green-300",- );+ expect(screen.getByText("ok")).toBeInTheDocument();});it("shows all available metadata for a blocked hook", () => {@@ -123,15 +170,7 @@ describe("hook execution event message", () => {`π« ${I18nKey.HOOK$HOOK_LABEL}: PostToolUse`,);expect(screen.getByText("(terminal)")).toBeInTheDocument();- expect(screen.getByText("blocked")).toHaveClass(- "ml-2",- "px-1",- "py-0.5",- "rounded",- "text-xs",- "bg-amber-900/50",- "text-amber-300",- );+ expect(screen.getByText("blocked")).toBeInTheDocument();expect(message).toHaveTextContent(`${I18nKey.HOOK$COMMAND}: check-policy`);expect(message).toHaveTextContent(`${I18nKey.HOOK$EXIT_CODE}: 13`);expect(message).toHaveTextContent(@@ -155,10 +194,7 @@ describe("hook execution event message", () => {const message = screen.getByTestId("generic-event-message");expect(message).toHaveAttribute("data-success", "error");- expect(screen.getByText("failed")).toHaveClass(- "bg-red-900/50",- "text-red-300",- );+ expect(screen.getByText("failed")).toBeInTheDocument();expect(screen.getByText(`${"x".repeat(77)}...`)).toBeInTheDocument();expect(message).not.toHaveTextContent(longCommand);expect(message).not.toHaveTextContent(I18nKey.HOOK$BLOCKED_REASON);diff --git a/__tests__/themes/color-themes.test.tsx b/__tests__/themes/color-themes.test.tsxindex 7cd8cfd851..7bc1a7ef9e 100644--- a/__tests__/themes/color-themes.test.tsx+++ b/__tests__/themes/color-themes.test.tsx@@ -120,6 +120,22 @@ describe("color themes", () => {"--oh-contrast against the configured credential banner surface",).toBeGreaterThanOrEqual(4.5);+ // Hook status badges tint the same feedback role over the chat canvas.+ const hookCanvas = channels(resolve("--oh-color-base"));+ for (const role of [+ "--oh-feedback-success",+ "--oh-feedback-warning",+ "--oh-feedback-error",+ ]) {+ const tint = channels(resolve(role)).map(+ (channel, index) => channel * 0.1 + hookCanvas[index] * 0.9,+ );+ expect(+ contrast(luminance(resolve(role)), luminance(tint)),+ `${role} against its 10% hook status tint`,+ ).toBeGreaterThanOrEqual(4.5);+ }+// Focus contrast includes each neutral control surface.for (const surfaceRole of ["--oh-color-base",diff --git a/src/components/shared/hook-execution-event-message.tsx b/src/components/shared/hook-execution-event-message.tsxindex 65510c9f2c..b68d7f4716 100644--- a/src/components/shared/hook-execution-event-message.tsx+++ b/src/components/shared/hook-execution-event-message.tsx@@ -48,9 +48,9 @@ function getStatusText(blocked: boolean, success: boolean): string {}function getStatusClassName(blocked: boolean, success: boolean): string {- if (blocked) return "bg-amber-900/50 text-amber-300";- if (success) return "bg-green-900/50 text-green-300";- return "bg-red-900/50 text-red-300";+ if (blocked) return "bg-feedback-warning/10 text-feedback-warning";+ if (success) return "bg-feedback-success/10 text-feedback-success";+ return "bg-feedback-error/10 text-feedback-error";}export function HookExecutionEventMessage({@@ -104,7 +104,7 @@ export function HookExecutionEventMessage({)}{event.blocked && event.reason && (- <div className="text-amber-400">+ <div className="text-feedback-warning"><span className="text-text-subtle">{t(I18nKey.HOOK$BLOCKED_REASON)}:</span>{" "}@@ -120,7 +120,7 @@ export function HookExecutionEventMessage({)}{event.error && (- <div className="text-red-400">+ <div className="text-feedback-error"><span className="text-text-subtle">{t(I18nKey.HOOK$ERROR)}:</span>{" "}{event.error}</div>@@ -138,7 +138,7 @@ export function HookExecutionEventMessage({{event.stderr && (<div><span className="text-text-subtle">{t(I18nKey.HOOK$STDERR)}:</span>- <pre className="text-xs bg-surface p-2 rounded mt-1 overflow-x-auto max-h-40 overflow-y-auto text-amber-300">+ <pre className="text-xs bg-surface p-2 rounded mt-1 overflow-x-auto max-h-40 overflow-y-auto text-feedback-warning">{event.stderr}</pre></div>